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 tf...@apache.org on 2008/01/04 23:37:30 UTC
svn commit: r609035 - in /db/torque/site/trunk: src/dtd/database.dtd
xdocs/changes.xml xdocs/download.xml
Author: tfischer
Date: Fri Jan 4 14:37:30 2008
New Revision: 609035
URL: http://svn.apache.org/viewvc?rev=609035&view=rev
Log:
Fixed doc errors:
- used correct database.dtd
- use trunks module as primary svn checkout url
- add date for 3.3-RC2 release in changes.xml
Modified:
db/torque/site/trunk/src/dtd/database.dtd
db/torque/site/trunk/xdocs/changes.xml
db/torque/site/trunk/xdocs/download.xml
Modified: db/torque/site/trunk/src/dtd/database.dtd
URL: http://svn.apache.org/viewvc/db/torque/site/trunk/src/dtd/database.dtd?rev=609035&r1=609034&r2=609035&view=diff
==============================================================================
--- db/torque/site/trunk/src/dtd/database.dtd (original)
+++ db/torque/site/trunk/src/dtd/database.dtd Fri Jan 4 14:37:30 2008
@@ -1,150 +1,195 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!--
- Torque XML database schema DTD
- $Id: database.dtd,v 1.10 2001/12/27 20:49:32 jmcnally Exp $
--->
-
-<!--
-For: database.defaultIdMethod and table.idMethod
-
-Do not use autoincrement or sequence. They are deprecated in favor of
-using native which will use the Turbine Connection pool to determine
-which database it is talking to (yes, it knows that) and then use
-whatever native database methodology for insert increments that it can.
-Otherwise, you should use idbroker or none. none is good if you have a
-table that is just a join table. idbroker is good if you want a
-centralized repository for brokering out clumps of id's in a database
-agnostic way.
--->
-
-<!--
-
-defaultJavaNamingMethod determines how a table or column name,
-from the name attribute in the xml database file, is converted to a
-Java class or method name.
-
- nochange - indicates not change is performed.
- underscore - Underscores are removed, First letter is
- capitalized, first letter after an underscore
- is capitalized, the rest of the letters are
- converted to lowercase.
- javaname - same as underscore, but no letters are converted
- to lowercase.
--->
-
-<!ELEMENT database (table+)>
-<!ATTLIST database
- name CDATA #IMPLIED
- defaultIdMethod (idbroker|native|autoincrement|sequence|none) "none"
- defaultJavaType (object|primitive) "primitive"
- package CDATA #IMPLIED
- baseClass CDATA #IMPLIED
- basePeer CDATA #IMPLIED
- defaultJavaNamingMethod (nochange|underscore|javaname) "underscore"
- heavyIndexing (true|false) "false"
->
-
-<!ELEMENT table (column+,(foreign-key|index|unique|id-method-parameter)*)>
-<!ATTLIST table
- name CDATA #REQUIRED
- javaName CDATA #IMPLIED
- idMethod (idbroker|native|autoincrement|sequence|none|null) "null"
- skipSql (true|false) "false"
- abstract (true|false) "false"
- baseClass CDATA #IMPLIED
- basePeer CDATA #IMPLIED
- alias CDATA #IMPLIED
- javaNamingMethod (nochange|underscore|javaname) #IMPLIED
- heavyIndexing (true|false) #IMPLIED
- description CDATA #IMPLIED
->
-
-<!ELEMENT id-method-parameter EMPTY>
-<!ATTLIST id-method-parameter
- name CDATA "default"
- value CDATA #REQUIRED
->
-
-<!ELEMENT column (inheritance*)>
-<!ATTLIST column
- name CDATA #REQUIRED
- javaName CDATA #IMPLIED
- primaryKey (true|false) "false"
- required (true|false) "false"
- type
- (
- BIT | TINYINT | SMALLINT | INTEGER | BIGINT | FLOAT
- | REAL | NUMERIC | DECIMAL | CHAR | VARCHAR | LONGVARCHAR
- | DATE | TIME | TIMESTAMP | BINARY | VARBINARY | LONGVARBINARY
- | NULL | OTHER | JAVA_OBJECT | DISTINCT | STRUCT | ARRAY
- | BLOB | CLOB | REF | BOOLEANINT | BOOLEANCHAR
- | DOUBLE
- ) "VARCHAR"
- javaType (object|primitive) #IMPLIED
- size CDATA #IMPLIED
- default CDATA #IMPLIED
- autoIncrement (true|false) "false"
- inheritance (single|false) "false"
- inputValidator CDATA #IMPLIED
- javaNamingMethod (nochange|underscore|javaname) #IMPLIED
- description CDATA #IMPLIED
->
-
-<!ELEMENT inheritance EMPTY>
-<!ATTLIST inheritance
- key CDATA #REQUIRED
- class CDATA #REQUIRED
- extends CDATA #IMPLIED
->
-
-<!ELEMENT foreign-key (reference+)>
-<!ATTLIST foreign-key
- foreignTable CDATA #REQUIRED
- name CDATA #IMPLIED
- onUpdate (cascade|setnull|restrict|none) "none"
- onDelete (cascade|setnull|restrict|none) "none"
->
-
-<!ELEMENT reference EMPTY>
-<!ATTLIST reference
- local CDATA #REQUIRED
- foreign CDATA #REQUIRED
->
-
-<!ELEMENT index (index-column+)>
-<!ATTLIST index
- name CDATA #IMPLIED
->
-
-<!ELEMENT index-column EMPTY>
-<!ATTLIST index-column
- name CDATA #REQUIRED
- size CDATA #IMPLIED
->
-
-<!ELEMENT unique (unique-column+)>
-<!ATTLIST unique
- name CDATA #IMPLIED
->
-
-<!ELEMENT unique-column EMPTY>
-<!ATTLIST unique-column
- name CDATA #REQUIRED
->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!--
+ Torque XML database schema DTD
+ $Id: database.dtd 584517 2007-10-14 09:00:14Z tfischer $
+-->
+
+<!--
+For: database.defaultIdMethod and table.idMethod
+
+Do not use autoincrement or sequence. They are deprecated in favor of
+using native which will use the Connection pool to determine
+which database it is talking to (yes, it knows that) and then use
+whatever native database methodology for insert increments that it can.
+Otherwise, you should use idbroker or none. none is good if you have a
+table that is just a join table. idbroker is good if you want a
+centralized repository for brokering out clumps of id's in a database
+agnostic way.
+-->
+
+<!--
+
+defaultJavaNamingMethod determines how a table or column name,
+from the name attribute in the xml database file, is converted to a
+Java class or method name.
+
+ nochange - indicates not change is performed.
+ underscore - Underscores and dots are removed, first letter is
+ capitalized, first letter after an underscore
+ is capitalized, first letter after a dot is capitalized,
+ the rest of the letters are converted to lowercase.
+ underscoreOmitSchema - The section of the name before and including
+ the last dot in the name is removed. For the remaining part,
+ underscores are removed, first letter is capitalized,
+ first letter after an underscore is capitalized,
+ the rest of the letters are converted to lowercase.
+ javaname - same as underscore, but no letters are converted
+ to lowercase.
+-->
+
+<!ELEMENT database (option*, external-schema*, domain*, table+)>
+<!ATTLIST database
+ name CDATA #REQUIRED
+ defaultIdMethod (idbroker|native|none) "none"
+ defaultJavaType (object|primitive) "primitive"
+ package CDATA #IMPLIED
+ baseClass CDATA #IMPLIED
+ basePeer CDATA #IMPLIED
+ defaultJavaNamingMethod (nochange|underscore|underscoreOmitSchema|javaname) "underscore"
+ heavyIndexing (true|false) "false"
+>
+
+<!ELEMENT option EMPTY>
+<!ATTLIST option
+ key CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+
+<!ELEMENT external-schema EMPTY>
+<!ATTLIST external-schema
+ filename CDATA #REQUIRED
+>
+
+<!ELEMENT domain EMPTY>
+<!ATTLIST domain
+ name CDATA #REQUIRED
+ type
+ (
+ BIT | TINYINT | SMALLINT | INTEGER | BIGINT | FLOAT
+ | REAL | NUMERIC | DECIMAL | CHAR | VARCHAR | LONGVARCHAR
+ | DATE | TIME | TIMESTAMP | BINARY | VARBINARY | LONGVARBINARY
+ | NULL | OTHER | JAVA_OBJECT | DISTINCT | STRUCT | ARRAY
+ | BLOB | CLOB | REF | BOOLEANINT | BOOLEANCHAR
+ | DOUBLE
+ ) "VARCHAR"
+ size CDATA #IMPLIED
+ scale CDATA #IMPLIED
+ default CDATA #IMPLIED
+ description CDATA #IMPLIED
+>
+
+
+<!--
+ note: the interface="true", requires that useManagers=true in the
+ properties file.
+-->
+<!ELEMENT table (option*,column+,(foreign-key|index|unique|id-method-parameter)*)>
+<!ATTLIST table
+ name CDATA #REQUIRED
+ javaName CDATA #IMPLIED
+ idMethod (idbroker|native|none|null) "null"
+ skipSql (true|false) "false"
+ abstract (true|false) "false"
+ baseClass CDATA #IMPLIED
+ basePeer CDATA #IMPLIED
+ alias CDATA #IMPLIED
+ interface CDATA #IMPLIED
+ javaNamingMethod (nochange|underscore|underscoreOmitSchema|javaname) #IMPLIED
+ heavyIndexing (true|false) #IMPLIED
+ description CDATA #IMPLIED
+>
+
+<!ELEMENT id-method-parameter EMPTY>
+<!ATTLIST id-method-parameter
+ name CDATA "default"
+ value CDATA #REQUIRED
+>
+
+<!ELEMENT column (option*, inheritance*)>
+<!ATTLIST column
+ name CDATA #REQUIRED
+ javaName CDATA #IMPLIED
+ primaryKey (true|false) "false"
+ required (true|false) "false"
+ protected (true|false) "false"
+ domain CDATA #IMPLIED
+ type
+ (
+ BIT | TINYINT | SMALLINT | INTEGER | BIGINT | FLOAT
+ | REAL | NUMERIC | DECIMAL | CHAR | VARCHAR | LONGVARCHAR
+ | DATE | TIME | TIMESTAMP | BINARY | VARBINARY | LONGVARBINARY
+ | NULL | OTHER | JAVA_OBJECT | DISTINCT | STRUCT | ARRAY
+ | BLOB | CLOB | REF | BOOLEANINT | BOOLEANCHAR
+ | DOUBLE
+ ) #IMPLIED
+ javaType (object|primitive) #IMPLIED
+ size CDATA #IMPLIED
+ scale CDATA #IMPLIED
+ default CDATA #IMPLIED
+ autoIncrement (true|false) #IMPLIED
+ inheritance (single|false) "false"
+ inputValidator CDATA #IMPLIED
+ javaNamingMethod (nochange|underscore|javaname) #IMPLIED
+ description CDATA #IMPLIED
+>
+
+<!ELEMENT inheritance EMPTY>
+<!ATTLIST inheritance
+ key CDATA #REQUIRED
+ class CDATA #REQUIRED
+ extends CDATA #IMPLIED
+>
+
+<!ELEMENT foreign-key (option*,reference+)>
+<!ATTLIST foreign-key
+ foreignTable CDATA #REQUIRED
+ name CDATA #IMPLIED
+ onUpdate (cascade|setnull|restrict|none) "none"
+ onDelete (cascade|setnull|restrict|none) "none"
+>
+
+<!ELEMENT reference EMPTY>
+<!ATTLIST reference
+ local CDATA #REQUIRED
+ foreign CDATA #REQUIRED
+>
+
+<!ELEMENT index (option*,index-column+)>
+<!ATTLIST index
+ name CDATA #IMPLIED
+>
+
+<!-- The index-column's size element is currently ignored
+ and will be removed in a further version. -->
+<!ELEMENT index-column EMPTY>
+<!ATTLIST index-column
+ name CDATA #REQUIRED
+ size CDATA #IMPLIED
+>
+
+<!ELEMENT unique (option*,unique-column+)>
+<!ATTLIST unique
+ name CDATA #IMPLIED
+>
+
+<!ELEMENT unique-column EMPTY>
+<!ATTLIST unique-column
+ name CDATA #REQUIRED
+>
Modified: db/torque/site/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/changes.xml?rev=609035&r1=609034&r2=609035&view=diff
==============================================================================
--- db/torque/site/trunk/xdocs/changes.xml (original)
+++ db/torque/site/trunk/xdocs/changes.xml Fri Jan 4 14:37:30 2008
@@ -190,7 +190,8 @@
if offset is set but limit is not set in a query.
</action>
</release>
- <release version="3.3-RC2" date="in SVN">
+
+ <release version="3.3-RC2" date="2007-02-26">
<action type="fix" dev="tv" issue="TORQUE-76" due-to="Ronny Völker">
Fix the handling of interfaces while keeping backward compatibility.
Add documentation and test cases.
Modified: db/torque/site/trunk/xdocs/download.xml
URL: http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/download.xml?rev=609035&r1=609034&r2=609035&view=diff
==============================================================================
--- db/torque/site/trunk/xdocs/download.xml (original)
+++ db/torque/site/trunk/xdocs/download.xml Fri Jan 4 14:37:30 2008
@@ -221,7 +221,7 @@
You can check out the latest source from the DB SVN module.<br/>
Torque resides in the db/torque module.
- <source><![CDATA[svn checkout http://svn.apache.org/repos/asf/db/torque]]></source>
+ <source><![CDATA[svn checkout http://svn.apache.org/repos/asf/db/torque/trunks]]></source>
or browse the source code through <a href="http://svn.apache.org/viewvc/db/torque">ViewCVS</a>.
</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org