Make domain launchers run from the distribution (TUSCANY-3423)

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

4 files changed, 51 insertions, 120 deletions

diff --git a/sandbox/travelsample/launchers/fullapp-domain/build.xml b/sandbox/travelsample/launchers/fullapp-domain/build.xml
index 1befc6413f..d294dc664a 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/build.xml
+++ b/sandbox/travelsample/launchers/fullapp-domain/build.xml
@@ -26,7 +26,7 @@
        manager API.  Note that the classpath only includes the node launcher

        jar which will bootstrap the rest of the Tuscany runtime. -->

     <target name="run">

-        <java classname="scatours.FullAppDomainLauncher" fork="true">

+        <java classname="scatours.FullAppDomainAPILauncher" fork="true">

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

                 <fileset dir="${env.TUSCANY_HOME}/modules">

@@ -48,7 +48,7 @@
                     <include name="tuscany-node-launcher-*.jar"/>

                 </fileset>

             </classpath>

-        	<arg value=".\target\classes"/>

+        	<arg value="./target/classes"/>

         </java>

     </target>

 </project>

diff --git a/sandbox/travelsample/launchers/fullapp-domain/pom.xml b/sandbox/travelsample/launchers/fullapp-domain/pom.xml
index c0dcf5e00c..ae69ddd348 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/pom.xml
+++ b/sandbox/travelsample/launchers/fullapp-domain/pom.xml
@@ -31,113 +31,12 @@
     <dependencies>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-assembly</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-core</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>        

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-launcher</artifactId>

             <version>${tuscany.version}</version>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-domain-manager</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-atom-abdera</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jsonrpc-js</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-http-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-axis2</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>scatours-contribution-fullapp-bespoketrip</artifactId>

             <version>${pom.version}</version>

             <scope>provided</scope>

@@ -202,7 +101,11 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

-                        <manifestFile>META-INF/MANIFEST.MF</manifestFile>

+                        <manifest>

+                            <addClasspath>true</addClasspath>

+                            <classpathPrefix>../lib/</classpathPrefix>

+                            <mainClass>scatours.FullAppDomainLauncher</mainClass>

+                        </manifest>

                     </archive>

                 </configuration>

             </plugin>

diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainAPILauncher.java b/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainAPILauncher.java
new file mode 100644
index 0000000000..4f8d564eac
--- /dev/null
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainAPILauncher.java
@@ -0,0 +1,42 @@
+/*

+ * 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 java.io.IOException;

+import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;

+

+public class FullAppDomainAPILauncher {

+

+    public static void main(String[] args) throws Exception {

+    	DomainManagerLauncher dml = DomainManagerLauncher.newInstance();

+    	Object dm = dml.createDomainManager("../../domainconfig/fullapp/target/classes");

+        dm.getClass().getMethod("start").invoke(dm);

+    	

+        System.out.println("Point your browser at - http://localhost:9990/ui/home/ ");

+        System.out.println("Domain started - Press enter to shutdown.");

+

+        try {

+            System.in.read();

+        } catch (IOException e) {

+        }

+

+        dm.getClass().getMethod("stop").invoke(dm);

+    }

+}

diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java b/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java
index 21b0ae4cb3..599ca75e24 100644
--- a/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java
@@ -19,26 +19,12 @@
 
 package scatours;
 
-import java.io.IOException;
-import java.util.logging.Level;
-
 import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
 
 public class FullAppDomainLauncher {
 
     public static void main(String[] args) throws Exception {
-    	DomainManagerLauncher dml = DomainManagerLauncher.newInstance();
-    	Object dm = dml.createDomainManager("./target/classes");
-        dm.getClass().getMethod("start").invoke(dm);
-    	
-        System.out.println("Point your browser at - http://localhost:9990/ui/home/ ");
-        System.out.println("Domain started - Press enter to shutdown.");
-
-        try {
-            System.in.read();
-        } catch (IOException e) {
-        }
-
-        dm.getClass().getMethod("stop").invoke(dm);
+        String[] dmArgs = {"../domainconfig/fullapp"};
+        DomainManagerLauncher.main(dmArgs);
     }
 }