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 11:47:42 UTC
cvs commit: jakarta-turbine-2/extensions/maven-plugin/xdocs changes.xml properties.xml schema.xml
henning 2005/04/26 02:47:42
Modified: extensions/maven-plugin project.xml
extensions/maven-plugin/src/plugin plugin.jelly
plugin.properties
extensions/maven-plugin/src/plugin-resources/flavor/common/maven
project.properties
extensions/maven-plugin/src/plugin-resources/setup
setup.properties
extensions/maven-plugin/xdocs changes.xml properties.xml
schema.xml
Log:
Make generation of ID_TABLE sql optional. Useful if you e.g. use a sequence
to create your Ids and you don't want to drag the ID_TABLE SQL around.
Fixes also a few typos in the plugin.jelly file.
Revision Changes Path
1.13 +7 -2 jakarta-turbine-2/extensions/maven-plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 18 Jan 2005 22:19:47 -0000 1.12
+++ project.xml 26 Apr 2005 09:47:41 -0000 1.13
@@ -31,7 +31,7 @@
<id>maven-turbine-plugin</id>
<name>Maven Environment for Turbine Applications Plugin</name>
<groupId>turbine</groupId>
- <currentVersion>1.2</currentVersion>
+ <currentVersion>1.3-dev</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
@@ -79,6 +79,11 @@
<name>1.2-rc1</name>
<tag>META_1_2_RC1</tag>
</version>
+ <version>
+ <id>1</id>
+ <name>1.2</name>
+ <tag>META_1_2</tag>
+ </version>
</versions>
<developers>
1.7 +13 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 31 Oct 2004 10:17:00 -0000 1.6
+++ plugin.jelly 26 Apr 2005 09:47:41 -0000 1.7
@@ -76,6 +76,7 @@
<filter token="TURBINE_PLUGIN_MODE" value="${turbine.plugin.mode}"/>
<filter token="TURBINE_PLUGIN_INPLACE_DIR" value="${turbine.plugin.inplace.dir}"/>
<filter token="TURBINE_APP_SETUP_DEMO" value="${turbine.app.setup.demo}"/>
+ <filter token="TURBINE_APP_TORQUE_USE_IDTABLE" value="${turbine.app.torque.use.idtable}" />
<filter token="TURBINE_PLUGIN_BASE_DIR" value="${turbine.plugin.base.dir}"/>
<filter token="TURBINE_PLUGIN_SRC_IMAGES" value="${turbine.plugin.src.images}"/>
@@ -941,6 +942,9 @@
<j:set var="turbine.plugin.torque.use" value="${context.getVariable('turbine.app.om.layer') != null && context.getVariable('turbine.app.om.layer').equalsIgnoreCase('torque')}" />
<j:set var="turbine.plugin.none.use" value="${context.getVariable('turbine.app.om.layer') != null && context.getVariable('turbine.app.om.layer').equalsIgnoreCase('none')}" />
+ <j:set var="turbine.plugin.om.torque.idtable" value="${context.getVariable('turbine.app.torque.use.idtable') == null || context.getVariable('turbine.app.torque.use.idtable').equalsIgnoreCase('true')}" />
+
+
<j:if test="${context.getVariable('maven.appserver.name') == null || context.getVariable('maven.appserver.name') == ''}">
<meta:requiredPropertyMissing propname="maven.appserver.name" />
</j:if>
@@ -1084,7 +1088,11 @@
<!-- -->
<!-- ================================================================== -->
<goal name="turbine:torque-copy-om"
- prereqs="turbine:torque-copy-security-om, turbine:torque-copy-app-om, turbine:torque-copy-id-table-om, turbine:torque-copy-data-dtd">
+ prereqs="turbine:torque-copy-security-om, turbine:torque-copy-app-om, turbine:torque-copy-data-dtd">
+
+ <j:if test="${turbine.plugin.om.torque.idtable}">
+ <attainGoal name="turbine:torque-copy-id-table-om" />
+ </j:if>
</goal>
<!-- ================================================================== -->
@@ -1324,7 +1332,10 @@
<goal name="turbine:torque-sql">
<attainGoal name="torque:sql"/>
- <attainGoal name="torque:id-table-init-sql"/>
+
+ <j:if test="${turbine.plugin.om.torque.idtable}">
+ <attainGoal name="torque:id-table-init-sql"/>
+ </j:if>
<u:available file="${turbine.plugin.src.schema}/${pom.artifactId}-data.xml">
<attainGoal name="torque:datasql"/>
1.4 +4 -1 jakarta-turbine-2/extensions/maven-plugin/src/plugin/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.properties 31 Oct 2004 16:09:04 -0000 1.3
+++ plugin.properties 26 Apr 2005 09:47:41 -0000 1.4
@@ -59,6 +59,9 @@
# Install the Welcome pages by default
turbine.app.setup.demo = true
+# Create id table SQL by default
+turbine.app.torque.use.idtable = true
+
# use Tomcat Application Server
maven.appserver.name = tomcat
1.6 +4 -1 jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/maven/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/maven/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties 31 Oct 2004 16:11:36 -0000 1.5
+++ project.properties 26 Apr 2005 09:47:42 -0000 1.6
@@ -95,6 +95,9 @@
#
# -------------------------------------------------------------------
+# Shall we create id table SQL
+@NOT_USE_OM_TORQUE@turbine.app.torque.use.idtable = @TURBINE_APP_TORQUE_USE_IDTABLE@
+
@NOT_USE_OM_TORQUE@torque.database = @TORQUE_DATABASE@
@NOT_USE_OM_TORQUE@torque.project = @TURBINE_APP_NAME@
1.5 +4 -1 jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/setup/setup.properties
Index: setup.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/setup/setup.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- setup.properties 31 Oct 2004 16:11:37 -0000 1.4
+++ setup.properties 26 Apr 2005 09:47:42 -0000 1.5
@@ -48,6 +48,9 @@
@NOT_USE_OM_TORQUE@torque.database.buildUrl = @TORQUE_DATABASE_URL@
@NOT_USE_OM_TORQUE@torque.database.createUrl = @TORQUE_DATABASE_CREATE_URL@
+# Shall we create id table SQL
+@NOT_USE_OM_TORQUE@turbine.app.torque.use.idtable = @TURBINE_APP_TORQUE_USE_IDTABLE@
+
######################################################################
#
# You don't need to change anything below this line. These parameters
1.6 +5 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- changes.xml 31 Oct 2004 15:55:04 -0000 1.5
+++ changes.xml 26 Apr 2005 09:47:42 -0000 1.6
@@ -25,6 +25,11 @@
</properties>
<body>
+ <release version="1.3" date="in CVS">
+ <action dev="henning" type="add">
+ Add a new flag to turn off id-table sql generation.
+ </action>
+ </release>
<release version="1.2" date="2004-10-31">
<action dev="henning" type="add">
Add IDE (Eclipse) Howto.
1.5 +11 -0 jakarta-turbine-2/extensions/maven-plugin/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/properties.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- properties.xml 31 Oct 2004 15:55:04 -0000 1.4
+++ properties.xml 26 Apr 2005 09:47:42 -0000 1.5
@@ -101,6 +101,17 @@
</tr>
<tr>
+<a name="turbine_app_torque_use_idtable" />
+<td>turbine.app.torque.use.idtable</td>
+<td>Yes</td>
+<td>true</td>
+<td>If true, the all torque related goals will also build SQL code for the ID table which is used by the Torque ID Broker to generate
+ unique IDs. If you use a different ID generation scheme (e.g. sequences), you can set this property to false and remove all id-table
+ related files from the schema directory.
+</td>
+</tr>
+
+<tr>
<td>turbine.plugin.mode</td>
<td>Yes</td>
<td>normal</td>
1.5 +3 -1 jakarta-turbine-2/extensions/maven-plugin/xdocs/schema.xml
Index: schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/extensions/maven-plugin/xdocs/schema.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- schema.xml 31 Oct 2004 15:55:04 -0000 1.4
+++ schema.xml 26 Apr 2005 09:47:42 -0000 1.5
@@ -84,7 +84,9 @@
The plugin supplies you with a configuration file for generating an <code>ID_TABLE</code>
table which is used by the Torque IdBroker to generate unique table row IDs. If you run
the <a href="goals.html#turbine_sql">turbine:sql</a> goal, SQL for this table is generated. There are no peer and object classes
- for the id table.</p>
+ for the id table. If you don't need these tables because you use a different way to generate unique IDs (e.g. sequences), you
+ can set the property <a href="properties.html#turbine_app_torque_use_idtable">turbine.app.torque.use.idtable</a> to false and remove
+ all id-table related files from the schema source directory.</p>
</subsection>
<subsection name="Turbine Security">
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org