Index: unix_installer/.cvsignore
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/.cvsignore,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ unix_installer/.cvsignore	1 May 2008 02:37:18 -0000	1.1
@@ -0,0 +1,9 @@
+*.swp
+installer-package/build
+installer-package/build/*
+installer-package/assembly
+installer-package/assembly/*
+upgrader-package/build
+upgrader-package/build/*
+upgrader-package/assembly
+upgrader-package/assembly/*
\ No newline at end of file
Index: unix_installer/upgrader-package/build.xml
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/build.xml,v
diff -u -r1.2 -r1.3
--- unix_installer/upgrader-package/build.xml	11 Jul 2007 01:37:01 -0000	1.2
+++ unix_installer/upgrader-package/build.xml	1 May 2008 02:37:18 -0000	1.3
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="Unix-Updater-Script-2.0.4" default="build" basedir=".">
+<project name="Unix-Updater-Build-Script" default="build" basedir=".">
 
- 	<property name="VERSION" value="2.0.4" />
- 	<property name="PACKAGE-ROOT" value="build/lams-unix-updater-2.0.4" />
+ 	<property name="VERSION" value="2.1" />
+ 	<property name="PACKAGE-ROOT" value="build/lams-unix-updater-${VERSION}" />
+	<property name="LAMS_PROJECT_ROOT" value="../.." />
+	<property name="TOOLS" value="tools" />
 	<property name="db.username" value="lams" />
 	<property name="db.password" value="lamsdemo" />
 	<property name="db.name" value="lams" />
@@ -61,19 +63,120 @@
 			<arg line="${PACKAGE-ROOT}/bin" />
 		</exec>
 		
-		<!-- create ${PACKAGE-ROOT}.tar.gz and place it in the build directory -->
-		<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" />
+		<!-- Remove all the CVS directories -->
+        <exec executable="/bin/bash" failonerror="true">
+            <arg value="-c" />
+            <arg value="./createPackage.sh" />
+        </exec>
 	</target>
 	
 	<!-- clean the installation, the .bak file will remain in the build dir -->
 	<target name="clean" description="Clean up output directories.">
 		<delete dir="${PACKAGE-ROOT}" failonerror="false"/>
-		
-		<!-- backup existing tar.gz file if it exists-->
 		<delete file="${PACKAGE-ROOT}.tar.gz" failonerror="false"/>
 	</target>
 	
+	<target name="copy-tools" description="Copies all the tool deploy files to the tools directory">
+
+		<antcall target="copy-tool-deploy-package"> 
+			<param name="tool.dir" value="lams_tool_chat" /> 
+			<param name="tool.sig" value="lachat11" /> 
+		</antcall>
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_forum" /> 
+            <param name="tool.sig" value="lafrum11" /> 
+        </antcall>	
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_lamc" /> 
+            <param name="tool.sig" value="lamc11" /> 
+        </antcall>	
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_laqa" /> 
+            <param name="tool.sig" value="laqa11" /> 
+        </antcall>	
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_larsrc" /> 
+            <param name="tool.sig" value="larsrc11" /> 
+        </antcall>	
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_nb" /> 
+            <param name="tool.sig" value="lanb11" /> 
+        </antcall>		
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_notebook" /> 
+            <param name="tool.sig" value="lantbk11" /> 
+        </antcall>
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_sbmt" /> 
+            <param name="tool.sig" value="lasbmt11" /> 
+        </antcall>
+            	
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_chat" /> 
+            <param name="tool.sig" value="lachat11" /> 
+        </antcall>
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_scribe" /> 
+            <param name="tool.sig" value="lascrb11" /> 
+        </antcall>
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_vote" /> 
+            <param name="tool.sig" value="lavote11" /> 
+        </antcall>
+		
+    </target>
+	
+    <target name="copy-tool-deploy-package" description="Copies the tools deploy packages after it has been built">
+        <echo>Copying tool deploy project for ${tool.sig}</echo>
+    	
+    	<!-- Cleaning the directory -->
+    	<delete dir="${TOOLS}/${tool.sig}" failonerror="false"/>
+        <mkdir dir="${TOOLS}/${tool.sig}" /> 
+    	
+    	<mkdir dir="${TOOLS}/${tool.sig}/build/deploy/language" />
+    	<mkdir dir="${TOOLS}/${tool.sig}/build/deploy/sql/updatescripts" />
+    	
+    	<!-- Copy the tool's build.properties -->
+    	<copy todir="${TOOLS}/${tool.sig}">
+            <fileset dir="${LAMS_PROJECT_ROOT}/${tool.dir}">
+                <include name="build.properties" />  
+            </fileset>
+    	</copy>
+    	
+    	<!-- Copy files to the tool's deploy dir -->
+    	<copy todir="${TOOLS}/${tool.sig}/build/deploy">
+            <fileset dir="${LAMS_PROJECT_ROOT}/${tool.dir}/build/deploy">
+                <include name="deploy.xml" />
+            	<include name="lams-tool-${tool.sig}.jar" />
+            	<include name="lams-tool-${tool.sig}.war" />
+            	<include name="deploy.sh" />
+            </fileset>
+        </copy>
+    	
+    	<!-- Make sure deploy.sh is executable -->
+    	<chmod file="${TOOLS}/${tool.sig}/build/deploy/deploy.sh" perm="ugo+rx"/>
+    	
+    	<!-- Copying language files for the tool -->
+    	<copy todir="${TOOLS}/${tool.sig}/build/deploy/language">
+    		<fileset dir="${LAMS_PROJECT_ROOT}/${tool.dir}/build/deploy/language" />
+    	</copy>
+    	
+    	<!-- Copying sql files for the tool -->
+        <copy todir="${TOOLS}/${tool.sig}/build/deploy/sql">
+            <fileset dir="${LAMS_PROJECT_ROOT}/${tool.dir}/build/deploy/sql" />
+        </copy>
+
+    </target>
+	
+	
+	
 </project>
Index: unix_installer/upgrader-package/createPackage.sh
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/createPackage.sh,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ unix_installer/upgrader-package/createPackage.sh	1 May 2008 02:37:18 -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-updater-$LAMS_VERSION.tar.gz lams-unix-installer-$LAMS_VERSION
Index: unix_installer/upgrader-package/lams.properties
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/lams.properties,v
diff -u -r1.1 -r1.2
--- unix_installer/upgrader-package/lams.properties	10 May 2007 04:28:29 -0000	1.1
+++ unix_installer/upgrader-package/lams.properties	1 May 2008 02:37:18 -0000	1.2
@@ -114,5 +114,8 @@
 SQL_DRIVER=com.mysql.jdbc.Driver
 SQL_JAR=mysql-connector-java-3.1.12-bin.jar
 
+# The version of this LAMS updater
+LAMS_VERSION=2.1
+
 #########################################################################################
 
Index: unix_installer/upgrader-package/update-lams.sh
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/update-lams.sh,v
diff -u -r1.3 -r1.4
Binary files differ
Index: unix_installer/upgrader-package/ant-scripts/language-pack.xml
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/ant-scripts/language-pack.xml,v
diff -u -r1.2 -r1.3
--- unix_installer/upgrader-package/ant-scripts/language-pack.xml	28 Jun 2007 02:17:26 -0000	1.2
+++ unix_installer/upgrader-package/ant-scripts/language-pack.xml	1 May 2008 02:37:18 -0000	1.3
@@ -1,48 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="language-pack" basedir="." >
-	<property file="../lams.properties"/>
-	<property file="lang.properties"/>
+    <property file="../lams.properties"/>
+    <property file="lang.properties"/>
 
-	<target name="update-languages" description="Runs the entire language pack process">
-		<!-- Done in main update-lams.xml build <antcall target="copy-languages"/> -->
-		<antcall target="copy-flash-xml"/>
-		<antcall target="copy-llid"/>
-		<antcall target="update-database"/>
-		<echo>LAMS language-pack ${version} updated</echo>
-	</target>
-	
-	<target name="copy-languages" description="Copies the language files for all the core LAMS projects">
-		<copy todir="${lams.dictionary.dir}" overwrite="true">
-			<fileset dir="../language-pack/lams-dictionary.jar/"/>
-		</copy>
-	</target>
+    <target name="update-languages" description="Runs the entire language pack process">
+        <!-- Done in main update-lams.xml build <antcall target="copy-languages"/> -->
+        <!--<antcall target="copy-flash-xml"/> -->
+        <antcall target="copy-llid"/>
+        <!--antcall target="update-database"/>-->
+        <echo>LAMS language-pack ${version} updated</echo>
+    </target>
+    
+    <target name="copy-llid" description="Copies the language files for combined tasks based on the llid values found in the database table lams-learning-library">
+        <java classname="copyllid" failonerror="true" fork="true">
+            <classpath>
+                <pathelement path=".;${sql.classpath}"/>
+            </classpath>
+        </java>
+    </target>
+    
+    <!--
+    <target name="copy-languages" description="Copies the language files for all the core LAMS projects">
+        <copy todir="${lams.dictionary.dir}" overwrite="true">
+            <fileset dir="../language-pack/lams-dictionary.jar/"/>
+        </copy>
+    </target>
 
-	<target name="copy-flash-xml" description="Copies the language files for flash">
-		<copy todir="${flashxml.deploy.dir}" overwrite="true">
-			<fileset dir="../language-pack/flashxml/"/>
-		</copy>
-	</target>
+    <target name="copy-flash-xml" description="Copies the language files for flash">
+        <copy todir="${flashxml.deploy.dir}" overwrite="true">
+            <fileset dir="../language-pack/flashxml/"/>
+        </copy>
+    </target>
 
-	<target name="copy-llid" description="Copies the language files for combined tasks based on the llid values found in the database table lams-learning-library">
-		<java classname="copyllid" failonerror="true" fork="true">
-			<classpath>
-				<pathelement path=".;${sql.classpath}"/>
-			</classpath>
-		</java>
-	</target>
+    <target name="update-database" description="Updates the database to record the current language pack">
+        <sql driver="com.mysql.jdbc.Driver" 
+            classpath="${sql.classpath}" 
+            url="${SQL_URL}" 
+            userid="${DB_USER}" 
+            password="${DB_PASS}"
+            encoding="utf8"
+            onerror="abort"
+            >
+            <transaction src="updateLocales.sql" />
+        </sql>
+    </target>
+    -->
 
-	<target name="update-database" description="Updates the database to record the current language pack">
-		<sql driver="com.mysql.jdbc.Driver" 
-			classpath="${sql.classpath}" 
-			url="${SQL_URL}" 
-			userid="${DB_USER}" 
-			password="${DB_PASS}"
-			encoding="utf8"
-			onerror="abort"
-			>
-			<transaction src="updateLocales.sql" />
-		</sql>
-	</target>
-
-
 </project>
Index: unix_installer/upgrader-package/ant-scripts/update-lams.xml
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/ant-scripts/update-lams.xml,v
diff -u -r1.4 -r1.5
--- unix_installer/upgrader-package/ant-scripts/update-lams.xml	25 Jul 2007 02:19:43 -0000	1.4
+++ unix_installer/upgrader-package/ant-scripts/update-lams.xml	1 May 2008 02:37:18 -0000	1.5
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-#   Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+#   Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
 #   License Information: http://lamsfoundation.org/licensing/lams/2.0/
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -24,333 +24,314 @@
 -->
 
 <project name="update-lams" basedir=".">
-	<property file="../lams.properties" />
-	<property file="lang.properties"/>
+    <property file="../lams.properties" />
+    <property file="lang.properties"/>
 
-	<condition property="files.match">
-		<filesmatch file1="${DEPLOY_DIR}/lams.ear/lams-www.war/news.html" file2="../assembly/lams.ear/lams-www.war/news-2.0.2.html" />
-		<!-- Uncomment the line below for 2.1.x upgrader and delete the line above (2.1 installer will create news-unmodified in the deploy dir)
-		 <filesmatch file1="${DEPLOY_DIR}/lams.ear/lams-www.war/news.html" file2="${DEPLOY_DIR}/lams.ear/lams-www.war/news-unmodified.html" /> -->
-	</condition>
+    <condition property="files.match">
+        <filesmatch file1="${DEPLOY_DIR}/lams.ear/lams-www.war/news.html" file2="../assembly/lams.ear/lams-www.war/news-2.0.2.html" />
+        <!-- Uncomment the line below for 2.1.x upgrader and delete the line above (2.1 installer will create news-unmodified in the deploy dir)
+         <filesmatch file1="${DEPLOY_DIR}/lams.ear/lams-www.war/news.html" file2="${DEPLOY_DIR}/lams.ear/lams-www.war/news-unmodified.html" /> -->
+    </condition>
 
-	<!-- Main Task, calls all the other tasks -->
-	<target name="update-lams" description="Runs the entire update process">
-		<!-- antcall target="check-software" / -->
-		<antcall target="configure-jboss" />
-		<antcall target="copy-core-jars-wars" />
-		<antcall target="update-core-database" />
-		<antcall target="update-mysql-ds" />
-		<antcall target="update-lams-www-war" />
-		<antcall target="overwrite-news.html" />
-		<!-- UNCOMMENT FOR 2.1.x <antcall target="overwrite-news-unmodified.html" /> -->
-		<antcall target="explode-wars"/>
-		<antcall target="create-tool-deployer" />
-		<antcall target="deploy-tools"/>
-		<antcall target="update-context-paths"/>
-		<antcall target="compress-wars"/>
-		<antcall target="language-pack" />
-		<antcall target="remove-lams-temp" />
-		<antcall target="set-lams-configuration" />
-		<antcall target="copy-properties-to-etc"/>
-		<echo message="Install complete"/>
-	</target>
+    <!-- Main Task, calls all the other tasks -->
+    <target name="update-lams" description="Runs the entire update process">
+        <!-- antcall target="check-software" / -->
+        <antcall target="configure-jboss" />
+        <antcall target="copy-core-jars-wars" />
+        <antcall target="update-core-database" />
+        <antcall target="update-mysql-ds" />
+        <antcall target="update-lams-www-war" />
+        <antcall target="overwrite-news.html" />
+        <antcall target="overwrite-news-unmodified.html" />
+        <antcall target="explode-wars"/>
+        <antcall target="create-tool-deployer" />
+        <antcall target="deploy-tools"/>
+        <antcall target="update-context-paths"/>
+        <antcall target="compress-wars"/>
+        <antcall target="language-pack" />
+        <antcall target="remove-lams-temp" />
+        <antcall target="set-lams-configuration" />
+        <antcall target="copy-properties-to-etc"/>
+        <echo message="Install complete"/>
+    </target>
 
 
-	<target name="configure-jboss" description="Copying jboss-cash.jar and jgroups.jar from server/all/lib to ${DEFAULT_DIR}/lib">
-		<echo message="Copying jboss-cache.jar and jgroups.jar from ${JBOSS_DIR}/server/all/lib to ${DEFAULT_DIR}/lib"/>
-		<copy file="${JBOSS_DIR}/server/all/lib/jboss-cache.jar" todir="${DEFAULT_DIR}/lib" failonerror="true" overwrite="true" />
-		<copy file="${JBOSS_DIR}/server/all/lib/jgroups.jar" todir="${DEFAULT_DIR}/lib" failonerror="true" overwrite="true" />
+    <target name="configure-jboss" description="Copying jboss-cash.jar and jgroups.jar from server/all/lib to ${DEFAULT_DIR}/lib">
+        <echo message="Copying jboss-cache.jar and jgroups.jar from ${JBOSS_DIR}/server/all/lib to ${DEFAULT_DIR}/lib"/>
+        <copy file="${JBOSS_DIR}/server/all/lib/jboss-cache.jar" todir="${DEFAULT_DIR}/lib" failonerror="true" overwrite="true" />
+        <copy file="${JBOSS_DIR}/server/all/lib/jgroups.jar" todir="${DEFAULT_DIR}/lib" failonerror="true" overwrite="true" />
 
-		<copy todir="${JBOSS_DIR}/bin" overwrite="true" failonerror="true">
-			<fileset dir="../bin/">
-				<include name="run-lams.sh" />
-			</fileset>
-			<filterset> 
-				<filter token="JAVA_HOME" value="${JDK_DIR}" />
-			</filterset>
-		</copy>
+        <copy todir="${JBOSS_DIR}/bin" overwrite="true" failonerror="true">
+            <fileset dir="../bin/">
+                <include name="run-lams.sh" />
+            </fileset>
+            <filterset> 
+                <filter token="JAVA_HOME" value="${JDK_DIR}" />
+            </filterset>
+        </copy>
 
-		<chmod file="${JBOSS_DIR}/bin/run-lams.sh" perm="755"/>
-	</target>
+        <chmod file="${JBOSS_DIR}/bin/run-lams.sh" perm="755"/>
+    </target>
 
-	<target name="copy-core-jars-wars" description="Overwrites lams.ear files built from assemble-ear ant task. Does not deploy tools">
-		<echo message="Overwriting assembled files into the deploy directory"/>
-		<copy todir="${DEPLOY_DIR}/lams.ear" overwrite="true">
-			<fileset dir="../assembly/lams.ear" >
-				<exclude name="*.bak"/>
-				<exclude name="*.tmp"/>
-				<exclude name="**/lams-www.war/**"/>
-				<exclude name="**/META-INF/**"/>
-				<exclude name="**/lams-dictionary.jar/org/lamsfoundation/lams/library/**"/>
-			</fileset>
-		</copy>
+    <target name="copy-core-jars-wars" description="Overwrites lams.ear files built from assemble-ear ant task. Does not deploy tools">
+        <echo message="Overwriting assembled files into the deploy directory"/>
+        <copy todir="${DEPLOY_DIR}/lams.ear" overwrite="true">
+            <fileset dir="../assembly/lams.ear" >
+                <exclude name="*.bak"/>
+                <exclude name="*.tmp"/>
+                <exclude name="**/lams-www.war/**"/>
+                <exclude name="**/META-INF/**"/>
+                <exclude name="**/lams-dictionary.jar/org/lamsfoundation/lams/library/**"/>
+            </fileset>
+        </copy>
 
-		<copy todir="${DEFAULT_DIR}/lib" overwrite="true">
-			<fileset dir="../assembly">
-				<include name="lams-valve.jar"/>
-				<include name="lams-session.jar"/>
-			</fileset>
-		</copy>	
-	
-		<echo message="lams.ear successfully updated"/>
-	</target>
+        <copy todir="${DEFAULT_DIR}/lib" overwrite="true">
+            <fileset dir="../assembly">
+                <include name="lams-valve.jar"/>
+                <include name="lams-session.jar"/>
+            </fileset>
+        </copy> 
+    
+        <echo message="lams.ear successfully updated"/>
+    </target>
 
-	<target name="update-core-database" description="Runs the sql scripts required to update the database">
-		<echo>Updating core database</echo>
-		<ant antfile="update-core-database.xml" output="../log/update-core-database.log" target="update-core-database" />
-	</target>
+    <target name="update-core-database" description="Runs the sql scripts required to update the database">
+        <echo>Updating core database</echo>
+        <ant antfile="update-core-database.xml" output="../log/update-core-database.log" target="update-core-database" />
+    </target>
 
-	<target name="update-lams-www-war" description="Updates files in lams-www.war">
-		<echo>Updating lams-www.war</echo>
+    <target name="update-lams-www-war" description="Updates files in lams-www.war">
+        <echo>Updating lams-www.war</echo>
 
 
-		<copy todir="${DEPLOY_DIR}/lams.ear/lams-www.war/images" overwrite="true">
-			<fileset dir="../assembly/lams.ear/lams-www.war/images/">
-				<include name="learner.logo.swf"/>
-				<include name="monitor.logo.swf"/>
-				<include name="preloader.logo.swf"/>
-				<include name="about.logo.swf"/>
-			</fileset>			
-		</copy>
-	
-		<!-- uncomment for 2.1 
-		<copy todir="${DEPLOY_DIR}/lams.ear/lams-www.war/WEB-INF/tags" overwrite="true">
+        <copy todir="${DEPLOY_DIR}/lams.ear/lams-www.war/images" overwrite="true">
+            <fileset dir="../assembly/lams.ear/lams-www.war/images/">
+                <include name="learner.logo.swf"/>
+                <include name="monitor.logo.swf"/>
+                <include name="preloader.logo.swf"/>
+                <include name="about.logo.swf"/>
+            </fileset>          
+        </copy>
+    
+        <!-- uncomment for 2.1 
+        <copy todir="${DEPLOY_DIR}/lams.ear/lams-www.war/WEB-INF/tags" overwrite="true">
                         <fileset dir="../assembly/lams.ear/lams-www.war/WEB-INF/tags">
                                 <include name="AuthoringButton.tag"/>
                                 <include name="ImgButton.tag"/>
                                 <include name="TabBody.tag"/>
                                 <include name="Tabs.tag"/>
-				<include name="Tab.tag"/>
-				<include name="FCKEditor.tag"/>
-				<include name="Passon.tag"/>
+                <include name="Tab.tag"/>
+                <include name="FCKEditor.tag"/>
+                <include name="Passon.tag"/>
                         </fileset>
-                </copy>
-		
-		<copy todir="${DEPLOY_DIR}/lams.ear/lams-www.war/WEB-INF" overwrite="true">
-			<fileset dir="../assembly/lams.ear/lams-www.war/WEB-INF">
-				<include name="lams.tld"/>
-			</fileset>
-		</copy>	
-		-->
-	</target>
+       </copy>
+        
+        <copy todir="${DEPLOY_DIR}/lams.ear/lams-www.war/WEB-INF" overwrite="true">
+            <fileset dir="../assembly/lams.ear/lams-www.war/WEB-INF">
+                <include name="lams.tld"/>
+            </fileset>
+        </copy> 
+        -->
+    </target>
 
-	<target name="overwrite-news.html" if="files.match">
-		<copy todir="${DEPLOY_DIR}/lams.ear/lams-www.war/" overwrite="true">
-			<fileset dir="../assembly/lams.ear/lams-www.war">
-				<include name="news.html"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<!--	
-	# UNCOMMENT FOR 2.1.x upgrader
-	#  The updater will always update news-unmodified.html to the current version, but it 
-	#  will only update news.html if it has not been modified. This way, the user has the
-	#  ability to revert back to the standard news.html page is they so desire
-	# <target name="overwrite-news-unmodified.html">
-	#	<copy file="../assembly/lams.ear/lams-www.war/news.html" 
-	#		tofile="${DEPLOY_DIR}/lams.ear/lams-www.war/news-unmodified.html"
-	#		overwrite="true"/>
-	# </target>
-	-->
 
-	<target name="update-mysql-ds" description="Updates mysql-ds.xml to have the SQL url in the lams.properties">
-		<copy todir="${DEPLOY_DIR}" overwrite="true">
-			<fileset dir="../conf">
-				<include name="mysql-ds.xml"/>
-			</fileset>
-			<filterset>
-				<filter token="SQL_HOST" value="${SQL_HOST}"/>
-				<filter token="DB_NAME" value="${DB_NAME}"/>
-				<filter token="DB_USER" value="${DB_USER}"/>
-				<filter token="DB_PASS" value="${DB_PASS}"/>
-			</filterset>
-		</copy>
-	</target>
+    <target name="update-mysql-ds" description="Updates mysql-ds.xml to have the SQL url in the lams.properties">
+        <copy todir="${DEPLOY_DIR}" overwrite="true">
+            <fileset dir="../conf">
+                <include name="mysql-ds.xml"/>
+            </fileset>
+            <filterset>
+                <filter token="SQL_HOST" value="${SQL_HOST}"/>
+                <filter token="DB_NAME" value="${DB_NAME}"/>
+                <filter token="DB_USER" value="${DB_USER}"/>
+                <filter token="DB_PASS" value="${DB_PASS}"/>
+            </filterset>
+        </copy>
+    </target>
 
-	<target name="explode-wars" description="Explodes the lams-learning and lams-monitoring wars so their files can be altered by the tool deployer">
-		<ant antfile="../tools/update-deploy-tools.xml" output="../log/explode-wars.log" target="explode-wars">
-			<property name="jboss.deploy" value="${EAR_DIR}"/>
-		</ant>
-	</target>
+    <target name="explode-wars" description="Explodes the lams-learning and lams-monitoring wars so their files can be altered by the tool deployer">
+        <ant antfile="../tools/update-deploy-tools.xml" output="../log/explode-wars.log" target="explode-wars">
+            <property name="jboss.deploy" value="${EAR_DIR}"/>
+        </ant>
+    </target>
 
-	<target name="compress-wars" description="Compresses the lams-learning and lams-monitoring wars after their files have been altered by the tool deployer">
-		<ant antfile="../tools/update-deploy-tools.xml" output="../log/compress-wars.log" target="compress-wars">
-			<property name="jboss.deploy" value="${EAR_DIR}"/>
-		</ant>
-	</target>
+    <target name="compress-wars" description="Compresses the lams-learning and lams-monitoring wars after their files have been altered by the tool deployer">
+        <ant antfile="../tools/update-deploy-tools.xml" output="../log/compress-wars.log" target="compress-wars">
+            <property name="jboss.deploy" value="${EAR_DIR}"/>
+        </ant>
+    </target>
 
-	<target name="create-tool-deployer" description="Creates all the required deploy.xml files for the tool deployer">
-		<ant antfile="update-deploy-tools.xml" output="../log/create-lachat11-deploy.log" target="create-deploy-package">
-			<property name="prop.path" value="lachat11"/>
-		</ant>
+    <target name="create-tool-deployer" description="Creates all the required deploy.xml files for the tool deployer">
+        <ant antfile="update-deploy-tools.xml" output="../log/create-lachat11-deploy.log" target="create-deploy-package">
+            <property name="prop.path" value="lachat11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/create-lafrum11-deploy.log" target="create-deploy-package">
-			<property name="prop.path" value="lafrum11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/create-lafrum11-deploy.log" target="create-deploy-package">
+            <property name="prop.path" value="lafrum11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/create-lamc11-deploy.log" target="create-deploy-package">
-			<property name="prop.path" value="lamc11"/>
-		</ant>
-		
-		<ant antfile="update-deploy-tools.xml" output="../log/create-lanb11-deploy.log" target="create-deploy-package">
-			<property name="prop.path" value="lanb11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/create-lamc11-deploy.log" target="create-deploy-package">
+            <property name="prop.path" value="lamc11"/>
+        </ant>
+        
+        <ant antfile="update-deploy-tools.xml" output="../log/create-lanb11-deploy.log" target="create-deploy-package">
+            <property name="prop.path" value="lanb11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/create-lantbk11-deploy.log" target="create-deploy-package">
-			<property name="prop.path" value="lantbk11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/create-lantbk11-deploy.log" target="create-deploy-package">
+            <property name="prop.path" value="lantbk11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/create-laqa11-deploy.log" target="create-deploy-package">
-			<property name="prop.path" value="laqa11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/create-laqa11-deploy.log" target="create-deploy-package">
+            <property name="prop.path" value="laqa11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/create-larsrc11-deploy.log" target="create-deploy-package">
-			<property name="prop.path" value="larsrc11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/create-larsrc11-deploy.log" target="create-deploy-package">
+            <property name="prop.path" value="larsrc11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/create-lasbmt11-deploy.log" target="create-deploy-package">
-			<property name="prop.path" value="lasbmt11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/create-lasbmt11-deploy.log" target="create-deploy-package">
+            <property name="prop.path" value="lasbmt11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/create-lascrb11-deploy.log" target="create-deploy-package">
-			<property name="prop.path" value="lascrb11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/create-lascrb11-deploy.log" target="create-deploy-package">
+            <property name="prop.path" value="lascrb11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/create-lasurv11-deploy.log" target="create-deploy-package">
-			<property name="prop.path" value="lasurv11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/create-lasurv11-deploy.log" target="create-deploy-package">
+            <property name="prop.path" value="lasurv11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/create-lavote11-deploy.log" target="create-deploy-package">
-			<property name="prop.path" value="lavote11"/>
-		</ant>
-	</target>
+        <ant antfile="update-deploy-tools.xml" output="../log/create-lavote11-deploy.log" target="create-deploy-package">
+            <property name="prop.path" value="lavote11"/>
+        </ant>
+    </target>
 
-	<target name="deploy-tools" description="Deploys the tools once all the deploy.xml files have been generated">
-		<ant antfile="update-deploy-tools.xml" output="../log/deploy-lachat11.log" target="deploy-tool">
-			<property name="prop.path" value="lachat11"/>
-		</ant>
-		<ant antfile="update-deploy-tools.xml" output="../log/deploy-lafrum11.log" target="deploy-tool">
-			<property name="prop.path" value="lafrum11"/>
-		</ant>
+    <target name="deploy-tools" description="Deploys the tools once all the deploy.xml files have been generated">
+        <ant antfile="update-deploy-tools.xml" output="../log/deploy-lachat11.log" target="deploy-tool">
+            <property name="prop.path" value="lachat11"/>
+        </ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/deploy-lafrum11.log" target="deploy-tool">
+            <property name="prop.path" value="lafrum11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/deploy-lamc11.log" target="deploy-tool">
-			<property name="prop.path" value="lamc11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/deploy-lamc11.log" target="deploy-tool">
+            <property name="prop.path" value="lamc11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/deploy-lanb11.log" target="deploy-tool">
-			<property name="prop.path" value="lanb11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/deploy-lanb11.log" target="deploy-tool">
+            <property name="prop.path" value="lanb11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/deploy-lantbk11.log" target="deploy-tool">
-			<property name="prop.path" value="lantbk11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/deploy-lantbk11.log" target="deploy-tool">
+            <property name="prop.path" value="lantbk11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/deploy-laqa11.log" target="deploy-tool">
-			<property name="prop.path" value="laqa11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/deploy-laqa11.log" target="deploy-tool">
+            <property name="prop.path" value="laqa11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/deploy-larsrc11.log" target="deploy-tool">
-			<property name="prop.path" value="larsrc11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/deploy-larsrc11.log" target="deploy-tool">
+            <property name="prop.path" value="larsrc11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/deploy-lasbmt11.log" target="deploy-tool">
-			<property name="prop.path" value="lasbmt11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/deploy-lasbmt11.log" target="deploy-tool">
+            <property name="prop.path" value="lasbmt11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/deploy-lascrb11.log" target="deploy-tool">
-			<property name="prop.path" value="lascrb11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/deploy-lascrb11.log" target="deploy-tool">
+            <property name="prop.path" value="lascrb11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/deploy-lasurv11.log" target="deploy-tool">
-			<property name="prop.path" value="lasurv11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/deploy-lasurv11.log" target="deploy-tool">
+            <property name="prop.path" value="lasurv11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/deploy-lavote11.log" target="deploy-tool">
-			<property name="prop.path" value="lavote11"/>
-		</ant>
-	</target> 
+        <ant antfile="update-deploy-tools.xml" output="../log/deploy-lavote11.log" target="deploy-tool">
+            <property name="prop.path" value="lavote11"/>
+        </ant>
+    </target> 
 
-	<target name="update-context-paths" description="Updating web.xml and MANIFEST.MF for lams-central.war, lams-monitor.war and lams-learning.war. using config from ${build.deploy}/deploy.xml">
-		<ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lachat11.log" target="update-tool-context">
-			<property name="prop.path" value="lachat11"/>
-		</ant>
-		<ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lafrum11.log" target="update-tool-context">
-			<property name="prop.path" value="lafrum11"/>
-		</ant>
+    <target name="update-context-paths" description="Updating web.xml and MANIFEST.MF for lams-central.war, lams-monitor.war and lams-learning.war. using config from ${build.deploy}/deploy.xml">
+        <ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lachat11.log" target="update-tool-context">
+            <property name="prop.path" value="lachat11"/>
+        </ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lafrum11.log" target="update-tool-context">
+            <property name="prop.path" value="lafrum11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lamc11.log" target="update-tool-context">
-			<property name="prop.path" value="lamc11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lamc11.log" target="update-tool-context">
+            <property name="prop.path" value="lamc11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lanb11.log" target="update-tool-context">
-			<property name="prop.path" value="lanb11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lanb11.log" target="update-tool-context">
+            <property name="prop.path" value="lanb11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lantbk11.log" target="update-tool-context">
-			<property name="prop.path" value="lantbk11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lantbk11.log" target="update-tool-context">
+            <property name="prop.path" value="lantbk11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-laqa11.log" target="update-tool-context">
-			<property name="prop.path" value="laqa11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-laqa11.log" target="update-tool-context">
+            <property name="prop.path" value="laqa11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-larsrc11.log" target="update-tool-context">
-			<property name="prop.path" value="larsrc11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-larsrc11.log" target="update-tool-context">
+            <property name="prop.path" value="larsrc11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lasbmt11.log" target="update-tool-context">
-			<property name="prop.path" value="lasbmt11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lasbmt11.log" target="update-tool-context">
+            <property name="prop.path" value="lasbmt11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lascrb11.log" target="update-tool-context">
-			<property name="prop.path" value="lascrb11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lascrb11.log" target="update-tool-context">
+            <property name="prop.path" value="lascrb11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lasurv11.log" target="update-tool-context">
-			<property name="prop.path" value="lasurv11"/>
-		</ant>
+        <ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lasurv11.log" target="update-tool-context">
+            <property name="prop.path" value="lasurv11"/>
+        </ant>
 
-		<ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lavote11.log" target="update-tool-context">
-			<property name="prop.path" value="lavote11"/>
-		</ant>
-		
-	</target> 
+        <ant antfile="update-deploy-tools.xml" output="../log/update-tool-context-lavote11.log" target="update-tool-context">
+            <property name="prop.path" value="lavote11"/>
+        </ant>
+        
+    </target> 
 
 
 
-	<target name="language-pack" description="Runs the latest language pack included with the updater">
-		<ant antfile="../language-pack/language-pack.xml" output="../log/language-pack.log" target="update-languages" inheritAll="true">
-			<property file="../language-pack/lang.properties"/>
-		</ant>
-	</target>
+    <target name="language-pack" description="Runs the latest language pack included with the updater">
+        <ant antfile="../language-pack/language-pack.xml" output="../log/language-pack.log" target="update-languages" inheritAll="true">
+            <property file="../language-pack/lang.properties"/>
+        </ant>
+    </target>
 
-	<target name="remove-lams-temp" description="Removes temporary cache files so that LAMS will restart correctly in the browser">
+    <target name="remove-lams-temp" description="Removes temporary cache files so that LAMS will restart correctly in the browser">
                 
-		<delete dir="${DEFAULT_DIR}/tmp" includeemptydirs="true" failonerror="false"/>
-		<delete dir="${DEFAULT_DIR}/work/jboss.web/localhost" includeemptydirs="true" failonerror="false"/>
+        <delete dir="${DEFAULT_DIR}/tmp" includeemptydirs="true" failonerror="false"/>
+        <delete dir="${DEFAULT_DIR}/work/jboss.web/localhost" includeemptydirs="true" failonerror="false"/>
 
-	</target>
+    </target>
 
 
-	<target name="set-lams-configuration" description="Updates the lams_configuration table with all the settings from lams.properties">
-		<sql driver="com.mysql.jdbc.Driver" 
-			classpath="${DEPLOY_DIR}/lams.ear/mysql-connector-java-3.1.12-bin.jar" 
-			url="${SQL_URL}" 
-			userid="${DB_USER}" 
-			password="${DB_PASS}"
-			encoding="utf8"
-			onerror="abort"
-			>
-			<transaction src="../sql-scripts/setLamsConfiguration.sql" />
-		</sql>
-	</target>
+    <target name="set-lams-configuration" description="Updates the lams_configuration table with all the settings from lams.properties">
+        <sql driver="com.mysql.jdbc.Driver" 
+            classpath="${DEPLOY_DIR}/lams.ear/mysql-connector-java-3.1.12-bin.jar" 
+            url="${SQL_URL}" 
+            userid="${DB_USER}" 
+            password="${DB_PASS}"
+            encoding="utf8"
+            onerror="abort"
+            >
+            <transaction src="../sql-scripts/setLamsConfiguration.sql" />
+        </sql>
+    </target>
 
-	<target name="copy-properties-to-etc" description="Copies properties files to etc, so they can be used in late updaters">
-		<mkdir dir="/etc/lams2"/>
+    <target name="copy-properties-to-etc" description="Copies properties files to etc, so they can be used in late updaters">
+        <mkdir dir="/etc/lams2"/>
 
-		<copy todir="/etc/lams2" file= "../lams.properties"/>
-		<copy todir="/etc/lams2" file= "lang.properties"/>
-	</target>		
+        <copy todir="/etc/lams2" file= "../lams.properties"/>
+        <copy todir="/etc/lams2" file= "lang.properties"/>
+    </target>       
 
 </project>