You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2005/04/26 12:21:21 UTC
cvs commit: jakarta-turbine-2/extensions/maven-plugin/xdocs changes.xml
henning 2005/04/26 03:21:21
Modified: extensions/maven-plugin/src/plugin plugin.jelly
extensions/maven-plugin/xdocs changes.xml
Log:
For data sql generation, use ${turbine.app.name}-data.xml
everywhere. This fixes the bug with SQL generation which failed when
${pom.artifactId} and ${turbine.app.name} were different.
Revision Changes Path
1.8 +5 -5 jakarta-turbine-2/extensions/maven-plugin/src/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 26 Apr 2005 09:47:41 -0000 1.7
+++ plugin.jelly 26 Apr 2005 10:21:21 -0000 1.8
@@ -687,7 +687,7 @@
<!-- torque:datadtd -->
<!-- -->
<!-- ======================================================================== -->
- <goal name="turbine:torque-datadtd" prereqs="turbine:copy-om"/>
+ <goal name="turbine:torque-datadtd" prereqs="turbine:torque-copy-om"/>
<!-- ======================================================================== -->
<!-- torque:datadtd -->
<!-- ======================================================================== -->
@@ -1082,7 +1082,7 @@
<!-- ================================================================== -->
<!-- -->
- <!-- turbine:copy-om -->
+ <!-- turbine:torque-copy-om -->
<!-- -->
<!-- Prepare the XML files for building the OM peer classes -->
<!-- -->
@@ -1144,7 +1144,7 @@
<filter token="DATABASE_PACKAGE" value="${turbine.app.om.package}"/>
<copy filtering="yes" overwrite="yes"
file="${turbine.plugin.src.schema}/id-table-schema.xml"
- tofile="${torque.schema.dir}/${pom.artifactId}-id-table-schema.xml"/>
+ tofile="${torque.schema.dir}/${turbine.app.name}-id-table-schema.xml"/>
<!-- If we have different data source for Application and Security, we must
also set up two ID Table XML files
@@ -1181,7 +1181,7 @@
</j:if>
</goal>
<!-- ================================================================== -->
- <!-- turbine:copy-om -->
+ <!-- turbine:copy-data-dtd -->
<!-- ================================================================== -->
<!-- ================================================================== -->
@@ -1337,7 +1337,7 @@
<attainGoal name="torque:id-table-init-sql"/>
</j:if>
- <u:available file="${turbine.plugin.src.schema}/${pom.artifactId}-data.xml">
+ <u:available file="${turbine.plugin.src.schema}/${turbine.app.name}-data.xml">
<attainGoal name="torque:datasql"/>
</u:available>
1.7 +4 -0 jakarta-turbine-2/extensions/maven-plugin/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changes.xml 26 Apr 2005 09:47:42 -0000 1.6
+++ changes.xml 26 Apr 2005 10:21:21 -0000 1.7
@@ -29,6 +29,10 @@
<action dev="henning" type="add">
Add a new flag to turn off id-table sql generation.
</action>
+ <action dev="henning" type="update">
+ Bugfix: when turbine.app.name and pom.artifactId were different,
+ the generation of data SQL failed.
+ </action>
</release>
<release version="1.2" date="2004-10-31">
<action dev="henning" type="add">
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org