diff --git a/src/javax/persistence/Access.java b/src/javax/persistence/Access.java
index 0a4a780..96f864f 100644
--- a/src/javax/persistence/Access.java
+++ b/src/javax/persistence/Access.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/AccessType.java b/src/javax/persistence/AccessType.java
index 6eba052..6494278 100644
--- a/src/javax/persistence/AccessType.java
+++ b/src/javax/persistence/AccessType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/AssociationOverride.java b/src/javax/persistence/AssociationOverride.java
index 652d7e7..06cfff9 100644
--- a/src/javax/persistence/AssociationOverride.java
+++ b/src/javax/persistence/AssociationOverride.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Sun Microsystems. All rights reserved. 
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved. 
  * 
  * This program and the accompanying materials are made available under the 
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
@@ -9,7 +9,7 @@
  * http://www.eclipse.org/org/documents/edl-v10.php.
  * 
  * Contributors:
- *     Linda DeMichiel - Java Persistence 2.0 - Version 2.0 (October 1, 2009)
+ *     Linda DeMichiel - Java Persistence 2.0 - Version 2.0 (October 1 - 2013)
  *     Specification available from http://jcp.org/en/jsr/detail?id=317
  *
  ******************************************************************************/
diff --git a/src/javax/persistence/AssociationOverrides.java b/src/javax/persistence/AssociationOverrides.java
index ef2e0f2..babeb3c 100644
--- a/src/javax/persistence/AssociationOverrides.java
+++ b/src/javax/persistence/AssociationOverrides.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/AttributeConverter.java b/src/javax/persistence/AttributeConverter.java
index 9860ef6..ea69750 100644
--- a/src/javax/persistence/AttributeConverter.java
+++ b/src/javax/persistence/AttributeConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -10,7 +10,6 @@
  *
  * Contributors:
  *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
  *
  ******************************************************************************/
 package javax.persistence;
diff --git a/src/javax/persistence/AttributeNode.java b/src/javax/persistence/AttributeNode.java
index 96c117e..97f192e 100644
--- a/src/javax/persistence/AttributeNode.java
+++ b/src/javax/persistence/AttributeNode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -15,12 +15,16 @@
 
 package javax.persistence;
 
+import java.util.Map;
+
 /**
  * Represents an attribute node of an entity graph.
  *
  * @param <T> The type of the attribute.
  *
  * @see EntityGraph
+ * @see Subgraph
+ * @see NamedAttributeNode
  *
  * @since Java Persistence 2.1
  */
@@ -32,5 +36,21 @@
      * @return name of the attribute
      */
     public String getAttributeName();
+
+    /**
+     * Return the Map&#060;Class, Subgraph&#062; of subgraphs associated
+     * with this attribute node.
+     * @return Map of subgraphs associated with this attribute node
+     * or empty Map if none have been defined
+     */
+    public Map<Class, Subgraph> getSubgraphs();
+
+    /**
+     * Return the Map&#060;Class, Subgraph&#062; of subgraphs associated
+     * with this attribute node's map key.
+     * @return Map of subgraphs associated with this attribute 
+     * node's map key or empty Map if none have been defined
+     */
+    public Map<Class, Subgraph> getKeySubgraphs();
 }
 
diff --git a/src/javax/persistence/AttributeOverride.java b/src/javax/persistence/AttributeOverride.java
index beecbd0..83bb91f 100644
--- a/src/javax/persistence/AttributeOverride.java
+++ b/src/javax/persistence/AttributeOverride.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/AttributeOverrides.java b/src/javax/persistence/AttributeOverrides.java
index ba141f6..28ce50d 100644
--- a/src/javax/persistence/AttributeOverrides.java
+++ b/src/javax/persistence/AttributeOverrides.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Basic.java b/src/javax/persistence/Basic.java
index 0b700dd..894a96c 100644
--- a/src/javax/persistence/Basic.java
+++ b/src/javax/persistence/Basic.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Cache.java b/src/javax/persistence/Cache.java
index 8e88ecd..8ba66ee 100644
--- a/src/javax/persistence/Cache.java
+++ b/src/javax/persistence/Cache.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/CacheRetrieveMode.java b/src/javax/persistence/CacheRetrieveMode.java
index 2151921..aff7473 100644
--- a/src/javax/persistence/CacheRetrieveMode.java
+++ b/src/javax/persistence/CacheRetrieveMode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/CacheStoreMode.java b/src/javax/persistence/CacheStoreMode.java
index 9f88639..16fc0e0 100644
--- a/src/javax/persistence/CacheStoreMode.java
+++ b/src/javax/persistence/CacheStoreMode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Cacheable.java b/src/javax/persistence/Cacheable.java
index e50ae75..431fdca 100644
--- a/src/javax/persistence/Cacheable.java
+++ b/src/javax/persistence/Cacheable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/CascadeType.java b/src/javax/persistence/CascadeType.java
index 44fec73..14a2e07 100644
--- a/src/javax/persistence/CascadeType.java
+++ b/src/javax/persistence/CascadeType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/CollectionTable.java b/src/javax/persistence/CollectionTable.java
index 1e3a483..63ccc42 100644
--- a/src/javax/persistence/CollectionTable.java
+++ b/src/javax/persistence/CollectionTable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Column.java b/src/javax/persistence/Column.java
index b195a20..adc030b 100644
--- a/src/javax/persistence/Column.java
+++ b/src/javax/persistence/Column.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/ColumnResult.java b/src/javax/persistence/ColumnResult.java
index ff35dbb..ff42571 100644
--- a/src/javax/persistence/ColumnResult.java
+++ b/src/javax/persistence/ColumnResult.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/ConstructorResult.java b/src/javax/persistence/ConstructorResult.java
index 8b864a5..9bd4776 100644
--- a/src/javax/persistence/ConstructorResult.java
+++ b/src/javax/persistence/ConstructorResult.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Convert.java b/src/javax/persistence/Convert.java
index 9fe4086..189e18f 100644
--- a/src/javax/persistence/Convert.java
+++ b/src/javax/persistence/Convert.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Converter.java b/src/javax/persistence/Converter.java
index d9916c4..de8b4b1 100644
--- a/src/javax/persistence/Converter.java
+++ b/src/javax/persistence/Converter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Converts.java b/src/javax/persistence/Converts.java
index c0aa398..1754f91 100644
--- a/src/javax/persistence/Converts.java
+++ b/src/javax/persistence/Converts.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/DiscriminatorColumn.java b/src/javax/persistence/DiscriminatorColumn.java
index 2e36bc6..9f1c39b 100644
--- a/src/javax/persistence/DiscriminatorColumn.java
+++ b/src/javax/persistence/DiscriminatorColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/DiscriminatorType.java b/src/javax/persistence/DiscriminatorType.java
index 660b07a..09da52c 100644
--- a/src/javax/persistence/DiscriminatorType.java
+++ b/src/javax/persistence/DiscriminatorType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/DiscriminatorValue.java b/src/javax/persistence/DiscriminatorValue.java
index f0d25cb..664b20b 100644
--- a/src/javax/persistence/DiscriminatorValue.java
+++ b/src/javax/persistence/DiscriminatorValue.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/ElementCollection.java b/src/javax/persistence/ElementCollection.java
index 7a1f212..45d2bf5 100644
--- a/src/javax/persistence/ElementCollection.java
+++ b/src/javax/persistence/ElementCollection.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Embeddable.java b/src/javax/persistence/Embeddable.java
index 7cc752d..6b6a66d 100644
--- a/src/javax/persistence/Embeddable.java
+++ b/src/javax/persistence/Embeddable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Embedded.java b/src/javax/persistence/Embedded.java
index 6b595bd..9fdccfc 100644
--- a/src/javax/persistence/Embedded.java
+++ b/src/javax/persistence/Embedded.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/EmbeddedId.java b/src/javax/persistence/EmbeddedId.java
index 3842a7f..3c5a88d 100644
--- a/src/javax/persistence/EmbeddedId.java
+++ b/src/javax/persistence/EmbeddedId.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Entity.java b/src/javax/persistence/Entity.java
index 82acc12..1dda0a3 100644
--- a/src/javax/persistence/Entity.java
+++ b/src/javax/persistence/Entity.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/EntityExistsException.java b/src/javax/persistence/EntityExistsException.java
index e4b7271..2ac4517 100644
--- a/src/javax/persistence/EntityExistsException.java
+++ b/src/javax/persistence/EntityExistsException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/EntityGraph.java b/src/javax/persistence/EntityGraph.java
index 3f2ca42..8095f78 100644
--- a/src/javax/persistence/EntityGraph.java
+++ b/src/javax/persistence/EntityGraph.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -23,9 +23,15 @@
  * as a template to define the attribute nodes and boundaries of a
  * graph of entities and entity relationships. The root must be an
  * entity type.
