Browse Source

Move the <exclude> patterns for <javac> and <junit> to external

patternsets so that they are in one place instead of repeated up to
three time.

update link for BSF.

Add pointer to JDepend in the Library Dependencies section.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271512 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 23 years ago
parent
commit
939e7c021e
3 changed files with 254 additions and 150 deletions
  1. +246
    -148
      build.xml
  2. +2
    -2
      docs/manual/OptionalTasks/script.html
  3. +6
    -0
      docs/manual/install.html

+ 246
- 148
build.xml View File

@@ -111,10 +111,181 @@
files that have dependencies that are not available files that have dependencies that are not available
=================================================================== ===================================================================
--> -->
<!-- depends on JDK version -->
<patternset id="needs.jdk1.2+">
<exclude name="${util.package}/optional/NoExitSecurityManager.java"
unless="jdk1.2+" />
<exclude name="${optional.package}/Javah.java"
unless="jdk1.2+" />
<exclude name="${optional.package}/metamata/*.java"
unless="jdk1.2+" />
<exclude name="${optional.type.package}/depend/*.java"
unless="jdk1.2+" />
<exclude name="${util.package}/depend/*.java"
unless="jdk1.2+" />
<exclude name="${optional.package}/ejb/EjbJar.java"
unless="jdk1.2+" />
<exclude name="${optional.package}/ejb/*DeploymentTool.java"
unless="jdk1.2+" />
<exclude name="${optional.package}/ejb/IPlanet*.java"
unless="jdk1.2+" />
<!-- uses the context classloader -->
<exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
unless="jdk1.2+"/>
</patternset>
<patternset id="needs.jdk1.3+">
<exclude name="${ant.package}/taskdefs/TestProcess.java"
unless="jdk1.3+" />
</patternset>
<patternset id="needs.jdk1.4+">
<exclude name="${regexp.package}/Jdk14Regexp*.java"
unless="jdk1.4+" />
</patternset>

<!-- classes that should be present in Sun based JVMs, but not in
Kaffe for example -->
<patternset id="needs.sun.tools">
<exclude name="${optional.package}/Native2Ascii.java"
unless="sun.tools.present" />
<exclude name="${optional.package}/Javah.java"
unless="sun.tools.present" />
</patternset>
<patternset id="needs.sun.uue">
<exclude name="${ant.package}/taskdefs/email/UUMailer.java"
unless="sunuue.present" />
</patternset>
<patternset id="needs.sun.b64">
<exclude name="${ant.package}/taskdefs/Get.java"
unless="base64.present" />
</patternset>

