You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by qu...@apache.org on 2003/01/31 17:46:12 UTC
cvs commit: jakarta-turbine-torque/examples project-schema.xml
quintonm 2003/01/31 08:46:12
Modified: xdocs Tag: TORQUE_3_0_BRANCH tutorial.xml changes.xml
xdocs/tutorial Tag: TORQUE_3_0_BRANCH step2.xml
examples Tag: TORQUE_3_0_BRANCH project-schema.xml
Log:
Updated documentation and samples to use the new DTD
Revision Changes Path
No revision
No revision
1.9.2.1 +3 -3 jakarta-turbine-torque/xdocs/tutorial.xml
Index: tutorial.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/tutorial.xml,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- tutorial.xml 22 Aug 2002 14:48:29 -0000 1.9
+++ tutorial.xml 31 Jan 2003 16:46:11 -0000 1.9.2.1
@@ -200,7 +200,7 @@
<source><![CDATA[
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
<!DOCTYPE database SYSTEM
- "http://jakarta.apache.org/turbine/dtd/database.dtd">
+ "http://jakarta.apache.org/turbine/dtd/database_3_0_1.dtd">
<database
name="bookstore"
@@ -428,7 +428,7 @@
Another common mistake is to forget that XML is
<b>case-sensitive</b>. All of the elements and
attributes must be specified according to the
- <a href="/turbine/dtd/database.dtd">DTD</a>
+ <a href="/turbine/dtd/database_3_0_1.dtd">DTD</a>
for the database schema. In addition, you must
include the XML declaration and DTD specification in
your database schema file. Failure to do so can
@@ -449,7 +449,7 @@
<source><![CDATA[
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
<!DOCTYPE database SYSTEM
- "http://jakarta.apache.org/turbine/dtd/database.dtd">
+ "http://jakarta.apache.org/turbine/dtd/database_3_0_1.dtd">
<database name="bookstore">
<table name="ID_TABLE" idMethod="idbroker">
1.54.2.2 +3 -0 jakarta-turbine-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/changes.xml,v
retrieving revision 1.54.2.1
retrieving revision 1.54.2.2
diff -u -r1.54.2.1 -r1.54.2.2
--- changes.xml 28 Jan 2003 02:10:59 -0000 1.54.2.1
+++ changes.xml 31 Jan 2003 16:46:11 -0000 1.54.2.2
@@ -28,6 +28,9 @@
<p>
<ul>
<li>
+ The DTD resolver will now use the database.dtd from the classpath if the DTD
+ is http://jakarta.apache.org/turbine/dtd/database_3_0_1.dtd. This change
+ allows XML editor to use the proper version of the DTD.
</li>
</ul>
</p>
No revision
No revision
1.1.2.1 +3 -3 jakarta-turbine-torque/xdocs/tutorial/step2.xml
Index: step2.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/tutorial/step2.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- step2.xml 28 Sep 2002 01:21:41 -0000 1.1
+++ step2.xml 31 Jan 2003 16:46:12 -0000 1.1.2.1
@@ -137,7 +137,7 @@
<source><![CDATA[
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
<!DOCTYPE database SYSTEM
- "http://jakarta.apache.org/turbine/dtd/database.dtd">
+ "http://jakarta.apache.org/turbine/dtd/database_3_0_1.dtd">
<database
name="bookstore"
@@ -365,7 +365,7 @@
Another common mistake is to forget that XML is
<b>case-sensitive</b>. All of the elements and
attributes must be specified according to the
- <a href="/turbine/dtd/database.dtd">DTD</a>
+ <a href="/turbine/dtd/database_3_0_1.dtd">DTD</a>
for the database schema. In addition, you must
include the XML declaration and DTD specification in
your database schema file. Failure to do so can
@@ -386,7 +386,7 @@
<source><![CDATA[
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
<!DOCTYPE database SYSTEM
- "http://jakarta.apache.org/turbine/dtd/database.dtd">
+ "http://jakarta.apache.org/turbine/dtd/database_3_0_1.dtd">
<database name="bookstore">
<table name="ID_TABLE" idMethod="idbroker">
No revision
No revision
1.3.4.1 +5 -5 jakarta-turbine-torque/examples/project-schema.xml
Index: project-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/examples/project-schema.xml,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- project-schema.xml 27 Oct 2001 21:10:04 -0000 1.3
+++ project-schema.xml 31 Jan 2003 16:46:12 -0000 1.3.4.1
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
-<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd">
+<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database_3_0_1.dtd">
<!-- ==================================================================== -->
<!-- -->
@@ -7,11 +7,11 @@
<!-- -->
<!-- ==================================================================== -->
-<!--
+<!--
Note: You must now specify a database name.
-->
-<database name="INTERPLANETARY">
+<database name="INTERPLANETARY">
<table name="CIVILIZATION">
<column name="CIV_ID" required="true" autoIncrement="true"
primaryKey="true" type="INTEGER"/>
@@ -19,7 +19,7 @@
</table>
<table name="CIV_PEOPLE">
- <column name="CIV_ID" required="true" primaryKey="true"
+ <column name="CIV_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="PEOPLE_ID" required="true" primaryKey="true" type="INTEGER"/>
@@ -38,4 +38,4 @@
<column name="SPECIES" type="INTEGER" default="-2"/>
<column name="PLANET" type="INTEGER" default="-1"/>
</table>
-</database>
+</database>