jvanzyl     2002/07/09 18:42:10

  Modified:    .        maven.xml
               src/plugins/ant plugin.jelly
  Log:
  o The "installer" goal will now produce the JAR that will be used by the
    auto-installer.
  
  o The "deploy-installer" will push up the latest install bundle and symlink
    it to maven-install-latest.jar which can be sucked down by a task in
    the generated ant build.xml file. So we can use ant to infect people
    with maven :-)
  
  Revision  Changes    Path
  1.13      +49 -5     jakarta-turbine-maven/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/maven.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- maven.xml 9 Jul 2002 23:10:18 -0000       1.12
  +++ maven.xml 10 Jul 2002 01:42:10 -0000      1.13
  @@ -1,4 +1,6 @@
  -<project default="install" xmlns:j="jelly:core">
  +<project default="install" 
  +  xmlns:j="jelly:core"
  +  xmlns:m="maven">
   
     <!-- ================================================================== -->
     <!-- I N S T A L L   P L U G I N S                                      -->
  @@ -119,12 +121,54 @@
       -->
     </goal>
   
  -  <goal name="goober" prereqs="user-check">
  -  </goal>
  +  <!-- ================================================================== -->
  +  <!-- M A V E N  I N S T A L L E R                                       -->
  +  <!-- ================================================================== -->
  +
  +  <goal
  +    name="installer">
  +
  +    <jar
  +      jarfile="maven-install-${pom.currentVersion}.jar">
  +      <fileset dir="${maven.home}"/>
  +    </jar>
   
  -  <goal name="peas">
  -    <attainGoal name="user-check"/>
     </goal>
   
  +  <goal
  +    name="deploy-installer">
  +    
  +    <m:user-check user="${maven.username}"/>    
  +    <attainGoal name="installer"/>
  +    
  +    <!--
  +    
  +    Push the installer up to the server where users can
  +    get at Maven. Get rid of hardcoding.
  +    
  +    -->
  +
  +    <property name="site" value="jakarta.apache.org"/>
  +    <property name="dir" value="/www/jakarta.apache.org/turbine/jars2/maven"/>
  +    <property name="installer" value="maven-install-${pom.currentVersion}.jar"/>
  +
  +    <exec dir="." executable="${maven.scp.executable}">
  +      <arg value="${installer}"/>
  +      <arg value="${maven.username}@${site}:${dir}"/>
  +    </exec>
  +    
  +    <!--
  +    
  +    Make a symbolic link to the most recent JAR pushed up to
  +    the repository.
  +    
  +    -->
  +    
  +    <exec dir="." executable="${maven.ssh.executable}">
  +      <arg line="${site} -l ${maven.username} 'cd ${dir}; ln -sf ${installer} 
maven-install-latest.jar'"/>
  +    </exec>
  +
  +
  +  </goal>
   
   </project>
  
  
  
  1.11      +3 -3      jakarta-turbine-maven/src/plugins/ant/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/ant/plugin.jelly,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- plugin.jelly      8 Jul 2002 16:47:24 -0000       1.10
  +++ plugin.jelly      10 Jul 2002 01:42:10 -0000      1.11
  @@ -89,13 +89,13 @@
       -->
   
       <get 
  -      src="$${maven.repo.remote}maven/${maven.latest.install.jar}"
  -      dest="$${user.home}/${maven.latest.install.jar}"
  +      src="$${maven.repo.remote}maven/maven-install-latest.jar"
  +      dest="$${user.home}/maven-install-latest.jar"
         usetimestamp="true"
       />
       
       <unjar
  -      src="$${user.home}/${maven.latest.install.jar}"
  +      src="$${user.home}/maven-install-latest.jar"
         dest="$${maven.home}"
       />
       
  
  
  

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

Reply via email to