Author: ivol37 at gmail.com
Date: Thu Feb 10 12:12:55 2011
New Revision: 773
Log:
[AMDATU-294] Fixed by defining proper configuration dependency for
ConsoleLogHandler. Also removed 'illegal' usage of System.out.println.
Modified:
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/osgi/Activator.java
trunk/amdatu-semanticweb/sesame/src/main/java/org/amdatu/semanticweb/sesame/osgi/Activator.java
Modified:
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/osgi/Activator.java
==============================================================================
---
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/osgi/Activator.java
(original)
+++
trunk/amdatu-core/loghandler/src/main/java/org/amdatu/core/loghandler/osgi/Activator.java
Thu Feb 10 12:12:55 2011
@@ -16,14 +16,11 @@
*/
package org.amdatu.core.loghandler.osgi;
-import java.util.Properties;
-
import org.amdatu.core.loghandler.service.ConsoleLogHandler;
import org.amdatu.core.loghandler.service.JdkLogForwarder;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
import org.osgi.service.cm.ManagedService;
import org.osgi.service.log.LogListener;
import org.osgi.service.log.LogReaderService;
@@ -37,25 +34,22 @@
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
- System.out.println("Starting Log handler.");
-
// Register our console log handler
- Properties consoleLogHandlerProps = new Properties();
- consoleLogHandlerProps.put(Constants.SERVICE_PID,
ConsoleLogHandler.PID);
manager.add(createComponent()
- .setInterface(new String[]{LogListener.class.getName(),
ManagedService.class.getName()}, consoleLogHandlerProps)
- .setImplementation(ConsoleLogHandler.class)
- .add(createServiceDependency()
- .setService(LogReaderService.class)
- .setRequired(false)
- .setCallbacks("logReaderAdded", "logReaderRemoved")));
+ .setInterface(new String[]{LogListener.class.getName(),
ManagedService.class.getName()}, null)
+ .setImplementation(ConsoleLogHandler.class)
+ .add(createServiceDependency()
+ .setService(LogReaderService.class)
+ .setRequired(false)
+ .setCallbacks("logReaderAdded", "logReaderRemoved"))
+
.add(createConfigurationDependency().setPid(ConsoleLogHandler.PID)));
// Register the JDKLog bridge
manager.add(createComponent()
- .setImplementation(new JdkLogForwarder())
-
.add(createServiceDependency().setService(LogService.class).setRequired(true))
-
.add(createServiceDependency().setService("(objectclass=*)").setCallbacks("onAdded",
"onRemoved")));
+ .setImplementation(new JdkLogForwarder())
+
.add(createServiceDependency().setService(LogService.class).setRequired(true))
+
.add(createServiceDependency().setService("(objectclass=*)").setCallbacks("onAdded",
"onRemoved")));
// TODO Why do we filter? Don't we just want all stuff?
}
Modified:
trunk/amdatu-semanticweb/sesame/src/main/java/org/amdatu/semanticweb/sesame/osgi/Activator.java
==============================================================================
---
trunk/amdatu-semanticweb/sesame/src/main/java/org/amdatu/semanticweb/sesame/osgi/Activator.java
(original)
+++
trunk/amdatu-semanticweb/sesame/src/main/java/org/amdatu/semanticweb/sesame/osgi/Activator.java
Thu Feb 10 12:12:55 2011
@@ -30,9 +30,6 @@
public class Activator extends DependencyActivatorBase {
@Override
public void init(BundleContext context, DependencyManager manager) throws
Exception {
- System.out.println("Starting Sesame application bundle...");
-
-
// Register the Sesame service
manager.add(
createComponent()
