openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r789813 - in /openjpa/branches/1.3.x: openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/co...
Date Tue, 30 Jun 2009 16:07:44 GMT
Author: dwoods
Date: Tue Jun 30 16:07:42 2009
New Revision: 789813

URL: http://svn.apache.org/viewvc?rev=789813&view=rev
Log:
enable checkstyle enforcement of 120 chars lines, but not the NewlineAtEndOfFile requirement yet.

Modified:
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestAnchorParsing.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEmbeddedPessimisticLocking.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerDistinct.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestQueryAgainstEntireMappedHierarchy.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/Address.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/CANAddress.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/GBRAddress.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ObjectFactory.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ShortAddress.java
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/USAAddress.java
    openjpa/branches/1.3.x/openjpa-project/checkstyle.xml

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestDataCachingAndUnenhancedPropertyAccess.java Tue Jun 30 16:07:42 2009
@@ -21,6 +21,7 @@
 import java.util.List;
 import javax.persistence.EntityManager;
 
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
@@ -35,6 +36,11 @@
     }
 
     public void testSimpleDataCacheOperation() {
+        // Not all databases support GenerationType.IDENTITY column(s)
+        if (!((JDBCConfiguration) emf.getConfiguration()).
+            getDBDictionaryInstance().supportsAutoAssign) {
+			return;
+		}
         EntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
         em.persist(new UnenhancedIdentityIdPropertyAccess());
@@ -43,6 +49,12 @@
     }
 
     public void testAccessIdBeforeCommit() {
+        // Not all databases support GenerationType.IDENTITY column(s)
+        if (!((JDBCConfiguration) emf.getConfiguration()).
+            getDBDictionaryInstance().supportsAutoAssign) {
+            return;
+        }
+
         OpenJPAEntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
         UnenhancedIdentityIdPropertyAccess o =
@@ -52,4 +64,4 @@
         em.getTransaction().commit();
         em.close();
     }
