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 gk...@apache.org on 2020/07/14 12:46:20 UTC
svn commit: r1879858 [1/3] - in /db/torque/torque4/trunk: ./
torque-ant-tasks/
torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/torque-gen/conf/
torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/xsd/
torque-generator/ torque-gene...
Author: gk
Date: Tue Jul 14 12:46:20 2020
New Revision: 1879858
URL: http://svn.apache.org/viewvc?rev=1879858&view=rev
Log:
Cleanup before Release:
- Set Version from 4.1 to 5.0.
- Dependencies updated: major: groovy from 2.5.6 to 3.0.4, mockito 2.11.2 to 3.4.0, both require Java 8 minor: jupiter 5.3.2 to 5.6.2, log4j2 2.12.2 to 2.13.3, patch: hsqldb to 2.5.1, mysql .to 8.0.21
- plugin updates dependency-check to 5.3.2, surefire to 3.0.0.M5, rat to 0.13, pmd 3.13, javadoc 3.2.0, compile 3.8.0
- replace fulcrum with jupiter, where possible
- add compiler configuration, but check for as this may fail testcontainer test
- Refactor DatabaseMapTest using Junit 5 Order
Added:
db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/xsd/database-5-0-strict.xsd
db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/xsd/database-5-0.xsd
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-5-0-strict.xsd
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-5-0.xsd
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/mysql/DoInsertContainerTest.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/postgresql/DoInsertContainerTest.java
Modified:
db/torque/torque4/trunk/ (props changed)
db/torque/torque4/trunk/README.md
db/torque/torque4/trunk/pom.xml
db/torque/torque4/trunk/torque-ant-tasks/pom.xml
db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/torque-gen/conf/control.xml
db/torque/torque4/trunk/torque-generator/pom.xml
db/torque/torque4/trunk/torque-generator/src/changes/changes.xml
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java
db/torque/torque4/trunk/torque-generator/src/test/resources/log4j2-test.xml
db/torque/torque4/trunk/torque-maven-plugin/pom.xml
db/torque/torque4/trunk/torque-runtime/pom.xml
db/torque/torque4/trunk/torque-runtime/src/changes/changes.xml
db/torque/torque4/trunk/torque-site/pom.xml
db/torque/torque4/trunk/torque-site/src/changes/old-changes.xml
db/torque/torque4/trunk/torque-site/src/site/site.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/index.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/connections-transactions.xml
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/index.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/initialisation-configuration.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/orm-reference/supported-databases.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/index.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml
db/torque/torque4/trunk/torque-templates/pom.xml
db/torque/torque4/trunk/torque-templates/src/changes/changes.xml
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
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/jdbc2schema/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/test/schema/schema.xml
db/torque/torque4/trunk/torque-test/README.md
db/torque/torque4/trunk/torque-test/pom.xml
db/torque/torque4/trunk/torque-test/src/main/schema/bookstore-schema.xml
db/torque/torque4/trunk/torque-test/src/main/schema/id-table-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/test-schema.xml
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/junit5/extension/DockerMySQLCallback.java
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/testcontainer/postgresql/ManagerConditionalContainerTest.java
Propchange: db/torque/torque4/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jul 14 12:46:20 2020
@@ -1,6 +1,5 @@
-target
+.classpath
+.idea
.project
-
.settings
-
-.classpath
+target
Modified: db/torque/torque4/trunk/README.md
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/README.md?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/README.md (original)
+++ db/torque/torque4/trunk/README.md Tue Jul 14 12:46:20 2020
@@ -23,6 +23,10 @@
- It generates the necessary classes (including the Data Objects) from an XML schema describing the database layout.
- it uses velocity / groovy templates during the code generation process.
+## Requirements
+- Version 5 requires Java 8.
+- Build tested with Java 8 and Tests run with JAva 8 and 14. Building with Java 11 or higher might require some fixes.
+
### Modules
- This project consists of six modules
@@ -41,6 +45,9 @@
*Torque-generator* is the core module providing the mechanism to generate the mappings, which are provided by *Torque-templates* module.
You need the ant tool installed.
+*Torque-runtime* is the only module needed, if building / generation step was done.
+
+
#### Test module
*Torque-test* allows to test against databases and provides a [README](torque-test/README.md) of its own. You need the ant tool installed.
Modified: db/torque/torque4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Tue Jul 14 12:46:20 2020
@@ -32,9 +32,9 @@
<artifactId>torque</artifactId>
<packaging>pom</packaging>
<name>Torque Maven Parent</name>
- <version>4.1-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
<description>Torque parent project</description>
- <url>http://db.apache.org/torque/releases/torque-4.1</url>
+ <url>http://db.apache.org/torque/releases/torque-5.0</url>
<modules>
<module>torque-runtime</module>
@@ -389,9 +389,9 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.23.0</version>
+ <version>3.4.0</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
@@ -405,14 +405,28 @@
<version>4.3.1</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ <version>${junit.launcher.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
@@ -449,6 +463,7 @@
<exclude>torque-test/src/main/generated-java/**/*</exclude>
<!-- hsqldb-jenkins -->
<exclude>torque-test/torque-test/**</exclude>
+ <exclude>torque-test/README.md</exclude>
<exclude>**/target/**</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
@@ -494,7 +509,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M4</version>
+ <version>3.0.0-M5</version>
<configuration>
<!--default setting is forkCount=1/reuseForks=true -->
<reuseForks>false</reuseForks>
@@ -558,18 +573,31 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M3</version>
+ <version>3.0.0-M5</version>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>5.2.2</version>
+ <version>5.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.8.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <configuration>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <fork>${torque.compiler.fork}</fork>
+ <compilerVersion>${torque.compiler.compilerVersion}</compilerVersion>
+ <executable>${torque.compiler.javac}</executable>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -578,6 +606,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.2.0</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
@@ -595,12 +624,12 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.12</version>
+ <version>0.13</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.2</version>
+ <version>3.13.0</version>
<configuration>
<minimumTokens>200</minimumTokens>
<rulesets>
@@ -644,8 +673,17 @@
<maven.compiler.target>1.8</maven.compiler.target>
<dependency.check.skip>true</dependency.check.skip>
- <junit.jupiter.version>5.3.2</junit.jupiter.version>
- <log4j2.version>2.11.2</log4j2.version>
+ <junit.jupiter.version>5.6.2</junit.jupiter.version>
+ <junit.launcher.version>1.6.2</junit.launcher.version>
+ <log4j2.version>2.13.3</log4j2.version>
+
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
+ <torque.compiler.fork>false</torque.compiler.fork>
+ <torque.compiler.compilerVersion>1.8</torque.compiler.compilerVersion>
+ <torque.compiler.javac>${JAVA_HOME}/bin/javac</torque.compiler.javac>
+
</properties>
@@ -694,6 +732,18 @@
<dependency.check.skip>false</dependency.check.skip>
</properties>
</profile>
+ <profile>
+ <id>java12</id>
+ <activation>
+ <jdk>[12,)</jdk>
+ </activation>
+ <properties>
+ <java.version>12</java.version>
+ <!--torque.compiler.fork>true</torque.compiler.fork>
+ <torque.compiler.compilerVersion>1.12</torque.compiler.compilerVersion>
+ <torque.compiler.release>8</torque.compiler.release-->
+ </properties>
+ </profile>
</profiles>
</project>
Modified: db/torque/torque4/trunk/torque-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-ant-tasks/pom.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-ant-tasks/pom.xml (original)
+++ db/torque/torque4/trunk/torque-ant-tasks/pom.xml Tue Jul 14 12:46:20 2020
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>4.1-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/torque-gen/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/torque-gen/conf/control.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/torque-gen/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/torque-gen/conf/control.xml Tue Jul 14 12:46:20 2020
@@ -38,11 +38,11 @@
systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd"
resource="../../xsd/database-4-0-strict.xsd" />
<entityReference
- systemId="http://db.apache.org/torque/torque-4.1/documentation/orm-reference/database-4-1.xsd"
- resource="../../xsd/database-4-1.xsd" />
+ systemId="http://db.apache.org/torque/torque-5.0/documentation/orm-reference/database-5-0.xsd"
+ resource="../../xsd/database-5-0.xsd" />
<entityReference
- systemId="http://db.apache.org/torque/torque-4.1/documentation/orm-reference/database-4-1-strict.xsd"
- resource="../../xsd/database-4-1-strict.xsd" />
+ systemId="http://db.apache.org/torque/torque-5.0/documentation/orm-reference/database-5-0-strict.xsd"
+ resource="../../xsd/database-5-0-strict.xsd" />
<output name="jdbc2schema">
<filenameOutlet
Added: db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/xsd/database-5-0-strict.xsd
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/xsd/database-5-0-strict.xsd?rev=1879858&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/xsd/database-5-0-strict.xsd (added)
+++ db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/xsd/database-5-0-strict.xsd Tue Jul 14 12:46:20 2020
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ 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-4-0-strict.xsd 1622915 2014-09-06 19:21:17Z tfischer $
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://db.apache.org/torque/5.0/templates/database"
+ xmlns="http://db.apache.org/torque/5.0/templates/database"
+ elementFormDefault="qualified"
+ version="5.0">
+
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The XML schema used by version 5.0 and greater of the Apache Software
+Foundation Torque project(
+<a href="http://db.apache.org/torque">http://db.apache.org/torque</a> )
+to model SQL database information.
+This model restricts the available characters in java names and sql names
+as compared to the standard database.xsd
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:redefine schemaLocation="http://db.apache.org/torque/torque-5.0/documentation/orm-reference/database-5-0.xsd">
+ <xs:simpleType name="javaNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Java identifiers, e.g. [A-Za-z_$]A-Za-z_$0-9]*
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="javaNameType">
+ <xs:pattern value="[A-Za-z_$][A-Za-z_$0-9]*" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="javaQualifiedNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Java fully qualified names (e.g. x.y.x)
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="javaQualifiedNameType">
+ <xs:pattern
+ value="([A-Za-z_$][A-Za-z_$0-9]*[.])*[A-Za-z_$][A-Za-z_$0-9]*" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="sqlNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ SQL Standard non-delimited identifiers.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="sqlNameType">
+ <xs:pattern value="[A-Za-z$#][A-Za-z_$#0-9]*" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="sqlQualifiedNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ SQL Standard non-delimited identifiers.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="sqlQualifiedNameType">
+ <xs:pattern value="[A-Za-z$#][A-Za-z_$#0-9]*(\.[A-Za-z$#][A-Za-z_$#0-9]*)?" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:redefine>
+
+</xs:schema>
\ No newline at end of file
Added: db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/xsd/database-5-0.xsd
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/xsd/database-5-0.xsd?rev=1879858&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/xsd/database-5-0.xsd (added)
+++ db/torque/torque4/trunk/torque-ant-tasks/src/test/torqueJDBC2SchemaTaskTest/src/main/xsd/database-5-0.xsd Tue Jul 14 12:46:20 2020
@@ -0,0 +1,1157 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ 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-4-0.xsd 1629463 2015-00-05 02:11:26Z tfischer $
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://db.apache.org/torque/5.0/templates/database"
+ xmlns="http://db.apache.org/torque/5.0/templates/database"
+ elementFormDefault="qualified"
+ version="5.0">
+
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The XML schema used by version 5.0 and greater of the Apache Software
+Foundation Torque project(
+<a href="http://db.apache.org/torque">http://db.apache.org/torque</a> )
+to model SQL database information. This model is used by various Torque
+utilities for managing the SQL Server info and to build the Java objects
+to access this data.
+
+The basic structure of a model is built using the database element
+as the root. This will contain references to options, external (include)
+models, new SQL Domain definitions, and tables. See the Torque project
+home page for more details.
+ </xs:documentation>
+ </xs:annotation>
+
+<!-- =====================================
+ database element definition
+ ===================================== -->
+ <xs:element name="database" type="databaseType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The root element for defining a Torque database schema.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:complexType name="databaseType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The root type definition for a Torque database schema.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A set of key/value options to be passed to custom generator templates.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:element name="include-schema" type="includeSchemaType"
+ minOccurs="0" maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Include another schema file in this schema (as if it were a part of this
+schema file).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="external-schema" type="externalSchemaType"
+ minOccurs="0" maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Reference another schema file from this schema (outbound connections only).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="domain" type="domainType" minOccurs="0"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Domains are used to define common attribute sets for columns.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="table" type="tableType" minOccurs="0"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines a database table.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="view" type="viewType" minOccurs="0"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines a database view.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="javaNameType" use="required">
+ <xs:annotation>
+ <xs:documentation xml:lang="en" >
+The name used to identify this schema in the generated
+Java objects and as the default JDBC connection pool to use.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="defaultJavaType" use="optional"
+ type="javaReturnType" default="primitive" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines if the record object property getter / setters will
+use objects (e.g. Integer) or primitives (e.g. int), defaults
+to primitive.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="defaultIdMethod" use="optional" type="idMethodType"
+ default="none" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines the defaultIdMethod to use with tables which do not have an idMethod
+attribute defined. This attribute has 3 possible values, they are:
+
+- idbroker
+ Torque's software based id broker system
+- native
+ The SQL Server's native autoincrement/identifier process
+- none
+ Don't try to auto assign id numbers
+- null
+ Use the value previously set or the default value.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ option element definition
+ ===================================== -->
+ <xs:complexType name="optionType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+These tags allows a set of key/value options to be passed to custom generator
+templates.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="key" type="xs:string" use="required" />
+ <xs:attribute name="value" type="xs:string" use="required" />
+ </xs:complexType>
+
+<!-- =====================================
+ include-schema element definition
+ ===================================== -->
+ <xs:complexType name="includeSchemaType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Include another schema file in this schema (as if it were a part of this
+schema file).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="filename" type="xs:string" use="required" />
+ </xs:complexType>
+
+<!-- =====================================
+ external-schema element definition
+ ===================================== -->
+ <xs:complexType name="externalSchemaType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Includes another schema file.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="filename" type="xs:string" use="required" />
+ </xs:complexType>
+
+<!-- =====================================
+ domain element definition
+ ===================================== -->
+ <xs:complexType name="domainType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Domains are used to define attributes for columns.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="name" type="xs:string" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name used to reference this set of column attributes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="type" use="optional" type="sqlDataType"
+ default="VARCHAR" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The SQL Standard data type for the column
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="size" type="xs:decimal" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The size of the field. E.g. Varchar(size) or Numeric(Size). Note that
+while this still supports the original torque use of using a
+decimal number (5.2) to indicate the precision
+and scale in one attribute. Use of the scale attribute is preferred.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="scale" type="xs:integer" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The scale of the field. E.g.decimal(size, scale)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="default" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The default column value
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The description of this domain for documentation purposes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ table element definition
+ ===================================== -->
+ <xs:complexType name="tableType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The table element and its relevant attributes.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="column" type="columnType" maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column element and its relevant attributes
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:choice minOccurs="0" maxOccurs="unbounded" >
+ <xs:element name="foreign-key" type="foreignKeyType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a foreign key constraint for this table.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="index" type="indexType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines an index for this table.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="unique" type="uniqueType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a unique value constraint
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="id-method-parameter" type="idMethodParameterType">
+ </xs:element>
+ </xs:choice>
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlQualifiedNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The table name of the SQL table.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="interface" type="javaQualifiedNameType"
+ use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The interface attribute specifies an interface that should be referenced in
+the implements section of the generated extension class. If this is a fully
+qualified class name (i. e. the string contains dots), the interface will
+simply be implemented by the extension object. If the interface is a simple
+class name (without dots), an empty interface file will be generated in the
+extension object package. When this attribute is used, all methods that
+normally would return the extension object type will now return the interface
+type. This feature allows to use Torque generated classes in the context of
+other applications or APIs.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="peerInterface" type="javaQualifiedNameType"
+ use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The interface attribute specifies an interface that should be referenced in
+the implements section of the generated peer class. If this is a fully
+qualified class name (i. e. the string contains dots), the interface will
+simply be implemented by the peer object. If the interface is a simple
+class name (without dots), an empty interface file will be generated in the
+peer package. This feature allows to use Torque generated peer classes
+in the context of other applications or APIs.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="baseClass" type="javaQualifiedNameType" use="optional">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The fully qualified class that the generated Java table
+record objects will extend. This class does not have to extend
+org.apache.torque.om.BaseObject.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="basePeer" type="javaQualifiedNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The fully qualified class that the generated Java Peer objects will extend.
+Unlike baseClass, basePeer should extend BasePeer at some point in the chain,
+i.e. it needs to be the superclass.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="idMethod" use="optional" type="idMethodType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines the id method to automatically generate ids for this table.
+This attribute has 3 possible values, they are:
+
+- idbroker
+ Torque's software based id broker system
+- native
+ The SQL Server's native autoincrement / identifier process
+- none
+ Don't try to auto assign id numbers
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="abstract" use="optional" type="xs:boolean"
+ default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether or not to generate the class as Abstract or not
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaName" type="javaNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+This is the Java class name to use when generating the table. If
+this is missing the Java name is generated from the name attribute.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="skipSql" use="optional" type="xs:boolean"
+ default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether or not to skip SQL generation for this reference. Useful for using
+Views or creating a "subset" of columns in an existing table.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A description of this table. Used for documentation and will be included in
+the table generation SQL if the server type supports this.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ column element definition
+ ===================================== -->
+ <xs:complexType name="columnType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column element and its relevant attributes
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="enum-value" type="enumValueType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="inheritance" type="inheritanceType" minOccurs="0"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define an inheritance mapping of records to class by a key column. See the
+inheritance How To document.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column name
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="type" use="optional" type="sqlDataType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The SQL data type for the column. Is required unless a domain is used.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="size" type="xs:decimal" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The size of the field. E.g. Varchar(size) or Numeric(Size). Note that
+while this still supports the original torque use of using a
+decimal number (5.2) to indicate the precision
+and scale in one attribute. Use of the scale attribute is preferred.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="scale" type="xs:integer" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The scale of the field. E.g.decimal(size, scale)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="default" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The default column value
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="useDatabaseDefaultValue" type="xs:boolean" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether to use the database default value if a new object is saved
+and the attribute value is equal to the java default value. Default is false.
+Has no effect on primitive boolean columns.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="primaryKey" use="optional"
+ type="xs:boolean" default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether this column is part of the table's primary key.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="autoIncrement" use="optional"
+ type="xs:boolean" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether or not to auto-increment this field (true or false, defaults to false)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="required" use="optional" type="xs:boolean"
+ default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether a value is required in this column (NULL ALLOWED) (true or false,
+defaults to false)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaName" type="javaNameType"
+ use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The Java property name to use for this column in the record objects.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaType" use="optional"
+ type="javaReturnType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines if the record object property getter / setters will
+use objects (e.g. Integer) or primitives (e.g. int), defaults
+to database attribute or primitive
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="domain" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The domain reference name to set common settings.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="inheritance" type="inheritanceAttrType" use="optional"
+ default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The inheritance method used (see inheritance documentation)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="protected" use="optional"
+ type="xs:boolean" default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+If true, the setters and getters for this property will be protected rather
+than public.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="version" use="optional"
+ type="xs:boolean" default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+If true, this column is used as a version number for optimistic locking.
+I.e. for updates, Torque will check that the version number in the database
+is equal to the version number of the supplied object
+and it will automatically increase the version number of the updated row.
+Setting version to true will only work for numeric columns and will produce
+code that does not compile if applied to other column types.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="enumType" use="optional" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+If this attribute has a value, the java type for the column is an enum.
+The name of the enum type is contained in this attribute. It can be either
+fully qualified or unqualified.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The description of this column for documentation purposes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ inheritance element definition
+ ===================================== -->
+ <xs:complexType name="inheritanceType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define an inheritance mapping of records to class by a key column. See the
+inheritance How To document.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="key" type="xs:string" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A value found in the column marked as the inheritance key column
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="class" type="javaNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The class name for the object that will inherit the record values
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="extends" type="javaQualifiedNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The class that the inheritor class will extend
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ enumValue element definition
+ ===================================== -->
+ <xs:complexType name="enumValueType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines a possible value for an enum. If any of these elements occurs
+for a column, Torque will generate an enum for this column.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="value" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The value for the enum. Must be unique.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaName" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The java name for the enum. Must be unique and must not clash
+with automatically determined javaNames for the same enum.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A description for the enum value.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ foreign-key element definition
+ ===================================== -->
+ <xs:complexType name="foreignKeyType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a foreign key constraint for this table.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="reference" type="referenceType" maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a mapping between a local column containing a foreign key value and
+the foreign table column.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name used to create the foreign key constraint.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="foreignTable" type="sqlQualifiedNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name of the table that contains the foreign key
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="onDelete" use="optional" type="cascadeType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The action to take when the referenced value in foreignTable is deleted.
+Note this is handled by the database server and not Torque code. Will not
+work if the DB server does not support this.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="onUpdate" use="optional" type="cascadeType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The action to take when the referenced value in foreignTable is updated.
+Note this is handled by the database server and not Torque code. Will not
+work if the DB server does not support this.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ reference element definition
+ ===================================== -->
+ <xs:complexType name="referenceType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a mapping between a local column containing a foreign key value and
+the foreign table column.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="foreign" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column in the foreign table that contains the key.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="local" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column in this table that contains the foreign key.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ index element definition
+ ===================================== -->
+ <xs:complexType name="indexType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines an index for this table.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="index-column" type="indexColumnType"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a column to use in a table index.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name used in creating this index in the database.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ reference element definition
+ ===================================== -->
+ <xs:complexType name="indexColumnType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a column to use in a table index.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="name" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A column name to use in this index. Must exist in the table.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ unique element definition
+ ===================================== -->
+ <xs:complexType name="uniqueType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define a unique value constraint
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="unique-column" type="uniqueColumnType"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Specify a column to use in the unique constraint.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name to use in defining this constraint.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ unique-column element definition
+ ===================================== -->
+ <xs:complexType name="uniqueColumnType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Specify a column to use in the unique constraint.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="name" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name to use in defining this constraint.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="size" type="xs:decimal" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The size of the field. E.g. columnname(size). Mainly to customize restrictions in bytes/character restrictions without global changes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ id-method-parameter element definition
+ ===================================== -->
+ <xs:complexType name="idMethodParameterType">
+ <xs:attribute name="name" type="xs:string" use="optional"
+ default="default" />
+ <xs:attribute name="value" type="xs:string"
+ use="required" />
+ </xs:complexType>
+
+<!-- =====================================
+ view element definition
+ ===================================== -->
+ <xs:complexType name="viewType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The view element and its relevant attributes.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="column" type="viewColumnType" maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column element and its relevant attributes
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The name of the SQL view.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="baseClass" type="javaQualifiedNameType" use="optional">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The fully qualified class that the generated Java view
+record objects will extend. This class does not have to extend
+org.apache.torque.om.BaseObject.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="basePeer" type="javaQualifiedNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The fully qualified class that the generated Java Peer objects will extend.
+Unlike baseClass, basePeer should extend BasePeer at some point in the chain,
+i.e. it needs to be the superclass.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="abstract" use="optional" type="xs:boolean"
+ default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether or not to generate the class as Abstract or not
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaName" type="javaNameType" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+This is the Java class name to use when generating the view. If
+this is missing the Java name is generated from the name attribute.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="sqlSuffix" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The remainder of the sql for the view after column definitions.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="createSql" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The complete SQL for creating the view. Overrides all other means
+of generating the SQL for view creation.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="skipSql" use="optional" type="xs:boolean"
+ default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Whether or not to skip SQL generation for this reference.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A description of this view.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+<!-- =====================================
+ view column element definition
+ ===================================== -->
+ <xs:complexType name="viewColumnType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column element and its relevant attributes
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="option" type="optionType" minOccurs="0"
+ maxOccurs="unbounded" />
+ <xs:element name="inheritance" type="inheritanceType" minOccurs="0"
+ maxOccurs="unbounded" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Define an inheritance mapping of records to class by a key column. See the
+inheritance How To document.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ </xs:sequence>
+ <xs:attribute name="name" type="sqlNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The column name
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="type" use="required" type="sqlDataType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The SQL Standard data type for the column
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="size" type="xs:decimal" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The size of the field. E.g. Varchar(size) or Numeric(Size). Note that
+while this still supports the original torque use of using a
+decimal number (5.2) to indicate the precision
+and scale in one attribute. Use of the scale attribute is preferred.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="scale" type="xs:integer" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The scale of the field. E.g.decimal(size, scale)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaName" type="javaNameType"
+ use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The Java property name to use for this column in the record objects.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="javaType" use="optional"
+ type="javaReturnType" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Defines if the record object property getter / setters will
+use objects (e.g. Integer) or primitives (e.g. int), defaults
+to database attribute or primitive
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="domain" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The domain reference name to set common settings.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="select" type="sqlQualifiedNameType" use="required" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The sql snippet which contains the value to select.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="protected" use="optional"
+ type="xs:boolean" default="false" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+If true, the setters and getters for this property will be protected rather
+than public.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional" >
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+The description of this column for documentation purposes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="enumType" use="optional" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+If this attribute has a value, the java type for the column is an enum.
+The name of the enum type is contained in this attribute. It can be either
+fully qualified or unqualified.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+<!-- =====================================
+ Type definitions for attributes
+ ===================================== -->
+
+ <xs:simpleType name="sqlDataType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Standard SQL column data types.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="BIT" />
+ <xs:enumeration value="TINYINT" />
+ <xs:enumeration value="SMALLINT" />
+ <xs:enumeration value="INTEGER" />
+ <xs:enumeration value="BIGINT" />
+ <xs:enumeration value="FLOAT" />
+ <xs:enumeration value="REAL" />
+ <xs:enumeration value="NUMERIC" />
+ <xs:enumeration value="DECIMAL" />
+ <xs:enumeration value="CHAR" />
+ <xs:enumeration value="VARCHAR" />
+ <xs:enumeration value="LONGVARCHAR" />
+ <xs:enumeration value="DATE" />
+ <xs:enumeration value="TIME" />
+ <xs:enumeration value="TIMESTAMP" />
+ <xs:enumeration value="BINARY" />
+ <xs:enumeration value="VARBINARY" />
+ <xs:enumeration value="LONGVARBINARY" />
+ <xs:enumeration value="NULL" />
+ <xs:enumeration value="OTHER" />
+ <xs:enumeration value="JAVA_OBJECT" />
+ <xs:enumeration value="DISTINCT" />
+ <xs:enumeration value="STRUCT" />
+ <xs:enumeration value="ARRAY" />
+ <xs:enumeration value="BLOB" />
+ <xs:enumeration value="CLOB" />
+ <xs:enumeration value="REF" />
+ <xs:enumeration value="BOOLEANINT" />
+ <xs:enumeration value="BOOLEANCHAR" />
+ <xs:enumeration value="DOUBLE" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="idMethodType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+A schema type for methods to create ids automatically.
+
+idbroker = Torque's software based id broker system
+native = The SQL Server's native method, depends on database used
+ (e.g. autoincrement for MySQL, sequence for postgresql...)
+none = Don't try to auto assign id numbers
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="idbroker" />
+ <xs:enumeration value="native" />
+ <xs:enumeration value="none" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="javaReturnType">
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="object" />
+ <xs:enumeration value="primitive" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="cascadeType" >
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="cascade" />
+ <xs:enumeration value="setnull" />
+ <xs:enumeration value="restrict" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="inheritanceAttrType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="single" />
+ <xs:enumeration value="false" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="javaNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Java identifiers, e.g. [A-Za-z_$]A-Za-z_$0-9]*
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="javaQualifiedNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+Java fully qualified names (e.g. x.y.x)
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="sqlNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+SQL Standard non-delimited identifiers.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
+ <xs:simpleType name="sqlQualifiedNameType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+SQL Standard non-delimited identifiers.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
+</xs:schema>
\ No newline at end of file
Modified: db/torque/torque4/trunk/torque-generator/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/pom.xml (original)
+++ db/torque/torque4/trunk/torque-generator/pom.xml Tue Jul 14 12:46:20 2020
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>4.1-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -62,6 +62,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
@@ -88,14 +93,14 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.5.6</version>
+ <version>3.0.4</version>
<type>pom</type>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-testng</artifactId>
</exclusion>
- <!-- we do not use groovy sql, ecluding all which is not needed -->
+ <!-- we do not use groovy sql, excluding all which is not needed -->
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-sql</artifactId>
@@ -207,10 +212,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-testcontainer</artifactId>
- <scope>test</scope>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: db/torque/torque4/trunk/torque-generator/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/changes/changes.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/changes/changes.xml (original)
+++ db/torque/torque4/trunk/torque-generator/src/changes/changes.xml Tue Jul 14 12:46:20 2020
@@ -22,8 +22,9 @@
<title>Changes</title>
</properties>
<body>
- <release version="4.1-SNAPSHOT" date="in SVN">
+ <release version="5.0-SNAPSHOT" date="in SVN">
<action type="update" dev="gk">
+ - update to groovy 3.0.4 (requires Java 8)
- update to velocity 2.0
- fix junit 5
- remove log4j.properties
Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java Tue Jul 14 12:46:20 2020
@@ -103,6 +103,7 @@ public class RunOnlyOnSourceChangeTest e
assertTrue(targetDir.exists());
long unchangedTargetFile1LastModified = assertFile(targetDir1, "unchangedOutput.txt", "unchangedValue");
+ log.debug("sample modified time:" + unchangedTargetFile1LastModified);
long changedTargetFile11LastModified = assertFile(targetDir1, "changedOutput1.txt", "valueToBeChanged");
long changedTargetFile12LastModified = assertFile(targetDir1, "changedOutput2.txt", "valueToBeChanged");
long unchangedTargetFile2LastModified = assertFile(targetDir2, "unchangedOutput.txt", "unchangedValue");
@@ -132,7 +133,9 @@ public class RunOnlyOnSourceChangeTest e
log.debug("End time of generation " + System.currentTimeMillis());
// check outcome of second generation
- assertTrue(unchangedTargetFile1LastModified == assertFile(targetDir1, "unchangedOutput.txt", "unchangedValue"));
+ // fails in Ubuntu wsl1, Java 11, but not Ubuntu, wsl2, java 14
+ long lastModified = assertFile(targetDir1, "unchangedOutput.txt", "unchangedValue");
+ assertTrue(unchangedTargetFile1LastModified == lastModified, "sample last modified time: "+ lastModified + ", but expected time was:" + unchangedTargetFile1LastModified );
assertTrue(changedTargetFile11LastModified < assertFile(targetDir1, "changedOutput1.txt", "changedValue"));
assertTrue(changedTargetFile12LastModified < assertFile(targetDir1, "changedOutput2.txt", "changedValue"));
assertTrue(unchangedTargetFile2LastModified == assertFile(targetDir2, "unchangedOutput.txt", "unchangedValue"));
@@ -140,6 +143,14 @@ public class RunOnlyOnSourceChangeTest e
assertTrue(changedTargetFile22LastModified < assertFile(targetDir2, "changedOutput2.txt", "changedValue"));
}
+ /**
+ * Tests that file exists and content equals to supllied expectedContent.
+ * @param targetDir where to find the file
+ * @param filename
+ * @param expectedContent
+ * @return last modified time of file in milliseconds
+ * @throws IOException
+ */
private long assertFile(final File targetDir, final String filename, final String expectedContent) throws IOException
{
File targetFile = new File(targetDir, filename);
Modified: db/torque/torque4/trunk/torque-generator/src/test/resources/log4j2-test.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/resources/log4j2-test.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/resources/log4j2-test.xml (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/resources/log4j2-test.xml Tue Jul 14 12:46:20 2020
@@ -32,7 +32,7 @@
<Loggers>
<Logger name="org.apache.torque" additivity="false" level="DEBUG">
<AppenderRef ref="torque" level="DEBUG"/>
- <AppenderRef ref="console" level="INFO"/>
+ <AppenderRef ref="console" level="DEBUG"/>
</Logger>
<Logger name="org.apache.torque.generator.template.velocity" additivity="false" level="DEBUG">
<AppenderRef ref="torque" level="DEBUG"/>
@@ -40,7 +40,7 @@
</Logger>
<Logger name="org.apache.velocity" additivity="false" level="DEBUG">
<AppenderRef ref="velocity" level="DEBUG"/>
- <AppenderRef ref="console" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
</Logger>
<Root level="INFO"><!-- log4j 1.2 has DEBUG -->
<AppenderRef ref="console"/>
Modified: db/torque/torque4/trunk/torque-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-plugin/pom.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/torque4/trunk/torque-maven-plugin/pom.xml Tue Jul 14 12:46:20 2020
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>4.1-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: db/torque/torque4/trunk/torque-runtime/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/pom.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/pom.xml (original)
+++ db/torque/torque4/trunk/torque-runtime/pom.xml Tue Jul 14 12:46:20 2020
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>4.1-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -86,12 +86,29 @@
</dependency>
<dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-testcontainer</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<scope>test</scope>
Modified: db/torque/torque4/trunk/torque-runtime/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/changes/changes.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/changes/changes.xml (original)
+++ db/torque/torque4/trunk/torque-runtime/src/changes/changes.xml Tue Jul 14 12:46:20 2020
@@ -22,7 +22,7 @@
<title>Changes</title>
</properties>
<body>
- <release version="4.1-SNAPSHOT" date="in SVN">
+ <release version="5.0-SNAPSHOT" date="in SVN">
<action type="update" dev="gk">
Use Commons Configuration, which allows for overriding, Update Beanutils 1.9.4
</action>
Modified: db/torque/torque4/trunk/torque-site/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/pom.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/pom.xml (original)
+++ db/torque/torque4/trunk/torque-site/pom.xml Tue Jul 14 12:46:20 2020
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>4.1-SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -48,7 +48,7 @@
<id>apache.website</id>
<name>Apache DB Torque Site</name>
<!-- endpoint have to exist -->
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/db/content/torque/torque-4.1</url>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/db/content/torque/torque-5.0</url>
</site>
</distributionManagement>
Modified: db/torque/torque4/trunk/torque-site/src/changes/old-changes.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/changes/old-changes.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/changes/old-changes.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/changes/old-changes.xml Tue Jul 14 12:46:20 2020
@@ -829,7 +829,7 @@
</action>
</release>
- <release version="3.1.1" date="2004-10-26">
+ <release version="3.1.1" date="2005-00-26">
<action type="update" dev="henning">
Change PostgreSQL ID generation to use select nextval
instead of select currval.
@@ -874,7 +874,7 @@
Fix offset and limit swap for DB2 and Oracle.
</action>
</release>
- <release version="3.1.1-RC3" date="2004-10-16">
+ <release version="3.1.1-RC3" date="2005-00-16">
<action type="update" dev="henning">
Add maven-generated ant-buildfiles as a courtesy to those that are
still stuck with ant. No warranty, no support. It works for me, though.
@@ -1187,7 +1187,7 @@
1.3.1 for Linux), unsafe on a multi-CPU box.
</action>
</release>
- <release version="3.1-ALPHA1" date="2003-04-17">
+ <release version="3.1-ALPHA1" date="2003-05-07">
<action type="update">
Removed all deprecated stuff from the java code. Make sure to not get
any deprecation warnings before you switch to 3.1!
Modified: db/torque/torque4/trunk/torque-site/src/site/site.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/site.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/site.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/site.xml Tue Jul 14 12:46:20 2020
@@ -94,8 +94,8 @@
<item name="Avalon Component" href="/documentation/orm-reference/avalon.html"/>
<item name="Customizing the generation" href="/documentation/orm-reference/customizing-generation.html"/>
<item name="Relevant classes" href="/documentation/orm-reference/relevant-classes.html"/>
- <item name="Source XSD" href="/documentation/orm-reference/database-4-1.xsd"/>
- <item name="Source XSD (strict)" href="/documentation/orm-reference/database-4-1-strict.xsd"/>
+ <item name="Source XSD" href="/documentation/orm-reference/database-5-0.xsd"/>
+ <item name="Source XSD (strict)" href="/documentation/orm-reference/database-5-0-strict.xsd"/>
<item name="Migration from Torque 3" href="/documentation/orm-reference/migration-from-torque-3.html"/>
</item>
<item name="Code Generation Reference" href="/documentation/codegen-reference/index.html" collapse="true">
Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/index.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/index.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/index.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/index.xml Tue Jul 14 12:46:20 2020
@@ -44,7 +44,7 @@
- To learn about using the generator as generic code generator,
see the <a href="generator/index.html">generator documentation</a>.
<br />
- - To use the generator in a maven 2 build,
+ - To use the generator in a maven 3 build,
see the <a href="maven-plugin/index.html">maven plugin documentation</a>.
<br />
- To use the generator in an ant build,
Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/connections-transactions.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/connections-transactions.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/connections-transactions.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/connections-transactions.xml Tue Jul 14 12:46:20 2020
@@ -122,7 +122,7 @@ finally
</p>
<p>
- As of Torque 4.1 and with the advent of the try-with-resources construct,
+ As of Torque 5.0 and with the advent of the try-with-resources construct,
this can be simplified further. Simply use TorqueConnection instead,
which handles the automatic closing and possibly rollback internally:
</p>
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=1879858&r1=1879857&r2=1879858&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 Tue Jul 14 12:46:20 2020
@@ -50,10 +50,10 @@
</p>
<source><![CDATA[
<database
- xmlns="http://db.apache.org/torque/4.1/templates/database"
+ xmlns="http://db.apache.org/torque/5.0/templates/database"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://db.apache.org/torque/4.1/templates/database
- http://db.apache.org/torque/torque-4.1/documentation/orm-reference/database-4-1-strict.xsd"
+ xsi:schemaLocation="http://db.apache.org/torque/5.0/templates/database
+ http://db.apache.org/torque/torque-5.0/documentation/orm-reference/database-5-0-strict.xsd"
...
]]></source>
<p>
@@ -61,10 +61,10 @@
</p>
<source><![CDATA[
<database
- xmlns="http://db.apache.org/torque/4.1/templates/database"
+ xmlns="http://db.apache.org/torque/5.0/templates/database"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://db.apache.org/torque/4.1/templates/database
- http://db.apache.org/torque/torque-4.1/documentation/orm-reference/database-4-1.xsd"
+ xsi:schemaLocation="http://db.apache.org/torque/5.0/templates/database
+ http://db.apache.org/torque/torque-5.0/documentation/orm-reference/database-5-0.xsd"
...
]]></source>
<p>
Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml Tue Jul 14 12:46:20 2020
@@ -31,7 +31,8 @@
<p>
This Reference contains information about how to use Torque as
a Object-Relational mapper (a tool that maps from relational databases
- to java classes). Torque requires JDK 1.6 or higher.
+ to java classes).
+ Torque 4.0 requires JDK 1.6 or higher, Torque 5.0 JDK 1.8 or higher.
</p>
<p>
To access a database with Torque, the following steps are needed,
Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/initialisation-configuration.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/initialisation-configuration.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/initialisation-configuration.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/initialisation-configuration.xml Tue Jul 14 12:46:20 2020
@@ -451,7 +451,7 @@ torque.dsfactory.bookstore.jndi.path=jdb
which is prepended to table names in the runtime either per database
or as a global setting.
(The old way of configuring a schema per-datasource was removed
- in Torque 4.1).
+ in Torque 5.0).
Defining a schema allows e.g. in oracle to access another
database schema than the one of the user which connects to the database.
<br/>
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=1879858&r1=1879857&r2=1879858&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 Tue Jul 14 12:46:20 2020
@@ -217,10 +217,10 @@
<source><![CDATA[
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
<database name="${database.name}"
- xmlns="http://db.apache.org/torque/4.1/templates/database"
+ xmlns="http://db.apache.org/torque/5.0/templates/database"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://db.apache.org/torque/4.1/templates/database
- http://db.apache.org/torque/torque-4.1/documentation/orm-reference/database-4-1-strict.xsd">
+ xsi:schemaLocation="http://db.apache.org/torque/5.0/templates/database
+ http://db.apache.org/torque/torque-5.0/documentation/orm-reference/database-5-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/orm-reference/supported-databases.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/supported-databases.xml?rev=1879858&r1=1879857&r2=1879858&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/supported-databases.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/supported-databases.xml Tue Jul 14 12:46:20 2020
@@ -98,7 +98,7 @@
<subsection name="Supported Versions">
<p>
Torque 4 was tested against MySQL 5.5.
- Subselects are known not to work for MySQL < 4.1.
+ Subselects are known not to work for MySQL < 5.0.
There are no other known issues for old MySQL versions.
</p>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org