Index: lams_tool_laqa/build.properties
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r122c415882b975de0b8e423ea1608c76b1f97c62
--- lams_tool_laqa/build.properties	(.../build.properties)	(revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/build.properties	(.../build.properties)	(revision 122c415882b975de0b8e423ea1608c76b1f97c62)
@@ -6,8 +6,10 @@
 
 # Directory where third party jars reside.
 sharedlib=../lams_build/lib
+deploy.tool.dir=../lams_build/deploy-tool
 j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
 
+build.deploy=${build}/deploy
 #middlegen properties
 middlegen = ${conf}/middlegen
 gui = true
@@ -18,14 +20,19 @@
 #web application properties
 sessiontimeout=120
 
+signature=laqa11
 #database access
 db.name=lams
 db.driver=com.mysql.jdbc.Driver
-db.url=jdbc:mysql://localhost/${db.name}
+db.url=jdbc:mysql://localhost/lams?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
+database.url=jdbc:mysql://localhost/lams?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
 db.username=root
+database.userid=root
 db.password=root
+database.password=root
 db.driver.jar=${sharedlib}/mysql/mysql-connector-java-3.1.7-bin.jar
 db.scripts=${basedir}/db/sql
+sql=${basedir}/db/sql
 
 #submit files package definition
 qa.package=org.lamsfoundation.lams.tool.qa
Index: lams_tool_laqa/build.xml
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r122c415882b975de0b8e423ea1608c76b1f97c62
--- lams_tool_laqa/build.xml	(.../build.xml)	(revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/build.xml	(.../build.xml)	(revision 122c415882b975de0b8e423ea1608c76b1f97c62)
@@ -292,4 +292,89 @@
 			</sql>
 			<delete quiet="true" dir ="${contentrepository.location}"/>
 		</target>
+	
+		<!-- =================================================================== -->
+		<!-- Generate the deploy package                                         -->
+		<!-- =================================================================== -->
+		<target name="create-deploy-package" depends="lams-questionAnswer-war" 
+			description="Generate the deployment package.">
+
+			<path id="deploy.lib.classpath">
+				<fileset dir="${deploy.tool.dir}">
+					<include name="lib/*.jar"/>
+				</fileset>
+			</path> 
+				  
+			<mkdir dir="${build.deploy}"/>
+			<mkdir dir="${build.deploy}/lib"/> 
+			<mkdir dir="${build.deploy}/sql"/> 
+			 
+			<copy overwrite="yes" todir="${build.deploy}/sql">
+				<fileset dir="${sql}/">
+					<include name="create_lams_tool_qa.sql"/>
+					<include name="drop_lams_tool_qa.sql"/>
+					<include name="insert_tool_qa_data.sql"/>
+					<include name="activity_insert.sql"/>
+					<include name="library_insert.sql"/>
+					<include name="tool_insert.sql"/>
+				</fileset>
+			</copy>
+
+			<copy overwrite="yes" todir="${build.deploy}/">
+				<fileset dir="${deploy.tool.dir}">
+					<include name="*.*"/>
+				</fileset>
+			</copy>
+
+			<copy overwrite="yes" todir="${build.deploy}/lib">
+				<fileset dir="${deploy.tool.dir}/lib">
+					<include name="*.jar"/>
+				</fileset>
+			</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}"
+				dbPassword="${database.password}"
+				dbUsername="${database.userid}"
+				dbDriverUrl="${database.url}"
+				dbDriverClass="com.mysql.jdbc.Driver"
+				deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
+				toolSignature="${signature}"
+				toolTablesScriptPath="${sql}/create_lams_tool_qa.sql"
+				toolTablesDeleteScriptPath="${sql}/drop_lams_tool_qa.sql"
+				toolActivityInsertScriptPath="${sql}/activity_insert.sql"
+				toolLibraryInsertScriptPath="${sql}/library_insert.sql"
+				toolInsertScriptPath="${sql}/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}">
+					<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}/deploy.properties"/>
+					<arg value="True"/> 
+			</java>
+-->						
+		</target>
 </project>
