40 files changed, 0 insertions, 88 deletions
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/README b/sandbox/samples/sca-features/binding-sca/calculator-contribution/README
index 4777c5ad88..4777c5ad88 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/README
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/README
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/build.xml b/sandbox/samples/sca-features/binding-sca/calculator-contribution/build.xml
index 593e1ba7a4..593e1ba7a4 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/build.xml
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/build.xml
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/pom.xml b/sandbox/samples/sca-features/binding-sca/calculator-contribution/pom.xml
index c877155853..c877155853 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/pom.xml
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/pom.xml
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
index bb75bb2337..bb75bb2337 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
index fc53393d23..fc53393d23 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
index b1250ed9f2..b1250ed9f2 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
index 11f68c66e3..11f68c66e3 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
index 30e59bf668..30e59bf668 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/resources/Calculator.composite b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/resources/Calculator.composite
index 05bea57944..05bea57944 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/resources/Calculator.composite
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/resources/CalculatorClient.composite
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
index 3e64787ce4..3e64787ce4 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/temp/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
index 9d3024f451..9d3024f451 100644
--- a/sandbox/samples/temp/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sandbox/samples/sca-features/binding-sca/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/README b/sandbox/samples/sca-features/binding-ws/calculator-contribution/README
index a1f34e0e8a..a1f34e0e8a 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/README
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/README
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/build.xml b/sandbox/samples/sca-features/binding-ws/calculator-contribution/build.xml
index 69661f7b5e..69661f7b5e 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/build.xml
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/build.xml
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/calculator.odg b/sandbox/samples/sca-features/binding-ws/calculator-contribution/calculator.odg
index c2646f7d5e..c2646f7d5e 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/calculator.odg
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/calculator.odg
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/calculator.png b/sandbox/samples/sca-features/binding-ws/calculator-contribution/calculator.png
index 476306e5f0..476306e5f0 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/calculator.png
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/calculator.png
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/pom.xml b/sandbox/samples/sca-features/binding-ws/calculator-contribution/pom.xml
index a177a043d5..a177a043d5 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/pom.xml
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/pom.xml
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/AddService.java
index 138213b5fc..138213b5fc 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/AddService.java
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/DivideService.java
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyService.java
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/SubtractService.java
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/resources/Calculator.composite b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/resources/Calculator.composite
index 3688ebcb85..3688ebcb85 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/resources/Calculator.composite
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
index 3a7548cd47..3a7548cd47 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/samples/temp/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
index 1952eb4a6e..1952eb4a6e 100644
--- a/sandbox/samples/temp/binding-ws/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sandbox/samples/sca-features/binding-ws/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sandbox/samples/temp/binding-sca/README b/sandbox/samples/temp/binding-sca/README
deleted file mode 100644
index 18ba62d494..0000000000
--- a/sandbox/samples/temp/binding-sca/README
+++ /dev/null
@@ -1 +0,0 @@
-Please look at the README files in the subdirectories of this directory for descriptions of the sample contributions.
diff --git a/sandbox/samples/temp/binding-sca/pom.xml b/sandbox/samples/temp/binding-sca/pom.xml
deleted file mode 100644
index e3cc9d6e43..0000000000
--- a/sandbox/samples/temp/binding-sca/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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-sca</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Sample binding.sca</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>contribution-calculator</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>
diff --git a/sandbox/samples/temp/binding-ws/README b/sandbox/samples/temp/binding-ws/README
deleted file mode 100644
index 18ba62d494..0000000000
--- a/sandbox/samples/temp/binding-ws/README
+++ /dev/null
@@ -1 +0,0 @@
-Please look at the README files in the subdirectories of this directory for descriptions of the sample contributions.
diff --git a/sandbox/samples/temp/binding-ws/pom.xml b/sandbox/samples/temp/binding-ws/pom.xml
deleted file mode 100644
index bfac74c8c0..0000000000
--- a/sandbox/samples/temp/binding-ws/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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-ws</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Sample binding.ws</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>contribution-calculator</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>