Author: tfischer Date: Sat Sep 6 19:21:17 2014 New Revision: 1622915 URL: http://svn.apache.org/r1622915 Log: TORQUE-308 correct wrong schema location for XSDs
Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/defining-the-schema.xml db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/running-the-generator.xml db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0-strict.xsd db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml db/torque/torque4/trunk/torque-templates/src/test/schema/extext-schema.xml db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml db/torque/torque4/trunk/torque-templates/src/test/simple-schema/schema.xml 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/foreign-key-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/id-table-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/included-from-included-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/included-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/index.xml db/torque/torque4/trunk/torque-test/src/main/schema/pk-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/qualified-table-name-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/types-schema.xml Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/defining-the-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/defining-the-schema.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/defining-the-schema.xml (original) +++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/defining-the-schema.xml Sat Sep 6 19:21:17 2014 @@ -54,7 +54,7 @@ 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" + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd" ... ]]></source> <p> @@ -65,7 +65,7 @@ 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" + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd" ... ]]></source> </subsection> Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/running-the-generator.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/running-the-generator.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/running-the-generator.xml (original) +++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/running-the-generator.xml Sat Sep 6 19:21:17 2014 @@ -220,7 +220,7 @@ 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"> + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd"> <table name="ID_TABLE" idMethod="idbroker"> <column name="ID_TABLE_ID" required="true" primaryKey="true" type="INTEGER"/> Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml (original) +++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml Sat Sep 6 19:21:17 2014 @@ -72,7 +72,7 @@ <database 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" + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd" name="bookstore" defaultIdMethod="native"> Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml Sat Sep 6 19:21:17 2014 @@ -26,10 +26,10 @@ <options xsi:type="propertiesOptions" path="options.properties"/> <entityReference - systemId="http://db.apache.org/torque/4.0/templates/database.xsd" + systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd" resource="../../../xsd/database-4-0.xsd" /> <entityReference - systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd" + systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd" resource="../../../xsd/database-4-0-strict.xsd" /> <!-- Documentation css --> Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml Sat Sep 6 19:21:17 2014 @@ -26,10 +26,10 @@ <options xsi:type="propertiesOptions" path="options.properties"/> <entityReference - systemId="http://db.apache.org/torque/4.0/templates/database.xsd" + systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd" resource="../../../xsd/database-4-0.xsd" /> <entityReference - systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd" + systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd" resource="../../../xsd/database-4-0-strict.xsd" /> <!-- Documentation xdoc --> Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml Sat Sep 6 19:21:17 2014 @@ -26,10 +26,10 @@ <options xsi:type="propertiesOptions" path="options.properties"/> <entityReference - systemId="http://db.apache.org/torque/4.0/templates/database.xsd" + systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd" resource="../../xsd/database-4-0.xsd" /> <entityReference - systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd" + systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd" resource="../../xsd/database-4-0-strict.xsd" /> <output name="torque.sql.idtable.idtable"> Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml Sat Sep 6 19:21:17 2014 @@ -26,10 +26,10 @@ <options xsi:type="propertiesOptions" path="options.properties"/> <entityReference - systemId="http://db.apache.org/torque/4.0/templates/database.xsd" + systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd" resource="../../xsd/database-4-0.xsd" /> <entityReference - systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd" + systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd" resource="../../xsd/database-4-0-strict.xsd" /> <output name="torque.om.dbObject" existingTargetStrategy="skip" outputDirKey="modifiable"> Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml Sat Sep 6 19:21:17 2014 @@ -27,10 +27,10 @@ <options xsi:type="propertiesOptions" path="options.properties"/> <entityReference - systemId="http://db.apache.org/torque/4.0/templates/database.xsd" + systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd" resource="../../xsd/database-4-0.xsd" /> <entityReference - systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd" + systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd" resource="../../xsd/database-4-0-strict.xsd" /> <output name="torque.sql.ddl" > Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml Sat Sep 6 19:21:17 2014 @@ -27,10 +27,10 @@ <options xsi:type="propertiesOptions" path="options.properties"/> <entityReference - systemId="http://db.apache.org/torque/4.0/templates/database.xsd" + systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd" resource="../../../xsd/database-4-0.xsd" /> <entityReference - systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd" + systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd" resource="../../../xsd/database-4-0-strict.xsd" /> <output name="torque.sql.createdb"> Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0-strict.xsd URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0-strict.xsd?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0-strict.xsd (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0-strict.xsd Sat Sep 6 19:21:17 2014 @@ -40,7 +40,7 @@ as compared to the standard database.xsd </xs:documentation> </xs:annotation> - <xs:redefine schemaLocation="http://db.apache.org/torque/4.0/templates/database.xsd"> + <xs:redefine schemaLocation="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd"> <xs:simpleType name="javaNameType"> <xs:annotation> <xs:documentation xml:lang="en"> Modified: db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml Sat Sep 6 19:21:17 2014 @@ -21,7 +21,7 @@ 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" + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd" name="ext" defaultIdMethod="native"> Modified: db/torque/torque4/trunk/torque-templates/src/test/schema/extext-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/extext-schema.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/test/schema/extext-schema.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/test/schema/extext-schema.xml Sat Sep 6 19:21:17 2014 @@ -21,7 +21,7 @@ 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" + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd" name="extext" defaultIdMethod="idbroker"> Modified: db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml Sat Sep 6 19:21:17 2014 @@ -21,7 +21,7 @@ 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" + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd" name="bookstore" defaultIdMethod="native"> <external-schema filename="ext-schema.xml" /> Modified: db/torque/torque4/trunk/torque-templates/src/test/simple-schema/schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/simple-schema/schema.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/test/simple-schema/schema.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/test/simple-schema/schema.xml Sat Sep 6 19:21:17 2014 @@ -21,7 +21,7 @@ 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" + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd" name="bookstore" defaultIdMethod="native"> 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=1622915&r1=1622914&r2=1622915&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 Sat Sep 6 19:21:17 2014 @@ -23,7 +23,7 @@ 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"> + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.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=1622915&r1=1622914&r2=1622915&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 Sat Sep 6 19:21:17 2014 @@ -23,7 +23,7 @@ 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"> + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-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=1622915&r1=1622914&r2=1622915&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 Sat Sep 6 19:21:17 2014 @@ -23,7 +23,7 @@ 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"> + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd"> <table name="extext"> Modified: db/torque/torque4/trunk/torque-test/src/main/schema/foreign-key-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/foreign-key-schema.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/foreign-key-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/foreign-key-schema.xml Sat Sep 6 19:21:17 2014 @@ -26,7 +26,7 @@ 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"> + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd"> <table name="P_INTEGER_PK" description="table with a primitive int pk"> 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=1622915&r1=1622914&r2=1622915&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 Sat Sep 6 19:21:17 2014 @@ -34,7 +34,7 @@ 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"> + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd"> <table name="ID_TABLE" idMethod="idbroker"> <column name="ID_TABLE_ID" required="true" primaryKey="true" type="INTEGER"/> Modified: db/torque/torque4/trunk/torque-test/src/main/schema/included-from-included-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/included-from-included-schema.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/included-from-included-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/included-from-included-schema.xml Sat Sep 6 19:21:17 2014 @@ -23,7 +23,7 @@ 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"> + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd"> <table name="included_from_included"> <column Modified: db/torque/torque4/trunk/torque-test/src/main/schema/included-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/included-schema.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/included-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/included-schema.xml Sat Sep 6 19:21:17 2014 @@ -23,7 +23,7 @@ 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"> + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd"> <include-schema filename="included-from-included-schema.xml" /> Modified: db/torque/torque4/trunk/torque-test/src/main/schema/index.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/index.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/index.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/index.xml Sat Sep 6 19:21:17 2014 @@ -24,7 +24,7 @@ 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"> + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd"> <table name="single_named_index" idMethod="none"> <column name="id" required="true" primaryKey="true" type="INTEGER" /> Modified: db/torque/torque4/trunk/torque-test/src/main/schema/pk-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/pk-schema.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/pk-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/pk-schema.xml Sat Sep 6 19:21:17 2014 @@ -24,7 +24,7 @@ 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"> + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd"> <table name="nopk" idMethod="none" description="this table has no pk"> <column name="INTCOL" type="INTEGER" /> Modified: db/torque/torque4/trunk/torque-test/src/main/schema/qualified-table-name-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/qualified-table-name-schema.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/qualified-table-name-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/qualified-table-name-schema.xml Sat Sep 6 19:21:17 2014 @@ -24,7 +24,7 @@ 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"> + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd"> <table name="@DATABASE_SCHEMA@.qualified_name" > <column name="id" type="INTEGER" primaryKey="true"/> Modified: db/torque/torque4/trunk/torque-test/src/main/schema/types-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/types-schema.xml?rev=1622915&r1=1622914&r2=1622915&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/types-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/types-schema.xml Sat Sep 6 19:21:17 2014 @@ -24,7 +24,7 @@ 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"> + http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd"> <!-- Used by TestOMSetByName but can be used to test all types as needed. Modified from Generator domaintest-schema.xml --> --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org