Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Lippert2009-05-09 20:06:53 +0000
committerMartin Lippert2009-05-09 20:06:53 +0000
commit04c7e7ca9cb5ec7206001542ecc0702d34186d45 (patch)
tree2fbeb1d8bb5d8393fc0ab6b46b4ab969ed4488b1
parentd4f6007f28246e7877dde49536672c3eb8ac617f (diff)
downloadrt.equinox.bundles-04c7e7ca9cb5ec7206001542ecc0702d34186d45.tar.gz
rt.equinox.bundles-04c7e7ca9cb5ec7206001542ecc0702d34186d45.tar.xz
rt.equinox.bundles-04c7e7ca9cb5ec7206001542ecc0702d34186d45.zip
some classes renamed to fit better into the general equinox aspects structure
-rw-r--r--bundles/org.eclipse.equinox.weaving.aspectj/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/AspectJWeavingActivator.java (renamed from bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/WeavingServicePlugin.java)10
-rw-r--r--bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/AspectJWeavingService.java (renamed from bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/WeavingService.java)20
-rw-r--r--bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/AspectJWeavingServiceFactory.java (renamed from bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/WeavingServiceFactory.java)6
-rw-r--r--bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingAdaptor.java4
-rw-r--r--bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingContext.java4
6 files changed, 23 insertions, 23 deletions
diff --git a/bundles/org.eclipse.equinox.weaving.aspectj/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.weaving.aspectj/META-INF/MANIFEST.MF
index d56c26c1f..e42035dc5 100644
--- a/bundles/org.eclipse.equinox.weaving.aspectj/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.weaving.aspectj/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: WeavingService Plug-in (Incubation)
Bundle-SymbolicName: org.eclipse.equinox.weaving.aspectj
Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.equinox.weaving.aspectj.WeavingServicePlugin
+Bundle-Activator: org.eclipse.equinox.weaving.aspectj.AspectJWeavingActivator
Import-Package: org.aspectj.weaver;version="1.6.2",
org.aspectj.weaver.loadtime;version="1.6.2",
org.aspectj.weaver.loadtime.definition;version="1.6.2",
diff --git a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/WeavingServicePlugin.java b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/AspectJWeavingActivator.java
index 9906bca29..1720110e7 100644
--- a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/WeavingServicePlugin.java
+++ b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/AspectJWeavingActivator.java
@@ -25,7 +25,7 @@ import org.osgi.framework.ServiceReference;
/**
* The main plugin class to be used in the desktop.
*/
-public class WeavingServicePlugin implements BundleActivator {
+public class AspectJWeavingActivator implements BundleActivator {
public static boolean DEBUG;
@@ -33,7 +33,7 @@ public class WeavingServicePlugin implements BundleActivator {
.getBoolean("org.aspectj.osgi.verbose");
//The shared instance.
- private static WeavingServicePlugin plugin;
+ private static AspectJWeavingActivator plugin;
private AspectAdminImpl aspectDefinitionRegistry;
@@ -42,14 +42,14 @@ public class WeavingServicePlugin implements BundleActivator {
/**
* The constructor.
*/
- public WeavingServicePlugin() {
+ public AspectJWeavingActivator() {
plugin = this;
}
/**
* Returns the shared instance.
*/
- public static WeavingServicePlugin getDefault() {
+ public static AspectJWeavingActivator getDefault() {
return plugin;
}
@@ -76,7 +76,7 @@ public class WeavingServicePlugin implements BundleActivator {
System.err
.println("[org.eclipse.equinox.weaving.aspectj] info Starting AspectJ weaving service ...");
final String serviceName = IWeavingServiceFactory.class.getName();
- final IWeavingServiceFactory weavingServiceFactory = new WeavingServiceFactory(
+ final IWeavingServiceFactory weavingServiceFactory = new AspectJWeavingServiceFactory(
aspectDefinitionRegistry);
final Properties props = new Properties();
context.registerService(serviceName, weavingServiceFactory, props);
diff --git a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/WeavingService.java b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/AspectJWeavingService.java
index b1915611b..f42d90440 100644
--- a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/WeavingService.java
+++ b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/AspectJWeavingService.java
@@ -32,7 +32,7 @@ import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.osgi.service.resolver.State;
import org.osgi.framework.Bundle;
-public class WeavingService implements IWeavingService {
+public class AspectJWeavingService implements IWeavingService {
private List<Definition> aspectDefinitions;
@@ -46,19 +46,19 @@ public class WeavingService implements IWeavingService {
private OSGiWeavingContext weavingContext;
- public WeavingService() {
- if (WeavingServicePlugin.DEBUG)
+ public AspectJWeavingService() {
+ if (AspectJWeavingActivator.DEBUG)
System.out.println("- WeavingService.<init>");
}
- public WeavingService(final ClassLoader loader, final Bundle bundle,
+ public AspectJWeavingService(final ClassLoader loader, final Bundle bundle,
final State state, final BundleDescription bundleDescription,
final ISupplementerRegistry supplementerRegistry,
final AspectAdmin aspectAdmin) {
this.bundleDescription = bundleDescription;
final AspectResolver aspectResolver = new AspectResolver(state,
- supplementerRegistry, aspectAdmin, WeavingServicePlugin
+ supplementerRegistry, aspectAdmin, AspectJWeavingActivator
.getDefault().getContext());
final AspectConfiguration aspectConfig = aspectResolver
.resolveAspectsFor(bundle, bundleDescription);
@@ -72,7 +72,7 @@ public class WeavingService implements IWeavingService {
this.weavingAdaptor = new OSGiWeavingAdaptor(loader,
weavingContext, namespaceAddOn.toString());
} else {
- if (WeavingServicePlugin.DEBUG) {
+ if (AspectJWeavingActivator.DEBUG) {
System.err
.println("[org.eclipse.equinox.weaving.aspectj] info not weaving bundle '"
+ bundle.getSymbolicName() + "'");
@@ -120,13 +120,13 @@ public class WeavingService implements IWeavingService {
* @see org.eclipse.equinox.service.weaving.IWeavingService#getKey()
*/
public String getKey() {
- if (WeavingServicePlugin.DEBUG)
+ if (AspectJWeavingActivator.DEBUG)
System.out.println("> WeavingService.getKey() bundle="
+ bundleDescription.getSymbolicName());
final String namespace = namespaceAddOn.toString();
- if (WeavingServicePlugin.DEBUG)
+ if (AspectJWeavingActivator.DEBUG)
System.out.println("< WeavingService.getKey() key='" + namespace
+ "'");
@@ -140,7 +140,7 @@ public class WeavingService implements IWeavingService {
public byte[] preProcess(final String name, final byte[] classbytes,
final ClassLoader loader) throws IOException {
if (enabled) {
- if (WeavingServicePlugin.DEBUG)
+ if (AspectJWeavingActivator.DEBUG)
System.out.println("> WeavingService.preProcess() bundle="
+ bundleDescription.getSymbolicName() + ", name="
+ name + ", bytes=" + classbytes.length);
@@ -149,7 +149,7 @@ public class WeavingService implements IWeavingService {
// Bug 215177: Adapt to updated (AJ 1.5.4) signature.
newBytes = weavingAdaptor.weaveClass(name, classbytes, false);
- if (WeavingServicePlugin.DEBUG)
+ if (AspectJWeavingActivator.DEBUG)
System.out.println("< WeavingService.preProcess() bytes="
+ newBytes.length);
return newBytes;
diff --git a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/WeavingServiceFactory.java b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/AspectJWeavingServiceFactory.java
index 811e716d7..184eb59c1 100644
--- a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/WeavingServiceFactory.java
+++ b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/AspectJWeavingServiceFactory.java
@@ -24,11 +24,11 @@ import org.osgi.framework.Bundle;
*
* @author martinlippert
*/
-public class WeavingServiceFactory implements IWeavingServiceFactory {
+public class AspectJWeavingServiceFactory implements IWeavingServiceFactory {
private final AspectAdminImpl aspectDefinitionRegistry;
- public WeavingServiceFactory(final AspectAdminImpl aspectDefinitionRegistry) {
+ public AspectJWeavingServiceFactory(final AspectAdminImpl aspectDefinitionRegistry) {
this.aspectDefinitionRegistry = aspectDefinitionRegistry;
}
@@ -42,7 +42,7 @@ public class WeavingServiceFactory implements IWeavingServiceFactory {
final Bundle bundle, final State resolverState,
final BundleDescription bundleDesciption,
final ISupplementerRegistry supplementerRegistry) {
- return new WeavingService(loader, bundle, resolverState,
+ return new AspectJWeavingService(loader, bundle, resolverState,
bundleDesciption, supplementerRegistry,
aspectDefinitionRegistry);
}
diff --git a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingAdaptor.java b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingAdaptor.java
index e7f645141..808eecf04 100644
--- a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingAdaptor.java
+++ b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingAdaptor.java
@@ -23,7 +23,7 @@ import java.util.Map;
import org.aspectj.weaver.IUnwovenClassFile;
import org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptor;
-import org.eclipse.equinox.weaving.aspectj.WeavingServicePlugin;
+import org.eclipse.equinox.weaving.aspectj.AspectJWeavingActivator;
/**
* The weaving adaptor for AspectJs load-time weaving API that deals with the
@@ -84,7 +84,7 @@ public class OSGiWeavingAdaptor extends ClassLoaderWeavingAdaptor {
initialized = true;
initializing = false;
- if (WeavingServicePlugin.verbose) {
+ if (AspectJWeavingActivator.verbose) {
if (isEnabled())
System.err
.println("[org.eclipse.equinox.weaving.aspectj] info weaving bundle '"
diff --git a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingContext.java b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingContext.java
index e17913301..d9187aeb9 100644
--- a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingContext.java
+++ b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingContext.java
@@ -19,7 +19,7 @@ import java.util.List;
import org.aspectj.weaver.loadtime.DefaultWeavingContext;
import org.aspectj.weaver.loadtime.definition.Definition;
import org.aspectj.weaver.tools.WeavingAdaptor;
-import org.eclipse.equinox.weaving.aspectj.WeavingServicePlugin;
+import org.eclipse.equinox.weaving.aspectj.AspectJWeavingActivator;
import org.eclipse.osgi.service.resolver.BundleDescription;
/**
@@ -38,7 +38,7 @@ public class OSGiWeavingContext extends DefaultWeavingContext {
super(loader);
this.bundleDescription = bundleDescription;
this.aspectDefinitions = aspectDefinitions;
- if (WeavingServicePlugin.DEBUG)
+ if (AspectJWeavingActivator.DEBUG)
System.out.println("- WeavingContext.WeavingContext() locader="
+ loader + ", bundle="
+ bundleDescription.getSymbolicName());

Back to the top