<!-- depends on external libraries -->
<patternset id="needs.trax">
<exclude name="${optional.package}/TraXLiaison*.java"
unless="trax.present" />
<exclude name="${optional.package}/junit/XMLResultAggregator.java"
unless="trax.present" />
<exclude name="${optional.package}/junit/AggregateTransformer.java"
unless="trax.present" />
<exclude name="${optional.package}/sitraka/**"
unless="trax.present"/>
<exclude name="${optional.package}/metamata/MMetrics*"
unless="trax.present"/>
</patternset>
<patternset id="needs.xalan1">
<exclude name="${optional.package}/XalanLiaison*.java"
unless="xalan.present" />
<exclude name="${optional.package}/junit/Xalan1Executor.java"
unless="xalan.present" />
</patternset>
<patternset id="needs.xalan2">
<exclude name="${optional.package}/junit/XMLResultAggregator.java"
unless="xalan2.present" />
<exclude name="${optional.package}/junit/AggregateTransformer.java"
unless="xalan2.present" />
<exclude name="${optional.package}/junit/XalanExecutor.java"
unless="xalan2.present" />
<exclude name="${optional.package}/junit/Xalan2Executor.java"
unless="xalan2.present" />
</patternset>
<patternset id="needs.xslp">
<exclude name="${optional.package}/XslpLiaison*.java"
unless="xslp.present" />
</patternset>
<patternset id="needs.junit">
<exclude name="${optional.package}/junit/*.java" unless="junit.present" />
</patternset>
<patternset id="needs.jakarta.regexp"> <patternset id="needs.jakarta.regexp">
<exclude name="${regexp.package}/JakartaRegexp*.java" <exclude name="${regexp.package}/JakartaRegexp*.java"
unless="jakarta.regexp.present" /> unless="jakarta.regexp.present" />
</patternset> </patternset>
<patternset id="needs.jakarta.oro">
<exclude name="${regexp.package}/JakartaOro*.java"
unless="jakarta.oro.present" />
<exclude name="${optional.package}/perforce/*.java"
unless="jakarta.oro.present" />
<exclude name="${optional.package}/metamata/MAudit*.java"
unless="jakarta.oro.present"/>
</patternset>
<patternset id="needs.jakarta.bcel">
<exclude name="${optional.type.package}/depend/*.java"
unless="bcel.present" />
<exclude name="${util.package}/depend/*.java"
unless="bcel.present" />
<exclude name="${optional.package}/ejb/EjbJar.java"
unless="bcel.present" />
<exclude name="${optional.package}/ejb/*DeploymentTool.java"
unless="bcel.present" />
<exclude name="${optional.package}/ejb/IPlanet*.java"
unless="bcel.present" />
</patternset>
<patternset id="needs.jakarta.log4j">
<exclude name="${ant.package}/listener/Log4jListener.java"
unless="log4j.present" />
</patternset>
<patternset id="needs.bsf">
<exclude name="${optional.package}/Script.java"
unless="bsf.present" />
</patternset>
<patternset id="needs.stylebook">
<exclude name="${optional.package}/StyleBook.java"
unless="stylebook.present" />
</patternset>
<patternset id="needs.javamail">
<exclude name="${ant.package}/taskdefs/email/MimeMailer.java"
unless="javamail.complete" />
</patternset>
<patternset id="needs.icontract">
<exclude name="${optional.package}/IContract.java"
unless="icontract.present" />
</patternset>
<patternset id="needs.netrexx">
<exclude name="${optional.package}/NetRexxC.java"
unless="netrexx.present" />
</patternset>
<patternset id="needs.weblogic.ejbc">
<exclude name="${optional.package}/ejb/Ejbc*.java"
unless="ejb.ejbc.present" />
</patternset>
<patternset id="needs.weblogic.ddcreator">
<exclude name="${optional.package}/ejb/DDCreator*.java"
unless="ejb.DDCreator.present" />
</patternset>
<patternset id="needs.weblogic.server">
<exclude name="${optional.package}/ejb/WLRun.java"
unless="ejb.wls.present" />
<exclude name="${optional.package}/ejb/WLStop.java"
unless="ejb.wls.present" />
</patternset>
<patternset id="needs.netcomponents">
<exclude name="${optional.package}/net/FTP.java"
unless="netcomp.present" />
<exclude name="${optional.package}/net/TelnetTask.java"
unless="netcomp.present" />
</patternset>
<patternset id="needs.starteam">
<exclude name="${optional.package}/scm/AntStarTeam*.java"
unless="starteam.present" />
<exclude name="${optional.package}/starteam/*.java"
unless="starteam.present" />
</patternset>
<patternset id="needs.vaj">
<exclude name="${optional.package}/ide/VAJ*.java"
unless="vaj.present" />
</patternset>
<patternset id="needs.antlr">
<exclude name="${optional.package}/ANTLR*.java" unless="antlr.present" />
</patternset>
<patternset id="needs.servletapi">
<exclude name="${optional.package}/ide/VAJ*Servlet.java"
unless="servlet.present" />
</patternset>
<patternset id="needs.jmf">
<exclude name="${optional.package}/sound/*.java" unless="jmf.present" />
</patternset>
<patternset id="needs.jdepend">
<exclude name="${optional.package}/jdepend/*" unless="jdepend.present" />
</patternset>


<!-- <!--
=================================================================== ===================================================================
@@ -230,13 +401,6 @@
</or> </or>
</condition> </condition>
<condition property="ejbjar.support">
<and>
<isset property="bcel.present" />
<isset property="jdk1.2+" />
</and>
</condition>

