Index: unix_installer/upgrader-package/ant-scripts/tools.properties
===================================================================
diff -u -rd3e1423ab32ceafba2ea46b790b7206c6e8dbfad -r23a7089d5a5aa5203c6fee8f035401d580e75468
--- unix_installer/upgrader-package/ant-scripts/tools.properties	(.../tools.properties)	(revision d3e1423ab32ceafba2ea46b790b7206c6e8dbfad)
+++ unix_installer/upgrader-package/ant-scripts/tools.properties	(.../tools.properties)	(revision 23a7089d5a5aa5203c6fee8f035401d580e75468)
@@ -8,8 +8,7 @@
 db.username=${DB_USER}
 db.password=${DB_PASS}
 db.Driver=com.mysql.jdbc.Driver
-db.url=jdbc:mysql://${SQL_HOST}/${db.name}?characterEncoding=utf8&zeroDateTimeBehaviour=convertToNull&autoReconnect=true&useUnicode=true
-jboss.deploy=${instdir}/jboss-4.0.2/server/default/deploy/lams.ear/
+db.url=jdbc:mysql://${SQL_HOST}:${SQL_PORT}/${DB_NAME}?characterEncoding=utf8&zeroDateTimeBehaviour=convertToNull&autoReconnect=true&useUnicode=true
 deploy.tool.dir=../tools/
 toolContext=/lams/tool/${signature}
 product=lams-tool-${signature}
Index: unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml
===================================================================
diff -u -r7cd04d543a7014b7dc948401a72494f523abf287 -r23a7089d5a5aa5203c6fee8f035401d580e75468
--- unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision 7cd04d543a7014b7dc948401a72494f523abf287)
+++ unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision 23a7089d5a5aa5203c6fee8f035401d580e75468)
@@ -27,7 +27,7 @@
 				<filter token="dbPassword" value="${db.password}" />
 				<filter token="dbDriverUrl" value="${db.url}" />
 				<filter token="dbDriverClass" value="${db.Driver}" />
-				<filter token="lamsear" value="${jboss.deploy}" />
+				<filter token="lamsear" value="${DEFAULT_DIR}/deploy/lams.ear" />
 				<filter token="toolDeployPackageDir" value="${build.deploy}" />
 			</filterset>
 		</copy>
@@ -69,7 +69,7 @@
 			toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" 
 			toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" 
 			toolApplicationContextPath="/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml"
-			lamsEarPath="${jboss.deploy}"
+			lamsEarPath="${DEFAULT_DIR}/deploy/lams.ear"
 			toolContext="${toolContext}"
 			toolWebUri="${product}.war"
 			languageFilesPackage="${language.files.package}">
@@ -97,7 +97,7 @@
         </path> 
         
         <java classname="org.lamsfoundation.lams.tool.deploy.AddCustomWebXmlContexts" classpathref="deploy.lib.classpath" fork="true">
-            <arg value="${jboss.deploy}" />
+            <arg value="${DEFAULT_DIR}/deploy/lams.ear" />
             <arg value="${db.username}" />
             <arg value="${db.password}" />
             <arg value="${SQL_URL}" />
@@ -114,23 +114,23 @@
 		<!-- 2.2 SPECIFIC UPDATE!!!!!!!!!!!! -->
 		<echo>BEGIN Updating application.xml</echo>
 		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
-			<arg value="${jboss.deploy}" />
+			<arg value="${DEFAULT_DIR}/deploy/lams.ear" />
 			<arg value="transform.jar" />
 		</java>
 		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
-			<arg value="${jboss.deploy}" />
+			<arg value="${DEFAULT_DIR}/deploy/lams.ear" />
 			<arg value="translate.jar" />
 		</java>
 		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
-			<arg value="${jboss.deploy}" />
+			<arg value="${DEFAULT_DIR}/deploy/lams.ear" />
 			<arg value="JabberHTTPBind-1.1.1.jar" />
 		</java>
 		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
-			<arg value="${jboss.deploy}" />
+			<arg value="${DEFAULT_DIR}/deploy/lams.ear" />
 			<arg value="tk-autopatch-1.2.0-b2-cvs.jar" />
 		</java>
 		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
-			<arg value="${jboss.deploy}" />
+			<arg value="${DEFAULT_DIR}/deploy/lams.ear" />
 			<arg value="tk-discovery-1.0.0.jar" />
 		</java>
 		<!-- END 2.2 SPECIFIC UPDATE!!!!!!!!!!!! -->
