db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g.@apache.org
Subject svn commit: r1881816 [1/2] - in /db/torque/torque4/trunk: ./ torque-site/src/site/ torque-site/src/site/xdoc/ torque-site/src/site/xdoc/developer-info/ torque-site/src/site/xdoc/documentation/codegen-reference/ torque-site/src/site/xdoc/documentation/o...
Date Fri, 18 Sep 2020 11:39:50 GMT
Author: gk
Date: Fri Sep 18 11:39:49 2020
New Revision: 1881816

URL: http://svn.apache.org/viewvc?rev=1881816&view=rev
Log:
- update site information
- fix inconsistencies

Added:
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/database-5-0-strict.xsd
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/database-5-0.xsd
Modified:
    db/torque/torque4/trunk/README.md
    db/torque/torque4/trunk/pom.xml
    db/torque/torque4/trunk/torque-site/src/site/site.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/subversion.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/test-project.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/index.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/running-the-generator.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-maven.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step3-ant.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step3-maven.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step4.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step5.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step6-ant.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step6-maven.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-test/README.md
    db/torque/torque4/trunk/torque-test/pom.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/mysql/docker-resources/db/Dockerfile
    db/torque/torque4/trunk/torque-test/src/test/resources/log4j2-test.xml

Modified: db/torque/torque4/trunk/README.md
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/README.md?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/README.md (original)
+++ db/torque/torque4/trunk/README.md Fri Sep 18 11:39:49 2020
@@ -129,7 +129,9 @@ First test the release locally until the
     
     mvn release:prepare -DautoVersionSubmodules=true -Ptest,managers,beans
     
-    mvn release:perform 
+    mvn release:perform  -Pmanagers,beans
+    
+    Note: We need to add profiles managers, beans as release perform does a checkout of the tagged version (which is then uploaded to nexus) and is running the build process again. In module torque-test  the beans and manager java is generated only, if the beforementioned profiles are active.
 
 Now close the staging repository after Login in Nexus Repo
   https://repository.apache.org/index.html#stagingRepositories

Modified: db/torque/torque4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Fri Sep 18 11:39:49 2020
@@ -52,7 +52,7 @@
 
     <ciManagement>
         <system>jenkins</system>
-        <url>http://builds.apache.org/</url>
+        <url>https://ci-builds.apache.org/</url>
         <notifiers>
             <notifier>
                 <type>email</type>

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=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/site.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/site.xml Fri Sep 18 11:39:49 2020
@@ -34,31 +34,16 @@
   <body>
 
     <menu name="General information">
-      <item name="Overview"              href="/index.html"/>
-      <item name="News and Status"       href="/status.html"/>
-      <item name="Downloads"             href="/download.html"/>
-      <item name="Addons"                href="/addons.html"/>
-      <item name="Changes"               href="/jira-report.html"/>
-      <item name="Old Changes"           href="/changes-report.html"/>
-      <item name="Wiki"                  href="http://wiki.apache.org/DBTORQUE/" target="_blank"/>
-      <item name="Issue tracker"         href="https://issues.apache.org/jira/projects/TORQUE/" target="_blank"/>
+      <item name="Overview"            href="/index.html"/>
+      <item name="News and Status" href="/status.html"/>
+      <item name="Downloads"          href="/download.html"/>
+      <item name="Changes"              href="/jira-report.html"/>
+      <item name="Wiki"                     href="http://wiki.apache.org/DBTORQUE/" target="_blank"/>
+      <item name="Issue tracker"      href="https://issues.apache.org/jira/projects/TORQUE/" target="_blank"/>
       <item name="Mailing lists"         href="/mail-lists.html"/>
