Index: win_installer/updater/src/ant/update-deploy-tools.xml
===================================================================
diff -u -re0a6c0ebbb7175fd9dc07bbae37716a58a27dbaf -r894a0caebd8ab18dc1706c1f8cea6334305fa8d8
--- win_installer/updater/src/ant/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision e0a6c0ebbb7175fd9dc07bbae37716a58a27dbaf)
+++ win_installer/updater/src/ant/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision 894a0caebd8ab18dc1706c1f8cea6334305fa8d8)
@@ -32,86 +32,8 @@
 		
 	    <echo>Deploy packaqe for ${signature} created.</echo>
 	              
-	    </target>
-	
-	
-	
-	
-	
-	<!-- =================================================================== -->
-	<!-- Generate the deploy package                                         -->
-	<!-- =================================================================== -->
-	<!--
-	<target name="create-deploy-package" description="Generate the deployment package.">
-		<echo>Generating deploy.xml for ${signature}</echo>
-	
-		<path id="deploy.lib.classpath">
-			<fileset dir="${deploy.tool.dir}">
-				<include name="lib/*.jar"/>
-			</fileset>
-		</path> 
-
-		<taskdef name="generateDeployProperties" 
-			classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
-		    <classpath refid="deploy.lib.classpath"/>
-		</taskdef>
-
-		<generateDeployProperties 
-			mode="production" 
-			outputPath="${build.deploy}"
-			dbPassword="${db.password}"
-			dbUsername="${db.username}"
-			dbDriverUrl="${db.url}"
-			dbDriverClass="com.mysql.jdbc.Driver"
-			deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
-			toolJarFileName="${product}.jar"
-			toolSignature="${signature}"
-			toolVersion="${tool.version}"
-			hideTool="${hideTool}"
-			minServerVersionNumber="${min.server.version.number}"
-			toolUpdateScriptPath="${build.deploy}/sql/updatescripts/updateTo${tool.version}.sql"
-			toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_forum.sql" 
-			toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_forum.sql" 
-			toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" 
-			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}"
-			toolContext="${toolContext}"
-			toolWebUri="${product}.war"
-			languageFilesPackage="${language.files.package}">
-
-			<fileset dir="${build.deploy}/language">
-				<include name="**/*.properties"/>
-				<include name="**/*.txt"/>
-			</fileset>
-				
-		</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="${jboss.deploy}" />
-            <arg value="${db.username}" />
-            <arg value="${db.password}" />
-            <arg value="${db.url}" />
-        </java> 
-    </target>
-	    
-	
+
 	<target name="update-application-xml" description="Adds java modules to application.xml">
 		<path id="deploy.lib.classpath">
 			<fileset dir="${deploy.tool.dir}">
Index: win_installer/updater/src/updater.nsi
===================================================================
diff -u -r5ded297de026e3326780d37de90a2565bb9d9d72 -r894a0caebd8ab18dc1706c1f8cea6334305fa8d8
--- win_installer/updater/src/updater.nsi	(.../updater.nsi)	(revision 5ded297de026e3326780d37de90a2565bb9d9d72)
+++ win_installer/updater/src/updater.nsi	(.../updater.nsi)	(revision 894a0caebd8ab18dc1706c1f8cea6334305fa8d8)
@@ -240,9 +240,6 @@
             ; Then Calls deploy tools 
             call createAndDeployTools
             
-            ;updates tool contexts for non-default tools
-            call insertCustomToolContexts
-            
             # update application.xml 
             call updateApplicationXML
             
@@ -1726,38 +1723,6 @@
 
 FunctionEnd
 
-Function insertCustomToolContexts
-
-    # Running the ant scripts to update web.xmls and manifests
-    strcpy $0 '"$INSTDIR\apache-ant-1.6.5\bin\newAnt.bat" -logfile "$INSTDIR\update-logs\ant-update-custom-tool-contexts.log" -buildfile "$TEMP\lams\update-deploy-tools.xml" -propertyfile $TEMP\lams\$TOOL_SIG\build.properties update-custom-tool-contexts'
-    DetailPrint $0
-    nsExec::ExecToStack $0
-    Pop $0 ; return code, 0=success, error=fail
-    Pop $1 ; console output
-    ${if} $0 == "error"
-    ${orif} $0 == 1
-        goto error
-    ${endif}
-    DetailPrint "Result: $1"
-    
-    push "$INSTDIR\update-logs\ant-update-custom-tool-contexts.log"
-    push "FAILED"
-    Call FileSearch
-    Pop $0 #Number of times found throughout
-    Pop $3 #Found at all? yes/no
-    Pop $2 #Number of lines found in
-    StrCmp $3 yes 0 +2
-        goto error
-    
-    goto done
-    error:
-        DetailPrint "Web.xml update failed"
-        MessageBox MB_OK|MB_ICONSTOP "Web.xml update failed, check update logs in the installation directory for details $\r$\nError:$\r$\n$\r$\n$1"
-        Abort "LAMS configuration failed"
-    done:
-
-FunctionEnd
-
 ################################################################################
 # END CODE USED FOR UPDATER                                                    #
 ################################################################################