<condition property="tests.and.ant.share.classloader"> <condition property="tests.and.ant.share.classloader">
<or> <or>
<equals arg1="${junit.fork}" arg2="true" /> <equals arg1="${junit.fork}" arg2="true" />
@@ -300,81 +464,37 @@
deprecation="${deprecation}" deprecation="${deprecation}"
optimize="${optimize}" > optimize="${optimize}" >
<classpath refid="classpath" /> <classpath refid="classpath" />

<patternset refid="needs.jdk1.2+" />
<patternset refid="needs.jdk1.4+" />

<patternset refid="needs.jakarta.regexp" /> <patternset refid="needs.jakarta.regexp" />
<exclude name="${regexp.package}/JakartaOro*.java"
unless="jakarta.oro.present" />
<exclude name="${regexp.package}/Jdk14Regexp*.java"
unless="jdk1.4+" />
<exclude name="${util.package}/optional/NoExitSecurityManager.java"
unless="jdk1.2+" />
<exclude name="${ant.package}/listener/Log4jListener.java"
unless="log4j.present" />

<exclude name="${ant.package}/taskdefs/email/UUMailer.java" unless="sunuue.present" />
<exclude name="${ant.package}/taskdefs/email/MimeMailer.java" unless="javamail.complete" />

<exclude name="${optional.package}/IContract.java" unless="icontract.present" />
<exclude name="${optional.package}/Script.java" unless="bsf.present" />
<exclude name="${optional.package}/StyleBook.java" unless="stylebook.present" />
<exclude name="${optional.package}/NetRexxC.java" unless="netrexx.present" />
<exclude name="${optional.package}/TraXLiaison.java"
unless="trax.present" />
<exclude name="${optional.package}/XslpLiaison.java" unless="xslp.present" />
<exclude name="${optional.package}/XalanLiaison.java" unless="xalan.present" />
<exclude name="${optional.package}/ejb/Ejbc*.java" unless="ejb.ejbc.present" />
<exclude name="${optional.package}/ejb/DDCreator*.java" unless="ejb.DDCreator.present" />
<exclude name="${optional.package}/ejb/WLRun.java" unless="ejb.wls.present" />
<exclude name="${optional.package}/ejb/WLStop.java" unless="ejb.wls.present" />
<exclude name="${optional.package}/ejb/EjbJar.java" unless="ejbjar.support" />
<exclude name="${optional.package}/ejb/*DeploymentTool.java" unless="ejbjar.support" />
<exclude name="${optional.package}/ejb/IPlanet*.java" unless="ejbjar.support" />
<exclude name="${optional.package}/Javah.java" unless="jdk1.2+" />
<exclude name="${optional.package}/junit/*" unless="junit.present" />
<exclude name="${optional.package}/net/FTP.java" unless="netcomp.present" />
<exclude name="${optional.package}/net/TelnetTask.java" unless="netcomp.present" />
<exclude name="${optional.package}/scm/AntStarTeam*.java" unless="starteam.present" />
<exclude name="${optional.package}/starteam/*.java" unless="starteam.present" />
<exclude name="${optional.package}/ANTLR.java" unless="antlr.present" />
<exclude name="${optional.package}/ide/VAJ*.java" unless="vaj.present" />
<exclude name="${optional.package}/ide/VAJ*Servlet.java"
unless="servlet.present" />
<exclude name="${optional.package}/perforce/*.java" unless="jakarta.oro.present" />
<exclude name="${optional.package}/sound/*.java" unless="jmf.present" />
<exclude name="${optional.package}/junit/XMLResultAggregator.java"
unless="trax.present" />
<exclude name="${optional.package}/junit/AggregateTransformer.java"
unless="trax.present" />
<exclude name="${optional.package}/junit/XMLResultAggregator.java"
unless="xalan2.present" />
<exclude name="${optional.package}/junit/AggregateTransformer.java"
unless="xalan2.present" />
<exclude name="${optional.package}/junit/XalanExecutor.java"
unless="xalan2.present" />
<exclude name="${optional.package}/junit/Xalan2Executor.java"
unless="xalan2.present" />
<exclude name="${optional.package}/junit/Xalan1Executor.java"
unless="xalan.present" />
<exclude name="${optional.package}/jdepend/*" unless="jdepend.present" />
<exclude name="${optional.package}/sitraka/**" unless="some.regexp.support"/>
<exclude name="${optional.package}/sitraka/**" unless="trax.present"/>
<exclude name="${optional.package}/metamata/MAudit*" unless="jakarta.oro.present"/>
<exclude name="${optional.package}/metamata/MMetrics*"
unless="trax.present"/>
<exclude name="${optional.package}/metamata/**" unless="jdk1.2+" />
<exclude name="${optional.package}/Native2Ascii.java"
unless="sun.tools.present" />
<exclude name="${optional.package}/Javah.java"
unless="sun.tools.present" />
<exclude name="${ant.package}/taskdefs/Get.java"
unless="base64.present" />
<exclude name="${optional.type.package}/depend/*.java"
unless="bcel.present" />
<exclude name="${util.package}/depend/*.java"
unless="bcel.present" />
<exclude name="${optional.type.package}/depend/*.java"
unless="jdk1.2+" />
<exclude name="${util.package}/depend/*.java"
unless="jdk1.2+" />
<patternset refid="needs.jakarta.oro" />
<patternset refid="needs.jakarta.log4j" />
<patternset refid="needs.sun.uue" />
<patternset refid="needs.javamail" />
<patternset refid="needs.icontract" />
<patternset refid="needs.bsf" />
<patternset refid="needs.stylebook" />
<patternset refid="needs.netrexx" />
<patternset refid="needs.trax" />
<patternset refid="needs.xslp" />
<patternset refid="needs.xalan1" />
<patternset refid="needs.weblogic.ejbc" />
<patternset refid="needs.weblogic.ddcreator" />
<patternset refid="needs.weblogic.server" />
<patternset refid="needs.junit" />
<patternset refid="needs.netcomponents" />
<patternset refid="needs.starteam" />
<patternset refid="needs.antlr" />
<patternset refid="needs.vaj" />
<patternset refid="needs.servletapi" />
<patternset refid="needs.jmf" />
<patternset refid="needs.xalan2" />
<patternset refid="needs.jdepend" />
<patternset refid="needs.sun.tools" />
<patternset refid="needs.sun.b64" />
<patternset refid="needs.jakarta.bcel" />
</javac> </javac>