-      <item name="CI Management"   href="/ci-management.html"/>
-      <item name="SCM"                     href="/scm.html" />
-      <item name="License"               href="http://www.apache.org/licenses/" target="_blank"/>
-      <item name="Team"                  href="/team.html"/>
-      <item name="Developer Information" href="/developer-info/index.html" collapse="true">
-        <item name="Subversion"          href="/developer-info/subversion.html"/>
-        <item name="Test project"        href="/developer-info/test-project.html"/>
-        <item name="Code style"          href="/developer-info/codestyle.html"/>
-        <item name="Developer Guide"     href="/developer-info/developer-guide.html"/>
-        <item name="Contributions"       href="/developer-info/contributions.html"/>
-        <item name="Edit/deploy the site" href="/developer-info/site-edit-deploy.html"/>
-        <item name="References"          href="/developer-info/references.html"/>
-      </item>
-      <item name="Sponsorship"           href="http://www.apache.org/foundation/sponsorship.html"/>
-      <item name="Security"              href="http://www.apache.org/security/"/>
-      <item name="Thanks"                href="http://www.apache.org/foundation/thanks.html"/>
+      <item name="SCM"                      href="/scm.html" />
+      <item name="License"                href="http://www.apache.org/licenses/" target="_blank"/>
+      <item name="Team"                   href="/team.html"/>
     </menu>
 
     <menu name="Documentation">
@@ -142,6 +127,7 @@
         <item name="Ant Tasks"           href="/documentation/modules/ant-tasks/index.html" collapse="true">
           <item name="Reference"         href="/documentation/modules/ant-tasks/reference/index.html" collapse="true">
             <item name="Generator Task"  href="/documentation/modules/ant-tasks/reference/generator-task.html"/>
+            <item name="JDBC2Schema Task"  href="/documentation/modules/ant-tasks/reference/jdbc2schema-task.html"/>
           </item>
           <item name="Dependencies"      href="/documentation/modules/ant-tasks/dependencies.html"/>
           <item name="Project Reports"   href="/documentation/modules/ant-tasks/reports/index.html" collapse="true">
@@ -167,6 +153,25 @@
       <item name="Torque 4.0"          href="../torque-4.0/index.html" target="_blank"/>
       <item name="Torque 3.3"          href="../torque-3.3/index.html" target="_blank"/>
     </menu>
+    
+    
+    <menu name="More information">
+      <item name="CI Management"   href="/ci-management.html"/>
+      <item name="Developer Information" href="/developer-info/index.html" collapse="true">
+          <item name="Subversion"          href="/developer-info/subversion.html"/>
+          <item name="Test project"        href="/developer-info/test-project.html"/>
+          <item name="Code style"          href="/developer-info/codestyle.html"/>
+          <item name="Developer Guide"     href="/developer-info/developer-guide.html"/>
+          <item name="Contributions"       href="/developer-info/contributions.html"/>
+          <item name="Edit/deploy the site" href="/developer-info/site-edit-deploy.html"/>
+          <item name="References"          href="/developer-info/references.html"/>   
+      </item>      
+      <item name="Old Changes"           href="/changes-report.html"/>
+      <item name="Addons"                href="/addons.html"/>
+      <item name="Sponsorship"           href="http://www.apache.org/foundation/sponsorship.html"/>
+      <item name="Security"              href="http://www.apache.org/security/"/>
+      <item name="Thanks"                href="http://www.apache.org/foundation/thanks.html"/>
+    </menu>
 
   </body>
   <custom>

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml Fri Sep 18 11:39:49 2020
@@ -45,7 +45,7 @@
       <subsection name="Command line build">
         <p>
           Change into the directory into which you checked out the
-          torque 4 trunk. Run <code>mvn install</code>.
+          torque 4 trunk. Run <source>mvn install</source>.
           The runtime, generator, templates, maven 3 generator plugin
           and ant tasks will be built in turn and installed
           in your local maven repository.
@@ -88,7 +88,7 @@
           <li>
             In command line, change into the torque4 directory 
             you just checked out and run 
-            <code>mvn -Ptest,derbyEmbedded eclipse:configure-workspace install eclipse:clean eclipse:eclipse</code>.
+            <source>mvn -Ptest,derbyEmbedded eclipse:configure-workspace install eclipse:clean eclipse:eclipse</source>.
           </li>
           <li>
             In command line, delete the .project file in this directory 
@@ -121,9 +121,9 @@
           </li>
         </ul>
        To later change or update a project change into the module directory and run 
-       <code>mvn eclipse:eclipse</code>.
+       <source>mvn eclipse:eclipse</source>.
        or in case of the "special" test module torque-test run 