+ * <p>
+ * The methods to add subgraphs implicitly create the
+ * corresponding attribute nodes as well; such attribute nodes
+ * should not be redundantly specified.
  *
  * @param <T> The type of the root entity.
  *
+ * @see AttributeNode
+ * @see Subgraph
  * @see NamedEntityGraph
  *
  * @since Java Persistence 2.1
@@ -38,10 +44,6 @@
      * annotation, XML descriptor element, or added by means of the
      * <code>addNamedEntityGraph</code> method.  Returns null if the
      * EntityGraph is not a named EntityGraph.
-     * <p>
-     * The methods to add subgraphs implicitly create the
-     * corresponding attribute nodes as well; such attribute nodes
-     * should not be redundantly specified.
      */
     public String getName();
 
@@ -218,7 +220,8 @@
     /**
      * Return the attribute nodes of this entity that are included in
      * the entity graph.
-     * @return attribute nodes for the annotated entity type
+     * @return attribute nodes for the annotated entity type or empty
+     *         list if none have been defined
      */
     public List<AttributeNode<?>> getAttributeNodes();
 
diff --git a/src/javax/persistence/EntityListeners.java b/src/javax/persistence/EntityListeners.java
index 81c3fca..3f8e40e 100644
--- a/src/javax/persistence/EntityListeners.java
+++ b/src/javax/persistence/EntityListeners.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/EntityManager.java b/src/javax/persistence/EntityManager.java
index 647bdf2..f306164 100644
--- a/src/javax/persistence/EntityManager.java
+++ b/src/javax/persistence/EntityManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/EntityManagerFactory.java b/src/javax/persistence/EntityManagerFactory.java
index b4d534c..58f10e6 100644
--- a/src/javax/persistence/EntityManagerFactory.java
+++ b/src/javax/persistence/EntityManagerFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/EntityNotFoundException.java b/src/javax/persistence/EntityNotFoundException.java
index 3542544..21e5b35 100644
--- a/src/javax/persistence/EntityNotFoundException.java
+++ b/src/javax/persistence/EntityNotFoundException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/EntityResult.java b/src/javax/persistence/EntityResult.java
index 0afebec..1e74264 100644
--- a/src/javax/persistence/EntityResult.java
+++ b/src/javax/persistence/EntityResult.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/EntityTransaction.java b/src/javax/persistence/EntityTransaction.java
index 79e6eb3..d6c7833 100644
--- a/src/javax/persistence/EntityTransaction.java
+++ b/src/javax/persistence/EntityTransaction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/EnumType.java b/src/javax/persistence/EnumType.java
index 8733301..ff0c873 100644
--- a/src/javax/persistence/EnumType.java
+++ b/src/javax/persistence/EnumType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Enumerated.java b/src/javax/persistence/Enumerated.java
index 07ef1b9..ad8c4ca 100644
--- a/src/javax/persistence/Enumerated.java
+++ b/src/javax/persistence/Enumerated.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/ExcludeDefaultListeners.java b/src/javax/persistence/ExcludeDefaultListeners.java
index 5ab94d4..9404728 100644
--- a/src/javax/persistence/ExcludeDefaultListeners.java
+++ b/src/javax/persistence/ExcludeDefaultListeners.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/ExcludeSuperclassListeners.java b/src/javax/persistence/ExcludeSuperclassListeners.java
index 285060a..e95e939 100644
--- a/src/javax/persistence/ExcludeSuperclassListeners.java
+++ b/src/javax/persistence/ExcludeSuperclassListeners.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/FetchType.java b/src/javax/persistence/FetchType.java
index 7ef0241..0efc1cc 100644
--- a/src/javax/persistence/FetchType.java
+++ b/src/javax/persistence/FetchType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/FieldResult.java b/src/javax/persistence/FieldResult.java
index 4eda9c1..7aae6bc 100644
--- a/src/javax/persistence/FieldResult.java
+++ b/src/javax/persistence/FieldResult.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/FlushModeType.java b/src/javax/persistence/FlushModeType.java
index 349b145..d521c10 100644
--- a/src/javax/persistence/FlushModeType.java
+++ b/src/javax/persistence/FlushModeType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/ForeignKey.java b/src/javax/persistence/ForeignKey.java
index 1c54ae3..4670d9b 100644
--- a/src/javax/persistence/ForeignKey.java
+++ b/src/javax/persistence/ForeignKey.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -10,7 +10,6 @@
  *
  * Contributors:
  *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
  *
  ******************************************************************************/
 package javax.persistence;
diff --git a/src/javax/persistence/GeneratedValue.java b/src/javax/persistence/GeneratedValue.java
index 1f1fda7..9c90d80 100644
--- a/src/javax/persistence/GeneratedValue.java
+++ b/src/javax/persistence/GeneratedValue.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/GenerationType.java b/src/javax/persistence/GenerationType.java
index 74de4d1..9d1980e 100644
--- a/src/javax/persistence/GenerationType.java
+++ b/src/javax/persistence/GenerationType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Id.java b/src/javax/persistence/Id.java
index 44558b6..a201843 100644
--- a/src/javax/persistence/Id.java
+++ b/src/javax/persistence/Id.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/IdClass.java b/src/javax/persistence/IdClass.java
index 3d4dde6..8bfab22 100644
--- a/src/javax/persistence/IdClass.java
+++ b/src/javax/persistence/IdClass.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Index.java b/src/javax/persistence/Index.java
index 29a598a..5899a03 100644
--- a/src/javax/persistence/Index.java
+++ b/src/javax/persistence/Index.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -10,7 +10,6 @@
  *
  * Contributors:
  *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
  *
  ******************************************************************************/
 package javax.persistence;
