db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r516587 - in /db/jdo/trunk/api20: src/schema/javax/jdo/ test/java/javax/jdo/schema/ test/java/javax/jdo/util/ test/schema/
Date Fri, 09 Mar 2007 22:30:11 GMT
Author: mcaisse
Date: Fri Mar  9 14:30:10 2007
New Revision: 516587

URL: http://svn.apache.org/viewvc?view=rev&rev=516587
Log:
JDO-379 Change file names and references to them from *.dtd, *.xsd to *_2_0.dtd, *_2_0.xsd.
Change version from 1.0 to 2.0.

Added:
    db/jdo/trunk/api20/src/schema/javax/jdo/jdo_2_0.dtd
      - copied unchanged from r510161, db/jdo/trunk/api20/src/schema/javax/jdo/jdo.dtd
    db/jdo/trunk/api20/src/schema/javax/jdo/jdo_2_0.xsd
      - copied, changed from r510161, db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd
    db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery_2_0.dtd
      - copied unchanged from r510161, db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.dtd
    db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery_2_0.xsd
      - copied, changed from r510161, db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd
    db/jdo/trunk/api20/src/schema/javax/jdo/orm_2_0.dtd
      - copied unchanged from r510161, db/jdo/trunk/api20/src/schema/javax/jdo/orm.dtd
    db/jdo/trunk/api20/src/schema/javax/jdo/orm_2_0.xsd
      - copied, changed from r510161, db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd
Removed:
    db/jdo/trunk/api20/src/schema/javax/jdo/jdo.dtd
    db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd
    db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.dtd
    db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd
    db/jdo/trunk/api20/src/schema/javax/jdo/orm.dtd
    db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd
Modified:
    db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java
    db/jdo/trunk/api20/test/java/javax/jdo/util/XMLTestUtil.java
    db/jdo/trunk/api20/test/schema/Positive99-dtd.jdo
    db/jdo/trunk/api20/test/schema/Positive99-dtd.jdoquery
    db/jdo/trunk/api20/test/schema/Positive99-dtd.orm

Copied: db/jdo/trunk/api20/src/schema/javax/jdo/jdo_2_0.xsd (from r510161, db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd)
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/schema/javax/jdo/jdo_2_0.xsd?view=diff&rev=516587&p1=db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd&r1=510161&p2=db/jdo/trunk/api20/src/schema/javax/jdo/jdo_2_0.xsd&r2=516587
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/jdo_2_0.xsd Fri Mar  9 14:30:10 2007
@@ -18,7 +18,7 @@
 <xs:schema targetNamespace="http://java.sun.com/xml/ns/jdo/jdo"
            xmlns="http://java.sun.com/xml/ns/jdo/jdo"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           version="1.0">
+           version="2.0">
     <xs:element name="jdo">
         <xs:complexType>
             <xs:sequence>

Copied: db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery_2_0.xsd (from r510161, db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd)
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery_2_0.xsd?view=diff&rev=516587&p1=db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd&r1=510161&p2=db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery_2_0.xsd&r2=516587
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery_2_0.xsd Fri Mar  9 14:30:10 2007
@@ -18,7 +18,7 @@
 <xs:schema  targetNamespace="http://java.sun.com/xml/ns/jdo/jdoquery"
            xmlns="http://java.sun.com/xml/ns/jdo/jdoquery"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           version="1.0">
+           version="2.0">
     <xs:element name="jdoquery">
         <xs:complexType>
             <xs:sequence>

Copied: db/jdo/trunk/api20/src/schema/javax/jdo/orm_2_0.xsd (from r510161, db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd)
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/schema/javax/jdo/orm_2_0.xsd?view=diff&rev=516587&p1=db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd&r1=510161&p2=db/jdo/trunk/api20/src/schema/javax/jdo/orm_2_0.xsd&r2=516587
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/orm_2_0.xsd Fri Mar  9 14:30:10 2007
@@ -18,7 +18,7 @@
 <xs:schema targetNamespace="http://java.sun.com/xml/ns/jdo/orm"
            xmlns="http://java.sun.com/xml/ns/jdo/orm"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           version="1.0">
+           version="2.0">
     <xs:element name="orm">
         <xs:complexType>
             <xs:sequence>

Modified: db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java?view=diff&rev=516587&r1=516586&r2=516587
==============================================================================
--- db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java (original)
+++ db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java Fri Mar  9 14:30:10 2007
@@ -48,15 +48,15 @@
 
     /** */
     protected static final File JDO_XSD_FILE = 
-        new File(BASEDIR + "/target/classes/javax/jdo/jdo.xsd");
+        new File(BASEDIR + "/target/classes/javax/jdo/jdo_2_0.xsd");
 
     /** */
     protected static final File ORM_XSD_FILE = 
-        new File(BASEDIR + "/target/classes/javax/jdo/orm.xsd");
+        new File(BASEDIR + "/target/classes/javax/jdo/orm_2_0.xsd");
 
     /** */
     protected static final File JDOQUERY_XSD_FILE = 
