You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/08/14 15:51:29 UTC

svn commit: r1695912 - in /felix/trunk/http/cometd: pom.xml src/main/java/org/apache/felix/http/cometd/internal/CometdServiceImpl.java

Author: cziegeler
Date: Fri Aug 14 13:51:29 2015
New Revision: 1695912

URL: http://svn.apache.org/r1695912
Log:
Update to new parent pom

Modified:
    felix/trunk/http/cometd/pom.xml
    felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdServiceImpl.java

Modified: felix/trunk/http/cometd/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/cometd/pom.xml?rev=1695912&r1=1695911&r2=1695912&view=diff
==============================================================================
--- felix/trunk/http/cometd/pom.xml (original)
+++ felix/trunk/http/cometd/pom.xml Fri Aug 14 13:51:29 2015
@@ -83,20 +83,15 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>4.2.0</version>
-            <scope>provided</scope>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <version>4.2.0</version>
-            <scope>provided</scope>
+            <artifactId>osgi.cmpn</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>

Modified: felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdServiceImpl.java?rev=1695912&r1=1695911&r2=1695912&view=diff
==============================================================================
--- felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdServiceImpl.java (original)
+++ felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdServiceImpl.java Fri Aug 14 13:51:29 2015
@@ -18,7 +18,6 @@ package org.apache.felix.http.cometd.int
 
 import java.util.Dictionary;
 import java.util.Hashtable;
-import java.util.Properties;
 
 import javax.servlet.http.HttpServlet;
 
@@ -58,7 +57,7 @@ public final class CometdServiceImpl
     public void start()
         throws Exception
     {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<String, Object>();
         props.put(Constants.SERVICE_PID, PID);
         this.configServiceReg = this.context.registerService(ManagedService.class.getName(), this, props);