svn commit: r725695 - in /cxf/sandbox/dosgi: discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/ discovery/local/src/test/resources/ dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/ dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/...

davidb Thu, 11 Dec 2008 06:20:43 -0800

Author: davidb
Date: Thu Dec 11 06:20:13 2008
New Revision: 725695

URL: http://svn.apache.org/viewvc?rev=725695&view=rev
Log:
Fix for bug CXF-1941.


Modified:
    
cxf/sandbox/dosgi/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryService.java
    cxf/sandbox/dosgi/discovery/local/src/test/resources/remote-services.xml
    
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java
    
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/OsgiUtilsTest.java
    
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-services/multi-services.xml
    
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-services/remote-services.xml
    cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/test-resources/rs1.xml
    cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/test-resources/rs2.xml
    
cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
    
cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
    
cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/resources/OSGI-INF/remote-services/remote-services.xml
    
cxf/sandbox/dosgi/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
    
cxf/sandbox/dosgi/systests/basic/src/test/resources/OSGI-INF/remote-services/remote-services.xml

Modified: 
cxf/sandbox/dosgi/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryService.java
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryService.java?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- 
cxf/sandbox/dosgi/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryService.java
 (original)
+++ 
cxf/sandbox/dosgi/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryService.java
 Thu Dec 11 06:20:13 2008
@@ -65,11 +65,11 @@
     
     private static final String SERVICE_DESCRIPTION_ELEMENT = 
"service-description";
     
-    private static final String PROVIDE_INTERFACE_ELEMENT = "interface";
-    private static final String PROVIDE_INTERFACE_NAME_ATTRIBUTE = "name";
+    private static final String PROVIDE_INTERFACE_ELEMENT = "provide";
+    private static final String PROVIDE_INTERFACE_NAME_ATTRIBUTE = "interface";
 
     private static final String PROPERTY_ELEMENT = "property";
-    private static final String PROPERTY_KEY_ATTRIBUTE = "key";
+    private static final String PROPERTY_KEY_ATTRIBUTE = "name";
     
     // TODO : these properties should be configurable
     private static final long ASYNC_WAIT_TIME = 5000L;

Modified: 
cxf/sandbox/dosgi/discovery/local/src/test/resources/remote-services.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/discovery/local/src/test/resources/remote-services.xml?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- cxf/sandbox/dosgi/discovery/local/src/test/resources/remote-services.xml 
(original)
+++ cxf/sandbox/dosgi/discovery/local/src/test/resources/remote-services.xml 
Thu Dec 11 06:20:13 2008
@@ -15,17 +15,17 @@
   -->
 <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0";>
   <service-description>
-    <interface name="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService" />
-    <property key="osgi.remote.interfaces">*</property>
-    <property key="osgi.remote.requires.intents">SOAP HTTP</property>
-    <property key="osgi.remote.configuration.type">pojo</property>
-    <property 
key="osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
+    <provide 
interface="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService" />
+    <property name="osgi.remote.interfaces">*</property>
+    <property name="osgi.remote.requires.intents">SOAP HTTP</property>
+    <property name="osgi.remote.configuration.type">pojo</property>
+    <property 
name="osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
   </service-description>
   <service-description>
-    <interface name="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService" />
-    <property key="osgi.remote.interfaces">*</property>
-    <property key="osgi.remote.requires.intents">SOAP HTTP</property>
-    <property key="osgi.remote.configuration.type">pojo</property>
-    <property 
key="osgi.remote.configuration.pojo.address">http://localhost:10000/greeter</property>
+    <provide 
interface="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService" />
+    <property name="osgi.remote.interfaces">*</property>
+    <property name="osgi.remote.requires.intents">SOAP HTTP</property>
+    <property name="osgi.remote.configuration.type">pojo</property>
+    <property 
name="osgi.remote.configuration.pojo.address">http://localhost:10000/greeter</property>
   </service-description>
 </service-descriptions>

Modified: 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java
 (original)
+++ 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java
 Thu Dec 11 06:20:13 2008
@@ -63,11 +63,11 @@
     
     private static final String SERVICE_DESCRIPTION_ELEMENT = 
"service-description";
     
-    private static final String PROVIDE_INTERFACE_ELEMENT = "interface";
-    private static final String PROVIDE_INTERFACE_NAME_ATTRIBUTE = "name";
+    private static final String PROVIDE_INTERFACE_ELEMENT = "provide";
+    private static final String PROVIDE_INTERFACE_NAME_ATTRIBUTE = "interface";
 
     private static final String PROPERTY_ELEMENT = "property";
-    private static final String PROPERTY_KEY_ATTRIBUTE = "key";
+    private static final String PROPERTY_KEY_ATTRIBUTE = "name";
     private static final String PROPERTY_INTERFACE_ATTRIBUTE = "interface";
 
     private static final String INTERFACE_WILDCARD = "*";

