Changed contribution-* samples to *-contribution.

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

304 files changed, 140 insertions, 95 deletions

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/README b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/README
index 88bbe9adcb..88bbe9adcb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/pom.xml
index 326422ed7b..326422ed7b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/java/sample/HelloWorldClient.java
index f209f11605..f209f11605 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/java/sample/HelloWorldClient.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/java/sample/HelloWorldService.java
index df2a852161..df2a852161 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/java/sample/HelloWorldService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
index c09af51e23..c09af51e23 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/webapp/META-INF/context.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/webapp/META-INF/context.xml
index 7575edfc29..7575edfc29 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/webapp/META-INF/context.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/webapp/META-INF/context.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
index a8cd27f6c6..a8cd27f6c6 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/webapp/WEB-INF/web.composite
index c51985bc30..c51985bc30 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/webapp/WEB-INF/web.xml
index 86710435ae..86710435ae 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/webapp/hello.jsp b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/webapp/hello.jsp
index 9ae037f2c2..9ae037f2c2 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/pom.xml
new file mode 100644
index 0000000000..f536abf314
--- /dev/null
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/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-binding-jms</artifactId>

+    <packaging>pom</packaging>

+    <name>Apache Tuscany SCA Sample binding.jms</name>

+

+    <profiles>

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <modules>

+                <module>helloworld-jms</module>
+            </modules>

+        </profile>

+    </profiles>    

+</project>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/README b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/README
index 1e5bc9c584..1e5bc9c584 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml
index 7d0ce122dd..7d0ce122dd 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
index 7e08ce52be..7e08ce52be 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddBean.java
index bb39e961b4..bb39e961b4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddBean.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddService.java
index 03e844d09c..03e844d09c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
index 8eabfa6773..8eabfa6773 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorClient.java
index 1df1f31c48..1df1f31c48 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
index d32cc73815..d32cc73815 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
index ddd7b9cc6e..ddd7b9cc6e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
index cc0de498d3..cc0de498d3 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
index 22e95f7f54..22e95f7f54 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/Calculator.composite
index 5f1add2431..5f1add2431 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/build-dojo.xml
index 36714c67fc..36714c67fc 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/build-dojo.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/build-dojo.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
index 586937b5e5..586937b5e5 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddBean.java
index 71724ee7ae..71724ee7ae 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddBean.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddService.java
index 03e844d09c..03e844d09c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e16b352021..e16b352021 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index d32cc73815..d32cc73815 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index ddd7b9cc6e..ddd7b9cc6e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index cc0de498d3..cc0de498d3 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 22e95f7f54..22e95f7f54 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.composite
index dc0df8756c..dc0df8756c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index b7e216baf7..b7e216baf7 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/calculate.html
index 6d22806e8f..6d22806e8f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/src/main/webapp/calculate.html
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/calculate.html
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml
index 52d05e075b..cabcc8ea00 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml
@@ -36,7 +36,8 @@
                 <activeByDefault>true</activeByDefault>

             </activation>

             <modules>

-                <module>contribution-calculator</module>

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

             </modules>

         </profile>

     </profiles>    

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>    

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/README b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/README
index 4777c5ad88..4777c5ad88 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml
index 593e1ba7a4..593e1ba7a4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
index c877155853..c877155853 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
index bb75bb2337..bb75bb2337 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
index fc53393d23..fc53393d23 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
index b1250ed9f2..b1250ed9f2 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
index 11f68c66e3..11f68c66e3 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
index 30e59bf668..30e59bf668 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/Calculator.composite
index 05bea57944..05bea57944 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
index 3e64787ce4..3e64787ce4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
index 9d3024f451..9d3024f451 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml
index e3cc9d6e43..6497c5b719 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml
@@ -36,7 +36,7 @@
                 <activeByDefault>true</activeByDefault>

             </activation>

             <modules>

-                <module>contribution-calculator</module>

