Index: lams_tool_forum/build.properties
===================================================================
diff -u -r9e785def00397c4b310a4a5295863bcba7ee81de -r3f881fb4927d02d9e124d95c09f15035a89b495b
--- lams_tool_forum/build.properties	(.../build.properties)	(revision 9e785def00397c4b310a4a5295863bcba7ee81de)
+++ lams_tool_forum/build.properties	(.../build.properties)	(revision 3f881fb4927d02d9e124d95c09f15035a89b495b)
@@ -10,8 +10,3 @@
 signature=lafrum11
 project.displayname = lams forum tool
 
-# path properties 
-lib=${basedir}/lib
-j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
-jboss.home=D:/jboss-3.2.6/
-
Index: lams_tool_forum/build.xml
===================================================================
diff -u -r1bdf0996e7e15cb6d7641dafa1b0acaa9587c5bc -r3f881fb4927d02d9e124d95c09f15035a89b495b
--- lams_tool_forum/build.xml	(.../build.xml)	(revision 1bdf0996e7e15cb6d7641dafa1b0acaa9587c5bc)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision 3f881fb4927d02d9e124d95c09f15035a89b495b)
@@ -8,21 +8,10 @@
 	<property name="project.displayname" value="${project} - ${project.displayname}"/>
 	<property name="project.description" value="${project} - ${project.description}"/>
 
-	<!-- fixed filesystem property structure /-->
-	<property name="lib.dir" value="${basedir}/lib"/>
-	<property name="classes.dir" value="${build}/classes"/>
-
-    <property name="test.lib.dir" value="${basedir}/test/lib"/>
-    <property name="test.classes.dir" value="${basedir}/test/classes"/>
-    <property name="test.result" value="${basedir}/test/testresult"/>
-
 	<!-- end properties *********************************************************************************************-->
 
 	<!-- begin path *************************************************************************************************-->
 	<path id="all-libs">
-		<fileset dir="${lib}">
-			<include name="**/*.jar"/>
-		</fileset>
 		<fileset dir="${sharedlib}">
 			<include name="**/*.jar"/>
 		</fileset>
@@ -38,39 +27,22 @@
 		<pathelement location="${java.class.path}" />
 	</path>
 
-	<path id="build.class.path">
-		<fileset dir="${lib.dir}/build">
-			<include name="**/*.jar"/>
-		</fileset>
-    </path>
-
 	<!-- end path ***************************************************************************************************-->
 
 	<!-- begin tasks ***********************************************************************************************/-->
 	<target name="init">
 		<echo>+------------------------------------------+</echo>
-		<echo>| build initializing                       |</echo>
-		<echo>+------------------------------------------+</echo>
-
-		<antcall target="mkdirs"/>
-
-		<echoproperties/>
-	</target>
-
-	<target name="mkdirs">
-		<echo>+------------------------------------------+</echo>
 		<echo>| creating directory structure             |</echo>
 		<echo>+------------------------------------------+</echo>
 
 		<!-- build filesystem structure /-->
-		<mkdir dir="${classes.dir}"/>
-		<mkdir dir="${lib.dir}"/>
         <mkdir dir="${build}"/>
+		<mkdir dir="${build.classes.java}"/>
         <mkdir dir="${build.report}"/>
         <mkdir dir="${build.lib}"/>
         <mkdir dir="${build.deploy}"/>
-        <mkdir dir="${test.classes.dir}"/>
-        <mkdir dir="${test.result}"/>
+        <mkdir dir="${build.classes.test}"/>
+        <mkdir dir="${build.report}"/>
 	</target>
 
 
@@ -79,30 +51,30 @@
 		<echo>| clean                                    |</echo>
 		<echo>+------------------------------------------+</echo>
 
