Index: unix_installer/upgrader-package/ant-scripts/update-lams.xml
===================================================================
diff -u -rdfde3b7525955235b664ca801fdece4fb418b532 -r254e5562bcc33928d30715c6e9e2f27033127bd5
--- unix_installer/upgrader-package/ant-scripts/update-lams.xml	(.../update-lams.xml)	(revision dfde3b7525955235b664ca801fdece4fb418b532)
+++ unix_installer/upgrader-package/ant-scripts/update-lams.xml	(.../update-lams.xml)	(revision 254e5562bcc33928d30715c6e9e2f27033127bd5)
@@ -38,27 +38,22 @@
 	
     <!-- 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="configure-jboss" />-->
+        <!--<antcall target="copy-core-jars-wars" />-->
         <antcall target="update-core-database" />
         <!-- <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="update-custom-tool-contexts"/>
-    	<antcall target="update-2.1-specific"/>
+    	<antcall target="update-lams-central-war" />
+    	
+    	<antcall target="deploy-new-tools" />
+    	
+    	<antcall target="update-application-xml" />
+    	
     	<antcall target="update-conf-files"/>
-        <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"/>
+        <!--<antcall target="set-lams-configuration" />-->
     </target>
 
 
@@ -145,24 +140,53 @@
         </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="MYSQL_HOST" value="${SQL_HOST}"/>
-                <filter token="MYSQL_PORT" 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>
+	
+	<target name="update-lams-central-war" description="Updates files in lams-central.war">
+        <echo>Updating lams-central.war</echo>
+		<copy todir="${DEPLOY_DIR}/lams.ear/lams-central.war" overwrite="true">
+            <fileset dir="../assembly/lams.ear/lams-central.war">
+                <exclude name="META-INF/MANIFEST.MF"/>
+            	<exclude name="WEB-INF/web.xml"/>
+            </fileset>          
         </copy>
     </target>
-	-->
+	
+	<target name="language-pack" description="Runs the latest language pack included with the updater">
+		<echo>Applying language pack</echo>
+		
+		<!-- Overwrite language files, but leave the combined task language files alone -->
+		<copy todir="${DEPLOY_DIR}/lams.ear/lams-dictionary.jar" overwrite="true">
+            <fileset dir="../assembly/lams.ear/lams-dictionary.jar">
+                <exclude name="**/library/**"/>
+            </fileset>          
+        </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">
+	            <fileset dir="../assembly/lams.ear/lams-central.war/flashxml/"/>
+	        </copy>
+	    </target>
+    	
+		<!-- Copy combined activity language files to appropriate directory -->
+    	<java classname="copyllid" failonerror="true" fork="true">
+        	<arg value="${JBOSS_DIR}"/>
+        	<arg value="${DB_USER}"/>
+        	<arg value="${DB_PASS}"/>
+        	<arg value="${DB_NAME}"/>
+        	<arg value="${SQL_URL}"/>
+        	<classpath>
+                <pathelement path="../bin:../tools/lib/mysql-connector-java-3.1.12-bin.jar"/>
+            </classpath>
+        </java>
 
+		<!--
+    	<ant antfile="language-pack.xml" output="../log/language-pack.log" target="update-languages" inheritAll="true">
+        </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="update-deploy-tools.xml" output="../log/explode-wars.log" target="explode-wars">
             <property name="jboss.deploy" value="${EAR_DIR}"/>
@@ -174,204 +198,60 @@
             <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>
