Index: unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml
===================================================================
diff -u -red7331c3429f396672d217b7339b1a8266873543 -rec5e801fb51ac3387b91e67b5f6d2d4b3ab7276c
--- unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision ed7331c3429f396672d217b7339b1a8266873543)
+++ unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision ec5e801fb51ac3387b91e67b5f6d2d4b3ab7276c)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="update-deploy-tools" basedir="." >
+<project name="update-deploy-tools" basedir=".">
 	<!-- begin properties *******************************************************************************************-->
 	<!-- import properties from the specified file -->
-	
+
 	<property file="../tools/${prop.path}/build.properties" />
-	<property file="../lams.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"> 
+		<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>  
+				<include name="deploy.xml" />
+			</fileset>
+			<filterset>
 				<filter token="dbUsername" value="${db.username}" />
 				<filter token="dbPassword" value="${db.password}" />
 				<filter token="dbDriverUrl" value="${db.url}" />
@@ -31,12 +31,12 @@
 				<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"/>
-	    
+
+		<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}">
@@ -83,159 +83,229 @@
 		</generateDeployProperties>
 		
 		<echo>Deploy packaqe for ${signature} created.</echo>
-		-->	
-		
-		
+		-->
+
+
 	</target>
-	
+
 	<target name="update-custom-tool-contexts" description="Updates the web.xmls for the non-custom tools">
-        <echo>Updating web.xml and MANIFEST.MF for lams-central.war, lams-monitor.war and lams-learning.war. using for custom tools</echo>
-        <path id="deploy.lib.classpath">
-            <fileset dir="${deploy.tool.dir}">
-                <include name="lib/*.jar"/>
-            </fileset>
-        </path> 
-        
-        <java classname="org.lamsfoundation.lams.tool.deploy.AddCustomWebXmlContexts" classpathref="deploy.lib.classpath" fork="true">
-            <arg value="${DEFAULT_DIR}/deploy/lams.ear" />
-            <arg value="${db.username}" />
-            <arg value="${db.password}" />
-            <arg value="${SQL_URL}" />
-        </java> 
-    </target>
-	
+		<echo>Updating web.xml and MANIFEST.MF for lams-central.war, lams-monitor.war and lams-learning.war. using for custom tools</echo>
+		<path id="deploy.lib.classpath">
+			<fileset dir="${deploy.tool.dir}">
+				<include name="lib/*.jar" />
+			</fileset>
+		</path>
+
+		<java classname="org.lamsfoundation.lams.tool.deploy.AddCustomWebXmlContexts" classpathref="deploy.lib.classpath" fork="true">
+			<arg value="${DEFAULT_DIR}/deploy/lams.ear" />
+			<arg value="${db.username}" />
+			<arg value="${db.password}" />
+			<arg value="${SQL_URL}" />
+		</java>
+	</target>
+
 	<target name="update-application-xml" description="Adds/Removes java modules to application.xml">
 		<path id="deploy.lib.classpath">
 			<fileset dir="${deploy.tool.dir}">
-				<include name="lib/*.jar"/>
+				<include name="lib/*.jar" />
 			</fileset>
 		</path>
 
-		<!-- 2.2 SPECIFIC UPDATE!!!!!!!!!!!! -->
+		<!-- 2.3 SPECIFIC UPDATE!!!!!!!!!!!! -->
+		<!--
+		  Add
+		      - web lams-gradebook.war
+		      slf4j-api-1.5.2.jar
+		      slf4j-log4j12-1.5.2.jar
+		      lucene-core-2.4.0.jar
+		      lucene-snowball-2.4.0.jar
+		      jxl.jar
+		      opencsv-1.8.jar
+		      
+		  Edit 
+		      FCKeditor-2.3.jar - FCKeditor-2.4.1.jar
+		      mysql-connector-java-3.1.12-bin.jar - mysql-connector-java-5.0.8-bin.jar
+		      
+		  Delete 
+		      jboss-cache.jar
+		      jgroups.jar
+		-->
+
 		<echo>BEGIN Updating application.xml</echo>
