Index: lams_tool_forum/build.xml
===================================================================
diff -u -r14a4ddd75793d09a63e27fef3863a4771c64d37a -r4296cc24afab0a22b2075656b93b7bad7578e32f
--- lams_tool_forum/build.xml	(.../build.xml)	(revision 14a4ddd75793d09a63e27fef3863a4771c64d37a)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
@@ -10,61 +10,58 @@
 	<property file="build.properties"/>
 
 	<!-- fixed filesystem property structure /-->
+	<property name="sql.dir" value="${project.dir}/db/sql"/>
+	
 	<property name="src.dir" value="${project.dir}/src/java"/>
-    <property name="lib.build.dir" value="${build.lib}"/>
-	<property name="lib.dir" value="${shared.lib}"/>
-	<property name="dist.dir" value="${project.dir}/dist"/>
-	<property name="classes.dir" value="${project.dir}/classes"/>
+	<property name="lib.dir" value="${project.dir}/lib"/>
 	<property name="build.dir" value="${project.dir}/build"/>
+	<property name="build.lib.dir" value="${build.dir}/lib"/>
+	<property name="build.report.dir" value="${build.dir}/report"/>
+	<property name="build.deploy.dir" value="${build.dir}/deploy"/>
+	<property name="classes.dir" value="${build.dir}/classes"/>
   	<property name="deploy.dir" value="${project.dir}/deploy"/>
 
     <property name="test.src.dir" value="${project.dir}/test/java"/>
     <property name="test.lib.dir" value="${project.dir}/test/lib"/>
     <property name="test.classes.dir" value="${project.dir}/test/classes"/>
-    <property name="test.result" value="${project.dir}//test/testresult"/>
+    <property name="test.result" value="${project.dir}/test/testresult"/>
 
     <property name="web.dir" value="${project.dir}/web"/>
-    <property name="web.lib.dir" value="${project.dir}/web/WEB-INF/lib"/>
-    <!--
-    <property name="web.src.dir" value="${project.dir}/web/WEB-INF/classes"/>
-    <property name="web.classes.dir" value="${project.dir}/web/classes"/>
-    -->
+	<property name="webinf.dir" value="${project.dir}/web/WEB-INF"/>
+	 
+	<property name="conf.dir" value="${project.dir}/conf"/>
+	<property name="xdoclet.dir" value="${conf.dir}/xdoclet"/>
 
+	<property name="hibernate.mappings.dir" value="${conf.dir}/hibernate/mappings"/>
+
 	<!-- end properties *********************************************************************************************-->
 
 	<!-- begin path *************************************************************************************************-->
-	<!--
-    <path id="app.class.path">
-		<fileset dir="${lib.dir}">
+	<path id="all-libs">
+		<fileset dir="${lib}">
 			<include name="**/*.jar"/>
 		</fileset>
-	</path>
-    -->
-
-	<path id="build.class.path">
-		<fileset dir="${lib.dir}">
+		<fileset dir="${sharedlib}">
 			<include name="**/*.jar"/>
 		</fileset>
-       	<fileset dir="${lib.build.dir}">
+		<fileset dir="${j2eelibs}">
 			<include name="**/*.jar"/>
 		</fileset>
-    </path>
+	</path>
 
-    <!--
-    <path id="test.class.path">
-        <path refid="build.class.path"/>
-        <fileset dir="${test.lib.dir}">
-            <include name="*.jar"/>
-        </fileset>
+	<path id="project.classpath">
+		<path refid="all-libs"/>
+		<!-- Java CLASSPATH should be added as the last item -->
+		<!-- This property is supposed to be set in eclipse  -->
+		<pathelement location="${java.class.path}" />
+	</path>
 
+	<path id="build.class.path">
+		<fileset dir="${lib.dir}/build">
+			<include name="**/*.jar"/>
+		</fileset>
     </path>
-    -->
 
-	<path id="hibernate.build.class.path">
-		<pathelement path="${classes.dir}"/>
-		<pathelement path="${src.dir}"/>
-		<path refid="build.class.path"/>
-    </path>
 	<!-- end path ***************************************************************************************************-->
 
 	<!-- begin tasks ***********************************************************************************************/-->
@@ -86,14 +83,13 @@
 		<!-- build filesystem structure /-->
 		<mkdir dir="${classes.dir}"/>
 		<mkdir dir="${lib.dir}"/>
