seade 2004/09/04 06:29:19
Modified: src/maven-plugin Tag: TORQUE_3_1_BRANCH plugin.properties
src/generator/xdocs Tag: TORQUE_3_1_BRANCH
properties-reference.xml
xdocs Tag: TORQUE_3_1_BRANCH release-changes.xml
Log:
Changed the default property value for torque.output.dir from maven.build.dest to
maven.build.dir.
The properties reference was updated accordingly and a few missing properties were
also documented.
Revision Changes Path
No revision
No revision
1.3.2.6 +2 -2 db-torque/src/maven-plugin/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.properties,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- plugin.properties 25 Aug 2004 01:05:59 -0000 1.3.2.5
+++ plugin.properties 4 Sep 2004 13:29:19 -0000 1.3.2.6
@@ -47,7 +47,7 @@
#
# -------------------------------------------------------------------
-outputDirectory = ${maven.build.dest}
+outputDirectory = ${maven.build.dir}
schemaDirectory = ${maven.src.dir}/schema
templatePath = ${maven.src.dir}/torqueTemplates
No revision
No revision
1.4.2.3 +49 -12 db-torque/src/generator/xdocs/properties-reference.xml
Index: properties-reference.xml
===================================================================
RCS file: /home/cvs/db-torque/src/generator/xdocs/properties-reference.xml,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- properties-reference.xml 19 Aug 2004 00:41:47 -0000 1.4.2.2
+++ properties-reference.xml 4 Sep 2004 13:29:19 -0000 1.4.2.3
@@ -77,7 +77,7 @@
</tr>
<tr>
<td><code> torque.output.dir </code></td>
- <td><code> ${torque.home}/src </code></td>
+ <td><code> ${torque.home}/target </code></td>
<td>
The base directory for the output files.
</td>
@@ -98,7 +98,7 @@
</tr>
<tr>
<td><code> torque.java.dir </code></td>
- <td><code> ${torque.output.dir}/java </code></td>
+ <td><code> ${maven.src.dir}/java </code></td>
<td>
The directory to place all of the generated Java code in.
</td>
@@ -119,20 +119,18 @@
</tr>
<tr>
<td><code> torque.ojb.dir </code></td>
- <td><code> ${torque.output.dir}/ojb </code></td>
+ <td><code> ${maven.src.dir}/ojb </code></td>
<td>
The directory to place all of the generated OJB code in.
</td>
</tr>
-<!--
- <tr>
- <td><code> torque.omzip.dir </code></td>
- <td><code> ${torque.output.dir} </code></td>
- <td>
- The directory a jar of the Java om files.
- </td>
- </tr>
--->
+<tr>
+ <td><code> torque.omzip.dir </code></td>
+ <td><code> ${torque.output.dir} </code></td>
+ <td>
+ The directory to place the jar files output by the om-zip goal.
+ </td>
+</tr>
<tr>
@@ -382,6 +380,45 @@
</td>
</tr>
+<tr>
+ <td><code> torque.omzip.src.base </code></td>
+ <td><code> false </code></td>
+ <td>
+ Whether the om generated base src (BaseX.java) files should be included in
+ the src jar produced by om-zip.
+ </td>
+</tr>
+<tr>
+ <td><code> torque.omzip.src.extension </code></td>
+ <td><code> false </code></td>
+ <td>
+ Whether the om generated extension src (X.java) files should be included in
+ the src jar produced by om-zip.
+ </td>
+</tr>
+<tr>
+ <td><code> torque.omzip.bin.base </code></td>
+ <td><code> false </code></td>
+ <td>
+ Whether the om generated base class (BaseX.class) files should be included
+ in the bin jar produced by om-zip.
+ </td>
+</tr>
+<tr>
+ <td><code> torque.omzip.bin.extension </code></td>
+ <td><code> false </code></td>
+ <td>
+ Whether the om generated extension class (X.class) files should be included
+ in the bin jar produced by om-zip.
+ </td>
+</tr>
+<tr>
+ <td><code> torque.omzip.deleteFiles </code></td>
+ <td><code> false </code></td>
+ <td>
+ Whether the generated om files should be deleted following the om-zip.
+ </td>
+</tr>
<tr>
<td colspan="3"><strong> Compile Settings </strong></td>
No revision
No revision
1.3.2.22 +31 -0 db-torque/xdocs/release-changes.xml
Index: release-changes.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v
retrieving revision 1.3.2.21
retrieving revision 1.3.2.22
diff -u -r1.3.2.21 -r1.3.2.22
--- release-changes.xml 27 Aug 2004 12:07:25 -0000 1.3.2.21
+++ release-changes.xml 4 Sep 2004 13:29:19 -0000 1.3.2.22
@@ -10,6 +10,37 @@
<body>
+<section name="Torque 3.1.1-rc3.">
+<p>
+ Changes between Torque 3.1.1-rc2 and 3.1.1-rc3.<br/>
+</p>
+
+<subsection name="Other changes">
+<p>
+ <ul>
+ <li>
+ Changed the default property value for <code>torque.output.dir</code>
+ from <code>maven.build.dest</code> to <code>maven.build.dir</code>.
+ This means many of the generated files will now appear in the
+ <code>target</code> rather than the <code>target/classes</code>
+ directory. The properties reference was updated accordingly (a few
+ missing properties were also documented).
+ </li>
+ </ul>
+</p>
+</subsection>
+</section>
+
+<!--subsection name="Fixed bugs">
+<p>
+ <ul>
+ <li>
+ </li>
+ </ul>
+</p>
+</subsection>
+</section-->
+
<section name="Torque 3.1.1-rc2.">
<p>
Changes between Torque 3.1.1-rc1 and 3.1.1-rc2.<br/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
