Move the test into node-impl-osgi

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@755358 13f79535-47bb-0310-9956-ffa450edef68

31 files changed, 34 insertions, 0 deletions

diff --git a/java/sca/modules/implementation-osgi-runtime/pom.xml b/java/sca/modules/implementation-osgi-runtime/pom.xml
index 91ee8e3e24..a3e94109e2 100644
--- a/java/sca/modules/implementation-osgi-runtime/pom.xml
+++ b/java/sca/modules/implementation-osgi-runtime/pom.xml
@@ -168,6 +168,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorActivator.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorActivator.java
index b2d8ffb44c..b2d8ffb44c 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorActivator.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorActivator.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorService.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorService.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java
index 9a1d64077b..9a1d64077b 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceDSImpl.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceImpl.java
index 9f31afbd1f..9f31afbd1f 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/CalculatorServiceImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorServiceImpl.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/AddService.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/AddService.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/AddServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddServiceImpl.java
index 6bdbfa5fb5..6bdbfa5fb5 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/AddServiceImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddServiceImpl.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/DivideService.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/DivideService.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java
index eafc9b0f4f..eafc9b0f4f 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideServiceImpl.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/MultiplyService.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/MultiplyService.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java
index c2e39ad2f4..c2e39ad2f4 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyServiceImpl.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/OperationsActivator.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/OperationsActivator.java
index 7db89cd98d..7db89cd98d 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/OperationsActivator.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/OperationsActivator.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/SubtractService.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/SubtractService.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java
index 64cc776884..64cc776884 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractServiceImpl.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 8e39625dfa..8e39625dfa 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
index 8f9162c749..8f9162c749 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
index e95629c611..e95629c611 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
index aad5772037..aad5772037 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
index f6db6edc12..f6db6edc12 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
index 499ec8082e..499ec8082e 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
+++ b/java/sca/modules/node-impl-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/OSGI-INF/add-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/add-component.xml
index a7d563023c..a7d563023c 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/OSGI-INF/add-component.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/add-component.xml
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/OSGI-INF/calculator-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/calculator-component.xml
index 3e537df732..3e537df732 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/OSGI-INF/calculator-component.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/calculator-component.xml
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/OSGI-INF/divide-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/divide-component.xml
index def7fce23c..def7fce23c 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/OSGI-INF/divide-component.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/divide-component.xml
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/OSGI-INF/multiply-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/multiply-component.xml
index 57f627f990..57f627f990 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/OSGI-INF/multiply-component.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/multiply-component.xml
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/OSGI-INF/subtract-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/subtract-component.xml
index 073ee5ea40..073ee5ea40 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/OSGI-INF/subtract-component.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/OSGI-INF/subtract-component.xml
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
index 5a4db21087..5a4db21087 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/bundle.componentType b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
index 7860094626..7860094626 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/bundle.componentType
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/calculator.composite b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
index 44d53f6345..bc054b7db8 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/calculator.composite
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
@@ -25,6 +25,20 @@
 

     <component name="CalculatorComponent">

         <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi" bundleVersion="1.0.0" />

+        <reference name="addService">

+            <tuscany:binding.rmi uri="rmi://locahost:8085/AddService"/>

+        </reference>

+        <reference name="subtractService">

+            <tuscany:binding.rmi uri="rmi://locahost:8085/SubtractService"/>

+        </reference>

+        <reference name="multiplyService">

+            <tuscany:binding.rmi uri="rmi://locahost:8085/MultiplyService"/>

+        </reference>

+        <reference name="divideService">

+            <tuscany:binding.rmi uri="rmi://locahost:8085/DivideService"/>

+        </reference>

+        

+        <!-- 

         <reference name="addService" target="OperationsComponent/AddService">

         </reference>

         <reference name="subtractService" target="OperationsComponent/SubtractService">

@@ -33,6 +47,7 @@
         </reference>

         <reference name="divideService" target="OperationsComponent/DivideService">

         </reference>

+         -->

     </component>

 

 </composite>

diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
index eb15e778b1..eb15e778b1 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/bundle.componentType b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
index 6f6f4bdce6..6f6f4bdce6 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/bundle.componentType
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/operations.composite b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
index 964be5643e..c9fb3818b8 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/operations.composite
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
@@ -25,6 +25,19 @@
 

     <component name="OperationsComponent">

         <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi.operations" bundleVersion="1.0.0" />

+        <service name="AddService">

+            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>

+        </service>

+        <service name="SubtractService">

+            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>

+        </service>

+        <service name="MultiplyService">

+            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>

+        </service>

+        <service name="DivideService">

+            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>

+        </service>

+        

     </component>

 

 </composite>