openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ppod...@apache.org
Subject svn commit: r787832 [1/6] - in /openjpa/trunk: ./ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ openjpa-persistence-jdbc/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/ openjpa-persistence-jdbc/src/test/java/...
Date Tue, 23 Jun 2009 21:04:35 GMT
Author: ppoddar
Date: Tue Jun 23 21:04:32 2009
New Revision: 787832

URL: http://svn.apache.org/viewvc?rev=787832&view=rev
Log:
OPENJPA-1143: Build dependency to 1.0-EA3-SNAPSHOT (latest unpublished JPA Spec), refactored MetaModel/CriteriaQuery API to compile against the new JPA API, line length limit increased to 120

Added:
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java   (with props)
Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RuntimeStrategyInstaller.java
    openjpa/trunk/openjpa-persistence-jdbc/pom.xml
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJoinCondition.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestSubqueries.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Transaction_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ArrayMember_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed0_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/Embed1_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccessMixed_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitFieldAccess_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccessMixed_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ExplicitPropertyAccess_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessBase.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessBase_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass_.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuerySPI.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ExpressionImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OrderImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/RootImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Types.java
    openjpa/trunk/openjpa-project/checkstyle.xml
    openjpa/trunk/pom.xml

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java Tue Jun 23 21:04:32 2009
@@ -1270,8 +1270,7 @@
         }
     }
     
