Index: jpa/eclipselink.jpa.test/build.xml
===================================================================
--- jpa/eclipselink.jpa.test/build.xml	(revision 2011)
+++ jpa/eclipselink.jpa.test/build.xml	(working copy)
@@ -39,7 +39,9 @@
         - server-test : runs the JPA LRG tests in the server
         - server-test-lrg : runs the JPA LRG tests in the server
         - server-test-sessionbean : runs the SessionBean tests in the server
-        - server-test-fieldaccess-advanced : runs the test in the server
+        - server-test-fieldaccess-advanced : runs the Fieldaccess tests in the server
+        - server-test-datatypes : runs the Datatypes tests in the server
+        - server-test-datetime : runs the Datetime tests in the server
 
         It requires some configuration of the build.properties and test.properties to run.
     -->
@@ -649,12 +651,14 @@
     </target>
 
     <target name="generate-report">
+        <copy todir="${env.JAVA_HOME}/jre/lib" file="${eclipselink.jpa.test}/resource/${server.name}/jaxp.properties" failonerror="false"/>
         <junitreport todir="${eclipselink.jpa.test}/${report.dir}">
             <fileset dir="${eclipselink.jpa.test}/${report.dir}">
                 <include name="*test-results.xml"/>
             </fileset>
             <report format="noframes" todir="${eclipselink.jpa.test}/${report.dir}"/>
         </junitreport>
+        <delete file="${env.JAVA_HOME}/jre/lib/jaxp.properties" failonerror="false"/>
     </target>
 
     <!-- Runs the test using the PromptTestRunner -->
@@ -846,7 +850,7 @@
             includes="org/eclipse/persistence/testing/framework/junit/**">
             <classpath refid="compile.path"/>
         </javac>
-        <copy file="${eclipselink.jpa.test}/resource/${MODEL_NAME}/server/application-client.xml" todir="stage/META-INF"/>
+        <copy file="${eclipselink.jpa.test}/resource/server/application-client.xml" todir="stage/META-INF"/>
         <filter token="server.user" value="${server.user}"/>
         <filter token="server.pwd" value="${server.pwd}"/>
         <filter token="server.factory" value="${server.factory}"/>
@@ -872,7 +876,13 @@
             srcdir="${eclipselink.jpa.test}/${src.dir}"
             destdir="${eclipselink.jpa.test}/stage"
             debug="${javac.debug}"
