Return-Path: X-Original-To: apmail-db-torque-dev-archive@www.apache.org Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2DE849713 for ; Mon, 4 Jun 2012 12:42:06 +0000 (UTC) Received: (qmail 8069 invoked by uid 500); 4 Jun 2012 12:42:05 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 7997 invoked by uid 500); 4 Jun 2012 12:42:05 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 7988 invoked by uid 500); 4 Jun 2012 12:42:04 -0000 Received: (qmail 7972 invoked by uid 99); 4 Jun 2012 12:42:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jun 2012 12:42:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jun 2012 12:42:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 317882388980; Mon, 4 Jun 2012 12:41:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1345941 - in /db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules: ant-tasks/index.xml ant-tasks/reference/generator-task.xml ant-tasks/reference/index.xml maven2-plugin/reference/index.xml Date: Mon, 04 Jun 2012 12:41:42 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120604124143.317882388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Mon Jun 4 12:41:42 2012 New Revision: 1345941 URL: http://svn.apache.org/viewvc?rev=1345941&view=rev Log: Documentation fixes (mostly wording) Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/index.xml db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/reference/generator-task.xml db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/reference/index.xml db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/maven2-plugin/reference/index.xml Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/index.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/index.xml?rev=1345941&r1=1345940&r2=1345941&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/index.xml (original) +++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/index.xml Mon Jun 4 12:41:42 2012 @@ -27,8 +27,8 @@

- The Torque ant tasks project can currently be used to - run the Torque generator from within ant. For more information, see the + The Torque Ant tasks project can currently be used to + run the Torque generator from within Ant. For more information, see the tasks reference.

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/reference/generator-task.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/reference/generator-task.xml?rev=1345941&r1=1345940&r2=1345941&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/reference/generator-task.xml (original) +++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/reference/generator-task.xml Mon Jun 4 12:41:42 2012 @@ -97,18 +97,19 @@

- Target attributes: They define wher the target files are created. + Target attributes: They define where the target files are created.

  • - newFileTargetDir: The target directory for files + defaultOutputDir: The target directory for files which are generated each time anew. Default is "./generated-sources".
  • - modifiedFileTargetDir: The target directory for files - which are not generated each time anew. - Default is "./src/main/generated-java". + outputDirMap: + The mapping from outputDirKey to output directories. + The outputDirKeys are defined in the templates you use. + Default is modifiable -> "./src/main/generated-java"

@@ -120,11 +121,6 @@ Must be one of trace, debug, info, warn or error. If not set, the log level defined in the generation unit is used. -

  • - modifiedFileTargetDir: The target directory for files - which are not generated each time anew. - Default is "./src/main/generated-java". -
  • Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/reference/index.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/reference/index.xml?rev=1345941&r1=1345940&r2=1345941&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/reference/index.xml (original) +++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/ant-tasks/reference/index.xml Mon Jun 4 12:41:42 2012 @@ -26,7 +26,7 @@

    - The Torque ant tasks provide the ant integration of the + The Torque Ant tasks provide the Ant integration of the Torque generator.

    @@ -57,7 +57,7 @@ ]]>

    - The documentation of the template should give you to the values for + The documentation of the templates should give you to the values for ${templates-config-package} and the necessary/possible options to set. Set ${source-dir} to the directory where the source files for the generation are located. Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/maven2-plugin/reference/index.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/maven2-plugin/reference/index.xml?rev=1345941&r1=1345940&r2=1345941&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/maven2-plugin/reference/index.xml (original) +++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/maven2-plugin/reference/index.xml Mon Jun 4 12:41:42 2012 @@ -20,18 +20,18 @@ - Torque Maven 2 Plugin + Torque Maven Plugin

    - The Torque maven 2 plugin provides the maven 2 integration of the + The Torque Maven plugin provides the Maven 2/3 integration of the Torque generator.

    The only goal this plugin offers currently is the "generate" goal, which - starts the torque generator. + starts the Torque generator. A basic configuration for using pre-defined templates would be