-		<delete dir="${classes.dir}"/>
-		<delete dir="${build}"/>
-		<delete dir="${build.report}"/>
-		<delete dir="${build.lib}"/>
-		<delete dir="${build.deploy}"/>
-        <delete dir="${test.classes.dir}"/>
-        <delete dir="${test.result}"/>
+		<delete dir="${build.classes.java}" quiet="false"/>
+        <delete dir="${build.classes.test}" quiet="false"/>
+		<delete dir="${build.lib}" quiet="false"/>
+		<delete dir="${build.deploy}" quiet="false"/>
 
 	</target>
 			
-	<target name="compile" description="Compiles the Task" depends="init">
-		<echo>+------------------------------------------+</echo>
-		<echo>| compile                                  |</echo>
-		<echo>+------------------------------------------+</echo>
-
-		<javac srcdir="${src.dir}"
+	<target name="compile-java" description="Compiles the Task" depends="init">
+		<javac srcdir="${src.java.dir}"
             source="1.4"
             debug="on"
             compiler="modern"
             classpathref="project.classpath"
-            destdir="${classes.dir}"/>
+            destdir="${build.classes.java}"/>
+	 	<copy overwrite="yes" todir="${build.classes.java}" verbose="true">
+			<fileset dir="${src.java.dir}">
+				<include name="**/*.xml"/>
+				<include name="**/*.hbm.xml"/>
+				<include name="**/*.properties"/>
+			</fileset>
+		</copy>
 	</target>
 
-	<target name="hibernate" depends="compile">
+	<target name="hibernate" depends="compile-java">
 		<echo>+------------------------------------------+</echo>
 		<echo>| generating hibernate metadata            |</echo>
 		<echo>+------------------------------------------+</echo>
@@ -111,47 +83,35 @@
 			classname="xdoclet.modules.hibernate.HibernateDocletTask"
 			classpathref="all-libs"/>
 
-		<echo>Building hbm.xml files using XDoclet to ${conf.hibernate.mapping.dir} from ${src.dir}</echo>
+		<echo>Building hbm.xml files using XDoclet to ${conf.hibernate.mapping.dir} from ${src.java.dir}</echo>
 
 		<hibernatedoclet
 			destdir="${conf.hibernate.mapping.dir}"
 			excludedtags="@version,@author,@todo"
 			force="true">
-				<fileset dir="${src.dir}">
+				<fileset dir="${src.java.dir}">
 					<include name="**/*.java"/>
 				</fileset>
 			<hibernate version="2.0"/>
 		</hibernatedoclet>
 
     </target>
 
-    <target name="compiletest" description="Compiles the test classes" depends="clean, compile, hibernate">
-        <echo>+------------------------------------------+</echo>
-        <echo>| compile                                  |</echo>
-        <echo>+------------------------------------------+</echo>
-         <mkdir dir="${test.classes.dir}"/>
-
-	      <copy todir="${test.classes.dir}">
-            <fileset dir="${src.dir}">
-			    <include name="**/*.xml"/>
-            </fileset>
-          </copy>
-          <copy todir="${test.classes.dir}">
-			<fileset dir="${classes.dir}">
-                <include name="**/*.class"/>
-                <include name="**/*.hbm.xml"/>
-            </fileset>
-          </copy>
-
-        <javac srcdir="${src.test.dir}"
-            source="1.4"
-            debug="on"
-            compiler="modern"
-            classpathref="project.classpath"
-            destdir="${test.classes.dir}"/>
-    </target>
+	<target name="compile-test" depends="compile-java">
+		<javac srcdir="${src.test.dir}" compiler="modern"
+	         	 	destdir="${build.classes.test}" deprecation="on" debug="on">
+			<classpath>
+				<pathelement location="${build.classes.java}"/>
+				<path refid="project.classpath"/>
+			</classpath>
+		</javac>
+		<copy overwrite="yes" todir="${build.classes.test}">
+			<fileset dir="${src.test.dir}">
+				<include name="**/*.xml"/>
+			</fileset>
+		</copy>
+	</target>
 	
-	
 	<!-- =================================================================== -->
 	<!-- Forum Database tasks                                               -->
 	<!-- =================================================================== -->
@@ -187,62 +147,46 @@
 		</sql>
 	</target>
 
