Start adding the launcher to the distro to try it out, still very primitive and does't quite work yet

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

5 files changed, 237 insertions, 180 deletions

diff --git a/java/sca/distribution/all/pom.xml b/java/sca/distribution/all/pom.xml
index 8b3c1ef7b9..5a3ed1d5fa 100644
--- a/java/sca/distribution/all/pom.xml
+++ b/java/sca/distribution/all/pom.xml
@@ -1,180 +1,185 @@
-<?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-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-all</artifactId>
-    <name>Apache Tuscany SCA All-in-one Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-api</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webapp</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webservice</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-ejava</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!--
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-manager</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-process</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-web20</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-gdata-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-fastinfoset</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-xmlbeans</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-tracing-aspectj</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        -->
-
-    </dependencies>
-
-    <profiles>
-    
-        <!-- Build profile that can be used to build the distro packages -->
-        <profile>
-            <id>distribution</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-modules</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>generate-modules</goal>
-                                </goals>
-                                <configuration>
-                                    <targetDirectory>target/modules</targetDirectory>
-                                    <generateManifestJar>true</generateManifestJar>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-all-2.0-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>    
-
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-            </modules>
-        </profile>
-    </profiles>
-
-</project>
+<?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-distribution</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../pom.xml</relativePath>

+    </parent>

+

+    <artifactId>tuscany-distribution-all</artifactId>

+    <name>Apache Tuscany SCA All-in-one Distribution</name>

+    <packaging>pom</packaging>

+

+    <dependencies>

+

+        <dependency>

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

+            <artifactId>tuscany-distribution-api</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-distribution-core</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-distribution-webapp</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-distribution-webservice</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-distribution-ejava</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-launcher</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        <!--

+        <dependency>

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

+            <artifactId>tuscany-distribution-manager</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-distribution-process</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-distribution-web20</artifactId>

+            <type>pom</type>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-binding-gdata-runtime</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-databinding-fastinfoset</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-databinding-xmlbeans</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+

+        <dependency>

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

+            <artifactId>tuscany-tracing-aspectj</artifactId>

+            <version>2.0-SNAPSHOT</version>

+        </dependency>

+        -->

+

+    </dependencies>

+

+    <profiles>

+    

+        <!-- Build profile that can be used to build the distro packages -->

+        <profile>

+            <id>distribution</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <build>

+                <plugins>

+                    <plugin>

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

+                        <artifactId>tuscany-maven-bundle-plugin</artifactId>

+                        <executions>

+                            <execution>

+                                <id>distribution-modules</id>

+                                <phase>generate-resources</phase>

+                                <goals>

+                                    <goal>generate-modules</goal>

+                                </goals>

+                                <configuration>

+                                    <targetDirectory>target/modules</targetDirectory>

+                                    <generateManifestJar>true</generateManifestJar>

+                                </configuration>

+                            </execution>

+                        </executions>

+                    </plugin>

+

+                    <plugin>

+                        <groupId>org.apache.maven.plugins</groupId>

+                        <artifactId>maven-assembly-plugin</artifactId>

+                        <executions>

+                            <execution>

+                                <id>distribution-package</id>

+                                <phase>package</phase>

+                                <goals>

+                                    <goal>single</goal>

+                                </goals>

+                                <configuration>

+                                    <descriptors>

+                                        <descriptor>src/main/assembly/bin.xml</descriptor>

+                                        <descriptor>src/main/assembly/src.xml</descriptor>

+                                    </descriptors>

+                                    <tarLongFileMode>gnu</tarLongFileMode>

+                                    <finalName>apache-tuscany-sca-all-2.0-SNAPSHOT</finalName>

+                                </configuration>

+                            </execution>

+                        </executions>

+                    </plugin>

+                </plugins>

+            </build>

+        </profile>    

+

+        <!-- Profile that can be used to build the modules included in the distro -->

+        <profile>

+            <id>modules</id>

+            <modules>

+            </modules>

+        </profile>

+    </profiles>

+

+</project>

diff --git a/java/sca/distribution/all/src/main/assembly/bin.xml b/java/sca/distribution/all/src/main/assembly/bin.xml
index 5db4ba65a5..2a8b628674 100644
--- a/java/sca/distribution/all/src/main/assembly/bin.xml
+++ b/java/sca/distribution/all/src/main/assembly/bin.xml
@@ -35,6 +35,8 @@
         <componentDescriptor>../ejava/src/main/components/bin-samples.xml</componentDescriptor>

         <componentDescriptor>../host-webapp/src/main/components/bin-samples.xml</componentDescriptor>

         <componentDescriptor>../webservice/src/main/components/bin-samples.xml</componentDescriptor>

+        <componentDescriptor>../all/src/main/components/bin-launcher.xml</componentDescriptor>

+

 <!--

         <componentDescriptor>../manager/src/main/components/bin-samples.xml</componentDescriptor>

         <componentDescriptor>../process/src/main/components/bin-samples.xml</componentDescriptor>

diff --git a/java/sca/distribution/all/src/main/components/bin-launcher.xml b/java/sca/distribution/all/src/main/components/bin-launcher.xml
new file mode 100644
index 0000000000..ae7aba79ca
--- /dev/null
+++ b/java/sca/distribution/all/src/main/components/bin-launcher.xml
@@ -0,0 +1,41 @@
+<!--

+    * 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.

+-->

+<component>

+    <fileSets>

+        <fileSet>

+            <directory>src/main/release/launcher</directory>

+            <outputDirectory>bin</outputDirectory>

+            <includes>

+            </includes>

+        </fileSet>

+    </fileSets>

+

+    <dependencySets>

+        <dependencySet>

+            <outputDirectory>bin</outputDirectory>

+            <unpack>false</unpack>

+            <includes>

+                <include>org.apache.tuscany.sca:tuscany-launcher</include>

+            </includes>

+            <outputFileNameMapping>launcher.jar</outputFileNameMapping>

+        </dependencySet>

+

+    </dependencySets>

+

+</component>

diff --git a/java/sca/distribution/all/src/main/release/launcher/default.config b/java/sca/distribution/all/src/main/release/launcher/default.config
new file mode 100644
index 0000000000..fd6d9e9dd6
--- /dev/null
+++ b/java/sca/distribution/all/src/main/release/launcher/default.config
@@ -0,0 +1,3 @@
+classpath=../modules/**

+mainClass=org.apache.tuscany.sca.node.launcher.NodeMain2

+

diff --git a/java/sca/distribution/all/src/main/release/launcher/tuscany.bat b/java/sca/distribution/all/src/main/release/launcher/tuscany.bat
new file mode 100644
index 0000000000..823eea56e2
--- /dev/null
+++ b/java/sca/distribution/all/src/main/release/launcher/tuscany.bat
@@ -0,0 +1,6 @@
+@echo off

+

+REM bla

+

+java -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -jar launcher.jar %1 %2 %3 %4 %5 %6 %7

+REM java -jar launcher.jar %1 %2 %3 %4 %5 %6 %7