cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r698939 - 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/resources/META-INF/osgi/ sampl...
Date Thu, 25 Sep 2008 12:13:41 GMT
Author: sergeyb
Date: Thu Sep 25 05:13:40 2008
New Revision: 698939

URL: http://svn.apache.org/viewvc?rev=698939&view=rev
Log:
CXF-1815 : Applying a patch on behalf of David Bosschaert

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/resources/META-INF/osgi/remote-services.xml
    cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/META-INF/osgi/remote-services.xml
    cxf/sandbox/dosgi/samples/greeter/impl/src/main/resources/META-INF/osgi/remote-services.xml
    cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/resources/META-INF/osgi/remote-services.xml
    cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/resources/META-INF/osgi/remote-services.xml
    cxf/sandbox/dosgi/systests/basic/src/test/resources/META-INF/osgi/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=698939&r1=698938&r2=698939&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 Sep 25 05:13:40 2008
@@ -60,11 +60,15 @@
     private static final String REMOTE_SERVICES_ENTRY = 
         "/META-INF/osgi/remote-services.xml";
     private static final String REMOTE_SERVICES_NS =
-        "http://www.osgi.org/xmlns/rs/v1.0.0";
+        "http://www.osgi.org/xmlns/sd/v1.0.0";    
     
+    private static final String SERVICE_DESCRIPTION_ELEMENT = "service-description";
     
-    private static final String NAME_ATTRIBUTE = "name";
-    private static final String INTERFACE_ATTRIBUTE = "interface";
+    private static final String PROVIDE_INTERFACE_ELEMENT = "interface";
+    private static final String PROVIDE_INTERFACE_NAME_ATTRIBUTE = "name";
+
+    private static final String PROPERTY_ELEMENT = "property";
+    private static final String PROPERTY_KEY_ATTRIBUTE = "key";
     
     // TODO : these properties should be configurable
     private static final long ASYNC_WAIT_TIME = 5000L;
@@ -279,18 +283,18 @@
 
         Document d = new SAXBuilder().build(is);
         Namespace ns = Namespace.getNamespace(REMOTE_SERVICES_NS);
-        List<Element> references = d.getRootElement().getChildren("reference", ns);
+        List<Element> references = d.getRootElement().getChildren(SERVICE_DESCRIPTION_ELEMENT,
ns);
         
         servicesInfo.clear();
         
         for (Element ref : references) {
-            List<String> iNames = getInterfaceNames(ref.getChildren("provide", ns));
+            List<String> iNames = getInterfaceNames(ref.getChildren(PROVIDE_INTERFACE_ELEMENT,
ns));
             if (iNames.isEmpty()) {
                 continue;
             }
             
             ServiceDescription sd = new ServiceDescriptionImpl(iNames,  
-                          getProperties(ref.getChildren("property", ns)));
+                          getProperties(ref.getChildren(PROPERTY_ELEMENT, ns)));
             servicesInfo.putIfAbsent(sd, sd);
         }
         