@@ -139,30 +139,30 @@
 	
 	
 	<target name="explode-wars" description="explodes lams_learning.war and lams-monitoring.war">
-		<move file="${jboss.deploy}/lams-learning.war" tofile= "${jboss.deploy}/lams-learning.war.bak" />
-		<move file="${jboss.deploy}/lams-monitoring.war" tofile= "${jboss.deploy}/lams-monitoring.war.bak" />
-		<unwar src="${jboss.deploy}/lams-learning.war.bak" dest="${jboss.deploy}/lams-learning.war" />
-		<unwar src="${jboss.deploy}/lams-monitoring.war.bak" dest="${jboss.deploy}/lams-monitoring.war" />
+		<move file="${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war" tofile= "${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war.bak" />
+		<move file="${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war" tofile= "${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war.bak" />
+		<unwar src="${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war.bak" dest="${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war" />
+		<unwar src="${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war.bak" dest="${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war" />
 				
 	</target>
 		
 	<target name="compress-wars" description="compresses lams_learning.war and lams-monitoring.war">
 			
-		<move file="${jboss.deploy}/lams-learning.war" tofile= "${jboss.deploy}/lams-learning.war.tmp" failonerror="false"/>
-		<move file="${jboss.deploy}/lams-monitoring.war" tofile= "${jboss.deploy}/lams-monitoring.war.tmp" failonerror="false"/>
+		<move file="${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war" tofile= "${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war.tmp" failonerror="false"/>
+		<move file="${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war" tofile= "${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war.tmp" failonerror="false"/>
 		
-		<war warfile="${jboss.deploy}/lams-monitoring.war" manifest="${jboss.deploy}/lams-monitoring.war.tmp/META-INF/MANIFEST.MF" 
-		  				webxml="${jboss.deploy}/lams-monitoring.war.tmp/WEB-INF/web.xml">
+		<war warfile="${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war" manifest="${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war.tmp/META-INF/MANIFEST.MF" 
+		  				webxml="${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war.tmp/WEB-INF/web.xml">
 			
-			<webinf dir="${jboss.deploy}/lams-monitoring.war.tmp/WEB-INF">
+			<webinf dir="${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war.tmp/WEB-INF">
 				<include name="**/*.xml"/>
 				<include name="**/*.tld"/>
 				<include name="struts/*"/>
 				<include name="jstl/*"/>
 				<include name="tags/*"/>
 				<exclude name="web.xml"/>
 			</webinf>
-			<fileset dir="${jboss.deploy}/lams-monitoring.war.tmp">
+			<fileset dir="${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war.tmp">
 				<include name="*"/>
 				<include name="css/*"/>
 				<include name="branching/*"/>
@@ -173,10 +173,10 @@
 			</fileset>
 		</war>
 		
-		<war warfile="${jboss.deploy}/lams-learning.war" manifest="${jboss.deploy}/lams-learning.war.tmp/META-INF/MANIFEST.MF" 
-				  				webxml="${jboss.deploy}/lams-learning.war.tmp/WEB-INF/web.xml">
+		<war warfile="${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war" manifest="${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war.tmp/META-INF/MANIFEST.MF" 
+				  				webxml="${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war.tmp/WEB-INF/web.xml">
 					
-			<webinf dir="${jboss.deploy}/lams-learning.war.tmp/WEB-INF">
+			<webinf dir="${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war.tmp/WEB-INF">
 				<include name="*.xml"/>
 				<include name="struts/*"/>
 				<include name="struts/tlds/*"/>
@@ -186,7 +186,7 @@
 				<include name="lams.tld"/>
 				<exclude name="web.xml"/>
 			</webinf>
-			<fileset dir="${jboss.deploy}/lams-learning.war.tmp">
+			<fileset dir="${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war.tmp">
 				<include name="*"/>
 				<include name="css/*"/>
 				<include name="branching/*"/>
@@ -202,8 +202,8 @@
 		</war>
 		
 		
-		<delete dir="${jboss.deploy}/lams-learning.war.tmp" failonerror="false" />
-		<delete dir="${jboss.deploy}/lams-monitoring.war.tmp" failonerror="false" />
+		<delete dir="${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war.tmp" failonerror="false" />
+		<delete dir="${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war.tmp" failonerror="false" />
 		
 	</target>
 			
