Index: lams_build/build.xml
===================================================================
diff -u -rc461633fb060a95f28ac5d51cf7ca5ecc9847ceb -r8e94e526d650b32f7a3506eb8764c7ba6c0d49eb
--- lams_build/build.xml	(.../build.xml)	(revision c461633fb060a95f28ac5d51cf7ca5ecc9847ceb)
+++ lams_build/build.xml	(.../build.xml)	(revision 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb)
@@ -313,17 +313,17 @@
 	<!-- 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="deploy-nbsubmit-deploy-package-library" depends="">
+	<!-- Generate the deployment package for share resources / forum parallel activity. -->
+	<target name="deploy-shareresourcesforum-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"/>
+			<property name="assembly.activity" value="${basedir}/assembly/shareresourcesforum"/>
+			<property name="package.cfg" value="librarypackages/shareresourcesforum"/>
 		
 			<mkdir dir="${assembly.activity}/"/>
 			<mkdir dir="${assembly.activity}/lib"/> 
@@ -402,98 +402,9 @@
 		
 		</target>
 
-	<!-- Generate the deployment package for nb/submit parallel activity. -->
-	<target name="deploy-doublevote-deploy-package-library" depends="">
-
-			<path id="deploy.lib.classpath">
-				<fileset dir="${deploy.tool.dir}">
-					<include name="lib/*.jar"/>
-				</fileset>
-			</path> 
-				  
-			<property name="dv.assembly.activity" value="${basedir}/assembly/doublevote"/>
-			<property name="dv.package.cfg" value="librarypackages/doublevote"/>
-		
-			<mkdir dir="${dv.assembly.activity}/"/>
-			<mkdir dir="${dv.assembly.activity}/lib"/> 
-			<mkdir dir="${dv.assembly.activity}/sql"/> 
-			<mkdir dir="${dv.assembly.activity}/language"/> 
-		
-			<copy overwrite="yes" todir="${dv.assembly.activity}/sql">
-				<fileset dir="${dv.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="${dv.assembly.activity}/language">
-				<fileset dir="${dv.package.cfg}/language">
-					<include name="*.*"/>
-				</fileset>
-			</copy>
-
-		<copy overwrite="yes" file="${dv.package.cfg}/deployLibrary.xml"
-					   	tofile="${dv.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="${dv.assembly.activity}/sql"/>
-		            </replacetokens>
-		            <replacetokens>
-			            <token key="assemblylangdir" value="${dv.assembly.activity}/language"/>
-			        </replacetokens>
-		            <replacetokens>
-			             <token key="lamsear" value="${jboss.deploy}"/>
-			        </replacetokens>
-		        </filterchain>
-		    </copy>
-
-			<copy overwrite="yes" todir="${dv.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="${dv.assembly.activity}"
-				configFile="${dv.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="${dv.assembly.activity}">
-					<include name="lib/*.jar"/>
-				</fileset>
-			</path> 
-	
-			<java
-				classname="org.lamsfoundation.lams.tool.deploy.libraryActivity.DeployLibrary"
-				classpathref="deploy.classpath"
-				fork="true">
-					<arg file="${dv.assembly.activity}/deploy.xml"/>
-					<arg file="${dv.assembly.activity}/language"/>
-			</java>
-		
-		</target>
-
 		<!-- deploy the complex activities to the library -->
 		<target name="deploy-learning-libraries" 
-			depends="deploy-nbsubmit-deploy-package-library,deploy-doublevote-deploy-package-library">
+			depends="deploy-shareresourcesforum-deploy-package-library">
 
 			<echo>Deploying Library Activities</echo>
 	