-}
\ No newline at end of file
+}

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java Tue Jun 30 16:07:42 2009
@@ -22,6 +22,7 @@
 import java.util.List;
 import javax.persistence.EntityManager;
 
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 /**
@@ -41,11 +42,15 @@
     public void setUp() {
         setUp(EntityA.class, EntityB.class, EntityC.class, EntityD.class, 
               EntityE.class, EntityF.class, EntityG.class);
-
         createTestData();
     }
 
     private void createTestData() {
+        // Not all databases support GenerationType.IDENTITY column(s)
+        if (!((JDBCConfiguration) emf.getConfiguration()).
+            getDBDictionaryInstance().supportsAutoAssign) {
+            return;
+        }
         entityA = new EntityA();
         entityB = new EntityB();
         entityC = new EntityC();
@@ -60,6 +65,11 @@
     }
 
     public void testSqlOrder() {
+        // Not all databases support GenerationType.IDENTITY column(s)
+        if (!((JDBCConfiguration) emf.getConfiguration()).
+            getDBDictionaryInstance().supportsAutoAssign) {
+			return;
+		}
         EntityManager em = emf.createEntityManager();
         try {
             em.getTransaction().begin();
@@ -91,8 +101,13 @@
             em.close();
         }
     }
-    
+
     public void testSimpleCycle() {
+        // Not all databases support GenerationType.IDENTITY column(s)
+        if (!((JDBCConfiguration) emf.getConfiguration()).
+            getDBDictionaryInstance().supportsAutoAssign) {
+			return;
+		}
         EntityManager em = emf.createEntityManager();
         try {
             em.getTransaction().begin();
@@ -106,8 +121,13 @@
             em.close();
         }
     }
-    
+
     public void testComplexCycle() {
+        // Not all databases support GenerationType.IDENTITY column(s)
+        if (!((JDBCConfiguration) emf.getConfiguration()).
+            getDBDictionaryInstance().supportsAutoAssign) {
+			return;
+		}
         EntityManager em = emf.createEntityManager();
         try {
             EntityE entityE = new EntityE();
@@ -119,7 +139,7 @@
             entityD.setEntityA(entityA);
             em.persist(entityA);
             em.getTransaction().commit();
-            
+
             em.getTransaction().begin();
             em.remove(entityE);
             em.remove(entityA);
@@ -133,6 +153,11 @@
     }
 
     public void testComplexTwoCycles() {
+        // Not all databases support GenerationType.IDENTITY column(s)
+        if (!((JDBCConfiguration) emf.getConfiguration()).
+            getDBDictionaryInstance().supportsAutoAssign) {
+			return;
+		}
         EntityManager em = emf.createEntityManager();
         try {
             EntityE entityE = new EntityE();
@@ -145,7 +170,7 @@
             entityD.setEntityB(entityB);
             em.persist(entityA);
             em.getTransaction().commit();
-            
+
             em.getTransaction().begin();
             em.remove(entityE);
             em.remove(entityA);
@@ -157,8 +182,13 @@
             em.close();
         }
     }
-    
+
     public void testForeignKeyCascade() {
+        // Not all databases support GenerationType.IDENTITY column(s)
+        if (!((JDBCConfiguration) emf.getConfiguration()).
+            getDBDictionaryInstance().supportsAutoAssign) {
+			return;
+		}
         EntityManager em = emf.createEntityManager();
         try {
             EntityF f = new EntityF();
@@ -169,7 +199,7 @@
             g1.setId(1);
             listG.add(g1);
             g1.setEntityF(f);
-            
+
             EntityG g2 = new EntityG();
             g2.setId(2);
             listG.add(g2);
@@ -184,7 +214,7 @@
             g4.setId(4);
             listG.add(g4);
             g4.setEntityF(f);
-            
+
             f.setListG(listG);
             em.getTransaction().begin();
             em.persist(f);
@@ -207,5 +237,4 @@
             em.close();
         }
     }
-    
 }

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestAnchorParsing.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestAnchorParsing.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestAnchorParsing.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestAnchorParsing.java Tue Jun 30 16:07:42 2009
@@ -35,7 +35,7 @@
         String fqLoc = "META-INF/persistence.xml#test";
         Options opts = new Options();
         opts.setProperty("p", fqLoc);
-        List locs =
+        List<String> locs =
             Configurations.getFullyQualifiedAnchorsInPropertiesLocation(opts);
         assertNotNull(locs);
         assertEquals(1, locs.size());
@@ -54,7 +54,7 @@
         Options opts = new Options();
         if (resource != null)
             opts.setProperty("p", resource);
-        List locs =
+        List<String> locs =
             Configurations.getFullyQualifiedAnchorsInPropertiesLocation(opts);
         assertNotNull(locs);
         // approximate so that if someone adds more units, this doesn't break

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java Tue Jun 30 16:07:42 2009
@@ -35,7 +35,7 @@
         return id;
     }
 
-    protected void setId(final String id) {
+    public void setId(final String id) {
         this.id = id;
     }
 }

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java Tue Jun 30 16:07:42 2009
@@ -77,7 +77,10 @@
 		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);
@@ -199,7 +202,8 @@
 
 		assertNotNull(emp);
 		assertNotNull(CallbackStorage.getInstance().getClist());
-		assertEquals("PostLoad is overfiring...not accurate", 2, CallbackStorage.getInstance().getClist().size());
+		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));
 

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java Tue Jun 30 16:07:42 2009
@@ -220,21 +220,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/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java Tue Jun 30 16:07:42 2009
@@ -45,14 +45,20 @@
         propsMap.put("openjpa.RemoteCommitProvider", "sjvm");
         propsMap.put("openjpa.FlushBeforeQueries", "true");
         //propsMap.put("javax.jdo.option.IgnoreCache", "false");
-        //propsMap.put("openjpa.BrokerImpl", "kodo.datacache.CacheTestBroker");//CacheTestBroker.class.getName ());
+        //propsMap.put("openjpa.BrokerImpl", "kodo.datacache.CacheTestBroker");
+        //CacheTestBroker.class.getName ());
         EntityManagerFactory emf = getEmf(propsMap);
 
         try {
 
-            //assertEquals(Class.forName("openjpa.datacache.CacheTestBroker",true,emf.getClass().getClassLoader()).getClassLoader(),emf.getClass().getClassLoader());
-            //Thread.currentThread().setContextClassLoader(emf.getClass().getClassLoader());
-            Class.forName("org.apache.openjpa.persistence.datacache.CacheTestBroker", true,
+            //assertEquals(Class.forName("openjpa.datacache.CacheTestBroker",
+            //    true,emf.getClass().getClassLoader()).getClassLoader(),
+            //    emf.getClass().getClassLoader());
+            //Thread.currentThread().setContextClassLoader(
+            //    emf.getClass().getClassLoader());
+            Class.forName(
+                    "org.apache.openjpa.persistence.datacache.CacheTestBroker",
+                    true,
                 Thread.currentThread().getContextClassLoader());
         } catch (Exception e) {
 

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java Tue Jun 30 16:07:42 2009
@@ -38,29 +38,42 @@
 @Entity
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 // Default inheritance strategy
-@DiscriminatorColumn(name = "EMP_TYPE", discriminatorType = DiscriminatorType.INTEGER)
+@DiscriminatorColumn(name = "EMP_TYPE",
+        discriminatorType = DiscriminatorType.INTEGER)
 @DiscriminatorValue("0")
 @FetchGroups( {
-        @FetchGroup(name = "AddressFetchGroup", attributes = { @FetchAttribute(name = "address") }),
-        @FetchGroup(name = "RatingFetchGroup", attributes = { @FetchAttribute(name = "rating") }),
-        @FetchGroup(name = "ManagerFetchGroup1A", attributes = { @FetchAttribute(name = "manager", recursionDepth = 1) }),
-        @FetchGroup(name = "ManagerFetchGroup1B", attributes = { @FetchAttribute(name = "manager", recursionDepth = -1) }),
-        @FetchGroup(name = "ManagerFetchGroup2", attributes = { @FetchAttribute(name = "manager", recursionDepth = 2) }),
-        @FetchGroup(name = "DescFetchGroup", attributes = { @FetchAttribute(name = "description") }),
+        @FetchGroup(name = "AddressFetchGroup",
+                attributes = { @FetchAttribute(name = "address") }),
+        @FetchGroup(name = "RatingFetchGroup",
+                attributes = { @FetchAttribute(name = "rating") }),
+        @FetchGroup(name = "ManagerFetchGroup1A",
+                attributes = { @FetchAttribute(name = "manager",
+                recursionDepth = 1) }),
+        @FetchGroup(name = "ManagerFetchGroup1B",
+                attributes = { @FetchAttribute(name = "manager",
+                recursionDepth = -1) }),
+        @FetchGroup(name = "ManagerFetchGroup2",
+                attributes = { @FetchAttribute(name = "manager",
+                recursionDepth = 2) }),
+        @FetchGroup(name = "DescFetchGroup",
+                attributes = { @FetchAttribute(name = "description") }),
 
-        @FetchGroup(name = "DepartmentFetchGroup", attributes = { @FetchAttribute(name = "dept") }),
+        @FetchGroup(name = "DepartmentFetchGroup",
+                attributes = { @FetchAttribute(name = "dept") }),
 
         @FetchGroup(name = "AggregateEmployeeFetchGroup1", attributes = {
                 @FetchAttribute(name = "dept"),
                 @FetchAttribute(name = "address"),
                 @FetchAttribute(name = "manager", recursionDepth = 1) }),
-        @FetchGroup(name = "AggregateEmployeeFetchGroup2", fetchGroups = { "AggregateEmployeeFetchGroup1" }),
+        @FetchGroup(name = "AggregateEmployeeFetchGroup2",
+                fetchGroups = { "AggregateEmployeeFetchGroup1" }),
         @FetchGroup(name = "AggregateEmployeeFetchGroup3", fetchGroups = {
                 "DepartmentFetchGroup", "AddressFetchGroup",
                 "ManagerFetchGroup1A" }),
         @FetchGroup(name = "AggregateEmployeeFetchGroup4", attributes = {
                 @FetchAttribute(name = "dept"),
-                @FetchAttribute(name = "address") }, fetchGroups = { "ManagerFetchGroup1A" }) })
+                @FetchAttribute(name = "address") },
+                fetchGroups = { "ManagerFetchGroup1A" }) })
 public class FGEmployee {
     @Id
     private int id;

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java Tue Jun 30 16:07:42 2009
@@ -71,7 +71,8 @@
         _pmf =(OpenJPAEntityManagerFactory) getEmf(getProps());
         
         if (!_init) {
-            initialize((JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI) OpenJPAPersistence.cast(_pmf)).getConfiguration());
+            initialize((JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI)
+                    OpenJPAPersistence.cast(_pmf)).getConfiguration());
             _init = true;
         }
         EntityManager pm = _pmf.createEntityManager();
@@ -105,10 +106,11 @@
         
         EntityManager em= currentEntityManager();
         OpenJPAEntityManager kem = OpenJPAPersistence.cast (em);
-        //JDBCConfiguration conf = (JDBCConfiguration) kem.getConfiguration();        
+        //JDBCConfiguration conf = (JDBCConfiguration) kem.getConfiguration();
         
         MappingTool tool = new MappingTool((JDBCConfiguration)
-        		((OpenJPAEntityManagerSPI) kem).getConfiguration(), MappingTool.ACTION_REFRESH, false);
+                ((OpenJPAEntityManagerSPI) kem).getConfiguration(),
+                MappingTool.ACTION_REFRESH, false);
         tool.run(ByteArrayPKPC.class);
         tool.run(ByteArrayPKPC2.class);
         tool.record();
@@ -171,7 +173,8 @@
         
         EntityManager em= currentEntityManager();
         OpenJPAEntityManager kem = OpenJPAPersistence.cast (em);
-        if (! ((OpenJPAEntityManagerSPI) kem).getConfiguration().getCompatibilityInstance().getCopyObjectIds())
+        if (! ((OpenJPAEntityManagerSPI) kem).getConfiguration()
+                .getCompatibilityInstance().getCopyObjectIds())
             return;
         
         ByteArrayPKPCId oid = new ByteArrayPKPCId();
@@ -266,7 +269,8 @@
             ByteArrayPKPC bytes = new ByteArrayPKPC(new byte[]
             { (byte) (i + 5), (byte) (i + 6) }, String.valueOf(i));
             kem.persist(bytes);
-            assertEquals(bytes, getStateManager(bytes, kem).getManagedInstance());
+            assertEquals(bytes,
+                    getStateManager(bytes, kem).getManagedInstance());
             owner.getRels().add(bytes);
         }
         

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEmbeddedPessimisticLocking.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEmbeddedPessimisticLocking.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEmbeddedPessimisticLocking.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEmbeddedPessimisticLocking.java Tue Jun 30 16:07:42 2009
@@ -68,9 +68,12 @@
 
     public void setUpTestCase() {
 
-		JDBCConfiguration conf = (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI) OpenJPAPersistence.cast(emf)).getConfiguration();
+        JDBCConfiguration conf =
+            (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI)
+                    OpenJPAPersistence.cast(emf)).getConfiguration();
 
-        supportsLocking = conf.getDBDictionaryInstance().supportsSelectForUpdate;
+        supportsLocking =
+            conf.getDBDictionaryInstance().supportsSelectForUpdate;
 
        deleteAll(EmbeddedOwnerPC.class);
 
@@ -102,7 +105,8 @@
         // do this to ensure that the SELECT DISTINCT gets performed here.
         OpenJPAEntityManager em = emf.createEntityManager();
 
-        //FIXME jthomas commenting this since setOptimistic is not available for userTx
+        //FIXME jthomas commenting this since setOptimistic is not available for
+        //userTx
         //em.getTransaction().setOptimistic(false);
         startTx(em);
 
@@ -117,7 +121,8 @@
     public void testEmbeddedFieldsWithLockedParent() {
         OpenJPAEntityManager em =(OpenJPAEntityManager)currentEntityManager();
         prepareEMF(em.getEntityManagerFactory());
-        ((FetchPlan) em.getFetchPlan()).addField(EmbeddedOwnerPC.class, "embedded");
+        ((FetchPlan) em.getFetchPlan()).addField(EmbeddedOwnerPC.class,
+                "embedded");
 //FIXME jthomas commenting this since setOptimistic is not available for userTx
 //        pm.currentTransaction().setOptimistic(false);
         startTx(em);
@@ -277,7 +282,8 @@
 		props.put("openjpa.RemoteCommitProvider", "sjvm");
 		props.put("openjpa.FlushBeforeQueries", "true");
 		props.put("javax.jdo.option.IgnoreCache", "false");
-		//propsMap.put("openjpa.BrokerImpl", "kodo.datacache.CacheTestBroker");//CacheTestBroker.class.getName ());
+		//propsMap.put("openjpa.BrokerImpl", "kodo.datacache.CacheTestBroker");
+                //CacheTestBroker.class.getName ());
 		return props;
 	}
 

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java Tue Jun 30 16:07:42 2009
@@ -51,7 +51,9 @@
 
 		emf = getEmf();
 
-		JDBCConfiguration conf = (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI) OpenJPAPersistence.cast(emf)).getConfiguration();
+        JDBCConfiguration conf =
+            (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI)
+            OpenJPAPersistence.cast(emf)).getConfiguration();
         DBDictionary dict = conf.getDBDictionaryInstance();
         return !dict.supportsAutoAssign;
     }

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java Tue Jun 30 16:07:42 2009
@@ -61,7 +61,9 @@
 
 
     public boolean skipTest() {
-        JDBCConfiguration conf = (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI) OpenJPAPersistence.cast(emf)).getConfiguration();
+        JDBCConfiguration conf =
+            (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI)
+            OpenJPAPersistence.cast(emf)).getConfiguration();
         DBDictionary dict = conf.getDBDictionaryInstance();
         if (dict.joinSyntax == Join.SYNTAX_TRADITIONAL)
             return true;
@@ -110,9 +112,11 @@
         EntityManager em =currentEntityManager();
         OpenJPAEntityManager kem = OpenJPAPersistence.cast(em);
 
-		String theQuery="select a FROM "+PagingPC.class.getSimpleName()+" a where a.intField >= 0";
+        String theQuery = "select a FROM " + PagingPC.class.getSimpleName()
+            + " a where a.intField >= 0";
 
-        //OpenJPAQuery q = kem.createQuery(PagingPC.class.getSimpleName(), "intField >= 0");
+        //OpenJPAQuery q = kem.createQuery(PagingPC.class.getSimpleName(),
+		//    "intField >= 0");
         OpenJPAQuery q = kem.createQuery(theQuery);
 
         q.getFetchPlan().setFetchBatchSize(0);
@@ -208,7 +212,8 @@
         EntityManager em =currentEntityManager();
         OpenJPAEntityManager kem = OpenJPAPersistence.cast (em);
 
-		String theQuery="select a FROM "+PagingPC.class.getSimpleName()+" a where a.intField >= 0";
+        String theQuery = "select a FROM " + PagingPC.class.getSimpleName()
+            + " a where a.intField >= 0";
         OpenJPAQuery q = kem.createQuery(theQuery);
         q.getFetchPlan().setFetchBatchSize(0);
         q.getFetchPlan().addFetchGroups("rel");
@@ -280,7 +285,8 @@
         EntityManager em =currentEntityManager();
         OpenJPAEntityManager kem = OpenJPAPersistence.cast(em);
 
-		String theQuery="select a FROM "+PagingAppIdPC.class.getSimpleName()+" a where a.intField >= 0";
+        String theQuery = "select a FROM " + PagingAppIdPC.class.getSimpleName()
+            + " a where a.intField >= 0";
         OpenJPAQuery q = kem.createQuery(theQuery);
 
 
@@ -379,7 +385,8 @@
         EntityManager em =currentEntityManager();
         OpenJPAEntityManager kem = OpenJPAPersistence.cast(em);
 
-		String theQuery="select a FROM "+PagingPC.class.getSimpleName()+" a where a.intField >= 0";
+        String theQuery = "select a FROM " + PagingPC.class.getSimpleName()
+            + " a where a.intField >= 0";
         OpenJPAQuery q = kem.createQuery(theQuery);
 
 
@@ -432,7 +439,8 @@
         EntityManager em =currentEntityManager();
         OpenJPAEntityManager kem = OpenJPAPersistence.cast(em);
 
-		String theQuery="select a FROM "+PagingPC.class.getSimpleName()+" a where a.intField >= 0";
+        String theQuery = "select a FROM " + PagingPC.class.getSimpleName()
+            + " a where a.intField >= 0";
         OpenJPAQuery q = kem.createQuery(theQuery);
 
 
@@ -648,7 +656,8 @@
 		props.put("openjpa.RemoteCommitProvider", "sjvm");
 		props.put("openjpa.FlushBeforeQueries", "true");
 		props.put("javax.jdo.option.IgnoreCache", "false");
-		//propsMap.put("openjpa.BrokerImpl", "kodo.datacache.CacheTestBroker");//CacheTestBroker.class.getName ());
+		//propsMap.put("openjpa.BrokerImpl", "kodo.datacache.CacheTestBroker");
+                //CacheTestBroker.class.getName ());
 		return props;
 	}
 

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerDistinct.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerDistinct.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerDistinct.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerDistinct.java Tue Jun 30 16:07:42 2009
@@ -43,8 +43,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestEagerDistinct extends org.apache.openjpa.persistence.jdbc.kernel.TestSQLListenerTestCase 
-{
+public class TestEagerDistinct
+    extends org.apache.openjpa.persistence.jdbc.kernel.TestSQLListenerTestCase {
         
     /** Creates a new instance of TestEagerDistinct */
     public TestEagerDistinct(String name) 
