debug output: replaced old bundle names with new ones

7 files changed, 12 insertions, 12 deletions

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/WeavingServicePlugin.java
index 56e35335e..d03e8debf 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/WeavingServicePlugin.java
@@ -67,7 +67,7 @@ public class WeavingServicePlugin implements BundleActivator {
         loadOptions(context);
         if (verbose)
             System.err
-                    .println("[org.aspectj.osgi.service.weaving] info Starting AspectJ weaving service ...");
+                    .println("[org.eclipse.equinox.weaving.aspectj] info Starting AspectJ weaving service ...");
         final String serviceName = IWeavingService.class.getName();
         //		ServiceFactory factory = new WeavingServiceFactory();
         final IWeavingService weavingService = new WeavingService();
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 978bf54e1..6feba2281 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
@@ -94,12 +94,12 @@ public class OSGiWeavingAdaptor extends ClassLoaderWeavingAdaptor {
                 if (WeavingServicePlugin.verbose) {
                     if (isEnabled())
                         System.err
-                                .println("[org.aspectj.osgi.service.weaving] info weaving bundle '"
+                                .println("[org.eclipse.equinox.weaving.aspectj] info weaving bundle '"
                                         + weavingContext.getClassLoaderName()
                                         + "'");
                     else
                         System.err
-                                .println("[org.aspectj.osgi.service.weaving] info not weaving bundle '"
+                                .println("[org.eclipse.equinox.weaving.aspectj] info not weaving bundle '"
                                         + weavingContext.getClassLoaderName()
                                         + "'");
                 }
diff --git a/bundles/org.eclipse.equinox.weaving.caching.j9/src/org/eclipse/equinox/weaving/internal/caching/j9/CachingServicePlugin.java b/bundles/org.eclipse.equinox.weaving.caching.j9/src/org/eclipse/equinox/weaving/internal/caching/j9/CachingServicePlugin.java
index 0fa3572c4..d970895a3 100644
--- a/bundles/org.eclipse.equinox.weaving.caching.j9/src/org/eclipse/equinox/weaving/internal/caching/j9/CachingServicePlugin.java
+++ b/bundles/org.eclipse.equinox.weaving.caching.j9/src/org/eclipse/equinox/weaving/internal/caching/j9/CachingServicePlugin.java
@@ -51,7 +51,7 @@ public class CachingServicePlugin implements BundleActivator {
         if (shouldRegister()) {
             if (verbose)
                 System.err
-                        .println("[org.aspectj.osgi.service.caching.j9] info starting J9 caching service ...");
+                        .println("[org.eclipse.equinox.weaving.caching.j9] info starting J9 caching service ...");
             final String name = ICachingService.class.getName();
             //			CachingServiceFactory factory = new CachingServiceFactory();
             final CachingService singleCachingService = new CachingService();
@@ -60,7 +60,7 @@ public class CachingServicePlugin implements BundleActivator {
         } else {
             if (verbose)
                 System.err
-                        .println("[org.aspectj.osgi.service.caching.j9] warning cannot start J9 caching service");
+                        .println("[org.eclipse.equinox.weaving.caching.j9] warning cannot start J9 caching service");
         }
 
         if (CachingServicePlugin.DEBUG)
diff --git a/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/Activator.java b/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/Activator.java
index ce791b975..a5b11b9d2 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/Activator.java
+++ b/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/Activator.java
@@ -47,12 +47,12 @@ public class Activator implements BundleActivator {
         if (shouldRegister()) {
             if (verbose)
                 System.err
-                        .println("[org.aspectj.osgi.service.caching] info starting standard caching service ...");
+                        .println("[org.eclipse.equinox.weaving.caching] info starting standard caching service ...");
             registerSingletonCachingService(bundleContext);
         } else {
             if (verbose)
                 System.err
-                        .println("[org.aspectj.osgi.service.caching] warning cannot start standard caching service on J9 VM");
+                        .println("[org.eclipse.equinox.weaving.caching] warning cannot start standard caching service on J9 VM");
         }
     }
 
diff --git a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/service/weaving/SupplementerRegistry.java b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/service/weaving/SupplementerRegistry.java
index 6c7b377ac..b042c5f32 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/service/weaving/SupplementerRegistry.java
+++ b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/service/weaving/SupplementerRegistry.java
@@ -215,7 +215,7 @@ public class SupplementerRegistry {
             supplementers.remove(bundle.getSymbolicName());
             if (AbstractAspectJHook.verbose)
                 System.err
-                        .println("[org.aspectj.osgi] info removing supplementer "
+                        .println("[org.eclipse.equinox.weaving.hook] info removing supplementer "
                                 + bundle.getSymbolicName());
 
             final Bundle[] supplementedBundles = supplementer
@@ -240,7 +240,7 @@ public class SupplementerRegistry {
     public void updateInstalledBundle(final Bundle bundle) {
         if (AbstractAspectJHook.verbose)
             System.err
-                    .println("[org.aspectj.osgi] info triggering update for re-supplementing "
+                    .println("[org.eclipse.equinox.weaving.hook] info triggering update for re-supplementing "
                             + bundle.getSymbolicName());
 
         try {
diff --git a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/AbstractAspectJHook.java b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/AbstractAspectJHook.java
index d12a779d3..9600c542e 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/AbstractAspectJHook.java
+++ b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/AbstractAspectJHook.java
@@ -77,7 +77,7 @@ public abstract class AbstractAspectJHook implements HookConfigurator,
     public void addHooks(final HookRegistry hooks) {
         if (verbose)
             System.err
-                    .println("[org.aspectj.osgi] info adding AspectJ hooks ..."); //$NON-NLS-1$
+                    .println("[org.eclipse.equinox.weaving.hook] info adding AspectJ hooks ..."); //$NON-NLS-1$
 
         supplementerRegistry = new SupplementerRegistry();
 
diff --git a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/AspectJStorageHook.java b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/AspectJStorageHook.java
index cf6ca6822..6b991073f 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/AspectJStorageHook.java
+++ b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/AspectJStorageHook.java
@@ -152,14 +152,14 @@ public class AspectJStorageHook implements StorageHook {
                 //                if (addRequiredBundles(supplementers)) {
                 //                    if (AbstractAspectJHook.verbose)
                 //                        System.err
-                //                                .println("[org.aspectj.osgi] info supplementing "
+                //                                .println("[org.eclipse.equinox.weaving.hook] info supplementing "
                 //                                        + getSymbolicName()
                 //                                        + " with "
                 //                                        + supplementers);
                 //                } else {
                 //                    if (AbstractAspectJHook.verbose)
                 //                        System.err
-                //                                .println("[org.aspectj.osgi] info not supplementing "
+                //                                .println("[org.eclipse.equinox.weaving.hook] info not supplementing "
                 //                                        + getSymbolicName());
                 //                }
             }