Author: antoine
Date: Sat Apr 22 08:02:28 2006
New Revision: 396131
URL: http://svn.apache.org/viewcvs?rev=396131&view=rev
Log:
removal of testlet, visual age for java, and icontract optional tasks.
Removed:
ant/core/trunk/docs/manual/Integration/VAJAntTool.html
ant/core/trunk/docs/manual/OptionalTasks/icontract.html
ant/core/trunk/docs/manual/OptionalTasks/test.html
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Test.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoad.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJProjectDescription.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ide/default.ini
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/build.xml
ant/core/trunk/docs/manual/dirtasks.html
ant/core/trunk/docs/manual/install.html
ant/core/trunk/docs/manual/optionaltasklist.html
ant/core/trunk/docs/manual/running.html
ant/core/trunk/docs/manual/tasksoverview.html
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/WHATSNEW?rev=396131&r1=396130&r2=396131&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sat Apr 22 08:02:28 2006
@@ -77,6 +77,12 @@
* support for the XSL:P XML parser has been removed.
Bugzilla Report 23455.
+* Visual Age for Java optional tasks removed.
+
+* Testlet (test) optional task removed.
+
+* Icontract optional task removed.
+
Fixed bugs:
-----------
Modified: ant/core/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/build.xml?rev=396131&r1=396130&r2=396131&view=diff
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Sat Apr 22 08:02:28 2006
@@ -264,10 +264,6 @@
</or>
</selector>
- <selector id="needs.icontract">
- <filename name="${optional.package}/IContract*"/>
- </selector>
-
<selector id="needs.netrexx">
<filename name="${optional.package}/NetRexxC*"/>
</selector>
@@ -302,10 +298,6 @@
</or>
</selector>
- <selector id="needs.vaj">
- <filename name="${optional.package}/ide/VAJ*"/>
- </selector>
-
<selector id="needs.antlr">
<filename name="${optional.package}/ANTLR*"/>
</selector>
@@ -445,9 +437,6 @@
<available property="antlr.present"
classname="antlr.Tool"
classpathref="classpath"/>
- <available property="vaj.present"
- classname="com.ibm.ivj.util.base.Workspace"
- classpathref="classpath"/>
<available property="stylebook.present"
classname="org.apache.stylebook.Engine"
classpathref="classpath"/>
@@ -463,9 +452,6 @@
<available property="jai.present"
classname="javax.media.jai.JAI"
classpathref="classpath"/>
- <available property="icontract.present"
- classname="com.reliablesystems.iContract.IContracted"
- classpathref="classpath"/>
<available property="jdepend.present"
classname="jdepend.framework.JDepend"
classpathref="classpath"/>
@@ -687,7 +673,6 @@
<selector refid="needs.apache-bsf" unless="bsf.present"/>
<selector refid="needs.stylebook" unless="stylebook.present"/>
<selector refid="needs.javamail" unless="javamail.complete"/>
- <selector refid="needs.icontract" unless="icontract.present"/>
<selector refid="needs.netrexx" unless="netrexx.present"/>
<selector refid="needs.weblogic.ejbc" unless="ejb.ejbc.present"/>
<selector refid="needs.weblogic.ddcreator"
@@ -695,7 +680,6 @@
<selector refid="needs.weblogic.server" unless="ejb.wls.present"/>
<selector refid="needs.commons-net" unless="commons.net.present"/>
<selector refid="needs.starteam" unless="starteam.present"/>
- <selector refid="needs.vaj" unless="vaj.present"/>
<selector refid="needs.antlr" unless="antlr.present"/>
<selector refid="needs.jmf" unless="jmf.present"/>
<selector refid="needs.jai" unless="jai.present"/>
@@ -867,14 +851,12 @@
<selector refid="needs.apache-bsf"/>
<selector refid="needs.stylebook"/>
<selector refid="needs.javamail"/>
- <selector refid="needs.icontract"/>
<selector refid="needs.netrexx"/>
<selector refid="needs.weblogic.ejbc"/>
<selector refid="needs.weblogic.ddcreator"/>
<selector refid="needs.weblogic.server"/>
<selector refid="needs.commons-net"/>
<selector refid="needs.starteam"/>
- <selector refid="needs.vaj"/>
<selector refid="needs.antlr"/>
<selector refid="needs.jmf"/>
<selector refid="needs.jai"/>
@@ -914,11 +896,9 @@
<optional-jar dep="apache-bsf"/>
<optional-jar dep="stylebook"/>
<optional-jar dep="javamail"/>
- <optional-jar dep="icontract"/>
<optional-jar dep="netrexx"/>
<optional-jar dep="commons-net"/>
<optional-jar dep="starteam"/>
- <optional-jar dep="vaj"/>
<optional-jar dep="antlr"/>
<optional-jar dep="jmf"/>
<optional-jar dep="jai"/>
Modified: ant/core/trunk/docs/manual/dirtasks.html
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/docs/manual/dirtasks.html?rev=396131&r1=396130&r2=396131&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/dirtasks.html (original)
+++ ant/core/trunk/docs/manual/dirtasks.html Sat Apr 22 08:02:28 2006
@@ -50,6 +50,7 @@
<code><includesfile></code> and <code><excludesfile></code>.
</li>
</ul>
+<p>
When dealing with an external file, each line of the file
is taken as a pattern that is added to the list of include or exclude
patterns.</p>
@@ -128,8 +129,9 @@
But not:
<pre>
org/apache/CVS/foo/bar/Entries (<code>foo/bar/</code>
- part does not match)</td>
+ part does not match)
</pre>
+ </td>
</tr>
<tr>
<td valign="top"><code>org/apache/jakarta/**</code></td>
@@ -201,7 +203,6 @@
<li><a
href="OptionalTasks/ejb.html#ejbjar"><code><ejbjar></code></a></li>
<li><a href="OptionalTasks/ejb.html#ejbc"><code><ejbc></code></a></li>
<li><a href="OptionalTasks/cab.html"><code><cab></code></a></li>
- <li><a
href="OptionalTasks/icontract.html"><code><icontract></code></a></li>
<li><a
href="OptionalTasks/native2ascii.html"><code><native2ascii></code></a></li>
<li><a
href="OptionalTasks/netrexxc.html"><code><netrexxc></code></a></li>
<li>
@@ -212,10 +213,7 @@
<li><a href="OptionalTasks/dotnet.html"><code><csc></code></a></li>
<li><a href="OptionalTasks/dotnet.html"><code><vbc></code></a></li>
<li><a
href="OptionalTasks/translate.html"><code><translate></code></a></li>
- <li>
- <a
href="Integration/VAJAntTool.html#vajexport"><code><vajexport></code></a>
- </li>
- <li><code><image></code></li>
+ <li><a href="OptionalTasks/image.html"><code><image></code></a></li>
<li><a href="OptionalTasks/jlink.html"><code><jlink></code></a>
(deprecated)</li>
<li><a href="OptionalTasks/jspc.html"><code><jspc></code></a></li>
<li><a href="OptionalTasks/wljspc.html"><code><wljspc></code></a></li>
@@ -280,7 +278,7 @@
href="CoreTasks/defaultexcludes.html">defaultexcludes</a> task.</p>
<hr>
-<p align="center">Copyright © 2000-2005 The Apache Software Foundation.
All
+<p align="center">Copyright © 2000-2006 The Apache Software Foundation.
All
rights Reserved.</p>
</body>
Modified: ant/core/trunk/docs/manual/install.html
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/docs/manual/install.html?rev=396131&r1=396130&r2=396131&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/install.html (original)
+++ ant/core/trunk/docs/manual/install.html Sat Apr 22 08:02:28 2006
@@ -470,13 +470,6 @@
<td>CVS repository of <a href="http://xml.apache.org/cvs.html";
target="_top">http://xml.apache.org/cvs.html</a></td>
</tr>
<tr>
- <td>testlet.jar</td>
- <td><strong>deprecated</strong> test task</td>
- <td>Build from the gzip compress tar archive in <a
- href="http://avalon.apache.org/historiccvs/testlet/";
- target="_top">http://avalon.apache.org/historiccvs/testlet/</a></td>
- </tr>
- <tr>
<td>antlr.jar</td>
<td>antlr task</td>
<td><a href="http://www.antlr.org/";
target="_top">http://www.antlr.org/</a></td>
@@ -626,15 +619,6 @@
<td>image task</td>
<td><a href="http://java.sun.com/products/java-media/jai/";
target="_top">http://java.sun.com/products/java-media/jai/</a></td>
- </tr>
- <tr>
- <td>IContract</td>
- <td>icontract task<br>
- Warning : the icontract jar file contains also antlr classes.<br>
- To make the antlr task work properly, remove
antlr/ANTLRGrammarParseBehavior.class
- from the icontract jar file installed under $ANT_HOME/lib.</td>
- <td><a href="http://www.reliable-systems.com/tools/";
- target="_top">http://www.reliable-systems.com/tools/</a></td>
</tr>
</table>
<br>
Modified: ant/core/trunk/docs/manual/optionaltasklist.html
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/docs/manual/optionaltasklist.html?rev=396131&r1=396130&r2=396131&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/optionaltasklist.html (original)
+++ ant/core/trunk/docs/manual/optionaltasklist.html Sat Apr 22 08:02:28 2006
@@ -28,7 +28,6 @@
<a href="OptionalTasks/ejb.html">EJB Tasks</a><br>
<a href="OptionalTasks/echoproperties.html">Echoproperties</a><br>
<a href="OptionalTasks/ftp.html">FTP</a><br>
-<a href="OptionalTasks/icontract.html">IContract</a><br>
<a href="OptionalTasks/image.html">Image</a><br>
<a href="OptionalTasks/jarlib-available.html">Jarlib-available</a><br>
<a href="OptionalTasks/jarlib-display.html">Jarlib-display</a><br>
@@ -71,9 +70,7 @@
<a href="OptionalTasks/stylebook.html"><i>Stylebook</i></a><br>
<a href="OptionalTasks/symlink.html">Symlink</a><br>
<a href="OptionalTasks/telnet.html">Telnet</a><br>
-<a href="OptionalTasks/test.html"><i>Test</i></a><br>
<a href="OptionalTasks/translate.html">Translate</a><br>
-<a href="Integration/VAJAntTool.html#tasks">Visual Age for Java Tasks</a><br>
<a href="OptionalTasks/vss.html#tasks">Microsoft Visual SourceSafe
Tasks</a><br>
<a href="OptionalTasks/wljspc.html">Weblogic JSP Compiler</a><br>
<a href="OptionalTasks/xmlvalidate.html">XmlValidate</a><br>
Modified: ant/core/trunk/docs/manual/running.html
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/docs/manual/running.html?rev=396131&r1=396130&r2=396131&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/running.html (original)
+++ ant/core/trunk/docs/manual/running.html Sat Apr 22 08:02:28 2006
@@ -345,7 +345,6 @@
see <a href="CoreTasks/javac.html">javac</a>,
<a href="OptionalTasks/ejb.html#ejbjar_weblogic">EJB Tasks</a>
(compiler attribute),
- <a href="OptionalTasks/icontract.html">IContract</a>,
<a href="OptionalTasks/javah.html">javah</a>
</td>
</tr>
Modified: ant/core/trunk/docs/manual/tasksoverview.html
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/docs/manual/tasksoverview.html?rev=396131&r1=396130&r2=396131&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/tasksoverview.html (original)
+++ ant/core/trunk/docs/manual/tasksoverview.html Sat Apr 22 08:02:28 2006
@@ -869,15 +869,6 @@
</tr>
<tr valign="top">
- <td nowrap><a href="OptionalTasks/icontract.html">IContract</a></td>
- <td><p>Instruments Java classes using the
- <a href="http://www.reliable-systems.com/tools/";>iContract</a> DBC
- preprocessor. This task can generate a properties file for
- <a href="http://home.sol.no/~hellesoy/icplus.html";>iControl</a>,
- a graphical user interface that lets you turn on/off assertions.</p></td>
- </tr>
-
- <tr valign="top">
<td nowrap><a href="CoreTasks/import.html">Import</a></td>
<td><p>Import another build file and potentially override targets
in it with targets of your own.</p></td>
@@ -1244,40 +1235,11 @@
report of the testcases results.</p></td>
</tr>
- <tr valign="top">
- <td nowrap><a href="OptionalTasks/test.html">Test</a></td>
- <td><p>Executes a unit test in the <code>org.apache.testlet</code>
- framework.</p></td>
- </tr>
-</table>
-
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="vaj">Visual Age for Java Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
- <tr valign="top">
- <th nowrap>Task Name</th>
- <th>Description</th>
- </tr>
-
- <tr valign="top">
- <td nowrap><a href="Integration/VAJAntTool.html">
- Visual Age for Java Tasks</a></td>
- <td><p>(See the documentation describing the Visual Age for Java
- tasks.)</p></td>
- </tr>
</table>
<hr>
-<p align="center">Copyright © 2001-2005 The Apache Software Foundation.
+<p align="center">Copyright © 2001-2006 The Apache Software Foundation.
All rights Reserved.</p>
</body>
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties?rev=396131&r1=396130&r2=396131&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Sat Apr 22 08:02:28 2006
@@ -118,7 +118,6 @@
ejbc=org.apache.tools.ant.taskdefs.optional.ejb.Ejbc
ejbjar=org.apache.tools.ant.taskdefs.optional.ejb.EjbJar
ftp=org.apache.tools.ant.taskdefs.optional.net.FTP
-icontract=org.apache.tools.ant.taskdefs.optional.IContract
ilasm=org.apache.tools.ant.taskdefs.optional.dotnet.Ilasm
ildasm=org.apache.tools.ant.taskdefs.optional.dotnet.Ildasm
image=org.apache.tools.ant.taskdefs.optional.image.Image
@@ -188,11 +187,7 @@
stylebook=org.apache.tools.ant.taskdefs.optional.StyleBook
symlink=org.apache.tools.ant.taskdefs.optional.unix.Symlink
telnet=org.apache.tools.ant.taskdefs.optional.net.TelnetTask
-test=org.apache.tools.ant.taskdefs.optional.Test
translate=org.apache.tools.ant.taskdefs.optional.i18n.Translate
-vajexport=org.apache.tools.ant.taskdefs.optional.ide.VAJExport
-vajimport=org.apache.tools.ant.taskdefs.optional.ide.VAJImport
-vajload=org.apache.tools.ant.taskdefs.optional.ide.VAJLoadProjects
vbc=org.apache.tools.ant.taskdefs.optional.dotnet.VisualBasicCompile
verifyjar=org.apache.tools.ant.taskdefs.VerifyJar
vssadd=org.apache.tools.ant.taskdefs.optional.vss.MSVSSADD
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
