geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1483970 [1/2] - in /geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence: ./ criteria/ metamodel/ spi/
Date Fri, 17 May 2013 20:09:11 GMT
Author: gawor
Date: Fri May 17 20:09:10 2013
New Revision: 1483970

URL: http://svn.apache.org/r1483970
Log:
GERONIMO-6451: JPA 2.1 updates - patch from Pinaki Poddar

Added:
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeConverter.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeNode.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstraintMode.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstructorResult.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Convert.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converter.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converts.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityGraph.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ForeignKey.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Index.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedAttributeNode.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraph.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraphs.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQueries.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQuery.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedSubgraph.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ParameterMode.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureParameter.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureQuery.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Subgraph.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SynchronizationType.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/package-info.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/metamodel/package-info.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/package-info.java   (with props)
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/spi/package-info.java   (with props)
Modified:
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AssociationOverride.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Cache.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/CollectionTable.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ColumnResult.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityManager.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityManagerFactory.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinColumn.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinColumns.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinTable.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PersistenceContext.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumn.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SecondaryTable.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SqlResultSetMapping.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Table.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/TableGenerator.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/CollectionJoin.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/CriteriaBuilder.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/CriteriaUpdate.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/Join.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/ListJoin.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/MapJoin.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/SetJoin.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/Subquery.java
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/spi/PersistenceProvider.java

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AssociationOverride.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AssociationOverride.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AssociationOverride.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AssociationOverride.java Fri May 17 20:09:10 2013
@@ -30,7 +30,7 @@ import static java.lang.annotation.Eleme
 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.ConstraintMode.PROVIDER_DEFAULT;
 
 @Target({TYPE, METHOD, FIELD}) 
 @Retention(RUNTIME)
