From 103e4989b19a05605dfe33b0243b9e2052fcf735 Mon Sep 17 00:00:00 2001 From: aheritier Date: Sat, 25 Jun 2005 08:26:09 +0000 Subject: [PATCH] - Fix MPCRUISECONTROL-26 : Properties page has duplicated "Maven Cruise Control Plug-in SCP Publisher Settings" sections - Fix XML formatting git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@201737 13f79535-47bb-0310-9956-ffa450edef68 --- cruisecontrol/xdocs/properties.xml | 337 +++++++++++------------------ 1 file changed, 124 insertions(+), 213 deletions(-) diff --git a/cruisecontrol/xdocs/properties.xml b/cruisecontrol/xdocs/properties.xml index d6dcbf60..bdc78690 100644 --- a/cruisecontrol/xdocs/properties.xml +++ b/cruisecontrol/xdocs/properties.xml @@ -1,5 +1,4 @@ - - Maven CruiseControl Plug-in Properties @@ -141,7 +139,7 @@ Template file to use in generating the cruisecontrol.xml file. - + maven.cruisecontrol.trigger.projects Yes @@ -156,7 +154,7 @@ results in continuious rebuilding of project and/or avoidable build failures.

- + maven.cruisecontrol.buildresults.site Yes @@ -165,7 +163,7 @@ Default value is ${pom.url}/cruisecontrol. While not required, typically you will need to set this. - + maven.cruisecontrol.buildresults.url Yes @@ -176,24 +174,24 @@ ${maven.cruisecontrol.buildresults.site}/buildresults/${pom.artifactId}.

- Note: Since the cruisecontrol report is not one of the + Note: Since the cruisecontrol report is not one of the defaults reports, you must add the cruisecontrol report to see a link to the Cruise Control Build Results under Project Reports.

- +
- + @@ -237,17 +235,17 @@

Default value is the domain name of the first email in ${pom.build.nagEmailAddress}.

- +
maven.cruisecontrol.mail.host Yes

Default value is localhost.

- NOTE: It may be more appropriate to set this in build.properties + NOTE: It may be more appropriate to set this in build.properties on the CruiseControl server since the value may differ from developer to developer.

- + @@ -302,7 +300,7 @@

Whether to include the build results URL. Default value is false.

- +
maven.cruisecontrol.jabberpublisher Yes

Control whether to include publishing to a Jabber server. Default value is - false.

+ false.
@@ -313,7 +311,7 @@

Host name of the FTP server.

- NOTE: This property doesn't have any default value, a value is required if + NOTE: This property doesn't have any default value, a value is required if maven.cruisecontrol.currentbuildstatusftppublisher property or maven.cruisecontrol.ftppublisher property is set to true.

@@ -365,7 +363,7 @@

Copies the file containing the current build status in a remote directory onto the FTP server. Default value is false.

- NOTE: To use this CruiseControl property you need to add this line + NOTE: To use this CruiseControl property you need to add this line currentbuildstatusftppublisher=net.sourceforge.cruisecontrol.publishers.CurrentBuildStatusFTPPublisher in the default-plugins.properties file before building CruiseControl (you can find it, in INSTALL_DIR/main/src/net/sourceforge/cruisecontrol/).

@@ -377,7 +375,7 @@

The filename to write.

- NOTE: This property doesn't have any default value, a value is required if + NOTE: This property doesn't have any default value, a value is required if maven.cruisecontrol.currentbuildstatusftppublisher property is set to true.

@@ -387,7 +385,7 @@

The remote directory to write the file.

- NOTE: This property doesn't have any default value, a value is required if + NOTE: This property doesn't have any default value, a value is required if maven.cruisecontrol.currentbuildstatusftppublisher property is set to true.

@@ -398,7 +396,7 @@

Copies the XML log file from the build onto the FTP server. Default value is false.

- NOTE: To use this CruiseControl property you need to add this line + NOTE: To use this CruiseControl property you need to add this line ftppublisher=net.sourceforge.cruisecontrol.publishers.FTPPublisher in the default-plugins.properties file before building CruiseControl (you can find it, in INSTALL_DIR/main/src/net/sourceforge/cruisecontrol/).

@@ -410,7 +408,7 @@

The remote directory to publish the files.

- NOTE: This property doesn't have any default value, a value is required if + NOTE: This property doesn't have any default value, a value is required if maven.cruisecontrol.ftppublisher property is set to true.

@@ -433,214 +431,127 @@
- - - - - + +
maven.cruisecontrol.scppublisherYes -