-    <target name="junit" depends="compiletest, init-db">
-        <echo>+-------------------------------------------+</echo>
-        <echo>| run junit tests and save results in /test |</echo>
-        <echo>+-------------------------------------------+</echo>
-        <mkdir dir="${test.result}"/>
+	<target name="test-report" depends="compile-test, init-db">
 
-        <junit dir="${basedir}"
-             printsummary="yes"
-             errorProperty="test.failed"
-             failureProperty="test.failed">
-         <jvmarg value="-Xmx512m"/>
-         <!--
-         <jvmarg value="-ea"/>
-         <jvmarg value="-esa"/>
-         -->
-         <jvmarg value="-Djava.endorsed.dirs=${lib.dir}/endorsed"/>
+		<mkdir dir="${build.report}"/>
+		<mkdir dir="${build.report}/html"/> 
+		
+		<junit printsummary="yes" errorProperty="test.failed" failureProperty="test.failed"
+			   fork="yes">
+			<formatter type="plain" usefile="false"/>
+			<formatter type="xml"/>
+			<batchtest todir="${build.report}">
+				<fileset dir="${src.test.dir}">
+	                 <include name="org/lamsfoundation/lams/tool/forum/**/*.*"/>
+				</fileset>
+			</batchtest>
+			<classpath>
+				<pathelement location="${build.classes.java}"/>
+				<pathelement location="${build.classes.test}"/>
+				<pathelement location="${conf.hibernate.mapping.dir}"/>
+				<pathelement location="${conf.web.dir}"/>
+				<path refid="project.classpath"/>
+			</classpath>
+		</junit>
 
-         <classpath id="junit.class.path">
-             <path location="${test.classes.dir}"/>
-             <path refid="project.classpath"/>
-         </classpath>
-
-         <formatter type="xml"/>
-
-
-         <batchtest fork="yes" todir="${test.result}">
-             <fileset dir="${src.test.dir}">
-                 <include name="org/lamsfoundation/lams/tool/forum/**/*.*"/>
-                 <exclude name="org/lamsfoundation/lams/tool/forum/core/BaseTestCase.java"/>
-                 <exclude name="org/lamsfoundation/lams/tool/forum/core/SpringAwareTestCase.java"/>
-             </fileset>
-         </batchtest>
-     </junit>
-    <fail message="Tests failed. Check log and/or reports." if="test.failed"/>
-    </target>
-
-    <target name="merge" description="merges dependencies for the jar file">
-		<echo>+------------------------------------------+</echo>
-		<echo>| merge stuff into jar file                |</echo>
-		<echo>+------------------------------------------+</echo>
-
-	 	<copy overwrite="yes" todir="${classes.dir}">
-			<fileset dir="${src.dir}">
-				<include name="**/*.xml"/>
-				<include name="**/*.properties"/>
+		<junitreport todir="${build.report}"> 
+			<fileset dir="${build.report}">
+				<include name="TEST-*.xml"/>
 			</fileset>
-		</copy>
+			<report todir="${build.report}/html"/> 
+		</junitreport>
+		
+		<fail message="Tests failed. Check log and/or reports" if="test.failed"/>
 	</target>
 
-	<target name="jar" description="JARs the Task" depends="hibernate, compile, merge">
+	<target name="jar" description="JARs the Task" depends="hibernate, compile-java">
 		<echo>+------------------------------------------+</echo>
 		<echo>| create jar file                          |</echo>
 		<echo>+------------------------------------------+</echo>
 		<delete file="${build.lib}/${product}.jar"/>
 		<jar destfile="${build.lib}/${product}.jar">
-			<fileset dir="${classes.dir}">
+			<fileset dir="${build.classes.java}">
 			</fileset>
 			<fileset dir="${conf.hibernate.mapping.dir}">
 			</fileset>
@@ -391,7 +335,7 @@
 	<!-- begin navigation tasks *************************************************************************************-->
 	<target
         name="_build"
