svn commit: r674146 [1/2] - in /incubator/jspwiki/trunk: build.properties build.xml doc/API Changes from 2.4.html doc/LICENSE.DependencyFinder tests/etc/DiffToHTML.xsl tests/lib/DependencyFinder.jar

[aj...@apache.org]

Author: ajaquith
Date: Fri Jul  4 18:43:16 2008
New Revision: 674146

URL: http://svn.apache.org/viewvc?rev=674146&view=rev
Log:
Removed inclusion of DependencyFinder. It is, however, still linked to in the 'api-diff' Ant target if it is installed.

Added:
    incubator/jspwiki/trunk/doc/API Changes from 2.4.html
Removed:
    incubator/jspwiki/trunk/doc/LICENSE.DependencyFinder
    incubator/jspwiki/trunk/tests/etc/DiffToHTML.xsl
    incubator/jspwiki/trunk/tests/lib/DependencyFinder.jar
Modified:
    incubator/jspwiki/trunk/build.properties
    incubator/jspwiki/trunk/build.xml

Modified: incubator/jspwiki/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties?rev=674146&r1=674145&r2=674146&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties (original)
+++ incubator/jspwiki/trunk/build.properties Fri Jul  4 18:43:16 2008
@@ -54,5 +54,6 @@
 #  Which browser to use?
 webtests.browser=*safari
 
-# For generating API diffs
-# jarfile.old=../JSPWiki-2.6.3-src/build/JSPWiki.jar
+# For generating API diffs (you must have DependencyFinder installed)
+#dependencyfinder.dir=../lib/DependencyFinder
+#jarfile.old=../JSPWiki-2.6.3-src/build/JSPWiki.jar

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=674146&r1=674145&r2=674146&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Fri Jul  4 18:43:16 2008
@@ -1417,24 +1417,25 @@
   
   <target name="api-diff" description="Compares API in JSPWiki.jar with previous version"
     depends="jar">
+     <!-- Assumes that the dependencyfinder.dir property points to the
+          dir containing the binary distribution of DependencyFinder -->
+     <check-property prop="dependencyfinder.dir" />
      <check-property prop="jarfile.old" />
      <mkdir dir="${tests.reports}" />
-     <!--
      <java classname="com.jeantessier.dependencyfinder.cli.JarJarDiff"
        output="${tests.reports}/API-changes.xml">
        <classpath refid="path.tests" />
-        <arg value="-new" />
-        <arg value="${jarfile}" />
-        <arg value="-old" />
-        <arg value="${jarfile.old}" />
-        <arg value="-name" />
-        <arg value="JSPWiki Public API Changes" />
+       <classpath>
+         <pathelement location="${dependencyfinder.dir}/lib/DependencyFinder.jar" />
+       </classpath>
+       <arg value="-new" />
+       <arg value="${jarfile}" />
+       <arg value="-old" />
+       <arg value="${jarfile.old}" />
+       <arg value="-name" />
+       <arg value="JSPWiki Public API Changes" />
      </java>
-     -->
-        <!--
-        <arg value="-level" />
-        <arg value="incompatible" />
-        -->
+
      <!-- Filthy hack that suppresses DTD resolution -->
      <replace file="${tests.reports}/API-changes.xml"
        token='&lt;!DOCTYPE differences SYSTEM "http://depfind.sourceforge.net/dtd/differences.dtd"&gt;'
@@ -1444,7 +1445,7 @@
        token="&amp;" value="(ampersand)"/>
      <xslt in="${tests.reports}/API-changes.xml"
        out="${tests.reports}/API-changes.html"
-       style="${tests.src}/etc/DiffToHTML.xsl">
+       style="${dependencyfinder.dir}/etc/DiffToHTML.xsl">
      </xslt>
   </target>