cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r747033 - in /cxf/dosgi/trunk: 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/cxf-dsw/src/test/resources/test-res...
Date Mon, 23 Feb 2009 14:41:06 GMT
Author: davidb
Date: Mon Feb 23 14:41:05 2009
New Revision: 747033

URL: http://svn.apache.org/viewvc?rev=747033&view=rev
Log:
Changed client-side intents service property from osgi.intents to service.intents.

Modified:
    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/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=747033&r1=747032&r2=747033&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
Feb 23 14:41:05 2009
@@ -19,7 +19,7 @@
 package org.apache.cxf.dosgi.dsw;
 
 public class Constants {
-    public static final String INTENTS_PROPERTY = "osgi.intents";
+    public static final String INTENTS_PROPERTY = "service.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=747033&r1=747032&r2=747033&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 Feb 23 14:41:05 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 osgi.intents=”transactionality” is set. 
+     * client-side proxy the property service.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 doesn’t 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=747033&r1=747032&r2=747033&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 Feb 23 14:41:05 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("osgi.intents", "a.b.c");
+        expected.put("service.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=747033&r1=747032&r2=747033&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 Feb 23 14:41:05 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("osgi.intents", "A B");
+        expected.put("service.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=747033&r1=747032&r2=747033&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 Feb 23 14:41:05
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="osgi.intents">confidentiality.message integrity</property>
+    <property name="service.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=747033&r1=747032&r2=747033&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 Feb 23 14:41:05 2009
@@ -20,7 +20,7 @@
   <service-description>
     <provide interface="org.apache.cxf.dosgi.samples.springdm.DinnerService" />
     <property name="osgi.remote.interfaces">*</property>
-    <property name="osgi.intents">SOAP HTTP</property>
+    <property name="service.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>



Mime
View raw message