-        depends="init, clean, mkdirs, compile, merge, jar, web">
+        depends="init, clean, compile-java, jar, web">
 		<echo>+------------------------------------------+</echo>
 		<echo>| built war file                           |</echo>
 		<echo>+------------------------------------------+</echo>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/core/GenericObjectFactoryImpl.java
===================================================================
diff -u -r16fbeb33bc816f2c00a4dbe4e552ee84aabfb0cf -r3f881fb4927d02d9e124d95c09f15035a89b495b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/core/GenericObjectFactoryImpl.java	(.../GenericObjectFactoryImpl.java)	(revision 16fbeb33bc816f2c00a4dbe4e552ee84aabfb0cf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/core/GenericObjectFactoryImpl.java	(.../GenericObjectFactoryImpl.java)	(revision 3f881fb4927d02d9e124d95c09f15035a89b495b)
@@ -1,14 +1,10 @@
 package org.lamsfoundation.lams.tool.forum.core;
 
+import org.apache.log4j.Logger;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.apache.log4j.Priority;
-import org.apache.log4j.Logger;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 
-
 /**
  * Created by IntelliJ IDEA.
  * User: conradb
@@ -31,6 +27,20 @@
         return genericObjectFactory;
     }
 
+    /** Get the Spring context with a local datasource and transaction, suitable
+     * for testing. Does not use JTA so the transactions across projects could be
+     * out. Do NOT use in production code - only for junit testing.
+     */
+    public static GenericObjectFactory getTestInstance() {
+        if (genericObjectFactory == null) {
+            genericObjectFactory = new GenericObjectFactoryImpl();
+            addContext("/org/lamsfoundation/lams/localApplicationContext.xml");
+            addContext("/org/lamsfoundation/lams/contentrepository/applicationContext.xml");
+            addContext("/forumApplicationContext.xml");
+        }
+        return genericObjectFactory;
+    }
+
     public static ApplicationContext addContext(String contextPath) {
             try {
                 if (applicationContext == null) {
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/AttachmentTest.java
===================================================================
diff -u -r5edaf254d29d3d54d418c18ffff0ffe84f7e8572 -r3f881fb4927d02d9e124d95c09f15035a89b495b
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/AttachmentTest.java	(.../AttachmentTest.java)	(revision 5edaf254d29d3d54d418c18ffff0ffe84f7e8572)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/AttachmentTest.java	(.../AttachmentTest.java)	(revision 3f881fb4927d02d9e124d95c09f15035a89b495b)
@@ -21,11 +21,11 @@
 
     public void testCreateAndDeleteForum() throws FactoryException {
         //Populate an Attachment entity for test purposes
-        AttachmentDao attachmentDao = (AttachmentDao) GenericObjectFactoryImpl.getInstance().lookup(AttachmentDao.class);
+        AttachmentDao attachmentDao = (AttachmentDao) GenericObjectFactoryImpl.getTestInstance().lookup(AttachmentDao.class);
         Attachment instructions = new Attachment();
         attachmentDao.saveOrUpdate(instructions);
 
-        AttachmentDao dao = (AttachmentDao) GenericObjectFactoryImpl.getInstance().lookup(AttachmentDao.class);
+        AttachmentDao dao = (AttachmentDao) GenericObjectFactoryImpl.getTestInstance().lookup(AttachmentDao.class);
         dao.saveOrUpdate(instructions);
         assertNotNull(instructions.getId());
 
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/ForumTest.java
===================================================================
diff -u -r5edaf254d29d3d54d418c18ffff0ffe84f7e8572 -r3f881fb4927d02d9e124d95c09f15035a89b495b
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/ForumTest.java	(.../ForumTest.java)	(revision 5edaf254d29d3d54d418c18ffff0ffe84f7e8572)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/ForumTest.java	(.../ForumTest.java)	(revision 3f881fb4927d02d9e124d95c09f15035a89b495b)
@@ -33,7 +33,7 @@
 
         Set attachments = new HashSet();
 
-        AttachmentDao attachmentDao = (AttachmentDao) GenericObjectFactoryImpl.getInstance().lookup(AttachmentDao.class);
+        AttachmentDao attachmentDao = (AttachmentDao) GenericObjectFactoryImpl.getTestInstance().lookup(AttachmentDao.class);
         Attachment instructions = new Attachment();
         //instructions.setType(true);
         attachments.add(instructions);
@@ -42,7 +42,7 @@
         entity.setAttachments(attachments);
 
         //save
-        ForumDao dao = (ForumDao) GenericObjectFactoryImpl.getInstance().lookup(ForumDao.class);
+        ForumDao dao = (ForumDao) GenericObjectFactoryImpl.getTestInstance().lookup(ForumDao.class);
         dao.saveOrUpdate(entity);
         assertNotNull(entity.getId());
         assertNotNull("date created is null", entity.getCreated());
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/GenericEntityTest.java
===================================================================
diff -u -rb62674f9ee01f587c9be2cc2409f16f94e3ed518 -r3f881fb4927d02d9e124d95c09f15035a89b495b
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/GenericEntityTest.java	(.../GenericEntityTest.java)	(revision b62674f9ee01f587c9be2cc2409f16f94e3ed518)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/GenericEntityTest.java	(.../GenericEntityTest.java)	(revision 3f881fb4927d02d9e124d95c09f15035a89b495b)
@@ -26,7 +26,7 @@
         entity.setModifiedBy(new Long("1004"));
 
         //save
-        GenericEntityDao dao = (GenericEntityDao) GenericObjectFactoryImpl.getInstance().lookup(GenericEntityDao.class);
+        GenericEntityDao dao = (GenericEntityDao) GenericObjectFactoryImpl.getTestInstance().lookup(GenericEntityDao.class);
         dao.saveOrUpdate(entity);
         assertNotNull(entity.getId());
         assertNotNull("date created is null", entity.getCreated());
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/MessageTest.java
===================================================================
diff -u -rb62674f9ee01f587c9be2cc2409f16f94e3ed518 -r3f881fb4927d02d9e124d95c09f15035a89b495b
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/MessageTest.java	(.../MessageTest.java)	(revision b62674f9ee01f587c9be2cc2409f16f94e3ed518)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/MessageTest.java	(.../MessageTest.java)	(revision 3f881fb4927d02d9e124d95c09f15035a89b495b)
@@ -27,7 +27,7 @@
         Forum forum = new Forum();
 
         //save
-        ForumDao dao = (ForumDao) GenericObjectFactoryImpl.getInstance().lookup(ForumDao.class);
+        ForumDao dao = (ForumDao) GenericObjectFactoryImpl.getTestInstance().lookup(ForumDao.class);
         dao.saveOrUpdate(forum);
 
         Message message = new Message();
@@ -39,7 +39,7 @@
         message.setCreatedBy(new Long(1000));
         message.setModifiedBy(new Long(1002));
 
-        MessageDao messageDao = (MessageDao) GenericObjectFactoryImpl.getInstance().lookup(MessageDao.class);
+        MessageDao messageDao = (MessageDao) GenericObjectFactoryImpl.getTestInstance().lookup(MessageDao.class);
         messageDao.saveOrUpdate(message);
 
         assertNotNull(message.getId());
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java
===================================================================
diff -u -r5edaf254d29d3d54d418c18ffff0ffe84f7e8572 -r3f881fb4927d02d9e124d95c09f15035a89b495b
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java	(.../ForumManagerImplTest.java)	(revision 5edaf254d29d3d54d418c18ffff0ffe84f7e8572)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java	(.../ForumManagerImplTest.java)	(revision 3f881fb4927d02d9e124d95c09f15035a89b495b)
@@ -22,7 +22,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        forumManager = (ForumManager) GenericObjectFactoryImpl.getInstance().lookup("forumManager");
+        forumManager = (ForumManager) GenericObjectFactoryImpl.getTestInstance().lookup("forumManager");
     }
 
     public void testCreateAndDeleteForum() throws PersistenceException {