--- cruisecontrol.jsl	2004-08-09 17:47:58.000000000 +0200
+++ D:\cvs-local\maven-plugins\cruisecontrol\src\plugin-resources\cruisecontrol.jsl	2004-08-19 16:17:22.000000000 +0200
@@ -39,7 +39,7 @@
           <plugin name="svnbootstrapper" classname="net.sourceforge.cruisecontrol.bootstrappers.SVNBootstrapper"/>
         </j:if>
         <bootstrappers>
-          <currentbuildstatusbootstrapper file="${maven.cruisecontrol.logs.dir}/currentbuildstatus.txt"/>
+          <currentbuildstatusbootstrapper file="${maven.cruisecontrol.logs.dir}/${pom.artifactId}/${maven.cruisecontrol.currentbuildstatus.filename}"/>
         </bootstrappers>
         <modificationset>
           <j:if test="${method == 'cvs'}">
@@ -92,7 +92,32 @@
           </j:if>
         </log>
         <publishers>
-          <currentbuildstatuspublisher file="${maven.cruisecontrol.logs.dir}/currentbuildstatus.txt"/>
+          <currentbuildstatuspublisher file="${maven.cruisecontrol.logs.dir}/${pom.artifactId}/${maven.cruisecontrol.currentbuildstatus.filename}"/>
+         <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'}">
+          <ftppublisher
+              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}"
+              destDir="${maven.cruisecontrol.ftppublisher.destDir}"
+              srcDir="${maven.cruisecontrol.ftppublisher.srcDir}/${pom.artifactId}"
+              deleteArtifacts="${maven.cruisecontrol.ftppublisher.deleteArtifacts}"/>
+         </j:if>
           <htmlemail 
               skipusers="${maven.cruisecontrol.mail.skipusers}"
               reportsuccess="${maven.cruisecontrol.mail.reportsuccess}"
@@ -114,7 +139,47 @@
              </j:if>
             </j:if>
             <failure address="${pom.build.nagEmailAddress}" />
+            <success address="${pom.build.nagEmailAddress}" />
           </htmlemail>
+         <j:set var="scppublisher" value="${maven.cruisecontrol.scppublisher}"/>
+         <j:if test="${scppublisher == 'true'}">
+          <j:set var="scpfile" value="${maven.cruisecontrol.scp.file}"/>
+          <j:choose>
+           <j:when test="${!empty(scpfile)}">
+            <scp
+              sourcedir="${maven.cruisecontrol.scp.sourcedir}"
+              targetuser="${maven.cruisecontrol.scp.targetuser}"
+              targethost="${maven.cruisecontrol.scp.targethost}"
+              targetdir="${maven.cruisecontrol.scp.targetdir}"
+              file="${maven.cruisecontrol.scp.file}"
+              ssh="${maven.cruisecontrol.scp.ssh}"/>
+             <scp
+              sourcedir="${maven.cruisecontrol.scp.sourcedir}"
+              targetuser="${maven.cruisecontrol.scp.targetuser}"
+              targethost="${maven.cruisecontrol.scp.targethost}"
+              targetdir="${maven.cruisecontrol.scp.targetdir}"
+              file="${maven.cruisecontrol.scp.statusfile}"
+              ssh="${maven.cruisecontrol.scp.ssh}"/>
+           </j:when>
+           <j:otherwise>
+            <scp
+              sourcedir="${maven.cruisecontrol.scp.sourcedir}"
+              targetuser="${maven.cruisecontrol.scp.targetuser}"
+              targethost="${maven.cruisecontrol.scp.targethost}"
+              targetdir="${maven.cruisecontrol.scp.targetlogdir}"
+              targetseparator="${maven.cruisecontrol.scp.targetseparator}"
+              ssh="${maven.cruisecontrol.scp.ssh}"/>
+             <scp
+              sourcedir="${maven.cruisecontrol.scp.sourcedir}"
+              targetuser="${maven.cruisecontrol.scp.targetuser}"
+              targethost="${maven.cruisecontrol.scp.targethost}"
+              targetdir="${maven.cruisecontrol.scp.targetstatusfiledir}"
+              targetseparator="${maven.cruisecontrol.scp.targetseparator}"
+              file="${maven.cruisecontrol.scp.statusfile}"
+              ssh="${maven.cruisecontrol.scp.ssh}"/>
+           </j:otherwise>
+          </j:choose>
+         </j:if>
         </publishers>
       </project>
       <jsl:applyTemplates select="./project" />