cvs commit: maven-plugins/gump plugin.jelly

[brett]

brett       2004/04/03 20:14:54

  Modified:    jellydoc plugin.jelly project.xml
               gump     plugin.jelly
  Log:
  remove use of target, replace with properties
  
  Revision  Changes    Path
  1.18      +1 -1      maven-plugins/jellydoc/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jellydoc/plugin.jelly,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- plugin.jelly      4 Mar 2004 18:36:13 -0000       1.17
  +++ plugin.jelly      4 Apr 2004 04:14:54 -0000       1.18
  @@ -65,7 +65,7 @@
       <ant:echo>Generating jellydoc for packages ${maven.jellydoc.packages}</ant:echo>
   
       <!-- the doclet dumps taglib.xml into ${user.dir}/target -->
  -    <ant:mkdir dir="target"/>
  +    <ant:mkdir dir="${maven.build.dir}"/>
   
       <ant:echo>Source directory is ${pom.build.sourceDirectory}</ant:echo>
   
  
  
  
  1.27      +1 -1      maven-plugins/jellydoc/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jellydoc/project.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- project.xml       7 Mar 2004 01:06:31 -0000       1.26
  +++ project.xml       4 Apr 2004 04:14:54 -0000       1.27
  @@ -23,7 +23,7 @@
     <pomVersion>3</pomVersion>
     <id>maven-jellydoc-plugin</id>
     <name>Maven JellyDoc Plug-in</name>
  -  <currentVersion>1.2</currentVersion>
  +  <currentVersion>1.3-SNAPSHOT</currentVersion>
     <!-- Gump integration -->
   
     <gumpRepositoryId>jakarta</gumpRepositoryId>
  
  
  
  1.5       +7 -3      maven-plugins/gump/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/gump/plugin.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- plugin.jelly      4 Mar 2004 18:13:38 -0000       1.4
  +++ plugin.jelly      4 Apr 2004 04:14:54 -0000       1.5
  @@ -21,6 +21,7 @@
   <project 
     xmlns:define="jelly:define" 
     xmlns:gump="gump"
  +  xmlns:maven="jelly:maven"
     xmlns:j="jelly:core" 
     xmlns:u="jelly:util">
   
  @@ -96,12 +97,15 @@
         <depend project="${dependency}" />
       </j:forEach>
   
  -    <work nested="target/classes"/>
  -    <home nested="target"/>
  +    <maven:makeRelativePath basedir="${basedir}" var="mavenBuildDest" separator="/" 
path="${maven.build.dest}" />
  +    <work nested="${mavenBuildDest}"/>
  +    <maven:makeRelativePath basedir="${basedir}" var="mavenBuildDir" separator="/" 
path="${maven.build.dir}" />
  +    <home nested="${mavenBuildDir}"/>
       <jar name="${pom.artifactId}-@@DATE@@.jar"/>
       
       <u:tokenize var="moduleTokens" delim="/">${scmTokens[5]}</u:tokenize>
  -    <javadoc nested="target/docs/apidocs" module="${moduleTokens[0]}"/>
  +    <maven:makeRelativePath basedir="${basedir}" var="mavenDocsDest" separator="/" 
path="${maven.docs.dest}" />
  +    <javadoc nested="${mavenDocsDest}/apidocs" module="${moduleTokens[0]}"/>
   
       <nag from="${pom.artifactId} development &lt;${pom.build.nagEmailAddress}&gt;"
            to="${pom.build.nagEmailAddress}"/>
  
  
  

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