-    public void endConfiguration()
-    {
+    public void endConfiguration() {
         super.endConfiguration();
 
         JDBCConfiguration conf = (JDBCConfiguration) getConfiguration();

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RuntimeStrategyInstaller.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RuntimeStrategyInstaller.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RuntimeStrategyInstaller.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RuntimeStrategyInstaller.java Tue Jun 23 21:04:32 2009
@@ -68,10 +68,8 @@
                     || field.getMappedBy() != null
                     || field.getMappingInfo().hasSchemaComponents()
                     || field.getValueInfo().hasSchemaComponents()
-                    || field.getElementMapping().getValueInfo().
-                    hasSchemaComponents()
-                    || field.getKeyMapping().getValueInfo().
-                    hasSchemaComponents())
+                    || field.getElementMapping().getValueInfo().hasSchemaComponents()
+                    || field.getKeyMapping().getValueInfo().hasSchemaComponents())
                     throw mde;
 
                 strategy = NoneFieldStrategy.getInstance();

Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Tue Jun 23 21:04:32 2009
@@ -815,8 +815,12 @@
                         <!-- You can exclude the lockmgr test to save ~15 mins.
                         <exclude>org/apache/openjpa/persistence/lockmgr/*.java</exclude>
                         -->
-
+						<!-- ================================================================== -->
+						<!--  Critera & MetaModel tests are *temporarily* excluded to wait for  -->
+						<!--  spec to stabilize on Result Processing API                        -->
+						<!-- ================================================================== --> 
                         <exclude>org/apache/openjpa/persistence/criteria/*.java</exclude>
+                        <exclude>org/apache/openjpa/persistence/meta/*.java</exclude>
                         
                         <!-- Exclude subclassing tests   -->
                         <exclude>org/apache/openjpa/**/TestUnenhanced*.java</exclude>

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/A_.java Tue Jun 23 21:04:32 2009
@@ -4,12 +4,12 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.A.class)
 public class A_ {
-    public static volatile Attribute<A,B> b;
-    public static volatile Attribute<A,Long> id;
-    public static volatile Attribute<A,String> name;
+    public static volatile SingularAttribute<A,B> b;
+    public static volatile SingularAttribute<A,Long> id;
+    public static volatile SingularAttribute<A,String> name;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account_.java Tue Jun 23 21:04:32 2009
@@ -4,14 +4,14 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Account.class)
 public class Account_ {
-    public static volatile Attribute<Account,Integer> balance;
-    public static volatile Attribute<Account,Long> id;
-    public static volatile Attribute<Account,Integer> loan;
-    public static volatile Attribute<Account,String> name;
-    public static volatile Attribute<Account,Person> owner;
+    public static volatile SingularAttribute<Account,Integer> balance;
+    public static volatile SingularAttribute<Account,Long> id;
+    public static volatile SingularAttribute<Account,Integer> loan;
+    public static volatile SingularAttribute<Account,String> name;
+    public static volatile SingularAttribute<Account,Person> owner;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Address_.java Tue Jun 23 21:04:32 2009
@@ -4,17 +4,17 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Address.class)
 public class Address_ {
-    public static volatile Attribute<Address,String> city;
-    public static volatile Attribute<Address,String> country;
-    public static volatile Attribute<Address,String> county;
-    public static volatile Attribute<Address,Long> id;
-    public static volatile Attribute<Address,String> state;
-    public static volatile Attribute<Address,String> street;
-    public static volatile Attribute<Address,CompUser> user;
-    public static volatile Attribute<Address,String> zipCode;
+    public static volatile SingularAttribute<Address,String> city;
+    public static volatile SingularAttribute<Address,String> country;
+    public static volatile SingularAttribute<Address,String> county;
+    public static volatile SingularAttribute<Address,Long> id;
+    public static volatile SingularAttribute<Address,String> state;
+    public static volatile SingularAttribute<Address,String> street;
+    public static volatile SingularAttribute<Address,CompUser> user;
+    public static volatile SingularAttribute<Address,String> zipCode;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/B_.java Tue Jun 23 21:04:32 2009
@@ -4,11 +4,11 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.B.class)
 public class B_ {
-    public static volatile Attribute<B,Integer> age;
-    public static volatile Attribute<B,Long> id;
+    public static volatile SingularAttribute<B,Integer> age;
+    public static volatile SingularAttribute<B,Long> id;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/C_.java Tue Jun 23 21:04:32 2009
@@ -4,19 +4,19 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Collection;
-import javax.persistence.metamodel.List;
-import javax.persistence.metamodel.Map;
-import javax.persistence.metamodel.Set;
+import javax.persistence.metamodel.CollectionAttribute;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.MapAttribute;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.C.class)
 public class C_ {
-    public static volatile Collection<C,D> coll;
-    public static volatile Attribute<C,Long> id;
-    public static volatile List<C,D> list;
-    public static volatile Map<C,Integer,D> map;
-    public static volatile Attribute<C,String> name;
-    public static volatile Set<C,D> set;
+    public static volatile CollectionAttribute<C,D> coll;
+    public static volatile SingularAttribute<C,Long> id;
+    public static volatile ListAttribute<C,D> list;
+    public static volatile MapAttribute<C,Integer,D> map;
+    public static volatile SingularAttribute<C,String> name;
+    public static volatile SetAttribute<C,D> set;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java Tue Jun 23 21:04:32 2009
@@ -4,18 +4,18 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.List;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 import org.apache.openjpa.persistence.criteria.CompUser.CreditRating;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.CompUser.class)
 public class CompUser_ {
-    public static volatile Attribute<CompUser,Address> address;
-    public static volatile Attribute<CompUser,Integer> age;
-    public static volatile Attribute<CompUser,String> computerName;
-    public static volatile Attribute<CompUser,CreditRating> creditRating;
-    public static volatile Attribute<CompUser,String> name;
-    public static volatile List<CompUser,String> nicknames;
-    public static volatile Attribute<CompUser,Integer> userid;
+    public static volatile SingularAttribute<CompUser,Address> address;
+    public static volatile SingularAttribute<CompUser,Integer> age;
+    public static volatile SingularAttribute<CompUser,String> computerName;
+    public static volatile SingularAttribute<CompUser,CreditRating> creditRating;
+    public static volatile SingularAttribute<CompUser,String> name;
+    public static volatile ListAttribute<CompUser,String> nicknames;
+    public static volatile SingularAttribute<CompUser,Integer> userid;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contact_.java Tue Jun 23 21:04:32 2009
@@ -4,12 +4,12 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.List;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Contact.class)
 public class Contact_ {
-    public static volatile Attribute<Contact,Address> address;
-    public static volatile List<Contact,Phone> phones;
+    public static volatile SingularAttribute<Contact,Address> address;
+    public static volatile ListAttribute<Contact,Phone> phones;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Contractor_.java Tue Jun 23 21:04:32 2009
@@ -5,7 +5,7 @@
 package org.apache.openjpa.persistence.criteria;
 
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Contractor.class)
 public class Contractor_ extends Person_  {
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Course_.java Tue Jun 23 21:04:32 2009
@@ -4,13 +4,13 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.List;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Course.class)
 public class Course_ {
-    public static volatile Attribute<Course,Long> id;
-    public static volatile Attribute<Course,String> name;
-    public static volatile List<Course,Student> studentWaitList;
+    public static volatile SingularAttribute<Course,Long> id;
+    public static volatile SingularAttribute<Course,String> name;
+    public static volatile ListAttribute<Course,Student> studentWaitList;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CreditCard_.java Tue Jun 23 21:04:32 2009
@@ -4,13 +4,13 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.List;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.CreditCard.class)
 public class CreditCard_ {
-    public static volatile Attribute<CreditCard,Customer> customer;
-    public static volatile Attribute<CreditCard,Long> id;
-    public static volatile List<CreditCard,TransactionHistory> transactionHistory;
+    public static volatile SingularAttribute<CreditCard,Customer> customer;
+    public static volatile SingularAttribute<CreditCard,Long> id;
+    public static volatile ListAttribute<CreditCard,TransactionHistory> transactionHistory;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java Tue Jun 23 21:04:32 2009
@@ -4,24 +4,24 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.List;
-import javax.persistence.metamodel.Set;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 import org.apache.openjpa.persistence.criteria.Customer.CreditRating;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Customer.class)
 public class Customer_ {
-    public static volatile Attribute<Customer,Long> accountNum;
-    public static volatile List<Customer,Account> accounts;
-    public static volatile Attribute<Customer,Address> address;
-    public static volatile Attribute<Customer,Integer> balanceOwed;
-    public static volatile Attribute<Customer,CreditRating> creditRating;
-    public static volatile Attribute<Customer,Integer> filledOrderCount;
-    public static volatile Attribute<Customer,String> firstName;
-    public static volatile Attribute<Customer,Long> id;
-    public static volatile Attribute<Customer,String> lastName;
-    public static volatile Attribute<Customer,String> name;
-    public static volatile Set<Customer,Order> orders;
-    public static volatile Attribute<Customer,Integer> status;
+    public static volatile SingularAttribute<Customer,Long> accountNum;
+    public static volatile ListAttribute<Customer,Account> accounts;
+    public static volatile SingularAttribute<Customer,Address> address;
+    public static volatile SingularAttribute<Customer,Integer> balanceOwed;
+    public static volatile SingularAttribute<Customer,CreditRating> creditRating;
+    public static volatile SingularAttribute<Customer,Integer> filledOrderCount;
+    public static volatile SingularAttribute<Customer,String> firstName;
+    public static volatile SingularAttribute<Customer,Long> id;
+    public static volatile SingularAttribute<Customer,String> lastName;
+    public static volatile SingularAttribute<Customer,String> name;
+    public static volatile SetAttribute<Customer,Order> orders;
+    public static volatile SingularAttribute<Customer,Integer> status;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/D_.java Tue Jun 23 21:04:32 2009
@@ -4,12 +4,12 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.D.class)
 public class D_ {
-    public static volatile Attribute<D,C> c;
-    public static volatile Attribute<D,Long> id;
-    public static volatile Attribute<D,String> name;
+    public static volatile SingularAttribute<D,C> c;
+    public static volatile SingularAttribute<D,Long> id;
+    public static volatile SingularAttribute<D,String> name;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Department_.java Tue Jun 23 21:04:32 2009
@@ -4,13 +4,13 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Set;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Department.class)
 public class Department_ {
-    public static volatile Attribute<Department,Integer> deptNo;
-    public static volatile Set<Department,Employee> employees;
-    public static volatile Attribute<Department,String> name;
+    public static volatile SingularAttribute<Department,Integer> deptNo;
+    public static volatile SetAttribute<Department,Employee> employees;
+    public static volatile SingularAttribute<Department,String> name;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java Tue Jun 23 21:04:32 2009
@@ -1,22 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 /** 
  *  Generated by OpenJPA MetaModel Generator Tool.
 **/
@@ -24,12 +5,12 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.util.Date;
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel(
-    value=org.apache.openjpa.persistence.criteria.DependentId.class)
+@javax.persistence.metamodel.StaticMetamodel
+(value=org.apache.openjpa.persistence.criteria.DependentId.class)
 public class DependentId_ {
-    public static volatile Attribute<DependentId,Date> effDate;
-    public static volatile Attribute<DependentId,Long> empid;
-    public static volatile Attribute<DependentId,String> name;
+    public static volatile SingularAttribute<DependentId,Date> effDate;
+    public static volatile SingularAttribute<DependentId,Long> empid;
+    public static volatile SingularAttribute<DependentId,String> name;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java Tue Jun 23 21:04:32 2009
@@ -1,22 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 /** 
  *  Generated by OpenJPA MetaModel Generator Tool.
 **/
@@ -24,13 +5,13 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.util.Date;
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel(
-    value=org.apache.openjpa.persistence.criteria.Dependent.class)
+@javax.persistence.metamodel.StaticMetamodel
+(value=org.apache.openjpa.persistence.criteria.Dependent.class)
 public class Dependent_ {
-    public static volatile Attribute<Dependent,Integer> curStatusId;
-    public static volatile Attribute<Dependent,Employee> emp;
-    public static volatile Attribute<Dependent,Date> endDate;
-    public static volatile Attribute<Dependent,DependentId> id;
+    public static volatile SingularAttribute<Dependent,Integer> curStatusId;
+    public static volatile SingularAttribute<Dependent,Employee> emp;
+    public static volatile SingularAttribute<Dependent,Date> endDate;
+    public static volatile SingularAttribute<Dependent,DependentId> id;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Employee_.java Tue Jun 23 21:04:32 2009
@@ -4,18 +4,18 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Employee.class)
 public class Employee_ {
-    public static volatile Attribute<Employee,Contact> contactInfo;
-    public static volatile Attribute<Employee,Department> department;
-    public static volatile Attribute<Employee,Integer> empId;
-    public static volatile Attribute<Employee,FrequentFlierPlan> frequentFlierPlan;
-    public static volatile Attribute<Employee,Manager> manager;
-    public static volatile Attribute<Employee,String> name;
-    public static volatile Attribute<Employee,Integer> rating;
-    public static volatile Attribute<Employee,Long> salary;
-    public static volatile Attribute<Employee,Employee> spouse;
+    public static volatile SingularAttribute<Employee,Contact> contactInfo;
+    public static volatile SingularAttribute<Employee,Department> department;
+    public static volatile SingularAttribute<Employee,Integer> empId;
+    public static volatile SingularAttribute<Employee,FrequentFlierPlan> frequentFlierPlan;
+    public static volatile SingularAttribute<Employee,Manager> manager;
+    public static volatile SingularAttribute<Employee,String> name;
+    public static volatile SingularAttribute<Employee,Integer> rating;
+    public static volatile SingularAttribute<Employee,Long> salary;
+    public static volatile SingularAttribute<Employee,Employee> spouse;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java Tue Jun 23 21:04:32 2009
@@ -5,10 +5,10 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.util.Date;
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Exempt.class)
 public class Exempt_ extends Employee_  {
-    public static volatile Attribute<Exempt,Date> hireDate;
+    public static volatile SingularAttribute<Exempt,Date> hireDate;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FemaleUser_.java Tue Jun 23 21:04:32 2009
@@ -5,7 +5,7 @@
 package org.apache.openjpa.persistence.criteria;
 
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.FemaleUser.class)
 public class FemaleUser_ extends CompUser_  {
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/FrequentFlierPlan_.java Tue Jun 23 21:04:32 2009
@@ -4,12 +4,12 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.FrequentFlierPlan.class)
 public class FrequentFlierPlan_ {
-    public static volatile Attribute<FrequentFlierPlan,Integer> annualMiles;
-    public static volatile Attribute<FrequentFlierPlan,String> id;
-    public static volatile Attribute<FrequentFlierPlan,String> name;
+    public static volatile SingularAttribute<FrequentFlierPlan,Integer> annualMiles;
+    public static volatile SingularAttribute<FrequentFlierPlan,String> id;
+    public static volatile SingularAttribute<FrequentFlierPlan,String> name;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Item_.java Tue Jun 23 21:04:32 2009
@@ -4,13 +4,13 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Map;
+import javax.persistence.metamodel.MapAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Item.class)
 public class Item_ {
-    public static volatile Attribute<Item,Integer> id;
-    public static volatile Attribute<Item,String> name;
-    public static volatile Map<Item,String,Photo> photos;
+    public static volatile SingularAttribute<Item,Integer> id;
+    public static volatile SingularAttribute<Item,String> name;
+    public static volatile MapAttribute<Item,String,Photo> photos;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/LineItem_.java Tue Jun 23 21:04:32 2009
@@ -4,15 +4,15 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.LineItem.class)
 public class LineItem_ {
-    public static volatile Attribute<LineItem,Double> cost;
-    public static volatile Attribute<LineItem,Integer> id;
-    public static volatile Attribute<LineItem,Order> order;
-    public static volatile Attribute<LineItem,Double> price;
-    public static volatile Attribute<LineItem,Product> product;
-    public static volatile Attribute<LineItem,Integer> quantity;
+    public static volatile SingularAttribute<LineItem,Double> cost;
+    public static volatile SingularAttribute<LineItem,Integer> id;
+    public static volatile SingularAttribute<LineItem,Order> order;
+    public static volatile SingularAttribute<LineItem,Double> price;
+    public static volatile SingularAttribute<LineItem,Product> product;
+    public static volatile SingularAttribute<LineItem,Integer> quantity;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java Tue Jun 23 21:04:32 2009
@@ -1,22 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 /** 
  *  Generated by OpenJPA MetaModel Generator Tool.
 **/
@@ -24,13 +5,14 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.sql.Date;
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel(
-    value=org.apache.openjpa.persistence.criteria.Magazine.class)
+@javax.persistence.metamodel.StaticMetamodel
+(value=org.apache.openjpa.persistence.criteria.Magazine.class)
 public class Magazine_ {
-    public static volatile Attribute<Magazine,Date> datePublished;
-    public static volatile Attribute<Magazine,Integer> id;
-    public static volatile Attribute<Magazine,Publisher> idPublisher;
-    public static volatile Attribute<Magazine,String> name;
+    public static volatile SingularAttribute<Magazine,Date> datePublished;
+    public static volatile SingularAttribute<Magazine,Integer> id;
+    public static volatile SingularAttribute<Magazine,Publisher> idPublisher;
+    public static volatile SingularAttribute<Magazine,String> name;
+    public static volatile SingularAttribute<Magazine,Long> serialVersionUID;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser_.java Tue Jun 23 21:04:32 2009
@@ -5,7 +5,7 @@
 package org.apache.openjpa.persistence.criteria;
 
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.MaleUser.class)
 public class MaleUser_ extends CompUser_  {
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java Tue Jun 23 21:04:32 2009
@@ -5,13 +5,13 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.math.BigDecimal;
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Manager.class)
 public class Manager_ {
-    public static volatile Attribute<Manager,Department> department;
-    public static volatile Attribute<Manager,Integer> id;
-    public static volatile Attribute<Manager,String> name;
-    public static volatile Attribute<Manager,BigDecimal> salary;
+    public static volatile SingularAttribute<Manager,Department> department;
+    public static volatile SingularAttribute<Manager,Integer> id;
+    public static volatile SingularAttribute<Manager,String> name;
+    public static volatile SingularAttribute<Manager,BigDecimal> salary;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie_.java Tue Jun 23 21:04:32 2009
@@ -4,11 +4,11 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Movie.class)
 public class Movie_ {
-    public static volatile Attribute<Movie,Integer> id;
-    public static volatile Attribute<Movie,String> title;
+    public static volatile SingularAttribute<Movie,Integer> id;
+    public static volatile SingularAttribute<Movie,String> title;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java Tue Jun 23 21:04:32 2009
@@ -5,18 +5,18 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.sql.Timestamp;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.List;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Order.class)
 public class Order_ {
-    public static volatile Attribute<Order,Integer> count;
-    public static volatile Attribute<Order,Customer> customer;
-    public static volatile Attribute<Order,Boolean> delivered;
-    public static volatile Attribute<Order,Integer> id;
-    public static volatile List<Order,LineItem> lineItems;
-    public static volatile Attribute<Order,Timestamp> orderTs;
-    public static volatile Attribute<Order,Integer> quantity;
-    public static volatile Attribute<Order,Double> totalCost;
+    public static volatile SingularAttribute<Order,Integer> count;
+    public static volatile SingularAttribute<Order,Customer> customer;
+    public static volatile SingularAttribute<Order,Boolean> delivered;
+    public static volatile SingularAttribute<Order,Integer> id;
+    public static volatile ListAttribute<Order,LineItem> lineItems;
+    public static volatile SingularAttribute<Order,Timestamp> orderTs;
+    public static volatile SingularAttribute<Order,Integer> quantity;
+    public static volatile SingularAttribute<Order,Double> totalCost;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Person_.java Tue Jun 23 21:04:32 2009
@@ -4,13 +4,13 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Set;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Person.class)
 public class Person_ {
-    public static volatile Attribute<Person,Integer> id;
-    public static volatile Attribute<Person,String> name;
-    public static volatile Set<Person,String> nickNames;
+    public static volatile SingularAttribute<Person,Integer> id;
+    public static volatile SingularAttribute<Person,String> name;
+    public static volatile SetAttribute<Person,String> nickNames;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone_.java Tue Jun 23 21:04:32 2009
@@ -4,13 +4,13 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Collection;
+import javax.persistence.metamodel.CollectionAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Phone.class)
 public class Phone_ {
-    public static volatile Collection<Phone,Employee> employees;
-    public static volatile Attribute<Phone,Integer> id;
-    public static volatile Attribute<Phone,String> vendor;
+    public static volatile CollectionAttribute<Phone,Employee> employees;
+    public static volatile SingularAttribute<Phone,Integer> id;
+    public static volatile SingularAttribute<Phone,String> vendor;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Photo_.java Tue Jun 23 21:04:32 2009
@@ -4,11 +4,11 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Photo.class)
 public class Photo_ {
-    public static volatile Attribute<Photo,Integer> id;
-    public static volatile Attribute<Photo,String> label;
+    public static volatile SingularAttribute<Photo,Integer> id;
+    public static volatile SingularAttribute<Photo,String> label;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product_.java Tue Jun 23 21:04:32 2009
@@ -4,12 +4,12 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Product.class)
 public class Product_ {
-    public static volatile Attribute<Product,Integer> pid;
-    public static volatile Attribute<Product,String> productType;
-    public static volatile Attribute<Product,Long> version;
+    public static volatile SingularAttribute<Product,Integer> pid;
+    public static volatile SingularAttribute<Product,String> productType;
+    public static volatile SingularAttribute<Product,Long> version;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher_.java Tue Jun 23 21:04:32 2009
@@ -1,35 +1,17 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 /** 
  *  Generated by OpenJPA MetaModel Generator Tool.
 **/
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Set;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel(
-    value=org.apache.openjpa.persistence.criteria.Publisher.class)
+@javax.persistence.metamodel.StaticMetamodel
+(value=org.apache.openjpa.persistence.criteria.Publisher.class)
 public class Publisher_ {
-    public static volatile Attribute<Publisher,Integer> id;
-    public static volatile Set<Publisher,Magazine> magazineCollection;
-    public static volatile Attribute<Publisher,String> name;
+    public static volatile SingularAttribute<Publisher,Integer> id;
+    public static volatile SetAttribute<Publisher,Magazine> magazineCollection;
+    public static volatile SingularAttribute<Publisher,String> name;
+    public static volatile SingularAttribute<Publisher,Long> serialVersionUID;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Semester_.java Tue Jun 23 21:04:32 2009
@@ -4,11 +4,11 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Semester.class)
 public class Semester_ {
-    public static volatile Attribute<Semester,Integer> id;
-    public static volatile Attribute<Semester,String> name;
+    public static volatile SingularAttribute<Semester,Integer> id;
+    public static volatile SingularAttribute<Semester,String> name;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student_.java Tue Jun 23 21:04:32 2009
@@ -4,13 +4,13 @@
 
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Map;
+import javax.persistence.metamodel.MapAttribute;
+import javax.persistence.metamodel.SingularAttribute;
 
-@javax.persistence.metamodel.TypesafeMetamodel
+@javax.persistence.metamodel.StaticMetamodel
 (value=org.apache.openjpa.persistence.criteria.Student.class)
 public class Student_ {
-    public static volatile Map<Student,Course,Semester> enrollment;
-    public static volatile Attribute<Student,Integer> id;
-    public static volatile Attribute<Student,String> name;
+    public static volatile MapAttribute<Student,Course,Semester> enrollment;
+    public static volatile SingularAttribute<Student,Integer> id;
+    public static volatile SingularAttribute<Student,String> name;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJoinCondition.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJoinCondition.java?rev=787832&r1=787831&r2=787832&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJoinCondition.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJoinCondition.java Tue Jun 23 21:04:32 2009
@@ -26,43 +26,37 @@
     }
 
     public void testSingleAttributeJoinModel() {
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<A> a = cq.from(A.class);
         Join<A,B> b = a.join(A_.b);
         assertTrue(b.getModel() instanceof Bindable);
         assertSame(B.class, b.getJavaType());
-        assertSame(B.class, b.getMember().getMemberJavaType());
-        assertEquals(Bindable.BindableType.MANAGED_TYPE,
-           b.getModel().getBindableType());
     }
     
     public void testCollectionJoinModel() {
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<C> c = cq.from(C.class);
         CollectionJoin<C,D> d = c.join(C_.coll);
         assertSame(Collection.class, d.getJavaType());
-        assertSame(D.class, d.getMember().getMemberJavaType());
     }
     
     public void testSetJoinModel() {
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<C> c = cq.from(C.class);
         SetJoin<C,D> d = c.join(C_.set);
         assertSame(Set.class, d.getJavaType());
-        assertSame(D.class, d.getMember().getMemberJavaType());
     }
     
     public void testListJoinModel() {
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<C> c = cq.from(C.class);
         ListJoin<C,D> d = c.join(C_.list);
         assertSame(List.class, d.getJavaType());
-        assertSame(D.class, d.getMember().getMemberJavaType());
     }
     
     public void testInnerJoinSingleAttributeWithoutCondition() {
         String jpql = "select a from A a INNER JOIN a.b b";
-        CriteriaQuery c = cb.create();
+        CriteriaQuery<?> c = cb.createQuery();
         c.from(A.class).join(A_.b, JoinType.INNER);
         
         assertEquivalence(c, jpql);
@@ -70,7 +64,7 @@
     
     public void testCrossJoinWithoutCondition() {
         String jpql = "select a from A a, C c";
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<A> a = cq.from(A.class);
         Root<C> c = cq.from(C.class);
         
@@ -79,7 +73,7 @@
     
     public void testCrossJoin() {
         String jpql = "select a from A a, C c where a.name=c.name";
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<A> a = cq.from(A.class);
         Root<C> c = cq.from(C.class);
         cq.where(cb.equal(a.get(A_.name), c.get(C_.name)));
@@ -89,7 +83,7 @@
 
     public void testInnerJoinSingleAttribute() {
         String jpql = "select a from A a INNER JOIN a.b b WHERE a.id=b.age";
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<A> a = cq.from(A.class);
         Join<A,B> b = a.join(A_.b);
         cq.where(cb.equal(a.get(A_.id), b.get(B_.age)));
@@ -99,7 +93,7 @@
     
     public void testOuterJoinSingleAttributeWithoutCondition() {
         String jpql = "select a from A a LEFT JOIN a.b b";
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<A> a = cq.from(A.class);
         Join<A,B> b = a.join(A_.b, JoinType.LEFT);
         
@@ -108,7 +102,7 @@
     
     public void testOuterJoinSingleAttribute() {
         String jpql = "select a from A a LEFT JOIN a.b b where a.id=b.age";
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<A> a = cq.from(A.class);
         Join<A,B> b = a.join(A_.b, JoinType.LEFT);
         cq.where(cb.equal(a.get(A_.id), b.get(B_.age)));
@@ -118,7 +112,7 @@
 
     public void testSetJoinWithoutCondition() {
         String jpql = "select c from C c JOIN c.set d";
-        CriteriaQuery c = cb.create();
+        CriteriaQuery<?> c = cb.createQuery();
         c.from(C.class).join(C_.set);
         
         assertEquivalence(c, jpql);
@@ -126,7 +120,7 @@
     
     public void testListJoinWithoutCondition() {
         String jpql = "select c from C c JOIN c.list d";
-        CriteriaQuery c = cb.create();
+        CriteriaQuery<?> c = cb.createQuery();
         c.from(C.class).join(C_.list);
         
         assertEquivalence(c, jpql);
@@ -134,7 +128,7 @@
     
     public void testCollectionJoinWithoutCondition() {
         String jpql = "select c from C c JOIN c.coll d";
-        CriteriaQuery c = cb.create();
+        CriteriaQuery<?> c = cb.createQuery();
         c.from(C.class).join(C_.coll);
         
         assertEquivalence(c, jpql);
@@ -142,7 +136,7 @@
     
     public void testMapJoinWithoutCondition() {
         String jpql = "select c from C c JOIN c.map d";
-        CriteriaQuery c = cb.create();
+        CriteriaQuery<?> c = cb.createQuery();
         c.from(C.class).join(C_.map);
         
         assertEquivalence(c, jpql);
@@ -150,7 +144,7 @@
  
     public void testKeyExpression() {
         String jpql = "select c from C c JOIN c.map d where KEY(d)=33";
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<C> c = cq.from(C.class);
         MapJoin<C,Integer,D> d = c.join(C_.map);
         cq.where(cb.equal(d.key(),33));
@@ -160,7 +154,7 @@
     
     public void testValueExpression() {
         String jpql = "select c from C c JOIN c.map d where VALUE(d).name='xy'";
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<C> c = cq.from(C.class);
         MapJoin<C,Integer,D> d = c.join(C_.map);
         cq.where(cb.equal(d.value().get(D_.name),"xy"));
@@ -171,7 +165,7 @@
     public void testFetchJoin() {
         String jpql = "select a from A a JOIN FETCH a.b";
         
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<A> a = cq.from(A.class);
         a.fetch(A_.b);
         
@@ -181,7 +175,7 @@
     public void testOuterFetchJoin() {
         String jpql = "select a from A a LEFT JOIN FETCH a.b";
         
-        CriteriaQuery cq = cb.create();
+        CriteriaQuery<?> cq = cb.createQuery();
         Root<A> a = cq.from(A.class);
         a.fetch(A_.b, JoinType.LEFT);
         



Mime
View raw message