Author: tfischer
Date: Fri Sep 10 02:27:36 2010
New Revision: 995643
URL: http://svn.apache.org/viewvc?rev=995643&view=rev
Log:
used new database.xsd and database-strict.xsd for schema validation
Modified:
db/torque/torque4/trunk/torque-test/src/main/schema/bookstore-schema.xml
db/torque/torque4/trunk/torque-test/src/main/schema/ext-schema.xml
db/torque/torque4/trunk/torque-test/src/main/schema/extext-schema.xml
db/torque/torque4/trunk/torque-test/src/main/schema/id-table-schema.xml
db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml
Modified:
db/torque/torque4/trunk/torque-test/src/main/schema/bookstore-schema.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/bookstore-schema.xml?rev=995643&r1=995642&r2=995643&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/main/schema/bookstore-schema.xml
(original)
+++ db/torque/torque4/trunk/torque-test/src/main/schema/bookstore-schema.xml
Fri Sep 10 02:27:36 2010
@@ -17,12 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd";>
-
-<database
- name="@DATABASE_DEFAULT@"
- defaultIdMethod="@DATABASE_ID_METHOD@">
+<database name="@DATABASE_DEFAULT@"
+ defaultIdMethod="@DATABASE_ID_METHOD@"
+ xmlns="http://db.apache.org/torque/4.0/templates/database";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
+ http://db.apache.org/torque/4.0/templates/database.xsd";>
<!-- =================================================== -->
<!-- B O O K T A B L E -->
Modified: db/torque/torque4/trunk/torque-test/src/main/schema/ext-schema.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/ext-schema.xml?rev=995643&r1=995642&r2=995643&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/main/schema/ext-schema.xml
(original)
+++ db/torque/torque4/trunk/torque-test/src/main/schema/ext-schema.xml Fri Sep
10 02:27:36 2010
@@ -17,12 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd";>
-<database
- name="@DATABASE_DEFAULT@"
- defaultIdMethod="@DATABASE_ID_METHOD@"
- package="org.apache.torque.test.ext">
+<database name="@DATABASE_DEFAULT@"
+ defaultIdMethod="@DATABASE_ID_METHOD@"
+ package="org.apache.torque.test.ext"
+ xmlns="http://db.apache.org/torque/4.0/templates/database";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
+ http://db.apache.org/torque/4.0/templates/database-strict.xsd";>
<external-schema filename="extext-schema.xml" />
Modified: db/torque/torque4/trunk/torque-test/src/main/schema/extext-schema.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/extext-schema.xml?rev=995643&r1=995642&r2=995643&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/main/schema/extext-schema.xml
(original)
+++ db/torque/torque4/trunk/torque-test/src/main/schema/extext-schema.xml Fri
Sep 10 02:27:36 2010
@@ -17,11 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd";>
-<database
- name="@DATABASE_DEFAULT@"
- defaultIdMethod="@DATABASE_ID_METHOD@">
+<database name="@DATABASE_DEFAULT@"
+ defaultIdMethod="@DATABASE_ID_METHOD@"
+ xmlns="http://db.apache.org/torque/4.0/templates/database";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
+ http://db.apache.org/torque/4.0/templates/database-strict.xsd";>
+
<table name="extext">
<column
Modified:
db/torque/torque4/trunk/torque-test/src/main/schema/id-table-schema.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/id-table-schema.xml?rev=995643&r1=995642&r2=995643&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/main/schema/id-table-schema.xml
(original)
+++ db/torque/torque4/trunk/torque-test/src/main/schema/id-table-schema.xml Fri
Sep 10 02:27:36 2010
@@ -17,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd";>
<!-- ==================================================================== -->
<!-- -->
@@ -31,7 +30,12 @@
<!-- @version $Id$ -->
<!-- ==================================================================== -->
-<database name="@DATABASE_DEFAULT@">
+<database name="@DATABASE_DEFAULT@"
+ xmlns="http://db.apache.org/torque/4.0/templates/database";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
+ http://db.apache.org/torque/4.0/templates/database-strict.xsd";>
+
<table name="ID_TABLE" idMethod="idbroker">
<column name="ID_TABLE_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="TABLE_NAME" required="true" size="250" type="VARCHAR"/>
Modified: db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml?rev=995643&r1=995642&r2=995643&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml
(original)
+++ db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml Fri Sep
10 02:27:36 2010
@@ -17,10 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd";>
<!-- this schema is used to test problems users reported -->
-<database name="@DATABASE_DEFAULT@" defaultIdMethod="@DATABASE_ID_METHOD@"
package="org.apache.torque.test">
+<database name="@DATABASE_DEFAULT@"
+ defaultIdMethod="@DATABASE_ID_METHOD@"
+ package="org.apache.torque.test"
+ xmlns="http://db.apache.org/torque/4.0/templates/database";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
+ http://db.apache.org/torque/4.0/templates/database.xsd";>
<external-schema filename="ext-schema.xml" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