diff --git a/src/javax/persistence/Inheritance.java b/src/javax/persistence/Inheritance.java
index 908141d..fe44c5e 100644
--- a/src/javax/persistence/Inheritance.java
+++ b/src/javax/persistence/Inheritance.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/InheritanceType.java b/src/javax/persistence/InheritanceType.java
index 1596120..dcb10cd 100644
--- a/src/javax/persistence/InheritanceType.java
+++ b/src/javax/persistence/InheritanceType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/JoinColumn.java b/src/javax/persistence/JoinColumn.java
index a894dd3..3642234 100644
--- a/src/javax/persistence/JoinColumn.java
+++ b/src/javax/persistence/JoinColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/JoinColumns.java b/src/javax/persistence/JoinColumns.java
index a752382..eb31414 100644
--- a/src/javax/persistence/JoinColumns.java
+++ b/src/javax/persistence/JoinColumns.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/JoinTable.java b/src/javax/persistence/JoinTable.java
index efe1de9..b8e21b7 100644
--- a/src/javax/persistence/JoinTable.java
+++ b/src/javax/persistence/JoinTable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Lob.java b/src/javax/persistence/Lob.java
index f0cc1b4..d1680b8 100644
--- a/src/javax/persistence/Lob.java
+++ b/src/javax/persistence/Lob.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/LockModeType.java b/src/javax/persistence/LockModeType.java
index d85daa2..622efec 100644
--- a/src/javax/persistence/LockModeType.java
+++ b/src/javax/persistence/LockModeType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/LockTimeoutException.java b/src/javax/persistence/LockTimeoutException.java
index df8da87..50d4f24 100644
--- a/src/javax/persistence/LockTimeoutException.java
+++ b/src/javax/persistence/LockTimeoutException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/ManyToMany.java b/src/javax/persistence/ManyToMany.java
index be02824..31aa29b 100644
--- a/src/javax/persistence/ManyToMany.java
+++ b/src/javax/persistence/ManyToMany.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/ManyToOne.java b/src/javax/persistence/ManyToOne.java
index 6d3766c..1d6ef67 100644
--- a/src/javax/persistence/ManyToOne.java
+++ b/src/javax/persistence/ManyToOne.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/MapKey.java b/src/javax/persistence/MapKey.java
index 53adf56..46c3d1e 100644
--- a/src/javax/persistence/MapKey.java
+++ b/src/javax/persistence/MapKey.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/MapKeyClass.java b/src/javax/persistence/MapKeyClass.java
index 0a8f883..2365188 100644
--- a/src/javax/persistence/MapKeyClass.java
+++ b/src/javax/persistence/MapKeyClass.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/MapKeyColumn.java b/src/javax/persistence/MapKeyColumn.java
index c7f6eb8..d00ccd9 100644
--- a/src/javax/persistence/MapKeyColumn.java
+++ b/src/javax/persistence/MapKeyColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/MapKeyEnumerated.java b/src/javax/persistence/MapKeyEnumerated.java
index 6473f54..53d99cb 100644
--- a/src/javax/persistence/MapKeyEnumerated.java
+++ b/src/javax/persistence/MapKeyEnumerated.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/MapKeyJoinColumn.java b/src/javax/persistence/MapKeyJoinColumn.java
index 564f923..99792e2 100644
--- a/src/javax/persistence/MapKeyJoinColumn.java
+++ b/src/javax/persistence/MapKeyJoinColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/MapKeyJoinColumns.java b/src/javax/persistence/MapKeyJoinColumns.java
index ed3a1c6..4d3927f 100644
--- a/src/javax/persistence/MapKeyJoinColumns.java
+++ b/src/javax/persistence/MapKeyJoinColumns.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/MapKeyTemporal.java b/src/javax/persistence/MapKeyTemporal.java
index 6ab4f22..151c072 100644
--- a/src/javax/persistence/MapKeyTemporal.java
+++ b/src/javax/persistence/MapKeyTemporal.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/MappedSuperclass.java b/src/javax/persistence/MappedSuperclass.java
index fdf25bf..b82c7e9 100644
--- a/src/javax/persistence/MappedSuperclass.java
+++ b/src/javax/persistence/MappedSuperclass.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/MapsId.java b/src/javax/persistence/MapsId.java
index 9e4e111..b7d778a 100644
--- a/src/javax/persistence/MapsId.java
+++ b/src/javax/persistence/MapsId.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/NamedAttributeNode.java b/src/javax/persistence/NamedAttributeNode.java
index 1432c24..eb4e862 100644
--- a/src/javax/persistence/NamedAttributeNode.java
+++ b/src/javax/persistence/NamedAttributeNode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/NamedEntityGraph.java b/src/javax/persistence/NamedEntityGraph.java
index d2c7c2d..e5f1931 100644
--- a/src/javax/persistence/NamedEntityGraph.java
+++ b/src/javax/persistence/NamedEntityGraph.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/NamedEntityGraphs.java b/src/javax/persistence/NamedEntityGraphs.java
index f78728e..d95ecd2 100644
--- a/src/javax/persistence/NamedEntityGraphs.java
+++ b/src/javax/persistence/NamedEntityGraphs.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/NamedNativeQueries.java b/src/javax/persistence/NamedNativeQueries.java
index 82a6166..fbec0a3 100644
--- a/src/javax/persistence/NamedNativeQueries.java
+++ b/src/javax/persistence/NamedNativeQueries.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/NamedNativeQuery.java b/src/javax/persistence/NamedNativeQuery.java
index 5b83e12..08c8e83 100644
--- a/src/javax/persistence/NamedNativeQuery.java
+++ b/src/javax/persistence/NamedNativeQuery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/NamedQueries.java b/src/javax/persistence/NamedQueries.java
index 9bf0b8e..fea5120 100644
--- a/src/javax/persistence/NamedQueries.java
+++ b/src/javax/persistence/NamedQueries.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/NamedQuery.java b/src/javax/persistence/NamedQuery.java
index 474dbc2..5a7202f 100644
--- a/src/javax/persistence/NamedQuery.java
+++ b/src/javax/persistence/NamedQuery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/NamedStoredProcedureQueries.java b/src/javax/persistence/NamedStoredProcedureQueries.java
index ac73f5d..a9375ad 100644
--- a/src/javax/persistence/NamedStoredProcedureQueries.java
+++ b/src/javax/persistence/NamedStoredProcedureQueries.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -10,7 +10,6 @@
  *
  * Contributors:
  *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
  *
  ******************************************************************************/ 
 package javax.persistence; 
diff --git a/src/javax/persistence/NamedStoredProcedureQuery.java b/src/javax/persistence/NamedStoredProcedureQuery.java
index 7e934e0..245521a 100644
--- a/src/javax/persistence/NamedStoredProcedureQuery.java
+++ b/src/javax/persistence/NamedStoredProcedureQuery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -10,7 +10,6 @@
  *
  * Contributors:
  *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
  *
  ******************************************************************************/ 
 package javax.persistence;
diff --git a/src/javax/persistence/NamedSubgraph.java b/src/javax/persistence/NamedSubgraph.java
index 533cd5c..afb137e 100644
--- a/src/javax/persistence/NamedSubgraph.java
+++ b/src/javax/persistence/NamedSubgraph.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/NoResultException.java b/src/javax/persistence/NoResultException.java
index 1907d72..d4bfd25 100644
--- a/src/javax/persistence/NoResultException.java
+++ b/src/javax/persistence/NoResultException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/NonUniqueResultException.java b/src/javax/persistence/NonUniqueResultException.java
index 974421a..8473be6 100644
--- a/src/javax/persistence/NonUniqueResultException.java
+++ b/src/javax/persistence/NonUniqueResultException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/OneToMany.java b/src/javax/persistence/OneToMany.java
index 9eebcf5..aa42ff8 100644
--- a/src/javax/persistence/OneToMany.java
+++ b/src/javax/persistence/OneToMany.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/OneToOne.java b/src/javax/persistence/OneToOne.java
index 2118e45..b22593b 100644
--- a/src/javax/persistence/OneToOne.java
+++ b/src/javax/persistence/OneToOne.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/OptimisticLockException.java b/src/javax/persistence/OptimisticLockException.java
index 177fce4..17a7422 100644
--- a/src/javax/persistence/OptimisticLockException.java
+++ b/src/javax/persistence/OptimisticLockException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/OrderBy.java b/src/javax/persistence/OrderBy.java
index 9c69316..0ed5eab 100644
--- a/src/javax/persistence/OrderBy.java
+++ b/src/javax/persistence/OrderBy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/OrderColumn.java b/src/javax/persistence/OrderColumn.java
index acc606e..ec9fffa 100644
--- a/src/javax/persistence/OrderColumn.java
+++ b/src/javax/persistence/OrderColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Parameter.java b/src/javax/persistence/Parameter.java
index c26ac15..7050547 100644
--- a/src/javax/persistence/Parameter.java
+++ b/src/javax/persistence/Parameter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/ParameterMode.java b/src/javax/persistence/ParameterMode.java
index 01ec6d2..1c5b9e0 100644
--- a/src/javax/persistence/ParameterMode.java
+++ b/src/javax/persistence/ParameterMode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -10,7 +10,6 @@
  *
  * Contributors:
  *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
  *
  ******************************************************************************/ 
 package javax.persistence; 