-            includes="org/eclipse/persistence/testing/framework/**">
+            includes="org/eclipse/persistence/testing/framework/**,
+                org/eclipse/persistence/testing/framework/AutoVerifyTestCase.java,
+                org/eclipse/persistence/testing/framework/TestCase.java,
+                org/eclipse/persistence/testing/framework/TestEntity.java,
+                org/eclipse/persistence/testing/framework/TestModel.java,
+                org/eclipse/persistence/testing/framework/*TestHelper.java,
+                org/eclipse/persistence/testing/framework/TestCollection.java">
             <classpath refid="compile.path"/>
         </javac>
         <javac
@@ -898,7 +908,7 @@
         </javac>
         <!-- Copy and replace platform in persistence.xml. -->
         <!-- JBoss has its own persistence.xml -->
-        <condition property="SERVER_NAME" value="server/${server.name}">
+        <condition property="SERVER_NAME" value="${server.name}">
             <contains string="${server.name}" substring="jboss"/>
         </condition>
 
@@ -909,19 +919,21 @@
         </condition>
 
         <copy todir="${eclipselink.jpa.test}/stage/META-INF">
-            <fileset dir="${eclipselink.jpa.test}/resource/${MODEL_NAME}/${SERVER_NAME}">
+            <fileset dir="${eclipselink.jpa.test}/resource/${SERVER_NAME}">
                 <include name="persistence.xml"/>
             </fileset>
         </copy>
-        <chmod file="${eclipselink.jpa.test}/stage/META-INF/*.xml" perm="ugo+w"/>
-        <replace dir="${eclipselink.jpa.test}/stage/META-INF" token='%%server-platform%%' value="${server.platform}">
-            <include name="*.xml"/>
-        </replace>
         <copy todir="${eclipselink.jpa.test}/stage/META-INF">
-            <fileset dir="${eclipselink.jpa.test}/resource/${MODEL_NAME}/server/">
+            <fileset dir="${eclipselink.jpa.test}/resource/server/">
                 <include name="ejb-jar.xml"/>
             </fileset>
         </copy>
+        <replace dir="${eclipselink.jpa.test}/stage/META-INF" token='%%server-platform%%' value="${server.platform}">
+            <include name="*.xml"/>
+        </replace>
+        <replace dir="${eclipselink.jpa.test}/stage/META-INF" token='%%default%%' value="${PERSISTENCE_UNIT_NAME}">
+            <include name="*.xml"/>
+        </replace>
         <!-- Create ejb jar. -->
         <jar destfile="${eclipselink.jpa.test}/${build.dir}/${MODEL_NAME}_ejb.jar" basedir="stage"/>
         <antcall target="create-ejb-stubs" inheritRefs="true"/>
@@ -936,7 +948,10 @@
 
     <!-- Build server test ear. -->
     <target name="server-build-ear">
-        <copy overwrite="true" file="./resource/${MODEL_NAME}/server/application.xml" todir="${build.dir}/META-INF"/>
+        <copy overwrite="true" file="./resource/server/application.xml" todir="${build.dir}/META-INF"/>
+        <replace dir="${build.dir}/META-INF" token='%%modelname%%' value="${MODEL_NAME}">
+            <include name="*.xml"/>
+        </replace>
         <ear destfile="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" appxml="${build.dir}/META-INF/application.xml">
             <fileset dir="${eclipselink.jpa.test}/${build.dir}" includes ="${MODEL_NAME}_ejb.jar"/>
         </ear>
@@ -980,18 +995,8 @@
             <sysproperty key="server.run" value="TRUE"/>
             <classpath refid="run.path"/>
             <formatter type="xml"/>
-            <test name="${TEST_SUITE}" haltonfailure="no" outfile="${report.dir}/test-results"/>
+            <test name="${TEST_SUITE}" haltonfailure="no" outfile="${report.dir}/${TEST_SUITE}-test-results"/>
         </junit>
-        <copy todir="${env.JAVA_HOME}/jre/lib" file="${eclipselink.jpa.test}/resource/${server.name}/jaxp.properties" failonerror="false"/>
-        <junitreport todir="${eclipselink.jpa.test}/${report.dir}">
-            <fileset dir="${eclipselink.jpa.test}/${report.dir}">
-                <include name="test-results.xml"/>
-            </fileset>
-            <report format="noframes" todir="${eclipselink.jpa.test}/${report.dir}"/>
-        </junitreport>
-        <delete file="${env.JAVA_HOME}/jre/lib/jaxp.properties" failonerror="false"/>
-        <!-- fail is not used as undeploy must be called. -->
-        <!--fail message="Some of the junit tests failed.  See the ${report.dir}/junit-noframes.html file for details." if="junit.failed"/-->
     </target>
 
     <!-- Server Tests -->
@@ -1004,11 +1009,15 @@
     <!-- Run all the JPA tests in the server -->
     <target name="server-test-lrg">
         <antcall target="server-test-sessionbean" inheritRefs="true"/>
-        <antcall target="server-test-fieldaccess.advanced" inheritRefs="true"/>
+        <antcall target="server-test-fieldaccess-advanced" inheritRefs="true"/>
+        <antcall target="server-test-datatypes" inheritRefs="true"/>
+        <antcall target="server-test-datetime" inheritRefs="true"/>
+        <antcall target="generate-report" inheritRefs="true"/>
     </target>
 
     <target name="server-test-sessionbean">
         <antcall target="server-run-all" inheritRefs="true">
+            <param name="PERSISTENCE_UNIT_NAME" value="fieldaccess"/>
             <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/sessionbean"/>
             <param name="MODEL_DIR2" value="org/eclipse/persistence/testing/models/jpa/fieldaccess/advanced"/>
             <param name="MODEL_NAME" value="eclipselink-sessionbean-model"/>
@@ -1021,6 +1030,7 @@
 
     <target name="server-test-fieldaccess-advanced">
         <antcall target="server-run-all" inheritRefs="true">
+            <param name="PERSISTENCE_UNIT_NAME" value="sessionbean"/>
             <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/fieldaccess/advanced"/>
             <param name="MODEL_NAME" value="eclipselink-advanced-field-access-model"/>
             <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/fieldaccess/advanced"/>
@@ -1033,6 +1043,7 @@
     <!-- Not working yet. -->
     <!--target name="server-test-advanced">
         <antcall target="server-run-all" inheritRefs="true">
+            <param name="PERSISTENCE_UNIT_NAME" value="default"/>
             <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/advanced"/>
             <param name="MODEL_NAME" value="eclipselink-annotation-model"/>
             <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/advanced"/>
@@ -1041,4 +1052,29 @@
             <param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.advanced.AdvancedTestSuite"/>
         </antcall>
     </target-->
+
+    <target name="server-test-datatypes">
+        <antcall target="server-run-all" inheritRefs="true">
+            <param name="PERSISTENCE_UNIT_NAME" value="default"/>
+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/datatypes"/>
+            <param name="MODEL_NAME" value="eclipselink-datatypes-model"/>
+            <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/datatypes"/>
+            <param name="TEST_NAME" value="eclipselink-datatypes-model"/>
+            <param name="EAR_NAME" value="eclipselink-datatypes-model"/>
+            <param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.datatypes.NullBindingJUnitTestCase"/>
+        </antcall>
+    </target>
+
+    <target name="server-test-datetime">
+        <antcall target="server-run-all" inheritRefs="true">
+            <param name="PERSISTENCE_UNIT_NAME" value="default"/>
+            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/datetime"/>
+            <param name="MODEL_NAME" value="eclipselink-datetime-model"/>
+            <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/datetime"/>
+            <param name="TEST_NAME" value="eclipselink-datetime-model"/>
+            <param name="EAR_NAME" value="eclipselink-datetime-model"/>
+            <param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.datetime.NullBindingJUnitTestCase"/>
+        </antcall>
+    </target>
+
 </project>
Index: jpa/eclipselink.jpa.test/resource/jboss/persistence.xml
===================================================================
--- jpa/eclipselink.jpa.test/resource/jboss/persistence.xml	(revision 0)
+++ jpa/eclipselink.jpa.test/resource/jboss/persistence.xml	(revision 0)
@@ -0,0 +1,9 @@
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0">
+    <persistence-unit name="%%default%%">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <jta-data-source>java:/EclipseLinkDS</jta-data-source>
+        <properties>
+            <property name="eclipselink.target-server" value="%%server-platform%%"/>
+        </properties>
+    </persistence-unit>
+</persistence>
Index: jpa/eclipselink.jpa.test/resource/server/application-client.xml
===================================================================
--- jpa/eclipselink.jpa.test/resource/server/application-client.xml	(revision 0)
+++ jpa/eclipselink.jpa.test/resource/server/application-client.xml	(revision 0)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE application-client PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.2//EN" "http://java.sun.com/j2ee/dtds/application-client_1_2.dtd">
+
+<application-client>
+    <display-name>servertest</display-name>
+    <ejb-ref>
+        <ejb-ref-name>ejb/TestRunner</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <remote>org.eclipse.persistence.testing.framework.server.TestRunner</remote>
+    </ejb-ref>
+</application-client>
Index: jpa/eclipselink.jpa.test/resource/server/application.xml
===================================================================
--- jpa/eclipselink.jpa.test/resource/server/application.xml	(revision 0)
+++ jpa/eclipselink.jpa.test/resource/server/application.xml	(revision 0)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
+<application>
+    <display-name>servertest</display-name>
+    <description>servertest</description>
+    <module>
+        <ejb>%%modelname%%_ejb.jar</ejb>
+    </module>
+</application>
Index: jpa/eclipselink.jpa.test/resource/server/ejb-jar.xml
===================================================================
--- jpa/eclipselink.jpa.test/resource/server/ejb-jar.xml	(revision 0)
+++ jpa/eclipselink.jpa.test/resource/server/ejb-jar.xml	(revision 0)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+          http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
+          version="3.0">
+    <enterprise-beans>
+        <session>
+            <ejb-name>TestRunner</ejb-name>
+            <persistence-context-ref>
+                <persistence-context-ref-name>persistence/entity-manager</persistence-context-ref-name>
+                <persistence-unit-name>%%default%%</persistence-unit-name>
+            </persistence-context-ref>
+            <persistence-unit-ref>
+                <persistence-unit-ref-name>persistence/factory</persistence-unit-ref-name>
+                <persistence-unit-name>%%default%%</persistence-unit-name>
+            </persistence-unit-ref>
+        </session>
+    </enterprise-beans>
+</ejb-jar>
\ No newline at end of file
Index: jpa/eclipselink.jpa.test/resource/server/persistence.xml
===================================================================
--- jpa/eclipselink.jpa.test/resource/server/persistence.xml	(revision 0)
+++ jpa/eclipselink.jpa.test/resource/server/persistence.xml	(revision 0)
@@ -0,0 +1,9 @@
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0">
+    <persistence-unit name="%%default%%">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <jta-data-source>jdbc/EclipseLinkDS</jta-data-source>
+        <properties>
+            <property name="eclipselink.target-server" value="%%server-platform%%"/>
+        </properties>
+    </persistence-unit>
+</persistence>
Index: jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/datatypes/NullBindingJUnitTestCase.java
===================================================================
--- jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/datatypes/NullBindingJUnitTestCase.java	(revision 2011)
+++ jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/datatypes/NullBindingJUnitTestCase.java	(working copy)
@@ -56,6 +56,7 @@
 
     public static Test suite() {
         TestSuite suite = new TestSuite("Null Binding DataTypes");
+        suite.addTest(new NullBindingJUnitTestCase("testSetup"));
         suite.addTest(new NullBindingJUnitTestCase("testCreateWrapperTypes"));
         suite.addTest(new NullBindingJUnitTestCase("testNullifyBigDecimal"));
         suite.addTest(new NullBindingJUnitTestCase("testNullifyBigInteger"));
@@ -73,18 +74,16 @@
         suite.addTest(new NullBindingJUnitTestCase("testCreateCharacterArrayType"));
         suite.addTest(new NullBindingJUnitTestCase("testCreateCharArrayType"));
 
-        return new TestSetup(suite) {
-
-            protected void setUp(){
-                DatabaseSession session = JUnitTestCase.getServerSession();
-                new DataTypesTableCreator().replaceTables(session);
-            }
-
-            protected void tearDown() {
-                clearCache();
-            }
-        };
+        return suite;
     }
+    
+    /**
+     * The setup is done as a test, both to record its failure, and to allow execution in the server.
+     */
+    public void testSetup() {
+        new DataTypesTableCreator().replaceTables(JUnitTestCase.getServerSession());
+        clearCache();
+    }
 
     /**
      * Creates the WrapperTypes instance used in later tests.
Index: jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/datetime/NullBindingJUnitTestCase.java
===================================================================
--- jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/datetime/NullBindingJUnitTestCase.java	(revision 2011)
+++ jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/datetime/NullBindingJUnitTestCase.java	(working copy)
@@ -51,6 +51,7 @@
 
     public static Test suite() {
         TestSuite suite = new TestSuite("Null Binding DateTime");
+        suite.addTest(new NullBindingJUnitTestCase("testSetup"));
         suite.addTest(new NullBindingJUnitTestCase("testCreateDateTime"));
         suite.addTest(new NullBindingJUnitTestCase("testNullifySqlDate"));
         suite.addTest(new NullBindingJUnitTestCase("testNullifyTime"));
@@ -58,18 +59,16 @@
         suite.addTest(new NullBindingJUnitTestCase("testNullifyUtilDate"));
         suite.addTest(new NullBindingJUnitTestCase("testNullifyCalendar"));
 
-        return new TestSetup(suite) {
-
-            protected void setUp(){
-                DatabaseSession session = JUnitTestCase.getServerSession();
-                new DateTimeTableCreator().replaceTables(session);
-            }
-
-            protected void tearDown() {
-                clearCache();
-            }
-        };
+        return suite;
     }
+    
+    /**
+     * The setup is done as a test, both to record its failure, and to allow execution in the server.
+     */
+    public void testSetup() {
+        new DateTimeTableCreator().replaceTables(JUnitTestCase.getServerSession());
+        clearCache();
+    }
 
     /**
      * Creates the DateTime instance used in later tests.