quintonm 2003/01/31 08:53:28
Modified: examples project-schema.xml
xdocs changes.xml tutorial.xml
xdocs/tutorial step2.xml
Log:
Updated documentation and samples to use the new DTD
Revision Changes Path
1.4 +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.4
diff -u -r1.3 -r1.4
--- project-schema.xml 27 Oct 2001 21:10:04 -0000 1.3
+++ project-schema.xml 31 Jan 2003 16:53:27 -0000 1.4
@@ -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_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>
1.67 +5 -0 jakarta-turbine-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/changes.xml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- changes.xml 28 Jan 2003 02:19:42 -0000 1.66
+++ changes.xml 31 Jan 2003 16:53:27 -0000 1.67
@@ -36,6 +36,11 @@
Package names for generated java classes are now handled in the model
(not the templates)
</li>
+ <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>
</subsection>
1.10 +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.10
diff -u -r1.9 -r1.10
--- tutorial.xml 22 Aug 2002 14:48:29 -0000 1.9
+++ tutorial.xml 31 Jan 2003 16:53:27 -0000 1.10
@@ -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_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_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_1.dtd";>
<database name="bookstore">
<table name="ID_TABLE" idMethod="idbroker">
1.2 +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.2
diff -u -r1.1 -r1.2
--- step2.xml 28 Sep 2002 01:21:41 -0000 1.1
+++ step2.xml 31 Jan 2003 16:53:28 -0000 1.2
@@ -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_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_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_1.dtd";>
<database name="bookstore">
<table name="ID_TABLE" idMethod="idbroker">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
