You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2007/03/12 14:31:29 UTC

svn commit: r517210 - in /maven/maven-1/plugins/trunk/jdiff: plugin.jelly plugin.properties xdocs/changes.xml xdocs/properties.xml

Author: ltheussl
Date: Mon Mar 12 06:31:28 2007
New Revision: 517210

URL: http://svn.apache.org/viewvc?view=rev&rev=517210
Log:
PR: MPJDIFF-9
Jdiff fails with svn modules. New property maven.jdiff.svn.module.

Modified:
    maven/maven-1/plugins/trunk/jdiff/plugin.jelly
    maven/maven-1/plugins/trunk/jdiff/plugin.properties
    maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml
    maven/maven-1/plugins/trunk/jdiff/xdocs/properties.xml

Modified: maven/maven-1/plugins/trunk/jdiff/plugin.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/jdiff/plugin.jelly?view=diff&rev=517210&r1=517209&r2=517210
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/jdiff/plugin.jelly Mon Mar 12 06:31:28 2007
@@ -104,7 +104,7 @@
            password="${maven.scm.password}"
         />
         <ant:property name="maven.jdiff.new.src" 
-          value="${maven.jdiff.new.dir}/${relativeSrcDir}"/>
+          value="${maven.jdiff.new.dir}/${maven.jdiff.svn.module}/${relativeSrcDir}"/>
       </j:otherwise>
     </j:choose>
 
@@ -128,7 +128,7 @@
            password="${maven.scm.password}"
          /> 
         <ant:property name="maven.jdiff.old.src" 
-          value="${maven.jdiff.old.dir}/${relativeSrcDir}"/>
+          value="${maven.jdiff.old.dir}/${maven.jdiff.svn.module}/${relativeSrcDir}"/>
       </j:otherwise>
     </j:choose>
     

Modified: maven/maven-1/plugins/trunk/jdiff/plugin.properties
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/jdiff/plugin.properties?view=diff&rev=517210&r1=517209&r2=517210
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/jdiff/plugin.properties Mon Mar 12 06:31:28 2007
@@ -22,3 +22,5 @@
 # -------------------------------------------------------------------
 maven.jdiff.old.tag=CURRENT
 maven.jdiff.new.tag=HEAD
+
+maven.jdiff.svn.module=
\ No newline at end of file

Modified: maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml?view=diff&rev=517210&r1=517209&r2=517210
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml Mon Mar 12 06:31:28 2007
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.5.1-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="fix" issue="MPJDIFF-9">Jdiff fails with svn modules. New property <code>maven.jdiff.svn.module</code>.</action>
       <action dev="ltheussl" type="fix" issue="MPJDIFF-10">Jdiff doclet fails with jdk 1.4.</action>
       <action dev="aheritier" type="fix">Use relative links to the javadoc.</action>
       <action dev="aheritier" type="update">It requires at least maven-plugin-plugin v1.7.</action>

Modified: maven/maven-1/plugins/trunk/jdiff/xdocs/properties.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/jdiff/xdocs/properties.xml?view=diff&rev=517210&r1=517209&r2=517210
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/jdiff/xdocs/properties.xml Mon Mar 12 06:31:28 2007
@@ -57,6 +57,14 @@
               scm plugin properties</a>.
           </td>
         </tr>
+        <tr>
+          <td>maven.jdiff.svn.module</td>
+          <td>Yes</td>
+          <td>
+              If you are using Subversion with modules, indicate the module
+              of your project here.
+          </td>
+        </tr>
       </table>
     </section>
   </body>