-       <code>mvn -Phsqldb eclipse:configure-workspace eclipse:clean eclipse:eclipse</code>.
+       <source>mvn -Phsqldb eclipse:configure-workspace eclipse:clean eclipse:eclipse</source>.
       </subsection>
     </section>
 
@@ -187,23 +187,23 @@
       </p>
       <p>
         To start building a release, run 
-        <code>mvn -DautoVersionSubmodules -Ptest release:prepare</code>.
+        <source>mvn -DautoVersionSubmodules -Ptest release:prepare</source>.
         This will change the version in the poms to the release version
         and then run a clean verify cycle on the new poms. This will fail
         because the test project needs the maven plugin which is not installed
         in the new version yet. To fix this, you might have to run
-        <code>rm torque-test/derby.log</code>, then run
-        <code>mvn install</code> 
+        <source>rm torque-test/derby.log</source>, then run
+        <source>mvn install</source> 
         to install the torque artifacts in the release version.
         Then run again
-        <code>mvn -Ptest release:prepare
-        -Dusername=YourApacheUsername -Dpassword=YourApachePassword</code>
+        <source>mvn -Ptest release:prepare
+        -Dusername=YourApacheUsername -Dpassword=YourApachePassword</source>
         to finish building the release, creating a tag for the release and 
         changing the pom's version entry to the new development version.
       </p>
       <p>
         To build the release and install it in the nexus staging repository,
-        run <code>mvn release:perform</code>.
+        run <source>mvn release:perform</source>.
       </p>
       <p>
         To test the release, login into https://repository.apache.org and 
@@ -218,9 +218,10 @@
         Adjust the version numbers in the site.
       </p>
       <p>
-        Call a vote on the torque dev list and forward to the db private list.
+        Call a vote on the torque dev list and forward to the db private and db pmc list (pmc@db.apache.org), 
+        as formally the entire db pmc is responsible.
         When the vote is finished, post the result to the dev list and again
-        forward to the db private list.
+        forward to the db private/pmc list.
       </p>
       <p>
         When the vote is accepted, promote the staging repository in nexus and

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml Fri Sep 18 11:39:49 2020
@@ -142,7 +142,7 @@
        </li>
        <li>
          Empty the cache of your browser and check everything is ok on
-         <a href="http://db.apache.org/torque/releases/torque-4.0/index.html">http://db.apache.org/torque/releases/torque-4.0/index.html</a>
+         <a href="http://db.apache.org/torque/torque-5.0/index.html">http://db.apache.org/torque/torque-5.0/index.html</a>
        </li>
        <li>
          If you are satisfied with the new site and no-one complains during

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/subversion.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/subversion.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/subversion.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/subversion.xml Fri Sep 18 11:39:49 2020
@@ -41,12 +41,12 @@
     </p>
    </section>
 
-   <section name="The Torque 4 repository">
+   <section name="The Torque 4 / 5 repository">
 
-    <subsection name="Torque 4 Repository Structure">
+    <subsection name="Torque 5 Repository Structure">
 
       <p>
-        The base directory of torque 4 is db/torque/torque4.
+        The base directory of torque 5  is db/torque/torque4.
         The main branch is located in the trunk subdirectory of that
         directory. The layout is:
       </p>
@@ -65,7 +65,7 @@
       ]]></source>
     </subsection>
 
-    <subsection name="Torque 4 Modules">
+    <subsection name="Torque 4 / 5  Modules">
      <p>
       Torque contains the following modules:
 

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/test-project.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/test-project.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/test-project.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/test-project.xml Fri Sep 18 11:39:49 2020
@@ -42,7 +42,7 @@
           <li>
             The test project checks whether the book table exists
             in the database by executing the command 
-            <code>select count(*) from book</code>.
+            <source>select count(*) from book</source>.
             If it fails, it is assumed that we work on an empty database
             and no drop commands are generated. If it succeeds, we assume that
             all tables have been dropped and generate all drop commands.
@@ -56,13 +56,14 @@
       <p>
         In order to run the test project using maven, use the following 
         procedure:
-        <ul>
+       </p>
+       <ul>
           <li>
             Check out the trunk containing the Torque modules 
             from the svn repository.
           </li>
           <li>
