geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r889680 - in /geronimo/specs/trunk/geronimo-jpa_2.0_spec: ./ src/main/appended-resources/ src/main/java/javax/persistence/ src/main/java/javax/persistence/criteria/ src/main/java/javax/persistence/metamodel/ src/main/java/javax/persistence/...
Date Fri, 11 Dec 2009 16:19:33 GMT
Author: dwoods
Date: Fri Dec 11 16:19:25 2009
New Revision: 889680

URL: http://svn.apache.org/viewvc?rev=889680&view=rev
Log:
final JSR-317 API updates, along with some whitespace formatting and removing early access notices

Removed:
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/appended-resources/
Modified:
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/NOTICE
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityExistsException.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManager.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityNotFoundException.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NoResultException.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NonUniqueResultException.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OptimisticLockException.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderColumn.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceException.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockException.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/QueryTimeoutException.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/RollbackException.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TransactionRequiredException.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaBuilder.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/FetchParent.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/From.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/MapJoin.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Path.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Predicate.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Selection.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Subquery.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Attribute.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Bindable.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/CollectionAttribute.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/IdentifiableType.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/ManagedType.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Metamodel.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/PluralAttribute.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/SingularAttribute.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Type.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolverHolder.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitInfo.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitTransactionType.java

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/NOTICE?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/NOTICE (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/NOTICE Fri Dec 11 16:19:25 2009
@@ -5,5 +5,3 @@
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-This is an implementation of an early-draft specification developed under the Java Community Process (JCP). The code is untested and presumed not to be a compatible implementation of the JSR-317 Java Persistence API, Version 2.0 specification.  We encourage you to migrate to an implementation of the JSR-317 Java Persistence API, Version 2.0 specification that has been tested and verified to be compatible as soon as such an implementation is available, and we encourage you to retain this notice in any implementation of JSR-317 Java Persistence API, Version 2.0 specification that you distribute.
-

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml Fri Dec 11 16:19:25 2009
@@ -34,9 +34,9 @@
     <artifactId>geronimo-jpa_2.0_spec</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Geronimo JSR-317 JPA 2.0 Spec API</name>
-    <version>1.0-EA9-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
 
-    <description>Implementation of Sun JSR-317 JPA 2.0 EARLY ACCESS Spec API</description>
+    <description>Implementation of Sun JSR-317 JPA 2.0 Spec API</description>
 
     <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
     <distributionManagement>

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityExistsException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityExistsException.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityExistsException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityExistsException.java Fri Dec 11 16:19:25 2009
@@ -24,24 +24,21 @@
 //
 package javax.persistence;
 
-/**
- * @version $Revision$ $Date$
- */
+
 public class EntityExistsException extends PersistenceException {
 
     public EntityExistsException() {
-
+        super();
     }
 
     public EntityExistsException(String message) {
         super(message);
     }
+    public EntityExistsException(String message, Throwable cause) {
+        super(message, cause);
+    }
 
     public EntityExistsException(Throwable cause) {
         super(cause);
     }
-
-    public EntityExistsException(String message, Throwable cause) {
-        super(message, cause);
-    }
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManager.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManager.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManager.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManager.java Fri Dec 11 16:19:25 2009
@@ -25,6 +25,7 @@
 
 package javax.persistence;
 
+import java.util.Set;
 import java.util.Map;
 import javax.persistence.metamodel.Metamodel;
 import javax.persistence.criteria.CriteriaBuilder;

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityNotFoundException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityNotFoundException.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityNotFoundException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityNotFoundException.java Fri Dec 11 16:19:25 2009
@@ -25,16 +25,8 @@
 package javax.persistence;
 
 
-/**
- * @version $Rev$ $Date$
- */
 public class EntityNotFoundException extends PersistenceException {
 
-    /**
-     *
-     */
-    private static final long serialVersionUID = 737197424871374104L;
-
     public EntityNotFoundException() {
         super();
     }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NoResultException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NoResultException.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NoResultException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NoResultException.java Fri Dec 11 16:19:25 2009
@@ -24,16 +24,8 @@
 //
 package javax.persistence;
 
-/**
- * @version $Rev$ $Date$
- */
 public class NoResultException extends PersistenceException {
 
-    /**
-     *
-     */
-    private static final long serialVersionUID = 4123871304568481301L;
-
     public NoResultException() {
         super();
     }
@@ -41,5 +33,4 @@
     public NoResultException(String message) {
         super(message);
     }
-
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NonUniqueResultException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NonUniqueResultException.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NonUniqueResultException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NonUniqueResultException.java Fri Dec 11 16:19:25 2009
@@ -25,16 +25,8 @@
 package javax.persistence;
 
 
-/**
- * @version $Rev$ $Date$
- */
 public class NonUniqueResultException extends PersistenceException {
 
-    /**
-     *
-     */
-    private static final long serialVersionUID = 8841586522747620836L;
-
     public NonUniqueResultException() {
         super();
     }
@@ -42,5 +34,5 @@
     public NonUniqueResultException(String message) {
         super(message);
     }
-
 }
+

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OptimisticLockException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OptimisticLockException.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OptimisticLockException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OptimisticLockException.java Fri Dec 11 16:19:25 2009
@@ -25,38 +25,35 @@
 package javax.persistence;
 
 public class OptimisticLockException extends PersistenceException {
-    private final Object entity;
+
+    Object entity;
 
     public OptimisticLockException() {
-        this.entity = null;
+        super();
     }
 
-    public OptimisticLockException(Object entity) {
-        super();
-        this.entity = entity;
+    public OptimisticLockException(String message) {
+        super(message);
     }
 
-    public OptimisticLockException(String string) {
-        super(string);
-        this.entity = null;
+    public OptimisticLockException(String message, Throwable cause) {
+        super(message, cause);
     }
 
-    public OptimisticLockException(String string, Throwable throwable) {
-        super(string, throwable);
-        this.entity = null;
+    public OptimisticLockException(Throwable cause) {
+        super(cause);
     }
 
-    public OptimisticLockException(String string, Throwable throwable, Object entity) {
-        super(string, throwable);
+    public OptimisticLockException(Object entity) {
         this.entity = entity;
     }
 
-    public OptimisticLockException(Throwable throwable) {
-        super(throwable);
-        this.entity = null;
+    public OptimisticLockException(String message, Throwable cause, Object entity) {
+        super(message, cause);
+        this.entity = entity;
     }
 
     public Object getEntity() {
-        return entity;
+        return this.entity;
     }
 }

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -35,13 +35,13 @@
 @Retention(RUNTIME)
 public @interface OrderColumn {
 
-	String name() default "";
+    String name() default "";
 
-	boolean nullable() default true;
+    boolean nullable() default true;
 
-	boolean insertable() default true;
+    boolean insertable() default true;
 
-	boolean updatable() default true;
+    boolean updatable() default true;
 
-	String columnDefinition() default "";
+    String columnDefinition() default "";
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceException.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceException.java Fri Dec 11 16:19:25 2009
@@ -24,26 +24,22 @@
 //
 package javax.persistence;
 
-/**
- * @version $Rev$ $Date$
- */
 public class PersistenceException extends RuntimeException {
 
-    private static final long serialVersionUID = -8734504053550505412L;
-
     public PersistenceException() {
         super();
     }
 
-    public PersistenceException(String string) {
-        super(string);
+    public PersistenceException(String message) {
+        super(message);
     }
 
-    public PersistenceException(String string, Throwable throwable) {
-        super(string, throwable);
+    public PersistenceException(String message, Throwable cause) {
+        super(message, cause);
     }
 
-    public PersistenceException(Throwable throwable) {
-        super(throwable);
+    public PersistenceException(Throwable cause) {
+        super(cause);
     }
 }
+

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockException.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockException.java Fri Dec 11 16:19:25 2009
@@ -25,38 +25,34 @@
 package javax.persistence;
 
 public class PessimisticLockException extends PersistenceException {
-    private final Object entity;
+    Object entity;
 
     public PessimisticLockException() {
-        this.entity = null;
+        super();
     }
 
-    public PessimisticLockException(Object entity) {
-        super();
-        this.entity = entity;
+    public PessimisticLockException(String message) {
+        super(message);
     }
 
-    public PessimisticLockException(String string) {
-        super(string);
-        this.entity = null;
+    public PessimisticLockException(String message, Throwable cause) {
+        super(message, cause);
     }
 
-    public PessimisticLockException(String string, Throwable throwable) {
-        super(string, throwable);
-        this.entity = null;
+    public PessimisticLockException(Throwable cause) {
+        super(cause);
     }
 
-    public PessimisticLockException(String string, Throwable throwable, Object entity) {
-        super(string, throwable);
+    public PessimisticLockException(Object entity) {
         this.entity = entity;
     }
 
-    public PessimisticLockException(Throwable throwable) {
-        super(throwable);
-        this.entity = null;
+    public PessimisticLockException(String message, Throwable cause, Object entity) {
+        super(message, cause);
+        this.entity = entity;
     }
-
+    
     public Object getEntity() {
-        return entity;
+        return this.entity;
     }
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/QueryTimeoutException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/QueryTimeoutException.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/QueryTimeoutException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/QueryTimeoutException.java Fri Dec 11 16:19:25 2009
@@ -26,14 +26,34 @@
 
 public class QueryTimeoutException extends PersistenceException {
 
-    private static final long serialVersionUID = -8316122340369217178L;
+    Query query;
 
     public QueryTimeoutException() {
         super();
     }
 
-    public QueryTimeoutException(String string) {
-        super(string);
+    public QueryTimeoutException(String message) {
+        super(message);
     }
 
+    public QueryTimeoutException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public QueryTimeoutException(Throwable cause) {
+        super(cause);
+    }
+
+    public QueryTimeoutException(Query query) {
+        this.query = query;
+    }
+
+    public QueryTimeoutException(String message, Throwable cause, Query query) {
+        super(message, cause);
+        this.query = query;
+    }
+    
+    public Query getQuery() {
+        return this.query;
+    }
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/RollbackException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/RollbackException.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/RollbackException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/RollbackException.java Fri Dec 11 16:19:25 2009
@@ -26,17 +26,18 @@
 
 public class RollbackException extends PersistenceException {
     public RollbackException() {
+        super();
     }
 
-    public RollbackException(String string) {
-        super(string);
+    public RollbackException(String message) {
+        super(message);
     }
 
-    public RollbackException(String string, Throwable throwable) {
-        super(string, throwable);
+    public RollbackException(String message, Throwable cause) {
+        super(message, cause);
     }
 
-    public RollbackException(Throwable throwable) {
-        super(throwable);
+    public RollbackException(Throwable cause) {
+        super(cause);
     }
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TransactionRequiredException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TransactionRequiredException.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TransactionRequiredException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TransactionRequiredException.java Fri Dec 11 16:19:25 2009
@@ -24,21 +24,14 @@
 //
 package javax.persistence;
 
-/**
- * @version $Rev$ $Date$
- */
+
 public class TransactionRequiredException extends PersistenceException {
-    /**
-     *
-     */
-    private static final long serialVersionUID = 2115931496795913403L;
 
     public TransactionRequiredException() {
         super();
     }
 
-    public TransactionRequiredException(String string) {
-        super(string);
+    public TransactionRequiredException(String message) {
+        super(message);
     }
-
 }

Modified: 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=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaBuilder.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaBuilder.java Fri Dec 11 16:19:25 2009
@@ -40,14 +40,12 @@
 
     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);
@@ -59,7 +57,9 @@
     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);
@@ -69,14 +69,16 @@
 
     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);
 
+    <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);
@@ -84,29 +86,31 @@
     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);
 
+    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);
@@ -114,6 +118,7 @@
     <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);
@@ -141,7 +146,9 @@
     <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);
@@ -157,12 +164,15 @@
     <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);
@@ -180,46 +190,51 @@
     Expression<BigDecimal> toBigDecimal(Expression<? extends Number> number);
 
     Expression<BigInteger> toBigInteger(Expression<? extends Number> number);
-    Expression<String> toString(Expression<Character> character);
 
+    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);
-
 
+    <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);
@@ -227,17 +242,23 @@
     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,
@@ -245,25 +266,33 @@
 
         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();
@@ -277,60 +306,54 @@
 
          In<T> value(Expression<? extends T> value);
      }
-    <T> In<T> in(Expression<? extends T> expression);
 
+    <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();
+        Expression<C> getExpression();
 
-		SimpleCase<C, R> when(C condition, R result);
+        SimpleCase<C, R> when(C condition, R result);
 
-		SimpleCase<C, R> when(C condition, Expression<? extends R> result);
+        SimpleCase<C, R> when(C condition, Expression<? extends R> result);
 
-		Expression<R> otherwise(R result);
+        Expression<R> otherwise(R result);
 
-		Expression<R> otherwise(Expression<? extends R> result);
-	}
-    <C, R> SimpleCase<C,R> selectCase(Expression<? extends C> expression);
+        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, R result);
+
+        Case<R> when(Expression<Boolean> condition, Expression<? extends R> result);
 
-		Case<R> when(Expression<Boolean> condition, Expression<? extends R> result);
+        Expression<R> otherwise(R result);
 
-		Expression<R> otherwise(R result);
+        Expression<R> otherwise(Expression<? extends R> result);
+    }
 
-		Expression<R> otherwise(Expression<? extends R> result);
-	}
     <R> Case<R> selectCase();
 
-   <T> Expression<T> function(String name, Class<T> type,
-Expression<?>... args);
+   <T> Expression<T> function(String name, Class<T> type, Expression<?>... args);
 
 }
 
-
-
-

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java Fri Dec 11 16:19:25 2009
@@ -30,11 +30,11 @@
 
 
 public interface CriteriaQuery<T> extends AbstractQuery<T> {
+
     CriteriaQuery<T> select(Selection<? extends T> selection);
 
     CriteriaQuery<T> multiselect(Selection<?>... selections);
 
-
     CriteriaQuery<T> multiselect(List<Selection<?>> selectionList);
 
     CriteriaQuery<T> where(Expression<Boolean> restriction);
@@ -54,6 +54,8 @@
     CriteriaQuery<T> orderBy(List<Order> o);
 
     CriteriaQuery<T> distinct(boolean distinct);
+
     List<Order> getOrderList();
+
     Set<ParameterExpression<?>> getParameters();
 }

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -38,6 +38,7 @@
     <Y> Fetch<X, Y> fetch(SingularAttribute<? super X, Y> attribute, JoinType jt);
 
     <Y> Fetch<X, Y> fetch(PluralAttribute<? super X, ?, Y> attribute);
+
     <Y> Fetch<X, Y> fetch(PluralAttribute<? super X, ?, Y> attribute, JoinType jt);
 
     @SuppressWarnings("hiding")

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -61,17 +61,18 @@
 
     <K, V> MapJoin<X, K, V> join(MapAttribute<? super X, K, V> map, JoinType jt);
 
-
     <X, Y> Join<X, Y> join(String attributeName);	
 
     <X, Y> CollectionJoin<X, Y> joinCollection(String attributeName);	
 
     <X, Y> SetJoin<X, Y> joinSet(String attributeName);	
 
-    <X, Y> ListJoin<X, Y> joinList(String attributeName);		
+    <X, Y> ListJoin<X, Y> joinList(String attributeName);
+
     <X, K, V> MapJoin<X, K, V> joinMap(String attributeName);	
 
-    <X, Y> Join<X, Y> join(String attributeName, JoinType jt);	
+    <X, Y> Join<X, Y> join(String attributeName, JoinType jt);
+
     <X, Y> CollectionJoin<X, Y> joinCollection(String attributeName, JoinType jt);	
 
     <X, Y> SetJoin<X, Y> joinSet(String attributeName, JoinType jt);	

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -33,7 +33,10 @@
 		extends PluralJoin<Z, Map<K, V>, V> {
 
     MapAttribute<? super Z, K, V> getModel();
+
     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/Path.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Path.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Path.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Path.java Fri Dec 11 16:19:25 2009
@@ -33,8 +33,10 @@
 
 public interface Path<X> extends Expression<X> {
 
-    Bindable<X> getModel(); 
+    Bindable<X> getModel();
+
     Path<?> getParentPath();
+
     <Y> Path<Y> get(SingularAttribute<? super X, Y> attribute);
 
     <E, C extends java.util.Collection<E>> Expression<C> get(PluralAttribute<X, C, E> collection);
@@ -43,6 +45,5 @@
 
     Expression<Class<? extends X>> type();
 
-
     <Y> Path<Y> get(String attributeName);
 }

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -30,14 +30,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 not();
-
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Selection.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Selection.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Selection.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Selection.java Fri Dec 11 16:19:25 2009
@@ -36,5 +36,4 @@
     boolean isCompoundSelection();
 
     List<Selection<?>> getCompoundSelectionItems();
-
 }

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -30,7 +30,9 @@
 
 
 public interface Subquery<T> extends AbstractQuery<T>, Expression<T> {
+
     Subquery<T> select(Expression<T> expression);
+
     Subquery<T> where(Expression<Boolean> restriction);
 
     Subquery<T> where(Predicate... restrictions);
@@ -44,6 +46,7 @@
     Subquery<T> having(Predicate... restrictions);
 
     Subquery<T> distinct(boolean distinct);
+
     <Y> Root<Y> correlate(Root<Y> parentRoot);
 
     <X, Y> Join<X, Y> correlate(Join<X, Y> parentJoin);
@@ -57,9 +60,9 @@
     <X, K, V> MapJoin<X, K, V> correlate(MapJoin<X, K, V> parentMap);
 
     AbstractQuery<?> getParent();
+
     Expression<T> getSelection();
 
     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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -28,20 +28,22 @@
 
 public interface Attribute<X, Y> {
 
-	public static enum PersistentAttributeType {
-	     MANY_TO_ONE, 
+    public static enum PersistentAttributeType {
 
-	     ONE_TO_ONE, 
-	     BASIC, 
+        MANY_TO_ONE,
 
-	     EMBEDDED,
+        ONE_TO_ONE,
 
-	     MANY_TO_MANY, 
+        BASIC,
 
-	     ONE_TO_MANY, 
+        EMBEDDED,
 
-	     ELEMENT_COLLECTION
-	}
+        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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -27,15 +27,16 @@
 
 
 public interface Bindable<T> {
-	public static enum BindableType { 
+    public static enum BindableType { 
 
-	    SINGULAR_ATTRIBUTE, 
+        SINGULAR_ATTRIBUTE, 
 
-	    PLURAL_ATTRIBUTE, 
+        PLURAL_ATTRIBUTE, 
 
-	    ENTITY_TYPE
-	}
+        ENTITY_TYPE
+    }
 
     BindableType getBindableType();
+
     Class<T> getBindableJavaType();
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/CollectionAttribute.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/CollectionAttribute.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/CollectionAttribute.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/CollectionAttribute.java Fri Dec 11 16:19:25 2009
@@ -27,4 +27,4 @@
 
 
 public interface CollectionAttribute<X, E> 
-	extends PluralAttribute<X, java.util.Collection<E>, E> {}
+    extends PluralAttribute<X, java.util.Collection<E>, E> {}

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -36,6 +36,7 @@
     <Y> SingularAttribute<? super X, Y> getVersion(Class<Y> type);
 
     <Y> SingularAttribute<X, Y> getDeclaredVersion(Class<Y> type);
+
     IdentifiableType<? super X> getSupertype();
 
     boolean hasSingleIdAttribute();

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -66,8 +66,6 @@
     Set<PluralAttribute<X, ?, ?>> getDeclaredPluralAttributes();
 
 
-
-
     Attribute<? super X, ?> getAttribute(String name); 
 
     Attribute<X, ?> getDeclaredAttribute(String name); 

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -33,6 +33,7 @@
     <X> EntityType<X> entity(Class<X> cls);
 
     <X> ManagedType<X> managedType(Class<X> cls);
+
     <X> EmbeddableType<X> embeddable(Class<X> cls);
 
     Set<ManagedType<?>> getManagedTypes();

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -28,16 +28,16 @@
 
 public interface PluralAttribute<X, C, E> 
 		extends Attribute<X, C>, Bindable<E> {
-	public static enum CollectionType {
+    public static enum CollectionType {
 
-	    COLLECTION, 
+        COLLECTION, 
 
-	    SET, 
+        SET, 
 
-	    LIST, 
+        LIST, 
 
-	    MAP
-	}
+        MAP
+    }
     CollectionType getCollectionType();
 
     Type<E> getElementType();

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -29,6 +29,7 @@
 
 public interface SingularAttribute<X, T> 
 		extends Attribute<X, T>, Bindable<T> {
+
     boolean isId();
 
     boolean isVersion();

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -28,16 +28,16 @@
 
 public interface Type<X> {
 
-       public static enum PersistenceType {
+    public static enum PersistenceType {
 
-           ENTITY, 
+        ENTITY, 
 
-	   EMBEDDABLE, 
+        EMBEDDABLE, 
 
-	   MAPPED_SUPERCLASS, 
+        MAPPED_SUPERCLASS, 
 
-	   BASIC
-       }
+        BASIC
+    }
 
     PersistenceType getPersistenceType();
 

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolverHolder.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolverHolder.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolverHolder.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolverHolder.java Fri Dec 11 16:19:25 2009
@@ -40,7 +40,15 @@
 
 import javax.persistence.PersistenceException;
 
-
+/**
+ * Contains Geronimo implemented code as required by the JPA spec.
+ *
+ * Finds/Creates the global {@link javax.persistence.spi.PersistenceProviderResolver}
+ * 
+ * Implementations must be thread-safe.
+ * 
+ * @since Java Persistence 2.0
+ */
 public class PersistenceProviderResolverHolder {
 
     private static PersistenceProviderResolver persistenceResolver =

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=889680&r1=889679&r2=889680&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 Fri Dec 11 16:19:25 2009
@@ -59,6 +59,7 @@
     public ValidationMode getValidationMode();
 
     public Properties getProperties();
+
     public String getPersistenceXMLSchemaVersion();
 
     public ClassLoader getClassLoader();

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitTransactionType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitTransactionType.java?rev=889680&r1=889679&r2=889680&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitTransactionType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitTransactionType.java Fri Dec 11 16:19:25 2009
@@ -29,5 +29,6 @@
 public enum PersistenceUnitTransactionType {
 
     JTA,
+
     RESOURCE_LOCAL
 }



Mime
View raw message