Index: lams_build/build.xml
===================================================================
diff -u -r244ab963236ba838c74c195db70061ef96843c44 -r7d1d03e0cfc056fdca09be177bc1639893740403
--- lams_build/build.xml	(.../build.xml)	(revision 244ab963236ba838c74c195db70061ef96843c44)
+++ lams_build/build.xml	(.../build.xml)	(revision 7d1d03e0cfc056fdca09be177bc1639893740403)
@@ -342,195 +342,31 @@
 	</target>
 	
 	
-	<!-- Build the parallel activities and other complex activities. Must be done after -->
+	<!-- Build and deploy the parallel activities and other complex activities. Must be done after -->
 	<!-- the tools are deployed -->
-	
-	<!-- Generate the deployment package for share resources / forum parallel activity. -->
-	<target name="deploy-shareresourcesforum-deploy-package-library" depends="">
+	<target name="deploy-learning-libraries">
 
-			<path id="deploy.lib.classpath">
-				<fileset dir="${deploy.tool.dir}">
-					<include name="lib/*.jar"/>
-				</fileset>
-			</path> 
-				  
-			<property name="assembly.activity" value="${basedir}/assembly/shareresourcesforum"/>
-			<property name="package.cfg" value="librarypackages/shareresourcesforum"/>
-		
-			<mkdir dir="${assembly.activity}/"/>
-			<mkdir dir="${assembly.activity}/lib"/> 
-			<mkdir dir="${assembly.activity}/sql"/> 
-			<mkdir dir="${assembly.activity}/language"/> 
-		
-			<copy overwrite="yes" todir="${assembly.activity}/sql">
-				<fileset dir="${package.cfg}">
-					<include name="learninglibrary1_insert.sql"/>
-					<include name="libraryActivity1_insert.sql"/>
-					<include name="toolActivity1_insert.sql"/>
-					<include name="toolActivity2_insert.sql"/>
-				</fileset>
-			</copy>
+		<echo>Deploying Library Activities</echo>
 
-			<copy overwrite="yes" todir="${assembly.activity}/language">
-				<fileset dir="${package.cfg}/language">
-					<include name="*.*"/>
-				</fileset>
-			</copy>
+		<!-- Generate the deployment package for share resources / forum parallel activity. -->
+		<ant antfile="buildcombinedtasks.xml" target="deploy-package-library">
+			<property name="assembly.activity" location="${basedir}/assembly/shareresourcesforum"/>
+			<property name="package.cfg" location="librarypackages/shareresourcesforum"/>
+		</ant> 
 
-		<copy overwrite="yes" file="${package.cfg}/deployLibrary.xml"
-					   	tofile="${assembly.activity}/deploy.xml" >
-			  <!-- replace @assemblydir@ in the xml template - this allows it to run under any directory structure -->
-		        <filterchain>
-		            <striplinecomments>
-		               <comment value="!"/>
-		            </striplinecomments>
-		           <replacetokens>
-		                <token key="assemblydir" value="${assembly.activity}/sql"/>
-		            </replacetokens>
-		            <replacetokens>
-			            <token key="assemblylangdir" value="${assembly.activity}/language"/>
-			        </replacetokens>
-		            <replacetokens>
-			             <token key="lamsear" value="${jboss.deploy}"/>
-			        </replacetokens>
-		        </filterchain>
-		    </copy>
+		<!-- Generate the deployment package for chat / scribe parallel activity. -->
+		<ant antfile="buildcombinedtasks.xml" target="deploy-package-library">
+			<property name="assembly.activity" value="${basedir}/assembly/chatscribe"/>
+			<property name="package.cfg" value="librarypackages/chatscribe"/>
+		</ant> 
 
-			<copy overwrite="yes" todir="${assembly.activity}/lib">
-				<fileset dir="${deploy.tool.dir}/lib">
-					<include name="*.jar"/>
-				</fileset>
-			</copy>
+		<!-- Generate the deployment package for forum / scribe parallel activity. -->
+		<ant antfile="buildcombinedtasks.xml" target="deploy-package-library">
+			<property name="assembly.activity" value="${basedir}/assembly/forumscribe"/>
+			<property name="package.cfg" value="librarypackages/forumscribe"/>
+		</ant> 
+</target>
 
