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 2004/08/04 23:42:49 UTC
cvs commit: jakarta-turbine-2/extensions/maven-plugin/src/plugin plugin.jelly
henning 2004/08/04 14:42:49
Modified: extensions/maven-plugin/src/plugin Tag: TURBINE_2_3_BRANCH
plugin.jelly
Log:
According to the maven documentation (
http://maven.apache.org/reference/project-descriptor.html#name), the
pom.name is only used for generating text and docs. For everything
else, pom.id should be used.
Revision Changes Path
No revision
No revision
1.1.2.29 +13 -13 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.1.2.28
retrieving revision 1.1.2.29
diff -u -r1.1.2.28 -r1.1.2.29
--- plugin.jelly 4 Jul 2004 22:01:11 -0000 1.1.2.28
+++ plugin.jelly 4 Aug 2004 21:42:49 -0000 1.1.2.29
@@ -300,10 +300,10 @@
description="Generate a Turbine based Web application (war)"
prereqs="turbine:check-runtime-environment,java:compile, war:webapp">
- <j:set var="webapp.build" value="target/${pom.name}"/>
- <j:set var="webapp.build.lib" value="target/${pom.name}/WEB-INF/lib"/>
- <j:set var="webapp.build.classes" value="target/${pom.name}/WEB-INF/classes"/>
- <j:set var="webapp.build.webinf" value="target/${pom.name}/WEB-INF"/>
+ <j:set var="webapp.build" value="target/${pom.id}"/>
+ <j:set var="webapp.build.lib" value="target/${pom.id}/WEB-INF/lib"/>
+ <j:set var="webapp.build.classes" value="target/${pom.id}/WEB-INF/classes"/>
+ <j:set var="webapp.build.webinf" value="target/${pom.id}/WEB-INF"/>
<delete file="${maven.build.dir}/${pom.artifactId}.war" />
@@ -392,7 +392,7 @@
<delete file="${maven.build.dir}/${pom.artifactId}.war" />
<j:set var="turbine.target.dir" scope="parent"
- value="${maven.appserver.home}/webapps/${pom.name}" />
+ value="${maven.appserver.home}/webapps/${pom.id}" />
<echo>Installing to Appserver Directory: ${turbine.target.dir}, Inplace: ${turbine.plugin.mode}</echo>
@@ -426,7 +426,7 @@
<j:when test="${context.getVariable('turbine.plugin.deploy.config.skip') == null || !context.getVariable('turbine.plugin.deploy.config.skip').equalsIgnoreCase('true')}">
<copy todir="${turbine.target.dir}/WEB-INF/conf" flatten="true" includeEmptyDirs="no">
<fileset dir="${turbine.plugin.src.conf}">
- <exclude name="${pom.name}-web.xml"/>
+ <exclude name="${pom.id}-web.xml"/>
</fileset>
</copy>
</j:when>
@@ -672,16 +672,16 @@
<!-- -->
<!-- ======================================================================== -->
<goal name="turbine:war-webapp">
- <j:set var="webapp.build" value="target/${pom.name}"/>
- <j:set var="webapp.build.lib" value="target/${pom.name}/WEB-INF/lib"/>
- <j:set var="webapp.build.classes" value="target/${pom.name}/WEB-INF/classes"/>
- <j:set var="webapp.build.webinf" value="target/${pom.name}/WEB-INF"/>
+ <j:set var="webapp.build" value="target/${pom.id}"/>
+ <j:set var="webapp.build.lib" value="target/${pom.id}/WEB-INF/lib"/>
+ <j:set var="webapp.build.classes" value="target/${pom.id}/WEB-INF/classes"/>
+ <j:set var="webapp.build.webinf" value="target/${pom.id}/WEB-INF"/>
<j:choose>
<j:when test="${context.getVariable('turbine.plugin.deploy.config.skip') == null || !context.getVariable('turbine.plugin.deploy.config.skip').equalsIgnoreCase('true')}">
<copy todir="${webapp.build.webinf}/conf" flatten="true" includeEmptyDirs="no">
<fileset dir="${turbine.plugin.src.conf}">
- <exclude name="**/${pom.name}-web.xml"/>
+ <exclude name="**/${pom.id}-web.xml"/>
</fileset>
</copy>
</j:when>
@@ -1110,7 +1110,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.name}-id-table-schema.xml"/>
+ tofile="${torque.schema.dir}/${pom.id}-id-table-schema.xml"/>
<!-- If we have different data source for Application and Security, we must
also set up two ID Table XML files
@@ -1300,7 +1300,7 @@
<attainGoal name="torque:sql"/>
<attainGoal name="torque:id-table-init-sql"/>
- <u:available file="${turbine.plugin.src.schema}/${pom.name}-data.xml">
+ <u:available file="${turbine.plugin.src.schema}/${pom.id}-data.xml">
<attainGoal name="torque:datasql"/>
</u:available>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org