Index: foundation/eclipselink.core.test/build.xml =================================================================== --- foundation/eclipselink.core.test/build.xml (revision 6885) +++ foundation/eclipselink.core.test/build.xml (working copy) @@ -15,6 +15,7 @@ + @@ -54,7 +55,7 @@ - + @@ -130,9 +131,10 @@ - Running test with ${eclipselink.core.test}/${test.properties} on ${db.url} + Running test with ${test.properties} on ${db.url} + - + @@ -148,7 +150,7 @@ - + \ No newline at end of file Index: foundation/eclipselink.core.test/LRGTestModel.launch =================================================================== --- foundation/eclipselink.core.test/LRGTestModel.launch (revision 0) +++ foundation/eclipselink.core.test/LRGTestModel.launch (revision 0) @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: foundation/eclipselink.core.test/run/SRGTestModel.launch =================================================================== --- foundation/eclipselink.core.test/run/SRGTestModel.launch (revision 6885) +++ foundation/eclipselink.core.test/run/SRGTestModel.launch (working copy) @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: foundation/eclipselink.core.test/run/Testing Browser.launch =================================================================== --- foundation/eclipselink.core.test/run/Testing Browser.launch (revision 6885) +++ foundation/eclipselink.core.test/run/Testing Browser.launch (working copy) @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: foundation/eclipselink.core.test/run/LRGTestModel.launch =================================================================== --- foundation/eclipselink.core.test/run/LRGTestModel.launch (revision 6885) +++ foundation/eclipselink.core.test/run/LRGTestModel.launch (working copy) @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: foundation/eclipselink.core.test/run/LRGTestModel.launch =================================================================== --- foundation/eclipselink.core.test/run/LRGTestModel.launch (revision 6885) +++ foundation/eclipselink.core.test/run/LRGTestModel.launch (working copy) @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: foundation/eclipselink.core.test/run/SRGTestModel.launch =================================================================== --- foundation/eclipselink.core.test/run/SRGTestModel.launch (revision 6885) +++ foundation/eclipselink.core.test/run/SRGTestModel.launch (working copy) @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: foundation/eclipselink.core.test/run/Testing Browser.launch =================================================================== --- foundation/eclipselink.core.test/run/Testing Browser.launch (revision 6885) +++ foundation/eclipselink.core.test/run/Testing Browser.launch (working copy) @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: foundation/eclipselink.core.test/SRGTestModel.launch =================================================================== --- foundation/eclipselink.core.test/SRGTestModel.launch (revision 0) +++ foundation/eclipselink.core.test/SRGTestModel.launch (revision 0) @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: foundation/eclipselink.core.test/test.properties =================================================================== --- foundation/eclipselink.core.test/test.properties (revision 6885) +++ foundation/eclipselink.core.test/test.properties (working copy) @@ -17,16 +17,16 @@ # jdbc.driver.jar=../../../extension.oracle.lib.external/ojdbc5_11.jar # db.driver=oracle.jdbc.OracleDriver -# db.url=jdbc:oracle:thin:@localhost:1521:toplink +# db.url=jdbc:oracle:thin:@tlsvrdb5.ca.oracle.com:1521:toplink # db.user=user # db.pwd=password # db.platform=org.eclipse.persistence.platform.database.oracle.OraclePlatform jdbc.driver.jar=../../../extension.oracle.lib.external/ojdbc5_11.jar db.driver=oracle.jdbc.OracleDriver -db.url=jdbc:oracle:thin:@localhost:1521:toplink -db.user=your_user_id -db.pwd=your_password +db.url=jdbc:oracle:thin:@localhost:1521:orcl +db.user=scott +db.pwd=tiger db.platform=org.eclipse.persistence.platform.database.oracle.OraclePlatform # Logging option for debugging Index: foundation/eclipselink.core.test/Testing Browser.launch =================================================================== --- foundation/eclipselink.core.test/Testing Browser.launch (revision 0) +++ foundation/eclipselink.core.test/Testing Browser.launch (revision 0) @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: foundation/eclipselink.extension.oracle.test/run/Testing Browser (Oracle).launch =================================================================== --- foundation/eclipselink.extension.oracle.test/run/Testing Browser (Oracle).launch (revision 6885) +++ foundation/eclipselink.extension.oracle.test/run/Testing Browser (Oracle).launch (working copy) @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: foundation/eclipselink.extension.oracle.test/run/Testing Browser (Oracle).launch =================================================================== --- foundation/eclipselink.extension.oracle.test/run/Testing Browser (Oracle).launch (revision 6885) +++ foundation/eclipselink.extension.oracle.test/run/Testing Browser (Oracle).launch (working copy) @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: foundation/eclipselink.extension.oracle.test/Testing Browser (Oracle).launch =================================================================== --- foundation/eclipselink.extension.oracle.test/Testing Browser (Oracle).launch (revision 0) +++ foundation/eclipselink.extension.oracle.test/Testing Browser (Oracle).launch (revision 0) @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: jpa/eclipselink.jpa.test/build.xml =================================================================== --- jpa/eclipselink.jpa.test/build.xml (revision 6885) +++ jpa/eclipselink.jpa.test/build.xml (working copy) @@ -3,15 +3,24 @@ - compile : compiles all JPA tests - package : jars JPA persistent units and tests jars - test : runs JPA LRG (FullRegressionTestSuite) + - test.lrg : runs JPA LRG (FullRegressionTestSuite) - test.no-weave : runs JPA LRG using no weaving (no agent) - test.static-weave : runs JPA LRG using static weaving + - server.start : starts the JEE server + - server.stop : stops the JEE server + - 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 + It requires some configuration of the build.properties and test.properties to run. --> + @@ -20,34 +29,33 @@ - - - - - - - - - - - + + + + + - + + + + + + + + - + - + - - + + @@ -56,6 +64,7 @@ + @@ -66,7 +75,7 @@ - + - + + + + + + @@ -249,7 +263,7 @@ - + @@ -267,10 +281,10 @@ - - Running test with ${eclipselink.jpa.test}/${test.properties} on ${db.url} + + Running test with ${test.properties} on ${db.url} - + @@ -289,7 +303,7 @@ - + @@ -352,4 +366,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Running test ${EAR_NAME} on ${server.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: jpa/eclipselink.jpa.test/FullRegressionTestSuite.launch =================================================================== --- jpa/eclipselink.jpa.test/FullRegressionTestSuite.launch (revision 0) +++ jpa/eclipselink.jpa.test/FullRegressionTestSuite.launch (revision 0) @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: jpa/eclipselink.jpa.test/oc4j.properties =================================================================== --- jpa/eclipselink.jpa.test/oc4j.properties (revision 0) +++ jpa/eclipselink.jpa.test/oc4j.properties (revision 0) @@ -0,0 +1,18 @@ +# OC4J Server Testing Environment Properties. + +# Standard server properties. +server.user=fmwadmin +server.pwd=welcome1 +server.url=ormi://localhost:23791/ +server.lib=../../../oc4j/j2ee/home +server.depend=oc4jclient.jar,oc4j.jar +server.platform=OC4J + +# OC4J specific properties. +oc4j.home=../../../oc4j +oc4j.rmiport=23791 +oc4j.jmsport=9127 +oc4j.httpport=8888 +oc4j.iiopport=5555 +oc4j.sslport=23943 +oc4j.httphost=localhost Index: jpa/eclipselink.jpa.test/oc4j.xml =================================================================== --- jpa/eclipselink.jpa.test/oc4j.xml (revision 0) +++ jpa/eclipselink.jpa.test/oc4j.xml (revision 0) @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: jpa/eclipselink.jpa.test/resource/eclipselink-advanced-field-access-model/server/application.xml =================================================================== --- jpa/eclipselink.jpa.test/resource/eclipselink-advanced-field-access-model/server/application.xml (revision 6885) +++ jpa/eclipselink.jpa.test/resource/eclipselink-advanced-field-access-model/server/application.xml (working copy) @@ -4,9 +4,9 @@ field-access field-access - jpaadvancedfieldaccess_ejb.jar + eclipselink-advanced-field-access-model_ejb.jar - jpaadvancedfieldaccess_client.jar + eclipselink-advanced-field-access-model_client.jar Index: jpa/eclipselink.jpa.test/resource/eclipselink-advanced-field-access-model/server/persistence.xml =================================================================== --- jpa/eclipselink.jpa.test/resource/eclipselink-advanced-field-access-model/server/persistence.xml (revision 6885) +++ jpa/eclipselink.jpa.test/resource/eclipselink-advanced-field-access-model/server/persistence.xml (working copy) @@ -1,9 +1,9 @@ - jdbc/OracleDS + org.eclipse.persistence.jpa.PersistenceProvider + jdbc/EclipseLinkDS - - + Index: jpa/eclipselink.jpa.test/resource/eclipselink-sessionbean-model/server/application.xml =================================================================== --- jpa/eclipselink.jpa.test/resource/eclipselink-sessionbean-model/server/application.xml (revision 6885) +++ jpa/eclipselink.jpa.test/resource/eclipselink-sessionbean-model/server/application.xml (working copy) @@ -4,9 +4,9 @@ session-bean session-bean - jpasessionbean_ejb.jar + eclipselink-sessionbean-model_ejb.jar - jpasessionbean_client.jar + eclipselink-sessionbean-model_client.jar Index: jpa/eclipselink.jpa.test/resource/eclipselink-sessionbean-model/server/persistence.xml =================================================================== --- jpa/eclipselink.jpa.test/resource/eclipselink-sessionbean-model/server/persistence.xml (revision 6885) +++ jpa/eclipselink.jpa.test/resource/eclipselink-sessionbean-model/server/persistence.xml (working copy) @@ -1,9 +1,9 @@ - jdbc/OracleDS + org.eclipse.persistence.jpa.PersistenceProvider + jdbc/EclipseLinkDS - - + Index: jpa/eclipselink.jpa.test/run/Testing Browser (JPA).launch =================================================================== --- jpa/eclipselink.jpa.test/run/Testing Browser (JPA).launch (revision 6885) +++ jpa/eclipselink.jpa.test/run/Testing Browser (JPA).launch (working copy) @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: jpa/eclipselink.jpa.test/run/FullRegressionTestSuite.launch =================================================================== --- jpa/eclipselink.jpa.test/run/FullRegressionTestSuite.launch (revision 6885) +++ jpa/eclipselink.jpa.test/run/FullRegressionTestSuite.launch (working copy) @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: jpa/eclipselink.jpa.test/run/FullRegressionTestSuite.launch =================================================================== --- jpa/eclipselink.jpa.test/run/FullRegressionTestSuite.launch (revision 6885) +++ jpa/eclipselink.jpa.test/run/FullRegressionTestSuite.launch (working copy) @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: jpa/eclipselink.jpa.test/run/Testing Browser (JPA).launch =================================================================== --- jpa/eclipselink.jpa.test/run/Testing Browser (JPA).launch (revision 6885) +++ jpa/eclipselink.jpa.test/run/Testing Browser (JPA).launch (working copy) @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/framework/junit/JUnitTestCase.java =================================================================== --- jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/framework/junit/JUnitTestCase.java (revision 6885) +++ jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/framework/junit/JUnitTestCase.java (working copy) @@ -47,7 +47,7 @@ * login.driverClass * * If you are using the TestingBrowser, these properties come from the login panel instead. - * If you are running the test in JEE the properties comr from the server config. + * If you are running the test in JEE the properties come from the server config. * This class should be used for all EntityManager operations to allow tests to be run in the server. */ public abstract class JUnitTestCase extends TestCase { @@ -69,7 +69,7 @@ public Boolean shouldRunTestOnServer; /** System variable to set the tests to run on the server. */ - public static final String RUN_ON_SERVER = "run-on-server"; + public static final String RUN_ON_SERVER = "server.run"; static { emfNamedPersistenceUnits = new Hashtable(); @@ -151,7 +151,7 @@ getServerSession(persistenceUnitName).getIdentityMapAccessor().initializeAllIdentityMaps(); } catch (Exception ex) { throw new RuntimeException("An exception occurred trying clear the cache.", ex); - } + } } /** @@ -342,9 +342,9 @@ public void runBareClient() throws Throwable { Properties properties = new Properties(); // TODO: make url platform independent. - String url = System.getProperty("oc4j-url"); + String url = System.getProperty("server.url"); if (url == null) { - fail("System property 'oc4j-url' must be set."); + fail("System property 'server.url' must be set."); } properties.put("java.naming.provider.url", url); Context context = new InitialContext(properties); Index: jpa/eclipselink.jpa.test/test.properties =================================================================== --- jpa/eclipselink.jpa.test/test.properties (revision 6885) +++ jpa/eclipselink.jpa.test/test.properties (working copy) @@ -19,8 +19,8 @@ # jdbc.driver.jar=../../../extension.lib.external/mysql-connector-java-5.0.7-bin.jar # db.driver=com.mysql.jdbc.Driver -# db.url=jdbc:mysql://tlsvrdb4.ca.oracle.com/COREDEV1 -# db.user=user +# db.url=jdbc:mysql://tlsvrdb4.ca.oracle.com/USER +# db.user=USER # db.pwd=password # jdbc.driver.jar=../../../extension.oracle.lib.external/ojdbc5_11.jar @@ -45,3 +45,6 @@ # These are relative to the run directory. test.properties.run=../test.properties eclipselink.jar.run=../../../eclipselink.jar + +# Server properties +server.name=oc4j Index: jpa/eclipselink.jpa.test/Testing Browser (JPA).launch =================================================================== --- jpa/eclipselink.jpa.test/Testing Browser (JPA).launch (revision 0) +++ jpa/eclipselink.jpa.test/Testing Browser (JPA).launch (revision 0) @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +