Author: jgrassel Date: Thu Apr 24 19:48:02 2014 New Revision: 1589852 URL: http://svn.apache.org/r1589852 Log: OPENJPA-2368: Undo revert on trunk (Move www.apache.org/openjpa/ns/orm to openjpa.apache.org/ns/orm)
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java?rev=1589852&r1=1589851&r2=1589852&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java Thu Apr 24 19:48:02 2014 @@ -65,7 +65,7 @@ public abstract class XMLMetaDataParser (XMLMetaDataParser.class); private static boolean _schemaBug; - private static final String OPENJPA_NAMESPACE = "http://www.apache.org/openjpa/ns/orm"; + private static final String OPENJPA_NAMESPACE = "http://openjpa.apache.org/ns/orm"; protected int _extendedNamespace = 0; protected int _openjpaNamespace = 0; Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml?rev=1589852&r1=1589851&r2=1589852&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml Thu Apr 24 19:48:02 2014 @@ -17,8 +17,8 @@ specific language governing permissions and limitations under the License. --> -<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable" - xmlns:openjpa="http://www.apache.org/openjpa/ns/orm" +<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" + xmlns:openjpa="http://openjpa.apache.org/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/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml?rev=1589852&r1=1589851&r2=1589852&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml Thu Apr 24 19:48:02 2014 @@ -17,8 +17,8 @@ specific language governing permissions and limitations under the License. --> -<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable" - xmlns:openjpa="http://www.apache.org/openjpa/ns/orm" +<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" + xmlns:openjpa="http://openjpa.apache.org/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/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml?rev=1589852&r1=1589851&r2=1589852&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml Thu Apr 24 19:48:02 2014 @@ -17,8 +17,8 @@ specific language governing permissions and limitations under the License. --> -<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable" - xmlns:openjpa="http://www.apache.org/openjpa/ns/orm" +<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" + xmlns:openjpa="http://openjpa.apache.org/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/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml?rev=1589852&r1=1589851&r2=1589852&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml Thu Apr 24 19:48:02 2014 @@ -17,8 +17,8 @@ specific language governing permissions and limitations under the License. --> -<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable" - xmlns:openjpa="http://www.apache.org/openjpa/ns/orm" +<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" + xmlns:openjpa="http://openjpa.apache.org/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/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml?rev=1589852&r1=1589851&r2=1589852&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml Thu Apr 24 19:48:02 2014 @@ -17,8 +17,8 @@ specific language governing permissions and limitations under the License. --> -<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable" - xmlns:openjpa="http://www.apache.org/openjpa/ns/orm" +<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" + xmlns:openjpa="http://openjpa.apache.org/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/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd?rev=1589852&r1=1589851&r2=1589852&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd (original) +++ openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd Thu Apr 24 19:48:02 2014 @@ -18,8 +18,8 @@ under the License. --> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.apache.org/openjpa/ns/orm/extendable" - xmlns:extendable-orm="http://www.apache.org/openjpa/ns/orm/extendable" + targetNamespace="http://openjpa.apache.org/ns/orm/extendable" + xmlns:extendable-orm="http://openjpa.apache.org/ns/orm/extendable" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" elementFormDefault="qualified" attributeFormDefault="unqualified" Modified: openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd?rev=1589852&r1=1589851&r2=1589852&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd (original) +++ openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd Thu Apr 24 19:48:02 2014 @@ -18,15 +18,15 @@ under the License. --> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - 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" + 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" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0"> - <xsd:import namespace="http://www.apache.org/openjpa/ns/orm/extendable"/> + <xsd:import namespace="http://openjpa.apache.org/ns/orm/extendable"/> <xsd:import namespace="http://java.sun.com/xml/ns/persistence/orm"/> <!-- **************************************************** -->