geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r824215 [2/3] - in /geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence: ./ criteria/ metamodel/ spi/
Date Mon, 12 Oct 2009 02:23:16 GMT
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQueries.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQueries.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQueries.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQueries.java Mon Oct 12 02:23:08 2009
@@ -22,18 +22,17 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-package javax.persistence;
+package javax.persistence; 
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE})  
+@Retention(RUNTIME) 
+public @interface NamedQueries { 
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface NamedQueries {
-    NamedQuery[] value();
+     NamedQuery [] value (); 
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQuery.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQuery.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQuery.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQuery.java Mon Oct 12 02:23:08 2009
@@ -24,22 +24,21 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static javax.persistence.LockModeType.NONE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
+@Target({TYPE}) 
+@Retention(RUNTIME)
 public @interface NamedQuery {
+
     String name();
 
     String query();
 
-    LockModeType lockMode() default LockModeType.NONE;
-
+    LockModeType lockMode() default NONE;
     QueryHint[] hints() default {};
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToMany.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToMany.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToMany.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToMany.java Mon Oct 12 02:23:08 2009
@@ -24,22 +24,25 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import javax.persistence.CascadeType;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.FetchType.LAZY;
+
+
+@Target({METHOD, FIELD}) 
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
 public @interface OneToMany {
+
     Class targetEntity() default void.class;
 
     CascadeType[] cascade() default {};
 
-    FetchType fetch() default FetchType.LAZY;
+    FetchType fetch() default LAZY;
 
     String mappedBy() default "";
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToOne.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToOne.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToOne.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToOne.java Mon Oct 12 02:23:08 2009
@@ -24,27 +24,30 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import javax.persistence.CascadeType;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.FetchType.EAGER;
+
+
+@Target({METHOD, FIELD}) 
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
 public @interface OneToOne {
+
     Class targetEntity() default void.class;
 
     CascadeType[] cascade() default {};
 
-    FetchType fetch() default FetchType.EAGER;
+    FetchType fetch() default EAGER;
 
     boolean optional() default true;
 
     String mappedBy() default "";
 
+
     boolean orphanRemoval() default false;
 }
-

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderBy.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderBy.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderBy.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderBy.java Mon Oct 12 02:23:08 2009
@@ -24,17 +24,17 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({METHOD, FIELD}) 
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
 public @interface OrderBy {
+
     String value() default "";
 }
-

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderColumn.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderColumn.java Mon Oct 12 02:23:08 2009
@@ -24,23 +24,24 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target( { METHOD, FIELD })
+@Retention(RUNTIME)
 public @interface OrderColumn {
 
-    String name() default "";
-    
-    boolean nullable() default true;
-    
-    boolean insertable() default true;
-    
-    boolean updatable() default true;
-    
-    String columnDefinition() default "";
-    
+	String name() default "";
+
+	boolean nullable() default true;
+
+	boolean insertable() default true;
+
+	boolean updatable() default true;
+
+	String columnDefinition() default "";
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Parameter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Parameter.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Parameter.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Parameter.java Mon Oct 12 02:23:08 2009
@@ -22,7 +22,6 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-
 package javax.persistence;
 
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContext.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContext.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContext.java Mon Oct 12 02:23:08 2009
@@ -24,17 +24,17 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.*;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.*;
+
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({TYPE, METHOD, FIELD})
+@Retention(RUNTIME)
 public @interface PersistenceContext {
+
     String name() default "";
 
     String unitName() default "";
@@ -43,4 +43,3 @@
 
     PersistenceProperty[] properties() default {};
 }
-

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContextType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContextType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContextType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContextType.java Mon Oct 12 02:23:08 2009
@@ -24,9 +24,10 @@
 //
 package javax.persistence;
 
-/**
- * @version $Rev$ $Date$
- */
+
 public enum PersistenceContextType {
-    TRANSACTION, EXTENDED
-}
\ No newline at end of file
+
+    TRANSACTION,
+
+    EXTENDED
+}

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContexts.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContexts.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContexts.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContexts.java Mon Oct 12 02:23:08 2009
@@ -24,16 +24,16 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.*;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.*;
+
 
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Target({TYPE})
+@Retention(RUNTIME)
 public @interface PersistenceContexts {
+
     PersistenceContext[] value();
+
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceProperty.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceProperty.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceProperty.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceProperty.java Mon Oct 12 02:23:08 2009
@@ -24,14 +24,17 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.*;
+
 
 @Target({})
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RUNTIME)
 public @interface PersistenceProperty {
+
     String name();
 
     String value();
+
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnit.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnit.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnit.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnit.java Mon Oct 12 02:23:08 2009
@@ -24,19 +24,19 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.*;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.*;
+
+
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+@Target({TYPE, METHOD, FIELD})
+@Retention(RUNTIME)
 public @interface PersistenceUnit {
+
     String name() default "";
 
     String unitName() default "";
-}
 
+}

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnitUtil.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnitUtil.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnitUtil.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnitUtil.java Mon Oct 12 02:23:08 2009
@@ -22,7 +22,6 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-
 package javax.persistence;
 
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnits.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnits.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnits.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnits.java Mon Oct 12 02:23:08 2009
@@ -24,16 +24,18 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.*;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.*;
+
+
 
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({TYPE})
+@Retention(RUNTIME)
 public @interface PersistenceUnits {
+
     PersistenceUnit[] value();
+
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUtil.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUtil.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUtil.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUtil.java Mon Oct 12 02:23:08 2009
@@ -22,7 +22,6 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-
 package javax.persistence;
 
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockScope.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockScope.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockScope.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockScope.java Mon Oct 12 02:23:08 2009
@@ -25,7 +25,10 @@
 
 package javax.persistence;
 
+
 public enum PessimisticLockScope {
+
     NORMAL,
+
     EXTENDED
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostLoad.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostLoad.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostLoad.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostLoad.java Mon Oct 12 02:23:08 2009
@@ -24,15 +24,13 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({METHOD}) 
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PostLoad {
-}
\ No newline at end of file
+public @interface PostLoad {}

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostPersist.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostPersist.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostPersist.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostPersist.java Mon Oct 12 02:23:08 2009
@@ -24,15 +24,13 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({METHOD})
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PostPersist {
-}
+public @interface PostPersist {}

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostRemove.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostRemove.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostRemove.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostRemove.java Mon Oct 12 02:23:08 2009
@@ -24,15 +24,13 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({METHOD})
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PostRemove {
-}
\ No newline at end of file
+public @interface PostRemove {}

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostUpdate.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostUpdate.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostUpdate.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostUpdate.java Mon Oct 12 02:23:08 2009
@@ -24,15 +24,13 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({METHOD})
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PostUpdate {
-}
\ No newline at end of file
+public @interface PostUpdate {}

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrePersist.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrePersist.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrePersist.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrePersist.java Mon Oct 12 02:23:08 2009
@@ -24,15 +24,13 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({METHOD}) 
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PrePersist {
-}
\ No newline at end of file
+public @interface PrePersist {}

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreRemove.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreRemove.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreRemove.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreRemove.java Mon Oct 12 02:23:08 2009
@@ -24,15 +24,13 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({METHOD})
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PreRemove {
-}
\ No newline at end of file
+public @interface PreRemove {}

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreUpdate.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreUpdate.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreUpdate.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreUpdate.java Mon Oct 12 02:23:08 2009
@@ -24,15 +24,13 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({METHOD}) 
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PreUpdate {
-}
\ No newline at end of file
+public @interface PreUpdate {}

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumn.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumn.java Mon Oct 12 02:23:08 2009
@@ -24,17 +24,19 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE, METHOD, FIELD})
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
 public @interface PrimaryKeyJoinColumn {
+
     String name() default "";
 
     String referencedColumnName() default "";

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java Mon Oct 12 02:23:08 2009
@@ -24,16 +24,18 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE, METHOD, FIELD})
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
 public @interface PrimaryKeyJoinColumns {
+
     PrimaryKeyJoinColumn[] value();
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Query.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Query.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Query.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Query.java Mon Oct 12 02:23:08 2009
@@ -53,25 +53,29 @@
 
     Map<String, Object> getHints();
 
-    Set<String> getSupportedHints();
-
     <T> Query setParameter(Parameter<T> param, T value);
 
-    Query setParameter(Parameter<Calendar> param, Calendar value, TemporalType temporalType);
+    Query setParameter(Parameter<Calendar> param, Calendar value, 
+                       TemporalType temporalType);
 
-    Query setParameter(Parameter<Date> param, Date value, TemporalType temporalType);
+    Query setParameter(Parameter<Date> param, Date value, 
+                       TemporalType temporalType);
 
     Query setParameter(String name, Object value);
 
-    Query setParameter(String name, Calendar value, TemporalType temporalType);
+    Query setParameter(String name, Calendar value, 
+                       TemporalType temporalType);
 
-    Query setParameter(String name, Date value, TemporalType temporalType);
+    Query setParameter(String name, Date value, 
+                       TemporalType temporalType);
 
     Query setParameter(int position, Object value);
 
-    Query setParameter(int position, Calendar value,  TemporalType temporalType);
+    Query setParameter(int position, Calendar value,  
+                       TemporalType temporalType);
 
-    Query setParameter(int position, Date value,  TemporalType temporalType);
+    Query setParameter(int position, Date value,  
+                       TemporalType temporalType);
 
     Set<Parameter<?>> getParameters();
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/QueryHint.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/QueryHint.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/QueryHint.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/QueryHint.java Mon Oct 12 02:23:08 2009
@@ -24,17 +24,16 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({}) 
+@Retention(RUNTIME)
+public @interface QueryHint { 
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface QueryHint {
-    String name();
+    String name(); 
 
     String value();
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SecondaryTable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SecondaryTable.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SecondaryTable.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SecondaryTable.java Mon Oct 12 02:23:08 2009
@@ -24,17 +24,17 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target(TYPE) 
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
 public @interface SecondaryTable {
+
     String name();
 
     String catalog() default "";
@@ -45,4 +45,3 @@
 
     UniqueConstraint[] uniqueConstraints() default {};
 }
-

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SecondaryTables.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SecondaryTables.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SecondaryTables.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SecondaryTables.java Mon Oct 12 02:23:08 2009
@@ -25,17 +25,16 @@
 
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target(TYPE) 
+@Retention(RUNTIME)
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
 public @interface SecondaryTables {
+
     SecondaryTable[] value();
 }
-

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SequenceGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SequenceGenerator.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SequenceGenerator.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SequenceGenerator.java Mon Oct 12 02:23:08 2009
@@ -24,17 +24,18 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({TYPE, METHOD, FIELD}) 
+@Retention(RUNTIME)
 public @interface SequenceGenerator {
+
     String name();
 
     String sequenceName() default "";

Added: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SharedCacheMode.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SharedCacheMode.java?rev=824215&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SharedCacheMode.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SharedCacheMode.java Mon Oct 12 02:23:08 2009
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+//
+// This source code implements specifications defined by the Java
+// Community Process. In order to remain compliant with the specification
+// DO NOT add / change / or delete method signatures!
+//
+package javax.persistence;
+
+
+public enum SharedCacheMode {
+
+    ALL, 
+
+    NONE, 
+
+    ENABLE_SELECTIVE, 
+
+    DISABLE_SELECTIVE, 
+
+    UNSPECIFIED
+}

Propchange: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SharedCacheMode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SqlResultSetMapping.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SqlResultSetMapping.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SqlResultSetMapping.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SqlResultSetMapping.java Mon Oct 12 02:23:08 2009
@@ -24,18 +24,17 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE}) 
+@Retention(RUNTIME)
+public @interface SqlResultSetMapping { 
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface SqlResultSetMapping {
-    String name();
+    String name(); 
 
     EntityResult[] entities() default {};
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SqlResultSetMappings.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SqlResultSetMappings.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SqlResultSetMappings.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SqlResultSetMappings.java Mon Oct 12 02:23:08 2009
@@ -24,16 +24,15 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE}) 
+@Retention(RUNTIME)
+public @interface SqlResultSetMappings { 
 
-/**
- * @version $Revision$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface SqlResultSetMappings {
     SqlResultSetMapping[] value();
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Table.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Table.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Table.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Table.java Mon Oct 12 02:23:08 2009
@@ -24,17 +24,16 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target(TYPE) 
+@Retention(RUNTIME)
 public @interface Table {
+
     String name() default "";
 
     String catalog() default "";

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TableGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TableGenerator.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TableGenerator.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TableGenerator.java Mon Oct 12 02:23:08 2009
@@ -22,20 +22,20 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({TYPE, METHOD, FIELD}) 
+@Retention(RUNTIME)
 public @interface TableGenerator {
+
     String name();
 
     String table() default "";

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Temporal.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Temporal.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Temporal.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Temporal.java Mon Oct 12 02:23:08 2009
@@ -24,16 +24,16 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({METHOD, FIELD}) 
+@Retention(RUNTIME)
 public @interface Temporal {
+
     TemporalType value();
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TemporalType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TemporalType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TemporalType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TemporalType.java Mon Oct 12 02:23:08 2009
@@ -24,9 +24,12 @@
 //
 package javax.persistence;
 
-/**
- * @version $Rev$ $Date$
- */
+
 public enum TemporalType {
-    DATE, TIME, TIMESTAMP
+
+    DATE, 
+
+    TIME, 
+
+    TIMESTAMP
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Transient.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Transient.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Transient.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Transient.java Mon Oct 12 02:23:08 2009
@@ -24,16 +24,14 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Transient {
-}
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
 
+public @interface Transient {}

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TypedQuery.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TypedQuery.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TypedQuery.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TypedQuery.java Mon Oct 12 02:23:08 2009
@@ -43,21 +43,28 @@
 
      <T> TypedQuery<X> setParameter(Parameter<T> param, T value);
 
-    TypedQuery<X> setParameter(Parameter<Calendar> param, Calendar value,  TemporalType temporalType);
+    TypedQuery<X> setParameter(Parameter<Calendar> param, 
+                               Calendar value,  
+                               TemporalType temporalType);
 
-    TypedQuery<X> setParameter(Parameter<Date> param, Date value,  TemporalType temporalType);
+    TypedQuery<X> setParameter(Parameter<Date> param, Date value,  
+                               TemporalType temporalType);
 
     TypedQuery<X> setParameter(String name, Object value);
 
-    TypedQuery<X> setParameter(String name, Calendar value, TemporalType temporalType);
+    TypedQuery<X> setParameter(String name, Calendar value, 
+                               TemporalType temporalType);
 
-    TypedQuery<X> setParameter(String name, Date value, TemporalType temporalType);
+    TypedQuery<X> setParameter(String name, Date value, 
+                               TemporalType temporalType);
 
     TypedQuery<X> setParameter(int position, Object value);
 
-    TypedQuery<X> setParameter(int position, Calendar value,  TemporalType temporalType);
+    TypedQuery<X> setParameter(int position, Calendar value,  
+                               TemporalType temporalType);
 
-    TypedQuery<X> setParameter(int position, Date value,  TemporalType temporalType);
+    TypedQuery<X> setParameter(int position, Date value,  
+                               TemporalType temporalType);
 
      TypedQuery<X> setFlushMode(FlushModeType flushMode);
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/UniqueConstraint.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/UniqueConstraint.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/UniqueConstraint.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/UniqueConstraint.java Mon Oct 12 02:23:08 2009
@@ -25,18 +25,16 @@
 
 package javax.persistence;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({}) 
+@Retention(RUNTIME)
 public @interface UniqueConstraint {
 
     String name() default "";
-    
-    String[] columnNames();    
+
+    String[] columnNames();
 }

Added: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ValidationMode.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ValidationMode.java?rev=824215&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ValidationMode.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ValidationMode.java Mon Oct 12 02:23:08 2009
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+//
+// This source code implements specifications defined by the Java
+// Community Process. In order to remain compliant with the specification
+// DO NOT add / change / or delete method signatures!
+//
+package javax.persistence;
+
+
+public enum ValidationMode {
+    AUTO,
+
+    CALLBACK,
+
+    NONE
+    }

Propchange: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ValidationMode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Version.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Version.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Version.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Version.java Mon Oct 12 02:23:08 2009
@@ -24,15 +24,13 @@
 //
 package javax.persistence;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Version {
-}
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface Version {}

Added: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaBuilder.java?rev=824215&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaBuilder.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaBuilder.java Mon Oct 12 02:23:08 2009
@@ -0,0 +1,336 @@
+/*
+ * 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.
+ */
+
+//
+// This source code implements specifications defined by the Java
+// Community Process. In order to remain compliant with the specification
+// DO NOT add / change / or delete method signatures!
+//
+package javax.persistence.criteria;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import javax.persistence.Tuple;
+
+
+public interface CriteriaBuilder {
+
+    CriteriaQuery<Object> createQuery();
+
+    <T> CriteriaQuery<T> createQuery(Class<T> resultClass);
+
+    CriteriaQuery<Tuple> createTupleQuery();
+
+
+    <Y> CompoundSelection<Y> construct(Class<Y> resultClass, Selection<?>... selections);
+
+    CompoundSelection<Tuple> tuple(Selection<?>... selections);
+
+    CompoundSelection<Object[]> array(Selection<?>... selections);
+
+
+    Order asc(Expression<?> x);
+
+    Order desc(Expression<?> x);
+
+    <N extends Number> Expression<Double> avg(Expression<N> x);
+
+    <N extends Number> Expression<N> sum(Expression<N> x);
+
+    Expression<Long> sumAsLong(Expression<Integer> x);
+
+    Expression<Double> sumAsDouble(Expression<Float> x);
+    <N extends Number> Expression<N> max(Expression<N> x);
+    <N extends Number> Expression<N> min(Expression<N> x);
+
+    <X extends Comparable<? super X>> Expression<X> greatest(Expression<X> x);
+    <X extends Comparable<? super X>> Expression<X> least(Expression<X> x);
+
+    Expression<Long> count(Expression<?> x);
+
+    Expression<Long> countDistinct(Expression<?> x);
+
+
+    Predicate exists(Subquery<?> subquery);
+    <Y> Expression<Y> all(Subquery<Y> subquery);
+    <Y> Expression<Y> some(Subquery<Y> subquery);
+    <Y> Expression<Y> any(Subquery<Y> subquery);
+
+
+    Predicate and(Expression<Boolean> x, Expression<Boolean> y);
+    Predicate and(Predicate... restrictions);
+
+    Predicate or(Expression<Boolean> x, Expression<Boolean> y);
+
+    Predicate or(Predicate... restrictions);
+
+    Predicate not(Expression<Boolean> restriction);
+    Predicate conjunction();
+
+    Predicate disjunction();
+
+
+    Predicate isTrue(Expression<Boolean> x);
+
+    Predicate isFalse(Expression<Boolean> x);
+
+
+    Predicate isNull(Expression<?> x);
+
+    Predicate isNotNull(Expression<?> x);
+
+    Predicate equal(Expression<?> x, Expression<?> y);
+    Predicate equal(Expression<?> x, Object y);
+
+    Predicate notEqual(Expression<?> x, Expression<?> y);
+    Predicate notEqual(Expression<?> x, Object y);
+
+
+    <Y extends Comparable<? super Y>> Predicate greaterThan(Expression<? extends Y> x, Expression<? extends Y> y);
+    <Y extends Comparable<? super Y>> Predicate greaterThan(Expression<? extends Y> x, Y y);
+    <Y extends Comparable<? super Y>> Predicate greaterThanOrEqualTo(Expression<? extends Y> x, Expression<? extends Y> y);
+
+    <Y extends Comparable<? super Y>> Predicate greaterThanOrEqualTo(Expression<? extends Y> x, Y y);
+
+    <Y extends Comparable<? super Y>> Predicate lessThan(Expression<? extends Y> x, Expression<? extends Y> y);
+
+    <Y extends Comparable<? super Y>> Predicate lessThan(Expression<? extends Y> x, Y y);
+    <Y extends Comparable<? super Y>> Predicate lessThanOrEqualTo(Expression<? extends Y> x, Expression<? extends Y> y);
+
+    <Y extends Comparable<? super Y>> Predicate lessThanOrEqualTo(Expression<? extends Y> x, Y y);
+
+    <Y extends Comparable<? super Y>> Predicate between(Expression<? extends Y> v, Expression<? extends Y> x, Expression<? extends Y> y);
+
+    <Y extends Comparable<? super Y>> Predicate between(Expression<? extends Y> v, Y x, Y y);
+
+    Predicate gt(Expression<? extends Number> x, Expression<? extends Number> y);
+
+    Predicate gt(Expression<? extends Number> x, Number y);
+
+    Predicate ge(Expression<? extends Number> x, Expression<? extends Number> y);
+
+    Predicate ge(Expression<? extends Number> x, Number y);
+
+    Predicate lt(Expression<? extends Number> x, Expression<? extends Number> y);
+
+    Predicate lt(Expression<? extends Number> x, Number y);
+
+    Predicate le(Expression<? extends Number> x, Expression<? extends Number> y);
+
+    Predicate le(Expression<? extends Number> x, Number y);
+
+    <N extends Number> Expression<N> neg(Expression<N> x);
+
+    <N extends Number> Expression<N> abs(Expression<N> x);
+    <N extends Number> Expression<N> sum(Expression<? extends N> x, Expression<? extends N> y);
+    <N extends Number> Expression<N> sum(Expression<? extends N> x, N y);
+
+    <N extends Number> Expression<N> sum(N x, Expression<? extends N> y);
+
+    <N extends Number> Expression<N> prod(Expression<? extends N> x, Expression<? extends N> y);
+
+    <N extends Number> Expression<N> prod(Expression<? extends N> x, N y);
+
+    <N extends Number> Expression<N> prod(N x, Expression<? extends N> y);
+
+    <N extends Number> Expression<N> diff(Expression<? extends N> x, Expression<? extends N> y);
+
+    <N extends Number> Expression<N> diff(Expression<? extends N> x, N y);
+
+    <N extends Number> Expression<N> diff(N x, Expression<? extends N> y);
+    Expression<Number> quot(Expression<? extends Number> x, Expression<? extends Number> y);
+
+    Expression<Number> quot(Expression<? extends Number> x, Number y);
+
+    Expression<Number> quot(Number x, Expression<? extends Number> y);
+    Expression<Integer> mod(Expression<Integer> x, Expression<Integer> y);
+    Expression<Integer> mod(Expression<Integer> x, Integer y);
+
+    Expression<Integer> mod(Integer x, Expression<Integer> y);
+
+    Expression<Double> sqrt(Expression<? extends Number> x);
+
+    Expression<Long> toLong(Expression<? extends Number> number);
+
+    Expression<Integer> toInteger(Expression<? extends Number> number);
+
+    Expression<Float> toFloat(Expression<? extends Number> number);
+
+    Expression<Double> toDouble(Expression<? extends Number> number);
+
+    Expression<BigDecimal> toBigDecimal(Expression<? extends Number> number);
+
+    Expression<BigInteger> toBigInteger(Expression<? extends Number> number);
+    Expression<String> toString(Expression<Character> character);
+
+
+    <T> Expression<T> literal(T value);
+
+    <T> Expression<T> nullLiteral(Class<T> resultClass);
+
+
+    <T> ParameterExpression<T> parameter(Class<T> paramClass);
+
+    <T> ParameterExpression<T> parameter(Class<T> paramClass, String name);
+
+
+    <C extends Collection<?>> Predicate isEmpty(Expression<C> collection);
+
+    <C extends Collection<?>> Predicate isNotEmpty(Expression<C> collection);
+
+    <C extends java.util.Collection<?>> Expression<Integer> size(Expression<C> collection);
+    <C extends Collection<?>> Expression<Integer> size(C collection);
+    <E, C extends Collection<E>> Predicate isMember(Expression<E> elem, Expression<C> collection);
+
+    <E, C extends Collection<E>> Predicate isMember(E elem, Expression<C> collection);
+
+    <E, C extends Collection<E>> Predicate isNotMember(Expression<E> elem, Expression<C> collection);
+    <E, C extends Collection<E>> Predicate isNotMember(E elem, Expression<C> collection);
+
+
+
+    <V, M extends Map<?, V>> Expression<Collection<V>> values(M map);
+
+    <K, M extends Map<K, ?>> Expression<Set<K>> keys(M map);
+
+    Predicate like(Expression<String> x, Expression<String> pattern);
+    Predicate like(Expression<String> x, String pattern);
+    Predicate like(Expression<String> x, Expression<String> pattern, Expression<Character> escapeChar);
+    Predicate like(Expression<String> x, Expression<String> pattern, char escapeChar);
+    Predicate like(Expression<String> x, String pattern, Expression<Character> escapeChar);
+
+    Predicate like(Expression<String> x, String pattern, char escapeChar);
+    Predicate notLike(Expression<String> x, Expression<String> pattern);
+    Predicate notLike(Expression<String> x, String pattern);
+
+    Predicate notLike(Expression<String> x, Expression<String> pattern, Expression<Character> escapeChar);
+
+    Predicate notLike(Expression<String> x, Expression<String> pattern, char escapeChar);
+
+    Predicate notLike(Expression<String> x, String pattern, Expression<Character> escapeChar);
+    Predicate notLike(Expression<String> x, String pattern, char escapeChar);
+
+    Expression<String> concat(Expression<String> x, Expression<String> y);
+    Expression<String> concat(Expression<String> x, String y);
+
+    Expression<String> concat(String x, Expression<String> y);
+    Expression<String> substring(Expression<String> x, Expression<Integer> from);
+    Expression<String> substring(Expression<String> x, int from);
+
+    Expression<String> substring(Expression<String> x, Expression<Integer> from, Expression<Integer> len);
+    Expression<String> substring(Expression<String> x, int from, int len);
+    public static enum Trimspec { 
+
+        LEADING,
+        TRAILING, 
+
+        BOTH 
+    }
+    Expression<String> trim(Expression<String> x);
+    Expression<String> trim(Trimspec ts, Expression<String> x);
+
+    Expression<String> trim(Expression<Character> t, Expression<String> x);
+
+    Expression<String> trim(Trimspec ts, Expression<Character> t, Expression<String> x);
+    Expression<String> trim(char t, Expression<String> x);
+    Expression<String> trim(Trimspec ts, char t, Expression<String> x);
+    Expression<String> lower(Expression<String> x);
+    Expression<String> upper(Expression<String> x);
+    Expression<Integer> length(Expression<String> x);
+    Expression<Integer> locate(Expression<String> x, Expression<String> pattern);
+    Expression<Integer> locate(Expression<String> x, String pattern);
+
+    Expression<Integer> locate(Expression<String> x, Expression<String> pattern, Expression<Integer> from);
+
+    Expression<Integer> locate(Expression<String> x, String pattern, int from);
+
+
+    Expression<java.sql.Date> currentDate();
+
+    Expression<java.sql.Timestamp> currentTimestamp();
+
+    Expression<java.sql.Time> currentTime();
+
+    public static interface In<T> extends Predicate {
+
+         Expression<T> getExpression();
+         In<T> value(T value);
+
+         In<T> value(Expression<? extends T> value);
+     }
+    <T> In<T> in(Expression<? extends T> expression);
+
+
+    <Y> Expression<Y> coalesce(Expression<? extends Y> x, Expression<? extends Y> y);
+
+    <Y> Expression<Y> coalesce(Expression<? extends Y> x, Y y);
+    <Y> Expression<Y> nullif(Expression<Y> x, Expression<?> y);
+
+    <Y> Expression<Y> nullif(Expression<Y> x, Y y);
+
+
+
+    public static interface Coalesce<T> extends Expression<T> {
+
+         Coalesce<T> value(T value);
+
+         Coalesce<T> value(Expression<? extends T> value);
+	}
+    <T> Coalesce<T> coalesce();
+
+
+
+    public static interface SimpleCase<C,R> extends Expression<R> {
+
+		Expression<C> getExpression();
+
+		SimpleCase<C, R> when(C condition, R result);
+
+		SimpleCase<C, R> when(C condition, Expression<? extends R> result);
+
+		Expression<R> otherwise(R result);
+
+		Expression<R> otherwise(Expression<? extends R> result);
+	}
+    <C, R> SimpleCase<C,R> selectCase(Expression<? extends C> expression);
+
+
+    public static interface Case<R> extends Expression<R> {
+
+		Case<R> when(Expression<Boolean> condition, R result);
+
+		Case<R> when(Expression<Boolean> condition, Expression<? extends R> result);
+
+		Expression<R> otherwise(R result);
+
+		Expression<R> otherwise(Expression<? extends R> result);
+	}
+    <R> Case<R> selectCase();
+
+   <T> Expression<T> function(String name, Class<T> type,
+Expression<?>... args);
+
+}
+
+
+
+

Propchange: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/FetchParent.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/FetchParent.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/FetchParent.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/FetchParent.java Mon Oct 12 02:23:08 2009
@@ -40,7 +40,9 @@
     <Y> Fetch<X, Y> fetch(PluralAttribute<? super X, ?, Y> attribute);
     <Y> Fetch<X, Y> fetch(PluralAttribute<? super X, ?, Y> attribute, JoinType jt);
 
+    @SuppressWarnings("hiding")
     <X, Y> Fetch<X, Y> fetch(String attributeName);
 
+    @SuppressWarnings("hiding")
     <X, Y> Fetch<X, Y> fetch(String attributeName, JoinType jt);
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/From.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/From.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/From.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/From.java Mon Oct 12 02:23:08 2009
@@ -30,11 +30,17 @@
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.MapAttribute;
 import javax.persistence.metamodel.SetAttribute;
+import java.util.Set;
 
 
+@SuppressWarnings("hiding")
 public interface From<Z, X> extends Path<X>, FetchParent<Z, X> {
 
-    java.util.Set<Join<X, ?>> getJoins();
+    Set<Join<X, ?>> getJoins();
+    boolean isCorrelated();
+
+    From<Z, X> getCorrelationParent();
+
     <Y> Join<X, Y> join(SingularAttribute<? super X, Y> attribute);
 
     <Y> Join<X, Y> join(SingularAttribute<? super X, Y> attribute, JoinType jt);

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/JoinType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/JoinType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/JoinType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/JoinType.java Mon Oct 12 02:23:08 2009
@@ -27,5 +27,10 @@
 
 
 public enum JoinType {
-	INNER, LEFT, RIGHT
+
+    INNER, 
+
+    LEFT, 
+
+    RIGHT
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/MapJoin.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/MapJoin.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/MapJoin.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/MapJoin.java Mon Oct 12 02:23:08 2009
@@ -33,9 +33,6 @@
 		extends PluralJoin<Z, Map<K, V>, V> {
 
     MapAttribute<? super Z, K, V> getModel();
-    Join<Map<K, V>, K> joinKey();
-
-    Join<Map<K, V>, K> joinKey(JoinType jt);
     Path<K> key();
     Path<V> value(); 
     Expression<Map.Entry<K, V>> entry();

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Predicate.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Predicate.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Predicate.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Predicate.java Mon Oct 12 02:23:08 2009
@@ -29,12 +29,15 @@
 
 
 public interface Predicate extends Expression<Boolean> {
-	public static enum BooleanOperator {
-		AND, OR
-	}
+
+        public static enum BooleanOperator {
+              AND, OR
+        }
     BooleanOperator getOperator();
     boolean isNegated();
 
     List<Expression<Boolean>> getExpressions();
-    Predicate negate();
+
+    Predicate not();
+
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Subquery.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Subquery.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Subquery.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Subquery.java Mon Oct 12 02:23:08 2009
@@ -26,6 +26,7 @@
 package javax.persistence.criteria;
 
 import java.util.List;
+import java.util.Set;
 
 
 public interface Subquery<T> extends AbstractQuery<T>, Expression<T> {
@@ -58,7 +59,7 @@
     AbstractQuery<?> getParent();
     Expression<T> getSelection();
 
-    java.util.Set<Join<?, ?>> getJoins();
+    Set<Join<?, ?>> getCorrelatedJoins();
 
 }
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Attribute.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Attribute.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Attribute.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Attribute.java Mon Oct 12 02:23:08 2009
@@ -29,8 +29,18 @@
 public interface Attribute<X, Y> {
 
 	public static enum PersistentAttributeType {
-	    MANY_TO_ONE, ONE_TO_ONE, BASIC, EMBEDDED,
-	    MANY_TO_MANY, ONE_TO_MANY, ELEMENT_COLLECTION
+	     MANY_TO_ONE, 
+
+	     ONE_TO_ONE, 
+	     BASIC, 
+
+	     EMBEDDED,
+
+	     MANY_TO_MANY, 
+
+	     ONE_TO_MANY, 
+
+	     ELEMENT_COLLECTION
 	}
 
     String getName();

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Bindable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Bindable.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Bindable.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Bindable.java Mon Oct 12 02:23:08 2009
@@ -28,7 +28,12 @@
 
 public interface Bindable<T> {
 	public static enum BindableType { 
-		SINGULAR_ATTRIBUTE, PLURAL_ATTRIBUTE, ENTITY_TYPE
+
+	    SINGULAR_ATTRIBUTE, 
+
+	    PLURAL_ATTRIBUTE, 
+
+	    ENTITY_TYPE
 	}
 
     BindableType getBindableType();

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/EntityType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/EntityType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/EntityType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/EntityType.java Mon Oct 12 02:23:08 2009
@@ -27,7 +27,7 @@
 
 
 public interface EntityType<X> 
-	extends IdentifiableType<X>, Bindable<X>{
+            extends IdentifiableType<X>, Bindable<X>{
 
     String getName();
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/IdentifiableType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/IdentifiableType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/IdentifiableType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/IdentifiableType.java Mon Oct 12 02:23:08 2009
@@ -25,6 +25,8 @@
 
 package javax.persistence.metamodel;
 
+import java.util.Set;
+
 
 public interface IdentifiableType<X> extends ManagedType<X> {
     <Y> SingularAttribute<? super X, Y> getId(Class<Y> type);
@@ -40,7 +42,7 @@
 
     boolean hasVersionAttribute();
 
-     java.util.Set<SingularAttribute<? super X, ?>> getIdClassAttributes();
+     Set<SingularAttribute<? super X, ?>> getIdClassAttributes();
 
     Type<?> getIdType();
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/ManagedType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/ManagedType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/ManagedType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/ManagedType.java Mon Oct 12 02:23:08 2009
@@ -25,19 +25,23 @@
 
 package javax.persistence.metamodel;
 
+import java.util.Set;
+
 
 public interface ManagedType<X> extends Type<X> {
 
-     java.util.Set<Attribute<? super X, ?>> getAttributes();
+     Set<Attribute<? super X, ?>> getAttributes();
 
-     java.util.Set<Attribute<X, ?>> getDeclaredAttributes();
+     Set<Attribute<X, ?>> getDeclaredAttributes();
 
     <Y> SingularAttribute<? super X, Y> getSingularAttribute(String name, Class<Y> type);
 
     <Y> SingularAttribute<X, Y> getDeclaredSingularAttribute(String name, Class<Y> type);
-    java.util.Set<SingularAttribute<? super X, ?>> getSingularAttributes();
 
-    java.util.Set<SingularAttribute<X, ?>> getDeclaredSingularAttributes();
+    Set<SingularAttribute<? super X, ?>> getSingularAttributes();
+
+    Set<SingularAttribute<X, ?>> getDeclaredSingularAttributes();
+
     <E> CollectionAttribute<? super X, E> getCollection(String name, Class<E> elementType);
 
     <E> CollectionAttribute<X, E> getDeclaredCollection(String name, Class<E> elementType);
@@ -57,9 +61,9 @@
     <K, V> MapAttribute<X, K, V> getDeclaredMap(String name, 
                                                 Class<K> keyType, 
                                                 Class<V> valueType);
-    java.util.Set<PluralAttribute<? super X, ?, ?>> getPluralAttributes();
+    Set<PluralAttribute<? super X, ?, ?>> getPluralAttributes();
 
-    java.util.Set<PluralAttribute<X, ?, ?>> getDeclaredPluralAttributes();
+    Set<PluralAttribute<X, ?, ?>> getDeclaredPluralAttributes();
 
 
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/MappedSuperclassType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/MappedSuperclassType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/MappedSuperclassType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/MappedSuperclassType.java Mon Oct 12 02:23:08 2009
@@ -23,6 +23,7 @@
 // DO NOT add / change / or delete method signatures!
 //
 
+
 package javax.persistence.metamodel;
 
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Metamodel.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Metamodel.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Metamodel.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Metamodel.java Mon Oct 12 02:23:08 2009
@@ -25,18 +25,19 @@
 
 package javax.persistence.metamodel;
 
+import java.util.Set;
+
 
 public interface Metamodel {
 
     <X> EntityType<X> entity(Class<X> cls);
 
-    <X> ManagedType<X> type(Class<X> cls);
-
+    <X> ManagedType<X> managedType(Class<X> cls);
     <X> EmbeddableType<X> embeddable(Class<X> cls);
 
-    java.util.Set<ManagedType<?>> getManagedTypes();
+    Set<ManagedType<?>> getManagedTypes();
 
-    java.util.Set<EntityType<?>> getEntities();
+    Set<EntityType<?>> getEntities();
 
-    java.util.Set<EmbeddableType<?>> getEmbeddables();
+    Set<EmbeddableType<?>> getEmbeddables();
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/PluralAttribute.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/PluralAttribute.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/PluralAttribute.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/PluralAttribute.java Mon Oct 12 02:23:08 2009
@@ -29,7 +29,14 @@
 public interface PluralAttribute<X, C, E> 
 		extends Attribute<X, C>, Bindable<E> {
 	public static enum CollectionType {
-		COLLECTION, SET, LIST, MAP
+
+	    COLLECTION, 
+
+	    SET, 
+
+	    LIST, 
+
+	    MAP
 	}
     CollectionType getCollectionType();
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/SingularAttribute.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/SingularAttribute.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/SingularAttribute.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/SingularAttribute.java Mon Oct 12 02:23:08 2009
@@ -23,6 +23,7 @@
 // DO NOT add / change / or delete method signatures!
 //
 
+
 package javax.persistence.metamodel;
 
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/StaticMetamodel.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/StaticMetamodel.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/StaticMetamodel.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/StaticMetamodel.java Mon Oct 12 02:23:08 2009
@@ -34,5 +34,6 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface StaticMetamodel {
+
     Class<?> value();
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Type.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Type.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Type.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Type.java Mon Oct 12 02:23:08 2009
@@ -27,9 +27,19 @@
 
 
 public interface Type<X> {
-	public static enum PersistenceType {
-		ENTITY, EMBEDDABLE, MAPPED_SUPERCLASS, BASIC
-	}
+
+       public static enum PersistenceType {
+
+           ENTITY, 
+
+	   EMBEDDABLE, 
+
+	   MAPPED_SUPERCLASS, 
+
+	   BASIC
+       }
+
     PersistenceType getPersistenceType();
+
     Class<X> getJavaType();
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ClassTransformer.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ClassTransformer.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ClassTransformer.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ClassTransformer.java Mon Oct 12 02:23:08 2009
@@ -31,10 +31,10 @@
 
 public interface ClassTransformer {
 
-	byte[] transform(ClassLoader loader,
-                 String className,
-                 Class<?> classBeingRedefined,
-                 ProtectionDomain protectionDomain, 
-                 byte[] classfileBuffer) 
-					throws IllegalClassFormatException;
+    byte[] transform(ClassLoader loader,
+                     String className,
+                     Class<?> classBeingRedefined,
+                     ProtectionDomain protectionDomain, 
+                     byte[] classfileBuffer) 
+        throws IllegalClassFormatException;
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/LoadState.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/LoadState.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/LoadState.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/LoadState.java Mon Oct 12 02:23:08 2009
@@ -25,6 +25,7 @@
 
 package javax.persistence.spi;
 
+
 public enum LoadState {
     LOADED,
     NOT_LOADED,

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolver.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolver.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolver.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolver.java Mon Oct 12 02:23:08 2009
@@ -23,6 +23,7 @@
 // DO NOT add / change / or delete method signatures!
 //
 
+
 package javax.persistence.spi;
 
 import java.util.List;
@@ -30,7 +31,7 @@
 
 public interface PersistenceProviderResolver {
 
-	List<PersistenceProvider> getPersistenceProviders();
+    List<PersistenceProvider> getPersistenceProviders();
 
-	 public void clearCachedProviders();
+    void clearCachedProviders();
 } 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitInfo.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitInfo.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitInfo.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitInfo.java Mon Oct 12 02:23:08 2009
@@ -29,44 +29,41 @@
 import java.util.List;
 import java.util.Properties;
 import java.net.URL;
-
+import javax.persistence.SharedCacheMode;
+import javax.persistence.ValidationMode;
 
 
 public interface PersistenceUnitInfo {
-	public String getPersistenceUnitName();
-
-	public String getPersistenceProviderClassName();
-
-	public PersistenceUnitTransactionType getTransactionType();
-
-
-	public DataSource getJtaDataSource();
+    public String getPersistenceUnitName();
 
-	public DataSource getNonJtaDataSource();
+    public String getPersistenceProviderClassName();
 
-	public List<String> getMappingFileNames();
+    public PersistenceUnitTransactionType getTransactionType();
 
-	public List<URL> getJarFileUrls();
+    public DataSource getJtaDataSource();
 
-	public URL getPersistenceUnitRootUrl();
+    public DataSource getNonJtaDataSource();
 
+    public List<String> getMappingFileNames();
 
-	public List<String> getManagedClassNames();
+    public List<URL> getJarFileUrls();
 
-	public boolean excludeUnlistedClasses();
+    public URL getPersistenceUnitRootUrl();
 
-	public SharedCacheMode getSharedCacheMode();
+    public List<String> getManagedClassNames();
 
-	public ValidationMode getValidationMode();
+    public boolean excludeUnlistedClasses();
 
-	public Properties getProperties();
+    public SharedCacheMode getSharedCacheMode();
 
-	public String getPersistenceXMLSchemaVersion();
+    public ValidationMode getValidationMode();
 
-	public ClassLoader getClassLoader();
+    public Properties getProperties();
+    public String getPersistenceXMLSchemaVersion();
 
+    public ClassLoader getClassLoader();
 
-	public void addTransformer(ClassTransformer transformer);
+    public void addTransformer(ClassTransformer transformer);
 
-	public ClassLoader getNewTempClassLoader();
+    public ClassLoader getNewTempClassLoader();
 }



Mime
View raw message