Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsboshev2008-09-24 08:32:06 +0000
committersboshev2008-09-24 08:32:06 +0000
commit0b70d4a64bfda1e56fd384d60c2ebdb8ef5d5074 (patch)
treee77b6882c699a6d9f10b00b15d1dbe0669747d48
parent508e944c6774ce1a04e26c50c5ad4be53930eab3 (diff)
downloadrt.equinox.bundles-0b70d4a64bfda1e56fd384d60c2ebdb8ef5d5074.tar.gz
rt.equinox.bundles-0b70d4a64bfda1e56fd384d60c2ebdb8ef5d5074.tar.xz
rt.equinox.bundles-0b70d4a64bfda1e56fd384d60c2ebdb8ef5d5074.zip
Cleanup of unnecessary info messages
-rw-r--r--bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Activator.java1
-rw-r--r--bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Resolver.java28
-rw-r--r--bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java1
3 files changed, 8 insertions, 22 deletions
diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Activator.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Activator.java
index 59d8e5447..869b6ead6 100644
--- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Activator.java
+++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Activator.java
@@ -190,7 +190,6 @@ public class Activator implements BundleActivator, SynchronousBundleListener {
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext bc) throws Exception {
- log.info("Shutting down service component runtime!");
if (scrManager != null) {
bc.removeServiceListener(scrManager);
}
diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Resolver.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Resolver.java
index 8e82c3889..37515be0c 100644
--- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Resolver.java
+++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Resolver.java
@@ -86,20 +86,6 @@ public final class Resolver implements WorkPerformer {
instanceProcess = new InstanceProcess(this);
}
- /**
- * Clean up the SCR is shutting down
- */
- void dispose() {
- Activator.log.info("Resolver.dispose()");
- if (instanceProcess != null) {
- instanceProcess.dispose();
- instanceProcess = null;
- }
-
- scpEnabled.removeAllElements();
- satisfiedSCPs.removeAllElements();
- }
-
// -- begin *enable* component routines
/**
* enableComponents - called by the dispatchWorker
@@ -161,7 +147,9 @@ public final class Resolver implements WorkPerformer {
Activator.log.error("[SCR - Resolver] Cannot specify both ComponentFactory and ManagedServiceFactory\n" + "The name of the ComponentFactory component is " + current.name, null);
continue; // skip current component
}
- Activator.log.info("Resolver.enableComponents(): " + current.name + " as *managed service factory*");
+ if (Activator.DEBUG) {
+ Activator.log.debug("[SCR - Resolver] Resolver.enableComponents(): " + current.name + " as *managed service factory*", null);
+ }
try {
configs = ConfigurationManager.listConfigurations("(service.factoryPid=" + config.getFactoryPid() + ")");
} catch (Exception e) {
@@ -175,8 +163,9 @@ public final class Resolver implements WorkPerformer {
}
}
} else {
- Activator.log.info("Resolver.enableComponents(): " + current.name + " as *service*");
- // if Service, not ManagedServiceFactory
+ if (Activator.DEBUG) {
+ Activator.log.debug("[SCR - Resolver] Resolver.enableComponents(): " + current.name + " as *service*", null);
+ } // if Service, not ManagedServiceFactory
map(current, config);
}
} // end has configuration
@@ -217,9 +206,8 @@ public final class Resolver implements WorkPerformer {
/**
* Create the SCP and add to the maps
*
- * @param component
- * @param config
- * CM configuration
+ * @param component the component for which SCP will be created
+ * @param configProperties CM configuration properties
*/
public ServiceComponentProp map(ServiceComponent component, Dictionary configProperties) {
ServiceComponentProp scp = null;
diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java
index 9c8a93a22..500f0b473 100644
--- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java
+++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java
@@ -426,7 +426,6 @@ public class SCRManager implements ServiceListener, SynchronousBundleListener, C
}
private void disposeBundles() {
- log.info("disposeBundles()");
// dispose ALL bundles
if (bundleToServiceComponents != null) {
for (Enumeration e = bundleToServiceComponents.keys(); e.hasMoreElements();) {

Back to the top