diff options
Diffstat (limited to 'sca-java-2.x/trunk/samples')
-rw-r--r-- | sca-java-2.x/trunk/samples/learning-more/pom.xml | 2 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/README (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/README) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/build.xml (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/build.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/AddService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/AddService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/AddServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/AddServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorClient.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorClient.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/DivideService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/DivideService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/MultiplyService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/MultiplyService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/SubtractService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/SubtractService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/resources/Calculator.composite (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/resources/Calculator.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/resources/CalculatorClient.composite (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/resources/CalculatorClient.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-junit/pom.xml | 43 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/README (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/README) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/build.xml (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/build.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/logging.properties (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/logging.properties) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorClient.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorClient.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/META-INF/MANIFEST.MF (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/README (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/README) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractService.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/resources/Calculator.composite (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/resources/Calculator.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/pom.xml (renamed from sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/running-tuscany/pom.xml | 5 |
57 files changed, 46 insertions, 4 deletions
diff --git a/sca-java-2.x/trunk/samples/learning-more/pom.xml b/sca-java-2.x/trunk/samples/learning-more/pom.xml index c96e1e6aa5..1b11cf0e30 100644 --- a/sca-java-2.x/trunk/samples/learning-more/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/pom.xml @@ -54,8 +54,6 @@ <module>distributed-osgi</module> <module>sca-client</module> <module>async</module> - <module>maven-osgi-junit</module> - <module>maven-junit</module> </modules> </profile> </profiles> diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/README b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/README index 1e5bc9c584..1e5bc9c584 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/README +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/README diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/build.xml index bd06210755..bd06210755 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/build.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/build.xml diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml index 14907c0974..14907c0974 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/AddService.java index 5a1e7a638a..5a1e7a638a 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/AddService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/AddService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/AddServiceImpl.java index b3671cc795..b3671cc795 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/AddServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/AddServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorClient.java index 1df1f31c48..1df1f31c48 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorClient.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorClient.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorService.java index 78eea39c71..78eea39c71 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java index 8e4b082d14..8e4b082d14 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/DivideService.java index ef6a8b375b..ef6a8b375b 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/DivideService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/DivideService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java index ddd7b9cc6e..ddd7b9cc6e 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/MultiplyService.java index db568cc762..db568cc762 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/MultiplyService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/MultiplyService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java index cc0de498d3..cc0de498d3 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/SubtractService.java index 56ee372fc4..56ee372fc4 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/SubtractService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/SubtractService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java index 22e95f7f54..22e95f7f54 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/resources/Calculator.composite index 370e1cf315..370e1cf315 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/resources/Calculator.composite +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/resources/Calculator.composite diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/resources/CalculatorClient.composite index dfd32761be..dfd32761be 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/resources/CalculatorClient.composite +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/resources/CalculatorClient.composite diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml index 70aab0e051..70aab0e051 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java index ba269182eb..ba269182eb 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-junit/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java diff --git a/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/pom.xml new file mode 100644 index 0000000000..715d92016f --- /dev/null +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/pom.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-samples</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>tuscany-sample-maven-junit</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tuscany SCA Sample Maven Junit</name>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>calculator-contribution</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF index 1ebd35b30a..1ebd35b30a 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/README b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/README index c416ad96a0..c416ad96a0 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/README +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/README diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/build.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/build.xml index 41a52737cc..41a52737cc 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/build.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/build.xml diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/logging.properties b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/logging.properties index cf452e7812..cf452e7812 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/logging.properties +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/logging.properties diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml index 924d9f7c3b..924d9f7c3b 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddService.java index 188451ebac..188451ebac 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java index 7ca8fb04b5..7ca8fb04b5 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java index 4408568629..4408568629 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorClient.java index afd5ea48fc..afd5ea48fc 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorClient.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorClient.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java index c89043276e..c89043276e 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java index 39f55ca31f..39f55ca31f 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideService.java index 30d248208b..30d248208b 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java index 1323edf55a..1323edf55a 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyService.java index 5290605938..5290605938 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java index 91b803bc9e..91b803bc9e 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractService.java index bf0d1882b6..bf0d1882b6 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java index 58cc4a3547..58cc4a3547 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite index c5e636f769..c5e636f769 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java index d6a3ccb24e..d6a3ccb24e 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/META-INF/MANIFEST.MF index 1ebd35b30a..1ebd35b30a 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/META-INF/MANIFEST.MF +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/META-INF/MANIFEST.MF diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/README b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/README index 4c67296bd4..4c67296bd4 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/README +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/README diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml index 5afd616604..5afd616604 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddService.java index 188451ebac..188451ebac 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java index 193a7d6636..193a7d6636 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java index 4408568629..4408568629 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java index 2d14bbd49f..2d14bbd49f 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java index 55aabdb56f..55aabdb56f 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideService.java index 30d248208b..30d248208b 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java index 1323edf55a..1323edf55a 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java index 5290605938..5290605938 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java index 91b803bc9e..91b803bc9e 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractService.java index bf0d1882b6..bf0d1882b6 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractService.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java index 58cc4a3547..58cc4a3547 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/resources/Calculator.composite index c428ce93d6..c428ce93d6 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/main/resources/Calculator.composite +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/main/resources/Calculator.composite diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java index 704101b5c0..704101b5c0 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java diff --git a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/pom.xml index b2e096c145..b2e096c145 100644 --- a/sca-java-2.x/trunk/samples/learning-more/maven-osgi-junit/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/pom.xml diff --git a/sca-java-2.x/trunk/samples/running-tuscany/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/pom.xml index 54eda70d82..1cc0cab2db 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/pom.xml @@ -47,9 +47,10 @@ --> <module>embedded-jse</module> <module>embedded-osgi</module> - <!-- module>embedded-osgi-base</module --> + <!-- module>embedded-osgi-base</module --> + <module>maven-osgi-junit</module> + <module>maven-junit</module> <module>shell</module> - </modules> </profile> </profiles> |