Author: sergeyb
Date: Mon Oct 20 02:13:23 2008
New Revision: 706161
URL: http://svn.apache.org/viewvc?rev=706161&view=rev
Log:
DOSGI : applying a patch for CXF-1873 on behalf of David B.
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/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/rs2.xml
cxf/sandbox/dosgi/samples/greeter/client/src/main/resources/OSGI-INF/remote-services/remote-services.xml
cxf/sandbox/dosgi/samples/greeter/impl/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/systests/basic/src/test/resources/OSGI-INF/remote-services/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=706161&r1=706160&r2=706161&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
Mon Oct 20 02:13:23 2008
@@ -16,14 +16,14 @@
<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">*</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:9005/greeter</property>
</service-description>
<service-description>
<interface name="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService" />
- <property key="osgi.remote.publish.interfaces">*</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:10000/greeter</property>
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=706161&r1=706160&r2=706161&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
Mon Oct 20 02:13:23 2008
@@ -23,7 +23,7 @@
public static final String REMOTE_PROPERTY_PREFIX = "osgi.remote";
- public static final String REMOTE_INTERFACES_PROPERTY =
REMOTE_PROPERTY_PREFIX + ".publish.interfaces";
+ public static final String REMOTE_INTERFACES_PROPERTY =
REMOTE_PROPERTY_PREFIX + ".interfaces";
public static final String REQUIRES_INTENTS_PROPERTY =
REMOTE_PROPERTY_PREFIX + ".requires.intents";
public static final String CONFIGURATION_PROPERTY = ".configuration";
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=706161&r1=706160&r2=706161&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
Mon Oct 20 02:13:23 2008
@@ -23,7 +23,7 @@
<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.publish.interfaces">org.apache.cxf.dosgi.dsw.hooks.TestService,org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface</property>
+ <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"
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=706161&r1=706160&r2=706161&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
Mon Oct 20 02:13:23 2008
@@ -23,8 +23,8 @@
<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.publish.interfaces">org.apache.cxf.dosgi.dsw.hooks.TestService,org.apache.cxf.dosgi.dsw.hooks.CxfPublishHookTest$AdditionalInterface</property-->
- <property key="osgi.remote.publish.interfaces">*</property>
+ <!--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>
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=706161&r1=706160&r2=706161&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 Mon
Oct 20 02:13:23 2008
@@ -23,6 +23,6 @@
<service-description>
<interface name="org.example.Service" />
<property key="osgi.intents">confidentiality.message integrity</property>
- <property key="osgi.remote.publish.interfaces">*</property>
+ <property key="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=706161&r1=706160&r2=706161&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
Mon Oct 20 02:13:23 2008
@@ -16,7 +16,7 @@
<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">*</property>
+ <property key="osgi.remote.interfaces">*</property>
<property key="osgi.remote.requires.intents">SOAP HTTP</property>
<!--
property name="osgi.remote.requires.intents">reliability decoupled
Modified:
cxf/sandbox/dosgi/samples/greeter/impl/src/main/resources/OSGI-INF/remote-services/remote-services.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/greeter/impl/src/main/resources/OSGI-INF/remote-services/remote-services.xml?rev=706161&r1=706160&r2=706161&view=diff
==============================================================================
---
cxf/sandbox/dosgi/samples/greeter/impl/src/main/resources/OSGI-INF/remote-services/remote-services.xml
(original)
+++
cxf/sandbox/dosgi/samples/greeter/impl/src/main/resources/OSGI-INF/remote-services/remote-services.xml
Mon Oct 20 02:13:23 2008
@@ -16,7 +16,7 @@
<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">*</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:9090/greeter</property>
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=706161&r1=706160&r2=706161&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
Mon Oct 20 02:13:23 2008
@@ -16,7 +16,7 @@
<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">*</property>
+ <property key="osgi.remote.interfaces">*</property>
<!-- Uncomment to enable SOAP 1.2 and confirm via message logging -->
<!--
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=706161&r1=706160&r2=706161&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
Mon Oct 20 02:13:23 2008
@@ -16,7 +16,7 @@
<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">*</property>
+ <property key="osgi.remote.interfaces">*</property>
<!-- Uncomment to enable SOAP 1.2 and confirm via message logging -->
<!--
@@ -35,7 +35,7 @@
</service-description>
<service-description>
<interface name="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService" />
- <property key="osgi.remote.publish.interfaces">*</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:9005/greeter</property>
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=706161&r1=706160&r2=706161&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
Mon Oct 20 02:13:23 2008
@@ -16,14 +16,14 @@
<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">*</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>
</service-description>
<service-description>
<interface name="org.apache.cxf.dosgi.samples.pojo.hello.GreeterService" />
- <property key="osgi.remote.publish.interfaces">*</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:9005/greeter</property>
