Index: lams_build/build.xml
===================================================================
diff -u -re7466843b0f74ce4836a7def3c63849eeac60318 -r0373c5b5c5e80babb23c603c578ba141174ffbfc
--- lams_build/build.xml	(.../build.xml)	(revision e7466843b0f74ce4836a7def3c63849eeac60318)
+++ lams_build/build.xml	(.../build.xml)	(revision 0373c5b5c5e80babb23c603c578ba141174ffbfc)
@@ -28,13 +28,14 @@
 		<echo>   2. assemble-ear</echo>
 		<echo>   3. manually refresh the project</echo>
 		<echo>   4. deploy-ear</echo>
+		<echo>   5. deploy-tools</echo>
 		<echo>Do not try to assemble and deploy in the same run - if you do,</echo>
 		<echo>Eclipse may not deploy all of the newly created files.</echo>
 	</target>
 
 	<!-- clean dirs for this script only -->
 	<target name="clean" description="cleans assembly">
-		<delete includeEmptyDirs="true" dir="${assembly}"
+		<delete dir="${assembly}"
 			includes="**/*" />
 	</target>
 
@@ -168,7 +169,7 @@
 	<!-- Deploy IMS Content Package tool to the depoloyed ear 							-->
 	<!--  Relies on the tools using the parameter jboss.deploy							-->						
 	<!-- ============================================================================== -->
-	<target name="deploy-tools">
+	<target name="deploy-tools" description="Deploy the tools, including any special parallel activities">
  		<ant antfile="../${tool_forum_dir}/build.xml" target="deploy-tool"
 				inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
@@ -197,6 +198,7 @@
 				inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 		</ant> -->
+		<ant target="deploy-learning-libraries"/>
 	</target>
 	
 	<!-- ============================================================================== -->
@@ -274,4 +276,91 @@
 		<ant antfile="../${tool_survey_dir}/build.xml" target="test-report" inheritAll="false"/>
 	-->
 	</target>
+	
+	
+	<!-- Build the parallel activities and other complex activities. Must be done after -->
+	<!-- the tools are deployed -->
+	
+	<!-- Generate the deployment package for nb/submit parallel activity. -->
+	<target name="create-nbsubmit-deploy-package-library" depends="">
+
+			<path id="deploy.lib.classpath">
+				<fileset dir="${deploy.tool.dir}">
+					<include name="lib/*.jar"/>
+				</fileset>
+			</path> 
+				  
+			<property name="assembly.activity" value="${basedir}/assembly/nbsubmit"/>
+			<property name="package.cfg" value="librarypackages/nbsubmit"/>
+		
+			<mkdir dir="${assembly.activity}/"/>
+			<mkdir dir="${assembly.activity}/lib"/> 
+			<mkdir dir="${assembly.activity}/sql"/> 
+		
+			<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" 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>
+		        </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"	
+				/>
+		
+		
+		</target>
+
+		<!-- deploy the complex activities to the library -->
+		<target name="deploy-learning-libraries" depends="create-nbsubmit-deploy-package-library">
+
+				<path id="deploy.classpath">
+					<fileset dir="${assembly.activity}">
+						<include name="lib/*.jar"/>
+					</fileset>
+				</path> 
+
+				<echo>Deploying Library Activities</echo>
+		
+				<java
+					classname="org.lamsfoundation.lams.tool.deploy.libraryActivity.DeployLibrary"
+					classpathref="deploy.classpath"
+					fork="true">
+						<arg file="${assembly.activity}/deploy.xml"/>
+						
+				</java>
+							
+			</target>
 </project>