<copy todir="${build.classes}"> <copy todir="${build.classes}">
@@ -913,40 +1033,18 @@
deprecation="${deprecation}" > deprecation="${deprecation}" >
<classpath refid="tests-classpath" /> <classpath refid="tests-classpath" />


<exclude name="${optional.package}/ANTLRTest.java"
unless="antlr.present" />
<patternset refid="needs.antlr" />

<patternset refid="needs.jdk1.2+" />
<patternset refid="needs.jdk1.3+" />
<patternset refid="needs.jdk1.4+" />

<patternset refid="needs.jakarta.regexp" /> <patternset refid="needs.jakarta.regexp" />
<exclude name="${regexp.package}/JakartaOro*Test.java"
unless="jakarta.oro.present" />
<exclude name="${regexp.package}/Jdk14Regexp*Test.java"
unless="jdk1.4+" />

<exclude name="${optional.package}/metamata/*.java"
unless="jakarta.oro.present"/>

<exclude name="${optional.package}/sitraka/*.java"
unless="some.regexp.support" />
<exclude name="${optional.package}/sitraka/*.java"
unless="trax.present" />
<exclude name="${optional.package}/sitraka/XMLReportTest.java"
unless="trax.present" />

<exclude name="${optional.package}/XslpLiaisonTest.java"
unless="xslp.present"/>
<exclude name="${optional.package}/XalanLiaisonTest.java"
unless="xalan.present"/>
<exclude name="${optional.package}/TraXLiaisonTest.java"
unless="trax.present"/>

<!-- uses the context classloader -->
<exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
unless="jdk1.2+"/>

<exclude name="${optional.package}/perforce/*.java"
unless="jakarta.oro.present" />

<exclude name="${ant.package}/taskdefs/TestProcess.java"
unless="jdk1.3+" />
<patternset refid="needs.jakarta.oro" />

<patternset refid="needs.trax" />
<patternset refid="needs.xslp" />
<patternset refid="needs.xalan1" />
</javac> </javac>
</target> </target>


