Index: lams_contentrepository/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/build.xml,v
diff -u -r1.6 -r1.7
--- lams_contentrepository/build.xml	17 Jan 2005 10:03:58 -0000	1.6
+++ lams_contentrepository/build.xml	21 Jan 2005 04:11:47 -0000	1.7
@@ -33,7 +33,8 @@
 		<echo message=""/>
 		<echo message="Among the available targets are:"/>
 		<echo message=""/>
-		<echo message="deploy-lamscr  --> Deploy the content repository project"/>
+		<echo message="deploy-lamscr-jar  --> Deploy the content repository jar"/>
+		<echo message="deploy-lamscr-jarwar  --> Deploy the content repository jar and web example"/>
 		<echo message="create-db-tables   --> (Re)create the content repository tables"/>
 		<echo message="insert-test-data --> Insert test data to database"/>
 		<echo message="lamscr-jar  --> Make jar archive for deployment"/>
@@ -199,7 +200,7 @@
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
 	<!-- Make the war archive  for deployment             -->
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="lamscr-war" depends="lamscr-jar" description="creates war file">
+	<target name="lamscr-war" description="creates war file">
 		<delete file="${build.lib}/${product}.war"/>
 		<war warfile="${build.lib}/${product}.war" 
   				webxml="${webinf}/web.xml">
@@ -277,15 +278,27 @@
 	</target>
 
 	<!-- =================================================================== -->
-	<!-- Deploy the project                                                  -->
+	<!-- Deploy the project's jar file only                                  -->
 	<!-- =================================================================== -->
-	<target name="deploy-lamscr" depends="lamscr-jar,lamscr-war" description="removes all class files">
+	<target name="deploy-lamscr-jar" depends="lamscr-jar" description="deploy jar file">
 		<delete quiet="true">
 			<fileset dir="${jboss.deploy}/tmp"/>
 			<fileset dir="${jboss.deploy}/work"/>
 		</delete>
 		<copy file="${build.lib}/${product}.jar"
 				todir="${jboss.deploy}"/>
+	</target>
+
+	<!-- =================================================================== -->
+	<!-- Deploy the example struts jar and war                               -->
+	<!-- =================================================================== -->
+	<target name="deploy-lamscr-jarwar" depends="lamscr-jar, lamscr-war" description="deploy example war file">
+		<delete quiet="true">
+			<fileset dir="${jboss.deploy}/tmp"/>
+			<fileset dir="${jboss.deploy}/work"/>
+		</delete>
+		<copy file="${build.lib}/${product}.jar"
+				todir="${jboss.deploy}"/>
 		<copy file="${build.lib}/${product}.war"
 				todir="${jboss.deploy}"/> 
 	</target>
Index: lams_contentrepository/web/nodeSelection.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/web/nodeSelection.jsp,v
diff -u -r1.4 -r1.5
--- lams_contentrepository/web/nodeSelection.jsp	20 Jan 2005 13:08:17 -0000	1.4
+++ lams_contentrepository/web/nodeSelection.jsp	21 Jan 2005 04:12:30 -0000	1.5
@@ -58,7 +58,7 @@
 					Long key = (Long) iter.next();
 			%>
 				<TR><TD colspan="6"><STRONG>Node <%=key.toString()%>:</STRONG>
-				<input name="getNode" onClick="setActionSubmit('getNode', '<%=key.toString()%>', '')" type="button" size="50" value="Get Latest Version"/>
+				<input name="getNode" onClick="parent.location='download?uuid=<%=key.toString()%>'" type="button" size="50" value="Get Latest Version"/>
 				<input name="uploadNewVersion" onClick="parent.location='addNode.jsp?uuid=<%=key.toString()%>'" type="button" size="50" value="Upload New Version"/>
 				<input name="deleteNode" onClick="setActionSubmit('deleteNode', '<%=key.toString()%>', '')" type="button" size="50" value="Delete Node (All Versions)"/>
 				</TD></TR>
@@ -72,7 +72,7 @@
 			%>
 						<TR>
 							<TD>Version: <%=detail.getVersionId()%></TD>
-							<TD><input name="getNode" onClick="setActionSubmit('getNode', '<%=key.toString()%>', '<%=detail.getVersionId()%>')" type="button" size="50" value="Get File"/></TD>
+							<TD><input name="getNode" onClick="parent.location='download?uuid=<%=key.toString()%>&version=<%=detail.getVersionId()%>'" type="button" size="50" value="Get File"/></TD>
 							<TD><input name="deleteVersion" onClick="setActionSubmit('deleteNode', '<%=key.toString()%>', '<%=detail.getVersionId()%>')" type="button" size="50" value="Delete Version"/>
 							<TD>Created&nbsp;Date&nbsp;Time: <%=detail.getCreatedDateTime()%></TD>
 							<TD>Version&nbsp;Description: <%=detail.getDescription()%></TD>
Index: lams_contentrepository/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/web/WEB-INF/Attic/web.xml,v
diff -u -r1.1 -r1.2
--- lams_contentrepository/web/WEB-INF/web.xml	17 Jan 2005 10:02:58 -0000	1.1
+++ lams_contentrepository/web/WEB-INF/web.xml	21 Jan 2005 04:12:30 -0000	1.2
@@ -21,5 +21,17 @@
       <servlet-name>action</servlet-name>
       <url-pattern>*.do</url-pattern>
    </servlet-mapping>
+
+  <servlet>
+    <description>Download file(s)</description>
+    <display-name>Download file</display-name>
+    <servlet-name>Download</servlet-name>
+    <servlet-class>com.lamsinternational.lams.contentrepository.struts.action.Download</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Download</servlet-name>
+    <url-pattern>/download/*</url-pattern>
+  </servlet-mapping>
+
 </web-app>