Added maven appassembler to produce a distribution with server, gui and

usercode launchers.

5 files changed, 106 insertions, 2 deletions

diff --git a/bin/server.conf b/bin/server.conf
index 16f9ddd..eb692de 100644
--- a/bin/server.conf
+++ b/bin/server.conf
@@ -1,2 +1,2 @@
 ClusterStorage=LDAPClusterStorage,XMLDBClusterStorage

-ItemServer.Console.allow=localhost

+ItemServer.Console.allow=localhost,pcuwe04

diff --git a/pom.xml b/pom.xml
index 36faa96..e3c5a3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>cristal</groupId>
 	<artifactId>cristal-dev</artifactId>
-	<version>0.7-SNAPSHOT</version>
+	<version>3.0-SNAPSHOT</version>
 	<name>Cristal Development Module</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -39,6 +39,77 @@
 					<target>1.6</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>appassembler-maven-plugin</artifactId>
+				<version>1.8</version>
+				<configuration>
+					<repositoryLayout>flat</repositoryLayout>
+					<configurationDirectory>conf</configurationDirectory>
+					<copyConfigurationDirectory>true</copyConfigurationDirectory>
+					<useTimestampInSnapshotFileName>false</useTimestampInSnapshotFileName>
+					<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+					<assembleDirectory>${project.build.directory}/dist/client</assembleDirectory>
+					<showConsoleWindow>false</showConsoleWindow>
+					<repositoryName>lib</repositoryName>
+					<defaultJvmSettings>
+						<maxMemorySize>1024M</maxMemorySize>
+					</defaultJvmSettings>
+					<programs>
+						<program>
+							<mainClass>com.c2kernel.process.StandardServer</mainClass>
+							<id>cristal-server</id>
+							<commandLineArguments>
+								<commandLineArgument>-logLevel</commandLineArgument>
+								<commandLineArgument>0</commandLineArgument>
+								<commandLineArgument>-logFile</commandLineArgument>
+								<commandLineArgument>@BASEDIR@/server.log</commandLineArgument>								
+								<commandLineArgument>-config</commandLineArgument>
+								<commandLineArgument>@BASEDIR@/conf/server.conf</commandLineArgument>
+								<commandLineArgument>-connect</commandLineArgument>
+								<commandLineArgument>@BASEDIR@/conf/local.clc</commandLineArgument>
+							</commandLineArguments>
+						</program>					
+						<program>
+							<mainClass>com.c2kernel.gui.Main</mainClass>
+							<id>cristal-gui</id>
+							<commandLineArguments>
+								<commandLineArgument>-logLevel</commandLineArgument>
+								<commandLineArgument>0</commandLineArgument>
+								<commandLineArgument>-logFile</commandLineArgument>
+								<commandLineArgument>@BASEDIR@/gui.log</commandLineArgument>								
+								<commandLineArgument>-config</commandLineArgument>
+								<commandLineArgument>@BASEDIR@/conf/client.conf</commandLineArgument>
+								<commandLineArgument>-connect</commandLineArgument>
+								<commandLineArgument>@BASEDIR@/conf/local.clc</commandLineArgument>
+							</commandLineArguments>
+						</program>	
+						<program>
+							<mainClass>com.c2kernel.process.UserCodeProcess</mainClass>
+							<id>cristal-usercode</id>
+							<commandLineArguments>
+								<commandLineArgument>-logLevel</commandLineArgument>
+								<commandLineArgument>0</commandLineArgument>
+								<commandLineArgument>-logFile</commandLineArgument>
+								<commandLineArgument>@BASEDIR@/usercode.log</commandLineArgument>								
+								<commandLineArgument>-config</commandLineArgument>
+								<commandLineArgument>@BASEDIR@/conf/client.conf</commandLineArgument>
+								<commandLineArgument>-connect</commandLineArgument>
+								<commandLineArgument>@BASEDIR@/conf/local.clc</commandLineArgument>
+							</commandLineArguments>
+						</program>						
+					</programs>
+				</configuration>
+				<executions>
+					<execution>
+						<id>generate-distribution</id>
+						<phase>package</phase>
+						<goals>
+							<goal>assemble</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<issueManagement>
diff --git a/src/main/config/client.conf b/src/main/config/client.conf
new file mode 100644
index 0000000..6667aae
--- /dev/null
+++ b/src/main/config/client.conf
@@ -0,0 +1,2 @@
+ClusterStorage=LDAPClientReader,ProxyLoader

+EnableItemErase=true

diff --git a/src/main/config/local.clc.example b/src/main/config/local.clc.example
new file mode 100644
index 0000000..f6fe35d
--- /dev/null
+++ b/src/main/config/local.clc.example
@@ -0,0 +1,29 @@
+// Cristal Connect Local Centre example file

+// Copy this and change things

+

+// This name appears on the login box

+Name=Example Cristal Server

+Logo=http://path.to/image

+

+// TCP server ports

+ItemServer.name=HOSTNAME

+ItemServer.iiop=1500

+ItemServer.Proxy.port=1553

+ItemServer.Console.port=8080

+

+// LDAP config

+Authenticator=com.c2kernel.lookup.ldap.LDAPAuthManager

+Lookup=com.c2kernel.lookup.ldap.LDAPLookup

+LDAP.GlobalPath=LDAPROOTPATH

+LDAP.RootPath=cn=cristal

+LDAP.LocalPath=cn=dev

+LDAP.port=389

+LDAP.host=LDAPHOSTNAME

+LDAP.user=LDAPROOTUSER

+LDAP.password=LDAPPASSWORD

+

+// XMLDB config

+XMLDB.URI=xmldb:exist://EXISTHOSTNAME:8080/exist/xmlrpc/db

+XMLDB.root=dev

+XMLDB.user=EXISTROOTUSER

+XMLDB.EXIST=EXISTPASSWORD

diff --git a/src/main/config/server.conf b/src/main/config/server.conf
new file mode 100644
index 0000000..16f9ddd
--- /dev/null
+++ b/src/main/config/server.conf
@@ -0,0 +1,2 @@
+ClusterStorage=LDAPClusterStorage,XMLDBClusterStorage

+ItemServer.Console.allow=localhost