-			<taskdef name="generateDeployLibraryProperties" 
-				classname="org.lamsfoundation.lams.tool.deploy.libraryActivity.CreateLibraryPackageTask">
-			    <classpath refid="deploy.lib.classpath"/>
-			</taskdef>
-
-			<generateDeployLibraryProperties depends="compile" 
-				mode="development" 
-				outputPath="${assembly.activity}"
-				configFile="${assembly.activity}/deploy.xml"
-				dbPassword="${db.password}"
-				dbUsername="${db.username}"
-				dbDriverUrl="${db.url}"
-				dbDriverClass="com.mysql.jdbc.Driver"	
-				/>
-		
-			<!-- Do the actual deployment -->
-			<path id="deploy.classpath">
-				<fileset dir="${assembly.activity}">
-					<include name="lib/*.jar"/>
-				</fileset>
-			</path> 
-	
-			<java
-				classname="org.lamsfoundation.lams.tool.deploy.libraryActivity.DeployLibrary"
-				classpathref="deploy.classpath"
-				fork="true">
-					<arg file="${assembly.activity}/deploy.xml"/>
-					<arg file="${assembly.activity}/language"/>
-			</java>
-		
-		</target>
-
-	<target name="deploy-chatscribe-deploy-package-library" depends="">
-
-			<path id="deploy.lib.classpath">
-				<fileset dir="${deploy.tool.dir}">
-					<include name="lib/*.jar"/>
-				</fileset>
-			</path> 
-				  
-			<property name="cs.assembly.activity" value="${basedir}/chatscribe"/>
-			<property name="cs.package.cfg" value="librarypackages/chatscribe"/>
-		
-			<mkdir dir="${cs.assembly.activity}/"/>
-			<mkdir dir="${cs.assembly.activity}/lib"/> 
-			<mkdir dir="${cs.assembly.activity}/sql"/> 
-			<mkdir dir="${cs.assembly.activity}/language"/> 
-		
-			<copy overwrite="yes" todir="${cs.assembly.activity}/sql">
-				<fileset dir="${cs.package.cfg}">
-					<include name="learninglibrary1_insert.sql"/>
-					<include name="libraryActivity1_insert.sql"/>
-					<include name="toolActivity1_insert.sql"/>
-					<include name="toolActivity2_insert.sql"/>
-				</fileset>
-			</copy>
-
-			<copy overwrite="yes" todir="${cs.assembly.activity}/language">
-				<fileset dir="${cs.package.cfg}/language">
-					<include name="*.*"/>
-				</fileset>
-			</copy>
-
-		<copy overwrite="yes" file="${cs.package.cfg}/deployLibrary.xml"
-					   	tofile="${cs.assembly.activity}/deploy.xml" >
-			  <!-- replace @assemblydir@ in the xml template - this allows it to run under any directory structure -->
-		        <filterchain>
-		            <striplinecomments>
-		               <comment value="!"/>
-		            </striplinecomments>
-		           <replacetokens>
-		                <token key="assemblydir" value="${cs.assembly.activity}/sql"/>
-		            </replacetokens>
-		            <replacetokens>
-			            <token key="assemblylangdir" value="${cs.assembly.activity}/language"/>
-			        </replacetokens>
-		            <replacetokens>
-			             <token key="lamsear" value="${jboss.deploy}"/>
-			        </replacetokens>
-		        </filterchain>
-		    </copy>
-
-			<copy overwrite="yes" todir="${cs.assembly.activity}/lib">
-				<fileset dir="${deploy.tool.dir}/lib">
-					<include name="*.jar"/>
-				</fileset>
-			</copy>
-
-			<taskdef name="generateDeployLibraryProperties" 
-				classname="org.lamsfoundation.lams.tool.deploy.libraryActivity.CreateLibraryPackageTask">
-			    <classpath refid="deploy.lib.classpath"/>
-			</taskdef>
-
-			<generateDeployLibraryProperties depends="compile" 
-				mode="development" 
-				outputPath="${cs.assembly.activity}"
-				configFile="${cs.assembly.activity}/deploy.xml"
-				dbPassword="${db.password}"
-				dbUsername="${db.username}"
-				dbDriverUrl="${db.url}"
-				dbDriverClass="com.mysql.jdbc.Driver"	
-				/>
-		
-			<!-- Do the actual deployment -->
-			<path id="deploy.classpath">
-				<fileset dir="${cs.assembly.activity}">
-					<include name="lib/*.jar"/>
-				</fileset>
-			</path> 
-	
-			<java
-				classname="org.lamsfoundation.lams.tool.deploy.libraryActivity.DeployLibrary"
-				classpathref="deploy.classpath"
-				fork="true">
-					<arg file="${cs.assembly.activity}/deploy.xml"/>
-					<arg file="${cs.assembly.activity}/language"/>
-			</java>
-		
-		</target>
-		<!-- deploy the complex activities to the library -->
-		<target name="deploy-learning-libraries" 
-			depends="deploy-shareresourcesforum-deploy-package-library,deploy-chatscribe-deploy-package-library">
-
-			<echo>Deploying Library Activities</echo>
-	
-		</target>
-
-
-	
 	<!-- Copy lams.tld and the lams tags from lams-central to the other projects -->
 	<target name="copy-tags" description="Copy lams.tld and the lams tags from lams-central to the other projects">
 		<ant antfile="../${lams_admin}/build.xml" target="copy-tags" inheritAll="false"/>