-
-        <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-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-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-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-latask10-deploy.log" target="create-deploy-package">
-            <property name="prop.path" value="latask10"/>
-        </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 name="deploy-new-tools" description="Deploys any new tools added for this updater, must be updated for each release">
+    	<antcall target="explode-wars"/>
+    	
+    	<echo>Deploying new tools</echo>
+    	
+    	<!-- ============= 2.2 Tools ============== -->
+    	<antcall target="deploy-new-tool">
+    	   	<param name="signature" value="ladaco10"/>
+    	</antcall>
+    	<antcall target="deploy-new-tool">
+    	   	<param name="signature" value="lagmap10"/>
+    	</antcall>
+    	<antcall target="deploy-new-tool">
+    	   	<param name="signature" value="lasprd10"/>
+    	</antcall>
+    	<antcall target="deploy-new-tool">
+    	   	<param name="signature" value="lawiki10"/>
+    	</antcall>
+    	<!-- ============= 2.2 Tools ============== -->
+    	
+    	<antcall target="compress-wars"/>
     </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>
-
-        <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-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-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-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-latask10.log" target="deploy-tool">
-	        <property name="prop.path" value="latask10"/>
-	    </ant>
-
-        <ant antfile="update-deploy-tools.xml" output="../log/deploy-lavote11.log" target="deploy-tool">
-            <property name="prop.path" value="lavote11"/>
+	<target name="deploy-new-tool" description="Fully deploys a tool">
+    	<antcall target="filter-deploy-xml">
+    	    <param name="signature" value="${signature}"/>
+    	</antcall>
+    	<ant antfile="update-deploy-tools.xml" output="../log/deploy-${signature}.log" target="deploy-tool">
+            <property name="prop.path" value="${signature}"/>
         </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>
-
-        <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-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-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-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-latask10.log" target="update-tool-context">
-            <property name="prop.path" value="latask10"/>
-        </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"/>
+    <target name="filter-deploy-xml" description="Filters a new tool's deploy.xml and fills in the appropriate values for this install">
+    	<ant antfile="update-deploy-tools.xml" output="../log/create-${signature}-deploy.log" target="create-deploy-package">
+            <property name="prop.path" value="${signature}"/>
         </ant>
-        
-    </target> 
+   	</target>
 	
-	<target name="update-custom-tool-contexts">
-		<ant antfile="update-deploy-tools.xml" output="../log/update-custom-tool-contexts.log" target="update-custom-tool-contexts">
-            <property name="prop.path" value="lavote11"/>
-        </ant>
-	</target>
-	
-	<target name="update-2.1-specific" description="Update tasks specfic to the 2.1 Update">
+	<target name="update-application-xml" description="Updates application.xml to include all required modules for the current version">
 		<ant antfile="update-deploy-tools.xml" output="../log/update-application-xml.log" target="update-application-xml">
-            <property name="prop.path" value="lavote11"/>
+            <property name="prop.path" value="lachat11"/>
         </ant>
-		
-		<!-- LI-159 Update mysql-ds for 2.1 --> 
-		<copy todir="${DEPLOY_DIR}" overwrite="true">
-            <fileset dir="../conf">
-                <include name="mysql-ds.xml"/>
-            </fileset>
-            <filterset>
-                <filter token="MYSQL_HOST" value="${SQL_HOST}"/>
-                <filter token="MYSQL_PORT" value="${SQL_PORT}"/>
-                <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-conf-files" description="Updates conf files">
-		<copy todir="${DEFAULT_DIR}/conf" overwrite="true">
+    	
+	<target name="update-conf-files" description="Updates conf files, must be updated each release">
+		<!-- FOR 2.2 only, copy the context.xml to the jbossweb dir -->
+		<copy todir="${DEFAULT_DIR}/jbossweb-tomcat55.sar" overwrite="true">
             <fileset dir="../conf">
-                <include name="*.xml"/>
+                <include name="context.xml"/>
             </fileset>
         </copy>
 	</target>
 
-    <target name="language-pack" description="Runs the latest language pack included with the updater">
-        <ant antfile="language-pack.xml" output="../log/language-pack.log" target="update-languages" inheritAll="true">
-        </ant>
-    </target>
-
-    <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"/>
-
-    </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" 
@@ -385,9 +265,4 @@
         </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"/>
-        <copy todir="/etc/lams2" file= "../lams.properties"/>
-    </target>       
-
 </project>