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/10/05 11:41:09 UTC
svn commit: r1882251 - in /db/torque/trunk: ./ torque-ant-tasks/
torque-generator/ torque-maven-plugin/ torque-runtime/ torque-site/
torque-site/src/site/xdoc/ torque-site/src/site/xdoc/developer-info/
torque-templates/ torque-test/
Author: gk
Date: Mon Oct 5 11:41:08 2020
New Revision: 1882251
URL: http://svn.apache.org/viewvc?rev=1882251&view=rev
Log:
- Move scm urls to db/torque/trunk
- update developer infos
- update site
Modified:
db/torque/trunk/pom.xml
db/torque/trunk/torque-ant-tasks/pom.xml
db/torque/trunk/torque-generator/pom.xml
db/torque/trunk/torque-maven-plugin/pom.xml
db/torque/trunk/torque-runtime/pom.xml
db/torque/trunk/torque-site/pom.xml
db/torque/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml
db/torque/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml
db/torque/trunk/torque-site/src/site/xdoc/developer-info/subversion.xml
db/torque/trunk/torque-site/src/site/xdoc/download.xml
db/torque/trunk/torque-site/src/site/xdoc/index.xml
db/torque/trunk/torque-templates/pom.xml
db/torque/trunk/torque-test/pom.xml
Modified: db/torque/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Mon Oct 5 11:41:08 2020
@@ -315,9 +315,9 @@
</contributors>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencyManagement>
Modified: db/torque/trunk/torque-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-ant-tasks/pom.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/torque-ant-tasks/pom.xml (original)
+++ db/torque/trunk/torque-ant-tasks/pom.xml Mon Oct 5 11:41:08 2020
@@ -32,9 +32,9 @@
<name>Torque Generator Ant tasks</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-generator/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/pom.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/pom.xml (original)
+++ db/torque/trunk/torque-generator/pom.xml Mon Oct 5 11:41:08 2020
@@ -32,9 +32,9 @@
<name>Torque Generator</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/pom.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/trunk/torque-maven-plugin/pom.xml Mon Oct 5 11:41:08 2020
@@ -32,9 +32,9 @@
<name>Torque Generator Maven 2 Plugin</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-runtime/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/pom.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/pom.xml (original)
+++ db/torque/trunk/torque-runtime/pom.xml Mon Oct 5 11:41:08 2020
@@ -32,10 +32,10 @@
<name>Torque Runtime</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk
</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk</url>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-site/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/pom.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/torque-site/pom.xml (original)
+++ db/torque/trunk/torque-site/pom.xml Mon Oct 5 11:41:08 2020
@@ -38,9 +38,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<distributionManagement>
Modified: db/torque/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/developer-info/developer-guide.xml Mon Oct 5 11:41:08 2020
@@ -36,7 +36,7 @@
The Torque build process uses
<a href="http://maven.apache.org">Maven 3</a> for building.
<br/>
- You need to check out the <code>torque4/trunk</code>
+ You need to check out the <code>trunk</code>
part of the <code>db/torque</code> SVN repository.
Please read the <a href="subversion.html">Torque Subversion</a> page
for more information.
Modified: db/torque/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/developer-info/site-edit-deploy.xml Mon Oct 5 11:41:08 2020
@@ -86,45 +86,59 @@
<section name="Deploying the site">
<p>
This is a step-by-step guide to deploy the whole site.
- The guide assumes that putty on windows is used as ssh tool.
- First, an entry for the site must be created in maven's setting.xml,
- e.g.:
- </p>
- <source><![CDATA[
- <server>
- <id>apache.db.torque.site</id>
- <username>tfischer</username>
- <filePermissions>664</filePermissions>
- <directoryPermissions>775</directoryPermissions>
- <configuration>
- <sshExecutable>C:/Programme/PuTTY/plink</sshExecutable>
- <scpExecutable>C:/Programme/PuTTY/pscp</scpExecutable>
- </configuration>
- </server>]]>
- </source>
- <p>
- Then an appropriate private key must be created using puttygen.
- Save the key at a safe place locally, and paste the public key to the
- ~/.ssh/authorized_keys2 file relative to your home directory
- on people.apache.org.
- </p>
+
+ Follow the recommendations in <a href="https://infra.apache.org/publishing-maven-artifacts.html">Apache Infrastructure Information concerning Publishing Maven artifacts</a>.
+ Skip the following section for recent releases, which are no longer ssh deployment.
+ </p>
+ <subsection name="Prepare your SSH secure environment (deprecated)">
+ <p>
+ SSH-Deployment of artifacts is currently not used since Torque 4. The following assumes that putty on windows is used as ssh tool.
+ Find more information
+ <a href="https://maven.apache.org/plugins/maven-deploy-plugin/examples/deploy-ssh-external.html">Deploy SSH</a>.
+ First, an entry for the site must be created in maven's setting.xml,
+ e.g.:
+ </p>
+ <source><![CDATA[
+ <server>
+ <id>apache.db.torque.site</id>
+ <username>tfischer</username>
+ <filePermissions>664</filePermissions>
+ <directoryPermissions>775</directoryPermissions>
+ <configuration>
+ <sshExecutable>C:/Programme/PuTTY/plink</sshExecutable>
+ <scpExecutable>C:/Programme/PuTTY/pscp</scpExecutable>
+ </configuration>
+ </server>]]>
+ </source>
+ <p>
+ Then an appropriate private key must be created using puttygen.
+ Save the key at a safe place locally, and paste the public key to the
+ ~/.ssh/authorized_keys2 file relative to your home directory
+ on people.apache.org.
+ </p>
+ <p>Before deploying (see below) you have to
+ <ul>
+ <li>
+ Start putty's pageant.
+ </li>
+ <li>
+ Load the private key you have generated previously into pageant.
+ </li>
+ </ul>
+ </p>
+ </subsection>
+ <subsection name="Step by step">
<p>
Now you can begin to build and deploy the site:
</p>
<ul>
<li>
- run "mvn clean post-site" in the torque-parent module.
+ run "mvn clean post-site" in the torque parent (root) module.
</li>
<li>
check the site in torque-site/target/site
</li>
<li>
- Start putty's pageant.
- </li>
- <li>
- Load the private key you have generated previously into pageant.
- </li>
- <li>
It might be a good idea to create a tar.gz backup of the current
state of the site in your apache home directory, in case anything goes
wrong.
@@ -149,6 +163,7 @@
the next few days, delete the backup tar.gz.
</li>
</ul>
+ </subsection>
</section>
<section name="Updating the site for a new release">
@@ -159,7 +174,7 @@
</li>
<li>
Check that the correct internal version id is in the configuration
- fixVersionIds of the maven-changes-plugin in the pom of the
+ <i>fixVersionIds</i> of the maven-changes-plugin in the pom of the
torque-site project. The correct number can be determined by opening
the torque project in jira, clicking on "versions" in the left menu,
click on the appropriate version and then on "release notes" on top
Modified: db/torque/trunk/torque-site/src/site/xdoc/developer-info/subversion.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/developer-info/subversion.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/developer-info/subversion.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/developer-info/subversion.xml Mon Oct 5 11:41:08 2020
@@ -23,6 +23,7 @@
<title>Subversion</title>
<author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
<author email="fischer@seitenbau.de">Thomas Fischer</author>
+ <author email="gk@apache.org">Georg Kallidis</author>
</properties>
<body>
@@ -41,19 +42,20 @@
</p>
</section>
- <section name="The Torque 4 / 5 repository">
+ <section name="The Torque repository">
- <subsection name="Torque 5 Repository Structure">
+ <subsection name="Torque Repository Structure">
<p>
- The base directory of torque 5 is db/torque/torque4.
+ Torque 3 releases were in db/torque, Torque 4 and 5 (development history) is in /torque/torque4.
+ The base directory of current develoment again now is in <i>db/torque</i>.
The main branch is located in the trunk subdirectory of that
directory. The layout is:
</p>
<source><![CDATA[
- db/torque/torque4/trunk
- torque-maven-parent <--- contains the maven parent project and files
+ trunk/
+ <root> <--- contains the maven parent project and files
common to all modules.
torque-runtime <--- contains the runtime module
torque-generator <--- contains the generator module
@@ -64,15 +66,34 @@
torque-site <--- contains the sources of the homepage
]]></source>
</subsection>
-
- <subsection name="Torque 4 / 5 Modules">
+
+ <subsection name="Torque Developer Modules (new releases)">
<p>
Torque contains the following modules:
<table>
<tr><th>Module</th><th>Trunk repository location</th></tr>
- <tr><td>Runtime</td> <td><a href="http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime">http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-runtime</a></td></tr>
+ <tr><td>Runtime</td> <td><a href="http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime">http://svn.apache.org/repos/asf/db/torque/trunk/torque-runtime</a></td></tr>
+ <tr><td>Generator</td> <td><a href="http://svn.apache.org/viewvc/db/torque/trunk/torque-generator">http://svn.apache.org/repos/asf/db/torque/trunk/torque-generator</a></td></tr>
+ <tr><td>Templates</td> <td><a href="http://svn.apache.org/viewvc/db/torque/trunk/torque-templates">http://svn.apache.org/repos/asf/db/torque/trunk/torque-templates</a></td></tr>
+ <tr><td>Maven Plugin</td> <td><a href="http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin">http://svn.apache.org/repos/asf/db/torque/trunk/torque-maven-plugin</a></td></tr>
+ <tr><td>Ant Tasks</td> <td><a href="http://svn.apache.org/viewvc/db/torque/trunk/maven-ant-tasks">http://svn.apache.org/repos/asf/db/torque/trunk/maven-ant-tasks</a></td></tr>
+ <tr><td>Site</td> <td><a href="http://svn.apache.org/viewvc/db/torque/trunk/torque-site">http://svn.apache.org/repos/asf/db/torque/trunk/torque-site</a></td></tr>
+ <tr><td>Test Project</td> <td><a href="http://svn.apache.org/viewvc/db/torque/trunk/torque-test">http://svn.apache.org/repos/asf/db/torque/trunk/torque-test</a></td></tr>
+ </table>
+ </p>
+ </subsection>
+
+ <subsection name="Torque 4 and 5 Module Releases">
+ <p>
+ This has been the trunk for Torque 4 and 5 development ans is now historical.
+ The current development trunk is now in <a href="http://svn.apache.org/repos/asf/db/torque/trunk/">http://svn.apache.org/repos/asf/db/torque//trunk/</a>, see above.
+
+ <table>
+ <tr><th>Module</th><th>Trunk repository location</th></tr>
+
+ <tr><td>Runtime</td> <td><a href="http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-runtime">http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-runtime</a></td></tr>
<tr><td>Generator</td> <td><a href="http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator">http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-generator</a></td></tr>
<tr><td>Templates</td> <td><a href="http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates">http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-templates</a></td></tr>
<tr><td>Maven Plugin</td> <td><a href="http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-plugin">http://svn.apache.org/repos/asf/db/torque/torque4/trunk/torque-maven-plugin</a></td></tr>
@@ -87,16 +108,17 @@
<subsection name="Runtime, Generator, Templates, Maven 2 Plugin, Ant Tasks">
<p>
These modules make up the main torque distribution.
- Tags and Branches are the same for all modules and are locate
+ Tags and Branches are the same for all modules and are located
in the directories
+ <code>db/torque/tags</code> , <code>db/torque/branches</code>, and for 4 and 5.0 releases
<code>db/torque/torque4/tags</code> and
<code>db/torque/torque4/branches</code>.
</p>
</subsection>
- <subsection name="Maven Parent">
+ <subsection name="Maven Root (Parent)">
<p>
- The maven parent module is a special module because it contains files
+ The maven root module contains files
that are needed in all main modules of the Torque source tree.
</p>
</subsection>
Modified: db/torque/trunk/torque-site/src/site/xdoc/download.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/download.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/download.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/download.xml Mon Oct 5 11:41:08 2020
@@ -233,11 +233,14 @@ or
<section name="Getting The Development Source From SVN">
<p>
You can check out the latest source from the DB SVN module.<br/>
- Torque 4 and 5 resides in the db/torque/torque4 tree. Current developer trunk version is 5.1-SNAPSHOT.
-
+ Current developer trunk version is 5.1-SNAPSHOT.
+ <source><![CDATA[svn checkout http://svn.apache.org/repos/asf/db/torque/trunk]]></source>.
+
+ Torque 4 and 5.0 versions reside in the db/torque/torque4 tree.
+
<source><![CDATA[svn checkout http://svn.apache.org/repos/asf/db/torque/torque4/trunk]]></source>
- or browse the source code through <a href="http://svn.apache.org/viewvc/db/torque/torque4/trunk">ViewVC</a>.
+ or browse the source code through <a href="http://svn.apache.org/viewvc/db/torque/trunk">ViewVC</a>.
</p>
</section>
Modified: db/torque/trunk/torque-site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/index.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/index.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/index.xml Mon Oct 5 11:41:08 2020
@@ -58,6 +58,7 @@
<p>
Torque 5.0 requires JDK 1.8 or higher. Torque 4.0 requires JDK 1.6 or higher. Also labelled version 5.0 it is still considered highly compatible with version 4.
+ Current development version is 5.1-SNAPSHOT.
</p>
</section>
@@ -65,11 +66,11 @@
<p>
<ul>
<li>
- The most recent beta <i>production</i> release of Torque is
+ The most recent <i>production</i> release of Torque is
<a href="http://db.apache.org/torque">Torque 5.0</a>.
</li>
<li>
- The most recent stable <i>production</i> release of Torque is
+ Stable <i>production</i> release of Torque 4 is
<a href="http://db.apache.org/torque/torque-4.0">Torque 4.0</a>.
</li>
</ul>
Modified: db/torque/trunk/torque-templates/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/pom.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/pom.xml (original)
+++ db/torque/trunk/torque-templates/pom.xml Mon Oct 5 11:41:08 2020
@@ -32,10 +32,10 @@
<name>Torque Templates</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk
</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk</url>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-test/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/pom.xml?rev=1882251&r1=1882250&r2=1882251&view=diff
==============================================================================
--- db/torque/trunk/torque-test/pom.xml (original)
+++ db/torque/trunk/torque-test/pom.xml Mon Oct 5 11:41:08 2020
@@ -64,10 +64,10 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/torque4/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/torque4/trunk
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk
</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk</url>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org