Index: win_installer/patch/src/ant/update-deploy-tools.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/patch/src/ant/update-deploy-tools.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ win_installer/patch/src/ant/update-deploy-tools.xml	27 Dec 2010 13:40:45 -0000	1.1
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="update-deploy-tools" >
+	<!-- begin properties *******************************************************************************************-->
+	<!-- import properties from the specified file -->
+	
+	<!-- <property file="${prop.path}/build.properties" /> -->
+	<property file="tools.properties"/>
+
+	
+	<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_template.xml" />
+            </fileset>
+			<filterset>  
+				<filter token="dbUsername" value="${db.username}" />
+				<filter token="dbPassword" value="${db.password}" />
+				<filter token="dbDriverUrl" value="${db.urlDeployXML}" />
+				<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_template.xml" tofile="${build.deploy}/deploy.xml"/>
+		
+	    <echo>Deploy packaqe for ${signature} created.</echo>
+	              
+	</target>
+
+	<target name="update-application-xml" description="Adds java modules to application.xml">
+		<path id="deploy.lib.classpath">
+			<fileset dir="${deploy.tool.dir}">
+				<include name="lib/*.jar"/>
+			</fileset>
+		</path>
+		
+		<!--
+		  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="${jboss.deploy}" />
+            <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="${jboss.deploy}" />
+            <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="${jboss.deploy}" />
+            <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="${jboss.deploy}" />
+            <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="${jboss.deploy}" />
+            <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="${jboss.deploy}" />
+            <arg value="jxl.jar" />
+        </java>
+			
+		<java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+            <arg value="${jboss.deploy}" />
+            <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="${jboss.deploy}" />
+            <arg value="jboss-cache.jar" />
+        </java>
+		
+		<java classname="org.lamsfoundation.lams.tool.deploy.RemoveModuleFromApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+            <arg value="${jboss.deploy}" />
+            <arg value="jgroups.jar" />
+        </java>
+		
+		
+		<!-- Editing changed libraries -->
+		
+		<java classname="org.lamsfoundation.lams.tool.deploy.RemoveModuleFromApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+            <arg value="${jboss.deploy}" />
+            <arg value="FCKeditor-2.3.jar" />
+        </java>
+        
+        <java classname="org.lamsfoundation.lams.tool.deploy.RemoveModuleFromApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+            <arg value="${jboss.deploy}" />
+            <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="${jboss.deploy}" />
+            <arg value="FCKeditor-2.4.1.jar" />
+        </java>
+            
+        <java classname="org.lamsfoundation.lams.tool.deploy.AddModuleToApplicationXmlTask" classpathref="deploy.lib.classpath" fork="true">
+            <arg value="${jboss.deploy}" />
+            <arg value="mysql-connector-java-5.0.8-bin.jar" />
+        </java>
+		
+		<!-- 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="transform.jar" />
+        </java>
+        <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>
+	
+	<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" />
+				
+	</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"/>
+		
+		<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">
+			
+			<webinf dir="${jboss.deploy}/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">
+				<include name="**/**"/>
+				<!--
+				<include name="*"/>
+				<include name="css/*"/>
+				<include name="branching/*"/>
+				<include name="gate/*"/>
+				<include name="grouping/*"/>
+				<include name="images/*"/>
+				<include name="template/*"/>
+				-->
+			</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">
+					
+			<webinf dir="${jboss.deploy}/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"/>
+			</webinf>
+			<fileset dir="${jboss.deploy}/lams-learning.war.tmp">
+				<include name="**/**"/>
+				<!--
+				<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/**"/>
+				-->
+			</fileset>
+		</war>
+		
+		<delete dir="${jboss.deploy}/lams-learning.war.tmp" failonerror="false" />
+		<delete dir="${jboss.deploy}/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"/>
+			</fileset>
+		</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>	
+	</target>
+	
+</project>
\ No newline at end of file