svn commit: r400169 - in /maven/maven-1/plugins/trunk/cruisecontrol: src/plugin-resources/cruisecontrol.jsl xdocs/changes.xml

[ltheussl]

Author: ltheussl
Date: Fri May  5 13:50:16 2006
New Revision: 400169

URL: http://svn.apache.org/viewcvs?rev=400169&view=rev
Log:
PR: MPCRUISECONTROL-32
Replace deprecated currentbuildstatusbootstrapper, currentbuildstatuspublisher
and currentbuildstatusftppublisher by currentbuildstatuslistener and
currentbuildstatusftplistener.

Modified:
    
maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
    maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml

Modified: 
maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-resources/cruisecontrol.jsl?rev=400169&r1=400168&r2=400169&view=diff
==============================================================================
--- 
maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
 (original)
+++ 
maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
 Fri May  5 13:50:16 2006
@@ -37,9 +37,15 @@
           <plugin name="svn" 
classname="net.sourceforge.cruisecontrol.sourcecontrols.SVN"/> 
           <plugin name="svnbootstrapper" 
classname="net.sourceforge.cruisecontrol.bootstrappers.SVNBootstrapper"/>
         </j:if>
-        <bootstrappers>
-          <currentbuildstatusbootstrapper 
file="${maven.cruisecontrol.logs.dir}/${pom.artifactId}/${maven.cruisecontrol.currentbuildstatus.filename}"/>
-        </bootstrappers>
+        <listeners>
+          <currentbuildstatuslistener 
file="${maven.cruisecontrol.logs.dir}/${pom.artifactId}/${maven.cruisecontrol.currentbuildstatus.filename}"/>
+          <j:set var="ftpstatus" 
value="${maven.cruisecontrol.currentbuildstatusftppublisher}"/>
+          <j:if test="${ftpstatus == 'true'}">
+            <currentbuildstatusftplistener
+              
filename="${maven.cruisecontrol.currentbuildstatusftppublisher.file}"
+              
destdir="${maven.cruisecontrol.currentbuildstatusftppublisher.destDir}"/>
+          </j:if>
+        </listeners>
         <modificationset>
           <j:if test="${method == 'cvs'}">
             <cvs cvsroot="${url}" 
localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${pom.artifactId}" />
@@ -86,24 +92,11 @@
           </j:if>
         </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}" 
publishOnFailure="${maven.cruisecontrol.artifactspublisher.publishOnFailure}"/> 
 
-         </j:if>
-         <j:set var="ftpstatus" 
value="${maven.cruisecontrol.currentbuildstatusftppublisher}"/>
-         <j:if test="${ftpstatus == 'true'}">
-          <currentbuildstatusftppublisher
-              targetHost="${maven.cruisecontrol.ftp.targetHost}"
-              targetUser="${maven.cruisecontrol.ftp.targetUser}"
-              targetPasswd="${maven.cruisecontrol.ftp.targetPasswd}"
-              targetPort="${maven.cruisecontrol.ftp.targetPort}"
-              targetDir="${maven.cruisecontrol.ftp.targetDir}"
-              targetSeparator="${maven.cruisecontrol.ftp.targetSeparator}"
-              file="${maven.cruisecontrol.currentbuildstatusftppublisher.file}"
-              
destDir="${maven.cruisecontrol.currentbuildstatusftppublisher.destDir}"/>
          </j:if>
          <j:set var="ftppublisher" 
value="${maven.cruisecontrol.ftppublisher}"/>
          <j:if test="${ftppublisher == 'true'}">

Modified: maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml?rev=400169&r1=400168&r2=400169&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml Fri May  5 
13:50:16 2006
@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.8-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="fix" issue="MPCRUISECONTROL-32">Replace 
deprecated <code>&lt;currentbuildstatusbootstrapper&gt;</code>, 
<code>&lt;currentbuildstatuspublisher&gt;</code> and 
<code>&lt;currentbuildstatusftppublisher&gt;</code> by 
<code>&lt;currentbuildstatuslistener&gt;</code> and 
<code>&lt;currentbuildstatusftplistener&gt;</code>.</action>
       <action dev="ltheussl" type="fix" issue="MPCRUISECONTROL-30">Add missing 
documentation for several properties.</action>
       <action dev="ltheussl" type="fix" issue="MPCRUISECONTROL-29">Default for 
<code>maven.cruisecontrol.logs.mergedirectory</code> is incorrect on the 
Properties page.</action>
       <action dev="ltheussl" type="fix" issue="MPCRUISECONTROL-33">Property 
<code>maven.cruisecontrol.goals</code> contains deprecated 
<code>scm:update-project</code>.</action>