Modified: 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/OsgiUtilsTest.java
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/OsgiUtilsTest.java?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/OsgiUtilsTest.java
 (original)
+++ 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/OsgiUtilsTest.java
 Thu Dec 11 06:20:13 2008
@@ -145,8 +145,8 @@
         List<Element> rsElements = OsgiUtils.getAllDescriptionElements(b);
         assertEquals(2, rsElements.size());
         Namespace ns = 
Namespace.getNamespace("http://www.osgi.org/xmlns/sd/v1.0.0";);
-        assertEquals("SomeService", rsElements.get(0).getChild("interface", 
ns).getAttributeValue("name"));
-        assertEquals("SomeOtherService", 
rsElements.get(1).getChild("interface", ns).getAttributeValue("name"));
+        assertEquals("SomeService", rsElements.get(0).getChild("provide", 
ns).getAttributeValue("interface"));
+        assertEquals("SomeOtherService", rsElements.get(1).getChild("provide", 
ns).getAttributeValue("interface"));
     }
     
     public void testMultiRemoteServicesXMLFiles() {
@@ -163,9 +163,9 @@
         List<Element> rsElements = OsgiUtils.getAllDescriptionElements(b);
         assertEquals(3, rsElements.size());
         Namespace ns = 
Namespace.getNamespace("http://www.osgi.org/xmlns/sd/v1.0.0";);
-        assertEquals("SomeService", rsElements.get(0).getChild("interface", 
ns).getAttributeValue("name"));
-        assertEquals("SomeOtherService", 
rsElements.get(1).getChild("interface", ns).getAttributeValue("name"));
-        assertEquals("org.example.Service", 
rsElements.get(2).getChild("interface", ns).getAttributeValue("name"));
+        assertEquals("SomeService", rsElements.get(0).getChild("provide", 
ns).getAttributeValue("interface"));
+        assertEquals("SomeOtherService", rsElements.get(1).getChild("provide", 
ns).getAttributeValue("interface"));
+        assertEquals("org.example.Service", 
rsElements.get(2).getChild("provide", ns).getAttributeValue("interface"));
     }
     
     @SuppressWarnings("unchecked")
@@ -186,7 +186,7 @@
         List<Element> rsElements = OsgiUtils.getAllDescriptionElements(b);
         assertEquals(2, rsElements.size());
         Namespace ns = 
Namespace.getNamespace("http://www.osgi.org/xmlns/sd/v1.0.0";);
-        assertEquals("SomeService", rsElements.get(0).getChild("interface", 
ns).getAttributeValue("name"));
-        assertEquals("SomeOtherService", 
rsElements.get(1).getChild("interface", ns).getAttributeValue("name"));
+        assertEquals("SomeService", rsElements.get(0).getChild("provide", 
ns).getAttributeValue("interface"));
+        assertEquals("SomeOtherService", rsElements.get(1).getChild("provide", 
ns).getAttributeValue("interface"));
     }
 }

Modified: 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-services/multi-services.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-services/multi-services.xml?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-services/multi-services.xml
 (original)
+++ 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-services/multi-services.xml
 Thu Dec 11 06:20:13 2008
@@ -21,16 +21,16 @@
 
 <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0";>
   <service-description>
-    <interface name="org.apache.cxf.dosgi.dsw.hooks.TestService" />
-    <interface 
name="org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface" />
-    <property 
key="osgi.remote.interfaces">org.apache.cxf.dosgi.dsw.hooks.TestService,org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface</property>
-    <property key="osgi.remote.requires.intents">SOAP HTTP</property>
-    <property key="osgi.remote.configuration.type">pojo</property>
-    <property key="osgi.remote.configuration.pojo.address"
+    <provide interface="org.apache.cxf.dosgi.dsw.hooks.TestService" />
+    <provide 
interface="org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface"
 />
+    <property 
name="osgi.remote.interfaces">org.apache.cxf.dosgi.dsw.hooks.TestService,org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface</property>
+    <property name="osgi.remote.requires.intents">SOAP HTTP</property>
+    <property name="osgi.remote.configuration.type">pojo</property>
+    <property name="osgi.remote.configuration.pojo.address"
               interface="org.apache.cxf.dosgi.dsw.hooks.TestService">
       http://localhost:9001/hello
     </property>
-    <property key="osgi.remote.configuration.pojo.address"
+    <property name="osgi.remote.configuration.pojo.address"
               
interface="org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface">
       http://localhost:9002/hello
     </property>

Modified: 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-services/remote-services.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-services/remote-services.xml?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-services/remote-services.xml
 (original)
+++ 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/OSGI-INF/remote-services/remote-services.xml
 Thu Dec 11 06:20:13 2008