Fisheye: Tag 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb refers to a dead (removed) revision in file `lams_build/librarypackages/nbsubmit/deployLibrary.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb refers to a dead (removed) revision in file `lams_build/librarypackages/nbsubmit/language/ApplicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb refers to a dead (removed) revision in file `lams_build/librarypackages/nbsubmit/learninglibrary1_insert.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb refers to a dead (removed) revision in file `lams_build/librarypackages/nbsubmit/libraryActivity1_insert.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb refers to a dead (removed) revision in file `lams_build/librarypackages/nbsubmit/toolActivity1_insert.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb refers to a dead (removed) revision in file `lams_build/librarypackages/nbsubmit/toolActivity2_insert.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/librarypackages/shareresourcesforum/deployLibrary.xml
===================================================================
diff -u
--- lams_build/librarypackages/shareresourcesforum/deployLibrary.xml	(revision 0)
+++ lams_build/librarypackages/shareresourcesforum/deployLibrary.xml	(revision 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb)
@@ -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>larsrc11</toolSignature>
+					<toolActivityInsertScriptPath>@assemblydir@/toolActivity1_insert.sql</toolActivityInsertScriptPath>	
+				</toolActivity>
+				<toolActivity>
+					<toolSignature>lafrum11</toolSignature> 
+					<toolActivityInsertScriptPath>@assemblydir@/toolActivity2_insert.sql</toolActivityInsertScriptPath>	
+				</toolActivity>
+			</toolActivityList>
+		    <languageFileDirectory>@assemblylangdir@</languageFileDirectory>
+		    <languageFileRoot>ApplicationResources</languageFileRoot>
+		</learningLibrary>
+	</learningLibraryList>
+</Deploy>
+
Index: lams_build/librarypackages/shareresourcesforum/language/ApplicationResources.properties
===================================================================
diff -u
--- lams_build/librarypackages/shareresourcesforum/language/ApplicationResources.properties	(revision 0)
+++ lams_build/librarypackages/shareresourcesforum/language/ApplicationResources.properties	(revision 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb)
@@ -0,0 +1,6 @@
+# CVS ID: $Id$ #
+
+# ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
+activity.title=Discuss Shared Resources
+activity.description=Combined Share Resources and Forum 
+activity.helptext=The top window has a Share Resources area and the bottom window has a forum for learners to discuss items they have view via the Share Resources area.
Index: lams_build/librarypackages/shareresourcesforum/learninglibrary1_insert.sql
===================================================================
diff -u
--- lams_build/librarypackages/shareresourcesforum/learninglibrary1_insert.sql	(revision 0)
+++ lams_build/librarypackages/shareresourcesforum/learninglibrary1_insert.sql	(revision 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb)
@@ -0,0 +1,2 @@
+insert into lams_learning_library (learning_library_id,description,title,valid_flag,create_date_time) 
+values (null,'Shared Resources and Forum','Discuss Shared Resources',0,now());
Index: lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql
===================================================================
diff -u
--- lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql	(revision 0)
+++ lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql	(revision 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb)
@@ -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 Share Resources and Forum','Discuss Shared Resources',null,null,null,
+'Learners to discuss items they have viewed via Share Resources.',
+6,null,null,0,
+null,${learning_library_id},now(),0,
+null,null,null,null,
+null,null,null,'images/icon_urlcontentmessageboard.swf',
+2,0,1);
\ No newline at end of file
Index: lams_build/librarypackages/shareresourcesforum/toolActivity1_insert.sql
===================================================================
diff -u
--- lams_build/librarypackages/shareresourcesforum/toolActivity1_insert.sql	(revision 0)
+++ lams_build/librarypackages/shareresourcesforum/toolActivity1_insert.sql	(revision 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb)
@@ -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,'Share Resources','Share Resources',null,null,${parent_activity_id},'Share Resources',
+1,null,null,0,
+null,null,now(),0,
+null,null,${tool_id},null,
+null,null,null,'tool/larsrc11/images/icon_rsrc.swf',
+2,0,4,
+'org.lamsfoundation.lams.tool.rsrc.web.ApplicationResources');
\ No newline at end of file
Index: lams_build/librarypackages/shareresourcesforum/toolActivity2_insert.sql
===================================================================
diff -u
--- lams_build/librarypackages/shareresourcesforum/toolActivity2_insert.sql	(revision 0)
+++ lams_build/librarypackages/shareresourcesforum/toolActivity2_insert.sql	(revision 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb)
@@ -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,4,
+'org.lamsfoundation.lams.tool.forum.ApplicationResources');
\ No newline at end of file