Index: lams_build/librarypackages/nbsubmit/deployLibrary.xml
===================================================================
diff -u
--- lams_build/librarypackages/nbsubmit/deployLibrary.xml	(revision 0)
+++ lams_build/librarypackages/nbsubmit/deployLibrary.xml	(revision 0373c5b5c5e80babb23c603c578ba141174ffbfc)
@@ -0,0 +1,24 @@
+! @assemblydir@ should be replaced by the ant task.
+<Deploy>
+	<dbUsername></dbUsername>
+	<dbPassword></dbPassword>
+	<dbDriverClass></dbDriverClass>
+	<dbDriverUrl></dbDriverUrl>
+	<learningLibraryList>
+		<learningLibrary>
+			<libraryInsertScriptPath>@assemblydir@/learninglibrary1_insert.sql</libraryInsertScriptPath>
+			<templateActivityInsertScriptPath>@assemblydir@/libraryActivity1_insert.sql</templateActivityInsertScriptPath>
+			<toolActivityList>
+				<toolActivity>
+					<toolSignature>lanb11</toolSignature>
+					<toolActivityInsertScriptPath>@assemblydir@/toolActivity1_insert.sql</toolActivityInsertScriptPath>	
+				</toolActivity>
+				<toolActivity>
+					<toolSignature>lasbmt11</toolSignature> 
+					<toolActivityInsertScriptPath>@assemblydir@/toolActivity2_insert.sql</toolActivityInsertScriptPath>	
+				</toolActivity>
+			</toolActivityList>
+		</learningLibrary>
+	</learningLibraryList>
+</Deploy>
+
Index: lams_build/librarypackages/nbsubmit/learninglibrary1_insert.sql
===================================================================
diff -u
--- lams_build/librarypackages/nbsubmit/learninglibrary1_insert.sql	(revision 0)
+++ lams_build/librarypackages/nbsubmit/learninglibrary1_insert.sql	(revision 0373c5b5c5e80babb23c603c578ba141174ffbfc)
@@ -0,0 +1 @@
+insert into lams_learning_library (learning_library_id,description,title,create_date_time) values (null,'Parallel Activity Submit and NB','Parallel Activity 1', now());
Index: lams_build/librarypackages/nbsubmit/libraryActivity1_insert.sql
===================================================================
diff -u
--- lams_build/librarypackages/nbsubmit/libraryActivity1_insert.sql	(revision 0)
+++ lams_build/librarypackages/nbsubmit/libraryActivity1_insert.sql	(revision 0373c5b5c5e80babb23c603c578ba141174ffbfc)
@@ -0,0 +1,14 @@
+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,'Parallel Activity Description','Parallel Activity Title',null,null,null,'Help Text for Activity',
+6,null,null,0,
+null,${learning_library_id},now(),0,
+null,null,null,null,
+null,null,null,'images/icon_missing.swf',
+1,0,1);
\ No newline at end of file
Index: lams_build/librarypackages/nbsubmit/toolActivity1_insert.sql
===================================================================
diff -u
--- lams_build/librarypackages/nbsubmit/toolActivity1_insert.sql	(revision 0)
+++ lams_build/librarypackages/nbsubmit/toolActivity1_insert.sql	(revision 0373c5b5c5e80babb23c603c578ba141174ffbfc)
@@ -0,0 +1,14 @@
+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,'Parallel NB Activity','Parallel NB Activity',null,null,${parent_activity_id},'Help Text for Activity',
+1,null,null,0,
+null,null,now(),0,
+null,null,${tool_id},null,
+null,null,null,'tool/lanb11/images/icon_noticeboard.swf',
+1,0,4);
\ No newline at end of file
Index: lams_build/librarypackages/nbsubmit/toolActivity2_insert.sql
===================================================================
diff -u
--- lams_build/librarypackages/nbsubmit/toolActivity2_insert.sql	(revision 0)
+++ lams_build/librarypackages/nbsubmit/toolActivity2_insert.sql	(revision 0373c5b5c5e80babb23c603c578ba141174ffbfc)
@@ -0,0 +1,14 @@
+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,'Parallel Submit Activity','Parallel Submit Activity',null,null,${parent_activity_id},'Help Text for Activity',
+1,null,null,0,
+null,null,now(),0,
+null,null,${tool_id},null,
+null,null,null,'tool/lasbmt11/images/icon_reportsubmission.swf',
+1,0,4);
\ No newline at end of file