From bd289ae8e8a75c6ca1ecbe4fc86960607b6846de Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 6 Oct 2008 06:32:34 +0000
Subject: [PATCH] Windows deployment for SLC Detached

git-svn-id: https://svn.argeo.org/slc/trunk@1715 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc.detached.launcher/pom.xml             |  4 ++++
 .../src/assembly/dist.xml                           |  2 +-
 .../base/bin/slc-detached-settings.bat.template     | 13 +++++++++++++
 .../src/main/base/bin/slc-detached.bat              |  2 +-
 .../java/org/argeo/slc/detached/launcher/Main.java  |  4 ++++
 .../argeo/slc/detached/launcher/felix.properties    |  6 +++++-
 org.argeo.slc.dist/pom.xml                          |  2 +-
 org.argeo.slc.dist/src/assembly/dist.xml            |  2 +-
 8 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached-settings.bat.template

diff --git a/org.argeo.slc.detached.launcher/pom.xml b/org.argeo.slc.detached.launcher/pom.xml
index d1afacb4d..799d5703d 100644
--- 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>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
     </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 570e4746d..271986f7a 100644
--- 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>
 	<includeBaseDirectory>false</includeBaseDirectory>
 	<formats>
-		<format>zip</format>
+		<format>tar.gz</format>
 	</formats>
 	<fileSets>
 		<fileSet>
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
index 000000000..959365ced
--- /dev/null
+++ b/org.argeo.slc.detached.launcher/src/main/base/bin/slc-detached-settings.bat.template
@@ -0,0 +1,13 @@
+@echo off
+
+rem Target application
+set JAVA_HOME=[the target JRE]
+set SLC_USER_CLASSPATH=[classpath of the application to test]
+set SLC_DETACHED_APPCLASS=[main class of the application to test]
+set SLC_DETACHED_APPARGS=[arguments of the application to test]
+
+rem Runtime
+set PROJECT_BASE=[base of the project to being developed]
+set SLC_WORK_DIR=%PROJECT_BASE%/src/main/slc/work
+set SLC_USER_BUNDLES=reference:file:%PROJECT_BASE%/target/classes
+
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 b16fd3cf1..022d0734d 100644
--- 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 4c832aa78..fe69e30c5 100644
--- 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 cb9cdd2d4..e5bd39245 100644
--- 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 5c1787441..bc9778c29 100644
--- a/org.argeo.slc.dist/pom.xml
+++ b/org.argeo.slc.dist/pom.xml
@@ -52,7 +52,7 @@
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.detached.launcher</artifactId>
             <version>${project.version}</version>
-			<type>zip</type>
+			<type>tar.gz</type>
 			<classifier>dist</classifier>
 		</dependency>
 
diff --git a/org.argeo.slc.dist/src/assembly/dist.xml b/org.argeo.slc.dist/src/assembly/dist.xml
index ab271ceae..42d32c727 100644
--- a/org.argeo.slc.dist/src/assembly/dist.xml
+++ b/org.argeo.slc.dist/src/assembly/dist.xml
@@ -30,7 +30,7 @@
             <outputFileNameMapping></outputFileNameMapping>
             <includes>
                 <include>
-                    org.argeo.slc:org.argeo.slc.detached.launcher:zip:dist
+                    org.argeo.slc:org.argeo.slc.detached.launcher:tar.gz:dist
                 </include>
             </includes>
             <fileMode>0755</fileMode>
-- 
2.39.2