Author: davidb
Date: Fri Jun 25 09:03:08 2010
New Revision: 957854
URL: http://svn.apache.org/viewvc?rev=957854&view=rev
Log:
Some small updates to the Greeter Service and Spring DM demos.
Modified:
cxf/dosgi/trunk/samples/greeter/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml
cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml
cxf/dosgi/trunk/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml
Modified:
cxf/dosgi/trunk/samples/greeter/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml?rev=957854&r1=957853&r2=957854&view=diff
==============================================================================
---
cxf/dosgi/trunk/samples/greeter/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml
(original)
+++
cxf/dosgi/trunk/samples/greeter/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml
Fri Jun 25 09:03:08 2010
@@ -13,8 +13,7 @@
License for the specific language governing permissions and
limitations under the License.
-->
-<endpoint-descriptions xmlns="http://www.osgi.org/xmlns/rsa/v1.0.0";
- xmlns:other="http://www.acme.org/xmlns/other/v1.0.0";>
+<endpoint-descriptions xmlns="http://www.osgi.org/xmlns/rsa/v1.0.0";>
<endpoint-description>
<property name="objectClass">
<array>
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=957854&r1=957853&r2=957854&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
Fri Jun 25 09:03:08 2010
@@ -16,12 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0";>
- <service-description>
- <provide interface="org.apache.cxf.dosgi.samples.springdm.DinnerService" />
- <property name="service.exported.interfaces">*</property>
- <property name="deployment.intents">SOAP HTTP</property>
- <property name="service.exported.configs">org.apache.cxf.ws</property>
- <property
name="org.apache.cxf.ws.address">http://localhost:9000/org/apache/cxf/dosgi/samples/springdm/DinnerService</property>
- </service-description>
-</service-descriptions>
+<endpoint-descriptions xmlns="http://www.osgi.org/xmlns/rsa/v1.0.0";>
+ <endpoint-description>
+ <property name="objectClass">
+ <array>
+ <value>org.apache.cxf.dosgi.samples.springdm.DinnerService</value>
+ </array>
+ </property>
+ <property
name="endpoint.id">http://localhost:9000/org/apache/cxf/dosgi/samples/springdm/DinnerService</property>
+ <property name="service.imported.configs">org.apache.cxf.ws</property>
+ </endpoint-description>
+</endpoint-descriptions>
Modified:
cxf/dosgi/trunk/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml?rev=957854&r1=957853&r2=957854&view=diff
==============================================================================
---
cxf/dosgi/trunk/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml
(original)
+++
cxf/dosgi/trunk/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml
Fri Jun 25 09:03:08 2010
@@ -24,7 +24,7 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd";>
<osgi:service
interface="org.apache.cxf.dosgi.samples.springdm.DinnerService">
<osgi:service-properties>
- <entry key="osgi.remote.interfaces" value="*" />
+ <entry key="service.exported.interfaces" value="*" />
</osgi:service-properties>
<bean class="org.apache.cxf.dosgi.samples.springdm.impl.DinnerServiceImpl"
/>