-            Run the command <code>mvn install</code>
+            Run the command <source>mvn install</source>
             in the directory you just checked out.
           </li>
           <li>
@@ -75,33 +76,36 @@
             <i>torque-test/src/test/profile/${profile}</i>
             (where ${profile} is the name of the profile you have chosen)
             to match the database settings.
+            Currently provided profiles for databases are:
+            <ul><li>derby</li><li>derbyEmbedded</li><li>hsqldb</li><li>mssql</li><li>mysql</li><li>oracle</li><li>postgresql</li>
+            </ul>
           </li>
           <li>
             In the directory <i>torque-test</i>, 
-            run the command <code>mvn -P${profile} clean test</code>
+            run the command <source>mvn -P${profile} clean test</source>
             to run the test, replacing the variable 
-            <code>${profile}</code> with the name of your chosen database
-            profile.<br/>
+            <code>${profile}</code> with the <strong>name of your chosen database
+            profile</strong>.<br/>
             For example, if you want to test against mysql, run
-            <code>mvn -Pmysql clean test</code>.
+            <source>mvn -Pmysql,managers,beans clean test</source>.
+            N.B. You have  always to include profiles managers,beans.
           </li>
           <li>
-            If you do not want or have a database installed locally, you may use the docker-testcontainer profile. 
-            Run the command <code>mvn -P${profile},docker-testcontainer,managers,beans clean test</code>
+            If you do not want or have a database installed locally, you may use the <strong>docker-testcontainer</strong> profile. 
+            Run the command <source>mvn -P${profile},docker-testcontainer,managers,beans clean test</source>
             to run some tests*, replacing the variable 
             <code>${profile}</code> with the name of your chosen database
             profile. Currently only mysql and postgresql type is supported.<br/>
             For example, if you want to test against mysql, run
-            <code>mvn -Pmysql,docker-testcontainer,managers,beans clean test</code>.
+            <source>mvn -Pmysql,docker-testcontainer,managers,beans clean test</source>.
             * JUnit 5 not yet supports test suites, only some selected tests are triggered 
             (see package org.apache.torque.testcontainer).
             Hint (e.g. if adding new database profile): To test local Dockerfile run it locally to shortcut / 
             exclude other failures e.g. in docker-test/target directory with 
-            <code>docker build -t build -f Dockerfile  ./ </code> and inspecting the image with on the fly container:
-            <code>docker run --rm -it build bash</code>.
+            <source>docker build -t build -f Dockerfile  ./ </source> and inspecting the image with on the fly container:
+            <source>docker run --rm -it build bash</source>.
           </li>
-        </ul>
-      </p>
+      </ul>
       <p>
         The standard database profiles do not generate managers and beans,
         nor do they execute the corresponding tests. For generating beans,
@@ -111,24 +115,24 @@
         and run the corresponding test.<br/>
         For example, if you want to run the test against mysql and use beans
         and managers, run
-        <code>mvn -Pmysql,beans,managers clean test</code>.
+        <source>mvn -Pmysql,beans,managers clean test</source>.
       </p>
     </section>
     <section name="Running mvn eclipse:eclipse on the test project">
       <p>
         Because dependency information is pulled from the profiles,
         you need to enable a profile from the profiles.xml for
-        generating the eclipse files. Running <code>mvn eclipse:eclipse</code>
+        generating the eclipse files. Running <source>mvn eclipse:eclipse</source>
         without a profile will result in the following error:
         <br/>
-        <code>org.apache.maven.reactor.MavenExecutionException: 
-        Failed to validate POM for project org.apache.torque:torque-test</code>
+        <source>org.apache.maven.reactor.MavenExecutionException: 
+        Failed to validate POM for project org.apache.torque:torque-test</source>
       </p>
       <p>
         The profile you choose will also pull the database driver from the
         profile into your eclipse project. E.G. if you want to use the
         mysql driver dependency in your eclipse project, run
-        <code>mvn -Pmysql eclipse:eclipse</code>
+        <source>mvn -Pmysql eclipse:eclipse</source>
       </p>
     </section>
   </body>

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/index.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/index.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/index.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/index.xml Fri Sep 18 11:39:49 2020
@@ -46,7 +46,7 @@
       <li>Velocity</li>
       <li>Groovy</li>
     </ul>