Index: unix_installer/upgrader-package/ant-scripts/update-lams.xml
===================================================================
diff -u -rca7b9e07ccb764870d2f2b71da8347a6086d6286 -r23a7089d5a5aa5203c6fee8f035401d580e75468
--- unix_installer/upgrader-package/ant-scripts/update-lams.xml	(.../update-lams.xml)	(revision ca7b9e07ccb764870d2f2b71da8347a6086d6286)
+++ unix_installer/upgrader-package/ant-scripts/update-lams.xml	(.../update-lams.xml)	(revision 23a7089d5a5aa5203c6fee8f035401d580e75468)
@@ -162,11 +162,9 @@
         </copy>
 		
 		<!-- Overwrite flash language files-->
-		<target name="copy-flash-xml" description="Copies the language files for flash">
-	        <copy todir="${DEPLOY_DIR}/lams.ear/lams-central.war/flashxml" overwrite="true">
+		<copy todir="${DEPLOY_DIR}/lams.ear/lams-central.war/flashxml" overwrite="true">
 	            <fileset dir="../assembly/lams.ear/lams-central.war/flashxml/"/>
-	        </copy>
-	    </target>
+	   	</copy>
     	
 		<!-- Copy combined activity language files to appropriate directory -->
     	<java classname="copyllid" failonerror="true" fork="true">
Index: unix_installer/upgrader-package/bin/copyllid.class
===================================================================
diff -u -r80349002d46efb898c06fc8835c074d6418be97e -r23a7089d5a5aa5203c6fee8f035401d580e75468
Binary files differ
Index: unix_installer/upgrader-package/lams.properties
===================================================================
diff -u -re2c86dd901875b0838efff4f66e955e2eb64a47e -r23a7089d5a5aa5203c6fee8f035401d580e75468
--- unix_installer/upgrader-package/lams.properties	(.../lams.properties)	(revision e2c86dd901875b0838efff4f66e955e2eb64a47e)
+++ unix_installer/upgrader-package/lams.properties	(.../lams.properties)	(revision 23a7089d5a5aa5203c6fee8f035401d580e75468)
@@ -123,8 +123,8 @@
 
 # The version of this LAMS updater
 LAMS_VERSION=2.2
-LAMS_SERVER_VERSION=2.2.0.200811060000
-LAMS_LANGUAGE_VERSION=2008-11-06
+LAMS_SERVER_VERSION=2.2.0.200811310000
+LAMS_LANGUAGE_VERSION=2008-11-31
 
 #########################################################################################
 
Index: unix_installer/upgrader-package/update-lams.sh
===================================================================
diff -u -rab78ffe7c58097f49f018eda930bfba1b06f51bc -r23a7089d5a5aa5203c6fee8f035401d580e75468
--- unix_installer/upgrader-package/update-lams.sh	(.../update-lams.sh)	(revision ab78ffe7c58097f49f018eda930bfba1b06f51bc)
+++ unix_installer/upgrader-package/update-lams.sh	(.../update-lams.sh)	(revision 23a7089d5a5aa5203c6fee8f035401d580e75468)
@@ -88,9 +88,6 @@
 LAMS_LANGUAGE_VERSION=2008-11-06
 REQ_LAMS_VERSION=2.1
 
-SQL_HOST=localhost
-SQL_URL=jdbc:mysql://$SQL_HOST/$DB_NAME?characterEncoding=utf8&autoReconnect=true
-
 # Checking that the lams.properties points to a lams installation
 if [ ! -r "$JBOSS_DIR/server/default/deploy/lams.ear/lams.jar" ]
 then
@@ -174,58 +171,61 @@
 
 checkMysql()
 {
+    DB_URL=jdbc:mysql://${SQL_HOST}:${SQL_PORT}/${DB_NAME}?characterEncoding=utf8
     printf "Checking LAMS database...\n"
-        $JAVA_HOME/bin/java -cp .:bin/:assembly/lams.ear/mysql-connector-java-3.1.12-bin.jar checkmysql "$SQL_URL" "$DB_USER" "$DB_PASS" "$REQ_LAMS_VERSION"
+    printf "$DB_URL\n"   
+        
+    $JAVA_HOME/bin/java -cp .:bin/:assembly/lams.ear/mysql-connector-java-3.1.12-bin.jar checkmysql "$DB_URL" "$DB_USER" "$DB_PASS" "$REQ_LAMS_VERSION"
 
     if [  "$?" -ne  "0" ]
     then
     	installfailed
     fi
 }
 
