Author: brett Date: Wed Jan 12 11:54:51 2005 New Revision: 124984 URL: http://svn.apache.org/viewcvs?view=rev&rev=124984 Log: add clean property for publish separately Modified: maven/maven-1/plugins/trunk/site/plugin.jelly maven/maven-1/plugins/trunk/site/plugin.properties maven/maven-1/plugins/trunk/site/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/site/plugin.jelly Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/plugin.jelly?view=diff&rev=124984&p1=maven/maven-1/plugins/trunk/site/plugin.jelly&r1=124983&p2=maven/maven-1/plugins/trunk/site/plugin.jelly&r2=124984 ============================================================================== --- maven/maven-1/plugins/trunk/site/plugin.jelly (original) +++ maven/maven-1/plugins/trunk/site/plugin.jelly Wed Jan 12 11:54:51 2005 @@ -233,6 +233,7 @@ <j:set var="destSiteAddress" value="${pom.siteAddress}" /> <j:set var="destSiteDirectory" value="${pom.siteDirectory}" /> <j:set var="destSiteUsername" value="${maven.username}" /> + <j:set var="publishClean" value="${maven.site.publish.clean}" /> <echo> source site address: ${siteAddress} @@ -241,6 +242,7 @@ destination site address: ${destSiteAddress} destination site directory: ${destSiteDirectory} destination site username: ${destSiteUsername} + publish clean: ${publishClean} </echo> <j:if test="${siteAddress == destSiteAddress and @@ -253,7 +255,7 @@ <j:choose> <j:when test="${deployMethod == 'fs'}"> <echo>Executing filesystem copy on local server to publish</echo> - <j:if test="${siteClean}"> + <j:if test="${publishClean}"> <echo>Cleaning destination first</echo> <delete dir="${destSiteDirectory}" /> </j:if> @@ -264,7 +266,7 @@ </j:when> <j:when test="${siteAddress == destSiteAddress}"> <echo>Executing filesystem copy on remote server to publish</echo> - <j:if test="${siteClean}"> + <j:if test="${publishClean}"> <echo>Cleaning destination first</echo> <exec dir="." executable="${maven.ssh.executable}"> <arg line="[EMAIL PROTECTED] 'rm -r ${destSiteDirectory}'" /> @@ -277,7 +279,7 @@ <j:otherwise> <echo>Executing rsync on stage server to publish to live server</echo> <j:set var="rsyncArgs" value="${maven.rsync.args}" /> - <j:if test="${siteClean}"> + <j:if test="${publishClean}"> <echo>Cleaning destination</echo> <j:set var="rsyncArgs" value="${rsyncArgs} --delete" /> </j:if> Modified: maven/maven-1/plugins/trunk/site/plugin.properties Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/plugin.properties?view=diff&rev=124984&p1=maven/maven-1/plugins/trunk/site/plugin.properties&r1=124983&p2=maven/maven-1/plugins/trunk/site/plugin.properties&r2=124984 ============================================================================== --- maven/maven-1/plugins/trunk/site/plugin.properties (original) +++ maven/maven-1/plugins/trunk/site/plugin.properties Wed Jan 12 11:54:51 2005 @@ -35,3 +35,4 @@ maven.username=USERNAME_NOT_SET maven.site.deploy.clean=false +maven.site.publish.clean=false Modified: maven/maven-1/plugins/trunk/site/xdocs/properties.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/xdocs/properties.xml?view=diff&rev=124984&p1=maven/maven-1/plugins/trunk/site/xdocs/properties.xml&r1=124983&p2=maven/maven-1/plugins/trunk/site/xdocs/properties.xml&r2=124984 ============================================================================== --- maven/maven-1/plugins/trunk/site/xdocs/properties.xml (original) +++ maven/maven-1/plugins/trunk/site/xdocs/properties.xml Wed Jan 12 11:54:51 2005 @@ -55,10 +55,18 @@ <td>maven.site.deploy.clean</td> <td>Yes</td> <td> - This will ensure the target in either a <code>site:deploy</code> or <code>site:publish</code> goal is + This will ensure the target in a <code>site:deploy</code> goal is clean by either deleting the directory first, or rsync'ing with the <code>--delete</code> option. - This operation is not atomic, so is not recommended for the live site unless you are using the rsync - method. + This operation is not atomic, so is not recommended for the live site unless you are using the rsync method. + </td> + </tr> + <tr> + <td>maven.site.publish.clean</td> + <td>Yes</td> + <td> + This will ensure the target in a <code>site:publish</code> goal is + clean by either deleting the directory first, or rsync'ing with the <code>--delete</code> option. + This operation is not atomic, so is not recommended for the live site unless you are using the rsync method. </td> </tr> <tr> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
