Remove samples subfolder as its now in contrib and unreleased

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

18 files changed, 0 insertions, 700 deletions

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/README b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/README
deleted file mode 100644
index 4102b81e28..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Calculator Sample Contribution
-==============================
-
-This sample contribution implements a simple calculator using SCA components.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml
deleted file mode 100644
index 8fef755c8b..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
- * 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 name="sample-binding-sca-calculator-contribution" default="compile">
-    <property name="tuscany.home" value="../../../.."/>
-    <property name="jar.name"   value="sample-binding-sca-calculator-contribution.jar" />
-    
-    <echo>${tuscany.home}</echo>
-
-    <target name="init"> 
-      <delete quiet="true" includeemptydirs="true"> 
-         <fileset dir="target"/> 
-      </delete> 
-      <mkdir dir="target/classes"/> 
-    </target>
-    
-    <target name="compile" depends="init">
-      <javac srcdir="src/main/java" 
-             destdir="target/classes" 
-             debug="on"
-             source="1.5"
-             target="1.5"
-             failonerror="true"> 
-         <classpath>
-            <fileset dir="${tuscany.home}/lib">
-               <include name="tuscany-sca-api-*.jar" />
-            </fileset>
-         </classpath>
-      </javac> 
-      <copy todir="target/classes"> 
-         <fileset dir="src/main/resources"/> 
-      </copy> 
-      <jar destfile="target/${jar.name}" basedir="target/classes"> 
-         <manifest>
-            <attribute name="Main-Class" value="${main.class}" /> 
-         </manifest>
-      </jar>        
-    </target>
-</project>
-
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
deleted file mode 100644
index 134a9be456..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml
+++ /dev/null
@@ -1,57 +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>sample-binding-sca-calculator-contribution</artifactId>
-    <name>Apache Tuscany SCA Sample binding.sca Calculator Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency> 
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${project.artifactId}</finalName>
-       <plugins>
-          <plugin>
-             <groupId>org.apache.tuscany.maven.plugins</groupId>
-             <artifactId>maven-tuscany-plugin</artifactId>
-             <version>2.0-SNAPSHOT</version>
-          </plugin>
-       </plugins>
-   </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index bb75bb2337..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Add service
- */
-@Service(AddService.class)
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index afd5ea48fc..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package calculator;
-
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-@Scope("COMPOSITE")
-@EagerInit
-public class CalculatorClient {
-
-    private CalculatorService calculatorService;
-
-    @Reference
-    public void setCalculatorService(CalculatorService calculatorService) {
-        this.calculatorService = calculatorService;
-    }
-
-    @Init
-    public void calculate() {
-        // Calculate
-        System.out.println("SCA API ClassLoader: " + Reference.class.getClassLoader());
-        System.out.println("3 + 2=" + calculatorService.add(3, 2));
-        System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
-        System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
-        System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-    }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ce1cdaae5a..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The Calculator service interface.
- */
-@Remotable
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index fc53393d23..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-
-/**
- * An implementation of the Calculator service.
- */
-@Service(CalculatorService.class)
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index b1250ed9f2..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Divide service.
- */
-@Service(DivideService.class)
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 11f68c66e3..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Multiply service.
- */
-@Service(MultiplyService.class)
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 30e59bf668..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the subtract service.
- */
-@Service(SubtractService.class)
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/Calculator.composite
deleted file mode 100644
index 05bea57944..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,49 +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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/CalculatorClient.composite
deleted file mode 100644
index dfd32761be..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/CalculatorClient.composite
+++ /dev/null
@@ -1,30 +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.    

--->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-           targetNamespace="http://sample"

-           xmlns:sample="http://sample"

-           name="CalculatorClient">

-

-    <component name="CalculatorClient">

-		<implementation.java class="calculator.CalculatorClient"/>

-        <reference name="calculatorService" target="CalculatorServiceComponent" />

-    </component>

-

-</composite>

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 3e64787ce4..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:Calculator"/>
-   <deployable composite="sample:CalculatorClient"/>
-</contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index 9d3024f451..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * A unit test of the basic Java implementation classes in this contribution 
- * without using SCA
- */
-public class CalculatorTestCase {
-
-    @Test
-    public void testCalculator() throws Exception {
-        AddService add = new AddServiceImpl();
-        SubtractService subtract = new SubtractServiceImpl();
-        MultiplyService multiply = new MultiplyServiceImpl();
-        DivideService divide = new DivideServiceImpl();
-        
-        CalculatorServiceImpl calculator = new CalculatorServiceImpl();
-        
-        calculator.setAddService(add);
-        calculator.setSubtractService(subtract);
-        calculator.setMultiplyService(multiply);
-        calculator.setDivideService(divide);
-        
-        assertEquals(calculator.add(3, 2), 5.0, 0);
-        assertEquals(calculator.subtract(3, 2), 1.0, 0);
-        assertEquals(calculator.multiply(3, 2), 6.0, 0);
-        assertEquals(calculator.divide(3, 2), 1.5, 0);
-    }
-}