Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.24 -r1.25
--- lams_build/build.xml	8 May 2006 04:30:25 -0000	1.24
+++ lams_build/build.xml	8 May 2006 07:05:02 -0000	1.25
@@ -123,8 +123,8 @@
 					<include name="mysql/*.jar" />
 					<include name="odmg/*.jar" />
 					<include name="quartz/*.jar" />
-					<include name="smack.jar"/>
-					<include name="smackx.jar"/>
+					<include name="smack/smack.jar"/>
+					<include name="smack/smackx.jar"/>
 					<include name="spring/*.jar" />
 					<include name="struts/*.jar" />
 					<include name="wddx/*.jar" />
@@ -207,16 +207,10 @@
 				inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 		</ant>
-<!--		<ant antfile="../${tool_survey_dir}/build.xml" target="deploy-tool"
+  		<ant antfile="../${tool_chat_dir}/build.xml" target="deploy-tool"
 				inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
-		</ant> -->
-		<!-- Still under development -->
-<!--  		<ant antfile="../${tool_chat_dir}/build.xml" target="deploy-tool"
-				inheritAll="false" >
-			<property name="jboss.deploy" location="${jboss.deploy}"/>
-		</ant>
--->
+		</ant> 
 		<ant antfile="../${tool_larsrc_dir}/build.xml" target="deploy-tool"
 				inheritAll="false" >
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
@@ -319,7 +313,7 @@
 	<!-- the tools are deployed -->
 	
 	<!-- Generate the deployment package for nb/submit parallel activity. -->
-	<target name="create-nbsubmit-deploy-package-library" depends="">
+	<target name="deploy-nbsubmit-deploy-package-library" depends="">
 
 			<path id="deploy.lib.classpath">
 				<fileset dir="${deploy.tool.dir}">
@@ -389,26 +383,121 @@
 				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>
 
-		<!-- deploy the complex activities to the library -->
-		<target name="deploy-learning-libraries" depends="create-nbsubmit-deploy-package-library">
+	<!-- Generate the deployment package for nb/submit parallel activity. -->
+	<target name="deploy-doublevote-deploy-package-library" depends="">
 
-				<path id="deploy.classpath">
-					<fileset dir="${assembly.activity}">
-						<include name="lib/*.jar"/>
-					</fileset>
-				</path> 
+			<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>
 
-				<echo>Deploying Library Activities</echo>
+			<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"	
+				/>
 		
-				<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>
+			<!-- 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">
+
+			<echo>Deploying Library Activities</echo>
+	
+		</target>
+
+
+
 </project>