Changed contribution-* samples to *-contribution.

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

30 files changed, 2 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/README b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/README
index 2f169419ba..2f169419ba 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml
index 4bde8a31bf..4bde8a31bf 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
index c10d764ff1..c10d764ff1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorService.java
index 0f7dec116f..0f7dec116f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/resources/CalculatorRMIReference.composite
index 7455dc7d38..7455dc7d38 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/resources/CalculatorRMIReference.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 39d4b2fd28..39d4b2fd28 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/README b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/README
index cb25027f14..cb25027f14 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml
index d155649159..d155649159 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
index 5cd39e96bb..5cd39e96bb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorService.java
index 3c0375924f..3c0375924f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/resources/CalculatorRMIServer.composite
index 8b37d407f0..8b37d407f0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/resources/CalculatorRMIServer.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/resources/META-INF/sca-contribution.xml
index 8d6012e5c4..8d6012e5c4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 0e352db9bb..0e352db9bb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml
index 073687983d..9e27c39e34 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml
@@ -36,8 +36,8 @@
                 <activeByDefault>true</activeByDefault>

             </activation>

             <modules>

-                <module>contribution-calculator-reference</module>

-                <module>contribution-calculator-service</module>

+                <module>calculator-reference-contribution</module>

+                <module>calculator-service-contribution</module>

             </modules>

         </profile>

     </profiles>