-    <p>Running the Torque generator requires JDK 1.6 or higher.</p>
+    <p>Running the Torque generator requires JDK 1.8 or higher.</p>
   </section>
 
  </body>

Added: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/database-5-0-strict.xsd
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/database-5-0-strict.xsd?rev=1881816&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/database-5-0-strict.xsd (added)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/database-5-0-strict.xsd Fri Sep 18 11:39:49 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-site/src/site/xdoc/documentation/orm-reference/database-5-0.xsd
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/database-5-0.xsd?rev=1881816&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/database-5-0.xsd (added)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/orm-reference/database-5-0.xsd Fri Sep 18 11:39:49 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-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=1881816&r1=1881815&r2=1881816&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 Fri Sep 18 11:39:49 2020
@@ -37,8 +37,8 @@
       </p>
       <p>
         All schema files should comply either to
-        <a href="database-4-0-strict.xsd">database-4-0-strict.xsd</a>
-        or to <a href="database-4-0.xsd">database-4-0.xsd</a>.
+        <a href="database-5-0-strict.xsd">database-5-0-strict.xsd</a>
+        or to <a href="database-5-0.xsd">database-5-0.xsd</a>.
         The difference between the strict schema
         and the normal schema is that in the strict schema, additional
         naming restrictions are made which are aimed at better interoperability

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=1881816&r1=1881815&r2=1881816&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 Fri Sep 18 11:39:49 2020
@@ -450,7 +450,8 @@
         In the following, only basic configuration of the Torque Ant Tasks
         is covered. For details of configuration of the Torque Ant Tasks,
         refer to the 
-        <a href="../modules/ant-tasks/reference/generator-task.html">generator task reference</a>.
+        <a href="../modules/ant-tasks/reference/generator-task.html">generator task reference</a> and 
+         <a href="../modules/ant-tasks/reference/jdbc2schema-task.html">generator task reference</a>.
       </p>
     </subsection>
     <subsection name="Generation of om classes">

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-ant.xml Fri Sep 18 11:39:49 2020
@@ -247,7 +247,7 @@
 </section>
 
 <section name="User Comments">
-  <a href="http://wiki.apache.org/db-torque/TutorialUserCommentsStep2">User comments</a>
+  <a href="https://cwiki.apache.org/DBTORQUE/TutorialUserCommentsStep2">User comments</a>
   for this step
 </section>
 

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-maven.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-maven.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-maven.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step1-maven.xml Fri Sep 18 11:39:49 2020
@@ -252,7 +252,7 @@
 </section>
 
 <section name="User Comments">
-  <a href="http://wiki.apache.org/db-torque/TutorialUserCommentsStep2">User comments</a>
+  <a href="https://cwiki.apache.org/DBTORQUE/TutorialUserCommentsStep2">User comments</a>
   for this step
 </section>
 

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step2.xml Fri Sep 18 11:39:49 2020
@@ -291,7 +291,7 @@ ant jdbc
 </section>
 
 <section name="User Comments">
-  <a href="http://wiki.apache.org/db-torque/TutorialUserCommentsStep2">User comments</a>
+  <a href="https://cwiki.apache.org/DBTORQUE/TutorialUserCommentsStep2">User comments</a>
   for this step
 </section>
 

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step3-ant.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step3-ant.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step3-ant.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step3-ant.xml Fri Sep 18 11:39:49 2020
@@ -197,7 +197,7 @@ ant execute-sql
 </section>
 
 <section name="User Comments">
-  <a href="http://wiki.apache.org/db-torque/TutorialUserCommentsStep3">User comments</a>
+  <a href="https://cwiki.apache.org/DBTORQUE/TutorialUserCommentsStep3">User comments</a>
   for this step
 </section>
 

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step3-maven.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step3-maven.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step3-maven.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step3-maven.xml Fri Sep 18 11:39:49 2020
@@ -214,7 +214,7 @@ maven sql:execute
 </section>
 
 <section name="User Comments">
