37 files changed, 46 insertions, 11 deletions
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/README b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/README
index 3c3ef5e3d5..3c3ef5e3d5 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/README
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/README
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/pom.xml b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml
index 47aff7e941..47aff7e941 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/pom.xml
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/api/Java.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/api/Java.java
index 6c9240005f..6c9240005f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/api/Java.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/api/Java.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/api/WSDL.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/api/WSDL.java
index 655770ec32..655770ec32 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/api/WSDL.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/api/WSDL.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/api/WSDLReference.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/api/WSDLReference.java
index cad8478a2a..cad8478a2a 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/api/WSDLReference.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/api/WSDLReference.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/EmbedUtil.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/EmbedUtil.java
index 0ccbcc9e36..0ccbcc9e36 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/EmbedUtil.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/EmbedUtil.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/ImplUtil.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/ImplUtil.java
index abd4cd7ab0..abd4cd7ab0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/ImplUtil.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/ImplUtil.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleImplementation.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleImplementation.java
index 41ce71a732..41ce71a732 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleImplementation.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleImplementation.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleImplementationProcessor.java
index 6017030d35..6017030d35 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleImplementationProcessor.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleImplementationProcessor.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleJavaInvoker.java
index 244251c4c9..244251c4c9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleJavaInvoker.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleJavaInvoker.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleProvider.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleProvider.java
index 5d946b037b..5d946b037b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleProvider.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleProvider.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleProviderFactory.java
index 4ad24d33ff..4ad24d33ff 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleProviderFactory.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleProviderFactory.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleWSDLInvoker.java
index 6c5317274f..6c5317274f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleWSDLInvoker.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleWSDLInvoker.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleWSDLProxy.java
index a6882a0103..a6882a0103 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/java/sample/impl/SampleWSDLProxy.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/java/sample/impl/SampleWSDLProxy.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 908ac95a2e..908ac95a2e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 85aff44074..85aff44074 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 32a7efcaf9..32a7efcaf9 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/sample/impl/sample.xsd b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/resources/sample/impl/sample.xsd
index c057aef1c1..c057aef1c1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/main/resources/sample/impl/sample.xsd
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/main/resources/sample/impl/sample.xsd
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Client.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/Client.java
index 1b7e11c786..1b7e11c786 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Client.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/Client.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/ClientTest.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/ClientTest.java
index 92291c98a1..92291c98a1 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/ClientTest.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/ClientTest.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Hello.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/Hello.java
index 247fc8aa78..247fc8aa78 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Hello.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/Hello.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/JelloTest.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/JelloTest.java
index 5c999a6c80..5c999a6c80 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/JelloTest.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/JelloTest.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Upper.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/Upper.java
index 9c772b3487..9c772b3487 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Upper.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/Upper.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/UpperTest.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperTest.java
index 5399e4410d..5399e4410d 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/UpperTest.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/UpperTest.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/WelloTest.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/WelloTest.java
index 1bb9fc11ce..1bb9fc11ce 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/WelloTest.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/WelloTest.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Xutil.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/Xutil.java
index ce89f9dd8c..ce89f9dd8c 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/Xutil.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/Xutil.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/EmbedTestCase.java
index 406dbabee0..406dbabee0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/EmbedTestCase.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/EmbedTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/ReadWriteTestCase.java
index 8a4768cd9e..8a4768cd9e 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/ReadWriteTestCase.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/ReadWriteTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/RunTestCase.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/RunTestCase.java
index 29bf02d26b..29bf02d26b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/RunTestCase.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/RunTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/RunWSTestCase.java
index 61133d0fbf..61133d0fbf 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/RunWSTestCase.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/RunWSTestCase.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/TestUtil.java b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/TestUtil.java
index 6dcfb33912..6dcfb33912 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/java/sample/impl/TestUtil.java
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/java/sample/impl/TestUtil.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/resources/Hello.wsdl b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/resources/Hello.wsdl
index 360cea5ff3..360cea5ff3 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/resources/Hello.wsdl
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/resources/Hello.wsdl
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/resources/Upper.wsdl b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/resources/Upper.wsdl
index 8a148bb5e8..8a148bb5e8 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/resources/Upper.wsdl
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/resources/Upper.wsdl
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/resources/test.composite b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/resources/test.composite
index 43a75f50a7..43a75f50a7 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-extension/src/test/resources/test.composite
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/src/test/resources/test.composite
diff --git a/sca-java-2.x/trunk/samples/extending-tuscany/pom.xml b/sca-java-2.x/trunk/samples/extending-tuscany/pom.xml
new file mode 100644
index 0000000000..c8c006f702
--- /dev/null
+++ b/sca-java-2.x/trunk/samples/extending-tuscany/pom.xml
@@ -0,0 +1,45 @@
+<?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>
+    <groupId>org.apache.tuscany.sca</groupId>
+    <artifactId>tuscany-samples-extending-tuscany</artifactId>
+    <version>2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Extending Tuscany Samples</name>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>implementation-sample</module>
+            </modules>
+        </profile>
+    </profiles>    
+</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/pom.xml b/sca-java-2.x/trunk/samples/learning-more/pom.xml
index cbe5ff8d85..de6bb6e991 100644
--- a/sca-java-2.x/trunk/samples/learning-more/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/pom.xml
@@ -46,7 +46,6 @@
                 <module>binding-jsonrpc</module>
                 <module>implementation-bpel</module>
                 <module>implementation-composite</module>
-                <module>implementation-extension</module>
                 <module>implementation-java</module>
                 <module>implementation-script</module>
                 <module>implementation-spring</module>
diff --git a/sca-java-2.x/trunk/samples/pom.xml b/sca-java-2.x/trunk/samples/pom.xml
index 2d45da3b07..6eb99ee4e0 100644
--- a/sca-java-2.x/trunk/samples/pom.xml
+++ b/sca-java-2.x/trunk/samples/pom.xml
@@ -36,16 +36,7 @@
                 <module>running-tuscany</module>
                 <module>learning-more</module>
                 <module>applications</module>
-
-<!-- *********
-    IF YOU ADD ANY SAMPLES THEN ALSO ADD THEM TO 
-        distribution\all\src\main\components\bin-samples.xml
-    OR THEY WONT GET IN RELEASES
-     ********* -->
-<!-- *********
-    ALSO SAMPLES SHOULD HAVE A TEST IN itest/distribution TO 
-    ENSURE THAT THEY WORK PROPERLY OUT OF A DISTRIBUTION
-     ********* -->
+                <module>extending-tuscany</module>
             </modules>
 
           <build>