Index: unix_installer/upgrader-package/lams.properties
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/lams.properties,v
diff -u -r1.7 -r1.8
--- unix_installer/upgrader-package/lams.properties	12 Nov 2008 00:22:48 -0000	1.7
+++ unix_installer/upgrader-package/lams.properties	12 Nov 2008 04:52:21 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/update-lams.sh,v
diff -u -r1.9 -r1.10
Binary files differ
Index: unix_installer/upgrader-package/ant-scripts/tools.properties
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/ant-scripts/tools.properties,v
diff -u -r1.3 -r1.4
--- unix_installer/upgrader-package/ant-scripts/tools.properties	18 Jun 2008 05:51:06 -0000	1.3
+++ unix_installer/upgrader-package/ant-scripts/tools.properties	12 Nov 2008 04:52:21 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml,v
diff -u -r1.6 -r1.7
--- unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml	12 Nov 2008 00:11:29 -0000	1.6
+++ unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml	12 Nov 2008 04:52:21 -0000	1.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/ant-scripts/update-lams.xml,v
diff -u -r1.9 -r1.10
--- unix_installer/upgrader-package/ant-scripts/update-lams.xml	12 Nov 2008 02:51:01 -0000	1.9
+++ unix_installer/upgrader-package/ant-scripts/update-lams.xml	12 Nov 2008 04:52:21 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/upgrader-package/bin/copyllid.class,v
diff -u -r1.2 -r1.3
Binary files differ