summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkelvingoodson <kelvingoodson@13f79535-47bb-0310-9956-ffa450edef68>2010-09-16 15:27:07 +0000
committerkelvingoodson <kelvingoodson@13f79535-47bb-0310-9956-ffa450edef68>2010-09-16 15:27:07 +0000
commitbd4c82405f5b1928d0e6071fdecc7a36be57f696 (patch)
treee21ffadd53b85651543a7050f651f304bad0284f
parentc1edd74392bb1e8cd4cb103664b3e9f7e95fcff8 (diff)
TUSCANY-3677 all implementation.* samples are part of sca-features samples set
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@997789 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/README (renamed from sca-java-2.x/trunk/samples/implementation-extension/README)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/pom.xml (renamed from sca-java-2.x/trunk/samples/implementation-extension/pom.xml)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/Java.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/api/Java.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDL.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/api/WSDL.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDLReference.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/api/WSDLReference.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/EmbedUtil.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/EmbedUtil.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/ImplUtil.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/ImplUtil.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementation.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleImplementation.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProvider.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleProvider.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/sample/impl/sample.xsd (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/main/resources/sample/impl/sample.xsd)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Client.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/Client.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/ClientTest.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/ClientTest.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Hello.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/Hello.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/JelloTest.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/JelloTest.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Upper.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/Upper.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/UpperTest.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/UpperTest.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/WelloTest.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/WelloTest.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Xutil.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/Xutil.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunTestCase.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/RunTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/TestUtil.java (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/TestUtil.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/Hello.wsdl (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/resources/Hello.wsdl)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/Upper.wsdl (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/resources/Upper.wsdl)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/test.composite (renamed from sca-java-2.x/trunk/samples/implementation-extension/src/test/resources/test.composite)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/README (renamed from sca-java-2.x/trunk/samples/implementation-java/README)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/README (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/README)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/build.xml (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/build.xml)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/pom.xml (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/pom.xml)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/Calculator.composite (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/resources/Calculator.composite)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java (renamed from sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-java/pom.xml (renamed from sca-java-2.x/trunk/samples/implementation-java/pom.xml)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/README (renamed from sca-java-2.x/trunk/samples/implementation-script/README)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/README (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/README)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/build.xml (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/build.xml)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/pom.xml (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/pom.xml)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/Calculator.composite (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/Calculator.composite)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb (renamed from sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb)0
-rw-r--r--sca-java-2.x/trunk/samples/sca-features/implementation-script/pom.xml (renamed from sca-java-2.x/trunk/samples/implementation-script/pom.xml)0
77 files changed, 0 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/README b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/README
index 3c3ef5e3d5..3c3ef5e3d5 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/README
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/README
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/pom.xml b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/pom.xml
index 47aff7e941..47aff7e941 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/pom.xml
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/api/Java.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/Java.java
index 6c9240005f..6c9240005f 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/api/Java.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/Java.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/api/WSDL.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDL.java
index 655770ec32..655770ec32 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/api/WSDL.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDL.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/api/WSDLReference.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDLReference.java
index cad8478a2a..cad8478a2a 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/api/WSDLReference.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/api/WSDLReference.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/EmbedUtil.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/EmbedUtil.java
index 0ccbcc9e36..0ccbcc9e36 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/EmbedUtil.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/EmbedUtil.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/ImplUtil.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/ImplUtil.java
index abd4cd7ab0..abd4cd7ab0 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/ImplUtil.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/ImplUtil.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleImplementation.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementation.java
index 41ce71a732..41ce71a732 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleImplementation.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementation.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java
index 6017030d35..6017030d35 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java
index 244251c4c9..244251c4c9 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleProvider.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProvider.java
index 5d946b037b..5d946b037b 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleProvider.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProvider.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java
index 4ad24d33ff..4ad24d33ff 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java
index 6c5317274f..6c5317274f 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java
index a6882a0103..a6882a0103 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 908ac95a2e..908ac95a2e 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 85aff44074..85aff44074 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 32a7efcaf9..32a7efcaf9 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/main/resources/sample/impl/sample.xsd b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/sample/impl/sample.xsd
index c057aef1c1..c057aef1c1 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/main/resources/sample/impl/sample.xsd
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/main/resources/sample/impl/sample.xsd
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/Client.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Client.java
index 1b7e11c786..1b7e11c786 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/Client.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Client.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/ClientTest.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/ClientTest.java
index 92291c98a1..92291c98a1 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/ClientTest.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/ClientTest.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/Hello.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Hello.java
index 247fc8aa78..247fc8aa78 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/Hello.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Hello.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/JelloTest.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/JelloTest.java
index 5c999a6c80..5c999a6c80 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/JelloTest.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/JelloTest.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/Upper.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Upper.java
index 9c772b3487..9c772b3487 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/Upper.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Upper.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/UpperTest.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/UpperTest.java
index 5399e4410d..5399e4410d 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/UpperTest.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/UpperTest.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/WelloTest.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/WelloTest.java
index 1bb9fc11ce..1bb9fc11ce 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/WelloTest.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/WelloTest.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/Xutil.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Xutil.java
index ce89f9dd8c..ce89f9dd8c 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/Xutil.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/Xutil.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java
index 406dbabee0..406dbabee0 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java
index 8a4768cd9e..8a4768cd9e 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/RunTestCase.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunTestCase.java
index 29bf02d26b..29bf02d26b 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/RunTestCase.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunTestCase.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java
index 61133d0fbf..61133d0fbf 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/TestUtil.java b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/TestUtil.java
index 6dcfb33912..6dcfb33912 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/java/sample/impl/TestUtil.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/java/sample/impl/TestUtil.java
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/resources/Hello.wsdl b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/Hello.wsdl
index 360cea5ff3..360cea5ff3 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/resources/Hello.wsdl
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/Hello.wsdl
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/resources/Upper.wsdl b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/Upper.wsdl
index 8a148bb5e8..8a148bb5e8 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/resources/Upper.wsdl
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/Upper.wsdl
diff --git a/sca-java-2.x/trunk/samples/implementation-extension/src/test/resources/test.composite b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/test.composite
index 43a75f50a7..43a75f50a7 100644
--- a/sca-java-2.x/trunk/samples/implementation-extension/src/test/resources/test.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-extension/src/test/resources/test.composite
diff --git a/sca-java-2.x/trunk/samples/implementation-java/README b/sca-java-2.x/trunk/samples/sca-features/implementation-java/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/README
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/README
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/README b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/README
index 9e1ff828ee..9e1ff828ee 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/README
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/build.xml
index 8ec250d009..8ec250d009 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/build.xml
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/pom.xml
index c3e4ba4208..c3e4ba4208 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index 2b791a8e1f..2b791a8e1f 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/Calculator.composite
index 370e1cf315..370e1cf315 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index c1cd131f40..c1cd131f40 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/trunk/samples/implementation-java/pom.xml b/sca-java-2.x/trunk/samples/sca-features/implementation-java/pom.xml
index 96fece7481..96fece7481 100644
--- a/sca-java-2.x/trunk/samples/implementation-java/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-java/pom.xml
diff --git a/sca-java-2.x/trunk/samples/implementation-script/README b/sca-java-2.x/trunk/samples/sca-features/implementation-script/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/README
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/README
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/README b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/README
index 1e5bc9c584..1e5bc9c584 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/README
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/README
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/build.xml b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/build.xml
index 91285fdbca..91285fdbca 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/build.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/build.xml
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/pom.xml b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/pom.xml
index 61c864a4f0..61c864a4f0 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index 1df1f31c48..1df1f31c48 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 8e4b082d14..8e4b082d14 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/Calculator.composite
index d441aa0aea..d441aa0aea 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType
index 5f6d88454c..5f6d88454c 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js
index 6f11106ddd..6f11106ddd 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType
index f4bb4e3471..f4bb4e3471 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 35dc5721b2..35dc5721b2 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
index cce0b5b3ec..cce0b5b3ec 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType
index ee768f73f2..ee768f73f2 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/contribution-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/sca-java-2.x/trunk/samples/implementation-script/pom.xml b/sca-java-2.x/trunk/samples/sca-features/implementation-script/pom.xml
index cf719a7918..cf719a7918 100644
--- a/sca-java-2.x/trunk/samples/implementation-script/pom.xml
+++ b/sca-java-2.x/trunk/samples/sca-features/implementation-script/pom.xml