@@ -41,5 +41,7 @@ public @interface AssociationOverride {
 
     JoinColumn[] joinColumns() default {};
 
+    ForeignKey foreignKey() default @ForeignKey(PROVIDER_DEFAULT);
+
     JoinTable joinTable() default @JoinTable;
 }

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeConverter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeConverter.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeConverter.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeConverter.java Fri May 17 20:09:10 2013
@@ -0,0 +1,32 @@
+/*
+ * 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 interface AttributeConverter<X,Y> {
+
+    public Y convertToDatabaseColumn (X attribute);
+
+    public X convertToEntityAttribute (Y dbData);
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeConverter.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeConverter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeNode.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeNode.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeNode.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeNode.java Fri May 17 20:09:10 2013
@@ -0,0 +1,38 @@
+/*
+ * 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;
+
+import java.util.Map;
+
+public interface AttributeNode<T> {
+
+    public String getAttributeName();
+
+    public Map<Class, Subgraph> getSubgraphs();
+
+    public Map<Class, Subgraph> getKeySubgraphs();
+}
+

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeNode.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/AttributeNode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Cache.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Cache.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Cache.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Cache.java Fri May 17 20:09:10 2013
@@ -22,11 +22,8 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-
-
 package javax.persistence;
 
-
 public interface Cache {
 
     public boolean contains(Class cls, Object primaryKey);
@@ -36,4 +33,6 @@ public interface Cache {
     public void evict(Class cls);
 
     public void evictAll();
+
+    public <T> T unwrap(Class<T> cls);
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/CollectionTable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/CollectionTable.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/CollectionTable.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/CollectionTable.java Fri May 17 20:09:10 2013
@@ -29,7 +29,7 @@ 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;
-
+import static javax.persistence.ConstraintMode.PROVIDER_DEFAULT;
 
 
 @Target( { METHOD, FIELD })
@@ -44,5 +44,9 @@ public @interface CollectionTable {
 
      JoinColumn[] joinColumns() default {};
 
+    ForeignKey foreignKey() default @ForeignKey(PROVIDER_DEFAULT);
+
     UniqueConstraint[] uniqueConstraints() default {};
+
+    Index[] indexes() default {};
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ColumnResult.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ColumnResult.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ColumnResult.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ColumnResult.java Fri May 17 20:09:10 2013
@@ -28,11 +28,12 @@ import java.lang.annotation.Target;
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-
 @Target({}) 
 @Retention(RUNTIME)
 
 public @interface ColumnResult { 
 
     String name();
+
+    Class type() default void.class;
 }

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstraintMode.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstraintMode.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstraintMode.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstraintMode.java Fri May 17 20:09:10 2013
@@ -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 ConstraintMode {
+
+	CONSTRAINT,
+
+	NO_CONSTRAINT,
+
+        PROVIDER_DEFAULT
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstraintMode.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstraintMode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstructorResult.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstructorResult.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstructorResult.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstructorResult.java Fri May 17 20:09:10 2013
@@ -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;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({}) 
+@Retention(RUNTIME)
+
+public @interface ConstructorResult { 
+
+    Class targetClass();
+
+    ColumnResult[] columns();
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstructorResult.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ConstructorResult.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Convert.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Convert.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Convert.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Convert.java Fri May 17 20:09:10 2013
@@ -0,0 +1,42 @@
+/*
+ * 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;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({METHOD, FIELD, TYPE}) @Retention(RUNTIME)
+public @interface Convert {
+
+  Class converter() default void.class;
+
+  String attributeName() default "";
+
+  boolean disableConversion() default false;
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Convert.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Convert.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converter.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converter.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converter.java Fri May 17 20:09:10 2013
@@ -0,0 +1,35 @@
+/*
+ * 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;
+
+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 Converter {
+     boolean autoApply() default false;
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converter.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converts.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converts.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converts.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converts.java Fri May 17 20:09:10 2013
@@ -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;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({METHOD, FIELD, TYPE})
+@Retention(RUNTIME)
+public @interface Converts {
+
+  Convert[] value();
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converts.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Converts.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityGraph.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityGraph.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityGraph.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityGraph.java Fri May 17 20:09:10 2013
@@ -0,0 +1,62 @@
+/*
+ * 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;
+
+import javax.persistence.metamodel.Attribute;
+import java.util.List;
+
+public interface EntityGraph<T> {
+
+    public String getName();
+
+    public void addAttributeNodes(String ... attributeName);
+
+    public void addAttributeNodes(Attribute<T, ?> ... attribute);
+
+    public <X> Subgraph<X> addSubgraph(Attribute<T, X> attribute);
+
+    public <X> Subgraph<? extends X> addSubgraph(Attribute<T, X> attribute, Class<? extends X> type);
+
+    public <X> Subgraph<X> addSubgraph(String attributeName);
+
+    public <X> Subgraph<X> addSubgraph(String attributeName, Class<X> type);
+
+    public <X> Subgraph<X> addKeySubgraph(Attribute<T, X> attribute);
+
+    public <X> Subgraph<? extends X> addKeySubgraph(Attribute<T, X> attribute, Class<? extends X> type);
+
+    public <X> Subgraph<X> addKeySubgraph(String attributeName);
+
+    public <X> Subgraph<X> addKeySubgraph(String attributeName, Class<X> type);
+
+
+    public <T> Subgraph<? extends T> addSubclassSubgraph(Class<? extends T> type);
+//    public <S extends T> Subgraph<S> addSubclassSubgraph(Class<S> type);
+
+
+    public List<AttributeNode<?>> getAttributeNodes();
+
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityGraph.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityGraph.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityManager.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityManager.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityManager.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityManager.java Fri May 17 20:09:10 2013
@@ -22,24 +22,29 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-
 package javax.persistence;
 
-import java.util.Set;
 import java.util.Map;
+import java.util.List;
 import javax.persistence.metamodel.Metamodel;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-
+import javax.persistence.criteria.CriteriaUpdate;
+import javax.persistence.criteria.CriteriaDelete;
 
 public interface EntityManager {
 
     public void persist(Object entity);
+    
     public <T> T merge(T entity);
+
     public void remove(Object entity);
+    
     public <T> T find(Class<T> entityClass, Object primaryKey);
+    
     public <T> T find(Class<T> entityClass, Object primaryKey, 
                       Map<String, Object> properties); 
+    
     public <T> T find(Class<T> entityClass, Object primaryKey,
                       LockModeType lockMode);
 
@@ -70,6 +75,7 @@ public interface EntityManager {
 
     public void refresh(Object entity, LockModeType lockMode,
                         Map<String, Object> properties);
+    
     public void clear();
 
     public void detach(Object entity); 
@@ -86,6 +92,10 @@ public interface EntityManager {
 
     public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery); 
 
+    public Query createQuery(CriteriaUpdate updateQuery);
+
+    public Query createQuery(CriteriaDelete deleteQuery);
+
     public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass);
 
     public Query createNamedQuery(String name);
@@ -98,8 +108,20 @@ public interface EntityManager {
 
     public Query createNativeQuery(String sqlString, String resultSetMapping);
 
+    public StoredProcedureQuery createNamedStoredProcedureQuery(String name);
+
+    public StoredProcedureQuery createStoredProcedureQuery(String procedureName);
+
+    public StoredProcedureQuery createStoredProcedureQuery(
+	       String procedureName, Class... resultClasses);
+
+    public StoredProcedureQuery createStoredProcedureQuery(
+              String procedureName, String... resultSetMappings);
+
     public void joinTransaction();
 
+    public boolean isJoinedToTransaction();
+
     public <T> T unwrap(Class<T> cls); 
 
     public Object getDelegate();
@@ -115,4 +137,13 @@ public interface EntityManager {
     public CriteriaBuilder getCriteriaBuilder();
 
     public Metamodel getMetamodel();
+
+    public <T> EntityGraph<T> createEntityGraph(Class<T> rootType);
+
+    public EntityGraph<?> createEntityGraph(String graphName);
+
+    public  EntityGraph<?> getEntityGraph(String graphName);
+
+    public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass);
+
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityManagerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityManagerFactory.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityManagerFactory.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/EntityManagerFactory.java Fri May 17 20:09:10 2013
@@ -22,25 +22,28 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-
-
 package javax.persistence;
 
-import java.util.Set;
 import java.util.Map;
 import javax.persistence.metamodel.Metamodel;
 import javax.persistence.criteria.CriteriaBuilder;
 
-
 public interface EntityManagerFactory {
 
     public EntityManager createEntityManager();
+    
     public EntityManager createEntityManager(Map map);
 
+    public EntityManager createEntityManager(SynchronizationType synchronizationType);
+
+    public EntityManager createEntityManager(SynchronizationType synchronizationType, Map map);
+
     public CriteriaBuilder getCriteriaBuilder();
+    
     public Metamodel getMetamodel();
 
     public boolean isOpen();
+    
     public void close();
 
     public Map<String, Object> getProperties();
@@ -48,4 +51,11 @@ public interface EntityManagerFactory {
     public Cache getCache();
 
     public PersistenceUnitUtil getPersistenceUnitUtil();
+
+    public void addNamedQuery(String name, Query query);
+
+    public <T> T unwrap(Class<T> cls);
+
+    public <T> void addNamedEntityGraph(String graphName, EntityGraph<T> entityGraph);
+
 }

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ForeignKey.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ForeignKey.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ForeignKey.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ForeignKey.java Fri May 17 20:09:10 2013
@@ -0,0 +1,41 @@
+/*
+ * 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;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import static javax.persistence.ConstraintMode.CONSTRAINT;
+
+@Target({})
+@Retention(RUNTIME)
+public @interface ForeignKey {
+
+    String name() default "";
+
+    ConstraintMode value() default CONSTRAINT;
+
+    String foreignKeyDefinition() default "";
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ForeignKey.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ForeignKey.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Index.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Index.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Index.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Index.java Fri May 17 20:09:10 2013
@@ -0,0 +1,41 @@
+/*
+ * 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;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Target({})
+@Retention(RUNTIME)
+public @interface Index {
+
+    String name() default "";
+
+    String columnList();
+
+    boolean unique() default false;
+
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Index.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Index.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinColumn.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinColumn.java Fri May 17 20:09:10 2013
@@ -29,7 +29,7 @@ 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;
-
+import static javax.persistence.ConstraintMode.PROVIDER_DEFAULT;
 
 @Target({METHOD, FIELD})
 @Retention(RUNTIME)
@@ -50,4 +50,6 @@ public @interface JoinColumn {
     String columnDefinition() default "";
 
     String table() default "";
+
+    ForeignKey foreignKey() default @ForeignKey(PROVIDER_DEFAULT);
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinColumns.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinColumns.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinColumns.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinColumns.java Fri May 17 20:09:10 2013
@@ -29,11 +29,13 @@ 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;
-
+import static javax.persistence.ConstraintMode.PROVIDER_DEFAULT;
 
 @Target({METHOD, FIELD}) 
 @Retention(RUNTIME)
 public @interface JoinColumns {
 
     JoinColumn[] value();
+
+    ForeignKey foreignKey() default @ForeignKey(PROVIDER_DEFAULT);
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinTable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinTable.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinTable.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/JoinTable.java Fri May 17 20:09:10 2013
@@ -29,7 +29,7 @@ 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;
-
+import static javax.persistence.ConstraintMode.PROVIDER_DEFAULT;
 
 @Target({METHOD, FIELD}) 
 @Retention(RUNTIME)
@@ -46,5 +46,11 @@ public @interface JoinTable {
 
     JoinColumn[] inverseJoinColumns() default {};
 
+    ForeignKey foreignKey() default @ForeignKey(PROVIDER_DEFAULT);
+
+    ForeignKey inverseForeignKey() default @ForeignKey(PROVIDER_DEFAULT);
+
     UniqueConstraint[] uniqueConstraints() default {};
+
+    Index[] indexes() default {};
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java Fri May 17 20:09:10 2013
@@ -29,7 +29,7 @@ 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;
-
+import static javax.persistence.ConstraintMode.PROVIDER_DEFAULT;
 
 @Target( { METHOD, FIELD })
 @Retention(RUNTIME)
@@ -49,4 +49,6 @@ public @interface MapKeyJoinColumn {
 	String columnDefinition() default "";
 
 	String table() default "";
+
+        ForeignKey foreignKey() default @ForeignKey(PROVIDER_DEFAULT);
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java Fri May 17 20:09:10 2013
@@ -29,10 +29,12 @@ 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;
-
+import static javax.persistence.ConstraintMode.PROVIDER_DEFAULT;
 
 @Target( { METHOD, FIELD })
 @Retention(RUNTIME)
 public @interface MapKeyJoinColumns {
 	MapKeyJoinColumn[] value();
+
+        ForeignKey foreignKey() default @ForeignKey(PROVIDER_DEFAULT);
 }

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedAttributeNode.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedAttributeNode.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedAttributeNode.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedAttributeNode.java Fri May 17 20:09:10 2013
@@ -0,0 +1,43 @@
+/*
+ * 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;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({})
+@Retention(RUNTIME)
+public @interface NamedAttributeNode {
+
+    String value();
+
+    String subgraph() default "";
+
+    String keySubgraph() default "";
+}
+
+

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedAttributeNode.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedAttributeNode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraph.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraph.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraph.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraph.java Fri May 17 20:09:10 2013
@@ -0,0 +1,47 @@
+/*
+ * 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;
+
+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 NamedEntityGraph {
+
+    String name() default "";
+
+    NamedAttributeNode[] attributeNodes() default {};
+
+    boolean includeAllAttributes() default false;
+
+    NamedSubgraph[] subgraphs() default {};
+
+    NamedSubgraph[] subclassSubgraphs() default {};
+}
+

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraph.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraph.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraphs.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraphs.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraphs.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraphs.java Fri May 17 20:09:10 2013
@@ -0,0 +1,37 @@
+/*
+ * 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;
+
+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 NamedEntityGraphs{
+    NamedEntityGraph[] value();
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraphs.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedEntityGraphs.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQueries.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQueries.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQueries.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQueries.java Fri May 17 20:09:10 2013
@@ -0,0 +1,37 @@
+/*
+ * 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; 
+
+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 NamedStoredProcedureQueries { 
+
+    NamedStoredProcedureQuery[] value ();
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQueries.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQueries.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQuery.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQuery.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQuery.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQuery.java Fri May 17 20:09:10 2013
@@ -0,0 +1,48 @@
+/*
+ * 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;
+
+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 NamedStoredProcedureQuery { 
+
+    String name();
+
+    String procedureName();
+
+    StoredProcedureParameter[] parameters() default {};
+
+    Class[] resultClasses() default {}; 
+
+    String[] resultSetMappings() default {};
+
+    QueryHint[] hints() default {};
+
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQuery.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedStoredProcedureQuery.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedSubgraph.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedSubgraph.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedSubgraph.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedSubgraph.java Fri May 17 20:09:10 2013
@@ -0,0 +1,43 @@
+/*
+ * 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;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({})
+@Retention(RUNTIME)
+public @interface NamedSubgraph {
+
+    String name();
+
+    Class type() default void.class;
+
+    NamedAttributeNode[] attributeNodes();
+}
+
+

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedSubgraph.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/NamedSubgraph.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ParameterMode.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ParameterMode.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ParameterMode.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ParameterMode.java Fri May 17 20:09:10 2013
@@ -0,0 +1,41 @@
+/*
+ * 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; 
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+public enum ParameterMode {
+
+    IN,
+
+    INOUT,
+
+    OUT,
+
+    REF_CURSOR,
+
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ParameterMode.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/ParameterMode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PersistenceContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PersistenceContext.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PersistenceContext.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PersistenceContext.java Fri May 17 20:09:10 2013
@@ -30,7 +30,6 @@ import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.*;
 
 
-
 @Target({TYPE, METHOD, FIELD})
 @Retention(RUNTIME)
 public @interface PersistenceContext {
@@ -41,5 +40,7 @@ public @interface PersistenceContext {
 
     PersistenceContextType type() default PersistenceContextType.TRANSACTION;
 
+    SynchronizationType synchronization() default SynchronizationType.SYNCHRONIZED;
+
     PersistenceProperty[] properties() default {};
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumn.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumn.java Fri May 17 20:09:10 2013
@@ -30,7 +30,7 @@ import static java.lang.annotation.Eleme
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
+import static javax.persistence.ConstraintMode.PROVIDER_DEFAULT;
 
 @Target({TYPE, METHOD, FIELD})
 @Retention(RUNTIME)
@@ -42,4 +42,6 @@ public @interface PrimaryKeyJoinColumn {
     String referencedColumnName() default "";
 
     String columnDefinition() default "";
+
+    ForeignKey foreignKey() default @ForeignKey(PROVIDER_DEFAULT);
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java Fri May 17 20:09:10 2013
@@ -30,7 +30,7 @@ import static java.lang.annotation.Eleme
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
+import static javax.persistence.ConstraintMode.PROVIDER_DEFAULT;
 
 @Target({TYPE, METHOD, FIELD})
 @Retention(RUNTIME)
@@ -38,4 +38,7 @@ import static java.lang.annotation.Reten
 public @interface PrimaryKeyJoinColumns {
 
     PrimaryKeyJoinColumn[] value();
+
+    ForeignKey foreignKey() default @ForeignKey(PROVIDER_DEFAULT);
+
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SecondaryTable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SecondaryTable.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SecondaryTable.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SecondaryTable.java Fri May 17 20:09:10 2013
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
 import java.lang.annotation.Retention;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
+import static javax.persistence.ConstraintMode.PROVIDER_DEFAULT;
 
 @Target(TYPE) 
 @Retention(RUNTIME)
@@ -43,5 +43,9 @@ public @interface SecondaryTable {
 
     PrimaryKeyJoinColumn[] pkJoinColumns() default {};
 
+    ForeignKey foreignKey() default @ForeignKey(PROVIDER_DEFAULT);
+
     UniqueConstraint[] uniqueConstraints() default {};
+
+    Index[] indexes() default {};
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SqlResultSetMapping.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SqlResultSetMapping.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SqlResultSetMapping.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SqlResultSetMapping.java Fri May 17 20:09:10 2013
@@ -29,7 +29,6 @@ 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 { 
@@ -38,5 +37,7 @@ public @interface SqlResultSetMapping { 
 
     EntityResult[] entities() default {};
 
+    ConstructorResult[] classes() default {};
+
     ColumnResult[] columns() default {};
 }

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureParameter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureParameter.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureParameter.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureParameter.java Fri May 17 20:09:10 2013
@@ -0,0 +1,41 @@
+/*
+ * 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; 
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({}) 
+@Retention(RUNTIME)
+public @interface StoredProcedureParameter { 
+
+    String name() default "";
+
+    ParameterMode mode() default ParameterMode.IN;
+
+    Class type();
+
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureParameter.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureParameter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureQuery.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureQuery.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureQuery.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureQuery.java Fri May 17 20:09:10 2013
@@ -0,0 +1,94 @@
+/*
+ * 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;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+public interface StoredProcedureQuery extends Query {
+
+    StoredProcedureQuery setHint(String hintName, Object value);
+
+    <T> StoredProcedureQuery setParameter(Parameter<T> param, 
+                                          T value);
+
+    StoredProcedureQuery setParameter(Parameter<Calendar> param,
+                                      Calendar value, 
+                                      TemporalType temporalType);
+
+    StoredProcedureQuery setParameter(Parameter<Date> param, 
+                                      Date value, 
+                                      TemporalType temporalType);
+
+    StoredProcedureQuery setParameter(String name, Object value);
+
+    StoredProcedureQuery setParameter(String name, 
+                                      Calendar value, 
+                                      TemporalType temporalType);
+
+    StoredProcedureQuery setParameter(String name, 
+                                      Date value, 
+                                      TemporalType temporalType);
+
+    StoredProcedureQuery setParameter(int position, Object value);
+
+    StoredProcedureQuery setParameter(int position, 
+                                      Calendar value,  
+                                      TemporalType temporalType);
+
+    StoredProcedureQuery setParameter(int position, 
+                                      Date value,  
+                                      TemporalType temporalType);
+
+    StoredProcedureQuery setFlushMode(FlushModeType flushMode);
+
+    StoredProcedureQuery registerStoredProcedureParameter(
+	  int position,
+	  Class type,
+	  ParameterMode mode);
+
+    StoredProcedureQuery registerStoredProcedureParameter(
+	  String parameterName,
+	  Class type,
+	  ParameterMode mode);
+
+    Object getOutputParameterValue(int position);
+
+    Object getOutputParameterValue(String parameterName);
+
+    boolean execute();
+
+    int executeUpdate();
+
+    List getResultList();
+
+    Object getSingleResult();
+
+    boolean hasMoreResults();
+
+    int getUpdateCount();
+
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureQuery.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/StoredProcedureQuery.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Subgraph.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Subgraph.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Subgraph.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Subgraph.java Fri May 17 20:09:10 2013
@@ -0,0 +1,56 @@
+/*
+ * 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;
+
+import javax.persistence.metamodel.Attribute;
+import java.util.List;
+
+public interface Subgraph<T> {
+
+    public void addAttributeNodes(String ... attributeName);
+
+    public void addAttributeNodes(Attribute<T, ?> ... attribute);
+
+    public <X> Subgraph<X> addSubgraph(Attribute<T, X> attribute);
+
+    public <X> Subgraph<? extends X> addSubgraph(Attribute<T, X> attribute, Class<? extends X> type);
+
+    public <X> Subgraph<X> addSubgraph(String attributeName);
+
+    public <X> Subgraph<X> addSubgraph(String attributeName, Class<X> type);
+
+    public <X> Subgraph<X> addKeySubgraph(Attribute<T, X> attribute);
+
+    public <X> Subgraph<? extends X> addKeySubgraph(Attribute<T, X> attribute, Class<? extends X> type);
+
+    public <X> Subgraph<X> addKeySubgraph(String attributeName);
+
+    public <X> Subgraph<X> addKeySubgraph(String attributeName, Class<X> type);
+
+    public List<AttributeNode<?>> getAttributeNodes();
+
+    public Class<T> getClassType();
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Subgraph.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Subgraph.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SynchronizationType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SynchronizationType.java?rev=1483970&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SynchronizationType.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SynchronizationType.java Fri May 17 20:09:10 2013
@@ -0,0 +1,32 @@
+/*
+ * 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 SynchronizationType {
+
+    SYNCHRONIZED,
+
+    UNSYNCHRONIZED,
+}

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

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SynchronizationType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/SynchronizationType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Table.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Table.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Table.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/Table.java Fri May 17 20:09:10 2013
@@ -29,7 +29,6 @@ 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 Table {
@@ -41,4 +40,6 @@ public @interface Table {
     String schema() default "";
 
     UniqueConstraint[] uniqueConstraints() default {};
+
+    Index[] indexes() default {};
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/TableGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/TableGenerator.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/TableGenerator.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/TableGenerator.java Fri May 17 20:09:10 2013
@@ -31,7 +31,6 @@ import static java.lang.annotation.Eleme
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-
 @Target({TYPE, METHOD, FIELD}) 
 @Retention(RUNTIME)
 public @interface TableGenerator {
@@ -55,4 +54,6 @@ public @interface TableGenerator {
     int allocationSize() default 50;
 
     UniqueConstraint[] uniqueConstraints() default {};
+
+    Index[] indexes() default {};
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/CollectionJoin.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/CollectionJoin.java?rev=1483970&r1=1483969&r2=1483970&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/CollectionJoin.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/src/main/java/javax/persistence/criteria/CollectionJoin.java Fri May 17 20:09:10 2013
@@ -22,19 +22,17 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-
 package javax.persistence.criteria;
 
 import java.util.Collection;
 import javax.persistence.metamodel.CollectionAttribute;
 
-
 public interface CollectionJoin<Z, E> 
 		extends PluralJoin<Z, Collection<E>, E> {
 
-    CollectionAttribute<? super Z, E> getModel();
-    
     CollectionJoin<Z, E> on(Expression<Boolean> restriction);
     
     CollectionJoin<Z, E> on(Predicate... restrictions);
+
+    CollectionAttribute<? super Z, E> getModel();
 }



Mime
View raw message