Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2368: Revert change to OpenJPA Extendable ORM Target NameSpace 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1512004 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jody Grassel 2013-08-08 19:56:10 +00:00
parent d4b693e4e8
commit 6952aec464
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
View File

@ -65,7 +65,7 @@ public abstract class XMLMetaDataParser extends DefaultHandler
(XMLMetaDataParser.class); (XMLMetaDataParser.class);
private static boolean _schemaBug; 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 _extendedNamespace = 0;
protected int _openjpaNamespace = 0; protected int _openjpaNamespace = 0;

4
openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml
View File

@ -17,8 +17,8 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" <entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
xmlns:openjpa="http://openjpa.apache.org/ns/orm" xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0"> version="2.0">

4
openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml
View File

@ -17,8 +17,8 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" <entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
xmlns:openjpa="http://openjpa.apache.org/ns/orm" xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0"> version="2.0">

4
openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml
View File

@ -17,8 +17,8 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" <entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
xmlns:openjpa="http://openjpa.apache.org/ns/orm" xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0"> version="2.0">

4
openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml
View File

@ -17,8 +17,8 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" <entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
xmlns:openjpa="http://openjpa.apache.org/ns/orm" xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0"> version="2.0">

4
openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml
View File

@ -17,8 +17,8 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" <entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable"
xmlns:openjpa="http://openjpa.apache.org/ns/orm" xmlns:openjpa="http://www.apache.org/openjpa/ns/orm"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0"> version="2.0">

4
openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd
View File

@ -18,8 +18,8 @@
under the License. under the License.
--> -->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://openjpa.apache.org/ns/orm/extendable" targetNamespace="http://www.apache.org/openjpa/ns/orm/extendable"
xmlns:extendable-orm="http://openjpa.apache.org/ns/orm/extendable" xmlns:extendable-orm="http://www.apache.org/openjpa/ns/orm/extendable"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
elementFormDefault="qualified" elementFormDefault="qualified"
attributeFormDefault="unqualified" attributeFormDefault="unqualified"

8
openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd
View File

@ -18,15 +18,15 @@
under the License. under the License.
--> -->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://openjpa.apache.org/ns/orm" targetNamespace="http://www.apache.org/openjpa/ns/orm"
xmlns:openjpa-orm="http://openjpa.apache.org/ns/orm" xmlns:openjpa-orm="http://www.apache.org/openjpa/ns/orm"
xmlns:extendable-orm="http://openjpa.apache.org/ns/orm/extendable" xmlns:extendable-orm="http://www.apache.org/openjpa/ns/orm/extendable"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
elementFormDefault="qualified" elementFormDefault="qualified"
attributeFormDefault="unqualified" attributeFormDefault="unqualified"
version="1.0"> 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"/> <xsd:import namespace="http://java.sun.com/xml/ns/persistence/orm"/>
<!-- **************************************************** --> <!-- **************************************************** -->