+                <module>calculator-contribution</module>

             </modules>

         </profile>

     </profiles>    

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/README b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/README
index a1f34e0e8a..a1f34e0e8a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml
index b7c1508414..b7c1508414 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/calculator.odg b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/calculator.odg
index c2646f7d5e..c2646f7d5e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/calculator.odg
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/calculator.odg
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/calculator.png b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/calculator.png
index 476306e5f0..476306e5f0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/calculator.png
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/calculator.png
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
index a177a043d5..a177a043d5 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/AddService.java
index 138213b5fc..138213b5fc 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/resources/Calculator.composite
index 3688ebcb85..3688ebcb85 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
index 3a7548cd47..3a7548cd47 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/README b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/README
index be947b1923..be947b1923 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/README
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/build.xml
index 401315d424..401315d424 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/build.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/helloworld-ws-sdo.png
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/maven-eclipse.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/maven-eclipse.xml
index 3adfca89f4..3adfca89f4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/maven-eclipse.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/maven-eclipse.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
index c5bf5ff186..c5bf5ff186 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldClient.java
index ebc270811f..ebc270811f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldImpl.java
index c42a4d59c3..c42a4d59c3 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldServer.java
index ff5cb4ceda..ff5cb4ceda 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldService.java
index fa257a0605..fa257a0605 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BioTestCase.java
index d222d77b3b..d222d77b3b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BioTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BiochemicalCircle.java
index a988a4156c..a988a4156c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BiochemicalCircle.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BiochemicalCircleImpl.java
index b609f58373..b609f58373 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BiochemicalCircleImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml
index f8b2a60f6a..f8b2a60f6a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/helloworldws.composite
index 46c819d08c..46c819d08c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/helloworldws.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/helloworldwsclient.composite
index 65b0e294a8..65b0e294a8 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/helloworldwsclient.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/logging.properties
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/resources/clinicalLaboratory.composite
index 0451cee24c..0451cee24c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/resources/clinicalLaboratory.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/test.xsd b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/test.xsd
index 7fd9aa0013..7fd9aa0013 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/test.xsd
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/test.xsd
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/wsdl/helloworld.wsdl
index 882819110f..882819110f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/wsdl/helloworld.wsdl
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/HelloWorldClientTestCase.java
index 3918f9a4a5..3918f9a4a5 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/HelloWorldTestServer.java
index 98487ad88b..98487ad88b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/TestCaseRunner.java
index b6b4ed2254..b6b4ed2254 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/TestCaseRunner.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml
index bfac74c8c0..d2f99a2940 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml
@@ -36,7 +36,8 @@
                 <activeByDefault>true</activeByDefault>

             </activation>

             <modules>

-                <module>contribution-calculator</module>

+                <module>calculator-contribution</module>
+                <module>helloworld-ws-sdo-contribution</module>

             </modules>

         </profile>

     </profiles>    

diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/README b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/README
index 92f339ead5..92f339ead5 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/README
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/pom.xml b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/pom.xml
index a21897ca5b..a21897ca5b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/generated/com/facebook/fb303/FacebookService.java b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/generated/com/facebook/fb303/FacebookService.java
index 1708066955..1708066955 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/generated/com/facebook/fb303/FacebookService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/generated/com/facebook/fb303/FacebookService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/generated/com/facebook/fb303/fb_status.java b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/generated/com/facebook/fb303/fb_status.java
index bb7b132477..bb7b132477 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/generated/com/facebook/fb303/fb_status.java
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/generated/com/facebook/fb303/fb_status.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/generated/scribe/thrift/LogEntry.java b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/generated/scribe/thrift/LogEntry.java
index c06570d9ef..c06570d9ef 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/generated/scribe/thrift/LogEntry.java
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/generated/scribe/thrift/LogEntry.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/generated/scribe/thrift/ResultCode.java b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/generated/scribe/thrift/ResultCode.java
index 2bf826d06a..2bf826d06a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/generated/scribe/thrift/ResultCode.java
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/generated/scribe/thrift/ResultCode.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/generated/scribe/thrift/scribe.java b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/generated/scribe/thrift/scribe.java
index 40b4ca774b..40b4ca774b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/generated/scribe/thrift/scribe.java
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/generated/scribe/thrift/scribe.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/sample/HelloWorld.java b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/sample/HelloWorld.java
index 7fb20fe5f4..7fb20fe5f4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/sample/HelloWorld.java
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/sample/HelloWorld.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/sample/HelloWorldImpl.java b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/sample/HelloWorldImpl.java
index d90af4c792..d90af4c792 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/sample/HelloWorldImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/sample/HelloWorldImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/sample/Logger.java b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/sample/Logger.java
index aab9ec27c1..aab9ec27c1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/sample/Logger.java
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/sample/Logger.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/sample/ScribeLoggerImpl.java b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/sample/ScribeLoggerImpl.java
index 10c2e079fd..10c2e079fd 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/java/sample/ScribeLoggerImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/java/sample/ScribeLoggerImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/resources/META-INF/sca-contribution.xml
index fe284f2c10..fe284f2c10 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/resources/fb303.thrift b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/resources/fb303.thrift
index 4926b7a736..4926b7a736 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/resources/fb303.thrift
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/resources/fb303.thrift
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/resources/scribe.composite b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/resources/scribe.composite
index b075a13843..b075a13843 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/resources/scribe.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/resources/scribe.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/resources/scribe.thrift b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/resources/scribe.thrift
index 468412f38e..468412f38e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/main/resources/scribe.thrift
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/main/resources/scribe.thrift
diff --git a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/test/java/sample/LoggingTest.java b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/test/java/sample/LoggingTest.java
index 4232365f81..4232365f81 100644
--- a/sca-java-2.x/trunk/samples/learning-more/logging-scribe/src/test/java/sample/LoggingTest.java
+++ b/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/src/test/java/sample/LoggingTest.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/README b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/README
index 533743ebf6..533743ebf6 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/build.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml
index 008953e63b..008953e63b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/helloworld-bpel.png b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/helloworld-bpel.png
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/helloworld-bpel.png
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/helloworld-bpel.svg b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/helloworld-bpel.svg
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/helloworld-bpel.svg
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
index 3f4be82f71..3f4be82f71 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/src/main/java/helloworld/Hello.java b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/java/helloworld/Hello.java
index dbd3854d7c..dbd3854d7c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/src/main/java/helloworld/Hello.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/java/helloworld/Hello.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
index 4a56523adb..4a56523adb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.bpel
index d58768adfa..d58768adfa 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.bpel
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.composite
index 08350e8417..08350e8417 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.wsdl
index cf966264ef..cf966264ef 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/src/main/resources/log4j.properties b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/log4j.properties
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml
index 53ede3e358..31ba2f291f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml
@@ -36,7 +36,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>contribution-helloworld-bpel</module>
+                <module>helloworld-bpel-contribution</module>
                 <module>helloworld-bpel-webapp</module>
             </modules>
         </profile>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/README b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/README
index 9e1ff828ee..9e1ff828ee 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml
index 46ff617b30..46ff617b30 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
index c3e4ba4208..c3e4ba4208 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorClient.java
index 2b791a8e1f..2b791a8e1f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/Calculator.composite
index 370e1cf315..370e1cf315 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
index c1cd131f40..c1cd131f40 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml
index 96fece7481..7014c1dde1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml
@@ -36,7 +36,7 @@
                 <activeByDefault>true</activeByDefault>

             </activation>

             <modules>

-                <module>contribution-calculator</module>

+                <module>calculator-contribution</module>

             </modules>

         </profile>

     </profiles>    

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/README b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/README
index 1e5bc9c584..1e5bc9c584 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml
index 91285fdbca..91285fdbca 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
index 61c864a4f0..61c864a4f0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorClient.java
index 1df1f31c48..1df1f31c48 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
index 8e4b082d14..8e4b082d14 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/Calculator.composite
index d441aa0aea..d441aa0aea 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/AddServiceImpl.componentType
index 5f6d88454c..5f6d88454c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/AddServiceImpl.js
index 6f11106ddd..6f11106ddd 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/AddServiceImpl.js
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/DivideServiceImpl.componentType
index f4bb4e3471..f4bb4e3471 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 35dc5721b2..35dc5721b2 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/MultiplyServiceImpl.py
index cce0b5b3ec..cce0b5b3ec 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/SubtractServiceImpl.componentType
index ee768f73f2..ee768f73f2 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml
index cf719a7918..4f415a6fa5 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml
@@ -36,7 +36,7 @@
                 <activeByDefault>true</activeByDefault>

             </activation>

             <modules>

-                <module>contribution-calculator</module>

+                <module>calculator-contribution</module>

             </modules>

         </profile>

     </profiles>    

diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
index b8cb765c38..b8cb765c38 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java
index 7c50d66a9c..7c50d66a9c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
index 64bdd86f7c..64bdd86f7c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/Helloworld.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/Helloworld.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldClientImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
index a01aad9d88..ddcb1d9bc3 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldClientImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
@@ -1,48 +1,48 @@
-/*

- * 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.    

- */

-package sample;

