bodewig 2002/10/25 00:49:26
Modified: docs Tag: ANT_15_BRANCH external.html
docs/manual/OptionalTasks Tag: ANT_15_BRANCH ejb.html
src/main/org/apache/tools/ant/taskdefs/cvslib Tag:
ANT_15_BRANCH ChangeLogParser.java
xdocs Tag: ANT_15_BRANCH external.xml
Log:
merge from HEAD
Revision Changes Path
No revision
No revision
1.48.2.16 +75 -0 jakarta-ant/docs/external.html
Index: external.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/external.html,v
retrieving revision 1.48.2.15
retrieving revision 1.48.2.16
diff -u -r1.48.2.15 -r1.48.2.16
--- external.html 24 Oct 2002 08:56:18 -0000 1.48.2.15
+++ external.html 25 Oct 2002 07:49:25 -0000 1.48.2.16
@@ -1631,6 +1631,81 @@
<table border="0" cellspacing="0"
cellpadding="2" width="100%">
<tr><td bgcolor="#828DA6">
<font color="#ffffff" face="arial,helvetica,sanserif">
+ <a name="JRun Ant Tasks"><strong>JRun Ant Tasks</strong></a>
+ </font>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+ <p>JRun 4 SP1 ships with lib/jrun-ant-tasks.jar,
which defines
+ three Ant tasks: jrun, jrunapp, and jrunjmx. Documentation
+ for the tasks can be found in JRun under
+ docs/ant/jrun.html.</p>
+ <p>Note that the service pack must be
installed on top of an
+ existing JRun 4 installation.</p>
+ <table>
+ <tr>
+ <td bgcolor="#039acc" colspan="" rowspan=""
+ valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ Compatibility:
+ </font>
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
+ valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ Ant 1.4 or higher
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="#039acc" colspan="" rowspan=""
+ valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ URL:
+ </font>
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
+ valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ <a
href="http://dynamic.macromedia.com/bin/MM/software/trial/hwswrec.jsp?product=jrun_sp";>http://dynamic.macromedia.com/bin/MM/software/trial/hwswrec.jsp?product=jrun_sp</a>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="#039acc" colspan="" rowspan=""
+ valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ Contact:
+ </font>
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
+ valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ <a href="mailto:[EMAIL PROTECTED]">Brian Deitte</a>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="#039acc" colspan="" rowspan=""
+ valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ License:
+ </font>
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
+ valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ Commercial
+ </font>
+ </td>
+ </tr>
+ </table>
+ </blockquote>
+ </td></tr>
+ </table>
+ <table border="0" cellspacing="0"
cellpadding="2" width="100%">
+ <tr><td bgcolor="#828DA6">
+ <font color="#ffffff" face="arial,helvetica,sanserif">
<a name="Macker"><strong>Macker</strong></a>
</font>
</td></tr>
No revision
No revision
1.23.2.14 +2 -2 jakarta-ant/docs/manual/OptionalTasks/ejb.html
Index: ejb.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/OptionalTasks/ejb.html,v
retrieving revision 1.23.2.13
retrieving revision 1.23.2.14
diff -u -r1.23.2.13 -r1.23.2.14
--- ejb.html 2 Oct 2002 14:48:48 -0000 1.23.2.13
+++ ejb.html 25 Oct 2002 07:49:25 -0000 1.23.2.14
@@ -827,7 +827,7 @@
<p>The <support> nested element is used to supply additional classes
(files) to be included in the generated jars. The <support> element is
a
-FileSet, so it can either reference a fileset declared elsewhere or it can be
+<a href="../CoreTypes/fileset.html">FileSet</a>, so it can either reference
a fileset declared elsewhere or it can be
defined in-place with the appropriate <include> and <exclude>
nested
elements. The files in the support fileset are added into the generated EJB
jar
in the same relative location as their location within the support fileset.
Note
No revision
No revision
1.14.2.3 +3 -3
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
Index: ChangeLogParser.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- ChangeLogParser.java 24 Oct 2002 23:27:29 -0000 1.14.2.2
+++ ChangeLogParser.java 25 Oct 2002 07:49:25 -0000 1.14.2.3
@@ -110,7 +110,7 @@
}
return array;
}
-
+
/**
* Receive notification about the process writing
* to standard output.
@@ -275,4 +275,4 @@
m_previousRevision = null;
}
-}
\ No newline at end of file
+}
No revision
No revision
1.35.2.16 +30 -0 jakarta-ant/xdocs/external.xml
Index: external.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/xdocs/external.xml,v
retrieving revision 1.35.2.15
retrieving revision 1.35.2.16
diff -u -r1.35.2.15 -r1.35.2.16
--- external.xml 24 Oct 2002 08:56:18 -0000 1.35.2.15
+++ external.xml 25 Oct 2002 07:49:26 -0000 1.35.2.16
@@ -597,6 +597,36 @@
</table>
</subsection>
+ <subsection name="JRun Ant Tasks">
+
+ <p>JRun 4 SP1 ships with lib/jrun-ant-tasks.jar, which defines
+ three Ant tasks: jrun, jrunapp, and jrunjmx. Documentation
+ for the tasks can be found in JRun under
+ docs/ant/jrun.html.</p>
+
+ <p>Note that the service pack must be installed on top of an
+ existing JRun 4 installation.</p>
+
+ <table>
+ <tr>
+ <th>Compatibility:</th>
+ <td>Ant 1.4 or higher</td>
+ </tr>
+ <tr>
+ <th>URL:</th>
+ <td><a
href="http://dynamic.macromedia.com/bin/MM/software/trial/hwswrec.jsp?product=jrun_sp";>http://dynamic.macromedia.com/bin/MM/software/trial/hwswrec.jsp?product=jrun_sp</a></td>
+ </tr>
+ <tr>
+ <th>Contact:</th>
+ <td><a href="mailto:[EMAIL PROTECTED]">Brian Deitte</a></td>
+ </tr>
+ <tr>
+ <th>License:</th>
+ <td>Commercial</td>
+ </tr>
+ </table>
+ </subsection>
+
<subsection name="Macker">
<p>A build-time architectural testing tool, designed
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