@@ -107,7 +107,8 @@
     private void eagerParallelWithNonDistinctQuery(int fetchSize)
     throws Exception {
         OpenJPAEntityManager pm = getPM();
-        OpenJPAQuery q = pm.createNativeQuery("stringField.startsWith ('pc')",HelperPC2.class);
+        OpenJPAQuery q = pm.createNativeQuery(
+                "stringField.startsWith ('pc')", HelperPC2.class);
         //FIXME jthomas
         //q.setOrdering("stringField ascending");
         q.getFetchPlan().setFetchBatchSize(fetchSize);
@@ -146,7 +147,9 @@
     private void eagerParallelWithDistinctQuery(int fetchSize)
     throws Exception {
         OpenJPAEntityManager pm = getPM();
-        OpenJPAQuery q =  pm.createNativeQuery("helperCollection.contains (h) && h.stringField == 'shared'",HelperPC2.class);
+        OpenJPAQuery q = pm.createNativeQuery(
+                "helperCollection.contains (h) && h.stringField == 'shared'",
+                HelperPC2.class);
         //FIXME  jthomas
         //q.setOrdering("stringField ascending");
         q.getFetchPlan().setFetchBatchSize(fetchSize);
@@ -206,7 +209,8 @@
         sql.clear();
         
         pm = getPM();
-        q = pm.createNativeQuery("stringField.startsWith ('eager')",EagerPC.class);
+        q = pm.createNativeQuery("stringField.startsWith ('eager')",
+                EagerPC.class);
         //FIXME jthomas
         //q.setOrdering("stringField ascending");
         q.getFetchPlan().setFetchBatchSize(fetchSize);

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestQueryAgainstEntireMappedHierarchy.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestQueryAgainstEntireMappedHierarchy.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestQueryAgainstEntireMappedHierarchy.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestQueryAgainstEntireMappedHierarchy.java Tue Jun 30 16:07:42 2009
@@ -40,8 +40,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestQueryAgainstEntireMappedHierarchy extends org.apache.openjpa.persistence.jdbc.kernel.TestSQLListenerTestCase
-{
+public class TestQueryAgainstEntireMappedHierarchy
+    extends org.apache.openjpa.persistence.jdbc.kernel.TestSQLListenerTestCase {
 	
     /** Creates a new instance of TestQueryAgainstEntireMappedHierarchy */
     public TestQueryAgainstEntireMappedHierarchy(String name) 

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java Tue Jun 30 16:07:42 2009
@@ -27,8 +27,8 @@
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 import junit.framework.*;
 
-public class TestEJBQLSelectNPlusOne extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest
-{
+public class TestEJBQLSelectNPlusOne
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
 	public TestEJBQLSelectNPlusOne(String name)
 	{
 		super(name);
@@ -47,8 +47,9 @@
 	public void testSimpleEJBQLQuery() throws Exception
 	{
 		EntityManager pm = currentEntityManager();
-		// run a JDOQL query first to take care of any class-loading issues
-		List l = pm.createQuery("select object(o) from " + RuntimeTest1.class.getSimpleName()+" o").getResultList();
+        // run a JDOQL query first to take care of any class-loading issues
+        List l = pm.createQuery("select object(o) from "
+                + RuntimeTest1.class.getSimpleName() + " o").getResultList();
 
 		// now run the actual test.
 		assertEquals(1, l.size());

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java Tue Jun 30 16:07:42 2009
@@ -32,65 +32,67 @@
 @DataCache
 public class PartComposite extends  Part  {
 
-	 double assemblyCost;
-	 double assemblyTime;
-	 double massIncrement;
-	 
-	 @OneToMany( mappedBy="parent")
-	 Collection<Usage> partsUsed = new ArrayList<Usage>();
-	
-	public PartComposite() {}
-	
-	public PartComposite(int partno, String name, double asmCost, double massInc) {
-		this.partno=partno;
-		this.name=name;
-		assemblyCost=asmCost;
-		massIncrement=massInc;
-		inventory=0;
-	}
-	
-	public PartComposite addSubPart(EntityManager em,  int quantity, Part subpart) {
-		Usage use = new Usage( this, quantity, subpart);
-		em.persist(use);
-		return this;
-	}
-
-	public double getAssemblyCost() {
-		return assemblyCost;
-	}
-
-	public void setAssemblyCost(double assemblyCost) {
-		this.assemblyCost = assemblyCost;
-	}
-
-
-	public double getMassIncrement() {
-		return massIncrement;
-	}
-
-	public void setMassIncrement(double massIncrement) {
-		this.massIncrement = massIncrement;
-	}
-	
-	public String toString() {
-	
-		return "PartComposite:"+partno+" name:+"+name+" assemblyCost:"+assemblyCost+" massIncrement:"+massIncrement;
-	}
-
-	public Collection<Usage> getPartsUsed() {
-		return partsUsed;
-	}
-
-	public void setPartsUsed(Collection<Usage> partsUsed) {
-		this.partsUsed = partsUsed;
-	}
-
-	public double getAssemblyTime() {
-		return assemblyTime;
-	}
-
-	public void setAssemblyTime(double assemblyTime) {
-		this.assemblyTime = assemblyTime;
-	}
-
+    double assemblyCost;
+    double assemblyTime;
+    double massIncrement;
+
+    @OneToMany( mappedBy="parent")
+    Collection<Usage> partsUsed = new ArrayList<Usage>();
+
+    public PartComposite() {}
+
+    public PartComposite(int partno, String name, double asmCost,
+            double massInc) {
+        this.partno=partno;
+        this.name=name;
+        assemblyCost=asmCost;
+        massIncrement=massInc;
+        inventory=0;
+    }
+
+    public PartComposite addSubPart(EntityManager em, int quantity,
+            Part subpart) {
+        Usage use = new Usage( this, quantity, subpart);
+        em.persist(use);
+        return this;
+    }
+
+    public double getAssemblyCost() {
+        return assemblyCost;
+    }
+
+    public void setAssemblyCost(double assemblyCost) {
+        this.assemblyCost = assemblyCost;
+    }
+
+
+    public double getMassIncrement() {
+        return massIncrement;
+    }
+
+    public void setMassIncrement(double massIncrement) {
+        this.massIncrement = massIncrement;
+    }
+
+    public String toString() {
+
+        return "PartComposite:"+partno+" name:+"+name+" assemblyCost:"+
+            assemblyCost+" massIncrement:"+massIncrement;
+    }
+
+    public Collection<Usage> getPartsUsed() {
+        return partsUsed;
+    }
+
+    public void setPartsUsed(Collection<Usage> partsUsed) {
+        this.partsUsed = partsUsed;
+    }
+
+    public double getAssemblyTime() {
+        return assemblyTime;
+    }
+
+    public void setAssemblyTime(double assemblyTime) {
+        this.assemblyTime = assemblyTime;
+    }
 }

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java Tue Jun 30 16:07:42 2009
@@ -79,8 +79,8 @@
 
     public void testBetweenExpr() {
         EntityManager em = currentEntityManager();
-        String query =
-            "SELECT o.name FROM CompUser o WHERE o.age BETWEEN 19 AND 40 AND o.computerName = 'PC'";
+        String query = "SELECT o.name FROM CompUser o WHERE" +
+            " o.age BETWEEN 19 AND 40 AND o.computerName = 'PC'";
 
         List result = em.createQuery(query).getResultList();
 
@@ -94,8 +94,8 @@
 
     public void testNotBetweenExpr() {
         EntityManager em = currentEntityManager();
-        String query =
-            "SELECT o.name FROM CompUser o WHERE o.age NOT BETWEEN 19 AND 40 AND o.computerName= 'PC'";
+        String query = "SELECT o.name FROM CompUser o " +
+            "WHERE o.age NOT BETWEEN 19 AND 40 AND o.computerName= 'PC'";
 
         List result = em.createQuery(query).getResultList();
 
@@ -139,16 +139,16 @@
     public void testLikeExpr() {
         EntityManager em = currentEntityManager();
 
-        String query =
-            "SELECT o.computerName FROM CompUser o WHERE o.name LIKE 'Sha%' AND o.computerName NOT IN ('PC')";
+        String query = "SELECT o.computerName FROM CompUser o WHERE o.name " +
+            "LIKE 'Sha%' AND o.computerName NOT IN ('PC')";
 
         List result = em.createQuery(query).getResultList();
 
         assertNotNull(result);
         assertEquals(0, result.size());
 
-        query =
-            "SELECT o.computerName FROM CompUser o WHERE o.name LIKE 'Sha%o_' AND o.computerName NOT IN ('UNIX')";
+        query = "SELECT o.computerName FROM CompUser o WHERE o.name " +
+            "LIKE 'Sha%o_' AND o.computerName NOT IN ('UNIX')";
 
         result = em.createQuery(query).getResultList();
 
@@ -175,8 +175,8 @@
     public void testNullExpr() {
         EntityManager em = currentEntityManager();
 
-        String query =
-            "SELECT o.name FROM CompUser o WHERE o.age IS NOT NULL AND o.computerName = 'PC' ";
+        String query = "SELECT o.name FROM CompUser o WHERE o.age IS NOT NULL" +
+            " AND o.computerName = 'PC' ";
 
         List result = em.createQuery(query).getResultList();
 
@@ -259,7 +259,8 @@
 
         String query =
             "SELECT DISTINCT o.name FROM CompUser o WHERE NOT EXISTS" +
-                " (SELECT s FROM CompUser s WHERE s.address.country = o.address.country)";
+                " (SELECT s FROM CompUser s " +
+                "WHERE s.address.country = o.address.country)";
 
         List result = em.createQuery(query).getResultList();
 
@@ -274,7 +275,8 @@
 
         String query =
             "SELECT o.name FROM CompUser o WHERE o.address.zipcode = ANY (" +
-                " SELECT s.computerName FROM CompUser s WHERE s.address.country IS NOT NULL )";
+                " SELECT s.computerName FROM CompUser s " +
+                "WHERE s.address.country IS NOT NULL )";
 
         List result = em.createQuery(query).getResultList();
 
@@ -287,9 +289,9 @@
     public void testConstructorExpr() {
         EntityManager em = currentEntityManager();
 
-        String query =
-            "SELECT NEW org.apache.openjpa.persistence.common.apps.MaleUser(c.name, c.computerName, c.address, c.age, c.userid)" +
-                " FROM CompUser c WHERE c.name = 'Seetha'";
+        String query = "SELECT NEW org.apache.openjpa.persistence.common.apps" +
+               ".MaleUser(c.name, c.computerName, c.address, c.age, c.userid)" +
+               " FROM CompUser c WHERE c.name = 'Seetha'";
 
         MaleUser male = (MaleUser) em.createQuery(query).getSingleResult();
 

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java Tue Jun 30 16:07:42 2009
@@ -125,16 +125,27 @@
 
         assertEquals(1, size);
 
-//        assertSize(0, pm.newQuery(CalendarFields.class, "singapore < :date").execute(new Date(time - 100000)));
+//        assertSize(0, pm.newQuery(CalendarFields.class,
+//            "singapore < :date").execute(new Date(time - 100000)));
 //
-//        assertSize(0, pm.newQuery(CalendarFields.class, "singapore > :date").execute(new Date(time + 100000)));
-//        assertSize(1, pm.newQuery(CalendarFields.class, "singapore > :date").execute(new Date(time - 100000)));
+//        assertSize(0, pm.newQuery(CalendarFields.class,
+//            "singapore > :date").execute(new Date(time + 100000)));
+//        assertSize(1, pm.newQuery(CalendarFields.class,
+//            "singapore > :date").execute(new Date(time - 100000)));
 //
-//        assertSize(1, pm.newQuery(CalendarFields.class, "singapore < :date").execute(newCalendar(new Date(time + 100000), null)));
-//        assertSize(0, pm.newQuery(CalendarFields.class, "singapore < :date").execute(newCalendar(new Date(time - 100000), null)));
+//        assertSize(1, pm.newQuery(CalendarFields.class,
+//            "singapore < :date").execute(newCalendar(new Date(time + 100000),
+//            null)));
+//        assertSize(0, pm.newQuery(CalendarFields.class,
+//            "singapore < :date").execute(newCalendar(new Date(time - 100000),
+//             null)));
 //
-//        assertSize(0, pm.newQuery(CalendarFields.class, "singapore > :date").execute(newCalendar(new Date(time + 100000), null)));
-//        assertSize(1, pm.newQuery(CalendarFields.class, "singapore > :date").execute(newCalendar(new Date(time - 100000), null)));
+//        assertSize(0, pm.newQuery(CalendarFields.class,
+//            "singapore > :date").execute(newCalendar(new Date(time + 100000),
+//            null)));
+//        assertSize(1, pm.newQuery(CalendarFields.class,
+//            "singapore > :date").execute(newCalendar(new Date(time - 100000),
+//            null)));
 
         endEm(pm);
     }

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java Tue Jun 30 16:07:42 2009
@@ -335,8 +335,10 @@
 
         System.out.println("i1 : " + i1 + "\ni2 : " + i2);
 
-        //CR346162. In this CR, it was stated that @Temporal(DATE) fields will be equal for year, month, day but not for hours, 
-        //minutes, seconds. So, we removed the time check and checked only for the equality of day, month and year
+        // CR346162. In this CR, it was stated that @Temporal(DATE) fields will
+        // be equal for year, month, day but not for hours,
+        // minutes, seconds. So, we removed the time check and checked only for
+        // the equality of day, month and year
 
         /* assertEquals("Field type Date: "
      + testDate.getTime() + "!="
@@ -349,11 +351,12 @@
         if ((testDateDay != retrievedObjectDay) ||
             (testDateMonth != retrievedObjectMonth) ||
             (testDateYear != retrievedObjectYear)) {
-            Assert.fail(
-                "Field type Date not stored properly. One or more of the components of the date (day, month or year) do not match. \n" +
-                    " Value that should be stored : " + testDate.toGMTString() +
-                    ". \nValue that is actually" +
-                    "stored : " + retrievedObject.getTestDate().toGMTString());
+            Assert
+                .fail("Field type Date not stored properly. One or more of "
+                + "the components of the date (day, month or year) "
+                + "do not match. \n" + " Value that should be stored : "
+                + testDate.toGMTString() + ". \nValue that is actually"
+                + "stored : " + retrievedObject.getTestDate().toGMTString());
         }
         //assertEquals ("Field type Object", testObject,
         //retrievedObject.getTestObject ());

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java Tue Jun 30 16:07:42 2009
@@ -96,8 +96,11 @@
 //        */
 //        endEm(pm,());
         /*OpenJPAEntityManager pm = getPM();
-          OpenJPAQuery q = pm.createQuery("SELECT c FROM TestStaticInnerClasses.Inner c WHERE c.string = 'foo' ORDER BY c.string ASC");
-          q.setCandidateCollection((Collection)pm.createExtent(TestStaticInnerClasses.Inner.class, false));
+          OpenJPAQuery q = pm.createQuery(
+              "SELECT c FROM TestStaticInnerClasses.Inner c "
+              + "WHERE c.string = 'foo' ORDER BY c.string ASC");
+          q.setCandidateCollection((Collection)pm.createExtent(
+              TestStaticInnerClasses.Inner.class, false));
 
           try
           {

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java Tue Jun 30 16:07:42 2009
@@ -52,7 +52,9 @@
     public void testSimpleSubqueryAccessPath() {
         Broker broker = getBrokerFactory().newBroker();
         Query q = broker.newQuery(JPQLParser.LANG_JPQL,
-            "SELECT o FROM RuntimeTest1 o WHERE EXISTS (SELECT rt5.name FROM RuntimeTest5 rt5 WHERE rt5.name IS NOT NULL)");
+            "SELECT o FROM RuntimeTest1 o WHERE EXISTS ("
+            + "SELECT rt5.name FROM RuntimeTest5 rt5 "
+            + "WHERE rt5.name IS NOT NULL)");
         ClassMetaData[] metas = q.getAccessPathMetaDatas();
         Collection c = Arrays.asList(metas);
         ClassMetaData rt1 = broker.getConfiguration().
@@ -69,7 +71,9 @@
     public void testRelationTraversalSubqueryAccessPath() {
         Broker broker = getBrokerFactory().newBroker();
         Query q = broker.newQuery(JPQLParser.LANG_JPQL,
-            "SELECT o FROM RuntimeTest1 o WHERE EXISTS (SELECT rt5.runtimeTest4.name FROM RuntimeTest5 rt5 WHERE rt5.name IS NOT NULL)");
+            "SELECT o FROM RuntimeTest1 o WHERE EXISTS ("
+            + "SELECT rt5.runtimeTest4.name FROM RuntimeTest5 rt5 "
+            + "WHERE rt5.name IS NOT NULL)");
 
         ClassMetaData[] metas = q.getAccessPathMetaDatas();
         Collection c = Arrays.asList(metas);

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java Tue Jun 30 16:07:42 2009
@@ -22,6 +22,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javax.persistence.NoResultException;
+
 
 import org.apache.openjpa.persistence.query.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.query.common.apps.RuntimeTest2;
@@ -173,8 +175,8 @@
         em = (OpenJPAEntityManager) currentEntityManager();
         startTx(em);
 
-        String query =
-            "SELECT r FROM RuntimeTest2 r WHERE r.stringField = \'TestQueryResults1\'";
+        String query = "SELECT r FROM RuntimeTest2 r WHERE r.stringField = "
+            + "\'TestQueryResults1\'";
         List c = em.createQuery(query).getResultList();
 
         assertEquals(1, c.size());
@@ -247,19 +249,22 @@
             (OpenJPAEntityManager) currentEntityManager();
         startTx(em);
 
-        String query =
-            "SELECT DISTINCT r FROM RuntimeTest1 r WHERE r.stringField = \'TestQueryResults1\'";
+        String query = "SELECT DISTINCT r FROM RuntimeTest1 r WHERE "
+            + "r.stringField = \'TestQueryResults1\'";
         Object obj = em.createQuery(query).getSingleResult();
 
         assertTrue(obj instanceof RuntimeTest1);
 
-        query =
-            "SELECT DISTINCT r FROM RuntimeTest1 r WHERE r.stringField = \'xxxx\'";
+        query = "SELECT DISTINCT r FROM RuntimeTest1 r WHERE r.stringField = "
+            + "\'xxxx\'";
         OpenJPAQuery q = em.createQuery(query);
-        List l = q.getResultList();
-        assertNotNull(
-            "expecting l to be null since there is no RuntimeTest1 instance with stringfield=xxxx",
-            l);
+        try {
+            Object l = q.getSingleResult();
+            fail("Expected NoResultException since there is no RuntimeTest1 "
+                 + "instance with stringfield=xxxx");
+        } catch (NoResultException e) {
+            // good
+        }
 
         q.closeAll();
         endTx(em);
@@ -307,8 +312,8 @@
             (OpenJPAEntityManager) currentEntityManager();
         startTx(em);
 
-        OpenJPAQuery q = em.createQuery(
-            "SELECT DISTINCT r FROM RuntimeTest1 r WHERE r.stringField = \'TestQueryResults1\'");
+        OpenJPAQuery q = em.createQuery("SELECT DISTINCT r FROM RuntimeTest1 r "
+            + "WHERE r.stringField = \'TestQueryResults1\'");
         q.setFirstResult(2);
         q.setMaxResults(0);
         assertTrue(
@@ -324,8 +329,8 @@
             (OpenJPAEntityManager) currentEntityManager();
         startTx(em);
 
-        OpenJPAQuery q = em.createQuery(
-            "SELECT DISTINCT r FROM RuntimeTest1 r WHERE r.stringField = \'TestQueryResults1\'");
+        OpenJPAQuery q = em.createQuery("SELECT DISTINCT r FROM RuntimeTest1 r "
+            + "WHERE r.stringField = \'TestQueryResults1\'");
         q.setFirstResult(1);
         q.setMaxResults(1000000);
 
@@ -352,15 +357,18 @@
         endEm(em);
     }
 
-    /* This test is being commented because it was supposed to be a converted test complementing the original JDO test
-      * which uses the setUnique() method available in JDO Query. OpenJPAQuery does not have such a method and hence this test
-      * does not make sense.
+    /* This test is being commented because it was supposed to be a converted
+     * test complementing the original JDO test which uses the setUnique()
+     * method available in JDO Query. OpenJPAQuery does not have such a method
+     * and hence this test does not make sense.
       public void testUniqueThrowsExceptionIfNonUniqueRange()
      {
-         OpenJPAEntityManager em = (OpenJPAEntityManager) currentEntityManager();
+         OpenJPAEntityManager em =
+             (OpenJPAEntityManager) currentEntityManager();
          startTx(em);
 
-         OpenJPAQuery q = em.createQuery("SELECT DISTINCT r FROM RuntimeTest1 r ORDER BY r.stringField ASC");
+         OpenJPAQuery q = em.createQuery(
+            "SELECT DISTINCT r FROM RuntimeTest1 r ORDER BY r.stringField ASC");
          q.setFirstResult(1);
          q.setMaxResults(3);
 
@@ -400,7 +408,8 @@
             endEm(em);
         }
         catch (Exception uoe) {
-            //FIXME:AFAM -- Figure out JPA Equivalence of createExtent(class, false) ie how to restrict the query result to the base entity and
+            //FIXME:AFAM -- Figure out JPA Equivalence of createExtent(class,
+            //false) ie how to restrict the query result to the base entity and
             //not the subclasses
         }
     }

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java Tue Jun 30 16:07:42 2009
@@ -30,15 +30,19 @@
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.persistence.xmlmapping.entities.Customer;
 import org.apache.openjpa.persistence.xmlmapping.entities.EAddress;
 import org.apache.openjpa.persistence.xmlmapping.entities.Order;
 import org.apache.openjpa.persistence.xmlmapping.entities.Customer.CreditRating;
 import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.Address;
-import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.CANAddress;
-import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.ObjectFactory;
-import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.USAAddress;
+import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.
+        CANAddress;
+import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.
+        ObjectFactory;
+import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.
+        USAAddress;
 
 /**
  * Test query with predicates on persistent field mapped to XML column.
@@ -65,8 +69,6 @@
     public void setUp() {
         // skip test if dictionary has no support for XML column type
         if (!dictionarySupportsXMLColumn()) {
-            System.err.println("*** " + getName() + " skipped since "
-                + "DBDictionary.supportsXMLColumn property is false.");
             return;
         }
 
@@ -80,6 +82,7 @@
         em.close();
     }
 
+    @SuppressWarnings("unchecked")
     public void testXMLFieldProjection() {
         if (!enabled)
             return;
@@ -101,7 +104,8 @@
         
         em.close();
     }
-
+    
+    @SuppressWarnings("unchecked")
     public void testXMLFieldInEntity() {
         if (!enabled)
             return;
@@ -126,6 +130,7 @@
         em.close();
     }
 
+    @SuppressWarnings("unchecked")
     public void testXMLStringToXMLStringComparison() {
         if (!enabled)
             return;
@@ -153,6 +158,7 @@
         em.close();
     }
 
+    @SuppressWarnings("unchecked")
     public void testXMLStringToEmbeddedStringComparison() {
         if (!enabled)
             return;
@@ -170,6 +176,7 @@
         em.close();
     }
 
+    @SuppressWarnings("unchecked")
     public void testXMLStringToConstantStringComparison() {
         if (!enabled)
             return;
@@ -186,6 +193,7 @@
         em.close();
     }
 
+    @SuppressWarnings("unchecked")
     public void testXMLStringToParameterStringComparison() {
         if (!enabled)
             return;
@@ -203,6 +211,7 @@
         em.close();
     }
 
+    @SuppressWarnings("unchecked")
     public void testParameterStringToXMLStringComparison() {
         if (!enabled)
             return;
@@ -277,9 +286,9 @@
         
         EntityManager em = emf.createEntityManager();
         try {
-        List<Order> orders = em.createQuery(
-            "select o from Order o where o.shipAddress.city = 95141")
-            .getResultList();
+            em.createQuery(
+                "select o from Order o where o.shipAddress.city = 95141")
+                .getResultList();
         } catch (IllegalArgumentException iae) {
             return;
         } finally {
@@ -294,10 +303,9 @@
         
         EntityManager em = emf.createEntityManager();
         try {
-        List<Order> orders = em.createQuery(
-            "select o from Order o where o.shipAddress.street " +
-            "= '555 Bailey'")
-            .getResultList();
+            em.createQuery(
+                "select o from Order o where o.shipAddress.street "
+                    + "= '555 Bailey'").getResultList();
         } catch (IllegalArgumentException iae) {
             return;
         } finally {
@@ -312,9 +320,9 @@
         
         EntityManager em = emf.createEntityManager();
         try {
-        List<Order> orders = em.createQuery(
-            "select o from Order o where o.shipAddress.zip = 95141")
-            .getResultList();
+            em.createQuery(
+                "select o from Order o where o.shipAddress.zip = 95141")
+                .getResultList();
         } catch (IllegalArgumentException iae) {
             return;
         } finally {
@@ -340,15 +348,17 @@
         c1.setCid( new Customer.CustomerKey("USA", 1) );
         c1.setName("Harry's Auto");
         c1.setRating( CreditRating.GOOD );
-        c1.setAddress( new EAddress("12500 Monterey", "San Jose", "CA"
-                , "95141"));
+        c1.setAddress( new EAddress("12500 Monterey", "San Jose", "CA",
+                "95141"));
         em.persist(c1);
 
-        Order o1 = new Order(ORDER_1_OID, ORDER_1_AMOUNT, ORDER_1_DELIVERED, c1);
+        Order o1 = new Order(ORDER_1_OID, ORDER_1_AMOUNT, ORDER_1_DELIVERED,
+                c1);
         o1.setShipAddress(createUSAAddress(c1.getName()));
         em.persist(o1);
 
-        Order o2 = new Order(ORDER_2_OID, ORDER_2_AMOUNT, ORDER_2_DELIVERED, c1);
+        Order o2 = new Order(ORDER_2_OID, ORDER_2_AMOUNT, ORDER_2_DELIVERED,
+                c1);
         o2.setShipAddress(createCANAddress(c2.getName()));
         em.persist(o2);
     }
@@ -357,7 +367,8 @@
      * Check whether DBDictionary supports XML column.
      * This is done by forcing the execution of
      * {@link DBDictionary#connectedConfiguration(Connection)}.
-     * This is where some dictionaries actually determine whether XML column is supported.
+     * This is where some dictionaries actually determine whether XML column is
+     * supported.
      * @return true if {@link DBDictionary} supports XML column
      */
     private boolean dictionarySupportsXMLColumn() {

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/Address.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/Address.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/Address.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/Address.java Tue Jun 30 16:07:42 2009
@@ -1,8 +1,10 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2006.10.04 at 03:08:16 PM PDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB)
+// Reference Implementation, v2.0.2-b01-fcs
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the
+// source schema.
+// Generated on: 2006.10.04 at 03:08:16 PM PDT
 //
 
 
@@ -19,16 +21,20 @@
 /**
  * <p>Java class for Address complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>The following schema fragment specifies the expected content contained
+ * within this class.
  * 
  * <pre>
  * &lt;complexType name="Address">
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
- *         &lt;element name="Name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Street" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="3"/>
- *         &lt;element name="City" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="Name" type=
+ *             "{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="Street" type=
+ *             "{http://www.w3.org/2001/XMLSchema}string" maxOccurs="3"/>
+ *         &lt;element name="City" type=
+ *             "{http://www.w3.org/2001/XMLSchema}string"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/CANAddress.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/CANAddress.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/CANAddress.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/CANAddress.java Tue Jun 30 16:07:42 2009
@@ -1,8 +1,10 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2006.10.04 at 03:08:16 PM PDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB)
+// Reference Implementation, v2.0.2-b01-fcs
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the
+// source schema.
+// Generated on: 2006.10.04 at 03:08:16 PM PDT
 //
 
 
@@ -19,15 +21,18 @@
 /**
  * <p>Java class for CAN_Address complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>The following schema fragment specifies the expected content contained
+ * within this class.
  * 
  * <pre>
  * &lt;complexType name="CAN_Address">
  *   &lt;complexContent>
  *     &lt;extension base="{}Address">
  *       &lt;sequence>
- *         &lt;element name="Province" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="PostalCode" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="Province" type=
+ *             "{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="PostalCode" type=
+ *             "{http://www.w3.org/2001/XMLSchema}string"/>
  *       &lt;/sequence>
  *     &lt;/extension>
  *   &lt;/complexContent>

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/GBRAddress.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/GBRAddress.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/GBRAddress.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/GBRAddress.java Tue Jun 30 16:07:42 2009
@@ -1,8 +1,10 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2006.10.04 at 03:08:16 PM PDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB)
+// Reference Implementation, v2.0.2-b01-fcs
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the
+// source schema.
+// Generated on: 2006.10.04 at 03:08:16 PM PDT
 //
 
 
@@ -19,15 +21,18 @@
 /**
  * <p>Java class for GBR_Address complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>The following schema fragment specifies the expected content contained
+ * within this class.
  * 
  * <pre>
  * &lt;complexType name="GBR_Address">
  *   &lt;complexContent>
  *     &lt;extension base="{}Address">
  *       &lt;sequence>
- *         &lt;element name="County" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Postcode" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="County" type=
+ *             "{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="Postcode" type=
+ *             "{http://www.w3.org/2001/XMLSchema}string"/>
  *       &lt;/sequence>
  *     &lt;/extension>
  *   &lt;/complexContent>

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ObjectFactory.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ObjectFactory.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ObjectFactory.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ObjectFactory.java Tue Jun 30 16:07:42 2009
@@ -1,8 +1,10 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2006.10.04 at 03:08:16 PM PDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB)
+// Reference Implementation, v2.0.2-b01-fcs
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the
+// source schema.
+// Generated on: 2006.10.04 at 03:08:16 PM PDT
 //
 
 
@@ -33,12 +35,13 @@
 
     private final static QName _AddrUSA_QNAME = new QName("", "AddrUSA");
     private final static QName _AddrCAN_QNAME = new QName("", "AddrCAN");
-    private final static QName _MailAddress_QNAME = new QName("", "MailAddress");
+    private final static QName _MailAddress_QNAME =
+        new QName("", "MailAddress");
     private final static QName _AddrGBR_QNAME = new QName("", "AddrGBR");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: myaddress
-     * 
+     * Create a new ObjectFactory that can be used to create new instances of
+     * schema derived classes for package: myaddress
      */
     public ObjectFactory() {
     }
@@ -84,39 +87,50 @@
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link USAAddress }{@code >}}
-     * 
+     * Create an instance of
+     * {@link JAXBElement }{@code <}{@link USAAddress }{@code >}}
      */
-    @XmlElementDecl(namespace = "", name = "AddrUSA", substitutionHeadNamespace = "", substitutionHeadName = "MailAddress")
+    @XmlElementDecl(namespace = "", name = "AddrUSA",
+            substitutionHeadNamespace = "",
+            substitutionHeadName = "MailAddress")
     public JAXBElement<USAAddress> createAddrUSA(USAAddress value) {
-        return new JAXBElement<USAAddress>(_AddrUSA_QNAME, USAAddress.class, null, value);
+        return new JAXBElement<USAAddress>(_AddrUSA_QNAME, USAAddress.class,
+                null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CANAddress }{@code >}}
+     * Create an instance of
+     * {@link JAXBElement }{@code <}{@link CANAddress }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "", name = "AddrCAN", substitutionHeadNamespace = "", substitutionHeadName = "MailAddress")
+    @XmlElementDecl(namespace = "", name = "AddrCAN",
+            substitutionHeadNamespace = "",
+            substitutionHeadName = "MailAddress")
     public JAXBElement<CANAddress> createAddrCAN(CANAddress value) {
-        return new JAXBElement<CANAddress>(_AddrCAN_QNAME, CANAddress.class, null, value);
+        return new JAXBElement<CANAddress>(_AddrCAN_QNAME, CANAddress.class,
+                null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Address }{@code >}}
-     * 
+     * Create an instance of
+     *  {@link JAXBElement }{@code <}{@link Address }{@code >}}
      */
     @XmlElementDecl(namespace = "", name = "MailAddress")
     public JAXBElement<Address> createMailAddress(Address value) {
-        return new JAXBElement<Address>(_MailAddress_QNAME, Address.class, null, value);
+        return new JAXBElement<Address>(_MailAddress_QNAME, Address.class, null,
+                value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GBRAddress }{@code >}}
-     * 
+     * Create an instance of
+     * {@link JAXBElement }{@code <}{@link GBRAddress }{@code >}}
      */
-    @XmlElementDecl(namespace = "", name = "AddrGBR", substitutionHeadNamespace = "", substitutionHeadName = "MailAddress")
+    @XmlElementDecl(namespace = "", name = "AddrGBR",
+            substitutionHeadNamespace = "",
+            substitutionHeadName = "MailAddress")
     public JAXBElement<GBRAddress> createAddrGBR(GBRAddress value) {
-        return new JAXBElement<GBRAddress>(_AddrGBR_QNAME, GBRAddress.class, null, value);
+        return new JAXBElement<GBRAddress>(_AddrGBR_QNAME, GBRAddress.class,
+                null, value);
     }
 
 }

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ShortAddress.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ShortAddress.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ShortAddress.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ShortAddress.java Tue Jun 30 16:07:42 2009
@@ -1,8 +1,10 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2006.10.04 at 03:08:16 PM PDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB)
+// Reference Implementation, v2.0.2-b01-fcs
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the
+// source schema.
+// Generated on: 2006.10.04 at 03:08:16 PM PDT
 //
 
 
@@ -17,16 +19,20 @@
 /**
  * <p>Java class for ShortAddress complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>The following schema fragment specifies the expected content contained
+ * within this class.
  * 
  * <pre>
  * &lt;complexType name="ShortAddress">
  *   &lt;complexContent>
  *     &lt;restriction base="{}Address">
  *       &lt;sequence>
- *         &lt;element name="Name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Street" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="City" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="Name" type=
+ *             "{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="Street" type=
+ *             "{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="City" type=
+ *             "{http://www.w3.org/2001/XMLSchema}string"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/USAAddress.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/USAAddress.java?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/USAAddress.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/USAAddress.java Tue Jun 30 16:07:42 2009
@@ -1,8 +1,10 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2006.10.04 at 03:08:16 PM PDT 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB)
+// Reference Implementation, v2.0.2-b01-fcs
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the
+// source schema.
+// Generated on: 2006.10.04 at 03:08:16 PM PDT
 //
 
 
@@ -19,14 +21,16 @@
 /**
  * <p>Java class for USA_Address complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>The following schema fragment specifies the expected content contained
+ * within this class.
  * 
  * <pre>
  * &lt;complexType name="USA_Address">
  *   &lt;complexContent>
  *     &lt;extension base="{}Address">
  *       &lt;sequence>
- *         &lt;element name="State" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="State" type=
+ *             "{http://www.w3.org/2001/XMLSchema}string"/>
  *         &lt;element name="ZIP" type="{}USPS_ZIP"/>
  *       &lt;/sequence>
  *     &lt;/extension>

Modified: openjpa/branches/1.3.x/openjpa-project/checkstyle.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-project/checkstyle.xml?rev=789813&r1=789812&r2=789813&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-project/checkstyle.xml (original)
+++ openjpa/branches/1.3.x/openjpa-project/checkstyle.xml Tue Jun 30 16:07:42 2009
@@ -30,10 +30,10 @@
 <module name="Checker">
 <!--
     <module name="NewlineAtEndOfFile"/>
+-->
     <module name="TreeWalker">
         <module name="LineLength">
         <property name="max" value="120"/>
         </module>
     </module>
--->
 </module>



Mime
View raw message