-

-import org.oasisopen.sca.annotation.Reference;

-

-public class HelloworldClientImpl implements Helloworld {

-    private Helloworld helloworld;

-

-    // SCA reference

-    @Reference(required = false)

-    private DateService dateService;

-

-    public HelloworldClientImpl() {

-        System.out.println("HelloworldClientImpl()");

-    }

-

-    public String sayHello(String name) {

-        System.out.println("HelloworldClientImpl.sayHello(" + name + ")");

-        if (dateService == null) {

-            return "Hello " + name;

-        }

-        return "[" + dateService.getDate() + "] " + helloworld.sayHello(name);

-    }

-

-    // Setter for spring injection

-    public void setHelloworld(Helloworld helloworld) {

-        System.out.println("Injected with " + helloworld);

-        this.helloworld = helloworld;

-    }

-

-}

+/*
+ * 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.    
+ */
+package sample;
+
+import org.oasisopen.sca.annotation.Reference;
+
+public class HelloworldClientImpl implements Helloworld {
+    private Helloworld helloworld;
+
+    // SCA reference
+    @Reference(required = false)
+    private DateService dateService;
+
+    public HelloworldClientImpl() {
+        System.out.println("HelloworldClientImpl()");
+    }
+
+    public String sayHello(String name) {
+        System.out.println("HelloworldClientImpl.sayHello(" + name + ")");
+        if (dateService == null) {
+            return "Hello " + name;
+        }
+        return "[" + dateService.getDate() + "] " + helloworld.sayHello(name);
+    }
+
+    // Setter for spring injection
+    public void setHelloworld(Helloworld helloworld) {
+        System.out.println("Injected with " + helloworld);
+        this.helloworld = helloworld;
+    }
+
+}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java
index 125c333ddc..125c333ddc 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
index 552d100638..552d100638 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-client-context.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
index 0e30cfa582..15e9647bb0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-client-context.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
@@ -1,37 +1,37 @@
-<?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.    

--->

-<beans xmlns="http://www.springframework.org/schema/beans"

-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-       xmlns:sca="http://www.springframework.org/schema/sca"

-       xsi:schemaLocation="

-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">

-

-    <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl">

-        <property name="helloworld">

-            <ref bean="HelloworldBean"/>

-        </property>

-    </bean>

-    

-    <!-- 

-    <sca:reference name="dateService" type="sample.DateService"/>

-    -->

-

+<?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.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
+
+    <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl">
+        <property name="helloworld">
+            <ref bean="HelloworldBean"/>
+        </property>
+    </bean>
+    
+    <!-- 
+    <sca:reference name="dateService" type="sample.DateService"/>
+    -->
+
 </beans>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-context.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
index 9ecd09974e..9ecd09974e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-context.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite
index 6d356758ae..6d356758ae 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
index 7e679ec0e9..7e679ec0e9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/test/java/sample/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml
index 0cc184cbb4..f3e96c70bd 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml
@@ -36,7 +36,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>contribution-helloworld-spring</module>
+                <module>helloworld-spring-contribution</module>
                 <module>helloworld-spring-webapp</module>
             </modules>
         </profile>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/README b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
