seade 2004/09/04 06:28:58
Modified: src/maven-plugin plugin.properties
xdocs changes.xml
src/generator/xdocs properties-reference.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
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.properties 25 Aug 2004 01:02:22 -0000 1.6
+++ plugin.properties 4 Sep 2004 13:28:58 -0000 1.7
@@ -43,7 +43,7 @@
#
# -------------------------------------------------------------------
-torque.output.dir = ${maven.build.dest}
+torque.output.dir = ${maven.build.dir}
torque.schema.dir = ${maven.src.dir}/schema
torque.templatePath = ${maven.src.dir}/torqueTemplates
1.137 +8 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- changes.xml 27 Aug 2004 12:08:23 -0000 1.136
+++ changes.xml 4 Sep 2004 13:28:58 -0000 1.137
@@ -9,6 +9,14 @@
<body>
<release version="3.2-alpha" date="in CVS">
+ <action dev='seade' type='fix'>
+ 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).
+ </action>
<action dev='seade' type='update'>
Addressed a number of issues highlighted by
<a href="http://findbugs.sourceforge.net/";>FindBugs</a> in generated
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- properties-reference.xml 19 Aug 2004 00:41:32 -0000 1.6
+++ properties-reference.xml 4 Sep 2004 13:28:58 -0000 1.7
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