Index: lams_build/buildcombinedtasks.xml
===================================================================
diff -u
--- lams_build/buildcombinedtasks.xml	(revision 0)
+++ lams_build/buildcombinedtasks.xml	(revision 7d1d03e0cfc056fdca09be177bc1639893740403)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="build-combined-activites" default="usage" basedir=".">
+
+	<target name="usage">
+		<echo>Create the parallel activities that come standard with LAMS.</echo>
+		<echo>Must be called from build.xml as it relies on build.xml to set up the parameters.</echo>
+		<echo>usage: this message</echo>
+		<echo>deploy-package-library: build and deploy a parallel activity library</echo>
+	</target>
+	
+	<target name="deploy-package-library" depends="">
+
+			<echo>Building package: Configuration ${package.cfg}</echo>
+		<echo>Building package: Assembly Activity ${assembly.activity}</echo>
+		
+			<path id="deploy.lib.classpath">
+				<fileset dir="${deploy.tool.dir}">
+					<include name="lib/*.jar"/>
+				</fileset>
+			</path> 
+				  
+			<mkdir dir="${assembly.activity}/"/>
+			<mkdir dir="${assembly.activity}/lib"/> 
+			<mkdir dir="${assembly.activity}/sql"/> 
+			<mkdir dir="${assembly.activity}/language"/> 
+		
+			<copy overwrite="yes" todir="${assembly.activity}/sql">
+				<fileset dir="${package.cfg}">
+					<include name="learninglibrary1_insert.sql"/>
+					<include name="libraryActivity1_insert.sql"/>
+					<include name="toolActivity1_insert.sql"/>
+					<include name="toolActivity2_insert.sql"/>
+				</fileset>
+			</copy>
+
+			<copy overwrite="yes" todir="${assembly.activity}/language">
+				<fileset dir="${package.cfg}/language">
+					<include name="*.*"/>
+				</fileset>
+			</copy>
+
+		<copy overwrite="yes" file="${package.cfg}/deployLibrary.xml"
+					   	tofile="${assembly.activity}/deploy.xml" >
+			  <!-- replace @assemblydir@ in the xml template - this allows it to run under any directory structure -->
+		        <filterchain>
+		            <striplinecomments>
+		               <comment value="!"/>
+		            </striplinecomments>
+		           <replacetokens>
+		                <token key="assemblydir" value="${assembly.activity}/sql"/>
+		            </replacetokens>
+		            <replacetokens>
+			            <token key="assemblylangdir" value="${assembly.activity}/language"/>
+			        </replacetokens>
+		            <replacetokens>
+			             <token key="lamsear" value="${jboss.deploy}"/>
+			        </replacetokens>
+		        </filterchain>
+		    </copy>
+
+			<copy overwrite="yes" todir="${assembly.activity}/lib">
+				<fileset dir="${deploy.tool.dir}/lib">
+					<include name="*.jar"/>
+				</fileset>
+			</copy>
+
+			<taskdef name="generateDeployLibraryProperties" 
+				classname="org.lamsfoundation.lams.tool.deploy.libraryActivity.CreateLibraryPackageTask">
+			    <classpath refid="deploy.lib.classpath"/>
+			</taskdef>
+
+			<generateDeployLibraryProperties depends="compile" 
+				mode="development" 
+				outputPath="${assembly.activity}"
+				configFile="${assembly.activity}/deploy.xml"
+				dbPassword="${db.password}"
+				dbUsername="${db.username}"
+				dbDriverUrl="${db.url}"
+				dbDriverClass="com.mysql.jdbc.Driver"	
+				/>
+		
+			<!-- Do the actual deployment -->
+			<path id="deploy.classpath">
+				<fileset dir="${assembly.activity}">
+					<include name="lib/*.jar"/>
+				</fileset>
+			</path> 
+	
+			<java
+				classname="org.lamsfoundation.lams.tool.deploy.libraryActivity.DeployLibrary"
+				classpathref="deploy.classpath"
+				fork="true">
+					<arg file="${assembly.activity}/deploy.xml"/>
+					<arg file="${assembly.activity}/language"/>
+			</java>
+		
+		</target>
+
+
+</project>
Index: lams_build/librarypackages/forumscribe/deployLibrary.xml
===================================================================
diff -u
--- lams_build/librarypackages/forumscribe/deployLibrary.xml	(revision 0)
+++ lams_build/librarypackages/forumscribe/deployLibrary.xml	(revision 7d1d03e0cfc056fdca09be177bc1639893740403)
@@ -0,0 +1,27 @@
+! @assemblydir@ should be replaced by the ant task.
+<Deploy>
+	<dbUsername></dbUsername>
+	<dbPassword></dbPassword>
+	<dbDriverClass></dbDriverClass>
+	<dbDriverUrl></dbDriverUrl>
+    <lamsEarPath>@lamsear@</lamsEarPath>
+	<learningLibraryList>
+		<learningLibrary>
+			<libraryInsertScriptPath>@assemblydir@/learninglibrary1_insert.sql</libraryInsertScriptPath>
+			<templateActivityInsertScriptPath>@assemblydir@/libraryActivity1_insert.sql</templateActivityInsertScriptPath>
+			<toolActivityList>
+				<toolActivity>
+					<toolSignature>lafrum11</toolSignature>
+					<toolActivityInsertScriptPath>@assemblydir@/toolActivity1_insert.sql</toolActivityInsertScriptPath>	
+				</toolActivity>
+				<toolActivity>
+					<toolSignature>lascrb11</toolSignature> 
+					<toolActivityInsertScriptPath>@assemblydir@/toolActivity2_insert.sql</toolActivityInsertScriptPath>	
+				</toolActivity>
+			</toolActivityList>
+		    <languageFileDirectory>@assemblylangdir@</languageFileDirectory>
+		    <languageFileRoot>ApplicationResources</languageFileRoot>
+		</learningLibrary>
+	</learningLibraryList>
+</Deploy>
+
Index: lams_build/librarypackages/forumscribe/language/ApplicationResources.properties
===================================================================
diff -u
--- lams_build/librarypackages/forumscribe/language/ApplicationResources.properties	(revision 0)
+++ lams_build/librarypackages/forumscribe/language/ApplicationResources.properties	(revision 7d1d03e0cfc056fdca09be177bc1639893740403)
@@ -0,0 +1,12 @@
+appName = forumscribe 
+#language code: en 
+#locale code: AU 
+
+# CVS ID: $Id 
+ 
+#=================== labels for Chat & Scribe =================# 
+
+activity.title  =Forum and Scribe
+activity.description  =Combined Forum and Scribe
+activity.helptext  =The top window has a Forum area and the bottom window has a Scribe area for learners to create their group reports.
+
Index: lams_build/librarypackages/forumscribe/learninglibrary1_insert.sql
===================================================================
diff -u
--- lams_build/librarypackages/forumscribe/learninglibrary1_insert.sql	(revision 0)
+++ lams_build/librarypackages/forumscribe/learninglibrary1_insert.sql	(revision 7d1d03e0cfc056fdca09be177bc1639893740403)
@@ -0,0 +1,2 @@
+insert into lams_learning_library (learning_library_id,description,title,valid_flag,create_date_time) 
+values (null,'Forum and Scribe','Forum and Scribe',0,now());
Index: lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql
===================================================================
diff -u
--- lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql	(revision 0)
+++ lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql	(revision 7d1d03e0cfc056fdca09be177bc1639893740403)
@@ -0,0 +1,15 @@
+insert into lams_learning_activity
+(activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
+learning_activity_type_id,grouping_id,order_id,define_later_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
+max_number_of_options,min_number_of_options,tool_id,tool_content_id,
+gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
+values
+(null,null,'Combined Chat and Scribe','Prepare Group Report',null,null,null,
+'Learners to prepare group report, discussing report in chat',
+6,null,null,0,
+null,${learning_library_id},now(),0,
+null,null,null,null,
+null,null,null,'images/icon_groupreporting.swf',
+2,0,5);
\ No newline at end of file
Index: lams_build/librarypackages/forumscribe/toolActivity1_insert.sql
===================================================================
diff -u
--- lams_build/librarypackages/forumscribe/toolActivity1_insert.sql	(revision 0)
+++ lams_build/librarypackages/forumscribe/toolActivity1_insert.sql	(revision 7d1d03e0cfc056fdca09be177bc1639893740403)
@@ -0,0 +1,16 @@
+insert into lams_learning_activity
+(activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
+learning_activity_type_id,grouping_id,order_id,define_later_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
+max_number_of_options,min_number_of_options,tool_id,tool_content_id,
+gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
+grouping_support_type_id, apply_grouping_flag,activity_category_id,
+language_file)
+values
+(null,null,'Forum/Message Board','Forum',null,null,${parent_activity_id},'Forum/Message Board',
+1,null,null,0,
+null,null,now(),0,
+null,null,${tool_id},null,
+null,null,null,'tool/lafrum11/images/icon_forum.swf',
+2,0,2,
+'org.lamsfoundation.lams.tool.forum.ApplicationResources');
Index: lams_build/librarypackages/forumscribe/toolActivity2_insert.sql
===================================================================
diff -u
--- lams_build/librarypackages/forumscribe/toolActivity2_insert.sql	(revision 0)
+++ lams_build/librarypackages/forumscribe/toolActivity2_insert.sql	(revision 7d1d03e0cfc056fdca09be177bc1639893740403)
@@ -0,0 +1,16 @@
+insert into lams_learning_activity
+(activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
+learning_activity_type_id,grouping_id,order_id,define_later_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
+max_number_of_options,min_number_of_options,tool_id,tool_content_id,
+gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
+grouping_support_type_id, apply_grouping_flag,activity_category_id,
+language_file)
+values
+(null,null,'Scribe Tool','Scribe Tool',null,null,${parent_activity_id},'Scribe',
+1,null,null,0,
+null,null,now(),0,
+null,null,${tool_id},null,
+null,null,null,'tool/lascrb11/images/icon_scribe.swf',
+2,0,2,
+'org.lamsfoundation.lams.tool.scribe.ApplicationResources');
\ No newline at end of file