You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by mo...@apache.org on 2004/06/03 19:54:05 UTC
cvs commit: jakarta-jetspeed/plugin project.xml plugin.jelly
morciuch 2004/06/03 10:54:05
Modified: plugin project.xml plugin.jelly
Log:
Fixed merging of environment specific property files (see http://nagoya.apache.org/jira/browse/JS1-485)
Revision Changes Path
1.8 +1 -1 jakarta-jetspeed/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/plugin/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 27 May 2004 23:13:02 -0000 1.7
+++ project.xml 3 Jun 2004 17:54:04 -0000 1.8
@@ -18,7 +18,7 @@
<pomVersion>3</pomVersion>
<id>maven-jetspeed-plugin</id>
<name>Maven Jetspeed Plug-in</name>
- <currentVersion>1.2</currentVersion>
+ <currentVersion>1.3</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
1.14 +16 -18 jakarta-jetspeed/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/plugin/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 1 Jun 2004 21:42:19 -0000 1.13
+++ plugin.jelly 3 Jun 2004 17:54:04 -0000 1.14
@@ -33,7 +33,7 @@
-->
<goal name="jetspeed:war" description="Create custom .war file based on jetspeed binary distribution">
<j:set var="maven.war.src" value="${war.stage.dir}/webapp"/>
- <j:if test="${maven.jetspeed.debug == 'true'}">
+ <j:if test="${maven.jetspeed.debug}">
<echo>[DEBUG] maven.src.dir = ${maven.src.dir}</echo>
<echo>[DEBUG] maven.war.src = ${maven.war.src}</echo>
<echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
@@ -55,7 +55,7 @@
<u:tokenize var="parts" delim=":">${dep.getId()}</u:tokenize>
<j:set var="depid" value="${parts[0]}"/>
<j:set var="dist.dependency.zip" value="${maven.repo.local}/${depid}/distributions/${dep.getArtifact()}"/>
- <j:if test="${maven.jetspeed.debug == 'true'}">
+ <j:if test="${maven.jetspeed.debug}">
<echo>[DEBUG] dist.dependency.zip = ${dist.dependency.zip}</echo>
<echo>[DEBUG] dist.name = ${dist.name}</echo>
<echo>[DEBUG] internal.war.path= ${internal.war.path}</echo>
@@ -139,25 +139,23 @@
<j:set var="props.dir" value="${maven.war.src}/WEB-INF/conf"/>
<u:tokenize var="merge.prop.files" delim=", ">${maven.merge.properties}</u:tokenize>
<j:forEach items="${merge.prop.files}" var="prop.file">
- <j:if test="${maven.jetspeed.debug == 'true'}">
- <echo>[DEBUG] Merging ${prop.file}</echo>
- </j:if>
- <j:if test="${maven.env.name != null}">
- <j:if test="${maven.jetspeed.debug == 'true'}">
- <echo>[DEBUG] Merging ${prop.file} for ${maven.env.name}</echo>
- </j:if>
- <props_override mergeBaseProperties="${props.dir}/${prop.file}.properties" mergeProperties="${props.dir}/${prop.file}-${maven.env.name}.properties.merge" includesDir="${props.dir}" failonerror="false"/>
- </j:if>
- <props_override mergeBaseProperties="${props.dir}/${prop.file}.properties" mergeProperties="${props.dir}/${prop.file}.properties.merge" includesDir="${props.dir}" failonerror="false"/>
+ <u:available file="${props.dir}/${prop.file}-${maven.env.name}.properties.merge">
+ <echo>Merging ${prop.file} for ${maven.env.name}...</echo>
+ <props_override mergeBaseProperties="${props.dir}/${prop.file}.properties" mergeProperties="${props.dir}/${prop.file}-${maven.env.name}.properties.merge" includesDir="${props.dir}" failonerror="false"/>
+ </u:available>
+ <u:available file="${props.dir}/${prop.file}.properties.merge">
+ <echo>Merging ${prop.file}...</echo>
+ <props_override mergeBaseProperties="${props.dir}/${prop.file}.properties" mergeProperties="${props.dir}/${prop.file}.properties.merge" includesDir="${props.dir}" failonerror="false"/>
+ </u:available>
</j:forEach>
<!-- environment specific local registries -->
<j:if test="${maven.env.name == null}">
<u:tokenize var="local.xreg.files" delim=", ">${maven.copy.env.xreg}</u:tokenize>
<j:forEach items="${local.xreg.files}" var="xreg.file">
- <j:if test="${maven.jetspeed.debug == 'true'}">
- <echo>[DEBUG] Copying local-${xreg.file} for ${maven.env.name}</echo>
- </j:if>
- <copy file="${props.dir}/local-${xreg.file}-${maven.env.name}.xreg.copy" toFile="${props.dir}/local-${xreg.file}.xreg" failonerror="false"/>
+ <u:available file="${props.dir}/local-${xreg.file}-${maven.env.name}.xreg.copy">
+ <echo>Copying ${xreg.file} for ${maven.env.name}...</echo>
+ <copy file="${props.dir}/local-${xreg.file}-${maven.env.name}.xreg.copy" toFile="${props.dir}/local-${xreg.file}.xreg" failonerror="false"/>
+ </u:available>
</j:forEach>
</j:if>
<delete>
@@ -170,7 +168,7 @@
<!-- ================================================================== -->
<goal name="jetspeed:hotdeploy" prereqs="java:compile" description="Hot deploys webapp classes on a local server">
<attainGoal name="jetspeed:hotdeploy-config"/>
- <j:if test="${maven.jetspeed.debug == 'true'}">
+ <j:if test="${maven.jetspeed.debug}">
<echo>[DEBUG] maven.src.dir = ${maven.src.dir}</echo>
<echo>[DEBUG] maven.war.src = ${maven.war.src}</echo>
<echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
@@ -256,7 +254,7 @@
<!-- D E P L O Y W E B A P P -->
<!-- ================================================================== -->
<goal name="jetspeed:deploy" prereqs="jetspeed:war" description="Simple deploy of entire webapp to app server">
- <j:if test="${maven.jetspeed.debug == 'true'}">
+ <j:if test="${maven.jetspeed.debug}">
<echo>[DEBUG] maven.src.dir = ${maven.src.dir}</echo>
<echo>[DEBUG] maven.war.src = ${maven.war.src}</echo>
<echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org