@@ -21,12 +21,12 @@
 
 <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0";>
   <service-description>
-    <interface name="org.apache.cxf.dosgi.dsw.hooks.TestService" />
-    <interface 
name="org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface" />
-    <!--property 
key="osgi.remote.interfaces">org.apache.cxf.dosgi.dsw.hooks.TestService,org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface</property-->
-    <property key="osgi.remote.interfaces">*</property>
-    <property key="osgi.remote.requires.intents">SOAP HTTP</property>
-    <property key="osgi.remote.configuration.type">pojo</property>
-    <property 
key="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
+    <provide interface="org.apache.cxf.dosgi.dsw.hooks.TestService" />
+    <provide 
interface="org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface"
 />
+
+    <property name="osgi.remote.interfaces">*</property>
+    <property name="osgi.remote.requires.intents">SOAP HTTP</property>
+    <property name="osgi.remote.configuration.type">pojo</property>
+    <property 
name="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
   </service-description>
 </service-descriptions>

Modified: 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/test-resources/rs1.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/test-resources/rs1.xml?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/test-resources/rs1.xml 
(original)
+++ cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/test-resources/rs1.xml Thu 
Dec 11 06:20:13 2008
@@ -21,11 +21,11 @@
 
 <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0";>
   <service-description>
-    <interface name="SomeService" />
-    <property key="osgi.remote.requires.intents">confidentiality</property>
+    <provide interface="SomeService" />
+    <property name="osgi.remote.requires.intents">confidentiality</property>
   </service-description>
   <service-description>
-    <interface name="SomeOtherService" />
-    <interface name="WithSomeSecondInterface" />
+    <provide interface="SomeOtherService" />
+    <provide interface="WithSomeSecondInterface" />
   </service-description>
 </service-descriptions>

Modified: 
cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/test-resources/rs2.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/test-resources/rs2.xml?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/test-resources/rs2.xml 
(original)
+++ cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/test-resources/rs2.xml Thu 
Dec 11 06:20:13 2008
@@ -21,8 +21,8 @@
 
 <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0";>
   <service-description>
-    <interface name="org.example.Service" />
-    <property key="osgi.intents">confidentiality.message integrity</property>
-    <property key="osgi.remote.interfaces">*</property>
+    <provide interface="org.example.Service" />
+    <property name="osgi.intents">confidentiality.message integrity</property>
+    <property name="osgi.remote.interfaces">*</property>
   </service-description>
 </service-descriptions>

Modified: 
cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- 
cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
 (original)
+++ 
cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
 Thu Dec 11 06:20:13 2008
@@ -15,9 +15,9 @@
   -->
 <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0";>
   <service-description>
-    <interface name="org.apache.cxf.dosgi.samples.greeter.GreeterService" />
-    <property key="osgi.remote.interfaces">*</property>
-    <property key="osgi.remote.configuration.type">pojo</property>
-    <property 
key="osgi.remote.configuration.pojo.address">http://localhost:9090/greeter</property>
+    <provide interface="org.apache.cxf.dosgi.samples.greeter.GreeterService" />
+    <property name="osgi.remote.interfaces">*</property>
+    <property name="osgi.remote.configuration.type">pojo</property>
+    <property 
name="osgi.remote.configuration.pojo.address">http://localhost:9090/greeter</property>
   </service-description>
 </service-descriptions>

Modified: 
cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- 
cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
 (original)
+++ 
cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
 Thu Dec 11 06:20:13 2008
@@ -15,8 +15,8 @@
   -->
 <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0";>
   <service-description>
-    <interface name="org.apache.cxf.dosgi.samples.pojo.hello.HelloService" />
-    <property key="osgi.remote.interfaces">*</property>
+    <provide interface="org.apache.cxf.dosgi.samples.pojo.hello.HelloService" 
/>
+    <property name="osgi.remote.interfaces">*</property>
 
 <!-- Uncomment to enable SOAP 1.2 and confirm via message logging -->
     <!--
@@ -29,8 +29,8 @@
       property name="osgi.remote.requires.intents">logging reliability
       SOAP HTTP</property
     -->
-    <property key="osgi.remote.requires.intents">SOAP HTTP</property>
-    <property key="osgi.remote.configuration.type">pojo</property>
-    <property 
key="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
+    <property name="osgi.remote.requires.intents">SOAP HTTP</property>
+    <property name="osgi.remote.configuration.type">pojo</property>
+    <property 
name="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
   </service-description>
 </service-descriptions>

Modified: 
cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/resources/OSGI-INF/remote-services/remote-services.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/resources/OSGI-INF/remote-services/remote-services.xml?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- 
cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/resources/OSGI-INF/remote-services/remote-services.xml
 (original)
