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 se...@apache.org on 2004/09/04 15:32:50 UTC
cvs commit: db-torque/src/maven-plugin plugin.jelly
seade 2004/09/04 06:32:50
Modified: xdocs Tag: TORQUE_3_1_BRANCH release-changes.xml
src/maven-plugin Tag: TORQUE_3_1_BRANCH plugin.jelly
Log:
TRQS220: Torque maven plugin om zip goal doesn't work.
Thanks to Dan Price for the patch.
Revision Changes Path
No revision
No revision
1.3.2.23 +4 -2 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.22
retrieving revision 1.3.2.23
diff -u -r1.3.2.22 -r1.3.2.23
--- release-changes.xml 4 Sep 2004 13:29:19 -0000 1.3.2.22
+++ release-changes.xml 4 Sep 2004 13:32:50 -0000 1.3.2.23
@@ -31,15 +31,17 @@
</subsection>
</section>
-<!--subsection name="Fixed bugs">
+<subsection name="Fixed bugs">
<p>
<ul>
<li>
+ TRQS220: Torque maven plugin om zip goal doesn't work. Thanks to Dan
+ Price for the patch.
</li>
</ul>
</p>
</subsection>
-</section-->
+</section>
<section name="Torque 3.1.1-rc2.">
<p>
No revision
No revision
1.8.2.3 +6 -5 db-torque/src/maven-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.jelly,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- plugin.jelly 25 Aug 2004 01:05:59 -0000 1.8.2.2
+++ plugin.jelly 4 Sep 2004 13:32:50 -0000 1.8.2.3
@@ -555,7 +555,7 @@
<j:set var="torque.internal.omzip.type" value="bin"/>
<j:set var="torque.internal.omzip.pattern" value="base"/>
<j:set var="torque.internal.omzip.files" value="class"/>
- <j:set var="torque.internal.omzip.dir" value="${torque.compile.build.dir}"/>
+ <j:set var="torque.internal.omzip.dir" value="${torque.omzip.dir}"/>
<attainGoal name="torque:om-zip-worker"/>
<j:set var="torque.internal.omzip.pattern" value="extension"/>
<attainGoal name="torque:om-zip-worker"/>
@@ -565,12 +565,13 @@
<goal
name="torque:om-zip-worker">
- <j:if test="torque.internal.omzip.${torque.internal.omzip.type}.${torque.internal.omzip.pattern}">
+ <property name="torque_internal_omzipworker_guard_name" value="torque.internal.omzip.${torque.internal.omzip.type}.${torque.internal.omzip.pattern}"/>
+ <j:if test="${context.getVariable(torque_internal_omzipworker_guard_name) == 'true'}">
<!-- Base files that typically aren't modified. -->
<patternset id="torque.internal.omzip.pattern.base">
- <include name="${torque.internal.omzip.packagePath}/${torque.basePrefix}*.${torque.internal.omzip.files}"/>
- <include name="${torque.internal.omzip.packagePath}/map/*MapBuilder.${torque.internal.omzip.files}"/>
+ <include name="${torque.internal.omzip.packagePath}/**/${torque.basePrefix}*.${torque.internal.omzip.files}"/>
+ <include name="${torque.internal.omzip.packagePath}/map/**/*MapBuilder.${torque.internal.omzip.files}"/>
</patternset>
<!-- Extension files that typically are modified. -->
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org