index f414d87837..f414d87837 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
index 42625b8a78..42625b8a78 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/application b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/application
index 8ce781d6c8..8ce781d6c8 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/application
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/application
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
index 7ff71519e9..7ff71519e9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
index 3c5726a818..3c5726a818 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
index 50197cdfcb..50197cdfcb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/README b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
index 388df0913e..388df0913e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
index d41a8535e2..d41a8535e2 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
index babeb7b203..babeb7b203 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/src/main/webapp/hello.html b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/hello.html
index 12024cc4d3..12024cc4d3 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/src/main/webapp/hello.html
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/hello.html
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
index de41997a59..de41997a59 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
index 6f2b820e4c..6f2b820e4c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloWorldController.java
index 9c9f541997..9c9f541997 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloWorldController.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloWorldController.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
index 23925d6c69..23925d6c69 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
index 99cee9faeb..99cee9faeb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
index fecbd7c79b..fecbd7c79b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/helloWorld.jsp
index 189c142c99..189c142c99 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/webapp/helloWorld.jsp
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/helloWorld.jsp
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/webapp/index.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/index.jsp
index 5ca296e115..5ca296e115 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/webapp/index.jsp
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/index.jsp
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/webapp/page2.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/page2.jsp
index 89259021c7..89259021c7 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsf/src/main/webapp/page2.jsp
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/page2.jsp
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/README b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
index 05a3e23895..05a3e23895 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
index fa1f7ad7b9..fa1f7ad7b9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/hello.jsp
index ffd01cca73..ffd01cca73 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
index 665957b0eb..665957b0eb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/README b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
index 45725aaf72..45725aaf72 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldService.java
index 2e43e09897..2e43e09897 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
index 9e79276704..9e79276704 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
index bb72c50f6a..bb72c50f6a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
index a91b3fc96b..a91b3fc96b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/hello.html
index c4484916aa..c4484916aa 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/main/webapp/hello.html
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/hello.html
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
index 61d722da1f..61d722da1f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
index 16259aba62..16259aba62 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
index 0ab02682ac..0ab02682ac 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
index 0385c92369..0385c92369 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/resources/StripesResources.properties b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/resources/StripesResources.properties
index 902842a19e..902842a19e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/resources/StripesResources.properties
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/resources/StripesResources.properties
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/resources/log4j.properties b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/resources/log4j.properties
index 2741999098..2741999098 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/resources/log4j.properties
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/resources/log4j.properties
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
index 0681c1f2bf..0681c1f2bf 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
index d0fb716b80..d0fb716b80 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
index f85602fcfa..f85602fcfa 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
index f01584cc2f..f01584cc2f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/webapp/index.html b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/index.html
index c79d29e6a5..c79d29e6a5 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/main/webapp/index.html
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/index.html
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/test/java/README b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/test/java/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/test/java/README
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/test/java/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
index 7f4359fa43..7f4359fa43 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/pom.xml
index 30904804a6..8989407aae 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/pom.xml
@@ -37,7 +37,6 @@
             </activation>
             <modules>
                 <module>helloworld-jaxrs</module>
-                <module>helloworld-jms</module>
                 <module>helloworld-js-client</module>
                 <module>helloworld-jsf</module>
                 <module>helloworld-jsp</module>
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/README b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/README
index 97058ca4c9..97058ca4c9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/README
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml
index 6197b12e50..6197b12e50 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/src/main/java/sample/CalculatorSCAClient.java
index edbf528517..edbf528517 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/src/main/java/sample/CalculatorSCAClient.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/contribution-helloworld-scaclient/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml
index 4e7f057ca9..4e7f057ca9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/contribution-helloworld-scaclient/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/contribution-helloworld-scaclient/src/main/java/sample/Helloworld.java b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/contribution-helloworld-scaclient/src/main/java/sample/Helloworld.java
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/src/main/java/sample/Helloworld.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/contribution-helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/src/main/java/sample/HelloworldSCAClient.java
index c2c9c4e44e..c2c9c4e44e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/contribution-helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/src/main/java/sample/HelloworldSCAClient.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/contribution-helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/src/test/java/sample/HelloworldTestCase.java
index 13e08de692..13e08de692 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/contribution-helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/src/test/java/sample/HelloworldTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml
index 8a65e9f16d..df6627aa1f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml
@@ -38,7 +38,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>calculator-scaclient</module>
+                <module>helloworld-scaclient-contribution</module>
+                <module>calculator-scaclient-contribution</module>
             </modules>
         </profile>
     </profiles>    
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/deploy.sh b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/deploy.sh
index eb53bd5c76..eb53bd5c76 100755
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/deploy.sh
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/deploy.sh
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/pom.xml
index 5f28205da4..5f28205da4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
index eecc6044ea..eecc6044ea 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
index 00cbe73e82..00cbe73e82 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
index afbdcbc8d7..afbdcbc8d7 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
index 4278ef975b..4278ef975b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
index 55f935fa9f..55f935fa9f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
index 092988213b..092988213b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
index ff2da3a360..ff2da3a360 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
index aaa23f0b8a..aaa23f0b8a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/webapp/WEB-INF/appengine-web.xml
index 8696f76c50..8696f76c50 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/webapp/WEB-INF/web.composite
index 05b2ddd0d7..05b2ddd0d7 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/webapp/WEB-INF/web.xml
index 25b06c457a..25b06c457a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/index.html b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/webapp/index.html
index 0387e67adb..0387e67adb 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/src/main/webapp/index.html
+++ b/sca-java-2.x/trunk/samples/learning-more/weather-webapp/src/main/webapp/index.html