-		<mkdir dir="${dist.dir}"/>
         <mkdir dir="${build.dir}"/>
+        <mkdir dir="${build.report.dir}"/>
+        <mkdir dir="${build.lib.dir}"/>
+        <mkdir dir="${build.deploy.dir}"/>
         <mkdir dir="${test.classes.dir}"/>
         <mkdir dir="${test.result}"/>
-        <!--
-        <mkdir dir="${web.classes.dir}"/>
-        -->
-        <mkdir dir="${deploy.dir}"/>
+         <mkdir dir="${deploy.dir}"/>
 	</target>
 
 
@@ -103,17 +99,16 @@
 		<echo>+------------------------------------------+</echo>
 
 		<delete dir="${classes.dir}"/>
-		<delete dir="${dist.dir}"/>
 		<delete dir="${build.dir}"/>
+		<delete dir="${build.report.dir}"/>
+		<delete dir="${build.lib.dir}"/>
+		<delete dir="${build.deploy.dir}"/>
         <delete dir="${test.classes.dir}"/>
         <delete dir="${test.result}"/>
-        <!--
-        <delete dir="${web.classes.dir}"/>
-        -->
         <delete dir="${deploy.dir}"/>
 
 	</target>
-
+			
 	<target name="compile" description="Compiles the Task" depends="init">
 		<echo>+------------------------------------------+</echo>
 		<echo>| compile                                  |</echo>
@@ -123,7 +118,7 @@
             source="1.4"
             debug="on"
             compiler="modern"
-            classpathref="build.class.path"
+            classpathref="project.classpath"
             destdir="${classes.dir}"/>
 	</target>
 
@@ -132,44 +127,22 @@
 		<echo>| generating hibernate metadata            |</echo>
 		<echo>+------------------------------------------+</echo>
 
-		<taskdef name="hibernateDoclet"
-            classname="xdoclet.modules.hibernate.HibernateDocletTask"
-            classpathref="build.class.path"/>
+		<taskdef name="hibernatedoclet"
+			classname="xdoclet.modules.hibernate.HibernateDocletTask"
+			classpathref="all-libs"/>
 
-		<hibernateDoclet
-            destdir="${classes.dir}"
-            excludedtags="@version,@author"
-            force="true"
-            verbose="true">
+		<echo>Building hbm.xml files using XDoclet to ${hibernate.mappings.dir} from ${src.dir}</echo>
 
-			<fileset dir="${src.dir}">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="${lib.dir}">
-				<include name="propertyset-1.3-25Dec03.jar"/>
-			</fileset>
+		<hibernatedoclet
+			destdir="${hibernate.mappings.dir}"
+			excludedtags="@version,@author,@todo"
+			force="true">
+				<fileset dir="${src.dir}">
+					<include name="**/*.java"/>
+				</fileset>
 			<hibernate version="2.0"/>
-		</hibernateDoclet>
+		</hibernatedoclet>
 
-
-		<taskdef name="schemaexport"
-            classname="net.sf.hibernate.tool.hbm2ddl.SchemaExportTask"
-            classpathref="hibernate.build.class.path"/>
-
-	    <schemaexport properties="${project.dir}/mysql-hibernate.properties"
-            quiet="no"
-            text="yes"
-            drop="no"
-            delimiter=";"
-            output="${classes.dir}/mysql-schema-export.ddl">
-			<fileset dir="${classes.dir}">
-				<include name="**/*.hbm.xml"/>
-			</fileset>
-			<fileset dir="${lib.dir}">
-				<include name="propertyset-1.3*.jar"/>
-			</fileset>
-		</schemaexport>
-
     </target>
 
     <target name="compiletest" description="Compiles the test classes" depends="clean, compile, hibernate">
@@ -194,10 +167,45 @@
             source="1.4"
             debug="on"
             compiler="modern"
-            classpathref="build.class.path"
+            classpathref="project.classpath"
             destdir="${test.classes.dir}"/>
     </target>
 	
