Index: lams_contentrepository/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/build.xml,v
diff -u -r1.12 -r1.13
--- lams_contentrepository/build.xml	27 Feb 2005 23:03:09 -0000	1.12
+++ lams_contentrepository/build.xml	28 Feb 2005 07:56:22 -0000	1.13
@@ -56,13 +56,16 @@
 		<echo message=""/>
 		<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"/>
 		<echo message="lamscr-war  --> Make war archive for deployment"/>
 		<echo message="copyfiles --> Copy the third party jar files and cofiguration files for deployment"/> 
+		<echo message="test-report --> Run the junit tests"/> 
 <!--		<echo message="middlegen-cr --> <!-- Run middlegen for content repository tables"/>  -->
 <!--		<echo message="hbm2java-cr --> <!-- Run hbm2java for content repository mapping files"/> -->
+		<echo message="------------------------------------------------------"/>
+		<echo message="The tables and test data are created as part of the lams_common db setup."/>
+		<echo message="------------------------------------------------------"/>
+		
 		<echo message=""/>
 	</target>
 
@@ -211,6 +214,22 @@
 		</copy>
 	</target>
 
+	<target name="compile.test" depends="compile">
+		<mkdir dir="${build.test}"/>
+		<javac destdir="${build.test}" compiler="modern">
+			<src path="${test.java}"/>
+			<classpath>
+				<pathelement location="${build.classes}"/>
+				<path refid="project.classpath"/>
+			</classpath>
+		</javac>
+		<copy overwrite="yes" todir="${build.test}">
+			<fileset dir="${test.java}">
+				<include name="**/*.xml"/>
+			</fileset>
+		</copy>
+	</target>
+
 	<!-- ================================================================ -->
 	<!-- Make jar archive for deployment        		    	          -->
 	<!-- ================================================================ -->
@@ -330,34 +349,6 @@
 				todir="${jboss.deploy}"/> 
 	</target>
 
-	<!-- =================================================================== -->
-	<!-- Clean and rebuild the database                                      -->
-	<!-- =================================================================== -->
-	<target name="create-db-tables"
-		description="(re)create content repository tables. Mysql has to be running first and the database should exist.">
-		<sql driver="${database.driver}" url="${database.url}" userid="${database.userid}"
-				password="${database.password}">
-			<classpath>
-				<pathelement location="${database.driver.file}"/>
-			</classpath>
-			<transaction src="${sql}/create_content_repository_tables.sql"/>
-		</sql>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Insert test data to lams database                                   -->
-	<!-- =================================================================== -->
-	<target name="insert-test-data"
-		description="insert test data to lams database">
-		<sql driver="${database.driver}" url="${database.url}" userid="${database.userid}"
-				password="${database.password}">
-			<classpath>
-				<pathelement location="${database.driver.file}"/>
-			</classpath>
-			<transaction src="${sql}/insert_test_data.sql"/>
-		</sql>
-	</target>
-	
 	<target name="generate-hbm-files" 
 			description="Generate the hibernate hbm.xml files from the Java source (using XDoclet)"
 			depends="init">
@@ -379,5 +370,39 @@
 		</hibernatedoclet>
 	</target>
 
+	<!-- =================================================================== -->
+	<!-- Run JUnit Tests                                                     -->
+	<!-- =================================================================== -->
+	<target name="test-report" depends="test">
+		<mkdir dir="${build.report}/html"/> 
+		<junitreport todir="${build.report}"> 
+			<fileset dir="${build.report}">
+				<include name="TEST-*.xml"/>
+			</fileset>
+			<report todir="${build.report}/html"/> 
+		</junitreport>
+	</target>	
+	
+	<target name="test" depends="compile.test"> 
+		<mkdir dir="${build.report}"/>
+		<junit printsummary="yes" haltonerror="no" haltonfailure="no"
+			   fork="yes">
+			<formatter type="plain" usefile="false"/>
+			<formatter type="xml"/>
+			<batchtest todir="${build.report}">
+				<fileset dir="${test.java}">
+					<include name="**/Test*.java"/>
+					<exclude name="**/AllTests.java"/>
+				</fileset>
+			</batchtest> 
+			<classpath>
+				<pathelement location="${build.classes}"/>
+				<pathelement location="${build.test}"/>
+				<pathelement location="${hbm}"/>
+				<path refid="project.classpath"/>
+			</classpath>
+		</junit>
+	</target>
+
 </project>
 
