Bug 400841 - update jpa 2.1 schemas for namespace change

3 files changed, 24 insertions, 25 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/plugin.xml b/common/plugins/org.eclipse.jpt.common.eclipselink.core/plugin.xml
index b5a30c2db5..f8d36b0e48 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/plugin.xml
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-  Copyright (c) 2011, 2012 Oracle. All rights reserved.
+  Copyright (c) 2011, 2013 Oracle. All rights reserved.
   This program and the accompanying materials are made available under the
   terms of the Eclipse Public License v1.0, which accompanies this distribution
   and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -153,11 +153,11 @@
 				uri="platform:/plugin/org.eclipse.persistence.core/org/eclipse/persistence/eclipselink_sessions_2.1.xsd"/>	
 				
 			<uri
-				name="http://java.sun.com/xml/ns/persistence/orm_2_1.xsd"
+				name="http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd"
 				uri="schemas/orm_2_1.xsd"/>	
 				
 			<uri
-				name="http://java.sun.com/xml/ns/persistence/persistence_2_1.xsd"
+				name="http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
 				uri="schemas/persistence_2_1.xsd"/>	
 			
 		</catalogContribution>
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/orm_2_1.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/orm_2_1.xsd
index f89ee268f1..774d39aa4f 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/orm_2_1.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/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>

 

 <!-- **************************************************** -->

@@ -2312,4 +2311,4 @@
     <xsd:attribute name="access" type="orm:access-type"/>

   </xsd:complexType>

 

-</xsd:schema>
\ No newline at end of file
+</xsd:schema>

diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/persistence_2_1.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/persistence_2_1.xsd
index a613ef4151..b279dd90c8 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/persistence_2_1.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/persistence_2_1.xsd
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- persistence.xml schema -->

-<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence" 

+<xsd:schema targetNamespace="http://xmlns.jcp.org/xml/ns/persistence" 

   xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-  xmlns:persistence="http://java.sun.com/xml/ns/persistence"

+  xmlns:persistence="http://xmlns.jcp.org/xml/ns/persistence"

   elementFormDefault="qualified" 

   attributeFormDefault="unqualified" 

   version="2.1">

 

   <xsd:annotation>

     <xsd:documentation>

-      @(#)persistence_2_1.xsd  1.0  October 1 2009

+      @(#)persistence_2_1.xsd  2.1  February 4, 2013

     </xsd:documentation>

   </xsd:annotation>

 

   <xsd:annotation>

     <xsd:documentation>

 

-  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 

@@ -26,8 +26,8 @@
   http://www.eclipse.org/org/documents/edl-v10.php.

   

   Contributors:

-      Linda DeMichiel - Java Persistence 2.0, Version 2.0 (October 1, 2009)

-      Specification available from http://jcp.org/en/jsr/detail?id=317

+      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>

@@ -42,15 +42,15 @@
      Persistence configuration files must indicate

      the persistence schema by using the persistence namespace:

 

-     http://java.sun.com/xml/ns/persistence

+     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://java.sun.com/xml/ns/persistence"

+      <persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"

         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-        xsi:schemaLocation="http://java.sun.com/xml/ns/persistence

-          http://java.sun.com/xml/ns/persistence/persistence_2_1.xsd"

+        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence

+          http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"

         version="2.1">

           ...

       </persistence>