+	
+	<!-- =================================================================== -->
+	<!-- Forum Database tasks                                               -->
+	<!-- =================================================================== -->
+	<target name="clean-db"	description="clean forum database.">
+		<sql driver="${database.driver}" url="${database.url}" userid="${database.userid}"
+				password="${database.password}">
+			<classpath>
+				<pathelement location="${database.driver.file}"/>
+			</classpath>
+			<transaction src="${sql.dir}/cleanup_lams_tool_forum.sql"/>
+		</sql>
+	</target>
+	
+	<target name="init-db"	description="drop and create forum database.">
+		<sql driver="${database.driver}" url="${database.url}" userid="${database.userid}"
+				password="${database.password}">
+			<classpath>
+				<pathelement location="${database.driver.file}"/>
+			</classpath>
+			<transaction src="${sql.dir}/drop_lams_tool_forum.sql"/>
+			<transaction src="${sql.dir}/create_lams_tool_forum.sql"/>
+		</sql>
+	</target>
+	
+	<target name="build-db"	depends="init-db" 
+							description="build qa tool database.">
+		<sql driver="${database.driver}" url="${database.url}" userid="${database.userid}"
+				password="${database.password}">
+			<classpath>
+				<pathelement location="${database.driver.file}"/>
+			</classpath>
+			<transaction src="${sql.dir}/insert_lams_tool_forum_data.sql"/>
+		</sql>
+	</target>
 
     <target name="junit" depends="compiletest, init-db">
         <echo>+-------------------------------------------+</echo>
@@ -218,7 +226,7 @@
 
          <classpath id="junit.class.path">
              <path location="${test.classes.dir}"/>
-             <path refid="build.class.path"/>
+             <path refid="project.classpath"/>
          </classpath>
 
          <formatter type="xml"/>
@@ -240,9 +248,10 @@
 		<echo>| merge stuff into jar file                |</echo>
 		<echo>+------------------------------------------+</echo>
 
-		<copy todir="${classes.dir}">
+	 	<copy overwrite="yes" todir="${classes.dir}">
 			<fileset dir="${src.dir}">
 				<include name="**/*.xml"/>
+				<include name="**/*.properties"/>
 			</fileset>
 		</copy>
 	</target>
@@ -251,126 +260,163 @@
 		<echo>+------------------------------------------+</echo>
 		<echo>| create jar file                          |</echo>
 		<echo>+------------------------------------------+</echo>
-
-		<jar destfile="${build.dir}/${project}.jar"
-            basedir="${classes.dir}"/>
-
-		<copy file="${build.dir}/${project}.jar"
-            todir="${dist.dir}"/>
+		<delete file="${build.lib.dir}/${product}.jar"/>
+		<jar destfile="${build.lib.dir}/${product}.jar">
+			<fileset dir="${classes.dir}">
+			</fileset>
+			<fileset dir="${hibernate.mappings.dir}">
+			</fileset>
+		</jar> 
 	</target>
 
-    <!-- =================================================================== -->
-    <!-- Forum Database tasks                                               -->
-    <!-- =================================================================== -->
-    <target name="clean-db"	description="clean forum database.">
-        <sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-                password="${db.password}">
-
-         <classpath id="junit.class.path">
-             <path refid="build.class.path"/>
-         </classpath>
-
-            <transaction src="${db.scripts}/cleanup_lams_tool_forum.sql"/>
-        </sql>
-    </target>
-
-    <target name="init-db"	description="drop and create forum database.">
-        <sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-                password="${db.password}">
-            <classpath>
-                <path refid="build.class.path"/>
-            </classpath>
-            <transaction src="${db.scripts}/drop_lams_tool_forum.sql"/>
-            <transaction src="${db.scripts}/create_lams_tool_forum.sql"/>
-        </sql>
-    </target>
-
-    <target name="build-db"	depends="init-db"
-                            description="build qa tool database.">
-        <sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-                password="${db.password}">
-            <classpath>
-                <path refid="build.class.path"/>
-            </classpath>
-            <transaction src="${db.scripts}/insert_lams_tool_forum_data.sql"/>
-        </sql>
-    </target>
-
     <target name="web"  description="generates xdoclet for web">
 	    <taskdef
 	        name="webdoclet"
 	        classname="xdoclet.modules.web.WebDocletTask"
-	        classpathref="build.class.path"
+	        classpathref="project.classpath"
 	    />