diff --git a/src/javax/persistence/Persistence.java b/src/javax/persistence/Persistence.java
index 9062eb6..fd26d97 100644
--- a/src/javax/persistence/Persistence.java
+++ b/src/javax/persistence/Persistence.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -101,7 +101,7 @@
      *             value of these properties override any values that
      *             may have been configured elsewhere..             
      * @throws PersistenceException if insufficient or inconsistent
-     *         configuration information is provided of if schema
+     *         configuration information is provided or if schema
      *         generation otherwise fails.
      *
      * @since Java Persistence 2.1
diff --git a/src/javax/persistence/PersistenceContext.java b/src/javax/persistence/PersistenceContext.java
index b511ae0..ed2e240 100644
--- a/src/javax/persistence/PersistenceContext.java
+++ b/src/javax/persistence/PersistenceContext.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PersistenceContextType.java b/src/javax/persistence/PersistenceContextType.java
index ce7ea53..dc730cd 100644
--- a/src/javax/persistence/PersistenceContextType.java
+++ b/src/javax/persistence/PersistenceContextType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PersistenceContexts.java b/src/javax/persistence/PersistenceContexts.java
index b73ca78..c4c3c9b 100644
--- a/src/javax/persistence/PersistenceContexts.java
+++ b/src/javax/persistence/PersistenceContexts.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PersistenceException.java b/src/javax/persistence/PersistenceException.java
index 8948523..80cea82 100644
--- a/src/javax/persistence/PersistenceException.java
+++ b/src/javax/persistence/PersistenceException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PersistenceProperty.java b/src/javax/persistence/PersistenceProperty.java
index c296de7..174e4ba 100644
--- a/src/javax/persistence/PersistenceProperty.java
+++ b/src/javax/persistence/PersistenceProperty.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PersistenceUnit.java b/src/javax/persistence/PersistenceUnit.java
index cc209e0..5ab73e4 100644
--- a/src/javax/persistence/PersistenceUnit.java
+++ b/src/javax/persistence/PersistenceUnit.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PersistenceUnitUtil.java b/src/javax/persistence/PersistenceUnitUtil.java
index 48b1700..501e47c 100644
--- a/src/javax/persistence/PersistenceUnitUtil.java
+++ b/src/javax/persistence/PersistenceUnitUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PersistenceUnits.java b/src/javax/persistence/PersistenceUnits.java
index 5525e0d..c08364b 100644
--- a/src/javax/persistence/PersistenceUnits.java
+++ b/src/javax/persistence/PersistenceUnits.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PersistenceUtil.java b/src/javax/persistence/PersistenceUtil.java
index 3444ca2..1a68564 100644
--- a/src/javax/persistence/PersistenceUtil.java
+++ b/src/javax/persistence/PersistenceUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PessimisticLockException.java b/src/javax/persistence/PessimisticLockException.java
index 9cd75f4..042acd6 100644
--- a/src/javax/persistence/PessimisticLockException.java
+++ b/src/javax/persistence/PessimisticLockException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PessimisticLockScope.java b/src/javax/persistence/PessimisticLockScope.java
index 341af26..0a561c8 100644
--- a/src/javax/persistence/PessimisticLockScope.java
+++ b/src/javax/persistence/PessimisticLockScope.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PostLoad.java b/src/javax/persistence/PostLoad.java
index 7e65f00..d8a2ea4 100644
--- a/src/javax/persistence/PostLoad.java
+++ b/src/javax/persistence/PostLoad.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PostPersist.java b/src/javax/persistence/PostPersist.java
index 4882f89..fe2503b 100644
--- a/src/javax/persistence/PostPersist.java
+++ b/src/javax/persistence/PostPersist.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PostRemove.java b/src/javax/persistence/PostRemove.java
index 4238c58..0cfb221 100644
--- a/src/javax/persistence/PostRemove.java
+++ b/src/javax/persistence/PostRemove.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PostUpdate.java b/src/javax/persistence/PostUpdate.java
index d9437f6..08c35a9 100644
--- a/src/javax/persistence/PostUpdate.java
+++ b/src/javax/persistence/PostUpdate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PrePersist.java b/src/javax/persistence/PrePersist.java
index 0331742..576244f 100644
--- a/src/javax/persistence/PrePersist.java
+++ b/src/javax/persistence/PrePersist.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PreRemove.java b/src/javax/persistence/PreRemove.java
index 352cbc2..287338b 100644
--- a/src/javax/persistence/PreRemove.java
+++ b/src/javax/persistence/PreRemove.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PreUpdate.java b/src/javax/persistence/PreUpdate.java
index 45bd362..abc3915 100644
--- a/src/javax/persistence/PreUpdate.java
+++ b/src/javax/persistence/PreUpdate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PrimaryKeyJoinColumn.java b/src/javax/persistence/PrimaryKeyJoinColumn.java
index 15c1eb2..0dc6f2c 100644
--- a/src/javax/persistence/PrimaryKeyJoinColumn.java
+++ b/src/javax/persistence/PrimaryKeyJoinColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/PrimaryKeyJoinColumns.java b/src/javax/persistence/PrimaryKeyJoinColumns.java
index 9bc9384..e148313 100644
--- a/src/javax/persistence/PrimaryKeyJoinColumns.java
+++ b/src/javax/persistence/PrimaryKeyJoinColumns.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Query.java b/src/javax/persistence/Query.java
index 4b20dcd..0bd870f 100644
--- a/src/javax/persistence/Query.java
+++ b/src/javax/persistence/Query.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -421,7 +421,7 @@
      * @return the same query instance
      * @throws IllegalStateException if the query is found not to be 
      *         a Java Persistence query language SELECT query
-     *         or a Criteria API query
+     *         or a CriteriaQuery query
      * @since Java Persistence 2.0
      */
     Query setLockMode(LockModeType lockMode);
diff --git a/src/javax/persistence/QueryHint.java b/src/javax/persistence/QueryHint.java
index d3b425d..6111f17 100644
--- a/src/javax/persistence/QueryHint.java
+++ b/src/javax/persistence/QueryHint.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/QueryTimeoutException.java b/src/javax/persistence/QueryTimeoutException.java
index 20127bf..3704c69 100644
--- a/src/javax/persistence/QueryTimeoutException.java
+++ b/src/javax/persistence/QueryTimeoutException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/RollbackException.java b/src/javax/persistence/RollbackException.java
index d0821b5..c04fb6b 100644
--- a/src/javax/persistence/RollbackException.java
+++ b/src/javax/persistence/RollbackException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/SecondaryTable.java b/src/javax/persistence/SecondaryTable.java
index dfac40c..59ff180 100644
--- a/src/javax/persistence/SecondaryTable.java
+++ b/src/javax/persistence/SecondaryTable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/SecondaryTables.java b/src/javax/persistence/SecondaryTables.java
index 05c221c..fdbe90d 100644
--- a/src/javax/persistence/SecondaryTables.java
+++ b/src/javax/persistence/SecondaryTables.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/SequenceGenerator.java b/src/javax/persistence/SequenceGenerator.java
index 57e8ddc..8a0440b 100644
--- a/src/javax/persistence/SequenceGenerator.java
+++ b/src/javax/persistence/SequenceGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/SharedCacheMode.java b/src/javax/persistence/SharedCacheMode.java
index 146a207..b7ca900 100644
--- a/src/javax/persistence/SharedCacheMode.java
+++ b/src/javax/persistence/SharedCacheMode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/SqlResultSetMapping.java b/src/javax/persistence/SqlResultSetMapping.java
index 68f53b0..8954efd 100644
--- a/src/javax/persistence/SqlResultSetMapping.java
+++ b/src/javax/persistence/SqlResultSetMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/SqlResultSetMappings.java b/src/javax/persistence/SqlResultSetMappings.java
index da75bac..82f073b 100644
--- a/src/javax/persistence/SqlResultSetMappings.java
+++ b/src/javax/persistence/SqlResultSetMappings.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/StoredProcedureParameter.java b/src/javax/persistence/StoredProcedureParameter.java
index 1477f10..0a9bf2e 100644
--- a/src/javax/persistence/StoredProcedureParameter.java
+++ b/src/javax/persistence/StoredProcedureParameter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -10,7 +10,6 @@
  *
  * Contributors:
  *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
  *
  ******************************************************************************/ 
 package javax.persistence; 
