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/17 15:47:53 UTC
svn commit: r696293 - in /cxf/sandbox/dosgi:
discovery/local/src/test/resources/
dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/
dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/
dsw/cxf-dsw/src/test/resources/META-INF/osgi/ samples/gree...
Author: eglynn
Date: Wed Sep 17 06:47:52 2008
New Revision: 696293
URL: http://svn.apache.org/viewvc?rev=696293&view=rev
Log:
Applying patch for CXF-1799 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/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.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/java/org/apache/cxf/dosgi/samples/greeter/impl/Activator.java
cxf/sandbox/dosgi/samples/greeter/impl/src/main/resources/META-INF/osgi/remote-services.xml
cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/java/org/apache/cxf/dosgi/samples/pojo/hello/client/Activator.java
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/java/org/apache/cxf/dosgi/samples/pojo/hello/impl/Activator.java
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=696293&r1=696292&r2=696293&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 Wed Sep 17 06:47:52 2008
@@ -24,13 +24,13 @@
<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.address">http://localhost:9005/greeter</property>
+<property name="org.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.address">http://localhost:10000/greeter</property>
+<property name="org.osgi.remote.configuration.pojo.address">http://localhost:10000/greeter</property>
</reference>
-</remote-references>
\ No newline at end of file
+</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=696293&r1=696292&r2=696293&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 Wed Sep 17 06:47:52 2008
@@ -20,27 +20,36 @@
public class Constants {
+
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 CONFIG_TYPE_PROPERTY = REMOTE_PROPERTY_PREFIX + ".configuration.type";
+ public static final String CONFIGURATION_PROPERTY = ".configuration";
+
+ public static final String CONFIG_TYPE_PROPERTY =
+ REMOTE_PROPERTY_PREFIX + CONFIGURATION_PROPERTY + ".type";
// TODO : these config type properties should better be enums ?
// SCA
public static final String SCA_CONFIG_TYPE = "sca";
- public static final String SCA_REMOTE_BINDINGS = REMOTE_PROPERTY_PREFIX + ".bindings";
- public static final String SCA_REMOTE_POLICIES = REMOTE_PROPERTY_PREFIX + ".policies";
+ public static final String SCA_CONFIG_PREFIX =
+ REMOTE_PROPERTY_PREFIX + CONFIGURATION_PROPERTY + ".sca";
+ public static final String SCA_REMOTE_BINDINGS = SCA_CONFIG_PREFIX + ".bindings";
+ public static final String SCA_REMOTE_POLICIES = SCA_CONFIG_PREFIX + ".policies";
// WSDL
public static final String WSDL_CONFIG_TYPE = "wsdl";
- public static final String WSDL_ADDRESS = REMOTE_PROPERTY_PREFIX + ".wsdl";
- public static final String SERVICE_NAMESPACE = REMOTE_PROPERTY_PREFIX + ".service.ns";
+ public static final String WSDL_CONFIG_PREFIX =
+ REMOTE_PROPERTY_PREFIX + CONFIGURATION_PROPERTY + ".wsdl";
+ public static final String SERVICE_NAMESPACE = WSDL_CONFIG_PREFIX + ".service.ns";
// POJO
public static final String POJO_CONFIG_TYPE = "pojo";
- public static final String POJO_ADDRESS_PROPERTY = REMOTE_PROPERTY_PREFIX + ".address";
+ public static final String POJO_CONFIG_PREFIX =
+ REMOTE_PROPERTY_PREFIX + CONFIGURATION_PROPERTY + ".pojo";
+ public static final String POJO_ADDRESS_PROPERTY = POJO_CONFIG_PREFIX + ".address";
// Common Configuration Properties
public static final String CHECK_BUNDLE = "check.bundle";
Modified: cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java?rev=696293&r1=696292&r2=696293&view=diff
==============================================================================
--- cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java (original)
+++ cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java Wed Sep 17 06:47:52 2008
@@ -61,7 +61,7 @@
}
LOG.info("Creating a " + sd.getInterfaceName() + " client, wsdl address is "
- + OsgiUtils.getProperty(sd, Constants.WSDL_ADDRESS));
+ + OsgiUtils.getProperty(sd, Constants.WSDL_CONFIG_PREFIX));
String serviceNs = OsgiUtils.getProperty(sd, Constants.SERVICE_NAMESPACE);
if (serviceNs == null) {
@@ -85,7 +85,7 @@
}
private String getWsdlAddress(ServiceDescription sd, Class<?> iClass) {
- String address = OsgiUtils.getProperty(sd, Constants.WSDL_ADDRESS);
+ String address = OsgiUtils.getProperty(sd, Constants.WSDL_CONFIG_PREFIX);
if (address == null) {
address = getDefaultAddress(iClass);
if (address != null) {
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=696293&r1=696292&r2=696293&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 Wed Sep 17 06:47:52 2008
@@ -25,6 +25,6 @@
<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.address">http://localhost:9000/hello</property>
+<property name="org.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=696293&r1=696292&r2=696293&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 Wed Sep 17 06:47:52 2008
@@ -25,6 +25,6 @@
<!--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.address">http://localhost:9090/greeter</property>
+<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9090/greeter</property>
</reference>
</remote-references>
Modified: cxf/sandbox/dosgi/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/Activator.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/Activator.java?rev=696293&r1=696292&r2=696293&view=diff
==============================================================================
--- cxf/sandbox/dosgi/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/Activator.java (original)
+++ cxf/sandbox/dosgi/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/Activator.java Wed Sep 17 06:47:52 2008
@@ -36,7 +36,7 @@
Dictionary props = new Hashtable();
props.put("org.osgi.remote.publish", true);
- props.put("org.osgi.remote.address", "http://localhost:9090/greeter");
+ props.put("org.osgi.remote.configuration.pojo.address", "http://localhost:9090/greeter");
// props.put("org.osgi.remote.intents", "SOAP HTTP");
// props.put("org.osgi.remote.configuration.type", "pojo");
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=696293&r1=696292&r2=696293&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 Wed Sep 17 06:47:52 2008
@@ -24,6 +24,6 @@
<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.address">http://localhost:9090/greeter</property>
+<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9090/greeter</property>
</reference>
</remote-references>
Modified: cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/java/org/apache/cxf/dosgi/samples/pojo/hello/client/Activator.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/java/org/apache/cxf/dosgi/samples/pojo/hello/client/Activator.java?rev=696293&r1=696292&r2=696293&view=diff
==============================================================================
--- cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/java/org/apache/cxf/dosgi/samples/pojo/hello/client/Activator.java (original)
+++ cxf/sandbox/dosgi/samples/simple_pojo/client/src/main/java/org/apache/cxf/dosgi/samples/pojo/hello/client/Activator.java Wed Sep 17 06:47:52 2008
@@ -54,7 +54,7 @@
private static final String SERVICE_HELLO = "hello";
private static final String SERVICE_GREETER1 = "greeter1";
- private static final String REMOTE_ADDRESS_PROPERTY = "org.osgi.remote.address";
+ private static final String REMOTE_ADDRESS_PROPERTY = "org.osgi.remote.configuration.pojo.address";
private static final String GREETER1_ADDRESS_PROPERTY = "http://localhost:10000/greeter";
private volatile BundleContext bc;
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=696293&r1=696292&r2=696293&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 Wed Sep 17 06:47:52 2008
@@ -31,6 +31,6 @@
<property name="org.osgi.remote.intents">SOAP HTTP</property>
<property name="org.osgi.remote.configuration.type">pojo</property>
-<property name="org.osgi.remote.address">http://localhost:9000/hello</property>
+<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9000/hello</property>
</reference>
</remote-references>
Modified: cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/java/org/apache/cxf/dosgi/samples/pojo/hello/impl/Activator.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/java/org/apache/cxf/dosgi/samples/pojo/hello/impl/Activator.java?rev=696293&r1=696292&r2=696293&view=diff
==============================================================================
--- cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/java/org/apache/cxf/dosgi/samples/pojo/hello/impl/Activator.java (original)
+++ cxf/sandbox/dosgi/samples/simple_pojo/impl/src/main/java/org/apache/cxf/dosgi/samples/pojo/hello/impl/Activator.java Wed Sep 17 06:47:52 2008
@@ -48,7 +48,7 @@
private static final String USE_KEY = "use";
private static final String SERVICE_GREETER1 = "greeter1";
- private static final String REMOTE_ADDRESS_PROPERTY = "org.osgi.remote.address";
+ private static final String REMOTE_ADDRESS_PROPERTY = "org.osgi.remote.configuration.pojo.address";
private static final String GREETER1_ADDRESS_PROPERTY = "http://localhost:10000/greeter";
private volatile BundleContext bc;
/**
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=696293&r1=696292&r2=696293&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 Wed Sep 17 06:47:52 2008
@@ -31,13 +31,13 @@
<property name="org.osgi.remote.intents">SOAP HTTP</property>
<property name="org.osgi.remote.configuration.type">pojo</property>
-<property name="org.osgi.remote.address">http://localhost:9000/hello</property>
+<property name="org.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.address">http://localhost:9005/greeter</property>
+<property name="org.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=696293&r1=696292&r2=696293&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 Wed Sep 17 06:47:52 2008
@@ -24,13 +24,13 @@
<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.address">http://localhost:9000/hello</property>
+<property name="org.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.address">http://localhost:9005/greeter</property>
+<property name="org.osgi.remote.configuration.pojo.address">http://localhost:9005/greeter</property>
</reference>
</remote-references>