delete the beta2 branch as i'd not seen raymonds mail when i made it and we might as well wait till he's got his changes in before creating the beta2 branch

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

19 files changed, 0 insertions, 815 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF
deleted file mode 100644
index 1ebd35b30a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: calculator;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Calculator OSGi Sample

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Eclipse-LazyStart: false

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1223949424781

-Bundle-Activator: calculator.CalculatorActivator

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Calculator OSGi Sample

-Import-Package: org.apache.tuscany.sca.node;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0",

- org.osgi.framework;version="1.4"

-Bundle-SymbolicName: sample-calculator-osgi

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/README b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/README
deleted file mode 100644
index bc1e6298a7..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Calculator Sample Contribution
-==============================
-
-This sample contribution implements a simple calculator using SCA components. The
-contribution is tested automatically under OSGi using the maven-osgi-junit-plugin
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/build.xml b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/build.xml
deleted file mode 100644
index 7dbc5c3bd3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/build.xml
+++ /dev/null
@@ -1,78 +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="calculator-osgi" default="run">
-    <property name="sample.name" value="${ant.project.name}"/>
-    <property name="sample.jar" value="./target/sample-${sample.name}.jar" />
-
-    <target name="init">
-        <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">
-            <classpath>
-                <fileset dir="../../../../features">
-                    <include name="tuscany-sca-manifest.jar" />
-                </fileset>
-            </classpath>
-        </javac>
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="${sample.jar}" basedir="target/classes">
-        </jar>
-    </target>
-
-    <target name="run" depends="compile">
-        <java jar="../../features/tuscany-sca-manifest.jar" fork="true">
-            <jvmarg value="-Djava.util.logging.config.file=logging.properties"/>
-            <!-- optional to set the deployable composite -->
-            <arg value="-composite"/>
-            <arg value="Calculator.composite"/>
-            <!-- stop the node after the application runs -->
-            <arg value="-ttl"/>
-            <arg value="0"/>
-            <arg value="${sample.jar}"/>
-        </java>
-    </target>
-
-    <target name="run-equinox" depends="compile">
-        <java jar="../../features/tuscany-sca-equinox-manifest.jar" fork="true">
-            <jvmarg value="-Djava.util.logging.config.file=logging.properties"/>
-            <arg value="-composite"/>
-            <arg value="Calculator.composite"/>
-            <arg value="-config"/>
-            <arg value="../../features/configuration"/>
-            <arg value="-ttl"/>
-            <arg value="0"/>
-            <arg value="${sample.jar}"/>
-        </java>
-    </target>
-
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
-
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/logging.properties b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/logging.properties
deleted file mode 100644
index cf452e7812..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/logging.properties
+++ /dev/null
@@ -1,25 +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.
-#
-
-handlers= java.util.logging.ConsoleHandler
-
-.level = INFO
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-org.apache.tuscany.sca.level = INFO
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml
deleted file mode 100644
index e477fd652b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml
+++ /dev/null
@@ -1,116 +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-Beta2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-maven-osgi-junit-calculator-osgi</artifactId>
-    <name>Apache Tuscany SCA Sample Maven OSGI JUnit Calculator OSGi</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-api</artifactId>
-            <version>2.0-Beta2-SNAPSHOT</version>
-            <type>pom</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-all</artifactId>
-            <version>2.0-Beta2-SNAPSHOT</version>
-            <type>pom</type>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <version>2.5.1</version>
-                <configuration>
-                    <buildcommands>
-                        <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
-                        <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
-                    </buildcommands>
-                    <projectnatures>
-                        <projectnature>org.eclipse.jdt.core.javanature</projectnature>
-                        <projectnature>org.eclipse.pde.PluginNature</projectnature>
-                    </projectnatures>
-                    <classpathContainers>
-                        <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER
-                        </classpathContainer>
-                    </classpathContainers>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
-                </configuration>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.tuscany.maven.plugins</groupId>
-                <artifactId>maven-osgi-junit-plugin</artifactId>
-                <version>1.0</version>
-                <dependencies>
-                   <dependency>
-                      <groupId>org.apache.tuscany.sca</groupId>
-                      <artifactId>tuscany-node-launcher-equinox</artifactId>
-                      <version>${pom.version}</version>
-                   </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>osgi-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <systemProperties>
-                                <property>
-                                    <name>osgi.configuration.area</name>
-                                    <value>${project.build.directory}/equinox</value>
-                                </property>
-                            </systemProperties>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/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/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +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;
-
-/**
- * An implementation of the Add service
- */
-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/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
deleted file mode 100644
index 4408568629..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
+++ /dev/null
@@ -1,54 +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.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * Bundle Activator for Calculator
- *
- */
-public class CalculatorActivator implements BundleActivator {
-    private Node node;
-
-    public void start(BundleContext context) throws Exception {
-        try {
-            NodeFactory factory = NodeFactory.newInstance();
-            String url = ContributionLocationHelper.getContributionLocation(getClass());
-            Contribution contrib = new Contribution("c1", url);
-            node = factory.createNode("Calculator.composite", contrib);
-            node.start();
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void stop(BundleContext context) throws Exception {
-        if (node != null) {
-            node.stop();
-            node = null;
-        }
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index afd5ea48fc..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/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/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index c89043276e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,34 +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 Calculator service interface.
- */
-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/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 39f55ca31f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,69 +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;
-
-/**
- * An implementation of the Calculator service.
- */
-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/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/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/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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;
-
-/**
- * An implementation of the Divide service.
- */
-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/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/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/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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;
-
-/**
- * An implementation of the Multiply service.
- */
-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/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/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/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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;
-
-/**
- * An implementation of the subtract service.
- */
-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/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite
deleted file mode 100644
index c5e636f769..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,54 +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>
-
-    <component name="CalculatorClient">
-		<implementation.java class="calculator.CalculatorClient"/>
-        <reference name="calculatorService" target="CalculatorServiceComponent" />
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index d6a3ccb24e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/samples/running-tuscany/maven-osgi-junit/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
+++ /dev/null
@@ -1,54 +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.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This shows how to test the Calculator composition.
- */
-public class CalculatorTestCase {
-
-    private static Node node;   
-    
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        String location = ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
-        node = NodeFactory.newInstance().createNode("Calculator.composite", new Contribution("test", location));
-        System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader());
-        node.start();
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        if (node != null) {
-            node.stop();
-        }
-    }
-
-    @Test
-    public void testDummy() throws Exception {
-    }
-}