diff --git a/src/javax/persistence/StoredProcedureQuery.java b/src/javax/persistence/StoredProcedureQuery.java
index 6470c54..64db6b8 100644
--- a/src/javax/persistence/StoredProcedureQuery.java
+++ b/src/javax/persistence/StoredProcedureQuery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -10,7 +10,6 @@
  *
  * Contributors:
  *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
  *
  ******************************************************************************/ 
 package javax.persistence;
diff --git a/src/javax/persistence/Subgraph.java b/src/javax/persistence/Subgraph.java
index 6e12e6b..82e7c85 100644
--- a/src/javax/persistence/Subgraph.java
+++ b/src/javax/persistence/Subgraph.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -19,7 +19,7 @@
 import java.util.List;
 
 /**
- * This type represents a AttributeNode of an EntityGraph that
+ * This type represents a subgraph for an attribute node that
  * corresponds to a Managed Type. Using this class, an entity subgraph
  * can be embedded within an EntityGraph.
  *
@@ -27,10 +27,11 @@
  *
  * @see EntityGraph
  * @see AttributeNode
+ * @see NamedSubgraph
  *
  * @since Java Persistence 2.1
  */
-public interface Subgraph<T> extends AttributeNode<T> {
+public interface Subgraph<T> {
 
     /**
      * Add one or more attribute nodes to the entity graph.
@@ -187,7 +188,8 @@
     /**
      * Return the attribute nodes corresponding to the attributes of
      * this managed type that are included in the subgraph.
-     * @return list of attribute nodes included in the subgraph
+     * @return list of attribute nodes included in the subgraph or
+     * empty List if none have been defined
      */
     public List<AttributeNode<?>> getAttributeNodes();
 
diff --git a/src/javax/persistence/SynchronizationType.java b/src/javax/persistence/SynchronizationType.java
index 04a12d8..de79e4a 100644
--- a/src/javax/persistence/SynchronizationType.java
+++ b/src/javax/persistence/SynchronizationType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -10,7 +10,6 @@
  *
  * Contributors:
  *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
  *
  ******************************************************************************/ 
 package javax.persistence;
diff --git a/src/javax/persistence/Table.java b/src/javax/persistence/Table.java
index 04c7494..e92b77c 100644
--- a/src/javax/persistence/Table.java
+++ b/src/javax/persistence/Table.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/TableGenerator.java b/src/javax/persistence/TableGenerator.java
index 89551fe..4c4a0a7 100644
--- a/src/javax/persistence/TableGenerator.java
+++ b/src/javax/persistence/TableGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Temporal.java b/src/javax/persistence/Temporal.java
index 1d54ace..b6c40ec 100644
--- a/src/javax/persistence/Temporal.java
+++ b/src/javax/persistence/Temporal.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/TemporalType.java b/src/javax/persistence/TemporalType.java
index f5a41ed..a0ad8dd 100644
--- a/src/javax/persistence/TemporalType.java
+++ b/src/javax/persistence/TemporalType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/TransactionRequiredException.java b/src/javax/persistence/TransactionRequiredException.java
index 35692ae..abd2274 100644
--- a/src/javax/persistence/TransactionRequiredException.java
+++ b/src/javax/persistence/TransactionRequiredException.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Transient.java b/src/javax/persistence/Transient.java
index d275b6f..81446af 100644
--- a/src/javax/persistence/Transient.java
+++ b/src/javax/persistence/Transient.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Tuple.java b/src/javax/persistence/Tuple.java
index ff902cd..6a68b14 100644
--- a/src/javax/persistence/Tuple.java
+++ b/src/javax/persistence/Tuple.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/TupleElement.java b/src/javax/persistence/TupleElement.java
index 0fde26b..ff9ff49 100644
--- a/src/javax/persistence/TupleElement.java
+++ b/src/javax/persistence/TupleElement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/TypedQuery.java b/src/javax/persistence/TypedQuery.java
index fe9ae2b..e8057f9 100644
--- a/src/javax/persistence/TypedQuery.java
+++ b/src/javax/persistence/TypedQuery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/UniqueConstraint.java b/src/javax/persistence/UniqueConstraint.java
index a847f13..2351b45 100644
--- a/src/javax/persistence/UniqueConstraint.java
+++ b/src/javax/persistence/UniqueConstraint.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/ValidationMode.java b/src/javax/persistence/ValidationMode.java
index 5834cfb..2118538 100644
--- a/src/javax/persistence/ValidationMode.java
+++ b/src/javax/persistence/ValidationMode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/Version.java b/src/javax/persistence/Version.java
index 36fa1cf..af82cd9 100644
--- a/src/javax/persistence/Version.java
+++ b/src/javax/persistence/Version.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/AbstractQuery.java b/src/javax/persistence/criteria/AbstractQuery.java
index b1c7d25..53624dd 100644
--- a/src/javax/persistence/criteria/AbstractQuery.java
+++ b/src/javax/persistence/criteria/AbstractQuery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/CollectionJoin.java b/src/javax/persistence/criteria/CollectionJoin.java
index 2eead57..b661644 100644
--- a/src/javax/persistence/criteria/CollectionJoin.java
+++ b/src/javax/persistence/criteria/CollectionJoin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/CommonAbstractCriteria.java b/src/javax/persistence/criteria/CommonAbstractCriteria.java
index 1048cd5..71ecb58 100644
--- a/src/javax/persistence/criteria/CommonAbstractCriteria.java
+++ b/src/javax/persistence/criteria/CommonAbstractCriteria.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/CommonAbstractQuery.java b/src/javax/persistence/criteria/CommonAbstractQuery.java
index 9102b4c..bff6a8b 100644
--- a/src/javax/persistence/criteria/CommonAbstractQuery.java
+++ b/src/javax/persistence/criteria/CommonAbstractQuery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/CompoundSelection.java b/src/javax/persistence/criteria/CompoundSelection.java
index 3257011..66b1feb 100644
--- a/src/javax/persistence/criteria/CompoundSelection.java
+++ b/src/javax/persistence/criteria/CompoundSelection.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/CriteriaBuilder.java b/src/javax/persistence/criteria/CriteriaBuilder.java
index 8c27bd1..9d4231f 100644
--- a/src/javax/persistence/criteria/CriteriaBuilder.java
+++ b/src/javax/persistence/criteria/CriteriaBuilder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/CriteriaDelete.java b/src/javax/persistence/criteria/CriteriaDelete.java
index 1500dc3..4cc3157 100644
--- a/src/javax/persistence/criteria/CriteriaDelete.java
+++ b/src/javax/persistence/criteria/CriteriaDelete.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -10,7 +10,6 @@
  *
  * Contributors:
  *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
  *
  ******************************************************************************/ 
 package javax.persistence.criteria;
diff --git a/src/javax/persistence/criteria/CriteriaQuery.java b/src/javax/persistence/criteria/CriteriaQuery.java
index bcc47aa..ceebbea 100644
--- a/src/javax/persistence/criteria/CriteriaQuery.java
+++ b/src/javax/persistence/criteria/CriteriaQuery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/CriteriaUpdate.java b/src/javax/persistence/criteria/CriteriaUpdate.java
index e62ceae..7ae0da0 100644
--- a/src/javax/persistence/criteria/CriteriaUpdate.java
+++ b/src/javax/persistence/criteria/CriteriaUpdate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2011 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
@@ -10,7 +10,6 @@
  *
  * Contributors:
  *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
  *
  ******************************************************************************/ 
 package javax.persistence.criteria;
diff --git a/src/javax/persistence/criteria/Expression.java b/src/javax/persistence/criteria/Expression.java
index 05a11a7..3121372 100644
--- a/src/javax/persistence/criteria/Expression.java
+++ b/src/javax/persistence/criteria/Expression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/Fetch.java b/src/javax/persistence/criteria/Fetch.java
index 310cb3a..d11ef8e 100644
--- a/src/javax/persistence/criteria/Fetch.java
+++ b/src/javax/persistence/criteria/Fetch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/FetchParent.java b/src/javax/persistence/criteria/FetchParent.java
index df8cacc..63b8389 100644
--- a/src/javax/persistence/criteria/FetchParent.java
+++ b/src/javax/persistence/criteria/FetchParent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/From.java b/src/javax/persistence/criteria/From.java
index 2544b26..81b8355 100644
--- a/src/javax/persistence/criteria/From.java
+++ b/src/javax/persistence/criteria/From.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/Join.java b/src/javax/persistence/criteria/Join.java
index 447ce85..188dfc4 100644
--- a/src/javax/persistence/criteria/Join.java
+++ b/src/javax/persistence/criteria/Join.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/JoinType.java b/src/javax/persistence/criteria/JoinType.java
index d505536..80384de 100644
--- a/src/javax/persistence/criteria/JoinType.java
+++ b/src/javax/persistence/criteria/JoinType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/ListJoin.java b/src/javax/persistence/criteria/ListJoin.java
index 8336a5d..3890d95 100644
--- a/src/javax/persistence/criteria/ListJoin.java
+++ b/src/javax/persistence/criteria/ListJoin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/MapJoin.java b/src/javax/persistence/criteria/MapJoin.java
index e547e78..9e87d57 100644
--- a/src/javax/persistence/criteria/MapJoin.java
+++ b/src/javax/persistence/criteria/MapJoin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/Order.java b/src/javax/persistence/criteria/Order.java
index bf6e870..2c7920f 100644
--- a/src/javax/persistence/criteria/Order.java
+++ b/src/javax/persistence/criteria/Order.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/ParameterExpression.java b/src/javax/persistence/criteria/ParameterExpression.java
index b5a984a..64e7a94 100644
--- a/src/javax/persistence/criteria/ParameterExpression.java
+++ b/src/javax/persistence/criteria/ParameterExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/Path.java b/src/javax/persistence/criteria/Path.java
index fd90836..9f79516 100644
--- a/src/javax/persistence/criteria/Path.java
+++ b/src/javax/persistence/criteria/Path.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/PluralJoin.java b/src/javax/persistence/criteria/PluralJoin.java
index d5fc973..86f9ee2 100644
--- a/src/javax/persistence/criteria/PluralJoin.java
+++ b/src/javax/persistence/criteria/PluralJoin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/Predicate.java b/src/javax/persistence/criteria/Predicate.java
index c1375cb..b1a09a5 100644
--- a/src/javax/persistence/criteria/Predicate.java
+++ b/src/javax/persistence/criteria/Predicate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/Root.java b/src/javax/persistence/criteria/Root.java
index c6de7bb..55c9cc8 100644
--- a/src/javax/persistence/criteria/Root.java
+++ b/src/javax/persistence/criteria/Root.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/Selection.java b/src/javax/persistence/criteria/Selection.java
index 11a8b49..743f928 100644
--- a/src/javax/persistence/criteria/Selection.java
+++ b/src/javax/persistence/criteria/Selection.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/SetJoin.java b/src/javax/persistence/criteria/SetJoin.java
index 19556d0..be83924 100644
--- a/src/javax/persistence/criteria/SetJoin.java
+++ b/src/javax/persistence/criteria/SetJoin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/Subquery.java b/src/javax/persistence/criteria/Subquery.java
index 218c749..84a2b2e 100644
--- a/src/javax/persistence/criteria/Subquery.java
+++ b/src/javax/persistence/criteria/Subquery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/criteria/package-info.java b/src/javax/persistence/criteria/package-info.java
index 0a9a743..f283af1 100644
--- a/src/javax/persistence/criteria/package-info.java
+++ b/src/javax/persistence/criteria/package-info.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/Attribute.java b/src/javax/persistence/metamodel/Attribute.java
index 1118392..bbbd27f 100644
--- a/src/javax/persistence/metamodel/Attribute.java
+++ b/src/javax/persistence/metamodel/Attribute.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/BasicType.java b/src/javax/persistence/metamodel/BasicType.java
index d7b93aa..d69040b 100644
--- a/src/javax/persistence/metamodel/BasicType.java
+++ b/src/javax/persistence/metamodel/BasicType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/Bindable.java b/src/javax/persistence/metamodel/Bindable.java
index 1a40d29..4556116 100644
--- a/src/javax/persistence/metamodel/Bindable.java
+++ b/src/javax/persistence/metamodel/Bindable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/CollectionAttribute.java b/src/javax/persistence/metamodel/CollectionAttribute.java
index 4b3513a..66095b5 100644
--- a/src/javax/persistence/metamodel/CollectionAttribute.java
+++ b/src/javax/persistence/metamodel/CollectionAttribute.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/EmbeddableType.java b/src/javax/persistence/metamodel/EmbeddableType.java
index 329493c..949c3d0 100644
--- a/src/javax/persistence/metamodel/EmbeddableType.java
+++ b/src/javax/persistence/metamodel/EmbeddableType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/EntityType.java b/src/javax/persistence/metamodel/EntityType.java
index 0ae4a1a..c2d4b28 100644
--- a/src/javax/persistence/metamodel/EntityType.java
+++ b/src/javax/persistence/metamodel/EntityType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/IdentifiableType.java b/src/javax/persistence/metamodel/IdentifiableType.java
index 5bf186d..14e534c 100644
--- a/src/javax/persistence/metamodel/IdentifiableType.java
+++ b/src/javax/persistence/metamodel/IdentifiableType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/ListAttribute.java b/src/javax/persistence/metamodel/ListAttribute.java
index f43dcca..ee8c390 100644
--- a/src/javax/persistence/metamodel/ListAttribute.java
+++ b/src/javax/persistence/metamodel/ListAttribute.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/ManagedType.java b/src/javax/persistence/metamodel/ManagedType.java
index 895661a..f0b7537 100644
--- a/src/javax/persistence/metamodel/ManagedType.java
+++ b/src/javax/persistence/metamodel/ManagedType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/MapAttribute.java b/src/javax/persistence/metamodel/MapAttribute.java
index 761f859..1c0d769 100644
--- a/src/javax/persistence/metamodel/MapAttribute.java
+++ b/src/javax/persistence/metamodel/MapAttribute.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/MappedSuperclassType.java b/src/javax/persistence/metamodel/MappedSuperclassType.java
index 086fe34..8f69a79 100644
--- a/src/javax/persistence/metamodel/MappedSuperclassType.java
+++ b/src/javax/persistence/metamodel/MappedSuperclassType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/Metamodel.java b/src/javax/persistence/metamodel/Metamodel.java
index 96fab1b..fb9eddd 100644
--- a/src/javax/persistence/metamodel/Metamodel.java
+++ b/src/javax/persistence/metamodel/Metamodel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/PluralAttribute.java b/src/javax/persistence/metamodel/PluralAttribute.java
index c3e4665..b13587b 100644
--- a/src/javax/persistence/metamodel/PluralAttribute.java
+++ b/src/javax/persistence/metamodel/PluralAttribute.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/SetAttribute.java b/src/javax/persistence/metamodel/SetAttribute.java
index ef44899..0747cf3 100644
--- a/src/javax/persistence/metamodel/SetAttribute.java
+++ b/src/javax/persistence/metamodel/SetAttribute.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/SingularAttribute.java b/src/javax/persistence/metamodel/SingularAttribute.java
index 3025c70..fa2a333 100644
--- a/src/javax/persistence/metamodel/SingularAttribute.java
+++ b/src/javax/persistence/metamodel/SingularAttribute.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/StaticMetamodel.java b/src/javax/persistence/metamodel/StaticMetamodel.java
index 1a9e7a5..263c430 100644
--- a/src/javax/persistence/metamodel/StaticMetamodel.java
+++ b/src/javax/persistence/metamodel/StaticMetamodel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/Type.java b/src/javax/persistence/metamodel/Type.java
index 4cbb75f..0f1607b 100644
--- a/src/javax/persistence/metamodel/Type.java
+++ b/src/javax/persistence/metamodel/Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/metamodel/package-info.java b/src/javax/persistence/metamodel/package-info.java
index d462c91..7d1e9fe 100644
--- a/src/javax/persistence/metamodel/package-info.java
+++ b/src/javax/persistence/metamodel/package-info.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/orm_2_1.xsd b/src/javax/persistence/orm_2_1.xsd
index 4703523..36435fc 100644
--- a/src/javax/persistence/orm_2_1.xsd
+++ b/src/javax/persistence/orm_2_1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Java Persistence API object/relational mapping file schema -->
-<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence/orm" 
-  xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" 
+<xsd:schema targetNamespace="http://xmlns.jcp.org/xml/ns/persistence/orm" 
+  xmlns:orm="http://xmlns.jcp.org/xml/ns/persistence/orm" 
   xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
   elementFormDefault="qualified" 
   attributeFormDefault="unqualified" 
@@ -9,14 +9,14 @@
 
   <xsd:annotation>
     <xsd:documentation>
-      @(#)orm_2_1.xsd 2.1  December 11 2012
+      @(#)orm_2_1.xsd 2.1  February 4 2013
     </xsd:documentation>
   </xsd:annotation>
 
   <xsd:annotation>
     <xsd:documentation>
 
-  Copyright (c) 2008 - 2012 Oracle Corporation.  All rights reserved. 
+  Copyright (c) 2008 - 2013 Oracle Corporation.  All rights reserved. 
   
   This program and the accompanying materials are made available under the 
   terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
@@ -26,7 +26,7 @@
   http://www.eclipse.org/org/documents/edl-v10.php.
   
   Contributors:
-      Linda DeMichiel - Java Persistence 2.1, Version 2.1 (November 9, 2012)
+      Linda DeMichiel - Java Persistence 2.1, Version 2.1 (February 4, 2013)
       Specification available from http://jcp.org/en/jsr/detail?id=338
   
     </xsd:documentation>
@@ -44,15 +44,15 @@
        Object/relational mapping files must indicate the object/relational
        mapping file schema by using the persistence namespace:
 
-       http://java.sun.com/xml/ns/persistence
+       http://xmlns.jcp.org/xml/ns/persistence/orm
 
        and indicate the version of the schema by
        using the version element as shown below:
 
-      <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
+      <entity-mappings xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
-          http://java.sun.com/xml/ns/persistence/orm_2_1.xsd"
+        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm
+          http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd"
         version="2.1">
           ...
       </entity-mappings>
@@ -2145,11 +2145,10 @@
     <xsd:sequence>
       <xsd:element name="description" type="xsd:string" 
                    minOccurs="0"/>
-      <xsd:element name="parameter-mode" type="orm:parameter-mode" 
-                   minOccurs="0"/>
     </xsd:sequence>
     <xsd:attribute name="name" type="xsd:string"/>
     <xsd:attribute name="class" type="xsd:string" use="required"/>
+    <xsd:attribute name="mode" type="orm:parameter-mode"/>
   </xsd:complexType>
 
 <!-- **************************************************** -->
diff --git a/src/javax/persistence/package-info.java b/src/javax/persistence/package-info.java
index e29c71d..606f575 100644
--- a/src/javax/persistence/package-info.java
+++ b/src/javax/persistence/package-info.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/persistence_2_1.xsd b/src/javax/persistence/persistence_2_1.xsd
new file mode 100644
index 0000000..01d5149
--- /dev/null
+++ b/src/javax/persistence/persistence_2_1.xsd
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- persistence.xml schema -->
+<xsd:schema targetNamespace="http://xmlns.jcp.org/xml/ns/persistence" 
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:persistence="http://xmlns.jcp.org/xml/ns/persistence"
+  elementFormDefault="qualified" 
+  attributeFormDefault="unqualified" 
+  version="2.1">
+
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)persistence_2_1.xsd  2.1  February 4, 2013
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+  Copyright (c) 2008  - 2013 Oracle Corporation. All rights reserved. 
+  
+  This program and the accompanying materials are made available under the 
+  terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
+  which accompanies this distribution. 
+  The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+  and the Eclipse Distribution License is available at 
+  http://www.eclipse.org/org/documents/edl-v10.php.
+  
+  Contributors:
+      Linda DeMichiel - Java Persistence 2.1, Version 2.1 (February 4, 2013)
+      Specification available from http://jcp.org/en/jsr/detail?id=338
+ 
+    </xsd:documentation>
+  </xsd:annotation>
+
+   <xsd:annotation>
+     <xsd:documentation><![CDATA[
+
+     This is the XML Schema for the persistence configuration file.
+     The file must be named "META-INF/persistence.xml" in the 
+     persistence archive.
+
+     Persistence configuration files must indicate
+     the persistence schema by using the persistence namespace:
+
+     http://xmlns.jcp.org/xml/ns/persistence
+
+     and indicate the version of the schema by
+     using the version element as shown below:
+
+      <persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
+          http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
+        version="2.1">
+          ...
+      </persistence>
+
+    ]]></xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:simpleType name="versionType">
+    <xsd:restriction base="xsd:token">
+      <xsd:pattern value="[0-9]+(\.[0-9]+)*"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <!-- **************************************************** -->
+
+  <xsd:element name="persistence">
+    <xsd:complexType>
+      <xsd:sequence>
+
+        <!-- **************************************************** -->
+
+        <xsd:element name="persistence-unit" 
+                     minOccurs="1" maxOccurs="unbounded">
+          <xsd:complexType>
+            <xsd:annotation>
+              <xsd:documentation>
+
+                Configuration of a persistence unit.
+
+              </xsd:documentation>
+            </xsd:annotation>
+            <xsd:sequence>
+
+            <!-- **************************************************** -->
+
+              <xsd:element name="description" type="xsd:string" 
+                           minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+
+                    Description of this persistence unit.
+
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+
+              <!-- **************************************************** -->
+
+              <xsd:element name="provider" type="xsd:string" 
+                           minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+
+                    Provider class that supplies EntityManagers for this 
+                    persistence unit.
+
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+
+              <!-- **************************************************** -->
+
+              <xsd:element name="jta-data-source" type="xsd:string" 
+                           minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+
+                    The container-specific name of the JTA datasource to use.
+
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+
+              <!-- **************************************************** -->
+
+              <xsd:element name="non-jta-data-source" type="xsd:string" 
+                           minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+
+                    The container-specific name of a non-JTA datasource to use.
+
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+
+              <!-- **************************************************** -->
+
+              <xsd:element name="mapping-file" type="xsd:string" 
+                           minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                  <xsd:documentation>
+
+                    File containing mapping information. Loaded as a resource 
+                    by the persistence provider.
+
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+
+              <!-- **************************************************** -->
+
+              <xsd:element name="jar-file" type="xsd:string" 
+                           minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                  <xsd:documentation>
+
+                    Jar file that is to be scanned for managed classes. 
+
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+
+              <!-- **************************************************** -->
+
+              <xsd:element name="class" type="xsd:string" 
+                           minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                  <xsd:documentation>
+
+                    Managed class to be included in the persistence unit and
+                    to scan for annotations.  It should be annotated 
+                    with either @Entity, @Embeddable or @MappedSuperclass.
+
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+
+              <!-- **************************************************** -->
+
+              <xsd:element name="exclude-unlisted-classes" type="xsd:boolean" 
+                           default="true" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+
+                    When set to true then only listed classes and jars will 
+                    be scanned for persistent classes, otherwise the 
+                    enclosing jar or directory will also be scanned. 
+                    Not applicable to Java SE persistence units.
+
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+
+              <!-- **************************************************** -->
+
+              <xsd:element name="shared-cache-mode" 
+                           type="persistence:persistence-unit-caching-type" 
+                           minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+
+                    Defines whether caching is enabled for the 
+                    persistence unit if caching is supported by the
+                    persistence provider. When set to ALL, all entities 
+                    will be cached. When set to NONE, no entities will
+                    be cached. When set to ENABLE_SELECTIVE, only entities
+                    specified as cacheable will be cached. When set to
+                    DISABLE_SELECTIVE, entities specified as not cacheable
+                    will not be cached. When not specified or when set to
+                    UNSPECIFIED, provider defaults may apply.
+
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+
+              <!-- **************************************************** -->
+
+              <xsd:element name="validation-mode" 
+                           type="persistence:persistence-unit-validation-mode-type" 
+                           minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+
+                    The validation mode to be used for the persistence unit.
+
+                  </xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+
+
+              <!-- **************************************************** -->
+
+              <xsd:element name="properties" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+
+                    A list of standard and vendor-specific properties 
+                    and hints.
+
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="property" 
+                                 minOccurs="0" maxOccurs="unbounded">
+                      <xsd:annotation>
+                        <xsd:documentation>
+                          A name-value pair.
+                        </xsd:documentation>
+                      </xsd:annotation>
+                      <xsd:complexType>
+                        <xsd:attribute name="name" type="xsd:string" 
+                                       use="required"/>
+                        <xsd:attribute name="value" type="xsd:string" 
+                                       use="required"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                </xsd:complexType>
+              </xsd:element>
+
+            </xsd:sequence>
+
+            <!-- **************************************************** -->
+
+            <xsd:attribute name="name" type="xsd:string" use="required">
+              <xsd:annotation>
+                <xsd:documentation>
+
+                  Name used in code to reference this persistence unit.
+
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:attribute>
+
+            <!-- **************************************************** -->
+
+            <xsd:attribute name="transaction-type" 
+                           type="persistence:persistence-unit-transaction-type">
+              <xsd:annotation>
+                <xsd:documentation>
+
+                  Type of transactions used by EntityManagers from this 
+                  persistence unit.
+
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:attribute>
+
+          </xsd:complexType>
+        </xsd:element>
+      </xsd:sequence>
+      <xsd:attribute name="version" type="persistence:versionType" 
+                     fixed="2.1" use="required"/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <!-- **************************************************** -->
+
+  <xsd:simpleType name="persistence-unit-transaction-type">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        public enum PersistenceUnitTransactionType {JTA, RESOURCE_LOCAL};
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:token">
+      <xsd:enumeration value="JTA"/>
+      <xsd:enumeration value="RESOURCE_LOCAL"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="persistence-unit-caching-type">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        public enum SharedCacheMode { ALL, NONE, ENABLE_SELECTIVE, DISABLE_SELECTIVE, UNSPECIFIED};
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:token">
+      <xsd:enumeration value="ALL"/>
+      <xsd:enumeration value="NONE"/>
+      <xsd:enumeration value="ENABLE_SELECTIVE"/>
+      <xsd:enumeration value="DISABLE_SELECTIVE"/>
+      <xsd:enumeration value="UNSPECIFIED"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="persistence-unit-validation-mode-type">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        public enum ValidationMode { AUTO, CALLBACK, NONE};
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:token">
+      <xsd:enumeration value="AUTO"/>
+      <xsd:enumeration value="CALLBACK"/>
+      <xsd:enumeration value="NONE"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+</xsd:schema>
diff --git a/src/javax/persistence/spi/ClassTransformer.java b/src/javax/persistence/spi/ClassTransformer.java
index 7a739d5..4faf81e 100644
--- a/src/javax/persistence/spi/ClassTransformer.java
+++ b/src/javax/persistence/spi/ClassTransformer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/spi/LoadState.java b/src/javax/persistence/spi/LoadState.java
index 29c5f0c..6fa7b07 100644
--- a/src/javax/persistence/spi/LoadState.java
+++ b/src/javax/persistence/spi/LoadState.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/spi/PersistenceProvider.java b/src/javax/persistence/spi/PersistenceProvider.java
index 1e8e361..fe761b4 100644
--- a/src/javax/persistence/spi/PersistenceProvider.java
+++ b/src/javax/persistence/spi/PersistenceProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/spi/PersistenceProviderResolver.java b/src/javax/persistence/spi/PersistenceProviderResolver.java
index 3d2d78e..9df7270 100644
--- a/src/javax/persistence/spi/PersistenceProviderResolver.java
+++ b/src/javax/persistence/spi/PersistenceProviderResolver.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/spi/PersistenceProviderResolverHolder.java b/src/javax/persistence/spi/PersistenceProviderResolverHolder.java
index 976c224..0c9da9e 100644
--- a/src/javax/persistence/spi/PersistenceProviderResolverHolder.java
+++ b/src/javax/persistence/spi/PersistenceProviderResolverHolder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/spi/PersistenceUnitInfo.java b/src/javax/persistence/spi/PersistenceUnitInfo.java
index bec3da5..c8e107f 100644
--- a/src/javax/persistence/spi/PersistenceUnitInfo.java
+++ b/src/javax/persistence/spi/PersistenceUnitInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/spi/PersistenceUnitTransactionType.java b/src/javax/persistence/spi/PersistenceUnitTransactionType.java
index 812192d..acb1481 100644
--- a/src/javax/persistence/spi/PersistenceUnitTransactionType.java
+++ b/src/javax/persistence/spi/PersistenceUnitTransactionType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/spi/ProviderUtil.java b/src/javax/persistence/spi/ProviderUtil.java
index 69d85b4..a7390fd 100644
--- a/src/javax/persistence/spi/ProviderUtil.java
+++ b/src/javax/persistence/spi/ProviderUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
diff --git a/src/javax/persistence/spi/package-info.java b/src/javax/persistence/spi/package-info.java
index 6166299..852ec5f 100644
--- a/src/javax/persistence/spi/package-info.java
+++ b/src/javax/persistence/spi/package-info.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 - 2012 Oracle Corporation. All rights reserved.
+ * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0