cvs commit: db-torque/src/maven-plugin plugin.jelly
seade 2004/09/11 05:41:44
Modified:xdocschanges.xml
src/maven-plugin plugin.jelly
Log:
TRQS226: Remove unneeded code in Torque maven plugin. Thanks to Thierry Lach for
the patch.
Revision ChangesPath
1.139 +4 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- changes.xml 4 Sep 2004 13:33:09 - 1.138
+++ changes.xml 11 Sep 2004 12:41:44 - 1.139
@@ -10,6 +10,10 @@
release version=3.2-alpha date=in CVS
action dev='seade' type='fix'
+TRQS226: Remove unneeded code in Torque maven plugin. Thanks to
+Thierry Lach for the patch.
+ /action
+ action dev='seade' type='fix'
TRQS220: Torque maven plugin om zip goal doesn't work. Thanks to Dan
Price for the patch.
/action
1.13 +1 -8 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 4 Sep 2004 13:33:09 - 1.12
+++ plugin.jelly 11 Sep 2004 12:41:44 - 1.13
@@ -62,13 +62,6 @@
path refid=maven.dependency.classpath/
/path
-!-- The default.properties file will map old properties to the new ones along
- with setting the correct defaults.
-
- Note: I have no idea why this file is not already processed by the plugin..
- --
-property
file=${maven.plugin.dir}/maven-torque-plugin-3.2-dev/plugin.properties/
-
!-- Define all of the tasks --
taskdef
name=torque-data-model
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/maven-plugin plugin.jelly
seade 2004/09/04 06:32:50
Modified:xdocsTag: 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 ChangesPath
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 - 1.3.2.22
+++ release-changes.xml 4 Sep 2004 13:32:50 - 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 - 1.8.2.2
+++ plugin.jelly 4 Sep 2004 13:32:50 - 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: db-torque/src/maven-plugin plugin.jelly project.xml
henning 2004/05/17 05:31:21
Modified:.Tag: TORQUE_3_1_HENNING project.xml
src/generator Tag: TORQUE_3_1_HENNING project.xml
src/maven-plugin Tag: TORQUE_3_1_HENNING plugin.jelly
project.xml
Log:
Rename all maven visible stuff from torque to torquex, so that the
regular and the extended plugin can live side-by-side. Rename the
jar names from torque and torque-gen to torquex and torquex-gen.
Revision ChangesPath
No revision
No revision
1.103.2.6.2.1 +2 -2 db-torque/project.xml
Index: project.xml
===
RCS file: /home/cvs/db-torque/project.xml,v
retrieving revision 1.103.2.6
retrieving revision 1.103.2.6.2.1
diff -u -r1.103.2.6 -r1.103.2.6.2.1
--- project.xml 1 Apr 2004 02:06:14 - 1.103.2.6
+++ project.xml 17 May 2004 12:31:20 - 1.103.2.6.2.1
@@ -2,9 +2,9 @@
project
pomVersion3/pomVersion
- idtorque/id
+ idtorquex/id
groupIdtorque/groupId
- nameTorque/name
+ nameTorque (Experimental Version)/name
currentVersion3.1.1-dev/currentVersion
organization
nameApache Software Foundation/name
No revision
No revision
1.13.2.1.2.1 +1 -1 db-torque/src/generator/project.xml
Index: project.xml
===
RCS file: /home/cvs/db-torque/src/generator/project.xml,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.1.2.1
diff -u -r1.13.2.1 -r1.13.2.1.2.1
--- project.xml 25 Oct 2003 15:22:30 - 1.13.2.1
+++ project.xml 17 May 2004 12:31:21 - 1.13.2.1.2.1
@@ -3,7 +3,7 @@
project
extend../../project.xml/extend
pomVersion3/pomVersion
- idtorque-gen/id
+ idtorquex-gen/id
nameTorque generator/name
!-- Gump integration --
No revision
No revision
1.8.2.1.2.1 +55 -55db-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.1
retrieving revision 1.8.2.1.2.1
diff -u -r1.8.2.1 -r1.8.2.1.2.1
--- plugin.jelly 23 Oct 2003 10:17:24 - 1.8.2.1
+++ plugin.jelly 17 May 2004 12:31:21 - 1.8.2.1.2.1
@@ -11,16 +11,16 @@
!-- when you change your XML schema. --
!-- --
goal
-name=torque
+name=torquex
description=Generates SQL files and Peer-based OM objects
-attainGoal name=torque:sql/
-attainGoal name=torque:om/
+attainGoal name=torquex:sql/
+attainGoal name=torquex:om/
/goal
goal
-name=torque:init
+name=torquex:init
description=Build classpath and define tasks
!-- Setup the classpath for torque plugins --
@@ -32,7 +32,7 @@
pathelement path=${plugin.getDependencyPath('village')}/
pathelement path=${plugin.getDependencyPath('xercesImpl')}/
pathelement path=${plugin.getDependencyPath('xml-apis')}/
- pathelement path=${plugin.getDependencyPath('torque:torque-gen')}/
+ pathelement path=${plugin.getDependencyPath('torque:torquex-gen')}/
pathelement path=${pom.getDependencyClasspath()}/
path refid=maven.dependency.classpath/
/path
@@ -42,7 +42,7 @@
Note: I have no idea why this file is not already processed by the plugin..
--
-property
file=${maven.plugin.dir}/maven-torque-plugin-3.1.1-dev/plugin.properties/
+property
file=${maven.plugin.dir}/maven-torquex-plugin-3.1.1-dev/plugin.properties/
!-- Define all of the tasks --
taskdef
@@ -93,23 +93,23 @@
!-- --
goal
-name=torque:sql
+name=torquex:sql
description=generates the SQL for your project
-prereqs=torque:init, torque:sql-check
+prereqs=torquex:init, torquex:sql-check
j:choose
j:when test=${torque.internal.sql.uptodate}
echoSchema files have not changed since last generation./echo
/j:when
j:otherwise
-attainGoal name=torque:sql-generate/
+attainGoal name=torquex:sql-generate/
/j:otherwise
/j:choose
/goal
goal
-name=torque:sql-check
+name=torquex:sql-check
description=Determine if the SQL files need to be generated
j:choose
@@ -128,8 +128,8 @@
/goal
goal
-name=torque:sql-generate
-prereqs=torque:init
+name=torquex:sql-generate
+prereqs=torquex:init
