Windows deployment for SLC Detached

git-svn-id: https://svn.argeo.org/slc/trunk@1715 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.detached.launcher/pom.xml b/org.argeo.slc.detached.launcher/pom.xml
index d1afacb4d652df53b39afc59f072a18da42402d5..799d5703dd5b63e5edc8d3d9ca43ccfb7b679b18 100644 (file)
--- a/org.argeo.slc.detached.launcher/pom.xml
+++ b/org.argeo.slc.detached.launcher/pom.xml
@@ -86,5 +86,9 @@
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
         </dependency>
+        <dependency>\r
+            <groupId>xalan</groupId>\r
+            <artifactId>xalan</artifactId>\r
+        </dependency>\r
     </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.slc.detached.launcher/src/assembly/dist.xml b/org.argeo.slc.detached.launcher/src/assembly/dist.xml
index 570e4746d4fbe3371d598d0809d266969eef8142..271986f7adbfbf684ae0302b5ee23997868c6e52 100644 (file)
--- a/org.argeo.slc.detached.launcher/src/assembly/dist.xml
+++ b/org.argeo.slc.detached.launcher/src/assembly/dist.xml
@@ -4,7 +4,7 @@
        <id>dist</id>\r
        <includeBaseDirectory>false</includeBaseDirectory>\r
        <formats>\r
-               <format>zip</format>\r
+               <format>tar.gz</format>\r
        </formats>\r
        <fileSets>\r
                <fileSet>\r

diff --git a/org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached-settings.bat.template b/org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached-settings.bat.template
new file mode 100644 (file)
index 0000000..959365c
--- /dev/null
+++ b/org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached-settings.bat.template
@@ -0,0 +1,13 @@
+@echo off\r
+\r
+rem Target application\r
+set JAVA_HOME=[the target JRE]\r
+set SLC_USER_CLASSPATH=[classpath of the application to test]\r
+set SLC_DETACHED_APPCLASS=[main class of the application to test]\r
+set SLC_DETACHED_APPARGS=[arguments of the application to test]\r
+\r
+rem Runtime\r
+set PROJECT_BASE=[base of the project to being developed]\r
+set SLC_WORK_DIR=%PROJECT_BASE%/src/main/slc/work\r
+set SLC_USER_BUNDLES=reference:file:%PROJECT_BASE%/target/classes\r
+\r

diff --git a/org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached.bat b/org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached.bat
index b16fd3cf18b48977a6bed2252174dade7585646a..022d0734dad1505b527f25057799ffcebe6aa37a 100644 (file)
--- a/org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached.bat
+++ b/org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached.bat
@@ -9,7 +9,7 @@ call slc-detached-settings.bat
 rem FOR %%f IN (%SLC_HOME%\lib\detached\*.jar) DO set CLASSPATH=%CLASSPATH%;%%f
 FOR %%f IN (%SLC_HOME%\lib\detached\org.argeo.slc.detached.launcher-*.jar) DO set SLC_DETACHED_LAUNCHER_JAR=%%f
 
