Index: unix_installer/upgrader-package/ant-scripts/language-pack.xml
===================================================================
diff -u -rd3e1423ab32ceafba2ea46b790b7206c6e8dbfad -r7cd04d543a7014b7dc948401a72494f523abf287
--- unix_installer/upgrader-package/ant-scripts/language-pack.xml	(.../language-pack.xml)	(revision d3e1423ab32ceafba2ea46b790b7206c6e8dbfad)
+++ unix_installer/upgrader-package/ant-scripts/language-pack.xml	(.../language-pack.xml)	(revision 7cd04d543a7014b7dc948401a72494f523abf287)
@@ -18,8 +18,33 @@
                 <pathelement path="../bin:../tools/lib/mysql-connector-java-3.1.12-bin.jar"/>
             </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="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-core-database.xml
===================================================================
diff -u -rdfde3b7525955235b664ca801fdece4fb418b532 -r7cd04d543a7014b7dc948401a72494f523abf287
--- unix_installer/upgrader-package/ant-scripts/update-core-database.xml	(.../update-core-database.xml)	(revision dfde3b7525955235b664ca801fdece4fb418b532)
+++ unix_installer/upgrader-package/ant-scripts/update-core-database.xml	(.../update-core-database.xml)	(revision 7cd04d543a7014b7dc948401a72494f523abf287)
@@ -14,24 +14,8 @@
 			encoding="utf8"
 			onerror="abort"
 			>
-			<transaction src="../sql-scripts/alter_21_branching.sql" />
-			<transaction src="../sql-scripts/alter_21_groupings_fckeditor.sql" />
-			<transaction src="../sql-scripts/updateLocales.sql" />
+			<transaction src="../sql-scripts/alter_22_autopatch.sql" />
 		</sql>
-		
-		<!-- REMOVE BELOW FOR 2.2 -->
-		<echo></echo>
-		<echo>The below script will fail if the database tables are already INNODB, this will not affect the update.</echo>
-		<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="continue"
-			>
-            <transaction src="../sql-scripts/alter_21_engine.sql" />
-        </sql>
 	</target>
 </project>
 
Index: unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml
===================================================================
diff -u -rd3e1423ab32ceafba2ea46b790b7206c6e8dbfad -r7cd04d543a7014b7dc948401a72494f523abf287
--- unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision d3e1423ab32ceafba2ea46b790b7206c6e8dbfad)
+++ unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision 7cd04d543a7014b7dc948401a72494f523abf287)
@@ -6,40 +6,37 @@
 	<property file="../tools/${prop.path}/build.properties" />
 	<property file="../lams.properties"/>
 	<property file="tools.properties" />
-	
-	
-	
 
 	<!-- =================================================================== -->
 	<!-- Generate the deploy package                                         -->
 	<!-- =================================================================== -->
 	<target name="create-deploy-package" description="Generate the deployment package.">
 		
 		<echo>+------------------------------------------+</echo>
-	        <echo>| Generate the deployment package.         |</echo>
-	        <echo>+------------------------------------------+</echo>
-	        <echo>Copying deploy.xml for ${signature}</echo>
-		    
-			<mkdir dir="${build.deploy}/filtered"/>
-			<copy overwrite="yes" todir="${build.deploy}/filtered"> 
-				<fileset dir="${build.deploy}">
-	                <include name="deploy.xml" />
-	            </fileset>
-				<filterset>  
-					<filter token="dbUsername" value="${db.username}" />
-					<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="toolDeployPackageDir" value="${build.deploy}" />
-				</filterset>
-			</copy>
-			
-			<move file="${build.deploy}/filtered/deploy.xml" tofile="${build.deploy}/deploy.xml"/>
-			<delete dir="${build.deploy}/filtered"/>
-		    
-			<echo>Deploy packaqe for ${signature} created.</echo>
+        <echo>| Generate the deployment package.         |</echo>
+        <echo>+------------------------------------------+</echo>
+        <echo>Copying deploy.xml for ${signature}</echo>
+	    
+		<mkdir dir="${build.deploy}/filtered"/>
+		<copy overwrite="yes" todir="${build.deploy}/filtered"> 
+			<fileset dir="${build.deploy}">
+                <include name="deploy.xml" />
+            </fileset>
+			<filterset>  
+				<filter token="dbUsername" value="${db.username}" />
+				<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="toolDeployPackageDir" value="${build.deploy}" />
+			</filterset>
+		</copy>
 		
+		<move file="${build.deploy}/filtered/deploy.xml" tofile="${build.deploy}/deploy.xml"/>
+		<delete dir="${build.deploy}/filtered"/>
+	    
+		<echo>Deploy package for ${signature} created.</echo>
+		
 		<!--
 		<path id="deploy.lib.classpath">
 			<fileset dir="${deploy.tool.dir}">
@@ -113,14 +110,30 @@
 				<include name="lib/*.jar"/>
 			</fileset>
 		</path>
-		
-		<!-- 2.1 SPECIFIC UPDATE!!!!!!!!!!!! -->
+
+		<!-- 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="commons-io-1.4.jar" />
+			<arg value="transform.jar" />
 		</java>
-		<!-- END 2.1 SPECIFIC UPDATE!!!!!!!!!!!! -->
+		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+			<arg value="${jboss.deploy}" />
+			<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="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="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="tk-discovery-1.0.0.jar" />
+		</java>
+		<!-- END 2.2 SPECIFIC UPDATE!!!!!!!!!!!! -->
 
 	</target>