maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject cvs commit: maven-plugins/jdiff/xdocs changes.xml
Date Thu, 18 Dec 2003 22:44:11 GMT
evenisse    2003/12/18 14:44:11

  Modified:    jdiff    plugin.jelly project.xml
               jdiff/xdocs changes.xml
  Log:
  Fix error due to makeRelativePath.
  
  Revision  Changes    Path
  1.9       +13 -19    maven-plugins/jdiff/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jdiff/plugin.jelly,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- plugin.jelly	29 Aug 2003 06:27:52 -0000	1.8
  +++ plugin.jelly	18 Dec 2003 22:44:11 -0000	1.9
  @@ -41,13 +41,12 @@
           <ant:property name="maven.jdiff.new.dir" value="${maven.jdiff.dir}/${maven.jdiff.new.tag}"/>
 
           <ant:mkdir dir="${maven.jdiff.new.dir}"/>
   
  -        <maven:makeRelativePath var="mavenRelativeSrcDir" basedir="${basedir}" path="${maven.build.sourceDirectory}"
/>
           <ant:cvs
             cvsRoot="${pom.repository.cvsRoot}"
  -          package="${pom.repository.cvsModule}/${mavenRelativeSrcDir}"
  +          package="${pom.repository.cvsModule}"
             dest="${maven.jdiff.new.dir}"
             tag="${maven.jdiff.new.tag}"
  -        />
  +        />    
           <ant:property name="maven.jdiff.new.src" 
             value="${maven.jdiff.new.dir}/${pom.repository.cvsModule}/${relativeSrcDir}"/>
       
  @@ -65,10 +64,9 @@
             value="${maven.jdiff.dir}/${maven.jdiff.old.tag}"/>  
           <ant:mkdir dir="${maven.jdiff.old.dir}"/>
   
  -        <maven:makeRelativePath var="mavenRelativeSrcDir" basedir="${basedir}" path="${maven.build.sourceDirectory}"
/>
           <ant:cvs
             cvsRoot="${pom.repository.cvsRoot}"
  -          package="${pom.repository.cvsModule}/${mavenRelativeSrcDir}"
  +          package="${pom.repository.cvsModule}"
             dest="${maven.jdiff.old.dir}"
             tag="${maven.jdiff.old.tag}"
           />
  @@ -77,19 +75,17 @@
             value="${maven.jdiff.old.dir}/${pom.repository.cvsModule}/${relativeSrcDir}"/>
         </j:otherwise>
       </j:choose>
  -
       
       <ant:property name="maven.cp.sub" refid="maven-classpath"/>
  -    <ant:property name="maven.cp" value="${maven.cp.sub};${java.class.path}"/>
  +    <ant:property name="jdiff.jar" value="${plugin.getDependencyPath('jdiff')}"/>
  +    <ant:property name="maven.cp" value="${maven.cp.sub};${jdiff.jar};${java.class.path}"/>
   
  -    <ant:property name="baseuri" value="${maven.home}/plugins/jdiff"/>
  +    <ant:property name="baseuri" value="${plugin.dir}"/>
       
       <ant:javadoc 
         sourcepath="${maven.jdiff.old.src}"
  -      packagenames="${pom.package}.*"
  -      >
  -      <ant:doclet name="jdiff.JDiff"
  -        path="${maven.cp}">
  +      packagenames="${pom.package}.*">
  +      <ant:doclet name="jdiff.JDiff" path="${maven.cp}">
           <ant:param name="-apiname" value="${maven.jdiff.old.tag}"/>
           <ant:param name="-baseURI" value="${baseuri}"/>
         </ant:doclet>
  @@ -99,8 +95,7 @@
         packagenames="${pom.package}.*"
         sourcepath="${maven.jdiff.new.src}">
         
  -      <ant:doclet name="jdiff.JDiff"
  -        path="${maven.cp}">
  +      <ant:doclet name="jdiff.JDiff" path="${maven.cp}">
           <ant:param name="-apiname" value="${maven.jdiff.new.tag}"/>
           <ant:param name="-baseURI" value="${baseuri}"/>
         </ant:doclet>
  @@ -110,8 +105,7 @@
         private="yes"
         destdir="${maven.jdiff.changes.dir}"
         packagenames="${pom.package}.*"
  -      sourcepath="${maven.jdiff.new.src}"
  -      >
  +      sourcepath="${maven.jdiff.new.src}">
   
         <ant:doclet name="jdiff.JDiff" path="${maven.cp}">
           <ant:param name="-stats"/>
  @@ -122,11 +116,11 @@
   
       </ant:javadoc> 
       
  -    <ant:copy todir="${maven.jdiff.changes.dir}">
  -      <ant:fileset dir="${maven.home}/plugins/jdiff-maven-plugin-1.0">
  +   <ant:copy todir="${maven.jdiff.changes.dir}">
  +      <ant:fileset dir="${plugin.resources}">
           <ant:include name="*.gif"/>
         </ant:fileset>
  -    </ant:copy> 
  +    </ant:copy>
       
     </goal>
   
  
  
  
  1.16      +10 -1     maven-plugins/jdiff/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jdiff/project.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- project.xml	10 Oct 2003 19:21:01 -0000	1.15
  +++ project.xml	18 Dec 2003 22:44:11 -0000	1.16
  @@ -5,7 +5,7 @@
     <pomVersion>3</pomVersion>
     <id>maven-jdiff-plugin</id>
     <name>Maven JDiff Plugin</name>
  -  <currentVersion>1.1</currentVersion>
  +  <currentVersion>1.2-SNAPSHOT</currentVersion>
     <description/>
     <shortDescription>Diff between CVS releases</shortDescription>
     <url>http://maven.apache.org/reference/plugins/jdiff/</url>
  @@ -32,6 +32,15 @@
         <roles>
           <role>Architect</role>
           <role>Release Manager</role>
  +      </roles>
  +    </developer>
  +    <developer>
  +      <name>Emmanuel Venisse</name>
  +      <id>evenisse</id>
  +      <email>emmanuel@venisse.net</email>
  +      <organization/>
  +      <roles>
  +        <role>Java Developer</role>
         </roles>
       </developer>
     </developers>
  
  
  
  1.3       +3 -0      maven-plugins/jdiff/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jdiff/xdocs/changes.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- changes.xml	29 Sep 2003 06:18:41 -0000	1.2
  +++ changes.xml	18 Dec 2003 22:44:11 -0000	1.3
  @@ -7,6 +7,9 @@
     </properties>
   
     <body>
  +    <release version="1.2" date="In CVS">
  +      <action dev="evenisse" type="update">Fix error due to makeRelativePath.</action>
  +    </release>
       <release version="1.1" date="2003-09-29">
         <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
       </release>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Mime
View raw message