+
+		<!-- Adding gradebook web module -->
+		<java classname="org.lamsfoundation.lams.tool.deploy.AddWebAppToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+			<arg value="${EAR_DIR}" />
+			<arg value="lams-gradebook.war" />
+			<arg value="/lams/gradebook" />
+		</java>
+
+
+		<!-- Adding new third party jar modules -->
 		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
-			<arg value="${DEFAULT_DIR}/deploy/lams.ear" />
-			<arg value="transform.jar" />
+			<arg value="${EAR_DIR}" />
+			<arg value="slf4j-api-1.5.2.jar" />
 		</java>
+
 		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
-			<arg value="${DEFAULT_DIR}/deploy/lams.ear" />
-			<arg value="translate.jar" />
+			<arg value="${EAR_DIR}" />
+			<arg value="slf4j-log4j12-1.5.2.jar" />
 		</java>
+
 		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
-			<arg value="${DEFAULT_DIR}/deploy/lams.ear" />
-			<arg value="JabberHTTPBind-1.1.1.jar" />
+			<arg value="${EAR_DIR}" />
+			<arg value="lucene-core-2.4.0.jar" />
 		</java>
+
 		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
-			<arg value="${DEFAULT_DIR}/deploy/lams.ear" />
-			<arg value="tk-autopatch-1.2.0-b2-cvs.jar" />
+			<arg value="${EAR_DIR}" />
+			<arg value="lucene-snowball-2.4.0.jar" />
 		</java>
+
 		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
-			<arg value="${DEFAULT_DIR}/deploy/lams.ear" />
-			<arg value="tk-discovery-1.0.0.jar" />
+			<arg value="${EAR_DIR}" />
+			<arg value="jxl.jar" />
 		</java>
-		<!-- END 2.2 SPECIFIC UPDATE!!!!!!!!!!!! -->
 
+		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+			<arg value="${EAR_DIR}" />
+			<arg value="opencsv-1.8.jar" />
+		</java>
+
+		<!-- Removing Defunct libraries -->
+
+		<java classname="org.lamsfoundation.lams.tool.deploy.RemoveModuleFromApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+			<arg value="${EAR_DIR}" />
+			<arg value="jboss-cache.jar" />
+		</java>
+
+		<java classname="org.lamsfoundation.lams.tool.deploy.RemoveModuleFromApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+			<arg value="${EAR_DIR}" />
+			<arg value="jgroups.jar" />
+		</java>
+
+
+		<!-- Editing changed libraries -->
+
+		<java classname="org.lamsfoundation.lams.tool.deploy.RemoveModuleFromApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+			<arg value="${EAR_DIR}" />
+			<arg value="FCKeditor-2.3.jar" />
+		</java>
+
+		<java classname="org.lamsfoundation.lams.tool.deploy.RemoveModuleFromApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+			<arg value="${EAR_DIR}" />
+			<arg value="mysql-connector-java-3.1.12-bin.jar" />
+		</java>
+
+		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+			<arg value="${EAR_DIR}" />
+			<arg value="FCKeditor-2.4.1.jar" />
+		</java>
+
+		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+			<arg value="${EAR_DIR}" />
+			<arg value="mysql-connector-java-5.0.8-bin.jar" />
+		</java>
+		<!-- END 2.3 SPECIFIC UPDATE!!!!!!!!!!!! -->
 	</target>
-	
-	
+
+
 	<target name="explode-wars" description="explodes lams_learning.war and 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" />
