You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2009/05/21 16:39:43 UTC

svn commit: r777135 [2/10] - in /openjpa/trunk: openjpa-kernel/src/test/java/org/apache/openjpa/meta/ openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/ openjpa-lib/src/test/java/org/apache/openjpa/lib/graph/ openjpa-lib/src/test/java/org/apache/op...

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java Thu May 21 14:39:31 2009
@@ -59,9 +59,12 @@
     private Properties _system;
 
     private static final String OLD_STYLE_URL_KEY    = "openjpa.ConnectionURL";
-    private static final String OLD_STYLE_DRIVER_KEY = "openjpa.ConnectionDriverName";
-    private static final String NEW_STYLE_DRIVER_KEY = "javax.persistence.jdbc.driver";
-    private static final String NEW_STYLE_URL_KEY    = "javax.persistence.jdbc.url";
+    private static final String OLD_STYLE_DRIVER_KEY =
+        "openjpa.ConnectionDriverName";
+    private static final String NEW_STYLE_DRIVER_KEY =
+        "javax.persistence.jdbc.driver";
+    private static final String NEW_STYLE_URL_KEY    =
+        "javax.persistence.jdbc.url";
 
     private static final String[] KEYS = { 
         OLD_STYLE_DRIVER_KEY, OLD_STYLE_URL_KEY, 
@@ -70,17 +73,21 @@
     // NOTE: Non-standard naming because another test in the harness scans all 
     // META-INF/persistence.xml and fails as this file contains conflicting
     // property keys for testing.
-    private static final String PERSISTENCE_UNIT = "org/apache/openjpa/lib/conf/META-INF/persistence-config.xml";
+    private static final String PERSISTENCE_UNIT =
+        "org/apache/openjpa/lib/conf/META-INF/persistence-config.xml";
     
     private static final String OLD_STYLE_UNIT_NAME = "old-style";
     private static final String NEW_STYLE_UNIT_NAME = "new-style";
     private static final String MIXED_STYLE_UNIT_NAME = "mixed-style";
     private static final String CONFLICT_STYLE_UNIT_NAME = "conflict-style";
 
-    private static final String SYSTEM_CONFIGURED_UNIT_NAME  = "system-configured";
-    private static final String RUNTIME_CONFIGURED_UNIT_NAME = "runtime-configured";
+    private static final String SYSTEM_CONFIGURED_UNIT_NAME  =
+        "system-configured";
+    private static final String RUNTIME_CONFIGURED_UNIT_NAME =
+        "runtime-configured";
     
-    private static final String URL    = "jdbc:derby:target/database/openjpa-test-database;create=true";
+    private static final String URL    =
+        "jdbc:derby:target/database/openjpa-test-database;create=true";
     private static final String DRIVER = "org.apache.derby.jdbc.EmbeddedDriver";
 
     /**
@@ -104,7 +111,7 @@
      * Tests that openjpa.* namespace can be used for persistence.xml.
      */
     public void testOldStylePersistenceUnitConfiguration() {
-        emf = OpenJPAPersistence.createEntityManagerFactory(OLD_STYLE_UNIT_NAME, 
+        emf = OpenJPAPersistence.createEntityManagerFactory(OLD_STYLE_UNIT_NAME,
             PERSISTENCE_UNIT);
 
         assertNotNull(emf);
@@ -335,7 +342,8 @@
     }
 
     void verifyDatabaseConnection() {
-        String driver = OpenJPAPersistence.cast(emf).getConfiguration().getConnectionDriverName();
+        String driver = OpenJPAPersistence.cast(emf).getConfiguration()
+                .getConnectionDriverName();
         
         EntityManager em = emf.createEntityManager();
         em.getTransaction().begin();

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLAbstractMappedSuperProperty.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLAbstractMappedSuperProperty.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLAbstractMappedSuperProperty.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLAbstractMappedSuperProperty.java Thu May 21 14:39:31 2009
@@ -48,7 +48,8 @@
     
     public boolean equals(Object obj) {
         if (obj instanceof XMLAbstractMappedSuperProperty) {
-            XMLAbstractMappedSuperProperty ps = (XMLAbstractMappedSuperProperty)obj;
+            XMLAbstractMappedSuperProperty ps =
+                (XMLAbstractMappedSuperProperty)obj;
             return getId() == ps.getId() &&
                    getName().equals(ps.getName());
         }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java Thu May 21 14:39:31 2009
@@ -24,7 +24,8 @@
 import java.util.List;
 import javax.persistence.*;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import org.apache.openjpa.persistence.common.utils.*;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
@@ -40,7 +41,7 @@
 		deleteAll(Schedule.class);
 		deleteAll(FlightSchedule.class);
 
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
 		for(int i = 0; i<5; i++)
@@ -50,7 +51,8 @@
 			Date edate = new Date(10031980l);
 			String name = "AmericaWest"+i;
 			String schedname = "Schedule"+i;
-			FlightSchedule sched = new FlightSchedule(schedname, cal, date, edate, name);
+            FlightSchedule sched = new FlightSchedule(schedname, cal, date,
+                    edate, name);
 
 			em.persist(sched);
 
@@ -63,9 +65,10 @@
 
 	public void testTimeTemporalAnnot()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 
-		String query = "SELECT d.startDate FROM FlightSchedule d WHERE d.name = :name";
+        String query = "SELECT d.startDate FROM FlightSchedule d "
+            + "WHERE d.name = :name";
 
 		Date obj = (Date) em.createQuery(query)
 		              .setParameter("name", "Schedule3")
@@ -79,14 +82,15 @@
 
 	public void testCalendarTemporalAnnot()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		String query = "SELECT d FROM FlightSchedule d";
 
 		List list = em.createQuery(query).getResultList();
 		assertNotNull(list);
 		assertEquals(5, list.size());
 		/*
-		String query = "SELECT d.dob FROM FlightSchedule d WHERE d.name = :name";
+        String query = "SELECT d.dob FROM FlightSchedule d "
+            + "WHERE d.name = :name";
 
 		List list = em.createQuery(query)
 		              .setParameter("name", "Schedule3")
@@ -100,10 +104,11 @@
 
 	public void testUniqueConstraintAnnot()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
-		String query = "Update FlightSchedule f SET f.planeName = :plane WHERE f.name = :sname";
+        String query = "Update FlightSchedule f SET f.planeName = :plane "
+            + "WHERE f.name = :sname";
 		int upd = 0;
 
 		try
@@ -113,11 +118,12 @@
             .setParameter("sname", "Schedule2")
             .executeUpdate();
 
-			fail("Violated unique constraint rule...@Unique Constraint annotation needs to be supported");
+            fail("Violated unique constraint rule...@Unique Constraint"
+                    + " annotation needs to be supported");
 		}
 		catch(Exception e)
 		{
-			//suppose to throw exception based on the unique constraint rule
+            //suppose to throw exception based on the unique constraint rule
 		}
 
 		assertNotNull(upd);

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java Thu May 21 14:39:31 2009
@@ -28,7 +28,8 @@
 
 import org.apache.openjpa.persistence.common.utils.*;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 
 public class TestAnnotationBasics extends AnnotationTestCase {
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java Thu May 21 14:39:31 2009
@@ -44,7 +44,7 @@
 
 	public void testDDPrpPop()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
 		LifeCycleDDEntity lcd = new LifeCycleDDEntity("afam", "okeke");
@@ -63,7 +63,7 @@
 
 	public void testDDPrrPor()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
 		LifeCycleDDEntity lcd = new LifeCycleDDEntity("john", "rash");
@@ -90,7 +90,7 @@
 
 	public void testDDPouPru()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
 		LifeCycleDDEntity lcd = new LifeCycleDDEntity("Don", "Shiddle");
@@ -100,7 +100,8 @@
 
 		CallbackStorage.clearStore();
 
-		String query = "Update LifeCycleDDEntity e SET e.name = 'Joseph' WHERE e.id = :id";
+        String query = "Update LifeCycleDDEntity e SET e.name = 'Joseph' "
+            + "WHERE e.id = :id";
 
 		int result = em.createQuery(query)
 		               .setParameter("id", id)
@@ -121,7 +122,7 @@
 
 	public void testDDPol()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
 		LifeCycleDDEntity lcd = new LifeCycleDDEntity("Julie", "Jolie");
@@ -143,9 +144,11 @@
 
 		assertNotNull(lcd);
 		assertNotNull(CallbackStorage.getInstance().getClist());
-		assertEquals(2, CallbackStorage.getInstance().getClist().size());
-		assertEquals("def-postload", CallbackStorage.getInstance().getClist().get(0));
-		assertEquals("def-postload", CallbackStorage.getInstance().getClist().get(1));
+        assertEquals(2, CallbackStorage.getInstance().getClist().size());
+        assertEquals("def-postload",
+                CallbackStorage.getInstance().getClist().get(0));
+        assertEquals("def-postload",
+                CallbackStorage.getInstance().getClist().get(1));
 
 		endTx(em);
 		endEm(em);
@@ -156,10 +159,10 @@
 
 	public void testDefaultPrePostPersistListener()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
-		LifeCycleDDEntity2 lc = new LifeCycleDDEntity2("Bill", "Clinton");
+        LifeCycleDDEntity2 lc = new LifeCycleDDEntity2("Bill", "Clinton");
 
 		CallbackStorage store = CallbackStorage.getInstance();
 		store.clearStore();
@@ -179,10 +182,10 @@
     //FIX-ME Default-Entity-listener Impl. is over firing
 	public void testDefaultPrePostUpdateListener()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
-		LifeCycleDDEntity2 emp = new LifeCycleDDEntity2("lincoln", "Abraham");
+        LifeCycleDDEntity2 emp = new LifeCycleDDEntity2("lincoln", "Abraham");
 
 		em.persist(emp);
 
@@ -190,7 +193,8 @@
 
 		CallbackStorage.clearStore();
 
-		String query = "Update LifeCycleDDEntity2 e SET e.name = 'Joseph' WHERE e.id = :id";
+        String query = "Update LifeCycleDDEntity2 e SET e.name = 'Joseph' "
+                + "WHERE e.id = :id";
 
 		int result = em.createQuery(query)
 		               .setParameter("id", id)
@@ -214,10 +218,10 @@
 	//FIX-ME Default-Entity-listener Impl. is over firing
 	public void testDefaultPostLoadListener()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
-		LifeCycleDDEntity2 emp = new LifeCycleDDEntity2("Thomas", "Jefferson");
+        LifeCycleDDEntity2 emp = new LifeCycleDDEntity2("Thomas", "Jefferson");
 
 		em.persist(emp);
 		int id = emp.getId();
@@ -235,9 +239,11 @@
 
 		assertNotNull(emp);
 		assertNotNull(CallbackStorage.getInstance().getClist());
-		assertEquals(2, CallbackStorage.getInstance().getClist().size());
-		assertEquals("def-postload", CallbackStorage.getInstance().getClist().get(0));
-		assertEquals("def-postload", CallbackStorage.getInstance().getClist().get(1));
+        assertEquals(2, CallbackStorage.getInstance().getClist().size());
+        assertEquals("def-postload",
+                CallbackStorage.getInstance().getClist().get(0));
+        assertEquals("def-postload",
+                CallbackStorage.getInstance().getClist().get(1));
 
 		endTx(em);
 		endEm(em);
@@ -245,20 +251,24 @@
 
 	public void testSubClassOverrideSuperCallbacksInh()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+       OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
-		LifeCycleDDEntity2 emp = new LifeCycleDDEntity2("Thomas", "Jefferson");
+        LifeCycleDDEntity2 emp = new LifeCycleDDEntity2("Thomas", "Jefferson");
 
 		em.persist(emp);
 
 		assertNotNull(emp);
 		assertNotNull(CallbackStorage.getInstance().getClist());
-		assertEquals(4, CallbackStorage.getInstance().getClist().size());
-		assertEquals("def-prepersist", CallbackStorage.getInstance().getClist().get(0));
-		assertEquals("verifyprp", CallbackStorage.getInstance().getClist().get(1));
-		assertEquals("def-postpersist", CallbackStorage.getInstance().getClist().get(2));
-		assertEquals("verifypop", CallbackStorage.getInstance().getClist().get(3));
+        assertEquals(4, CallbackStorage.getInstance().getClist().size());
+        assertEquals("def-prepersist",
+                CallbackStorage.getInstance().getClist().get(0));
+        assertEquals("verifyprp",
+                CallbackStorage.getInstance().getClist().get(1));
+        assertEquals("def-postpersist",
+                CallbackStorage.getInstance().getClist().get(2));
+        assertEquals("verifypop",
+                CallbackStorage.getInstance().getClist().get(3));
 
 		endTx(em);
 		endEm(em);

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java Thu May 21 14:39:31 2009
@@ -30,7 +30,8 @@
 
 //import kodo.persistence.test.*;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import org.apache.openjpa.persistence.common.utils.*;
 
 import junit.framework.*;
@@ -118,7 +119,8 @@
 //            (EmbedOwner.class, null, true);
 //        assertEquals("OWN_BASIC", cls.getFieldMapping("basic").
 //            getColumns()[0].getName());
-//        ClassMapping embed = cls.getFieldMapping("embed").currentEntityManager()beddedMapping();
+//        ClassMapping embed = cls.getFieldMapping("embed")
+//            .currentEntityManager()beddedMapping();
 //        assertEquals("EMB_BLOB", embed.getFieldMapping("blob").
 //            getColumns()[0].getName());
 //        assertEquals("OVER_BASIC", embed.getFieldMapping("basic").

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddableSuperclass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddableSuperclass.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddableSuperclass.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddableSuperclass.java Thu May 21 14:39:31 2009
@@ -28,7 +28,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import org.apache.openjpa.persistence.common.utils.*;
 
 import junit.framework.*;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddedId.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddedId.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddedId.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddedId.java Thu May 21 14:39:31 2009
@@ -25,7 +25,8 @@
 
 import junit.framework.*;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import org.apache.openjpa.persistence.common.utils.*;
 
 /**

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java Thu May 21 14:39:31 2009
@@ -25,7 +25,8 @@
 
 import org.apache.openjpa.persistence.common.utils.*;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 public class TestEntityListenerAnnot extends AnnotationTestCase
@@ -45,7 +46,7 @@
 
 	public void testPrePersist()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 
 		ContractEmployee cemp = new ContractEmployee(21, "afam", 25, 5);
 
@@ -53,7 +54,8 @@
 		CallbackStorage store = CallbackStorage.getInstance();
 
 		assertNotNull(store.getClist());
-		assertEquals("@pre/post persist callback is over/under-firing", 2, store.getClist().size());
+        assertEquals("@pre/post persist callback is over/under-firing", 2,
+                store.getClist().size());
 		assertEquals("longnamevalidatorprr", store.getClist().get(0));
 		assertEquals("contractemployee", store.getClist().get(1));
 
@@ -73,11 +75,15 @@
 		CallbackStorage store = CallbackStorage.getInstance();
 
 		assertNotNull(store.getClist());
-		assertEquals("@pre/post persist callback is over/under-firing", 4, store.getClist().size());
+        assertEquals("@pre/post persist callback is over/under-firing", 4,
+                store.getClist().size());
 		assertEquals("namevalidator", store.getClist().get(0));
 		assertEquals("longnamevalidatorprr", store.getClist().get(1));
 		assertEquals("employeepop", store.getClist().get(2));
-		assertEquals("We expected 'gen#" +  emp.getCheck() + " : " + emp.getCheck() + "'. However, we got '" + store.getClist().get(3) + "'", "gen#"+emp.getCheck(), store.getClist().get(3));
+        assertEquals("We expected 'gen#" +  emp.getCheck() + " : " 
+                + emp.getCheck() + "'. However, we got '"
+                + store.getClist().get(3) + "'", "gen#" + emp.getCheck(),
+                store.getClist().get(3));
 	  }
       finally {
 		endTx(em);
@@ -87,7 +93,7 @@
 
 	public void testPre_PostRemove()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
 		Employee emp = new Employee(8, "Jonathan");
@@ -107,9 +113,12 @@
 		em.remove(emp);
 
 		assertTrue(!CallbackStorage.isEmpty());
-		assertEquals("callback is under/over-firing...", 2, CallbackStorage.size());
-		assertEquals("namevalidatorprr", CallbackStorage.getInstance().getClist().get(0));
-		assertEquals("namevalidatorpor", CallbackStorage.getInstance().getClist().get(1));
+        assertEquals("callback is under/over-firing...", 2,
+                CallbackStorage.size());
+        assertEquals("namevalidatorprr",
+                CallbackStorage.getInstance().getClist().get(0));
+        assertEquals("namevalidatorpor",
+                CallbackStorage.getInstance().getClist().get(1));
 
 		endTx(em);
 		endEm(em);
@@ -117,7 +126,7 @@
 
 	public void testPreUpdate()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
 		Employee emp = new Employee(5, "Abraham");
@@ -125,7 +134,8 @@
 
 		CallbackStorage.clearStore();
 
-		String query = "Update Employee e SET e.name = 'Joseph' WHERE e.id = :id";
+        String query =
+            "Update Employee e SET e.name = 'Joseph' WHERE e.id = :id";
 
 		int result = em.createQuery(query)
 		               .setParameter("id", 5)
@@ -147,7 +157,7 @@
 
 	public void testPreUpdate2()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
 		Employee emp = new Employee(5, "Abraham");
@@ -168,7 +178,8 @@
 		List store = CallbackStorage.getInstance().getClist();
 
 		assertNotNull(store);
-		assertEquals("update callback is either underfiring or overfiring...", 3, store.size());
+        assertEquals("update callback is either underfiring or overfiring...",
+                3, store.size());
 		assertEquals("namevalidatorpou", store.get(0));
 		assertEquals("longnamevalidatorpou", store.get(1));
 		assertEquals("employeepou", store.get(2));
@@ -179,7 +190,7 @@
 
 	public void testPostLoad()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
 		Employee emp = new Employee(6, "Jefferson");
@@ -199,9 +210,12 @@
 
 		assertNotNull(emp);
 		assertNotNull(CallbackStorage.getInstance().getClist());
-		assertEquals("PostLoad is overfiring...not accurate", 2, CallbackStorage.getInstance().getClist().size());
-		assertEquals("employeepol", CallbackStorage.getInstance().getClist().get(0));
-		assertEquals("employeepol", CallbackStorage.getInstance().getClist().get(1));
+        assertEquals("PostLoad is overfiring...not accurate", 2,
+                CallbackStorage.getInstance().getClist().size());
+        assertEquals("employeepol",
+                CallbackStorage.getInstance().getClist().get(0));
+        assertEquals("employeepol",
+                CallbackStorage.getInstance().getClist().get(1));
 
 		endTx(em);
 		endEm(em);
@@ -209,7 +223,7 @@
 
 	public void testGenPriKeyAvailInPostPersist()
 	{
-		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+        OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 		startTx(em);
 
 		assertNotNull(em);
@@ -222,7 +236,8 @@
 		int check = emp.getCheck();
 
 		assertNotNull(check);
-		assertTrue(CallbackStorage.getInstance().getClist().contains("gen#"+check));
+        assertTrue(CallbackStorage.getInstance().getClist().contains(
+                "gen#" + check));
 
 		endTx(em);
 		endEm(em);
@@ -230,22 +245,23 @@
 	/*Fix Me: aokeke - should fail when persisting with invalid id*/
 //	public void testExceptionCauseTxRollback2()
 //	{
-//		OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
+//      OpenJPAEntityManager em =(OpenJPAEntityManager) currentEntityManager();
 //		startTx(em);
 //		
 //		Employee emp = new Employee(-1, "failure");
 //		
 //		try
 //		{
-//			//persisting an entity with an invalid id throws an exception
+//          //persisting an entity with an invalid id throws an exception
 //			em.persist(emp);
 //			endTx(em);
-//			fail("Should have failed..persisting an entity with invalid id");
+//          fail("Should have failed..persisting an entity with invalid id");
 //		}
 //		catch(RuntimeException e)
 //		{			
 //			assertFalse(em.isPersistent(emp));
-//			assertTrue("transaction was not marked for rollback", em.getRollbackOnly());
+//          assertTrue("transaction was not marked for rollback",
+//                  em.getRollbackOnly());
 //			e.printStackTrace();
 //			if(em.getRollbackOnly() == true)
 //				endEm(em);
@@ -253,7 +269,8 @@
 //		catch(Exception e)
 //		{
 //			assertFalse(em.isPersistent(emp));
-//			assertTrue("transaction was not marked for rollback", em.getRollbackOnly());
+//          assertTrue("transaction was not marked for rollback",
+//                  em.getRollbackOnly());
 //			e.printStackTrace();
 //			if(em.getRollbackOnly() == true)
 //				endEm(em);

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java Thu May 21 14:39:31 2009
@@ -24,7 +24,8 @@
 import org.apache.openjpa.meta.*;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import org.apache.openjpa.persistence.common.utils.*;
 
 import junit.framework.*;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEnumerated.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEnumerated.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEnumerated.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEnumerated.java Thu May 21 14:39:31 2009
@@ -23,7 +23,8 @@
 import javax.persistence.*;
 import junit.framework.*;
 import org.apache.openjpa.persistence.common.utils.*;
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 
 
 
@@ -71,12 +72,13 @@
 
     public void testBehavior() 
     {
-        OpenJPAEntityManager em = (OpenJPAEntityManager) currentEntityManager();        
+        OpenJPAEntityManager em = (OpenJPAEntityManager) currentEntityManager();
         startTx(em);
         
         AnnoTest1 pc = new AnnoTest1(1);
         assertNotNull("pc is null", pc);
-        assertNotNull("InheritanceType.TABLE_PER_CLASS is null", InheritanceType.TABLE_PER_CLASS);
+        assertNotNull("InheritanceType.TABLE_PER_CLASS is null",
+                InheritanceType.TABLE_PER_CLASS);
         assertNotNull("InheritanceType.JOINED is null", InheritanceType.JOINED);
         pc.setEnumeration(InheritanceType.TABLE_PER_CLASS);
         pc.setOrdinalEnumeration(InheritanceType.TABLE_PER_CLASS);
@@ -93,7 +95,8 @@
         AnnoTest1 pc2 = (AnnoTest1) q.getSingleResult();
         assertNotNull("pc2 is null", pc2);
         assertEquals(InheritanceType.TABLE_PER_CLASS, pc2.getEnumeration());
-        assertEquals(InheritanceType.TABLE_PER_CLASS, pc2.getOrdinalEnumeration());
+        assertEquals(InheritanceType.TABLE_PER_CLASS,
+                pc2.getOrdinalEnumeration());
         assertEquals(InheritanceType.JOINED,  pc2.getStringEnumeration());
         startTx(em);
         pc2.setEnumeration(InheritanceType.JOINED);
@@ -108,7 +111,8 @@
         pc2 = (AnnoTest1) q.getSingleResult();
         assertEquals(InheritanceType.JOINED, pc2.getEnumeration());
         assertEquals(InheritanceType.JOINED, pc2.getOrdinalEnumeration());
-        assertEquals(InheritanceType.TABLE_PER_CLASS, pc2.getStringEnumeration());
+        assertEquals(InheritanceType.TABLE_PER_CLASS,
+                pc2.getStringEnumeration());
         endEm(em);
     }
     

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestFlatInheritance.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestFlatInheritance.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestFlatInheritance.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestFlatInheritance.java Thu May 21 14:39:31 2009
@@ -20,7 +20,8 @@
 
 import javax.persistence.*;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import junit.framework.*;
 
 import org.apache.openjpa.persistence.common.utils.*;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestGenerators.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestGenerators.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestGenerators.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestGenerators.java Thu May 21 14:39:31 2009
@@ -20,7 +20,8 @@
 
 import javax.persistence.*;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import org.apache.openjpa.persistence.common.utils.*;
 
 import junit.framework.*;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestJoinedInheritance.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestJoinedInheritance.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestJoinedInheritance.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestJoinedInheritance.java Thu May 21 14:39:31 2009
@@ -20,7 +20,8 @@
 
 import javax.persistence.*;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import org.apache.openjpa.persistence.common.utils.*;
 
 import junit.framework.*;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestManyToMany.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestManyToMany.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestManyToMany.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestManyToMany.java Thu May 21 14:39:31 2009
@@ -22,7 +22,8 @@
 
 import javax.persistence.*;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import junit.framework.*;
 
 import org.apache.openjpa.persistence.common.utils.*;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMapKey.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMapKey.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMapKey.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMapKey.java Thu May 21 14:39:31 2009
@@ -25,7 +25,8 @@
 import org.apache.openjpa.jdbc.meta.strats.*;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import junit.framework.*;
 
 import org.apache.openjpa.persistence.common.utils.*;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMappedSuperClass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMappedSuperClass.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMappedSuperClass.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMappedSuperClass.java Thu May 21 14:39:31 2009
@@ -23,11 +23,16 @@
 import java.util.List;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.PartyId;
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.Site;
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.Site1;
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.Store;
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.Store1;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.
+        PartyId;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.
+        Site;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.
+        Site1;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.
+        Store;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.
+        Store1;
 
 public class TestMappedSuperClass extends AnnotationTestCase {
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToMany.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToMany.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToMany.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToMany.java Thu May 21 14:39:31 2009
@@ -22,7 +22,8 @@
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import junit.framework.*;
 
 import org.apache.openjpa.persistence.common.utils.*;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToOne.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToOne.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToOne.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToOne.java Thu May 21 14:39:31 2009
@@ -20,7 +20,8 @@
 
 import javax.persistence.*;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import junit.framework.*;
 
 import org.apache.openjpa.persistence.common.utils.*;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java Thu May 21 14:39:31 2009
@@ -23,7 +23,8 @@
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import junit.framework.*;
 
 import org.apache.openjpa.persistence.common.utils.*;
@@ -103,19 +104,19 @@
 
     /*public void testJDOQL() {
         PersistenceManager pm = getPM();
-        pm.newQuery("select from persistence.annotations.common.apps.annotApp.annotype.PropertyAccess1 "
-            + "where name == 'foo'").execute();
-        pm.newQuery("select from persistence.annotations.common.apps.annotApp.annotype.PropertyAccess1 "
-            + "order by name ascending").execute();
+        pm.newQuery("select from persistence.annotations.common.apps.annotApp."
+            + "annotype.PropertyAccess1 where name == 'foo'").execute();
+        pm.newQuery("select from persistence.annotations.common.apps.annotApp."
+            + "annotype.PropertyAccess1 order by name ascending").execute();
         pm.close();
     }
 
     public void testJDOQLWithFieldNameMismatch() {
         PersistenceManager pm = getPM();
-        pm.newQuery("select from persistence.annotations.common.apps.annotApp.annotype.PropertyAccess1 "
-            + "where intValue == 0").execute();
-        pm.newQuery("select from persistence.annotations.common.apps.annotApp.annotype.PropertyAccess1 "
-            + "order by intValue asc").execute();
+        pm.newQuery("select from persistence.annotations.common.apps.annotApp."
+            + "annotype.PropertyAccess1 where intValue == 0").execute();
+        pm.newQuery("select from persistence.annotations.common.apps.annotApp."
+            + "annotype.PropertyAccess1 order by intValue asc").execute();
         pm.close();
     }*/
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestSerializedLobs.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestSerializedLobs.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestSerializedLobs.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestSerializedLobs.java Thu May 21 14:39:31 2009
@@ -27,7 +27,8 @@
 import org.apache.openjpa.jdbc.sql.*;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import junit.framework.*;
 
 import org.apache.openjpa.persistence.common.utils.*;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java Thu May 21 14:39:31 2009
@@ -23,7 +23,8 @@
 import org.apache.openjpa.jdbc.meta.strats.*;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import junit.framework.*;
 
 import org.apache.openjpa.persistence.common.utils.*;
@@ -68,7 +69,8 @@
             instanceof NoneDiscriminatorStrategy);
         assertEquals("TPC_BASIC", sup.getFieldMapping("basic").
             getColumns()[0].getName());
-        embed = sup.getFieldMapping("embed").currentEntityManager()beddedMapping();
+        embed = sup.getFieldMapping("embed")
+            .currentEntityManager()beddedMapping();
         assertEquals("TPC_EMB_BASIC", embed.getFieldMapping("basic").
             getColumns()[0].getName());
     }**/

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java Thu May 21 14:39:31 2009
@@ -24,7 +24,8 @@
 import org.apache.openjpa.jdbc.meta.* ;
 import org.apache.openjpa.jdbc.meta.strats.* ;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.* ;
+import
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
@@ -84,7 +85,8 @@
 	}
 
 /*
- * Fix Me aokeke -- Testcases causes deadlock during runtime CR307216 is used to track this issue.
+ * Fix Me aokeke -- Testcases causes deadlock during runtime CR307216 is used to
+ * track this issue.
  */
  public void testVersionNumeric()
 	{
@@ -220,21 +222,30 @@
 
 	   public void testNoDefaultVersionWithoutFieldOrColumn()
 	   {
-			OpenJPAEntityManager pm = (OpenJPAEntityManager) currentEntityManager();
-		   ClassMapping cls =  ((JDBCConfigurationImpl)((OpenJPAEntityManagerSPI) OpenJPAPersistence.cast(pm)).getConfiguration()).getMappingRepositoryInstance().getMapping(EmbedOwner.class, null, true);
-		   assertEquals(NoneVersionStrategy.getInstance(),
-				   cls.getVersion().getStrategy()); assertEquals(0,
-						   cls.getVersion().getColumns().length);
+           OpenJPAEntityManager pm =
+               (OpenJPAEntityManager) currentEntityManager();
+           ClassMapping cls =
+                   ((JDBCConfigurationImpl) ((OpenJPAEntityManagerSPI)
+                   OpenJPAPersistence.cast(pm)).getConfiguration())
+                   .getMappingRepositoryInstance().getMapping(EmbedOwner.class,
+                           null, true);
+           assertEquals(NoneVersionStrategy.getInstance(),
+                   cls.getVersion().getStrategy()); assertEquals(0,
+                           cls.getVersion().getColumns().length);
 			endEm(pm);
 	   }
 
 	   public void testVersionWithField()
 	   {
-		   OpenJPAEntityManager pm = (OpenJPAEntityManager) currentEntityManager();
-		   ClassMapping cls = ((JDBCConfigurationImpl)((OpenJPAEntityManagerSPI) OpenJPAPersistence.cast(pm)).getConfiguration()).getMappingRepositoryInstance().getMapping(AnnoTest1.class, null, true);
+           OpenJPAEntityManager pm =
+               (OpenJPAEntityManager) currentEntityManager();
+           ClassMapping cls = ((JDBCConfigurationImpl)((OpenJPAEntityManagerSPI)
+                   OpenJPAPersistence.cast(pm)).getConfiguration())
+                   .getMappingRepositoryInstance().getMapping(AnnoTest1.class,
+                           null, true);
 		   assertTrue(NoneVersionStrategy.getInstance() !=
 			   cls.getVersion().getStrategy()); assertEquals(1,
-					   cls.getVersion().getColumns().length);
+                       cls.getVersion().getColumns().length);
 			endEm(pm);
 	   }
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest1.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest1.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.util.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest2.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest2.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.util.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest3.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest3.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest3.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest3.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/CallbackStorage.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/CallbackStorage.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/CallbackStorage.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/CallbackStorage.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.util.List;
 import java.util.ArrayList;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/ContractEmployee.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/ContractEmployee.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/ContractEmployee.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/ContractEmployee.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.util.ArrayList;
 
@@ -42,7 +43,7 @@
 	@PrePersist
 	public void verifyTerm()
 	{
-		System.out.println("VerifyTerm of ContractEmployee running on"+this);
+        System.out.println("VerifyTerm of ContractEmployee running on" + this);
 
 		CallbackStorage store = CallbackStorage.getInstance();
 		store.getClist().add("contractemployee");

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DateValidator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DateValidator.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DateValidator.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DateValidator.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 
@@ -35,6 +36,7 @@
 	@PostPersist
 	public void postPersist(Schedule sched)
 	{
-		System.out.println("Schedule "+sched+" is successfully persisted: DateValidator.class");
+        System.out.println("Schedule " + sched
+                + " is successfully persisted: DateValidator.class");
 	}
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DefaultCallbackListener.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DefaultCallbackListener.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DefaultCallbackListener.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DefaultCallbackListener.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.PrePersist;
 import javax.persistence.PostPersist;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedOwner.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedOwner.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedOwner.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedOwner.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue2.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue2.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuper.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuper.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuper.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuper.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuperSub.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuperSub.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuperSub.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuperSub.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdClass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdClass.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdClass.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdClass.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdEntity.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdEntity.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Employee.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Employee.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Employee.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Employee.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 
@@ -69,7 +70,8 @@
 	@PostPersist
 	private void resetSyncTime()
 	{
-		System.out.println("resetSyncTime is running on "+this+"GEN #: "+lifecheck);
+        System.out.println("resetSyncTime is running on " + this + "GEN #: "
+                + lifecheck);
 		syncTime = System.currentTimeMillis();
 
 		CallbackStorage store = CallbackStorage.getInstance();
@@ -93,7 +95,8 @@
 
 	public String toString()
 	{
-		return "Name: "+name+" of "+this.getClass().getName()+" Id: "+id+" Synctime: "+syncTime;
+        return "Name: " + name + " of " + this.getClass().getName()
+            + " Id: " + id + " Synctime: " + syncTime;
 	}
 
 	public int getCheck() {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.io.Serializable;
 
@@ -37,7 +38,8 @@
 @Entity
 @Table(name="entity_1")
 @Inheritance(strategy=InheritanceType.JOINED)
-@SqlResultSetMapping(name="NativeTestResult", entities=@EntityResult(entityClass=Entity1.class))
+@SqlResultSetMapping(name="NativeTestResult",
+        entities=@EntityResult(entityClass=Entity1.class))
 public class Entity1 implements Serializable
 {
 	private static final long serialVersionUID = 2882935803066041165L;
@@ -112,6 +114,7 @@
 
 	public String toString()
 	{
-		return("PK: "+pk+" StringField: "+stringField+" IntField: "+intField);
+        return("PK: " + pk + " StringField: " + stringField
+                + " IntField: " + intField);
 	}
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity2.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity2.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.io.Serializable;
 
@@ -90,6 +91,7 @@
 
 	public String toString()
 	{
-		return("PK: "+pk+" StringField: "+stringField+" IntField: "+intField);
+        return("PK: " + pk + " StringField: " + stringField
+                + " IntField: " + intField);
 	}
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat1.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat1.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat2.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat2.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/FlightSchedule.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/FlightSchedule.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/FlightSchedule.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/FlightSchedule.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 
@@ -36,8 +37,8 @@
 
 	public FlightSchedule(){}
 
-	public FlightSchedule(String name, Calendar cad, Date start, Date end, String pname)
-	{
+    public FlightSchedule(String name, Calendar cad, Date start, Date end,
+            String pname) {
 		super(name, cad, start, end);
 		this.planeName = pname;
 	}

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Generator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Generator.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Generator.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Generator.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.util.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/LongNameValidator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/LongNameValidator.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/LongNameValidator.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/LongNameValidator.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NameValidator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NameValidator.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NameValidator.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NameValidator.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NamedEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NamedEntity.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NamedEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NamedEntity.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 
 public interface NamedEntity

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/OrderByEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/OrderByEntity.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/OrderByEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/OrderByEntity.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.util.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.util.Date;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party1.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Party1.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.util.Date;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PartyId.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PartyId.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PartyId.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PartyId.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.io.Serializable;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PropertyAccess1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PropertyAccess1.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PropertyAccess1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PropertyAccess1.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.*;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Schedule.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Schedule.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Schedule.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Schedule.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.util.Date;
 import java.util.Calendar;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.util.List;
 import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site1.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site1.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.util.List;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store1.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Store1.java Thu May 21 14:39:31 2009
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
+package
+    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;