You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/11/09 15:12:59 UTC
svn commit: r1540307 - in /karaf/trunk: pom.xml
scr/examples/component-factory/src/main/java/org/apache/karaf/scr/examples/component/factories/component/GreeterServiceFactoryManager.java
Author: jbonofre
Date: Sat Nov 9 14:12:59 2013
New Revision: 1540307
URL: http://svn.apache.org/r1540307
Log:
[KARAF-2559] Upgrade to Felix SCR 1.8.0
Modified:
karaf/trunk/pom.xml
karaf/trunk/scr/examples/component-factory/src/main/java/org/apache/karaf/scr/examples/component/factories/component/GreeterServiceFactoryManager.java
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1540307&r1=1540306&r2=1540307&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Sat Nov 9 14:12:59 2013
@@ -158,7 +158,7 @@
<felix.eventadmin.version>1.3.2</felix.eventadmin.version>
<felix.eventadmin.webconsole.plugin.version>1.0.2</felix.eventadmin.webconsole.plugin.version>
<felix.obr.version>1.0.2</felix.obr.version>
- <felix.scr.version>1.6.2</felix.scr.version>
+ <felix.scr.version>1.8.0</felix.scr.version>
<felix.scr.webconsole.plugin.version>1.0.0</felix.scr.webconsole.plugin.version>
<felix.scr.annotation.version>1.6.0</felix.scr.annotation.version>
Modified: karaf/trunk/scr/examples/component-factory/src/main/java/org/apache/karaf/scr/examples/component/factories/component/GreeterServiceFactoryManager.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/component-factory/src/main/java/org/apache/karaf/scr/examples/component/factories/component/GreeterServiceFactoryManager.java?rev=1540307&r1=1540306&r2=1540307&view=diff
==============================================================================
--- karaf/trunk/scr/examples/component-factory/src/main/java/org/apache/karaf/scr/examples/component/factories/component/GreeterServiceFactoryManager.java (original)
+++ karaf/trunk/scr/examples/component-factory/src/main/java/org/apache/karaf/scr/examples/component/factories/component/GreeterServiceFactoryManager.java Sat Nov 9 14:12:59 2013
@@ -26,6 +26,7 @@ import org.osgi.service.component.Compon
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Dictionary;
import java.util.Properties;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -56,7 +57,7 @@ public class GreeterServiceFactoryManage
final Properties props = new Properties();
props.setProperty("salutation", "Hello");
props.setProperty("name", "User");
- instance = factory.newInstance(props);
+ instance = factory.newInstance((Dictionary) props);
greeterService = (GreeterServiceComponentFactory) instance.getInstance();
greeterService.startGreeter();
}