diff --git a/cruisecontrol/plugin.properties b/cruisecontrol/plugin.properties index 800bcd17..60ed1444 100644 --- a/cruisecontrol/plugin.properties +++ b/cruisecontrol/plugin.properties @@ -17,6 +17,7 @@ # Location where the CruiseControl configuration file will be generated. maven.cruisecontrol.build.dir = ${maven.build.dir}/cruisecontrol maven.cruisecontrol.config = ${maven.cruisecontrol.build.dir}/config.xml +#maven.cruisecontrol.home= # Properties that are used for generating the content of the CC config file # ------------------------------------------------------------------------- @@ -63,7 +64,7 @@ maven.cruisecontrol.mail.spamwhilebroken=false maven.cruisecontrol.mail.usemap=true maven.cruisecontrol.mail.buildresultsurl=${maven.cruisecontrol.buildresults.url} maven.cruisecontrol.mail.css=${maven.cruisecontrol.home}/reporting/jsp/webcontent/css/cruisecontrol.css -maven.cruisecontrol.mail.xlsdir=${maven.cruisecontrol.home}/reporting/jsp/webcontent/xsl +maven.cruisecontrol.mail.xsldir=${maven.cruisecontrol.home}/reporting/jsp/webcontent/xsl maven.cruisecontrol.mail.failureaddress=${pom.build.nagEmailAddress} maven.cruisecontrol.mail.successaddress=${pom.build.nagEmailAddress} maven.cruisecontrol.mail.maps= diff --git a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl index 5985d4bf..68e1dc53 100644 --- a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl +++ b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl @@ -140,7 +140,7 @@ spamwhilebroken="${maven.cruisecontrol.mail.spamwhilebroken}" logdir="${maven.cruisecontrol.logs.dir}/${pom.artifactId}" css="${maven.cruisecontrol.mail.css}" - xsldir="${maven.cruisecontrol.mail.xlsdir}"> + xsldir="${maven.cruisecontrol.mail.xsldir}"> diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml index ec289a3a..a8f801a3 100644 --- a/cruisecontrol/xdocs/changes.xml +++ b/cruisecontrol/xdocs/changes.xml @@ -26,6 +26,7 @@ + Add missing documentation for several properties. Default for maven.cruisecontrol.logs.mergedirectory is incorrect on the Properties page. Property maven.cruisecontrol.goals contains deprecated scm:update-project. Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : diff --git a/cruisecontrol/xdocs/properties.xml b/cruisecontrol/xdocs/properties.xml index 2d5b1d2e..aadcd820 100644 --- a/cruisecontrol/xdocs/properties.xml +++ b/cruisecontrol/xdocs/properties.xml @@ -28,12 +28,20 @@ Optional? Description + + maven.cruisecontrol.build.dir + Yes + + The cruisecontrol build directory. + Default value is ${maven.build.dir}/cruisecontrol. + + maven.cruisecontrol.config Yes Config file to update/create. - Default value is ${maven.build.dir}/cruisecontrol/config.xml. + Default value is ${maven.cruisecontrol.build.dir}/config.xml. @@ -67,6 +75,14 @@ Default value is ${maven.cruisecontrol.work.dir}/logs + + maven.cruisecontrol.mavenhome + Yes + + The home directory of your Maven installation. + Default value is ${maven.home}. + + maven.cruisecontrol.schedule.type Yes @@ -117,6 +133,14 @@ ${maven.cruisecontrol.checkout.dir}/${pom.artifactId}/${maven.build.dir}/test-reports. + + maven.cruisecontrol.logs.pattern + Yes + + The pattern of files to merge. + Default value is TEST-*.xml. + + maven.cruisecontrol.currentbuildstatus.filename Yes @@ -138,6 +162,7 @@ Yes Template file to use in generating the cruisecontrol.xml file. + Default value is ${plugin.resources}/cruisecontrol.jsl. @@ -228,6 +253,16 @@ always.

+ + maven.cruisecontrol.mail.spamwhilebroken + Yes + +

+ Whether or not e-mail reports on failed builds will continue for subsequent failed builds. + Default value is false. +

+ + maven.cruisecontrol.mail.defaultsuffix Yes @@ -236,6 +271,69 @@ ${pom.build.nagEmailAddress}.

+ + maven.cruisecontrol.mail.buildresultsurl + Yes + +

+ URL to the build results JSP. + Default value is ${maven.cruisecontrol.buildresults.url}. +

+ + + + maven.cruisecontrol.mail.css + Yes + +

+ Path to cruisecontrol.css. + Default value is ${maven.cruisecontrol.home}/reporting/jsp/webcontent/css/cruisecontrol.css. +

+ + + + maven.cruisecontrol.mail.xsldir + Yes + +

+ Directory where standard CruiseControl xsl files are located. + Default value is ${maven.cruisecontrol.home}/reporting/jsp/webcontent/xsl. +

+ + + + maven.cruisecontrol.mail.failureaddress + Yes + +

+ Mail address to be emailed notification after failed builds. + Default value is ${pom.build.nagEmailAddress}. +

+ + + + maven.cruisecontrol.mail.successaddress + Yes + +

+ Mail address to be emailed notification after successful builds. + Default value is ${pom.build.nagEmailAddress}. +

+ + + + maven.cruisecontrol.mail.maps + Yes + +

+ Maps a source control user id to an email address. + Given by a comma-separated list of aliases, each of which + should be accompanied by an address of the form + maven.cruisecontrol.mail.map.${alias}. + Default value is the empty string. +

+ +
@@ -345,7 +443,7 @@ Yes

Base directory in the FTP server to put the files. Default value is - ..

+ '.'.

@@ -445,7 +543,7 @@ Yes

The directory to copy from. Default value is - ${maven.cruisecontrol.logs.dir}.

+ ${maven.cruisecontrol.logs.dir}/${pom.artifactId}.

@@ -473,7 +571,7 @@ Yes

The directory to copy the log files. Default value is - ..

+ '.'.

@@ -481,7 +579,7 @@ Yes

The directory to copy the currentstatusfile. Default value is - ..

+ '.'.