You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by da...@apache.org on 2009/08/13 12:43:01 UTC
svn commit: r803838 - in /cxf/dosgi/trunk: parent/ samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/ samples/ds/client/src/main/resources/OSGI-INF/remote-service/ samples/ds/impl/src/main/resources/OSGI-INF/ samples/spri...

Author: davidb
Date: Thu Aug 13 10:43:01 2009
New Revision: 803838

URL: http://svn.apache.org/viewvc?rev=803838&view=rev
Log:
Updated to CXF 2.2.3 (from 2.2.3-SNAPSHOT)
Migrated demos to use new standardized properties.

Modified:
    cxf/dosgi/trunk/parent/pom.xml
    cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java
    cxf/dosgi/trunk/samples/ds/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml
    cxf/dosgi/trunk/samples/ds/impl/src/main/resources/OSGI-INF/component.xml
    cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml

Modified: cxf/dosgi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=803838&r1=803837&r2=803838&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Thu Aug 13 10:43:01 2009
@@ -18,7 +18,7 @@
          generally caused by the fact that not all versions are available yet as 
          OSGi bundles. -->
     <properties>
-        <cxf.version>2.2.3-SNAPSHOT</cxf.version>
+        <cxf.version>2.2.3</cxf.version>
         <felix.version>1.8.0</felix.version>
         <spring.version>2.5.6</spring.version>
         <spring.osgi.version>1.2.0</spring.osgi.version>

Modified: cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java?rev=803838&r1=803837&r2=803838&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java (original)
+++ cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java Thu Aug 13 10:43:01 2009
@@ -39,9 +39,9 @@
         String host = getHostName();
         int port = getPort();
         
-        props.put("osgi.remote.interfaces", "*");
-        props.put("osgi.remote.configuration.type", "pojo");
-        props.put("osgi.remote.configuration.pojo.address", getAddress(host, port));
+        props.put("service.exported.interfaces", "*");
+        props.put("service.exported.configs", "org.apache.cxf.ws");
+        props.put("org.apache.cxf.ws.address", getAddress(host, port));
 
         reg = bc.registerService(DisplayService.class.getName(), 
                 new DisplayServiceImpl(host + ":" + port), props);

Modified: cxf/dosgi/trunk/samples/ds/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml?rev=803838&r1=803837&r2=803838&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml (original)
+++ cxf/dosgi/trunk/samples/ds/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml Thu Aug 13 10:43:01 2009
@@ -16,8 +16,8 @@
 <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0">
   <service-description>
     <provide interface="org.apache.cxf.dosgi.samples.ds.AdderService" />
-    <property name="osgi.remote.interfaces">*</property>
-    <property name="osgi.remote.configuration.type">pojo</property>
-    <property name="osgi.remote.configuration.pojo.address">http://localhost:9090/adder</property>
+    <property name="service.exported.interfaces">*</property>
+    <property name="service.exported.configs">org.apache.cxf.ws</property>
+    <property name="org.apache.cxf.ws.address">http://localhost:9090/adder</property>
   </service-description>
 </service-descriptions>

Modified: cxf/dosgi/trunk/samples/ds/impl/src/main/resources/OSGI-INF/component.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/impl/src/main/resources/OSGI-INF/component.xml?rev=803838&r1=803837&r2=803838&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/impl/src/main/resources/OSGI-INF/component.xml (original)
+++ cxf/dosgi/trunk/samples/ds/impl/src/main/resources/OSGI-INF/component.xml Thu Aug 13 10:43:01 2009
@@ -16,9 +16,9 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="DS Service Sample">
   <implementation class="org.apache.cxf.dosgi.samples.ds.impl.AdderServiceImpl"/>
   
-  <property name="osgi.remote.interfaces">*</property>
-  <property name="osgi.remote.configuration.type" value="pojo" />
-  <property name="osgi.remote.configuration.pojo.address" value="http://localhost:9090/adder" />
+  <property name="service.exported.interfaces">*</property>
+  <property name="service.exported.configs" value="org.apache.cxf.ws" />
+  <property name="org.apache.cxf.ws.address" value="http://localhost:9090/adder" />
   
   <service>
     <provide interface="org.apache.cxf.dosgi.samples.ds.AdderService"/>

Modified: cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml?rev=803838&r1=803837&r2=803838&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml (original)
+++ cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml Thu Aug 13 10:43:01 2009
@@ -19,9 +19,9 @@
 <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0">
   <service-description>
     <provide interface="org.apache.cxf.dosgi.samples.springdm.DinnerService" />
-    <property name="osgi.remote.interfaces">*</property>
+    <property name="service.exported.interfaces">*</property>
     <property name="deployment.intents">SOAP HTTP</property>
-    <property name="osgi.remote.configuration.type">pojo</property>
-    <property name="osgi.remote.configuration.pojo.address">http://localhost:9000/org/apache/cxf/dosgi/samples/springdm/DinnerService</property>
+    <property name="service.exported.configs">org.apache.cxf.ws</property>
+    <property name="org.apache.cxf.ws.address">http://localhost:9000/org/apache/cxf/dosgi/samples/springdm/DinnerService</property>
   </service-description>
 </service-descriptions>