Index: lams_contentrepository/properties.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/Attic/properties.xml,v
diff -u -r1.8 -r1.9
--- lams_contentrepository/properties.xml	27 Feb 2005 23:03:09 -0000	1.8
+++ lams_contentrepository/properties.xml	28 Feb 2005 07:56:22 -0000	1.9
@@ -38,6 +38,8 @@
 	<property name="sql"                       value="${basedir}/db/sql"/>
 	<property name="src"                       value="${basedir}/src"/>
 	<property name="src.java"                  value="${basedir}/src/java"/>
+	<property name="test"                       value="${basedir}/test"/>
+	<property name="test.java"                  value="${basedir}/test/java"/>
 	<property name="conf"                      value="${basedir}/conf"/>
 	<property name="conf.jboss"                value="${conf}/jboss"/>
 	<property name="hbm"                       value="${conf}/hibernate/mappings"/>
@@ -50,7 +52,9 @@
 
 	<property name="build"                         value="${basedir}/build"/>
 	<property name="build.classes"                 value="${build}/classes"/>
+	<property name="build.report"                  value="${build}/report"/>
 	<property name="build.lib"                     value="${build}/lib"/>
+	<property name="build.test"                    value="${build}/test"/>
 	
 	<property name="package"                   value="org/lamsfoundation/lams"/>
 	<property name="package.contentrepository"    value="${package}/contentrepository"/>