@@ -1001,68 +1099,66 @@


<batchtest> <batchtest>
<fileset dir="${tests.dir}"> <fileset dir="${tests.dir}">
<exclude name="org/example/**" />
<include name="**/*Test*" /> <include name="**/*Test*" />
<!-- abstract class, not a testcase -->

<!-- abstract classes, not testcases -->
<exclude name="${ant.package}/taskdefs/TaskdefsTest.java" /> <exclude name="${ant.package}/taskdefs/TaskdefsTest.java" />
<exclude name="${ant.package}/BuildFileTest.java" /> <exclude name="${ant.package}/BuildFileTest.java" />
<exclude name="${regexp.package}/RegexpMatcherTest.java" /> <exclude name="${regexp.package}/RegexpMatcherTest.java" />
<exclude name="${regexp.package}/RegexpTest.java" /> <exclude name="${regexp.package}/RegexpTest.java" />

<exclude name="${optional.package}/AbstractXSLTLiaisonTest.java" />
<!-- helper classes, not testcases --> <!-- helper classes, not testcases -->
<exclude name="org/example/**" />
<exclude name="${ant.package}/taskdefs/TaskdefTest*Task.java" /> <exclude name="${ant.package}/taskdefs/TaskdefTest*Task.java" />


<!-- these tests need to be localised before being ran???? -->
<exclude name="${optional.package}/PvcsTest.java" />
<!-- interactive test -->
<exclude name="${ant.package}/taskdefs/TestProcess.java" />


<!-- only run these tests if their required libraries are installed -->
<exclude name="${optional.package}/ANTLRTest.java"
unless="antlr.present" />
<!-- only run these tests if their required libraries are
installed -->
<patternset refid="needs.jdk1.2+" />
<patternset refid="needs.jdk1.4+" />
<patternset refid="needs.jakarta.regexp" /> <patternset refid="needs.jakarta.regexp" />
<exclude name="${regexp.package}/JakartaOro*Test.java"
unless="jakarta.oro.present" />
<exclude name="${regexp.package}/Jdk14Regexp*Test.java"
unless="jdk1.4+" />
<exclude name="${optional.package}/metamata/*.java"
unless="jakarta.oro.present"/>
<exclude name="${optional.package}/ide/VAJExportTest.java" unless="vaj.present" />
<exclude name="${optional.package}/sitraka/*.java" unless="jakarta.oro.present" />
<patternset refid="needs.jakarta.oro" />
<patternset refid="needs.vaj" />
<patternset refid="needs.antlr" />
<patternset refid="needs.xalan1" />
<patternset refid="needs.xslp" />
<!-- runtime dependencies that are different from compile
time dependencies -->
<exclude name="${optional.package}/ReplaceRegExpTest.java" <exclude name="${optional.package}/ReplaceRegExpTest.java"
unless="some.regexp.support" /> unless="some.regexp.support" />
<exclude name="${optional.package}/XslpLiaisonTest.java"
unless="xslp.present"/>
<exclude name="${optional.package}/XalanLiaisonTest.java"
unless="xalan.present"/>
<exclude name="${optional.package}/sitraka/*.java"
unless="some.regexp.support" />


<!-- uses the context classloader -->
<exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
unless="jdk1.2+"/>
<!-- fails if testcases can be loaded from the system classloader -->
<!-- fail if testcases can be loaded from the system classloader -->
<exclude name="${optional.package}/junit/JUnitClassLoaderTest.java" <exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
if="tests.are.on.system.classpath"/> if="tests.are.on.system.classpath"/>
<exclude name="${optional.package}/sitraka/XMLReportTest.java"
if="tests.are.on.system.classpath"/>


<exclude name="${optional.package}/perforce/*.java"
unless="jakarta.oro.present" />

<!-- it's an abstract class, not a test -->
<exclude name="${optional.package}/AbstractXSLTLiaisonTest.java" />
<!-- these tests need to be localised before being ran???? -->
<exclude name="${optional.package}/PvcsTest.java" />