Copies the XML log file from the build with a SCP command onto a remote host. Default value is + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - -
maven.cruisecontrol.scppublisherYes +

Copies the XML log file from the build with a SCP command onto a remote host. Default value is false.

-
maven.cruisecontrol.scp.sourcedirYes -

The directory to copy from. Default value is +

maven.cruisecontrol.scp.sourcedirYes +

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

-
maven.cruisecontrol.scp.targetuserYes -

Log in to the target machine as this user.

-

- NOTE: This property doesn't have any default value, a value is required if +

maven.cruisecontrol.scp.targetuserYes +

Log in to the target machine as this user.

+

+ NOTE: This property doesn't have any default value, a value is required if maven.cruisecontrol.scppublisher property is set to true.

-
maven.cruisecontrol.scp.targethostYes -

SCP to this machine.

-

- NOTE: This property doesn't have any default value, a value is required if +

maven.cruisecontrol.scp.targethostYes +

SCP to this machine.

+

+ NOTE: This property doesn't have any default value, a value is required if maven.cruisecontrol.scppublisher property is set to true.

-
maven.cruisecontrol.scp.targetlogdirYes -

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

maven.cruisecontrol.scp.targetlogdirYes +

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

-
maven.cruisecontrol.scp.targetstatusfiledirYes -

The directory to copy the currentstatusfile. Default value is +

maven.cruisecontrol.scp.targetstatusfiledirYes +

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

-
maven.cruisecontrol.scp.targetseparatorYes -

The file separator on the target machine. Default value is +

maven.cruisecontrol.scp.targetseparatorYes +

The file separator on the target machine. Default value is /.

-
maven.cruisecontrol.scp.sshYes -

The ssh application. Default value is +

maven.cruisecontrol.scp.sshYes +

The ssh application. Default value is ssh.

-
maven.cruisecontrol.scp.fileYes -

The filename to copy. Default value is the current log file.

-
maven.cruisecontrol.scp.statusfileYes -

The statusfilename to copy. Default value is +

maven.cruisecontrol.scp.fileYes +

The filename to copy. Default value is the current log file.

+
maven.cruisecontrol.scp.statusfileYes +

The statusfilename to copy. Default value is ${maven.cruisecontrol.currentbuildstatus.filename}.

-
- -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
maven.cruisecontrol.scppublisherYes -

Copies the XML log file from the build with a SCP command onto a remote host. Default value is - false.

-
maven.cruisecontrol.scp.sourcedirYes -

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

-
maven.cruisecontrol.scp.targetuserYes -

Log in to the target machine as this user.

-

- NOTE: This property doesn't have any default value, a value is required if - maven.cruisecontrol.scppublisher property is set to true.

-
maven.cruisecontrol.scp.targethostYes -

SCP to this machine.

-

- NOTE: This property doesn't have any default value, a value is required if - maven.cruisecontrol.scppublisher property is set to true.

-
maven.cruisecontrol.scp.targetlogdirYes -

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

-
maven.cruisecontrol.scp.targetstatusfiledirYes -

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

-
maven.cruisecontrol.scp.targetseparatorYes -

The file separator on the target machine. Default value is - /.

-
maven.cruisecontrol.scp.sshYes -

The ssh application. Default value is - ssh.

-
maven.cruisecontrol.scp.fileYes -

The filename to copy. Default value is the current log file.

-
maven.cruisecontrol.scp.statusfileYes -

The statusfilename to copy. Default value is - ${maven.cruisecontrol.currentbuildstatus.filename}.

-
+
- - - - - + +
maven.cruisecontrol.artifactspublisherYes -

Copies the build artifacts from to a given local location. Default value is + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - -
maven.cruisecontrol.artifactspublisherYes +

Copies the build artifacts from to a given local location. Default value is false.

-
maven.cruisecontrol.artifacts.dirYes -

The directory to copy from. Default value is +

maven.cruisecontrol.artifacts.dirYes +

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

-
maven.cruisecontrol.artifacts.destYes -

The directory to copy to. Default value is +

maven.cruisecontrol.artifacts.destYes +

The directory to copy to. Default value is ${maven.build.dir}/artifacts}.

-
maven.cruisecontrol.artifactsPublisher.publishOnFailureYes -

Whether to publish the artifacts on a failed build. Default value is +

maven.cruisecontrol.artifactsPublisher.publishOnFailureYes +

Whether to publish the artifacts on a failed build. Default value is true.

-
- +

+