+++ 
cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/resources/OSGI-INF/remote-services/remote-services.xml
 Thu Dec 11 06:20:13 2008
@@ -15,8 +15,8 @@
   -->
 <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0";>
   <service-description>
-    <interface name="org.apache.cxf.dosgi.samples.pojo.hello.HelloService" />
-    <property key="osgi.remote.interfaces">*</property>
+    <provide interface="org.apache.cxf.dosgi.samples.pojo.hello.HelloService" 
/>
+    <property name="osgi.remote.interfaces">*</property>
 
 <!-- Uncomment to enable SOAP 1.2 and confirm via message logging -->
     <!--
@@ -29,15 +29,15 @@
       property name="osgi.remote.requires.intents">logging reliability
       SOAP HTTP</property
     -->
-    <property key="osgi.remote.requires.intents">SOAP HTTP</property>
-    <property key="osgi.remote.configuration.type">pojo</property>
-    <property 
key="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
+    <property name="osgi.remote.requires.intents">SOAP HTTP</property>
+    <property name="osgi.remote.configuration.type">pojo</property>
+    <property 
name="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
   </service-description>
   <service-description>
-    <interface name="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService" />
-    <property key="osgi.remote.interfaces">*</property>
-    <property key="osgi.remote.requires.intents">SOAP HTTP</property>
-    <property key="osgi.remote.configuration.type">pojo</property>
-    <property 
key="osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
+    <provide 
interface="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService" />
+    <property name="osgi.remote.interfaces">*</property>
+    <property name="osgi.remote.requires.intents">SOAP HTTP</property>
+    <property name="osgi.remote.configuration.type">pojo</property>
+    <property 
name="osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
   </service-description>
 </service-descriptions>

Modified: 
cxf/sandbox/dosgi/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- 
cxf/sandbox/dosgi/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
 (original)
+++ 
cxf/sandbox/dosgi/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
 Thu Dec 11 06:20:13 2008
@@ -18,10 +18,10 @@
 -->
 <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0";>
   <service-description>
-    <interface name="org.apache.cxf.dosgi.samples.springdm.DinnerService" />
-    <property key="osgi.remote.interfaces">*</property>
-    <property key="osgi.intents">SOAP HTTP</property>
-    <property key="osgi.remote.configuration.type">pojo</property>
-    <property 
key="osgi.remote.configuration.pojo.address">http://localhost:9000/org/apache/cxf/dosgi/samples/springdm/DinnerService</property>
+    <provide interface="org.apache.cxf.dosgi.samples.springdm.DinnerService" />
+    <property name="osgi.remote.interfaces">*</property>
+    <property name="osgi.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>
   </service-description>
 </service-descriptions>

Modified: 
cxf/sandbox/dosgi/systests/basic/src/test/resources/OSGI-INF/remote-services/remote-services.xml
URL: 
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/basic/src/test/resources/OSGI-INF/remote-services/remote-services.xml?rev=725695&r1=725694&r2=725695&view=diff
==============================================================================
--- 
cxf/sandbox/dosgi/systests/basic/src/test/resources/OSGI-INF/remote-services/remote-services.xml
 (original)
+++ 
cxf/sandbox/dosgi/systests/basic/src/test/resources/OSGI-INF/remote-services/remote-services.xml
 Thu Dec 11 06:20:13 2008
@@ -15,17 +15,17 @@
   -->
 <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0";>
   <service-description>
-    <interface name="org.apache.cxf.dosgi.samples.pojo.hello.HelloService" />
-    <property key="osgi.remote.interfaces">*</property>
-    <property key="osgi.remote.requires.intents">SOAP HTTP</property>
-    <property key="osgi.remote.configuration.type">pojo</property>
-    <property 
key="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
+    <provide interface="org.apache.cxf.dosgi.samples.pojo.hello.HelloService" 
/>
+    <property name="osgi.remote.interfaces">*</property>
+    <property name="osgi.remote.requires.intents">SOAP HTTP</property>
+    <property name="osgi.remote.configuration.type">pojo</property>
+    <property 
name="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
   </service-description>
   <service-description>
-    <interface name="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService" />
-    <property key="osgi.remote.interfaces">*</property>
-    <property key="osgi.remote.requires.intents">SOAP HTTP</property>
-    <property key="osgi.remote.configuration.type">pojo</property>
-    <property 
key="osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
+    <provide 
interface="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService" />
+    <property name="osgi.remote.interfaces">*</property>
+    <property name="osgi.remote.requires.intents">SOAP HTTP</property>
+    <property name="osgi.remote.configuration.type">pojo</property>
+    <property 
name="osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
   </service-description>
 </service-descriptions>

svn commit: r725695 - in /cxf/sandbox/dosgi: discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/ discovery/local/src/test/resources/ dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/ dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/...

Reply via email to