\ No newline at end of file
Index: lams_tool_laqa/db/sql/activity_insert.sql
===================================================================
diff -u
--- lams_tool_laqa/db/sql/activity_insert.sql	(revision 0)
+++ lams_tool_laqa/db/sql/activity_insert.sql	(revision 122c415882b975de0b8e423ea1608c76b1f97c62)
@@ -0,0 +1,84 @@
+# Connection: ROOT LOCAL
+# Host: localhost
+# Saved: 2005-04-07 11:08:32
+# 
+INSERT INTO lams_learning_activity
+(
+activity_ui_id
+, description
+, title
+, help_text
+, xcoord
+, ycoord
+, parent_activity_id
+, parent_ui_id
+, learning_activity_type_id
+, grouping_support_type_id
+, apply_grouping_flag
+, grouping_id
+, grouping_ui_id
+, order_id
+, define_later_flag
+, learning_design_id
+, learning_library_id
+, create_date_time
+, run_offline_flag
+, offline_instructions
+, online_instructions
+, max_number_of_options
+, min_number_of_options
+, options_instructions
+, tool_id
+, tool_content_id
+, activity_category_id
+, gate_activity_level_id
+, gate_open_flag
+, gate_start_time_offset
+, gate_end_time_offset
+, gate_start_date_time
+, gate_end_date_time
+, library_activity_ui_image
+, create_grouping_id
+, create_grouping_ui_id
+, library_activity_id
+)
+VALUES
+(
+NULL
+, 'Displays an imported IMS Content Package File.'
+, 'IMS Content Package Reader'
+, 'Put some help text here.'
+, NULL
+, NULL
+, NULL
+, NULL
+, 1
+, 1
+, 0
+, NULL
+, NULL
+, NULL
+, 0
+, NULL
+, ${learning_library_id}
+, NOW()
+, 0
+, 'Do it yourself'
+, 'Do it in LAMS'
+, NULL
+, NULL
+, NULL
+, ${tool_id}
+, NULL
+, 4
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, NULL
+, '/tool/images/tree_expand_L_node.gif'
+, NULL
+, NULL
+, NULL
+)
Fisheye: Tag 122c415882b975de0b8e423ea1608c76b1f97c62 refers to a dead (removed) revision in file `lams_tool_laqa/db/sql/all.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/db/sql/library_insert.sql
===================================================================
diff -u
--- lams_tool_laqa/db/sql/library_insert.sql	(revision 0)
+++ lams_tool_laqa/db/sql/library_insert.sql	(revision 122c415882b975de0b8e423ea1608c76b1f97c62)
@@ -0,0 +1,18 @@
+# Connection: ROOT LOCAL
+# Host: localhost
+# Saved: 2005-04-07 10:50:55
+# 
+INSERT INTO lams_learning_library
+(
+description,
+title,
+valid_flag,
+create_date_time
+)
+VALUES
+(
+'Displays an imported IMS Content Package File.',
+'IMS Content Package Reader',
+0,
+NOW()
+)
Index: lams_tool_laqa/db/sql/tool_insert.sql
===================================================================
diff -u
--- lams_tool_laqa/db/sql/tool_insert.sql	(revision 0)
+++ lams_tool_laqa/db/sql/tool_insert.sql	(revision 122c415882b975de0b8e423ea1608c76b1f97c62)
@@ -0,0 +1,50 @@
+# Connection: ROOT LOCAL
+# Host: localhost
+# Saved: 2005-04-07 10:42:43
+# 
+INSERT INTO lams_tool
+(
+tool_signature,
+service_name,
+tool_display_name,
+description,
+learning_library_id,
+default_tool_content_id,
+valid_flag,
+grouping_support_type_id,
+supports_define_later_flag,
+supports_run_offline_flag,
+supports_moderation_flag,
+supports_contribute_flag,
+learner_url,
+author_url,
+define_later_url,
+export_portfolio_url,
+monitor_url,
+contribute_url,
+moderation_url,
+create_date_time
+)
+VALUES
+(
+'laicp10',
+'ImscpService',
+'IMS Content Package Reader',
+'Displays an imported IMS Content Package File.',
+NULL,
+NULL,
+0,
+1,
+1,
+1,
+1,
+0,
+'/tool/laqa11/learningStarter.do',
+'/tool/laqa11/authoringStarter.do',
+'/tool/laqa11/definelater.do',
+'/tool/laqa11/export.do',
+'/tool/laqa11/monitoringStarter.do',
+'/tool/laqa11/monitoringStarter.do',
+'/tool/laqa11/monitoringStarter.do',
+NOW()
+)
Index: lams_tool_laqa/lib/jaxen/jaxen-full.jar
===================================================================
diff -u
Binary files differ
Index: lams_tool_laqa/lib/jaxen/sax.jar
===================================================================
diff -u
Binary files differ
Index: lams_tool_laqa/lib/jaxen/saxpath.jar
===================================================================
diff -u
Binary files differ
Index: lams_tool_laqa/lib/reload_2_0_1/castor-0.9.5.3-xml.jar
===================================================================
diff -u
Binary files differ
Index: lams_tool_laqa/lib/reload_2_0_1/jdom.jar
===================================================================
diff -u
Binary files differ
Index: lams_tool_laqa/lib/reload_2_0_1/moonunitsrc.jar
===================================================================
diff -u
Binary files differ
Index: lams_tool_laqa/lib/reload_2_0_1/reload-diva.jar
===================================================================
diff -u
Binary files differ
Index: lams_tool_laqa/lib/reload_2_0_1/reload-editor.jar
===================================================================
diff -u
Binary files differ
Index: lams_tool_laqa/lib/reload_2_0_1/reload-jdom.jar
===================================================================
diff -u
Binary files differ
Index: lams_tool_laqa/lib/reload_2_0_1/reload-moonunit.jar
===================================================================
diff -u
Binary files differ
Index: lams_tool_laqa/lib/reload_2_0_1/xercesImpl.jar
===================================================================
diff -u
Binary files differ
Index: lams_tool_laqa/lib/reload_2_0_1/xml-apis.jar
===================================================================
diff -u
Binary files differ