jford 2004/06/26 19:25:38
Modified: . maven.xml
Log:
Now merge fusion properties during build
Revision Changes Path
1.24 +32 -2 jakarta-jetspeed/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/maven.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- maven.xml 26 Jun 2004 19:39:05 -0000 1.23
+++ maven.xml 27 Jun 2004 02:25:38 -0000 1.24
@@ -16,7 +16,8 @@
<project default="jar:jar"
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
- xmlns:m="maven"
+ xmlns:u="jelly:util"
+ xmlns:m="maven"
xmlns:castor="castor">
<goal name="allClean"
@@ -71,7 +72,34 @@
</j:if>
</j:if>
</j:forEach>
- </j:if>
+
+ <!-- define custom task for oeverriding properties -->
+ <taskdef name="props_override"
classname="org.apache.jetspeed.util.ant.OverwritePropertiesTask">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ <pathelement path="${maven.build.dest}" />
+ </classpath>
+ </taskdef>
+
+ <j:set var="fusion.properties.merge.dir"
value="fusion/src/webapp/WEB-INF/conf"/>
+
+ <!-- set proper environment property files -->
+ <echo>Targeting ${maven.env.name} environment ...</echo>
+ <j:set var="props.dir" value="${maven.war.webapp.dir}/WEB-INF/conf"/>
+ <echo>Props dir: ${props.dir}</echo>
+
+ <u:tokenize var="merge.prop.files" delim=",
">${maven.merge.properties}</u:tokenize>
+ <j:forEach items="${merge.prop.files}" var="prop.file">
+ <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="${fusion.properties.merge.dir}/${prop.file}.properties.merge">
+ <echo>Merging ${prop.file}...</echo>
+ <props_override
mergeBaseProperties="${props.dir}/${prop.file}.properties"
mergeProperties="${fusion.properties.merge.dir}/${prop.file}.properties.merge"
includesDir="${props.dir}" failonerror="false"/>
+ </u:available>
+ </j:forEach>
+ </j:if>
</postGoal>
<!-- ================================================================== -->
@@ -316,12 +344,14 @@
</copy>
-->
+ <!--
<j:set var="fusion.properties" value="fusion-setup.properties.empty"/>
<j:if test="${org.apache.jetspeed.fusion}">
<j:set var="fusion.properties"
value="fusion-setup.properties.full"/>
</j:if>
<copy
tofile="${maven.war.webapp.dir}/WEB-INF/conf/fusion-setup.properties"
file="fusion/src/webapp/WEB-INF/conf/${fusion.properties}" />
+ -->
</preGoal>
<goal name="deploy" description="Deploys jetspeed.war on a local server">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