@@ -301,7 +305,7 @@
         Map<String, Object> props = new HashMap<String, Object>();
         
         for (Element p : elementProps) {
-            String key = p.getAttributeValue(NAME_ATTRIBUTE);
+            String key = p.getAttributeValue(PROPERTY_KEY_ATTRIBUTE);
             if (key != null) {
                 props.put(key, p.getTextTrim());
             }
@@ -315,7 +319,7 @@
         List<String> names = new ArrayList<String>();
         
         for (Element p : elements) {
-            String name = p.getAttributeValue(INTERFACE_ATTRIBUTE);
+            String name = p.getAttributeValue(PROVIDE_INTERFACE_NAME_ATTRIBUTE);
             if (name != null) {
                 names.add(name);
             }

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=698939&r1=698938&r2=698939&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 Sep 25 05:13:40
2008
@@ -1,36 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<remote-references xmlns="http://www.osgi.org/xmlns/rs/v1.0.0">
-<reference>
-<provide interface="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService"/>
-<property name="osgi.remote.publish.interfaces">true</property>
-<property name="osgi.remote.publish.intents">SOAP HTTP</property>
-<property name="osgi.remote.configuration.type">pojo</property>
-<property name="osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
-</reference>
-<reference>
-<provide interface="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService"/>
-<property name="osgi.remote.publish.interfaces">true</property>
-<property name="osgi.remote.publish.intents">SOAP HTTP</property>
-<property name="osgi.remote.configuration.type">pojo</property>
-<property name="osgi.remote.configuration.pojo.address">http://localhost:10000/greeter</property>
-</reference>
-</remote-references>
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to you under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under
+    the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+    OR CONDITIONS OF ANY KIND, either express or implied. See the
+    License for the specific language governing permissions and
+    limitations under the License.
+  -->
+<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.publish.interfaces">true</property>
+    <property key="osgi.remote.publish.intents">SOAP HTTP</property>
+    <property key="osgi.remote.configuration.type">pojo</property>
+    <property key="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.publish.interfaces">true</property>
+    <property key="osgi.remote.publish.intents">SOAP HTTP</property>
+    <property key="osgi.remote.configuration.type">pojo</property>
+    <property key="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=698939&r1=698938&r2=698939&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
Sep 25 05:13:40 2008
@@ -54,12 +54,17 @@
     private static final String REMOTE_SERVICES_ENTRY = 
         "/META-INF/osgi/remote-services.xml";
     private static final String REMOTE_SERVICES_NS =
-        "http://www.osgi.org/xmlns/rs/v1.0.0";
+        "http://www.osgi.org/xmlns/sd/v1.0.0";
     
     static final String[] INTENT_MAP = {"/META-INF/osgi/intent-map.xml"};
     
-    private static final String PROPERTY_NAME_ATTRIBUTE = "name";
-    private static final String PROVIDE_INTERFACE_ATTRIBUTE = "interface";
+    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 PROPERTY_ELEMENT = "property";
+    private static final String PROPERTY_KEY_ATTRIBUTE = "key";
     
     private OsgiUtils() {
     }
@@ -101,12 +106,12 @@
         List<ServiceDescription> srefs = new ArrayList<ServiceDescription>();
         Namespace ns = Namespace.getNamespace(REMOTE_SERVICES_NS);
         for (Element ref : references) {
-            List<String> iNames = getInterfaceNames(ref.getChildren("provide", ns));
+            List<String> iNames = getInterfaceNames(ref.getChildren(PROVIDE_INTERFACE_ELEMENT,
ns));
             if (!serviceNamesMatch(names, iNames, matchAllNames)) {
                 continue;
             }
 
-            Map<String, Object> remoteProps = getProperties(ref.getChildren("property",
ns));
+            Map<String, Object> remoteProps = getProperties(ref.getChildren(PROPERTY_ELEMENT,
ns));
             remoteProps.putAll(userProperties);
             srefs.add(new ServiceDescriptionImpl(iNames, remoteProps));
             
@@ -123,8 +128,8 @@
         List<ServiceDescription> srefs = new ArrayList<ServiceDescription>();
         Namespace ns = Namespace.getNamespace(REMOTE_SERVICES_NS);
         for (Element ref : references) {
-            List<String> iNames = getInterfaceNames(ref.getChildren("provide", ns));
-            Map<String, Object> remoteProps = getProperties(ref.getChildren("property",
ns));
+            List<String> iNames = getInterfaceNames(ref.getChildren(PROVIDE_INTERFACE_ELEMENT,
ns));
+            Map<String, Object> remoteProps = getProperties(ref.getChildren(PROPERTY_ELEMENT,
ns));
             srefs.add(new ServiceDescriptionImpl(iNames, remoteProps));
         }
         return srefs;
@@ -139,7 +144,7 @@
                 Document d = new SAXBuilder().build(resourceURL.openStream());
                 Namespace ns = Namespace.getNamespace(REMOTE_SERVICES_NS);
                 
-                return d.getRootElement().getChildren("reference", ns);
+                return d.getRootElement().getChildren(SERVICE_DESCRIPTION_ELEMENT, ns);
             } catch (Exception ex) {
                 System.out.println("Problem parsing remote-services.xml :" 
                                    + ex.getMessage());
@@ -222,7 +227,7 @@
         Map<String, Object> props = new HashMap<String, Object>();
         
         for (Element p : elements) {
-            String key = p.getAttributeValue(PROPERTY_NAME_ATTRIBUTE);
+            String key = p.getAttributeValue(PROPERTY_KEY_ATTRIBUTE);
             if (key != null) {
                 props.put(key, p.getTextTrim());
             }
@@ -236,7 +241,7 @@
         List<String> names = new ArrayList<String>();
         
         for (Element p : elements) {
-            String name = p.getAttributeValue(PROVIDE_INTERFACE_ATTRIBUTE);
+            String name = p.getAttributeValue(PROVIDE_INTERFACE_NAME_ATTRIBUTE);
             if (name != null) {
                 names.add(name);
             }

Modified: cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/META-INF/osgi/remote-services.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/META-INF/osgi/remote-services.xml?rev=698939&r1=698938&r2=698939&view=diff
==============================================================================
--- cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/META-INF/osgi/remote-services.xml (original)
+++ cxf/sandbox/dosgi/dsw/cxf-dsw/src/test/resources/META-INF/osgi/remote-services.xml Thu
Sep 25 05:13:40 2008
@@ -19,12 +19,12 @@
   under the License.
 -->
 
-<remote-references xmlns="http://www.osgi.org/xmlns/rs/v1.0.0">
-<reference>
-<provide interface="org.apache.cxf.dosgi.dsw.hooks.TestService"/>
-<property name="osgi.remote.publish.interfaces">true</property>
-<property name="osgi.remote.publish.intents">SOAP HTTP</property>
-<property name="osgi.remote.configuration.type">pojo</property>
-<property name="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
-</reference>
-</remote-references>
+<service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0">
+  <service-description>
+    <interface name="org.apache.cxf.dosgi.dsw.hooks.TestService" />
+    <property key="osgi.remote.publish.interfaces">true</property>
+    <property key="osgi.remote.publish.intents">SOAP HTTP</property>
+    <property key="osgi.remote.configuration.type">pojo</property>
+    <property key="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
+  </service-description>
+</service-descriptions>

Modified: cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/META-INF/osgi/remote-services.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/META-INF/osgi/remote-services.xml?rev=698939&r1=698938&r2=698939&view=diff
==============================================================================
--- cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/META-INF/osgi/remote-services.xml
(original)
+++ cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/META-INF/osgi/remote-services.xml
Thu Sep 25 05:13:40 2008
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<remote-references xmlns="http://www.osgi.org/xmlns/rs/v1.0.0">
-<reference>
-<provide interface="org.apache.cxf.dosgi.samples.greeter.GreeterService"/>
-<property name="osgi.remote.publish.interfaces">true</property>
-<!--property name="osgi.remote.publish.intents">reliability decoupled SOAP HTTP</property-->
-<property name="osgi.remote.publish.intents">SOAP HTTP</property>
-<property name="osgi.remote.configuration.type">pojo</property>
-<property name="osgi.remote.configuration.pojo.address">http://localhost:9090/greeter</property>
-</reference>
-</remote-references>
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to you under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under
+    the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+    OR CONDITIONS OF ANY KIND, either express or implied. See the
+    License for the specific language governing permissions and
+    limitations under the License.
+  -->
+<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.publish.interfaces">true</property>
+    <!--
+      property name="osgi.remote.publish.intents">reliability decoupled
+      SOAP HTTP</property
+    -->
+    <property key="osgi.remote.publish.intents">SOAP HTTP</property>
+    <property key="osgi.remote.configuration.type">pojo</property>
+    <property key="osgi.remote.configuration.pojo.address">http://localhost:9090/greeter</property>
+  </service-description>
+</service-descriptions>

Modified: cxf/sandbox/dosgi/samples/greeter/impl/src/main/resources/META-INF/osgi/remote-services.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/greeter/impl/src/main/resources/META-INF/osgi/remote-services.xml?rev=698939&r1=698938&r2=698939&view=diff
==============================================================================
--- cxf/sandbox/dosgi/samples/greeter/impl/src/main/resources/META-INF/osgi/remote-services.xml
(original)
+++ cxf/sandbox/dosgi/samples/greeter/impl/src/main/resources/META-INF/osgi/remote-services.xml
Thu Sep 25 05:13:40 2008
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<remote-references xmlns="http://www.osgi.org/xmlns/rs/v1.0.0">
-<reference>
-<provide interface="org.apache.cxf.dosgi.samples.greeter.GreeterService"/>
-<property name="osgi.remote.publish.interfaces">true</property>
-<property name="osgi.remote.publish.intents">SOAP HTTP</property>
-<property name="osgi.remote.configuration.type">pojo</property>
-<property name="osgi.remote.configuration.pojo.address">http://localhost:9090/greeter</property>
-</reference>
-</remote-references>
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to you under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under
+    the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+    OR CONDITIONS OF ANY KIND, either express or implied. See the
+    License for the specific language governing permissions and
+    limitations under the License.
+  -->
+<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.publish.interfaces">true</property>
+    <property key="osgi.remote.publish.intents">SOAP HTTP</property>
+    <property key="osgi.remote.configuration.type">pojo</property>
+    <property key="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/META-INF/osgi/remote-services.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/resources/META-INF/osgi/remote-services.xml?rev=698939&r1=698938&r2=698939&view=diff
==============================================================================
--- cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/resources/META-INF/osgi/remote-services.xml
(original)
+++ cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/resources/META-INF/osgi/remote-services.xml
Thu Sep 25 05:13:40 2008
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<remote-references xmlns="http://www.osgi.org/xmlns/rs/v1.0.0">
-<reference>
-<provide interface="org.apache.cxf.dosgi.samples.pojo.hello.HelloService"/>
-<property name="osgi.remote.publish.interfaces">true</property>
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to you under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under
+    the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+    OR CONDITIONS OF ANY KIND, either express or implied. See the
+    License for the specific language governing permissions and
+    limitations under the License.
+  -->
+<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.publish.interfaces">true</property>
 
 <!-- Uncomment to enable SOAP 1.2 and confirm via message logging -->
-<!--property name="osgi.remote.publish.intents">logging SOAP.1_2 HTTP</property-->
+    <!--
+      property name="osgi.remote.publish.intents">logging SOAP.1_2
+      HTTP</property
+    -->
 
 <!-- Uncomment to enable WS-RM and confirm via message logging -->
-<!--property name="osgi.remote.publish.intents">logging reliability SOAP HTTP</property-->
-
-<property name="osgi.remote.publish.intents">SOAP HTTP</property>
-<property name="osgi.remote.configuration.type">pojo</property>
-<property name="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
-</reference>
-</remote-references>
+    <!--
+      property name="osgi.remote.publish.intents">logging reliability
+      SOAP HTTP</property
+    -->
+    <property key="osgi.remote.publish.intents">SOAP HTTP</property>
+    <property key="osgi.remote.configuration.type">pojo</property>
+    <property key="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/META-INF/osgi/remote-services.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/resources/META-INF/osgi/remote-services.xml?rev=698939&r1=698938&r2=698939&view=diff
==============================================================================
--- cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/resources/META-INF/osgi/remote-services.xml
(original)
+++ cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/resources/META-INF/osgi/remote-services.xml
Thu Sep 25 05:13:40 2008
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<remote-references xmlns="http://www.osgi.org/xmlns/rs/v1.0.0">
-<reference>
-<provide interface="org.apache.cxf.dosgi.samples.pojo.hello.HelloService"/>
-<property name="osgi.remote.publish.interfaces">true</property>
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to you under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under
+    the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+    OR CONDITIONS OF ANY KIND, either express or implied. See the
+    License for the specific language governing permissions and
+    limitations under the License.
+  -->
+<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.publish.interfaces">true</property>
 
 <!-- Uncomment to enable SOAP 1.2 and confirm via message logging -->
-<!--property name="osgi.remote.publish.intents">logging SOAP.1_2 HTTP</property-->
+    <!--
+      property name="osgi.remote.publish.intents">logging SOAP.1_2
+      HTTP</property
+    -->
 
 <!-- Uncomment to enable WS-RM and confirm via message logging -->
-<!--property name="osgi.remote.publish.intents">logging reliability SOAP HTTP</property-->
-
-<property name="osgi.remote.publish.intents">SOAP HTTP</property>
-<property name="osgi.remote.configuration.type">pojo</property>
-<property name="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
-</reference>
-<reference>
-<provide interface="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService"/>
-<property name="osgi.remote.publish.interfaces">true</property>
-<property name="osgi.remote.publish.intents">SOAP HTTP</property>
-<property name="osgi.remote.configuration.type">pojo</property>
-<property name="osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
-</reference>
-</remote-references>
+    <!--
+      property name="osgi.remote.publish.intents">logging reliability
+      SOAP HTTP</property
+    -->
+    <property key="osgi.remote.publish.intents">SOAP HTTP</property>
+    <property key="osgi.remote.configuration.type">pojo</property>
+    <property key="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.publish.interfaces">true</property>
+    <property key="osgi.remote.publish.intents">SOAP HTTP</property>
+    <property key="osgi.remote.configuration.type">pojo</property>
+    <property key="osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
+  </service-description>
+</service-descriptions>

Modified: cxf/sandbox/dosgi/systests/basic/src/test/resources/META-INF/osgi/remote-services.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/basic/src/test/resources/META-INF/osgi/remote-services.xml?rev=698939&r1=698938&r2=698939&view=diff
==============================================================================
--- cxf/sandbox/dosgi/systests/basic/src/test/resources/META-INF/osgi/remote-services.xml
(original)
+++ cxf/sandbox/dosgi/systests/basic/src/test/resources/META-INF/osgi/remote-services.xml
Thu Sep 25 05:13:40 2008
@@ -1,36 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<remote-references xmlns="http://www.osgi.org/xmlns/rs/v1.0.0">
-<reference>
-<provide interface="org.apache.cxf.dosgi.samples.pojo.hello.HelloService"/>
-<property name="osgi.remote.publish.interfaces">true</property>
-<property name="osgi.remote.publish.intents">SOAP HTTP</property>
-<property name="osgi.remote.configuration.type">pojo</property>
-<property name="osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
-</reference>
-<reference>
-<provide interface="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService"/>
-<property name="osgi.remote.publish.interfaces">true</property>
-<property name="osgi.remote.publish.intents">SOAP HTTP</property>
-<property name="osgi.remote.configuration.type">pojo</property>
-<property name="osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
-</reference>
-</remote-references>
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to you under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under
+    the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+    OR CONDITIONS OF ANY KIND, either express or implied. See the
+    License for the specific language governing permissions and
+    limitations under the License.
+  -->
+<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.publish.interfaces">true</property>
+    <property key="osgi.remote.publish.intents">SOAP HTTP</property>
+    <property key="osgi.remote.configuration.type">pojo</property>
+    <property key="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.publish.interfaces">true</property>
+    <property key="osgi.remote.publish.intents">SOAP HTTP</property>
+    <property key="osgi.remote.configuration.type">pojo</property>
+    <property key="osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
+  </service-description>
+</service-descriptions>



Mime
View raw message