You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by da...@apache.org on 2009/04/06 15:30:11 UTC
svn commit: r762332 - in /cxf/dosgi/trunk:
discovery/local/src/test/resources/
dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/
dsw/cxf-dsw/src/main/java/org/osgi/service/distribution/
dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ dsw...
Author: davidb
Date: Mon Apr 6 13:30:11 2009
New Revision: 762332
URL: http://svn.apache.org/viewvc?rev=762332&view=rev
Log:
Renamed service.intents to deployment.intents as per latest RFC 119 design.
Modified:
cxf/dosgi/trunk/discovery/local/src/test/resources/rs2.xml
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/osgi/service/distribution/DistributionProvider.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/resources/test-resources/rs2.xml
cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml
Modified: cxf/dosgi/trunk/discovery/local/src/test/resources/rs2.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/src/test/resources/rs2.xml?rev=762332&r1=762331&r2=762332&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/src/test/resources/rs2.xml (original)
+++ cxf/dosgi/trunk/discovery/local/src/test/resources/rs2.xml Mon Apr 6 13:30:11 2009
@@ -22,7 +22,7 @@
<service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0">
<service-description>
<provide interface="org.example.Service" />
- <property name="service.intents">confidentiality.message integrity</property>
+ <property name="deployment.intents">confidentiality.message integrity</property>
<property name="osgi.remote.interfaces">*</property>
</service-description>
</service-descriptions>
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java?rev=762332&r1=762331&r2=762332&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java Mon Apr 6 13:30:11 2009
@@ -19,7 +19,7 @@
package org.apache.cxf.dosgi.dsw;
public class Constants {
- public static final String INTENTS_PROPERTY = "service.intents";
+ public static final String INTENTS_PROPERTY = "deployment.intents";
public static final String REMOTE_PROPERTY_PREFIX = "osgi.remote";
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/osgi/service/distribution/DistributionProvider.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/osgi/service/distribution/DistributionProvider.java?rev=762332&r1=762331&r2=762332&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/osgi/service/distribution/DistributionProvider.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/osgi/service/distribution/DistributionProvider.java Mon Apr 6 13:30:11 2009
@@ -84,7 +84,7 @@
* side.
* E.g. a service is exposed remotely, the distribution software is configured
* to add transactionality to the remote service. Because of this, on the
- * client-side proxy the property service.intents=transactionality is set.
+ * client-side proxy the property deployment.intents=transactionality is set.
* However, these intents are *not* always set on the original
* ServiceRegistration on the server-side since on the server side the service
* object is a local pojo which doesnt provide transactionality by itself.
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java?rev=762332&r1=762331&r2=762332&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java Mon Apr 6 13:30:11 2009
@@ -85,7 +85,7 @@
Map<String, String> expected = new HashMap<String, String>();
expected.put("osgi.remote.configuration.type", "pojo");
expected.put("osgi.remote.configuration.pojo.address", "http://" + hostName + ":1327/myRunnable");
- expected.put("service.intents", "a.b.c");
+ expected.put("deployment.intents", "a.b.c");
assertEquals(expected, dp.getExposedProperties(sr));
}
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java?rev=762332&r1=762331&r2=762332&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java Mon Apr 6 13:30:11 2009
@@ -141,7 +141,7 @@
Map<String, String> expected = new HashMap<String, String>();
expected.put("osgi.remote.configuration.type", "pojo");
expected.put("osgi.remote.configuration.pojo.address", "http://somehost:54321/java/lang/String");
- expected.put("service.intents", "A B");
+ expected.put("deployment.intents", "A B");
assertEquals(expected, dp.getExposedProperties(sr));
}
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/resources/test-resources/rs2.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/resources/test-resources/rs2.xml?rev=762332&r1=762331&r2=762332&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/resources/test-resources/rs2.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/resources/test-resources/rs2.xml Mon Apr 6 13:30:11 2009
@@ -22,7 +22,7 @@
<service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0">
<service-description>
<provide interface="org.example.Service" />
- <property name="service.intents">confidentiality.message integrity</property>
+ <property name="deployment.intents">confidentiality.message integrity</property>
<property name="osgi.remote.interfaces">*</property>
</service-description>
</service-descriptions>
Modified: cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml?rev=762332&r1=762331&r2=762332&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml (original)
+++ cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml Mon Apr 6 13:30:11 2009
@@ -20,7 +20,7 @@
<service-description>
<provide interface="org.apache.cxf.dosgi.samples.springdm.DinnerService" />
<property name="osgi.remote.interfaces">*</property>
- <property name="service.intents">SOAP HTTP</property>
+ <property name="deployment.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>