You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by jg...@apache.org on 2013/07/26 20:43:19 UTC
svn commit: r1507393 - in /openjpa/branches/2.2.x:
openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/
openjpa-persistence-jdbc/src/test/resources/META-INF/
openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/
openj...
Author: jgrassel
Date: Fri Jul 26 18:43:18 2013
New Revision: 1507393
URL: http://svn.apache.org/r1507393
Log:
OPENJPA-2368: Revert change to OpenJPA Extendable ORM Target NameSpace
Modified:
openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml
openjpa/branches/2.2.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd
openjpa/branches/2.2.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd
Modified: openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java?rev=1507393&r1=1507392&r2=1507393&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java (original)
+++ openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java Fri Jul 26 18:43:18 2013
@@ -65,7 +65,7 @@ public abstract class XMLMetaDataParser
(XMLMetaDataParser.class);
private static boolean _schemaBug;
- private static final String OPENJPA_NAMESPACE = "http://openjpa.apache.org/ns/orm";
+ private static final String OPENJPA_NAMESPACE = "http://www.apache.org/openjpa/ns/orm";
protected int _extendedNamespace = 0;
protected int _openjpaNamespace = 0;
Modified: openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml?rev=1507393&r1=1507392&r2=1507393&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml (original)
+++ openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml Fri Jul 26 18:43:18 2013
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable"
- xmlns:openjpa="http://openjpa.apache.org/ns/orm"
+<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
+ xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
Modified: openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml?rev=1507393&r1=1507392&r2=1507393&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml (original)
+++ openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml Fri Jul 26 18:43:18 2013
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable"
- xmlns:openjpa="http://openjpa.apache.org/ns/orm"
+<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
+ xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
Modified: openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml?rev=1507393&r1=1507392&r2=1507393&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml (original)
+++ openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml Fri Jul 26 18:43:18 2013
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable"
- xmlns:openjpa="http://openjpa.apache.org/ns/orm"
+<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
+ xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
Modified: openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml?rev=1507393&r1=1507392&r2=1507393&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml (original)
+++ openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml Fri Jul 26 18:43:18 2013
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable"
- xmlns:openjpa="http://openjpa.apache.org/ns/orm"
+<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
+ xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
Modified: openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml?rev=1507393&r1=1507392&r2=1507393&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml (original)
+++ openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml Fri Jul 26 18:43:18 2013
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable"
- xmlns:openjpa="http://openjpa.apache.org/ns/orm"
+<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
+ xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0">
Modified: openjpa/branches/2.2.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd?rev=1507393&r1=1507392&r2=1507393&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd (original)
+++ openjpa/branches/2.2.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd Fri Jul 26 18:43:18 2013
@@ -18,8 +18,8 @@
under the License.
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://openjpa.apache.org/ns/orm/extendable"
- xmlns:extendable-orm="http://openjpa.apache.org/ns/orm/extendable"
+ targetNamespace="http://www.apache.org/openjpa/ns/orm/extendable"
+ xmlns:extendable-orm="http://www.apache.org/openjpa/ns/orm/extendable"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
Modified: openjpa/branches/2.2.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd?rev=1507393&r1=1507392&r2=1507393&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd (original)
+++ openjpa/branches/2.2.x/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd Fri Jul 26 18:43:18 2013
@@ -18,15 +18,15 @@
under the License.
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://openjpa.apache.org/ns/orm"
- xmlns:openjpa-orm="http://openjpa.apache.org/ns/orm"
- xmlns:extendable-orm="http://openjpa.apache.org/ns/orm/extendable"
+ targetNamespace="http://www.apache.org/openjpa/ns/orm"
+ xmlns:openjpa-orm="http://www.apache.org/openjpa/ns/orm"
+ xmlns:extendable-orm="http://www.apache.org/openjpa/ns/orm/extendable"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
- <xsd:import namespace="http://openjpa.apache.org/ns/orm/extendable"/>
+ <xsd:import namespace="http://www.apache.org/openjpa/ns/orm/extendable"/>
<xsd:import namespace="http://java.sun.com/xml/ns/persistence/orm"/>
<!-- **************************************************** -->