-  <a href="http://wiki.apache.org/db-torque/TutorialUserCommentsStep3">User comments</a>
+  <a href="https://cwiki.apache.org/DBTORQUE/TutorialUserCommentsStep3">User comments</a>
   for this step
 </section>
 

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step4.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step4.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step4.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step4.xml Fri Sep 18 11:39:49 2020
@@ -155,7 +155,7 @@ torque.dsfactory.bookstore.connection.pa
     <a href="http://commons.apache.org/logging/">
     commons-logging</a> as a logging interface.
     To enable logging in your application, read the
-    <a href="http://commons.apache.org/logging/commons-logging-1.1.1/guide.html">
+    <a href="https://commons.apache.org/proper/commons-logging/guide.html">
     commons-logging user guide</a>.
     </p>
     
@@ -192,7 +192,7 @@ torque.dsfactory.bookstore.connection.pa
 </section>
 
 <section name="User Comments">
-  <a href="http://wiki.apache.org/db-torque/TutorialUserCommentsStep4">User comments</a>
+  <a href="https://cwiki.apache.org/DBTORQUE/TutorialUserCommentsStep4">User comments</a>
   for this step
 </section>
 

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step5.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step5.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step5.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step5.xml Fri Sep 18 11:39:49 2020
@@ -753,7 +753,7 @@ public class Bookstore
 </section>
 
 <section name="User Comments">
-  <a href="http://wiki.apache.org/db-torque/TutorialUserCommentsStep5">User comments</a>
+  <a href="https://cwiki.apache.org/DBTORQUE/TutorialUserCommentsStep5">User comments</a>
   for this step
 </section>
 

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step6-ant.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step6-ant.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step6-ant.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step6-ant.xml Fri Sep 18 11:39:49 2020
@@ -88,7 +88,7 @@ ant
   of the jars in the lib/runtime folder
   (There are some jars which are transitive dependencies to other jars
   which are not used, but there is no harm in including these).