-		<webdoclet destdir="${web.dir}/WEB-INF">
-	        <fileset dir="${src.dir}" />
-			<strutsconfigxml validatexml="true" version="1.1" mergeDir="${web.dir}/WEB-INF/struts/config"  />
-			<!-- <jsptaglib shortname="spirit taglibs" filename="spirit.tld" /> -->
-		</webdoclet>
-        <copy todir="${web.dir}/WEB-INF">
-			<fileset dir="${web.dir}/WEB-INF/struts" includes="*.xml"/>
-		</copy>
+		<webdoclet destdir="${webinf.dir}" force="${xdoclet.force}" 
+			mergedir="${xdoclet.dir}" >
+			
+         <fileset dir="${src.dir}">
+            <include name="**/*Action.java" />
+            <include name="**/*Form.java" />
+         </fileset>
+
+         <deploymentdescriptor servletspec="2.3" sessiontimeout="${sessiontimeout}"/>
+			
+         <strutsconfigxml validatexml="true" version="1.2"/>
+      </webdoclet>
+
 	</target>
 
-	<target name="copyweb" description="Copy " depends="_build, web">
-        <mkdir dir="${deploy.dir}/WEB-INF" />
-		<copy todir="${deploy.dir}/WEB-INF">
-			<fileset dir="${web.dir}/WEB-INF/struts" includes="**/*.tld"/>
-            <fileset dir="${web.dir}/WEB-INF" excludes="**/struts/"/>
+	<target name="build-war" depends="web,jar" description="creates war file">
+		<echo>+------------------------------------------+</echo>
+		<echo>| build jar file                           |</echo>
+		<echo>+------------------------------------------+</echo>
+		<delete file="${build.lib.dir}/${product}.war"/>
+		<war warfile="${build.lib.dir}/${product}.war" 
+  				webxml="${webinf.dir}/web.xml" manifest="${conf.dir}/war/META-INF/MANIFEST.MF">
+			<webinf dir="${webinf.dir}">
+				<include name="*.tld"/>
+				<include name="*.xml"/>
+				<include name="struts/*"/>
+				<exclude name="web.xml"/>
+			</webinf>
+			<fileset dir="${web.dir}">
+				<include name="*"/>
+				<include name="includes/**"/>
+				<include name="jsps/**"/> 
+			</fileset>
+		</war>
+	</target>
 
-        </copy>
+	<!-- =================================================================== -->
+	<!-- Deploy the jar and war                               				 -->
+	<!-- =================================================================== -->
+	<target name="deploy-war" depends="build-war" description="Deploy the IMS Content Package tool war file and jar file">
+		<copy file="${build.lib.dir}/${product}.jar"
+				todir="${jboss.deploy}"/> 
+		<copy file="${build.lib.dir}/${product}.war"
+				todir="${jboss.deploy}"/> 
+	</target>
 
-		<mkdir dir="${deploy.dir}/WEB-INF/lib" />
-		<copy todir="${deploy.dir}/WEB-INF/lib">
-			<fileset dir="${lib.dir}" includes="*.jar"/>
-            <fileset dir="${build.dir}" includes="*.jar"/>
+	<!-- =================================================================== -->
+	<!-- Generate the deploy package                                         -->
+	<!-- =================================================================== -->
+	<target name="create-deploy-package" depends="build-war" 
+		description="Generate the deployment package.">
+
+		<echo>+------------------------------------------+</echo>
+		<echo>| Generate the deployment package.         |</echo>
+		<echo>+------------------------------------------+</echo>
+		<path id="deploy.lib.classpath">
+			<fileset dir="${deploy.tool.dir}">
+				<include name="lib/*.jar"/>
+			</fileset>
+		</path> 
+			  
+		<mkdir dir="${build.deploy.dir}"/>
+		<mkdir dir="${build.deploy.dir}/lib"/> 
+		<mkdir dir="${build.deploy.dir}/sql"/> 
+		 
+		<copy overwrite="yes" todir="${build.deploy.dir}/sql">
+			<fileset dir="${sql.dir}/">
+				<include name="create_lams_tool_forum.sql"/>
+				<include name="drop_lams_tool_forum.sql"/>
+				<include name="activity_insert.sql"/>
+				<include name="library_insert.sql"/>
+				<include name="tool_insert.sql"/>
+			</fileset>
 		</copy>
 
