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/03/09 15:21:56 UTC
svn commit: r1875009 - in /db/torque/torque4/trunk: ./ torque-ant-tasks/
torque-runtime/src/sqltest/ torque-site/ torque-site/src/site/
torque-site/src/site/xdoc/
torque-site/src/site/xdoc/documentation/codegen-reference/
torque-templates/src/changes/ ...
Author: gk
Date: Mon Mar 9 15:21:55 2020
New Revision: 1875009
URL: http://svn.apache.org/viewvc?rev=1875009&view=rev
Log:
- changes plugin is not used a lot in modules (may be removed?)
- fix / update documentation,
- fix changes in download.xml due to structural changes to Apache downloads.
Added:
db/torque/torque4/trunk/README.md
Modified:
db/torque/torque4/trunk/pom.xml
db/torque/torque4/trunk/torque-ant-tasks/pom.xml
db/torque/torque4/trunk/torque-runtime/src/sqltest/type-test-schema.xml
db/torque/torque4/trunk/torque-site/pom.xml
db/torque/torque4/trunk/torque-site/src/site/site.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/existing-target-modes.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml
db/torque/torque4/trunk/torque-templates/src/changes/changes.xml
db/torque/torque4/trunk/torque-test/README.md
db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/docker-resources/docker-java.properties.template
Added: db/torque/torque4/trunk/README.md
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/README.md?rev=1875009&view=auto
==============================================================================
--- db/torque/torque4/trunk/README.md (added)
+++ db/torque/torque4/trunk/README.md Mon Mar 9 15:21:55 2020
@@ -0,0 +1,60 @@
+<!---
+ 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.
+-->
+
+# Apache Db Torque Project
+
+## General
+
+- Apache Torque is an object-relational mapper using java.
+- 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.
+
+### Modules
+
+- This project consists of six modules
+
+ - torque-runtime
+ - torque-generator
+ - torque-templates
+ - torque-maven-plugin
+ - torque-ant-tasks
+ - torque-site
+ - torque-test
+
+
+### Core modules
+
+*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.
+
+#### 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.
+
+#### Site module
+
+*Torque-site* is used to generate the site (add post-site to merge the documentation of dependend modules. You need the ant tool installed.
+
+```sh
+mvn site post-site
+```
+
+#### Build modules
+
+- *Torque-maven-plugin* provides a Maven plugin (generator).
+
+- *Torque-ant-tasks* is to provide some ant tasks to generate the Torque artefacts (xml, java, sql).
Modified: db/torque/torque4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1875009&r1=1875008&r2=1875009&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Mon Mar 9 15:21:55 2020
@@ -620,6 +620,21 @@
<threshold>Normal</threshold>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.12.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ <configuration>
+ <xmlPath>src/changes/changes.xml</xmlPath>
+ </configuration>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
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=1875009&r1=1875008&r2=1875009&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-ant-tasks/pom.xml (original)
+++ db/torque/torque4/trunk/torque-ant-tasks/pom.xml Mon Mar 9 15:21:55 2020
@@ -49,7 +49,7 @@
<artifactId>torque-templates</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- SOME ant tasks depends on sytstem tools -->
+ <!-- SOME ant tasks depends on system tools -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
Modified: db/torque/torque4/trunk/torque-runtime/src/sqltest/type-test-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/sqltest/type-test-schema.xml?rev=1875009&r1=1875008&r2=1875009&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/sqltest/type-test-schema.xml (original)
+++ db/torque/torque4/trunk/torque-runtime/src/sqltest/type-test-schema.xml Mon Mar 9 15:21:55 2020
@@ -17,8 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd">
-
<database
name="@DATABASE_DEFAULT@"
Modified: db/torque/torque4/trunk/torque-site/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/pom.xml?rev=1875009&r1=1875008&r2=1875009&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/pom.xml (original)
+++ db/torque/torque4/trunk/torque-site/pom.xml Mon Mar 9 15:21:55 2020
@@ -47,6 +47,7 @@
<site>
<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>
</site>
</distributionManagement>
@@ -56,7 +57,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.12.1</version>
<reportSets>
<reportSet>
<reports>
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=1875009&r1=1875008&r2=1875009&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/site.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/site.xml Mon Mar 9 15:21:55 2020
@@ -164,6 +164,7 @@
</menu>
<menu name="Previous releases">
+ <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>
Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/existing-target-modes.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/existing-target-modes.xml?rev=1875009&r1=1875008&r2=1875009&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/existing-target-modes.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/existing-target-modes.xml Mon Mar 9 15:21:55 2020
@@ -53,7 +53,7 @@
The skip mode is suitable when a starting point for a file should be
generated, which can then subsequently be edited by the user.<br/>
The append mode can be useful for generating log files and similar.<br/>
- The skip mode is suitable when a file should be generated
+ The merge mode is suitable when a file should be generated
which content can then either be changed by the user and the generator.
<br/>
</p>
@@ -66,16 +66,16 @@
skip and merge, have different merits in user-generator interaction.
</p>
<p>
- The mode skip should be used if the generated file is just a starting
+ The mode <code>skip</code> should be used if the generated file is just a starting
point, or if the generation result is very unlikely to change,
e.g. if the code templates are believed to have all needed features
and the sources are unlikely to change.<br/>
It is a strategy which is simple to understand and use, so if a problem
- can be solved by both the skip mode and the merge mode,
+ can be solved by both the <code>skip</code> mode and the <code>merge</code> mode,
the skip mode should be used.
</p>
<p>
- The mode merge should be used if the generated code is not stable yet
+ The mode <code>merge</code> should be used if the generated code is not stable yet
(e.g. because the generator lacks features, or the source is likely
to change in such a way that the contents of a generated file is changed),
and it is likely that user interaction is needed in the generated files.
@@ -97,7 +97,7 @@
</p>
<subsection name="Merge Mode">
<p>
- The merge mode works as follows:
+ The <code>merge</code> mode works as follows:
If a file is generated which existingTargetStrategy is
<code>merge</code>is generated, the generator will store the generated
code in two files: one file being the nominal target, and the other
Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml?rev=1875009&r1=1875008&r2=1875009&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml Mon Mar 9 15:21:55 2020
@@ -49,66 +49,66 @@ The currently released versions of Torqu
<td rowspan="2"><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/">Torque 4.0</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.tar.gz">TAR</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.tar.gz.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.tar.gz.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.tar.gz.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.tar.gz.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.tar.gz.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.tar.gz.sha1">SHA1</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.tar.gz">TAR</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.tar.gz.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.tar.gz.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.tar.gz.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.tar.gz.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.tar.gz.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.tar.gz.sha1">SHA1</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-templates-4.0.tar.gz">TAR</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-templates-4.0.tar.gz.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-templates-4.0.tar.gz.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-templates-4.0.tar.gz.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-4.0.tar.gz.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-4.0.tar.gz.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-4.0.tar.gz.sha1">SHA1</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.tar.gz">TAR</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.tar.gz.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.tar.gz.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.tar.gz.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.tar.gz.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.tar.gz.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.tar.gz.sha1">SHA1</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.jar">JAR</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.jar.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.jar.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.jar.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.jar.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.jar.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.jar.sha1">SHA1</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz">TAR</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.sha1">SHA1</a></td>
</tr>
<tr>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.zip">ZIP</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.zip.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.zip.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.zip.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.zip.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.zip.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-runtime-4.0-bin.zip.sha1">SHA1</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.zip">ZIP</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.zip.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.zip.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.zip.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.zip.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.zip.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-4.0-bin.zip.sha1">SHA1</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-templates-4.0.zip">ZIP</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-templates-4.0.zip.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-templates-4.0.zip.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-templates-4.0.zip.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-4.0.zip.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-4.0.zip.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-4.0.zip.sha1">SHA1</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.zip">ZIP</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.zip.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.zip.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.zip.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.zip.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.zip.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.zip.sha1">SHA1</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.pom">POM</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.pom.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.pom.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.pom.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.pom.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.pom.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.pom.sha1">SHA1</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-site-4.0-site.zip">ZIP</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0-site.zip.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0-site.zip.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0-site.zip.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-4.0-site.zip.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-4.0-site.zip.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-4.0-site.zip.sha1">SHA1</a></td>
</tr>
</table>
</p>
@@ -125,22 +125,22 @@ The currently released versions of Torqu
<tr>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/">Torque 4.0</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/source/torque-4.0-source-release.zip">ZIP</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/source/torque-4.0-source-release.zip.asc">Sig.</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/source/torque-4.0-source-release.zip.md5">MD5</a>
- <a href="https://www.apache.org/dist/db/torque/torque-4.0/source/torque-4.0-source-release.zip.sha1">SHA1</a></td>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/source/torque-4.0-source-release.zip.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/source/torque-4.0-source-release.zip.md5">MD5</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/source/torque-4.0-source-release.zip.sha1">SHA1</a></td>
</tr>
</table>
</p>
<p>
Please check the integrity of the download using the
- <a href="https://www.apache.org/dist/db/torque/KEYS">KEYS</a> file
+ <a href="https://downloads.apache.org/db/torque/KEYS">KEYS</a> file
and the signature files.
</p>
<p>
The PGP signatures can be verified using PGP or GPG.
First download the
- <a href="https://www.apache.org/dist/db/torque/KEYS">KEYS</a>
+ <a href="https://downloads.apache.org/db/torque/KEYS">KEYS</a>
as well as the asc signature file for the relevant distribution.
Make sure you get these files from the main distribution directory,
rather than from a mirror. Then verify the signatures using e.g.
Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml?rev=1875009&r1=1875008&r2=1875009&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml Mon Mar 9 15:21:55 2020
@@ -45,7 +45,7 @@
<a href="jira-report.html">changes list</a>.
</subsection>
- <subsection name="December 2012 - Torque-4.0 released">
+ <subsection name="March 2013 - Torque-4.0 released">
<p>
This is the first production release of the Torque 4 branch.
The main changes with respect to the 4.0-beta1 release are:
Modified: db/torque/torque4/trunk/torque-templates/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/changes/changes.xml?rev=1875009&r1=1875008&r2=1875009&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/changes/changes.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/changes/changes.xml Mon Mar 9 15:21:55 2020
@@ -49,12 +49,7 @@
Update to commons-lang3 v3.8.1
</action>
</release>
- <release version="4.0-SNAPSHOT" date="in SVN">
- <action type="change" dev="tfischer">
- Renamed the option
- torque.addIntakeRetrievable to torque:addBaseDbObjectInterface and
- torque.retrievableInterface to torque:baseDbObjectInterface
- </action>
+ <release version="4.0-SNAPSHOT" date="2013-03-01">
<action type="remove" dev="tfischer">
Removed the alias attribute on the table element.
</action>
Modified: db/torque/torque4/trunk/torque-test/README.md
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/README.md?rev=1875009&r1=1875008&r2=1875009&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/README.md (original)
+++ db/torque/torque4/trunk/torque-test/README.md Mon Mar 9 15:21:55 2020
@@ -27,61 +27,90 @@ mvn test -P<data-type>
* e.g. for database Hsqldb use `mvn test -Phsqldb`.
-* Find profile names in pom.xml
+Running test against a non-memory or non-docker-containerized database requires a host-based database to be installed and running.
+ ### Profiles
+
Find more details about database and db user settings in the profile.
+* Find profile names in **pom.xml** and in
+
+ ```sh
+ src/test/profile/<database>/
+ ```
+
## Workflow
- check `src/main/schema` for the source schemas and the results in `target/generated-*` folders.
- find schema xsd in torque-templates module `src/main/resources/torque/xsd`.
-### Docker image
+### In-memory Databases
-Currently only mysql and postgresql adapter is supported (and selected tests).
+- **Hsqldb** and **Derby** adapters are provided
+#### Hsqldb
-### Hsqldb
+- In memory, no user access restriction as configured required.
-- In memory, no user access restriction as configured required
+### Dockerized databases
-### MySQL
+- Currently only **mysql** and **postgresql** adapter is supported (and selected tests). Run
-#### Existing host database (default profile)
-- User and database must exist, before running test, see profile mysql.
+ mvn -P mysql,docker-testcontainer,managers,beans clean test
+
+or
+
+ mvn -P postgresql,docker-testcontainer,managers,beans clean test
+
-#### Docker image (profile docker-textcontainer)
+If you get
+
+
+ No <dockerHost> given, no DOCKER_HOST environment variable,
+ no read/writable '/var/run/docker.sock' or '//./pipe/docker_engine'
+ and no external provider like Docker machine configured
+
+Docker Desktop (Windows) or docker is not running. If the error still shows pup after starting,
+you may configure and check your system. Provide in **docker-java.properties** DOCKER_HOST or other environment variables.
+find a templates in *src/test<database>/docker-resources/db*.
+
+
+#### Docker image (Profile docker-textcontainer)
Change into folder torque-test and check configuration files testcontainers.properties and docker-java.properties
in folder `src/test/profile/<profile>/docker-resources`.
-##### OS System Adjustments
+##### Docker OS System Adjustments
-__docker-maven-plugin and Docker Testcontainters needs appropriate environment settings__:
+__Docker-maven-plugin and Docker Testcontainters needs appropriate environment settings__:
-* Docker-Maven-Plugin automatically checks the OS system and which URL to use to communicate with the Docker daemon. Testcontainers expects settings in `docker-java.properties` [1][2]. Find this file here: `src/test/profile/mysql/docker-resources`.
+* **Docker-Maven-Plugin** automatically checks the OS system and which URL to use to communicate with
+the Docker daemon. Testcontainers expects settings in `docker-java.properties` [1],[2].
+
+Find the file docker-java.properties here: `src/test/profile/mysql/docker-resources`.
-[1]: org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy
-[2]: https://raw.githubusercontent.com/docker-java/docker-java/master/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java.
+* Docker daemon: By default setting the environment variable DOCKER_HOST ( URI / daemon ) is required or anexposed daemon port.
-* Docker daemon: By default setting the environment variable DOCKER_HOST ( URI / daemon ) is required. Set it appropriately in `docker-java.properties`. (e.g. activate the daemon without TLS in Windows 10 in Docker Desktop or set it later by using an appropriate (custom) Docker daemon [https://docs.microsoft.com/de-de/virtualization/windowscontainers/manage-docker/configure-docker-daemon] in the default folders by creating a `daemon.json` file.
+Set it appropriately in `docker-java.properties`. (e.g. activate the daemon without TLS in Windows 10 in Docker Desktop or set it later by using an appropriate
+(custom) Docker daemon [https://docs.microsoft.com/de-de/virtualization/windowscontainers/manage-docker/configure-docker-daemon]
+in the default folders by creating a `daemon.json` file.
* Windows system 7 and below without hyperv may require starting docker using `docker-machine start <id>`, environment check with `docker-machine env <id>` and setting it in shell and testcontainer-settings.
- Run the tests with profile __docker-testcontainer__ :
-
```sh
mvn -P mysql,docker-testcontainer,managers,beans clean test
```
+[1]: org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy
+[2]: (https://raw.githubusercontent.com/docker-java/docker-java/master/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java).
-### Postgresql
-#### Docker-Image
+#### Run test with Docker-Testcontainer
Change into folder torque-test and check configuration files `testcontainers.properties` and `docker-java.properties` in folder `src/test/profile/postgresql/docker-resources`.
@@ -91,12 +120,28 @@ Run the tests with:
mvn -P postgresql,docker-testcontainer,managers,beans clean test
```
+## Tests with hosted database
+
+### Existing host database (default profile)
+
+- User and database must exist, before running test, see profile mysql.
+
+#### Run test
+
+Provide database profile name and optionally extend with additional build profiles:
+
+```sh
+mvn test -P<data-type>, managers,beans
+```
+
+
### Mssql
...
### Oracle
...
+
### Derby
...
@@ -122,8 +167,7 @@ Example: Attach example opens port 8000
* or set `<forkCount>0</forkCount>` in pom.xml.
-
## TODO
-- Use Java Testcontainers (Docker in ither databas settings ...
+- Use Java Testcontainers Docker in other database settings ...
Modified: db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/docker-resources/docker-java.properties.template
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/docker-resources/docker-java.properties.template?rev=1875009&r1=1875008&r2=1875009&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/docker-resources/docker-java.properties.template (original)
+++ db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/docker-resources/docker-java.properties.template Mon Mar 9 15:21:55 2020
@@ -30,6 +30,7 @@
#DOCKER_HOST=tcp://<hostip>:2376
#DOCKER_CERT_PATH=<path-to-cert>
#DOCKER_MACHINE_NAME=nameofvirtualmachine (e.g. type virtualbox in Windows 7 or hyperv in Windows 10)
+# probably only windows 7:
#COMPOSE_CONVERT_WINDOWS_PATHS=true
-#api.version=1.39
+#api.version=
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org