epugh       2004/06/04 12:12:34

  Modified:    cruisecontrol/src/plugin-resources cruisecontrol.jsl
               cruisecontrol/xdocs changes.xml
  Log:
  allow SVN repositories to be used.
  
  Revision  Changes    Path
  1.7       +14 -4     
maven-plugins/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
  
  Index: cruisecontrol.jsl
  ===================================================================
  RCS file: 
/home/cvs/maven-plugins/cruisecontrol/src/plugin-resources/cruisecontrol.jsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- cruisecontrol.jsl 21 Apr 2004 00:55:43 -0000      1.6
  +++ cruisecontrol.jsl 4 Jun 2004 19:12:34 -0000       1.7
  @@ -30,17 +30,27 @@
       <jsl:copy>
         <!-- TODO: more configurable -->
         <project name="${pom.artifactId}">
  +        <!-- FIXME: Shouldn't this use the second element of 
pom.repository.connection -->
  +        <maven:pluginVar var="method" plugin='maven-scm-plugin' 
property='maven.scm.method' />
  +        
  +        <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>      
           <bootstrappers>
             <currentbuildstatusbootstrapper 
file="${maven.cruisecontrol.logs.dir}/currentbuildstatus.txt"/>
           </bootstrappers>
           <modificationset>
  -          <!-- FIXME: Shouldn't this use the second element of 
pom.repository.connection -->
  -          <maven:pluginVar var="method" plugin='maven-scm-plugin' 
property='maven.scm.method' />
  -          <maven:pluginVar var="module" plugin='maven-scm-plugin' 
property='maven.scm.cvs.module' />
  -          <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}" />
             </j:if>
  +          <j:if test="${method == 'svn'}">
  +            <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 svnroot="${root}" 
localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${module}" />
  +          </j:if>          
           </modificationset>
           <schedule interval="${maven.cruisecontrol.schedule.interval}">
             <maven mavenscript="${maven.home}/bin/maven" 
goal="${maven.cruisecontrol.goals}" 
projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
  
  
  
  1.7       +2 -1      maven-plugins/cruisecontrol/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/cruisecontrol/xdocs/changes.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- changes.xml       31 May 2004 15:56:08 -0000      1.6
  +++ changes.xml       4 Jun 2004 19:12:34 -0000       1.7
  @@ -24,7 +24,8 @@
       <author email="[EMAIL PROTECTED]">Brett Porter</author>
     </properties>
     <body>
  -    <release version="1.3" date="n/a">
  +    <release version="1.3-dev" date="in cvs">
  +      <action dev="epugh" type="add">Allow SVN repositories to by used by 
cruisecontrol.</action>    
         <action dev="epugh" type="fix">allow the maven.cruisecontrol.home property to 
be overrided by other plugins via preGoal calls.</action>
         <action dev="epugh" type="add">allow user to specify different cc template to 
use</action>
       </release>  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to