-		<mkdir dir="${deploy.dir}/jsps" />
-		<copy todir="${deploy.dir}/jsps">
-              <fileset dir="${web.dir}/jsps" includes="**/*.jsp"/>
-        </copy>
+		<copy overwrite="yes" todir="${build.deploy.dir}/">
+			<fileset dir="${deploy.tool.dir}">
+				<include name="*.*"/>
+			</fileset>
+		</copy>
 
-        <mkdir dir="${deploy.dir}/includes" />
-          <copy todir="${deploy.dir}/includes">
-              <fileset dir="${web.dir}/includes" excludes="**/*.txt,**/*.java"/>
-          </copy>
+		<copy overwrite="yes" todir="${build.deploy.dir}/lib">
+			<fileset dir="${deploy.tool.dir}/lib">
+				<include name="*.jar"/>
+			</fileset>
+		</copy>
 
-        <mkdir dir="${deploy.dir}/images" />
-          <copy todir="${deploy.dir}/images">
-              <fileset dir="${web.dir}/images" includes="**/*.png,**/*.gif"/>
-          </copy>
+		<taskdef name="generateDeployProperties" 
+			classname="org.lamsfoundation.lams.tool.deploy.CreatePackageTask">
+		    <classpath refid="deploy.lib.classpath"/>
+		</taskdef>
 
+		<generateDeployProperties depends="compile" 
+			mode="development" 
+			outputPath="${build.deploy.dir}"
+			dbPassword="${database.password}"
+			dbUsername="${database.userid}"
+			dbDriverUrl="${database.url}"
+			dbDriverClass="com.mysql.jdbc.Driver"
+			deployFiles="${build.lib.dir}/${product}.war,${build.lib.dir}/${product}.jar"
+			toolSignature="${signature}"
+			toolTablesScriptPath="${sql.dir}/create_lams_tool_forum.sql"
+			toolTablesDeleteScriptPath="${sql.dir}/drop_lams_tool_forum.sql"
+			toolActivityInsertScriptPath="${sql.dir}/activity_insert.sql"
+			toolLibraryInsertScriptPath="${sql.dir}/library_insert.sql"
+			toolInsertScriptPath="${sql.dir}/tool_insert.sql"
+			lamsEarPath="${jboss.deploy}"
+			toolContext="${toolContext}"
+			toolWebUri="${product}.war"
+			/>
 	</target>
 
+	<target name="deploy-tool" depends="create-deploy-package" 
+		description="Build the war, jar and run the deploy tool. Deletes most old tool references from db, creates db tables, application.xml in ear, copies war and jar file to ear. deploy-tool is only designed to be run in a development environment, or on an empty db. Do not run on a production environment.">
 
+		<path id="deploy.classpath">
+			<fileset dir="${build.deploy.dir}">
+				<include name="lib/*.jar"/>
+			</fileset>
+		</path> 
+
+		<echo>Deploying the ISMCP tool</echo>
+	
+		<java
+			classname="org.lamsfoundation.lams.tool.deploy.Deploy"
+			classpathref="deploy.classpath"
+			fork="true">
+				<arg file="${build.deploy.dir}/deploy.properties"/>
+				<arg value="True"/> <!-- forcedb -->
+		</java>
+					
+	</target>
+
 	<!-- begin navigation tasks *************************************************************************************-->
 	<target
         name="_build"
-        depends="init, clean, mkdirs, compile, merge, hibernate, jar">
+        depends="init, clean, mkdirs, compile, merge, jar, web">
 		<echo>+------------------------------------------+</echo>
 		<echo>| built war file                           |</echo>
 		<echo>+------------------------------------------+</echo>
 	</target>
 
-
-    <target name="war" depends="copyweb">
-            <war destfile="${deploy.dir}/${project}.war"
-                webxml="${deploy.dir}/WEB-INF/web.xml" basedir="${deploy.dir}" />
-    </target>
-
-    <!-- EAR Related Targets -->
-
-	<target
-        name="_deploy"
-        depends="war">
-		<echo>+------------------------------------------+</echo>
-		<echo>| deployed war file                        |</echo>
-		<echo>+------------------------------------------+</echo>
-         <copy todir="${appserver.deploy.dir}">
-            <fileset dir="${deploy.dir}" includes="${project}.war"/>
-        </copy>
-	</target>
-	<!-- end navigation tasks ***************************************************************************************-->
+ 	<!-- end navigation tasks ***************************************************************************************-->
 	<!-- end tasks **************************************************************************************************-->
 </project>