-  The classpath almo must include all of your application
+  The classpath must include all of your application
   and object model classes located in <em>target/classes</em>.
   To run the application, change into the root directory
   of the application and type (exchange the mysql driver jar for the one
@@ -97,10 +97,10 @@ ant
 
 <source><![CDATA[
 linux:
-java -cp target/classes:lib/runtime/commons-beanutils-core-1.8.0.jar:lib/runtime/commons-dbcp-1.3.jar:lib/runtime/commons-collections-3.2.1.jar:lib/runtime/commons-configuration-1.6.jar:lib/runtime/commons-lang-2.6.jar:lib/runtime/commons-logging-1.1.1.jar:lib/runtime/commons-pool-1.5.6.jar:lib/runtime/log4j-1.2.16.jar:lib/runtime/mysql-connector-java-5.0.4.jar:lib/runtime/torque-runtime-4.0.jar org.apache.torque.tutorial.om.Bookstore
+java -cp target/classes:lib/runtime/commons-beanutils-core-1.9.4.jar:lib/runtime/commons-dbcp2-2.7.jar:lib/runtime/commons-collections-3.2.2.jar:lib/runtime/commons-configuration2-2.7.jar:lib/runtime/commons-lang3-3.10.jar:lib/runtime/commons-logging-1.2.jar:lib/runtime/commons-pool2-2.7.0.jar:lib/runtime/log4j-1.2-api-2.13.3.jar:lib/runtime/mysql-connector-java-8.0.21.jar:lib/runtime/torque-runtime-5.0.jar org.apache.torque.tutorial.om.Bookstore
 
 windows:
-java -cp target/classes;lib/runtime/commons-beanutils-core-1.8.0.jar;lib/runtime/commons-dbcp-1.3.jar;lib/runtime/commons-collections-3.2.1.jar;lib/runtime/commons-configuration-1.6.jar;lib/runtime/commons-lang-2.6.jar;lib/runtime/commons-logging-1.1.1.jar;lib/runtime/commons-pool-1.5.6.jar;lib/runtime/log4j-1.2.16.jar;lib/runtime/mysql-connector-java-5.0.4.jar;lib/runtime/torque-runtime-4.0.jar org.apache.torque.tutorial.om.Bookstore
+java -cp target/classes;lib/runtime/commons-beanutils-core-1.9.4.jar;lib/runtime/commons-dbcp2-2.7.jar;lib/runtime/commons-collections-3.2.2.jar;lib/runtime/commons-configuration2-2.7.jar;lib/runtime/commons-lang3-3.10.jar;lib/runtime/commons-logging-1.2.jar;lib/runtime/commons-pool2-2.7.0.jar;lib/runtime/log4j-1.2-api-2.13.3.jar;lib/runtime/mysql-connector-java-8.0.21.jar;lib/runtime/torque-runtime-5.0.jar org.apache.torque.tutorial.om.Bookstore
 
 ]]></source>
 
@@ -177,7 +177,7 @@ java -cp target/classes;lib/runtime/comm
 </section>
 
 <section name="User Comments">
-  <a href="http://wiki.apache.org/db-torque/TutorialUserCommentsStep6">User comments</a>
+  <a href="https://cwiki.apache.org/DBTORQUE/TutorialUserCommentsStep6">User comments</a>
   for this step
 </section>
 

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step6-maven.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step6-maven.xml?rev=1881816&r1=1881815&r2=1881816&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step6-maven.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/orm/step6-maven.xml Fri Sep 18 11:39:49 2020
@@ -101,10 +101,10 @@ mvn package
 
 <source><![CDATA[
 linux:
-java -cp classes:dependency/commons-beanutils-core-1.8.0.jar:dependency/commons-dbcp-1.3.jar:dependency/commons-collections-3.2.1.jar:dependency/commons-configuration-1.6.jar:dependency/commons-lang-2.6.jar:dependency/commons-logging-1.1.1.jar:dependency/commons-pool-1.5.6.jar:dependency/log4j-1.2.16.jar:dependency/mysql-connector-java-5.0.4.jar:dependency/torque-runtime-4.0.jar org.apache.torque.tutorial.om.Bookstore
+java -cp target/classes:lib/runtime/commons-beanutils-core-1.9.4.jar:lib/runtime/commons-dbcp2-2.7.jar:lib/runtime/commons-collections-3.2.2.jar:lib/runtime/commons-configuration2-2.7.jar:lib/runtime/commons-lang3-3.10.jar:lib/runtime/commons-logging-1.2.jar:lib/runtime/commons-pool2-2.7.0.jar:lib/runtime/log4j-1.2-api-2.13.3.jar:lib/runtime/mysql-connector-java-8.0.21.jar:lib/runtime/torque-runtime-5.0.jar org.apache.torque.tutorial.om.Bookstore
 
 windows:
-java -cp classes;dependency/commons-beanutils-core-1.8.0.jar;dependency/commons-dbcp-1.3.jar;dependency/commons-collections-3.2.1.jar;dependency/commons-configuration-1.6.jar;dependency/commons-lang-2.6.jar;dependency/commons-logging-1.1.1.jar;dependency/commons-pool-1.5.6.jar;dependency/log4j-1.2.16.jar;dependency/mysql-connector-java-5.0.4.jar;dependency/torque-runtime-4.0.jar org.apache.torque.tutorial.om.Bookstore
+java -cp target/classes;lib/runtime/commons-beanutils-core-1.9.4.jar;lib/runtime/commons-dbcp2-2.7.jar;lib/runtime/commons-collections-3.2.2.jar;lib/runtime/commons-configuration2-2.7.jar;lib/runtime/commons-lang3-3.10.jar;lib/runtime/commons-logging-1.2.jar;lib/runtime/commons-pool2-2.7.0.jar;lib/runtime/log4j-1.2-api-2.13.3.jar;lib/runtime/mysql-connector-java-8.0.21.jar;lib/runtime/torque-runtime-5.0.jar org.apache.torque.tutorial.om.Bookstore
 
 ]]></source>
 
@@ -181,7 +181,7 @@ java -cp classes;dependency/commons-bean
 </section>
 
 <section name="User Comments">
-  <a href="http://wiki.apache.org/db-torque/TutorialUserCommentsStep6">User comments</a>
+  <a href="https://cwiki.apache.org/DBTORQUE/TutorialUserCommentsStep6">User comments</a>
   for this step
 </section>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message