Index: cruisecontrol.jsl
===================================================================
RCS file: /home/cvspublic/maven-plugins/cruisecontrol/src/plugin-resources/cruisecontrol.jsl,v
retrieving revision 1.11
diff -u -r1.11 cruisecontrol.jsl
--- cruisecontrol.jsl	30 Jul 2004 08:21:10 -0000	1.11
+++ cruisecontrol.jsl	5 Aug 2004 15:53:21 -0000
@@ -36,13 +36,13 @@
         
         <j:if test="${method == 'svn'}">
           <plugin name="svn" classname="net.sourceforge.cruisecontrol.sourcecontrols.SVN"/> 
-          <plugin name="svnbootstrapper" classname="net.sourceforge.cruisecontrol.bootstrappers.SVNBootstrapper"/>                   
-        </j:if>      
+          <plugin name="svnbootstrapper" classname="net.sourceforge.cruisecontrol.bootstrappers.SVNBootstrapper"/>
+        </j:if>
         <bootstrappers>
           <currentbuildstatusbootstrapper file="${maven.cruisecontrol.logs.dir}/currentbuildstatus.txt"/>
         </bootstrappers>
         <modificationset>
-          <j:if test="${method == 'cvs'}">            
+          <j:if test="${method == 'cvs'}">
             <maven:pluginVar var="root" plugin='maven-scm-plugin' property='maven.scm.cvs.root' />
             <maven:pluginVar var="module" plugin='maven-scm-plugin' property='maven.scm.cvs.module' />
             <cvs cvsroot="${root}" localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${module}" />
@@ -52,38 +52,67 @@
             <maven:pluginVar var="root" plugin='maven-scm-plugin' property='maven.scm.svn.root' />
             <maven:pluginVar var="module" plugin='maven-scm-plugin' property='maven.scm.svn.module' />
             <svn repositoryLocation="${root}" localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${module}" />
-          </j:if>          
+          </j:if>
           
           <!-- Add the list of additional directories for the classpath from ${maven.eclipse.classpath.include}-->
-          <u:tokenize var="triggerProjectsSplit" delim=",">${maven.cruisecontrol.trigger.projects}</u:tokenize>          
+          <u:tokenize var="triggerProjectsSplit" delim=",">${maven.cruisecontrol.trigger.projects}</u:tokenize>
           <!-- add extra directories to be included in the classpath -->
           <j:forEach var="triggerProject" items="${triggerProjectsSplit}">
-            <buildstatus logdir="${maven.cruisecontrol.logs.dir}/${triggerProject}"/> 
+            <buildstatus logdir="${maven.cruisecontrol.logs.dir}/${triggerProject}"/>
           </j:forEach>
                     
         </modificationset>
+ 
+        <j:set var="type" value="${maven.cruisecontrol.schedule.type}"/>
+        <j:choose>
+        <j:when test="${type == 'time'}">
+        <schedule>
+          <maven
+            mavenscript="${maven.home}/bin/maven"
+            time="${maven.cruisecontrol.schedule.time}"
+            goal="${maven.cruisecontrol.goals}" 
+            projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
+        </schedule>
+        </j:when>
+        <j:otherwise>
         <schedule interval="${maven.cruisecontrol.schedule.interval}">
-          <maven mavenscript="${maven.home}/bin/maven" goal="${maven.cruisecontrol.goals}" projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
+          <maven
+            mavenscript="${maven.home}/bin/maven"
+            goal="${maven.cruisecontrol.goals}"
+            projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
         </schedule>
-        <log dir="${maven.cruisecontrol.logs.dir}/${pom.artifactId}">
-          <merge dir="${maven.cruisecontrol.checkout.dir}/${module}/target/test-reports"/> 
+        </j:otherwise>
+        </j:choose>
+        
+        <log
+          encoding="${maven.cruisecontrol.logs.encodingtype}"
+          dir="${maven.cruisecontrol.logs.dir}/${pom.artifactId}">
+          <j:set var="mergevar" value="${maven.cruisecontrol.logs.merge}"/>
+          <j:if test="${mergevar == 'true'}">
+           <merge dir="${maven.cruisecontrol.logs.mergedirectory}"/>
+          </j:if>
         </log>
         <publishers>
           <currentbuildstatuspublisher file="${maven.cruisecontrol.logs.dir}/currentbuildstatus.txt"/>
           <htmlemail 
-              subjectprefix="${maven.cruisecontrol.mail.subjectprefix}" 
-              defaultsuffix="${maven.cruisecontrol.mail.defaultsuffix}" 
-              mailhost="${maven.cruisecontrol.mail.host}" 
-              returnaddress="${pom.build.nagEmailAddress}" 
-              logdir="${maven.cruisecontrol.logs.dir}/${pom.artifactId}" 
-              css="${maven.cruisecontrol.home}/reporting/jsp/css/cruisecontrol.css" 
+              skipusers="${maven.cruisecontrol.mail.skipusers}"
+              reportsuccess="${maven.cruisecontrol.mail.reportsuccess}"
+              subjectprefix="${maven.cruisecontrol.mail.subjectprefix}"
+              defaultsuffix="${maven.cruisecontrol.mail.defaultsuffix}"
+              mailhost="${maven.cruisecontrol.mail.host}"
+              returnaddress="${pom.build.nagEmailAddress}"
+              logdir="${maven.cruisecontrol.logs.dir}/${pom.artifactId}"
+              css="${maven.cruisecontrol.home}/reporting/jsp/css/cruisecontrol.css"
               xsldir="${maven.cruisecontrol.home}/reporting/jsp/xsl">
-            <!-- need to map ids to emails here -->
-            <j:set var="developers" value="${pom.developers}"/>
-            <j:if test="${!empty(developers)}">
-              <j:forEach var="developer" items="${pom.developers}">
-                <map alias="${developer.id}" address="${developer.email}"/>
-              </j:forEach>
+            <j:set var="usemap" value="${maven.cruisecontrol.mail.usemap}"/>
+            <j:if test="${usemap == 'true'}">
+             <!-- need to map ids to emails here -->
+             <j:set var="developers" value="${pom.developers}"/>
+             <j:if test="${!empty(developers)}">
+               <j:forEach var="developer" items="${pom.developers}">
+                 <map alias="${developer.id}" address="${developer.email}"/>
+               </j:forEach>
+             </j:if>
             </j:if>
             <failure address="${pom.build.nagEmailAddress}" />
           </htmlemail>