Return-Path: 
 <commits-return-6248-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 65770 invoked from network); 20 Oct 2008 09:14:00 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 20 Oct 2008 09:14:00 -0000
Received: (qmail 32526 invoked by uid 500); 20 Oct 2008 09:14:01 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 32466 invoked by uid 500); 20 Oct 2008 09:14:01 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 32336 invoked by uid 99); 20 Oct 2008 09:14:00 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Oct 2008 02:14:00 -0700
X-ASF-Spam-Status: No, hits=-1998.5 required=10.0
	tests=ALL_TRUSTED,WEIRD_PORT
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Oct 2008 09:12:47 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id BE650238896B; Mon, 20 Oct 2008 02:13:25 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r706161 - 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/OSGI-INF/remote-services/
 dsw/cxf-dsw/src/test/resources/test-resources/ samples/greeter...
Date: Mon, 20 Oct 2008 09:13:24 -0000
To: commits@cxf.apache.org
From: sergeyb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081020091325.BE650238896B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>