<!-- ehm, this is not really a TraX test but rather a xalan2 test..--> <!-- ehm, this is not really a TraX test but rather a xalan2 test..-->
<exclude name="${optional.package}/TraXLiaisonTest.java" unless="xalan2.present"/>
<exclude name="${optional.package}/TraXLiaisonTest.java"
unless="xalan2.present"/>

<!-- needs BSF to work -->
<exclude name="${optional.package}/XalanLiaisonTest.java"
unless="bsf.present" />


<!-- <!--
XXX need to figure out what's causing this InvocationTargetException XXX need to figure out what's causing this InvocationTargetException
--> -->
<exclude name="${optional.package}/junit/JUnitTestRunnerTest.java" <exclude name="${optional.package}/junit/JUnitTestRunnerTest.java"
unless="jdk1.2+" /> unless="jdk1.2+" />

<!-- DateTime handling seems to be broken in JDK 1.1 --> <!-- DateTime handling seems to be broken in JDK 1.1 -->
<exclude name="${util.package}/DateUtilsTest.java" <exclude name="${util.package}/DateUtilsTest.java"
unless="jdk1.2+" /> unless="jdk1.2+" />


<!-- interactive test -->
<exclude name="${ant.package}/taskdefs/TestProcess.java" />

<!-- These tests only passes if testcases and Ant classes have <!-- These tests only passes if testcases and Ant classes have
been loaded by the same classloader - will throw been loaded by the same classloader - will throw
IllegalAccessExceptions otherwise. --> IllegalAccessExceptions otherwise. -->
@@ -1072,6 +1168,8 @@
unless="tests.and.ant.share.classloader" /> unless="tests.and.ant.share.classloader" />
<exclude name="${optional.package}/TraXLiaisonTest.java" <exclude name="${optional.package}/TraXLiaisonTest.java"
unless="tests.and.ant.share.classloader" /> unless="tests.and.ant.share.classloader" />
<exclude name="${optional.package}/metamata/MAuditParserTest.java"
unless="tests.and.ant.share.classloader" />


<!-- failure of this test case kills the current JVM <!-- failure of this test case kills the current JVM
so until the defect is actually fixed it is taken so until the defect is actually fixed it is taken


+ 2
- 2
docs/manual/OptionalTasks/script.html View File

@@ -10,7 +10,7 @@
<h2><a name="script">Script</a></h2> <h2><a name="script">Script</a></h2>
<h3>Description</h3> <h3>Description</h3>
<p>Execute a script in a <p>Execute a script in a
<a href="http://oss.software.ibm.com/developerworks/opensource/bsf/" target="_top">BSF</a> supported language.</p>
<a href="http://www-124.ibm.com/developerworks/projects/bsf" target="_top">BSF</a> supported language.</p>
<p><b>Note:</b> This task depends on external libraries not included in the Ant distribution. <p><b>Note:</b> This task depends on external libraries not included in the Ant distribution.
See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p> See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p>
<p>All items (tasks, targets, etc) of the running project are <p>All items (tasks, targets, etc) of the running project are
@@ -115,7 +115,7 @@ BUILD SUCCESSFUL
</pre></blockquote> </pre></blockquote>


<hr> <hr>
<p align="center">Copyright &copy; 2001 Apache Software Foundation. All rights
<p align="center">Copyright &copy; 2001-2002 Apache Software Foundation. All rights
Reserved.</p> Reserved.</p>


</body> </body>


+ 6
- 0
docs/manual/install.html View File

@@ -352,6 +352,12 @@ Installing Ant / Optional Tasks</a> section above.</p>
<td><a href="http://java.sun.com/products/javabeans/glasgow/jaf.html" <td><a href="http://java.sun.com/products/javabeans/glasgow/jaf.html"
target="_top">http://java.sun.com/products/javabeans/glasgow/jaf.html</a></td> target="_top">http://java.sun.com/products/javabeans/glasgow/jaf.html</a></td>
</tr> </tr>
<tr>
<td>jdepend.jar</td>
<td>jdepend task</td>
<td><a href="http://www.clarkware.com/software/JDepend.html"
target="_top">http://www.clarkware.com/software/JDepend.html</a></td>
</tr>
</table> </table>
<br> <br>
<hr> <hr>


Loading…
Cancel
Save