epugh 2004/10/19 09:10:44
Modified: cruisecontrol/xdocs changes.xml
cruisecontrol/src/plugin-resources cruisecontrol.jsl
cruisecontrol plugin.properties
Log:
MPCRUISECONTROL-14 More flexible configuration
Revision Changes Path
1.18 +1 -0 maven-plugins/cruisecontrol/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/xdocs/changes.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- changes.xml 28 Aug 2004 21:22:15 -0000 1.17
+++ changes.xml 19 Oct 2004 16:10:44 -0000 1.18
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6" date="in cvs">
+ <action dev="epugh" type="add" issue="MPCRUISECONTROL-14" due-to="Marcin
Gurbisz">Add more configuration, especially better handling of emails.</action>
<action dev="evenisse" type="add" issue="MPCRUISECONTROL-12"
due-to="Alexandre Vivien">Add new properties to the maven cruisecontrol plugin. Ftp
publisher, Scp publisher.</action>
</release>
<release version="1.5" date="2004-08-14">
1.14 +29 -6
maven-plugins/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
Index: cruisecontrol.jsl
===================================================================
RCS file:
/home/cvs/maven-plugins/cruisecontrol/src/plugin-resources/cruisecontrol.jsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cruisecontrol.jsl 28 Aug 2004 21:22:15 -0000 1.13
+++ cruisecontrol.jsl 19 Oct 2004 16:10:44 -0000 1.14
@@ -67,7 +67,7 @@
<j:when test="${type == 'time'}">
<schedule>
<maven
- mavenscript="${maven.home}/bin/maven"
+ mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven"
time="${maven.cruisecontrol.schedule.time}"
goal="${maven.cruisecontrol.goals}"
projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
@@ -76,7 +76,7 @@
<j:otherwise>
<schedule interval="${maven.cruisecontrol.schedule.interval}">
<maven
- mavenscript="${maven.home}/bin/maven"
+ mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven"
goal="${maven.cruisecontrol.goals}"
projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
</schedule>
@@ -93,6 +93,12 @@
</log>
<publishers>
<currentbuildstatuspublisher
file="${maven.cruisecontrol.logs.dir}/${pom.artifactId}/${maven.cruisecontrol.currentbuildstatus.filename}"/>
+ <j:set var="publishartifacts"
value="${maven.cruisecontrol.artifactspublisher}"/>
+ <j:if test="${publishartifacts == 'true'}">
+ <artifactspublisher
+ dir="${maven.cruisecontrol.artifacts.dir}"
+ dest="${maven.cruisecontrol.artifacts.dest}/${pom.artifactId}"/>
+ </j:if>
<j:set var="ftpstatus"
value="${maven.cruisecontrol.currentbuildstatusftppublisher}"/>
<j:if test="${ftpstatus == 'true'}">
<currentbuildstatusftppublisher
@@ -125,9 +131,11 @@
defaultsuffix="${maven.cruisecontrol.mail.defaultsuffix}"
mailhost="${maven.cruisecontrol.mail.host}"
returnaddress="${pom.build.nagEmailAddress}"
+ buildresultsurl="${maven.cruisecontrol.mail.buildresultsurl}"
+ spamwhilebroken="${maven.cruisecontrol.mail.spamwhilebroken}"
logdir="${maven.cruisecontrol.logs.dir}/${pom.artifactId}"
- css="${maven.cruisecontrol.home}/reporting/jsp/css/cruisecontrol.css"
- xsldir="${maven.cruisecontrol.home}/reporting/jsp/xsl">
+ css="${maven.cruisecontrol.mail.css}"
+ xsldir="${maven.cruisecontrol.mail.xlsdir}">
<j:set var="usemap" value="${maven.cruisecontrol.mail.usemap}"/>
<j:if test="${usemap == 'true'}">
<!-- need to map ids to emails here -->
@@ -138,8 +146,18 @@
</j:forEach>
</j:if>
</j:if>
- <failure address="${pom.build.nagEmailAddress}" />
- <success address="${pom.build.nagEmailAddress}" />
+ <j:set var="mailmaps" value="${maven.cruisecontrol.mail.maps}"/>
+ <j:if test="${!empty(mailmaps)}">
+
+ <u:tokenize var="maps" delim=",">${mailmaps}</u:tokenize>
+ <j:forEach var="map" items="${maps}">
+ <j:set var="mapVarName"
value="maven.cruisecontrol.mail.map.${map}"/>
+ <map alias="${map}" address="${context.getVariable(mapVarName)}"/>
+ </j:forEach>
+ </j:if>
+
+ <failure address="${maven.cruisecontrol.mail.failureaddress}" />
+ <success address="${maven.cruisecontrol.mail.successaddress}" />
</htmlemail>
<j:set var="scppublisher" value="${maven.cruisecontrol.scppublisher}"/>
<j:if test="${scppublisher == 'true'}">
@@ -181,6 +199,11 @@
</j:choose>
</j:if>
</publishers>
+ <plugins>
+ <j:if test="${publishartifacts == 'true'}">
+ <plugin name="artifactspublisher"
classname="net.sourceforge.cruisecontrol.publishers.ArtifactsPublisher"/>
+ </j:if>
+ </plugins>
</project>
<jsl:applyTemplates select="./project" />
</jsl:copy>
1.13 +13 -1 maven-plugins/cruisecontrol/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/plugin.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.properties 28 Aug 2004 21:22:15 -0000 1.12
+++ plugin.properties 19 Oct 2004 16:10:44 -0000 1.13
@@ -15,6 +15,7 @@
# -------------------------------------------------------------------
maven.cruisecontrol.config=${basedir}/cruisecontrol.xml
+maven.cruisecontrol.mavenhome=${maven.home}
maven.cruisecontrol.schedule.type=interval
maven.cruisecontrol.schedule.interval=300
maven.cruisecontrol.schedule.time=1900
@@ -31,7 +32,14 @@
maven.cruisecontrol.mail.subjectprefix=[BUILD]
maven.cruisecontrol.mail.skipusers=false
maven.cruisecontrol.mail.reportsuccess=always
+maven.cruisecontrol.mail.spamwhilebroken=false
maven.cruisecontrol.mail.usemap=true
+maven.cruisecontrol.mail.buildresultsurl=
+maven.cruisecontrol.mail.css=${maven.cruisecontrol.home}/reporting/jsp/css/cruisecontrol.css
+maven.cruisecontrol.mail.xlsdir=${maven.cruisecontrol.home}/reporting/jsp/xsl
+maven.cruisecontrol.mail.failureaddress=${pom.build.nagEmailAddress}
+maven.cruisecontrol.mail.successaddress=${pom.build.nagEmailAddress}
+maven.cruisecontrol.mail.maps=
maven.cruisecontrol.template=${plugin.resources}/cruisecontrol.jsl
maven.cruisecontrol.trigger.projects=
@@ -61,4 +69,8 @@
maven.cruisecontrol.scp.targetseparator=/
maven.cruisecontrol.scp.ssh=ssh
#maven.cruisecontrol.scp.file=
-maven.cruisecontrol.scp.statusfile=${maven.cruisecontrol.currentbuildstatus.filename}
\ No newline at end of file
+maven.cruisecontrol.scp.statusfile=${maven.cruisecontrol.currentbuildstatus.filename}
+
+maven.cruisecontrol.artifactspublisher=false
+maven.cruisecontrol.artifacts.dir=
+maven.cruisecontrol.artifacts.dest=${maven.build.dir}/artifacts
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
