You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/03/16 17:20:53 UTC
svn commit: r754928 - in
/tuscany/java/sca/modules/implementation-osgi/src/test:
java/calculator/dosgi/ java/calculator/dosgi/operations/
resources/OSGI-INF/ resources/OSGI-INF/sca/
Author: rfeng
Date: Mon Mar 16 16:20:52 2009
New Revision: 754928
URL: http://svn.apache.org/viewvc?rev=754928&view=rev
Log:
Add the interfaces back to avoid error messages in processor
Added:
tuscany/java/sca/modules/implementation-osgi/src/test/java/calculator/dosgi/
tuscany/java/sca/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java
- copied unchanged from r754925, tuscany/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorService.java
tuscany/java/sca/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/
tuscany/java/sca/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java
- copied unchanged from r754925, tuscany/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/AddService.java
tuscany/java/sca/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
- copied unchanged from r754925, tuscany/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/DivideService.java
tuscany/java/sca/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
- copied unchanged from r754925, tuscany/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/MultiplyService.java
tuscany/java/sca/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
- copied unchanged from r754925, tuscany/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/SubtractService.java
Modified:
tuscany/java/sca/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml
tuscany/java/sca/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType
Modified: tuscany/java/sca/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml?rev=754928&r1=754927&r2=754928&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml (original)
+++ tuscany/java/sca/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml Mon Mar 16 16:20:52 2009
@@ -19,18 +19,18 @@
-->
<scr:component name="CalculatorComponent"
xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
- <implementation class="calculator.CalculatorServiceDSImpl" />
+ <implementation class="calculator.dosgi.CalculatorServiceDSImpl" />
<service>
- <provide interface="calculator.CalculatorService" />
+ <provide interface="calculator.dosgi.CalculatorService" />
</service>
- <reference name="addService" interface="calculator.operations.AddService" bind="setAddService" unbind="unsetAddService"
+ <reference name="addService" interface="calculator.dosgi.operations.AddService" bind="setAddService" unbind="unsetAddService"
policy="dynamic" />
- <reference name="subtractService" interface="calculator.operations.SubtractService" bind="setSubtractService"
+ <reference name="subtractService" interface="calculator.dosgi.operations.SubtractService" bind="setSubtractService"
unbind="unsetSubtractService" policy="dynamic" />
- <reference name="multiplyService" interface="calculator.operations.MultiplyService" bind="setMultiplyService"
+ <reference name="multiplyService" interface="calculator.dosgi.operations.MultiplyService" bind="setMultiplyService"
unbind="unsetMultiplyService" policy="dynamic" />
- <reference name="divideService" interface="calculator.operations.DivideService" bind="setDivideService"
+ <reference name="divideService" interface="calculator.dosgi.operations.DivideService" bind="setDivideService"
unbind="unsetDivideService" policy="dynamic" />
</scr:component>
Modified: tuscany/java/sca/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType?rev=754928&r1=754927&r2=754928&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType (original)
+++ tuscany/java/sca/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType Mon Mar 16 16:20:52 2009
@@ -23,7 +23,7 @@
<!-- The service elment defines an SCA view of the OSGi service -->
<service name="Calculator">
<!-- The interface will be mapped into the OSGi service class -->
- <interface.java interface="calculator.CalculatorService"/>
+ <interface.java interface="calculator.dosgi.CalculatorService"/>
<!-- The list of OSGi properties -->
<t:osgi.property name="prop1">1</t:osgi.property>
<t:osgi.property name="prop2">ABC</t:osgi.property>
@@ -31,22 +31,22 @@
<!-- The reference elment defines an SCA proxy to a remote OSGi service -->
<reference name="addService">
- <interface.java interface="calculator.operations.AddService"/>
+ <interface.java interface="calculator.dosgi.operations.AddService"/>
<t:osgi.property name="prop1">1</t:osgi.property>
<t:osgi.property name="prop2">ABC</t:osgi.property>
</reference>
<reference name="subtractService">
- <interface.java interface="calculator.operations.SubtractService"/>
+ <interface.java interface="calculator.dosgi.operations.SubtractService"/>
<t:osgi.property name="prop1">1</t:osgi.property>
<t:osgi.property name="prop2">ABC</t:osgi.property>
</reference>
<reference name="multiplyService">
- <interface.java interface="calculator.operations.MultiplyService"/>
+ <interface.java interface="calculator.dosgi.operations.MultiplyService"/>
<t:osgi.property name="prop1">1</t:osgi.property>
<t:osgi.property name="prop2">ABC</t:osgi.property>
</reference>
<reference name="divideService">
- <interface.java interface="calculator.operations.DivideService"/>
+ <interface.java interface="calculator.dosgi.operations.DivideService"/>
<t:osgi.property name="prop1">1</t:osgi.property>
<t:osgi.property name="prop2">ABC</t:osgi.property>
</reference>