19 files changed, 1 insertions, 274 deletions
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
index a0f60bcf6b..a0f60bcf6b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRef.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateViaAsyncRef.java
index 6ae8fd13f6..6ae8fd13f6 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRef.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateViaAsyncRef.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorAsyncHandler.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorAsyncHandler.java
index abaeef8062..abaeef8062 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorAsyncHandler.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorAsyncHandler.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorClient.java
index cc1d1d8d46..cc1d1d8d46 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorService.java
index 45bdd265d4..45bdd265d4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceAsync.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceAsync.java
index 3979529595..3979529595 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceAsync.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceAsync.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceAsyncImpl.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceAsyncImpl.java
index 1906f46f5b..1906f46f5b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceAsyncImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceAsyncImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceProxyImpl.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceProxyImpl.java
index 69c96fe892..69c96fe892 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceProxyImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceProxyImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceSyncImpl.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSyncImpl.java
index 615a4f4f11..615a4f4f11 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceSyncImpl.java
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSyncImpl.java
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/Calculator.composite
index 6117d436db..6117d436db 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/CalculatorClient.composite
index 374ef27e2b..374ef27e2b 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
index 3e64787ce4..3e64787ce4 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/sample-contribution-implementation-java-calculator-async/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/pom.xml
deleted file mode 100644
index 1ba7e0385c..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/pom.xml
+++ /dev/null
@@ -1,76 +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-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-launcher-embedded-jse-async</artifactId>
-    <name>Apache Tuscany SCA Sample Embedded JSE Launcher for asynchronous behaviour</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-api</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-core</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-webservice</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-ejava</artifactId>
-            <type>pom</type>
-            <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>${artifactId}</finalName>
-
-       <plugins>
-         
-       </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 9937323993..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,31 +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 {
-    String calculate(Integer n1);
-}
-\ No newline at end of file
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/RuntimeIntegration.java b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/RuntimeIntegration.java
deleted file mode 100644
index aa36b6009b..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/RuntimeIntegration.java
+++ /dev/null
@@ -1,43 +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 launcher;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-
-/**
- * Base JSE launcher function
- */
-public class RuntimeIntegration {
-    
-    
-    public Node startNode(Contribution... contributions){
-        Node node = NodeFactory.newInstance().createNode(contributions);
-        node.start();
-        return node;
-    }
-    
-    public void stopNode(Node node){
-        node.stop();
-    }
-    
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java
deleted file mode 100644
index a5e6d75d24..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java
+++ /dev/null
@@ -1,45 +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 launcher;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-
-import calculator.CalculatorService;
-
-
-/**
- * This client program shows how to create an embedded SCA runtime, load a contribution,
- * start it and, in some cases, locate and invoke an SCA component 
- */
-public class SampleJSELauncher extends RuntimeIntegration {
-    
-    protected boolean waitBeforeStopping = false;
-    
-    public static void main(String[] args) throws Exception {
-        SampleJSELauncher launcher = new SampleJSELauncher();       
-        launcher.launchImplementationJavaCalculatorAsync();          
-    }
-
-    public void launchImplementationJavaCalculatorAsync(){
-        Node node = startNode(new Contribution("c1", "../sample-contribution-implementation-java-calculator-async/target/sample-contribution-implementation-java-calculator-async.jar"));
-        stopNode(node);
-    }    
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleLauncherException.java
deleted file mode 100644
index 1eacb94b19..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleLauncherException.java
+++ /dev/null
@@ -1,42 +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 launcher;
-
-/**
- * This exception signals problems in the management of SCA component execution.
- */
-public class SampleLauncherException extends RuntimeException {
-    /**
-     * Constructs a SampleLauncherException with no detail message. 
-     */
-    public SampleLauncherException() {
-        super();
-    }
-
-    /**
-     * Constructs a SampleLauncherException with the specified detail
-     * message. 
-     *
-     * @param     message the detail message
-     */
-    public SampleLauncherException(String message) {
-        super(message);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java
deleted file mode 100644
index 9c046a9ca1..0000000000
--- a/sca-java-2.x/trunk/samples/learning-more/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.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 launcher;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Test sample contributions.
- */
-public class LauncherTestCase {
-
-	@Ignore
-    @Test
-    public void testContributionImplementationJavaCalculatorAsync() throws Exception {
-        SampleJSELauncher.main(null);
-    }
-   
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/pom.xml
index 25d4101550..0f46f8399f 100644
--- a/sca-java-2.x/trunk/samples/learning-more/async/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/async/pom.xml
@@ -36,8 +36,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>sample-contribution-implementation-java-calculator-async</module>
-                <module>embedded-jse-async-sample-launcher</module>
+                <module>calculator-contribution</module>
             </modules>
         </profile>
     </profiles>