-        new File(BASEDIR + "/target/classes/javax/jdo/jdoquery.xsd");
+        new File(BASEDIR + "/target/classes/javax/jdo/jdoquery_2_0.xsd");
 
     /** .xsd files */
     protected static final File[] XSD_FILES = 

Modified: db/jdo/trunk/api20/test/java/javax/jdo/util/XMLTestUtil.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/java/javax/jdo/util/XMLTestUtil.java?view=diff&rev=516587&r1=516586&r2=516587
==============================================================================
--- db/jdo/trunk/api20/test/java/javax/jdo/util/XMLTestUtil.java (original)
+++ db/jdo/trunk/api20/test/java/javax/jdo/util/XMLTestUtil.java Fri Mar  9 14:30:10 2007
@@ -78,15 +78,15 @@
 
     /** jdo xsd file */
     protected static final File JDO_XSD_FILE = 
-        new File(BASEDIR + "/target/classes/javax/jdo/jdo.xsd");
+        new File(BASEDIR + "/target/classes/javax/jdo/jdo_2_0.xsd");
 
     /** orm xsd file */
     protected static final File ORM_XSD_FILE = 
-        new File(BASEDIR + "/target/classes/javax/jdo/orm.xsd");
+        new File(BASEDIR + "/target/classes/javax/jdo/orm_2_0.xsd");
 
     /** jdoquery xsd file */
     protected static final File JDOQUERY_XSD_FILE = 
-        new File(BASEDIR + "/target/classes/javax/jdo/jdoquery.xsd");
+        new File(BASEDIR + "/target/classes/javax/jdo/jdoquery_2_0.xsd");
 
     /** Entity resolver */
     protected static final EntityResolver resolver = new JDOEntityResolver();
@@ -359,27 +359,27 @@
         private static final String RECOGNIZED_JDO_PUBLIC_ID = 
             "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN";
         private static final String RECOGNIZED_JDO_SYSTEM_ID = 
-            "file:/javax/jdo/jdo.dtd";
+            "file:/javax/jdo/jdo_2_0.dtd";
         private static final String RECOGNIZED_JDO_SYSTEM_ID2 = 
             "http://java.sun.com/dtd/jdo_2_0.dtd";
         private static final String RECOGNIZED_ORM_PUBLIC_ID = 
             "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN";
         private static final String RECOGNIZED_ORM_SYSTEM_ID = 
-            "file:/javax/jdo/orm.dtd";
+            "file:/javax/jdo/orm_2_0.dtd";
         private static final String RECOGNIZED_ORM_SYSTEM_ID2 = 
             "http://java.sun.com/dtd/orm_2_0.dtd";
         private static final String RECOGNIZED_JDOQUERY_PUBLIC_ID = 
             "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.0//EN";
         private static final String RECOGNIZED_JDOQUERY_SYSTEM_ID = 
-            "file:/javax/jdo/jdoquery.dtd";
+            "file:/javax/jdo/jdoquery_2_0.dtd";
         private static final String RECOGNIZED_JDOQUERY_SYSTEM_ID2 = 
             "http://java.sun.com/dtd/jdoquery_2_0.dtd";
         private static final String JDO_DTD_FILENAME = 
-            "javax/jdo/jdo.dtd";
+            "javax/jdo/jdo_2_0.dtd";
         private static final String ORM_DTD_FILENAME = 
-            "javax/jdo/orm.dtd";
+            "javax/jdo/orm_2_0.dtd";
         private static final String JDOQUERY_DTD_FILENAME = 
-            "javax/jdo/jdoquery.dtd";
+            "javax/jdo/jdoquery_2_0.dtd";
 
         static Map publicIds = new HashMap();
         static Map systemIds = new HashMap();

Modified: db/jdo/trunk/api20/test/schema/Positive99-dtd.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/Positive99-dtd.jdo?view=diff&rev=516587&r1=516586&r2=516587
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive99-dtd.jdo (original)
+++ db/jdo/trunk/api20/test/schema/Positive99-dtd.jdo Fri Mar  9 14:30:10 2007
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
+<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo_2_0.dtd">
 <jdo>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>

Modified: db/jdo/trunk/api20/test/schema/Positive99-dtd.jdoquery
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/Positive99-dtd.jdoquery?view=diff&rev=516587&r1=516586&r2=516587
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive99-dtd.jdoquery (original)
+++ db/jdo/trunk/api20/test/schema/Positive99-dtd.jdoquery Fri Mar  9 14:30:10 2007
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE jdoquery SYSTEM "file:/javax/jdo/jdoquery.dtd">
+<!DOCTYPE jdoquery SYSTEM "file:/javax/jdo/jdoquery_2_0.dtd">
 <jdoquery>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>

Modified: db/jdo/trunk/api20/test/schema/Positive99-dtd.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/test/schema/Positive99-dtd.orm?view=diff&rev=516587&r1=516586&r2=516587
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive99-dtd.orm (original)
+++ db/jdo/trunk/api20/test/schema/Positive99-dtd.orm Fri Mar  9 14:30:10 2007
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm SYSTEM "file:/javax/jdo/orm.dtd">
+<!DOCTYPE orm SYSTEM "file:/javax/jdo/orm_2_0.dtd">
 <orm>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>



Mime
View raw message