Move redundant modules into contrib

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

6 files changed, 0 insertions, 296 deletions

diff --git a/sandbox/travelsample/chapter-02/node-jumpstart/build.xml b/sandbox/travelsample/chapter-02/node-jumpstart/build.xml
deleted file mode 100644
index 0c3c506b67..0000000000
--- a/sandbox/travelsample/chapter-02/node-jumpstart/build.xml
+++ /dev/null
@@ -1,56 +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="scatours-chapter-02-node" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/scatours-chapter-02-node.jar" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="scatours.LaunchNode"/>
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="run">
-        <java classname="scatours.LaunchNode" fork="true">
-            <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
-</project>
diff --git a/sandbox/travelsample/chapter-02/node-jumpstart/pom.xml b/sandbox/travelsample/chapter-02/node-jumpstart/pom.xml
deleted file mode 100644
index f858f9f7e7..0000000000
--- a/sandbox/travelsample/chapter-02/node-jumpstart/pom.xml
+++ /dev/null
@@ -1,70 +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>1.6-SNAPSHOT</version>
-        <!--relativePath>../../pom.xml</relativePath-->
-    </parent>
-    <artifactId>scatours-chapter-02-node-jumpstart</artifactId>
-    <name>Apache Tuscany SCA Tours Chapter 02 Node Jumpstart</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-chapter-02-goodvaluetrips-contribution</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/sandbox/travelsample/chapter-02/node-jumpstart/src/main/java/scatours/LaunchNode.java b/sandbox/travelsample/chapter-02/node-jumpstart/src/main/java/scatours/LaunchNode.java
deleted file mode 100644
index b09939e49f..0000000000
--- a/sandbox/travelsample/chapter-02/node-jumpstart/src/main/java/scatours/LaunchNode.java
+++ /dev/null
@@ -1,53 +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 scatours;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-import com.goodvaluetrips.Trips;
-
-public class LaunchNode {
-
-    public static void main(String[] args) throws Exception {
-        try {
-            SCAContribution gvtContribution = 
-              new SCAContribution("goodvaluetrips", 
-                                  "../goodvaluetrips-contribution/target/classes");
-            SCANode node = SCANodeFactory.newInstance().
-               createSCANode("trips.composite", 
-                             gvtContribution);
-            node.start();
-
-            Trips tripProvider = ((SCAClient)node).getService(Trips.class, 
-                                                             "TripProvider/Trips");
-            
-            System.out.println("Trip boooking code = " + 
-                               tripProvider.checkAvailability("FS1APR4", 2));
-
-            node.stop();
-            
-        } catch (Throwable th) {
-            th.printStackTrace();
-        }
-    }
-}
diff --git a/sandbox/travelsample/chapter-02/node-jumpstart/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-02/node-jumpstart/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index e3ac806b9a..0000000000
--- a/sandbox/travelsample/chapter-02/node-jumpstart/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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://www.osoa.org/xmlns/sca/1.0"
-              xmlns:scatours="http://scatours">
-    <import namespace="http://tuscanyscatours.com/" />
-    <import namespace="http://goodvaluetrips.com/" />
-    <import namespace="http://client.scatours/" />
-    <deployable composite="scatours:scatours" />
-</contribution>
diff --git a/sandbox/travelsample/chapter-02/node-jumpstart/src/main/resources/scatours.composite b/sandbox/travelsample/chapter-02/node-jumpstart/src/main/resources/scatours.composite
deleted file mode 100644
index 6524f078f5..0000000000
--- a/sandbox/travelsample/chapter-02/node-jumpstart/src/main/resources/scatours.composite
+++ /dev/null
@@ -1,31 +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://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://scatours"
-    xmlns:client="http://client.scatours/"
-    xmlns:tours="http://tuscanyscatours.com/"
-    xmlns:trips="http://goodvaluetrips.com/"
-    name="scatours">
-
-    <include name="client:Client" />
-    <include name="tours:Tours" />
-    <include name="trips:Trips" />
-
-</composite>
diff --git a/sandbox/travelsample/chapter-02/node-jumpstart/src/test/java/scatours/NodeTestCase.java b/sandbox/travelsample/chapter-02/node-jumpstart/src/test/java/scatours/NodeTestCase.java
deleted file mode 100644
index 16cff30934..0000000000
--- a/sandbox/travelsample/chapter-02/node-jumpstart/src/test/java/scatours/NodeTestCase.java
+++ /dev/null
@@ -1,60 +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 scatours;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests all the components and services in chapter 2
- */
-public class NodeTestCase {
-
-    private SCANode node;
-
-    @Before
-    public void startServer() throws Exception {
-        try {
-            node = SCANodeFactory.newInstance().createSCANode("scatours.composite", 
-                new SCAContribution("goodvaluetrips", "../goodvaluetrips-contribution/target/classes"),
-                new SCAContribution("tuscanyscatours", "../tuscanyscatours-contribution/target/classes"),
-                new SCAContribution("client", "../client-contribution/target/classes"),
-                new SCAContribution("node", "./target/classes"));
-            node.start();
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-        }
-    }
-
-    @Test
-    public void testClient() throws Exception {
-        Runnable runner = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable");
-        runner.run();
-    }
-
-    @After
-    public void stopServer() throws Exception {
-        node.stop();
-    }
-}