-getMysqlHost()
-{
-    SQL_HOST=""
-        SQL_URL=""
-        continue=""
-        printf "Please enter the location of your MySql Host (Default: localhost)\n> "
-        read SQL_HOST
-        if [ -z "$SQL_HOST" ]
-    then    
-                SQL_HOST=localhost
-    fi
+#getMysqlHost()
+#{
+#    SQL_HOST=""
+#       SQL_URL=""
+#        continue=""
+#        printf "Please enter the location of your MySql Host (Default: localhost)\n> "
+#        read SQL_HOST
+#        if [ -z "$SQL_HOST" ]
+#    then    
+#                SQL_HOST=localhost
+#    fi
+#
+#        SQL_URL="jdbc:mysql://$SQL_HOST/$DB_NAME?characterEncoding=utf8&autoReconnect=true"
+#
+#        printf "\nAll LAMS database update connections will be done through: \n$SQL_URL.\n"
+#        printf "Is this correct? (y)es, (n)o, (q)uit.\n> "
+#        read continue
+#
+#        case $continue in
+#       q)
+#                printf "\nTo set up MySql on a separate server, follow the instructions in the readme.\n\n"
+#                printf "LAMS update aborted by user.\n\n"
+#                installexit
+#                ;;
+#        y)
+#    
+#        # append SQL_HOST and SQL_URL to lams.properties
+#        echo "# Updater-generated properties, used instead of default localhost" >> lams.properties
+#        echo "SQL_HOST=$SQL_HOST" >> lams.properties
+#        echo "SQL_URL=jdbc:mysql://${SQL_HOST}/${DB_NAME}?characterEncoding=utf8&autoReconnect=true" >> lams.properties
+#        printf "\n"
+#        ;;
+#    n)
+#                printf "\n"
+#                getMysqlHost
+#                ;;
+#        *)
+#                printf "\nPlease enter your MySql host and then enter (y).\n"
+#                getMysqlHost
+#                ;;
+#        esac
+#}
 
-        SQL_URL="jdbc:mysql://$SQL_HOST/$DB_NAME?characterEncoding=utf8&autoReconnect=true"
-
-        printf "\nAll LAMS database update connections will be done through: \n$SQL_URL.\n"
-        printf "Is this correct? (y)es, (n)o, (q)uit.\n> "
-        read continue
-
-        case $continue in
-        q)
-                printf "\nTo set up MySql on a separate server, follow the instructions in the readme.\n\n"
-                printf "LAMS update aborted by user.\n\n"
-                installexit
-                ;;
-        y)
-    
-        # append SQL_HOST and SQL_URL to lams.properties
-        echo "# Updater-generated properties, used instead of default localhost" >> lams.properties
-        echo "SQL_HOST=$SQL_HOST" >> lams.properties
-        echo "SQL_URL=jdbc:mysql://${SQL_HOST}/${DB_NAME}?characterEncoding=utf8&autoReconnect=true" >> lams.properties
-        printf "\n"
-        ;;
-    n)
-                printf "\n"
-                getMysqlHost
-                ;;
-        *)
-                printf "\nPlease enter your MySql host and then enter (y).\n"
-                getMysqlHost
-                ;;
-        esac
-}
-
 checklams()
 {
     printf "Do you want to run the LAMS shutdown script before continuing? (Recommended)\n"
@@ -343,16 +343,16 @@
 printf "> $sqldir/mysqldump -u$DB_USER -p$DB_PASS $DB_NAME > (backup dir)/dump.sql\n"
 printf "\n--------------------------------------------------------------------------------\n\n"
 
-getMysqlHost
+#getMysqlHost
 checkMysql
 checklams
 backup
 
 
 printf "\nUpdating lams.ear with new jars and wars...\n"
-cp -rv assembly/lams.ear/*.jar $EAR_DIR > log/update-files.log
-cp -rv assembly/lams.ear/*.war $EAR_DIR >> log/update-files.log
-cp -rv assembly/lams-session.jar assembly/lams-valve.jar $DEFAULT_DIR/lib >> log/update-files.log
+cp -r assembly/lams.ear/*.jar $EAR_DIR > log/update-files.log
+cp -r assembly/lams.ear/*.war $EAR_DIR >> log/update-files.log
+cp -r assembly/lams-session.jar assembly/lams-valve.jar $DEFAULT_DIR/lib >> log/update-files.log
 
 printf "\nBeginning ant scripts, check log/install.log for install log. This may take a few minutes...\n"
 ant/bin/ant -logfile log/install.log -buildfile ant-scripts/update-lams.xml update-lams