Commit 98a56db8 authored by Emmanuel Bourg's avatar Emmanuel Bourg

New upstream version 1.10.3

parent 1fd7966d
A N T
Apache Ant
What is it?
......@@ -52,10 +52,13 @@
Documentation
-------------
Documentation is available in HTML format, in the docs/ directory.
Documentation is available in HTML format, in the manual/ directory.
For information about building and installing Ant, see
docs/manual/index.html
manual/install.html
The manual for the latest release of Ant is available online at
<https://ant.apache.org/manual/index.html>.
The latest version of the manual is available online at
<https://rawgit.com/apache/ant/master/manual/index.html>.
Licensing
---------
......
Changes from Ant 1.10.2 TO Ant 1.10.3
=====================================
Changes that could break older environments:
-------------------------------------------
* Previous versions of Ant's copy task would throw a BuildException
if the "name" of the resource to copy was null. Starting
this version, the copy task instead silently skips such resources
and no longer throws an exception.
ant-dev list https://www.mail-archive.com/dev@ant.apache.org/msg46634.html
* Reverted the signature change of various clone method
implementation in Ant's data-types introduced with 1.10.2 as they
broke subclasses of said data-types which tried to override clone.
Fixed bugs:
-----------
* Fixed NullPointerException in ChainedMapper
Bugzilla Report 62086
* Fixed NullPointerException when a mappedresource is used in pathconvert
Bugzilla Report 62076
* Fixed an issue where a string, when used as a resource collection, within
tokens, would be replaced by property values
Bugzilla Report 62147
* Added a workaround for a bug in the jarsigner tool to <verifyjar>
which requires the -storepass command line argument when verifying
signatures using -strict together with a PKCS12 keystore. Unlike
when signing the jar it will not prompt for the keystore's password
and read it from standard input.
This means Ant will now pass the keystore's password on the command
line when using <verifyjar>, which poses a security risk you should
be aware of.
Bugzilla Report 62194
Other changes:
--------------
* Allow Saxon to be used for junitreport XSL transformation
Github Pull Request #57
* when running on Java 11+ rmic will fail early if iiop or idl are
requested. Java11 removes support for CORBA and the switches have
been removed from the rmic tool.
* A new junitlauncher task which support JUnit 5 test framework.
Bugzilla Report 61796
Changes from Ant 1.10.1 TO Ant 1.10.2
=====================================
......
This diff is collapsed.
......@@ -38,6 +38,10 @@
<first>Adam</first>
<last>Bryzak</last>
</name>
<name>
<first>Adam</first>
<last>Retter</last>
</name>
<name>
<first>Adam</first>
<last>Sotona</last>
......
......@@ -109,6 +109,7 @@ Set -Ddest=LOCATION on the command line
<attribute name="project"/>
<attribute name="archive" default="@{project}"/>
<attribute name="repository" default="${m2.repo}"/>
<attribute name="id" default="central"/>
<sequential>
<fail>
Unknown archive @{archive} -no property @{archive}.version defined in ${lib.dir}/libraries.properties.
......@@ -118,7 +119,6 @@ Set -Ddest=LOCATION on the command line
</not>
</condition>
</fail>
<artifact:remoteRepository url="@{repository}" id="central"/>
<artifact:dependencies pathID="@{archive}.path" useScope="runtime">
<dependency groupId="@{project}"
artifactId="@{archive}"
......@@ -127,6 +127,7 @@ Set -Ddest=LOCATION on the command line
<exclusion groupId="org.apache.ant" artifactId="ant"/>
<exclusion groupId="org.apache.ant" artifactId="ant-launcher"/>
</dependency>
<artifact:remoteRepository url="@{repository}" id="@{id}"/>
</artifact:dependencies>
<!-- now we are left with the problem of getting the files into our directory -->
<copy todir="${dest.dir}">
......@@ -231,6 +232,24 @@ Set -Ddest=LOCATION on the command line
<f2 project="org.hamcrest" archive="hamcrest-library"/>
</target>
<target name="junitlauncher"
description="load junitlauncher libraries"
depends="init">
<f2 project="org.junit.platform" archive="junit-platform-launcher" />
</target>
<target name="junit-engine-jupiter"
description="load junit jupiter engine libraries (necessary only for internal Ant project tests)"
depends="init">
<f2 project="org.junit.jupiter" archive="junit-jupiter-engine" />
</target>
<target name="junit-engine-vintage"
description="load junit vintage engine libraries (necessary only for internal Ant project tests)"
depends="init">
<f2 project="org.junit.vintage" archive="junit-vintage-engine" />
</target>
<target name="xml"
description="load full XML libraries (Xalan and xml-resolver)"
depends="init">
......@@ -328,9 +347,9 @@ Set -Ddest=LOCATION on the command line
<target name="jai"
description="load Java Advanced Imaging"
depends="init">
<f2 project="javax.media" archive="jai-core"
<f2 project="javax.media" archive="jai-core" id="jboss"
repository="https://repository.jboss.org/nexus/content/groups/public/"/>
<f2 project="com.sun.media" archive="jai-codec"
<f2 project="com.sun.media" archive="jai-codec" id="jboss"
repository="https://repository.jboss.org/nexus/content/groups/public/"/>
</target>
......@@ -366,5 +385,6 @@ Set -Ddest=LOCATION on the command line
<target name="all"
description="load all the libraries (except jython)"
depends="antunit,ivy,logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai,xz,netrexx"/>
depends="antunit,ivy,logging,junit,junitlauncher,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,
javamail,jspc,jai,xz,netrexx,junit-engine-vintage,junit-engine-jupiter"/>
</project>
......@@ -52,7 +52,12 @@ javax.mail-api.version=1.6.0
jdepend.version=2.9.1
jruby.version=1.6.8
junit.version=4.12
rhino.version=1.7.7.2
rhino.version=1.7.8
junit-platform-launcher.version=1.1.0
# Only used for internal tests in Ant project
junit-vintage-engine.version=5.1.0
# Only used for internal tests in Ant project
junit-jupiter-engine.version=5.1.0
jsch.version=0.1.54
jython.version=2.7.0
# log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo
......@@ -62,7 +67,7 @@ servlet-api.version=2.3
which.version=1.0
xalan.version=2.7.2
xml-resolver.version=1.2
xz.version=1.6
xz.version=1.8
# paired
jacl.version=1.2.6
tcljava.version=${jacl.version}
......@@ -14,43 +14,40 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
<title>Apache AntWork Plugin for the Jext Java Text Editor</title>
</head>
<body>
<h1>AntWork Plugin for the Jext Java Text Editor</h1>
<a name="authors"></a>by<ul>
<li>Klaus Hartlage
(<a href="mailto:KHartlage@t-online.de">KHartlage@t-online.de</a>)</li>
<h1 id="authors">AntWork Plugin for the Jext Java Text Editor</h1>
by
<ul>
<li>Klaus Hartlage (<a href="mailto:KHartlage@t-online.de">KHartlage@t-online.de</a>)</li>
</ul>
<hr>
<hr/>
<p>You can download the plugin at: <a
href="ftp://jext.sourceforge.net/pub/jext/plugins/AntWork.zip">ftp://jext.sourceforge.net/pub/jext/plugins/AntWork.zip</a></p>
<p>You can download the plugin
at: <a href="http://sourceforge.net/projects/jext/files/OldFiles/antwork_plugin.zip/download"
target="_top">http://sourceforge.net/projects/jext/files/OldFiles/antwork_plugin.zip/download</a></p>
<h2>Installation instructions from the Readme.txt:</h2>
<h2>Installation instructions from the Readme.txt</h2>
<p>You have to enable the Jext Console to see the Apache Ant output (menu:
Edit-&gt;Options... - General Panel), because the Ant messages are
redirected to the Jext console.</p>
Edit&rarr;Options&hellip;&ndash;General Panel), because Ant messages are redirected to the Jext
console.</p>
<p>You can configure the Ant call in the Jext menu: Edit-&gt;Options... -
Plugin Options - Antwork Plugin Panel; here you can set the ant home
directory and the path to your build file.</p>
<p>You can configure the Ant call in the Jext menu: Edit&rarr;Options&hellip;&ndash; Plugin
Options&ndash;Antwork Plugin Panel; here you can set Ant home directory and the path to your build
file.</p>
<p>You can start AntWork in the menu: Plugins-&gt;Ant-&gt;Work Now! In the
appearing dialog box you can enter the target which you want to
compile.</p>
<p>You can start AntWork in the menu: Plugins&rarr;Ant&rarr;Work Now! In the appearing dialog box
you can enter the target which you want to compile.</p>
<p>If a javac error occurs in the ant run an error-list opens within
Jext. With a double-click on the error-message you jump to the error
in the specified java text file.</p>
<p>If a <code>javac</code> error occurs in the Ant run, an error list opens within Jext. With a
double click on the error message you jump to the error in the specified Java source file.</p>
</body></html>
</body>
</html>
......@@ -24,117 +24,113 @@
<body>
<h2 id="log">BorlandDeploy Tool</h2>
<h2 id="log">BorlandDeployTool</h2>
<p>by Benoit Moussaud (<a href="mailto:benoit.moussaud@criltelecom.com">benoit.moussaud@criltelecom.com</a>)</p>
<h3>Description</h3>
<p>The BorlandDeployTool is a vendor specific nested element for the Ejbjar optional task.</p>
<p>BorlandDeploymentTool is dedicated to the Borland Application Server 4.5.x and Borland
Enterprise Server 5.x. It generates and compiles the stubs and skeletons for all ejb described into the
Deployment Descriptor, builds the jar file including the support files and
verify whether the produced jar is valid or not.</p>
<p>BorlandDeployTool is dedicated to the Borland Application Server 4.5.x and Borland Enterprise
Server 5.x. It generates and compiles the stubs and skeletons for all EJBs described in the
Deployment Descriptor, builds the jar file including the support files and verifies whether the
produced jar is valid or not.</p>
<p>Benoit Moussaud maintains a separate <a
href="http://www.moussaud.org/ejbjar.html">FAQ</a> for this task at
his homepage.</p>
<p>Benoit Moussaud maintains a
separate <a href="https://web.archive.org/web/20141122083215/http://www.moussaud.org/ejbjar.html"
target="_top">FAQ</a> for this task at his homepage.</p>
<h3>Borland element</h3>
<table>
<table class="attr">
<tr>
<td valign="top" width="63"><b>Attribute</b></td>
<td valign="top" width="915"><b>Description</b></td>
<td align="center" valign="top" width="62"><b>Required</b></td>
<th>Attribute</th>
<th>Description</th>
<th>Required</th>
</tr>
<tr>
<td valign="top" width="63">destdir</td>
<td valign="top" width="915">The base directory into which the generated borland
ready jar files are deposited</td>
<td align="center" valign="middle" width="62">yes</td>
<td>destdir</td>
<td>The base directory in which the generated Borland ready jar files are stored</td>
<td>Yes</td>
</tr>
<tr>
<td valign="top" width="63">debug</td>
<td valign="top" width="915">If true, turn on the debug mode for each borland
tools (java2iiop, iastool ...) default = false</td>
<td align="center" valign="middle" width="62">no</td>
<td>debug</td>
<td>If <q>true</q>, turn on the debug mode for each Borland tools
(<code>java2iiop</code>, <code>iastool</code>, ...)</td>
<td>No; default <q>false</q></td>
</tr>
<tr>
<td valign="top" width="63">verify</td>
<td valign="top" width="915">If true, turn on the verification at the end
of the jar production (default = false)</td>
<td align="center" valign="middle" width="62">no</td>
<td>verify</td>
<td>If <q>true</q>, turn on the verification at the end of the jar production.</td>
<td>No; default <q>false</q></td>
</tr>
<tr>
<td valign="top" width="63">verifyargs</td>
<td valign="top" width="915">extra parameter for verify command</td>
<td align="center" valign="middle" width="62">no</td>
<td>verifyargs</td>
<td>extra parameter for verify command</td>
<td>No</td>
</tr>
<tr>
<td valign="top" width="63">suffix</td>
<td valign="top" width="915">String value appended to the basename of the
deployment descriptor to create the filename of the Borland EJB jar file.</td>
<td align="center" valign="middle" width="62">No, defaults to '-ejb.jar'.</td>
<td>suffix</td>
<td>String value appended to the basename of the deployment descriptor to create the filename of
the Borland EJB jar file.</td>
<td>No; defaults to <q class="no-break">-ejb.jar</q></td>
</tr>
<tr>
<td valign="top" width="63">basdtd</td>
<td valign="top" width="915"><b>Deprecated</b>. Defines the location of the
DTD which covers the Borland specific deployment descriptors.
This should not be necessary if you have borland in your classpath. If you
do not, you should use a nested
<td>basdtd</td>
<td><em><u>Deprecated</u></em>. Defines the location of the DTD which covers the Borland
specific deployment descriptors. This should not be necessary if you have borland in your
classpath. If you do not, you should use a nested
<a href="ejb.html#ejbjar-dtd"><code>&lt;dtd&gt;</code></a> element, described
in the ejbjar task documentation.</td>
<td align="center" valign="middle" width="62">no</td>
<td>No</td>
</tr>
<tr>
<td valign="top" width="63">ejbdtd</td>
<td valign="top" width="915"><b>Deprecated</b>. Defines the location of the
ejb-jar DTD in the class hierarchy. This should not be necessary
if you have borland in your classpath. If you do not, you should use a
nested <a href="ejb.html#ejbjar-dtd"><code>&lt;dtd&gt;</code></a> element,
described in the ejbjar task
documentation.</td>
<td align="center" valign="middle" width="62">no</td>
<td>ejbdtd</td>
<td><em><u>Deprecated</u></em>. Defines the location of the ejb-jar DTD in the class
hierarchy. This should not be necessary if you have borland in your classpath. If you do not,
you should use a nested <a href="ejb.html#ejbjar-dtd"><code>&lt;dtd&gt;</code></a> element,
described in the ejbjar task documentation.</td>
<td>No</td>
</tr>
<tr>
<td valign="top" width="63">generateclient</td>
<td valign="top" width="915">If true, turn on the generation of the corresponding
ejbjar (default = false)</td>
<td align="center" valign="middle" width="62">no</td>
<td>generateclient</td>
<td>If <q>true</q>, turn on the generation of the corresponding EJB jar.</td>
<td>No; default <q>false</q></td>
</tr>
<tr>
<td valign="top" width="63">version</td>
<td valign="top" width="915">set the Borland Application Version.
<ul>
<li>4 means B.A.S (Borland Application Server) 4.x, target will add ejb-inprise.xml file</li>
<li>5 means B.E.S (Borland Application Server) 5.x, target will add ejb-borland.xml file</li>
</ul>
</td>
<td align="center" valign="middle" width="62">No, defaults to 4</td>
<td>version</td>
<td>set the Borland Application Version.
<ul>
<li>4 means B.A.S (Borland Application Server) 4.x, target will add ejb-inprise.xml file</li>
<li>5 means B.E.S (Borland Application Server) 5.x, target will add ejb-borland.xml file</li>
</ul>
</td>
<td>No; defaults to <q>4</q></td>
</tr>
<tr>
<td valign="top" width="63">java2iiopParams</td>
<td valign="top" width="915">If filled, the params are added to the java2iiop command (ex: -no_warn_missing_define)</td>
<td align="center" valign="middle" width="62">no</td>
<td>java2iiopParams</td>
<td>If filled, the params are added to the <kbd>java2iiop</kbd> command
(ex: <kbd>-no_warn_missing_define</kbd>)</td>
<td>No</td>
</tr>
</table>
<h3>Examples</h3>
<p>The following build.xml snippet is an example of how to use Borland element
into the ejbjar task</p>
<pre> &lt;ejbjar srcdir=&quot;${build.classes}&quot; basejarname=&quot;vsmp&quot; descriptordir=&quot;${rsc.dir}/hrmanager&quot;&gt;
&lt;borland destdir=&quot;lib&quot; verify=&quot;on&quot; generateclient=&quot;on&quot; version=&quot;5&quot;&gt;
&lt;classpath refid=&quot;classpath&quot;/&gt;
&lt;/borland&gt;
&lt;include name=&quot;**\ejb-jar.xml&quot;/&gt;
&lt;support dir=&quot;${build.classes}&quot;&gt;
&lt;include name=&quot;demo\*.class&quot;/&gt;
&lt;include name=&quot;demo\helper\*.class&quot;/&gt;
&lt;/support&gt;
&lt;/ejbjar&gt;</pre>
<pre>The borland element will generate into the lib dir an ejb jar file using the deployment descriptor placed into the ${rsc.dir}/hrmanager directory.
The verify phase is turned on and the generate client phase as well.
</pre>
<p>The following <samp>build.xml</samp> snippet is an example of how to use Borland element in
the <code>ejbjar</code> task</p>
<pre>
&lt;ejbjar srcdir=&quot;${build.classes}&quot; basejarname=&quot;vsmp&quot; descriptordir=&quot;${rsc.dir}/hrmanager&quot;&gt;
&lt;borland destdir=&quot;lib&quot; verify=&quot;on&quot; generateclient=&quot;on&quot; version=&quot;5&quot;&gt;
&lt;classpath refid=&quot;classpath&quot;/&gt;
&lt;/borland&gt;
&lt;include name=&quot;**\ejb-jar.xml&quot;/&gt;
&lt;support dir=&quot;${build.classes}&quot;&gt;
&lt;include name=&quot;demo\*.class&quot;/&gt;
&lt;include name=&quot;demo\helper\*.class&quot;/&gt;
&lt;/support&gt;
&lt;/ejbjar&gt;</pre>
<p>The <code>borland</code> element will generate into the <samp>lib</samp> directory an EJB jar
file using the deployment descriptor placed into the <samp>${rsc.dir}/hrmanager</samp> directory.
The verify phase is turned on and the generate client phase as well.</p>
</body>
</html>
......@@ -27,62 +27,61 @@
<h2 id="log">BorlandGenerateClient</h2>
<p>by Benoit Moussaud (<a href="mailto:benoit.moussaud@criltelecom.com">benoit.moussaud@criltelecom.com</a>)</p>
<h3>Description</h3>
<p>The BorlandGenerateClient is a task dedicated to Borland Application Server
v 4.5. It offers to generate the client jar file corresponding to an ejb jar
file.</p>
<p>The BorlandGenerateClient is a task dedicated to Borland Application Server v 4.5. It offers to
generate the client jar file corresponding to an EJB jar file.</p>
<h3>Parameters</h3>
<table>
<table class="attr">
<tr>
<td valign="top" width="63"><b>Attribute</b></td>
<td valign="top" width="915"><b>Description</b></td>
<td align="center" valign="top" width="62"><b>Required</b></td>
<th>Attribute</th>
<th>Description</th>
<th>Required</th>
</tr>
<tr>
<td valign="top" width="63">ejbjar</td>
<td valign="top" width="915">ejb jar file</td>
<td align="center" valign="middle" width="62">yes</td>
<td>ejbjar</td>
<td>EJB jar file</td>
<td>yes</td>
</tr>
<tr>
<td valign="top" width="63">debug</td>
<td valign="top" width="915">If true, turn on the debug mode for each borland
tools (java2iiop, iastool ...) default = false</td>
<td align="center" valign="middle" width="62">no</td>
<td>debug</td>
<td>If <q>true</q>, turn on the debug mode for each Borland tool
(<code>java2iiop</code>, <code>iastool</code>, ...)</td>
<td>no; default <q>false</q></td>
</tr>
<tr>
<td valign="top" width="63">clientjar</td>
<td valign="top" width="915">client jar file name. If missing the client jar
file name is build using the ejbjar file name: ejbjar = hellobean-ejb.jar
=&gt; hellobean-ejbclient.jar</td>
<td align="center" valign="middle" width="62">no</td>
<td>clientjar</td>
<td>client jar file name. If missing the client jar file name is build using
the <var>ejbjar</var> file name: <var>ejbjar</var>=<q>hellobean-ejb.jar</q>
&rArr; <q>hellobean-ejbclient.jar</q></td>
<td>no</td>
</tr>
<tr>
<td valign="top" width="63">mode</td>
<td valign="top" width="915">choose the command launching mode. Two values:
java or fork. default = fork. java is not supported for version=5.Possibility to specify a classpath.</td>
<td align="center" valign="middle" width="62">no</td>
<td>mode</td>
<td>choose the command launching mode. Two values: <q>java</q> or <q>fork</q>
(default). <q>java</q> is not supported for <var>version</var>=<q>5</q>. Possibility to
specify a classpath.</td>
<td>no</td>
</tr>
<tr>
<td valign="top" width="63">version</td>
<td valign="top" width="915">set the Borland Application Version.
<ul>
<li>4 means B.A.S (Borland Application Server 4.x)</li>
<li>5 means B.E.S (Borland Application Server 5.x)</li>
</ul>
</td>
<td align="center" valign="middle" width="62">No, defaults to 4</td>
<td>version</td>
<td>set the Borland Application Version.
<ul>
<li><q>4</q> means B.A.S (Borland Application Server 4.x)</li>
<li><q>5</q> means B.E.S (Borland Application Server 5.x)</li>
</ul>
</td>
<td>No; defaults to <q>4</q></td>
</tr>
</table>
<h3>Examples</h3>
<p>The following build.xml snippet is an example of how to use Borland element
into the ejbjar task using the java mode.</p>
<p>The following <samp>build.xml</samp> snippet is an example of how to use Borland element in
the <code>ejbjar</code> task using the <q>fork</q> <var>mode</var>.</p>
<pre>
&lt;blgenclient ejbjar=&quot;lib/secutest-ejb.jar&quot; clientjar=&quot;lib/client.jar&quot; debug=&quot;true&quot; mode=&quot;fork&quot;&gt; version=&quot;5&quot;&gt;
&lt;blgenclient ejbjar=&quot;lib/secutest-ejb.jar&quot; clientjar=&quot;lib/client.jar&quot; debug=&quot;true&quot; mode=&quot;fork&quot; version=&quot;5&quot;&gt;
&lt;classpath&gt;
&lt;pathelement location=&quot;mymodule.jar&quot;/&gt;
&lt;/classpath&gt;
&lt;/blgenclient&gt;
</pre>
&lt;/blgenclient&gt;</pre>
</body>
</html>
This diff is collapsed.
This diff is collapsed.
......@@ -26,175 +26,123 @@
<h2 id="antlr">ANTLR</h2>