+		<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="${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="${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">
-			
+
+		<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="${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="${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"/>
+				<include name="**/*.xml" />
+				<include name="**/*.tld" />
+				<include name="struts/*" />
+				<include name="jstl/*" />
+				<include name="tags/*" />
+				<exclude name="web.xml" />
 			</webinf>
 			<fileset dir="${DEFAULT_DIR}/deploy/lams.ear/lams-monitoring.war.tmp">
-				<include name="*"/>
-				<include name="css/*"/>
-				<include name="branching/*"/>
-				<include name="gate/*"/>
-				<include name="grouping/*"/>
-				<include name="images/*"/>
-				<include name="template/*"/>
+				<include name="*" />
+				<include name="css/*" />
+				<include name="branching/*" />
+				<include name="gate/*" />
+				<include name="grouping/*" />
+				<include name="images/*" />
+				<include name="template/*" />
 			</fileset>
 		</war>
-		
-		<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">
-					
+
+		<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="${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war.tmp/WEB-INF">
-				<include name="*.xml"/>
-				<include name="struts/*"/>
-				<include name="struts/tlds/*"/>
-				<include name="jstl/*"/>
-				<include name="jstl/tlds/*"/>
-				<include name="tags/*"/>
-				<include name="lams.tld"/>
-				<exclude name="web.xml"/>
+				<include name="*.xml" />
+				<include name="struts/*" />
+				<include name="struts/tlds/*" />
+				<include name="jstl/*" />
+				<include name="jstl/tlds/*" />
+				<include name="tags/*" />
+				<include name="lams.tld" />
+				<exclude name="web.xml" />
 			</webinf>
 			<fileset dir="${DEFAULT_DIR}/deploy/lams.ear/lams-learning.war.tmp">
-				<include name="*"/>
-				<include name="css/*"/>
-				<include name="branching/*"/>
+				<include name="*" />
+				<include name="css/*" />
+				<include name="branching/*" />
 				<include name="common/*" />
-				<include name="exportPortfolio/*"/>
-				<include name="notebook/*"/>
-				<include name="gate/*"/>
-				<include name="grouping/*"/>
-				<include name="images/*"/>
-				<include name="layout/*"/>
-				<include name="test/*"/>
-				<include name="includes/**"/>
+				<include name="exportPortfolio/*" />
+				<include name="notebook/*" />
+				<include name="gate/*" />
+				<include name="grouping/*" />
+				<include name="images/*" />
+				<include name="layout/*" />
+				<include name="test/*" />
+				<include name="includes/**" />
 			</fileset>
 		</war>
-		
-		
+
+
 		<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>
-			
+
 	<target name="deploy-tool" description="runs the tool deployer for a given tool">
 		<path id="deploy.lib.classpath">
 			<fileset dir="${deploy.tool.dir}">
-				<include name="lib/*.jar"/>
+				<include name="lib/*.jar" />
 			</fileset>
-		</path> 
-		
+		</path>
+
 		<echo>Deploying the ${signature} Tool</echo>
 
 		<java classname="org.lamsfoundation.lams.tool.deploy.Deploy" classpathref="deploy.lib.classpath" fork="true">
 			<arg file="${build.deploy}/deploy.xml" />
 			<arg value="False" />
 		</java>
 	</target>
-	
+
 	<target name="update-tool-context">
-			<echo>Updating web.xml and MANIFEST.MF for lams-central.war, lams-monitor.war and lams-learning.war. using config from ${build.deploy}/deploy.xml</echo>
-			
-			<path id="deploy.lib.classpath">
-				<fileset dir="${deploy.tool.dir}">
-					<include name="lib/*.jar"/>
-				</fileset>
-			</path> 
-			
-			<java classname="org.lamsfoundation.lams.tool.deploy.UpdateToolContextPath" classpathref="deploy.lib.classpath" fork="true">
-					<arg file="${build.deploy}/deploy.xml" />
-			</java>	
+		<echo>Updating web.xml and MANIFEST.MF for lams-central.war, lams-monitor.war and lams-learning.war. using config from ${build.deploy}/deploy.xml</echo>
+
+		<path id="deploy.lib.classpath">
+			<fileset dir="${deploy.tool.dir}">
+				<include name="lib/*.jar" />
+			</fileset>
+		</path>
+
+		<java classname="org.lamsfoundation.lams.tool.deploy.UpdateToolContextPath" classpathref="deploy.lib.classpath" fork="true">
+			<arg file="${build.deploy}/deploy.xml" />
+		</java>
 	</target>
-	
-	
+
+
 </project>