Index: lams_tool_lamc/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/build.properties,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/build.properties	30 Sep 2005 10:11:34 -0000	1.1
+++ lams_tool_lamc/build.properties	17 Oct 2005 12:38:42 -0000	1.2
@@ -4,7 +4,7 @@
 signature=lamc11
 
 #mc files package definition
-mc.package=org.lamsfoundation.lams.tool.mc
+package=org.lamsfoundation.lams.tool.mc
 mc.path=org/lamsfoundation/lams/tool/mc
 
 #configuration files
@@ -13,7 +13,7 @@
 conf.resources.dir=${conf.web.dir}/resources
 
 # Build directory
-build.webinf.dir=${build.web}/WEB-INF/resources
+
 build.web.includes=${build}/web/includes
 build.web.template=${build}/web/template
 
Index: lams_tool_lamc/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/build.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/build.xml	6 Oct 2005 16:01:07 -0000	1.6
+++ lams_tool_lamc/build.xml	17 Oct 2005 12:38:42 -0000	1.7
@@ -100,7 +100,7 @@
 			>
 
 				<hibernate destination="${conf.hibernate.mapping.dir}"
-						   package="${mc.package}" 
+						   package="${package}" 
 						   genXDocletTags="true"
 						   javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
 				/>
@@ -125,7 +125,7 @@
 	      />
 		
 		  <hbm2java output="${src.java.dir}">
-				<fileset dir="${conf.hibernate.mapping.dir}/${mc.path}">
+				<fileset dir="${conf.hibernate.mapping.dir}/${path}">
 					<include name="*.hbm.xml"/>
 				</fileset>
 			</hbm2java>
@@ -284,7 +284,22 @@
 					todir="${jboss.deploy}"/> 
 		</target>
 	
+		
 		<!-- =================================================================== -->
+		<!-- Initialize database. 									 -->
+		<!-- =================================================================== -->
+		<target name="init-db"
+			description="rebuild Submit Files tables">
+			<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
+					password="${db.password}">
+				<classpath>
+					<pathelement location="${db.driver.jar}"/>
+				</classpath>
+				<transaction src="${db.scripts}/init_lams_tool_lamc.sql"/>
+			</sql>
+		</target>
+	
+		<!-- =================================================================== -->
 		<!-- Clean and rebuild the database. 									 -->
 		<!-- =================================================================== -->
 		<target name="rebuild-db"
@@ -296,7 +311,7 @@
 				</classpath>
 				<transaction src="${db.scripts}/drop_lams_tool_lamc.sql"/>
 				<transaction src="${db.scripts}/create_lams_tool_lamc.sql"/>
-		<!--		<transaction src="${db.scripts}/insert_lams_tool_lamc.sql"/> -->
+				<transaction src="${db.scripts}/insert_lams_tool_lamc.sql"/> 
 			</sql>
 		</target>
 
Index: lams_tool_lamc/db/sql/init_lams_tool_lamc.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/Attic/init_lams_tool_lamc.sql,v
diff -u
Binary files differ
Index: lams_tool_lamc/db/sql/insert_lams_tool_lamc.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/Attic/insert_lams_tool_lamc.sql,v
diff -u -r1.2 -r1.3
Binary files differ
Fisheye: Tag 1.10 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.10 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.9 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbConnection.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/log4j.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/AllTests.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/McDataAccessTestCase.java,v
diff -u -r1.13 -r1.14
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java	15 Oct 2005 15:21:56 -0000	1.13
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java	17 Oct 2005 12:37:22 -0000	1.14
@@ -80,7 +80,7 @@
     	super.tearDown();
     }
     
-    
+
     public void testInitDB()
     {
     	//create new mc content
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/TestMcContent.java,v
diff -u -r1.11 -r1.12
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java	12 Oct 2005 16:39:20 -0000	1.11
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java	17 Oct 2005 12:37:22 -0000	1.12
@@ -108,13 +108,6 @@
    }
    
     
-    public void testRetrieveMcContent()
-    {
-    	McContent mcContent = mcContentDAO.findMcContentById(TEST_CONTENT_ID);
-    	assertNotNull(mcContent);
-    	assertEquals(mcContent.getMcContentId(), new Long(2));
-    }
- 
     public void testRemoveMcContent()
     {
     	McContent mcContent = mcContentDAO.findMcContentById(TEST_CONTENT_ID);
@@ -128,4 +121,7 @@
     	mcContentDAO.removeMcById(TEST_CONTENT_ID_OTHER);
     }
 */
+       
+    
+    
 }
\ No newline at end of file
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_lamc/test/web/authoringMaincontent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_lamc/test/web/index.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?