You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by eg...@apache.org on 2008/09/23 12:17:05 UTC
svn commit: r698120 - in /cxf/sandbox/dosgi:
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/
samples/greeter/client/src/main/resources/META-INF/osgi/ samples/greeter/...
Author: eglynn
Date: Tue Sep 23 03:17:04 2008
New Revision: 698120
URL: http://svn.apache.org/viewvc?rev=698120&view=rev
Log:
Applying patch for CXF-1811 on behalf of David Bosschaert.
Modified:
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/Constants.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/test/resources/remote-services.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/discovery/local/src/test/resources/remote-services.xml?rev=698120&r1=698119&r2=698120&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 Tue Sep 23 03:17:04 2008
@@ -21,16 +21,16 @@
<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="org.osgi.remote.publish">true</property>
-<property name="org.osgi.remote.intents">SOAP HTTP</property>
-<property name="org.osgi.remote.configuration.type">pojo</property>
-<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
+<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="org.osgi.remote.publish">true</property>
-<property name="org.osgi.remote.intents">SOAP HTTP</property>
-<property name="org.osgi.remote.configuration.type">pojo</property>
-<property name="org.osgi.remote.configuration.pojo.address">http://localhost:10000/greeter</property>
+<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>
Modified: cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java?rev=698120&r1=698119&r2=698120&view=diff
==============================================================================
--- cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java (original)
+++ cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java Tue Sep 23 03:17:04 2008
@@ -19,12 +19,10 @@
package org.apache.cxf.dosgi.dsw;
public class Constants {
+ public static final String REMOTE_PROPERTY_PREFIX = "osgi.remote";
-
- public static final String REMOTE_PROPERTY_PREFIX = "org.osgi.remote";
-
- public static final String PUBLISH_PROPERTY = REMOTE_PROPERTY_PREFIX + ".publish";
- public static final String INTENTS_PROPERTY = REMOTE_PROPERTY_PREFIX + ".intents";
+ public static final String PUBLISH_PROPERTY = REMOTE_PROPERTY_PREFIX + ".publish.interfaces";
+ public static final String INTENTS_PROPERTY = REMOTE_PROPERTY_PREFIX + ".publish.intents";
public static final String CONFIGURATION_PROPERTY = ".configuration";
public static final String CONFIG_TYPE_PROPERTY =
@@ -59,7 +57,6 @@
public static final String DEFAULT_HOST_VALUE = "localhost";
public final static String USE_MASTER_MAP = "use.master.map";
- // DSW Identification
- public static final String DSW_CLIENT_ID = "org.osgi.remote.dsw.client";
- public static final String DSW_SERVER_ID = "org.osgi.remote.dsw.server";
+ // DSW Identification - TODO do we really need this one?
+ public static final String DSW_CLIENT_ID = "org.apache.cxf.remote.dsw.client";
}
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=698120&r1=698119&r2=698120&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 Tue Sep 23 03:17:04 2008
@@ -22,9 +22,9 @@
<remote-references xmlns="http://www.osgi.org/xmlns/rs/v1.0.0">
<reference>
<provide interface="org.apache.cxf.dosgi.dsw.hooks.TestService"/>
-<property name="org.osgi.remote.publish">true</property>
-<property name="org.osgi.remote.intents">SOAP HTTP</property>
-<property name="org.osgi.remote.configuration.type">pojo</property>
-<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
+<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>
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=698120&r1=698119&r2=698120&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 Tue Sep 23 03:17:04 2008
@@ -21,10 +21,10 @@
<remote-references xmlns="http://www.osgi.org/xmlns/rs/v1.0.0">
<reference>
<provide interface="org.apache.cxf.dosgi.samples.greeter.GreeterService"/>
-<property name="org.osgi.remote.publish">true</property>
-<!--property name="org.osgi.remote.intents">reliability decoupled SOAP HTTP</property-->
-<property name="org.osgi.remote.intents">SOAP HTTP</property>
-<property name="org.osgi.remote.configuration.type">pojo</property>
-<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9090/greeter</property>
+<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>
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=698120&r1=698119&r2=698120&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 Tue Sep 23 03:17:04 2008
@@ -21,9 +21,9 @@
<remote-references xmlns="http://www.osgi.org/xmlns/rs/v1.0.0">
<reference>
<provide interface="org.apache.cxf.dosgi.samples.greeter.GreeterService"/>
-<property name="org.osgi.remote.publish">true</property>
-<property name="org.osgi.remote.intents">SOAP HTTP</property>
-<property name="org.osgi.remote.configuration.type">pojo</property>
-<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9090/greeter</property>
+<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>
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=698120&r1=698119&r2=698120&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 Tue Sep 23 03:17:04 2008
@@ -21,16 +21,16 @@
<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="org.osgi.remote.publish">true</property>
+<property name="osgi.remote.publish.interfaces">true</property>
<!-- Uncomment to enable SOAP 1.2 and confirm via message logging -->
-<!--property name="org.osgi.remote.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="org.osgi.remote.intents">logging reliability SOAP HTTP</property-->
+<!--property name="osgi.remote.publish.intents">logging reliability SOAP HTTP</property-->
-<property name="org.osgi.remote.intents">SOAP HTTP</property>
-<property name="org.osgi.remote.configuration.type">pojo</property>
-<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9000/hello</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>
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=698120&r1=698119&r2=698120&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 Tue Sep 23 03:17:04 2008
@@ -21,23 +21,23 @@
<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="org.osgi.remote.publish">true</property>
+<property name="osgi.remote.publish.interfaces">true</property>
<!-- Uncomment to enable SOAP 1.2 and confirm via message logging -->
-<!--property name="org.osgi.remote.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="org.osgi.remote.intents">logging reliability SOAP HTTP</property-->
+<!--property name="osgi.remote.publish.intents">logging reliability SOAP HTTP</property-->
-<property name="org.osgi.remote.intents">SOAP HTTP</property>
-<property name="org.osgi.remote.configuration.type">pojo</property>
-<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9000/hello</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="org.osgi.remote.publish">true</property>
-<property name="org.osgi.remote.intents">SOAP HTTP</property>
-<property name="org.osgi.remote.configuration.type">pojo</property>
-<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
+<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>
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=698120&r1=698119&r2=698120&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 Tue Sep 23 03:17:04 2008
@@ -21,16 +21,16 @@
<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="org.osgi.remote.publish">true</property>
-<property name="org.osgi.remote.intents">SOAP HTTP</property>
-<property name="org.osgi.remote.configuration.type">pojo</property>
-<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
+<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="org.osgi.remote.publish">true</property>
-<property name="org.osgi.remote.intents">SOAP HTTP</property>
-<property name="org.osgi.remote.configuration.type">pojo</property>
-<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
+<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>