Index: unix_installer/installer-package/.cvsignore
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/.cvsignore,v
diff -u -r1.1 -r1.2
--- unix_installer/installer-package/.cvsignore	13 Mar 2008 05:58:55 -0000	1.1
+++ unix_installer/installer-package/.cvsignore	30 Apr 2008 03:03:59 -0000	1.2
@@ -1,5 +1,3 @@
 *.swp
 build
-build/*
-assembly
-assembly/*
\ No newline at end of file
+assembly
\ No newline at end of file
Index: unix_installer/installer-package/build.xml
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/build.xml,v
diff -u -r1.3 -r1.4
--- unix_installer/installer-package/build.xml	13 Mar 2008 05:58:55 -0000	1.3
+++ unix_installer/installer-package/build.xml	30 Apr 2008 03:03:59 -0000	1.4
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="Unix-Build-Script" default="build" basedir=".">
+<project name="Unix-Installer-Build-Script" default="build" basedir=".">
 
- 	<property name="VERSION" value="2.1-RC1" />
+ 	<property name="VERSION" value="2.1" />
  	<property name="PACKAGE-ROOT" value="build/lams-unix-installer-${VERSION}" />
 	<property name="db.username" value="lams" />
 	<property name="db.password" value="lamsdemo" />
@@ -30,6 +30,9 @@
 		<mkdir dir="${PACKAGE-ROOT}/doc" />
 		
 		<!-- copy files to new created folders -->
+		
+        
+
 		<exec executable="cp" failonerror="true">
 			<arg line="-r" />
 		    <arg line="ant" />
@@ -38,49 +41,23 @@
 		    <arg line="bin" />
 			<arg line="conf" />
 		    <arg line="database" />
-		    <arg line="install-lams.sh" />		
-			<arg line="wrapper" />		
+			<arg line="doc" />
+			<arg line="repository" />
+			<arg line="sql-scripts" />
+			<arg line="wrapper" />   
+		    <arg line="install-lams.sh" />			
 			<arg line="readme" />
 			<arg line="license" />
 			<arg line="lams.properties" />
 			<arg line="${PACKAGE-ROOT}" />
 		</exec>
 		
-		<exec executable="cp" failonerror="true">
-			<arg line="doc/setLamsConfiguration.sql" />
-		    <arg line="${PACKAGE-ROOT}/doc" />
+		<!-- Remove all the CVS directories -->
+		<exec executable="/bin/bash" failonerror="true">
+			<arg value="-c" />
+			<arg value="./createPackage.sh" />
 		</exec>
 		
-		<exec executable="cp" failonerror="true">
-			<arg line="sql-scripts/create-database.sql" />
-		    <arg line="${PACKAGE-ROOT}/sql-scripts" />
-		</exec>
-	
-		<exec executable="cp" failonerror="true">
-			<arg line="bin/checkmysql.class" />
-			<arg line="bin/testJava.class" />
-			<arg line="bin/run-lams.sh" />
-			<arg line="${PACKAGE-ROOT}/bin" />	
-		</exec>
-
-		<!-- create ${PACKAGE-ROOT}.tar.gz and place it in the build directory -->
-		
-		<!--
-		<exec executable="tar" failonerror="true">
-                        <arg line="cCf" />
-                        <arg line="${PACKAGE-ROOT}.tar" />
-                        <arg line="${PACKAGE-ROOT}" />
-                </exec>
-
-		
-
-		<tar longfile="gnu" destfile="${PACKAGE-ROOT}.tar" basedir="build" excludes="*.tar.gz, *.tar.gz.bak"/>
-		
-		
-		<gzip zipfile="${PACKAGE-ROOT}.tar.gz" src="${PACKAGE-ROOT}.tar" />
-		
-		<delete failonerror="false" file="${PACKAGE-ROOT}.tar" />
-		-->
 	</target>
 	
 	<!-- clean the installation, the .bak file will remain in the build dir -->
Index: unix_installer/installer-package/createPackage.sh
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/createPackage.sh,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ unix_installer/installer-package/createPackage.sh	30 Apr 2008 03:03:59 -0000	1.1
@@ -0,0 +1,10 @@
+#!/bin/bash
+#Removes all the CVS and *.bak files from the build directory
+
+. ./lams.properties
+
+cd build
+find . -name CVS | xargs rm -rf
+find . -name *.bak | xargs rm -rf
+
+tar -czf lams-unix-installer-$LAMS_VERSION.tar.gz lams-unix-installer-$LAMS_VERSION
Index: unix_installer/installer-package/install-lams.sh
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/install-lams.sh,v
diff -u -r1.8 -r1.9
Binary files differ
Index: unix_installer/installer-package/lams.properties
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/lams.properties,v
diff -u -r1.3 -r1.4
--- unix_installer/installer-package/lams.properties	13 Mar 2008 05:58:55 -0000	1.3
+++ unix_installer/installer-package/lams.properties	30 Apr 2008 03:03:59 -0000	1.4
@@ -23,7 +23,7 @@
 #########################################################################################
 
 # The lamshome directory, will contain repository, temp and dump files
-# Make sure this location has suffiecient disk space as several files will be stored
+# Make sure this location has sufficient disk space as several files will be stored
 # here during run time
 LAMS_DIR=/var/opt/lams
 
@@ -71,7 +71,7 @@
 JBOSS_DIR=/usr/local/jboss-4.0.2
 
 # The directory that contains your JDK. (Must be 1.5 or higher)
-JDK_DIR=/usr/bin/java/jdk1.5.0_11/
+JDK_DIR=/usr/lib/jvm/java-1.5.0-sun/
 
 # The location of your mysql executable (Must be 5.0 or higher)
 SQL_DIR=/usr/bin
@@ -122,5 +122,8 @@
 # The URL of the default mysql database
 MYSQL_DB_URL=jdbc:mysql://${SQL_HOST}/mysql?characterEncoding=utf8
 
+# The version of this lams installer
+LAMS_VERSION=2.1
+
 #########################################################################################
 
Index: unix_installer/installer-package/license
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/license,v
diff -u -r1.3 -r1.4
Binary files differ
Index: unix_installer/installer-package/readme
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/readme,v
diff -u -r1.4 -r1.5
Binary files differ
Index: unix_installer/installer-package/bin/run-lams.sh
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/bin/run-lams.sh,v
diff -u -r1.4 -r1.5
Binary files differ
Index: unix_installer/installer-package/database/lams.dump
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/database/Attic/lams.dump,v
diff -u -r1.3 -r1.4
Binary files differ
Index: unix_installer/installer-package/repository/02/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/02/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/03/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/03/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/04/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/04/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/05/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/05/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/07/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/07/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/08/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/08/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/09/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/09/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/10/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/10/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/11/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/11/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/12/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/12/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/13/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/13/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/15/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/15/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/16/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/16/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/17/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/17/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/19/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/19/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/20/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/20/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/21/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/21/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/23/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/23/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/24/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/24/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/25/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/25/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/27/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/27/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/28/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/28/Attic/1,v
diff -u
Binary files differ
Index: unix_installer/installer-package/repository/29/1
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/repository/29/Attic/1,v
diff -u
Binary files differ