-set CLASSPATH=%SLC_DETACHED_LAUNCHER_JAR%;%SLC_USER_CLASSPATH%;%SLC_LIB_DETACHED%\aopalliance-1.0.jar;%SLC_LIB_DETACHED%\commons-io-1.4.jar;%SLC_LIB_DETACHED%\commons-logging-1.1.1.jar;%SLC_LIB_DETACHED%\log4j-1.2.15.jar;%SLC_LIB_DETACHED%\org.apache.felix.main-1.2.1.jar;%SLC_LIB_DETACHED%\spring-beans-2.0.8.jar;%SLC_LIB_DETACHED%\spring-context-2.0.8.jar;%SLC_LIB_DETACHED%\spring-core-2.0.8.jar;%SLC_LIB_DETACHED%\xercesImpl-2.8.1.jar;%SLC_LIB_DETACHED%\xml-apis-1.3.03.jar
+set CLASSPATH=%SLC_DETACHED_LAUNCHER_JAR%;%SLC_USER_CLASSPATH%;%SLC_LIB_DETACHED%\aopalliance-1.0.jar;%SLC_LIB_DETACHED%\commons-io-1.4.jar;%SLC_LIB_DETACHED%\commons-logging-1.1.1.jar;%SLC_LIB_DETACHED%\log4j-1.2.15.jar;%SLC_LIB_DETACHED%\org.apache.felix.main-1.2.1.jar;%SLC_LIB_DETACHED%\spring-beans-2.0.8.jar;%SLC_LIB_DETACHED%\spring-context-2.0.8.jar;%SLC_LIB_DETACHED%\spring-core-2.0.8.jar;%SLC_LIB_DETACHED%\xercesImpl-2.8.1.jar;%SLC_LIB_DETACHED%\xml-apis-1.3.03.jar;%SLC_LIB_DETACHED%\xalan-2.7.0.jar
 
 set CMD=%JAVA_HOME%\bin\java -Dslc.home=%SLC_HOME% -Dslc.workDir=%SLC_WORK_DIR% "-Dslc.detached.userBundles=%SLC_USER_BUNDLES%" -Dslc.detached.appclass=%SLC_DETACHED_APPCLASS% "-Dslc.detached.appargs=%SLC_DETACHED_APPARGS%" -classpath %CLASSPATH% org.argeo.slc.detached.launcher.Main
 rem echo CMD=%CMD%

diff --git a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
index 4c832aa78648bd946c365ee4d3147a546b313671..fe69e30c56af83cd95c2b7dceb7ff0e62b99fd1b 100644 (file)
--- a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
+++ b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
@@ -130,6 +130,10 @@ public class Main {
                String[] uiArgs = readArgumentsFromLine(config.getProperty(
                                "slc.detached.appargs", ""));
 
+               if (className == null)
+                       throw new Exception(
+                                       "A main class has to be defined with teh system property slc.detached.appclass");
+
                // Launch main method using reflection
                Class clss = Class.forName(className);
                Class[] mainArgsClasses = new Class[] { uiArgs.getClass() };

diff --git a/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties b/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
index cb9cdd2d460bed6b3b3b82aadc730ce0ed57ebcf..e5bd3924591941acb830adbcd3d06eef576d6bc6 100644 (file)
--- a/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
+++ b/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
@@ -18,7 +18,11 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
  org.springframework.core.io;version=2.0.8, \
  org.apache.commons.io; version=1.4.0, \
  org.apache.commons.io.filefilter; version=1.4.0, \
- org.apache.commons.logging \
+ org.apache.commons.logging, \
+ org.w3c.dom, \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.stream \
  ${jre-${java.specification.version}} 
 
 #org.osgi.framework.bootdelegation=sun.*,com.sun.*

diff --git a/org.argeo.slc.dist/pom.xml b/org.argeo.slc.dist/pom.xml
index 5c17874414205eb68e11194eddc41e9b0feea9c6..bc9778c29dfa695323e1fe8ee6e3b7fec1167ca9 100644 (file)
--- a/org.argeo.slc.dist/pom.xml
+++ b/org.argeo.slc.dist/pom.xml
@@ -52,7 +52,7 @@
                        <groupId>org.argeo.slc</groupId>\r
                        <artifactId>org.argeo.slc.detached.launcher</artifactId>\r
             <version>${project.version}</version>\r
-                       <type>zip</type>\r
+                       <type>tar.gz</type>\r
                        <classifier>dist</classifier>\r
                </dependency>\r
 \r

diff --git a/org.argeo.slc.dist/src/assembly/dist.xml b/org.argeo.slc.dist/src/assembly/dist.xml
index ab271ceae158ffe77598418f1a31c8fad8783e24..42d32c727f98138f1944a941e4d20fc784acdc48 100644 (file)
--- a/org.argeo.slc.dist/src/assembly/dist.xml
+++ b/org.argeo.slc.dist/src/assembly/dist.xml
@@ -30,7 +30,7 @@
             <outputFileNameMapping></outputFileNameMapping>\r
             <includes>\r
                 <include>\r
-                    org.argeo.slc:org.argeo.slc.detached.launcher:zip:dist\r
+                    org.argeo.slc:org.argeo.slc.detached.launcher:tar.gz:dist\r
                 </include>\r
             </includes>\r
             <fileMode>0755</fileMode>\r