Index: lams_contentrepository/db/sql/insert_test_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/db/sql/Attic/insert_test_data.sql,v
diff -u -r1.11 -r1.12
--- lams_contentrepository/db/sql/insert_test_data.sql	25 Feb 2005 03:57:47 -0000	1.11
+++ lams_contentrepository/db/sql/insert_test_data.sql	28 Feb 2005 07:56:22 -0000	1.12
@@ -1,38 +1,2 @@
-use lams;
-
-SET FOREIGN_KEY_CHECKS=0;
-
-DELETE from lams_cr_node_version_property;
-DELETE from lams_cr_node_version;
-DELETE from lams_cr_node;
-
-DELETE from lams_cr_workspace_credential  ;
-DELETE from lams_cr_credential ;
-DELETE from lams_cr_workspace  ;
-
-SET FOREIGN_KEY_CHECKS=1;
-
-INSERT INTO lams_cr_credential (credential_id, name, password) VALUES (1, 'atool','atool');
-INSERT INTO lams_cr_workspace  (workspace_id, name) VALUES (1, 'atoolWorkspace');
-INSERT INTO lams_cr_workspace_credential  (wc_id, workspace_id, credential_id) VALUES  (1, 1,1);
-INSERT INTO lams_cr_workspace  (workspace_id, name) VALUES (2, 'atoolWorkspace2');
-INSERT INTO lams_cr_workspace_credential  (wc_id, workspace_id, credential_id) VALUES  (2, 2,1);
-
-INSERT INTO lams_cr_node (node_id, workspace_id, type, created_date_time, path, next_version_id) VALUES (1, 1, 'DATANODE', 20050106103100, "/test",3);
-INSERT INTO lams_cr_node_version (nv_id, node_id, version_id, created_date_time)
-VALUES (1, 1, 1, 20050106103100);
-INSERT INTO lams_cr_node_version (nv_id, node_id, version_id, created_date_time)
-VALUES (2, 1, 2, 20050106110000);
-
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (1,1,"APPSPEC","abcd","STRING");
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (2,1,"VERSIONDESC","Initial Version.","STRING");
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (3,2,"APPSEC","The quick brown fox jumped over the lazy dog.","STRING");
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (4,2,"VERSIONDESC","The second version.","STRING");
-
--- Note : this file node is missing its file as can't setup the repository
-INSERT INTO lams_cr_node (node_id, workspace_id, type, created_date_time, path, next_version_id) VALUES (2, 1, 'FILENODE', 20050106103100, "", 2);
-INSERT INTO lams_cr_node_version (nv_id, node_id, version_id, created_date_time)
-VALUES (3, 2, 1, 20050106103100);
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (5,3,"VERSIONDESC","Initial Version.","STRING");
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (6,3,"FILENAME","nofile.txt","STRING");
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (7,3,"MIMETYPE","unknown/unknown","STRING");
\ No newline at end of file
+-- This file has been replaced with the add_test_data script 
+-- in the lams_common project.
\ No newline at end of file
Index: lams_contentrepository/lib/mysql/mysql-connector-java-3.1.7-bin.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/lib/mysql/Attic/mysql-connector-java-3.1.7-bin.jar,v
diff -u
Binary files differ
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dbConnection.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/Attic/dbConnection.properties,v
diff -u -r1.4 -r1.5
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dbConnection.properties	25 Feb 2005 03:57:47 -0000	1.4
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dbConnection.properties	28 Feb 2005 07:56:21 -0000	1.5
@@ -23,7 +23,7 @@
 
 #jdbc configuration
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost/lams
+jdbc.url=jdbc:mysql://localhost/lams?characterEncoding=utf8
 jdbc.username=lams
 jdbc.password=lamsdemo
 
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java,v
diff -u -r1.2 -r1.3
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java	21 Feb 2005 06:12:45 -0000	1.2
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java	28 Feb 2005 07:56:21 -0000	1.3
@@ -137,7 +137,7 @@
 			throw new FileException(message, e);
 			
 		} finally {
-			// always want to close is
+
 			try {
 				if ( is != null )
 					is.close();
@@ -146,13 +146,12 @@
 				log.error(message,e1);
 				new FileException(message, e1);
 			}
-			// only try to close os if an error occured
+
 			try {
-				if ( writeErrorOccured && os != null )
+				if ( os != null )
 					os.close();
 			} catch (IOException e2) {
-				String message = "Unable to close output filestream due to IOException. This may be due to the previous exception "
-	                +". Original filename ";
+				String message = "Unable to close file in repository due to IOException";
 				log.error(message,e2);
 				new FileException(message, e2);
 			}
Index: lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/BaseTestCase.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/Attic/BaseTestCase.java,v
diff -u -r1.3 -r1.4
--- lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/BaseTestCase.java	21 Feb 2005 06:13:40 -0000	1.3
+++ lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/BaseTestCase.java	28 Feb 2005 07:56:21 -0000	1.4
@@ -23,7 +23,6 @@
 
 import junit.framework.TestCase;
 
-import org.apache.log4j.BasicConfigurator;
 import org.lamsfoundation.lams.contentrepository.ICredentials;
 import org.lamsfoundation.lams.contentrepository.IRepository;
 import org.lamsfoundation.lams.contentrepository.IRepositoryAdmin;
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/NodeTransactionTest.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/TestSimpleTicket.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/Attic/TestSimpleTicket.java,v
diff -u -r1.2 -r1.3
--- lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/TestSimpleTicket.java	21 Feb 2005 06:13:40 -0000	1.2
+++ lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/TestSimpleTicket.java	28 Feb 2005 07:56:21 -0000	1.3
@@ -61,6 +61,7 @@
 	}
 
 	public void testGetWorkspaceId() {
+		assertTrue("Ticket exists.", ticket != null );
 		Long id = ticket.getWorkspaceId();
 		assertTrue("Ticket has workspaceId.", id != null );
 		assertTrue("Workspace id is "+id
@@ -69,6 +70,7 @@
 	}
 
 	public void testGetTicketId() {
+		assertTrue("Ticket exists.", ticket != null );
 		String id = ticket.getTicketId();
 		assertTrue("Ticket has a ticketId.", id != null );
 	}