bodewig 01/11/08 08:16:08
Modified: . WHATSNEW
docs/manual/CoreTasks ear.html jar.html war.html
src/main/org/apache/tools/ant/taskdefs Jar.java
Log:
JARs are never empty.
PR: 4448
This probably is not what the reporting user intended ...
Revision Changes Path
1.164 +4 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- WHATSNEW 2001/11/05 08:14:17 1.163
+++ WHATSNEW 2001/11/08 16:16:08 1.164
@@ -24,6 +24,10 @@
that only one test could be running at the same time - this is not
necessarily true, see junit.extensions.ActiveTestSuite.
+* <jar>'s whenEmpty attribute is useless as JARs are never empty, they
+ contain at least a manifest file, therefore it will now print a
+ warning and do nothing.
+
Other changes:
--------------
1.8 +0 -5 jakarta-ant/docs/manual/CoreTasks/ear.html
Index: ear.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/ear.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ear.html 2001/10/30 10:05:34 1.7
+++ ear.html 2001/11/08 16:16:08 1.8
@@ -97,11 +97,6 @@
the destination file if it already exists.</td>
<td valign="top" align="center">No</td>
</tr>
- <tr>
- <td valign="top">whenempty</td>
- <td valign="top">Behavior to use if no files match.</td>
- <td valign="top" align="center">No</td>
- </tr>
</table>
<h3>Nested elements</h3>
<h4>metainf</h4>
1.10 +0 -9 jakarta-ant/docs/manual/CoreTasks/jar.html
Index: jar.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/jar.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jar.html 2001/10/30 10:05:34 1.9
+++ jar.html 2001/11/08 16:16:08 1.10
@@ -38,10 +38,6 @@
updated with the files specified. When set to <code>no</code> (the
default) the JAR file is overwritten. An example use of this is
provided in the <a href="zip.html">Zip task documentation</a>.</p>
-<p>The <code>whenempty</code> parameter controls what happens when no files
match.
-If <code>create</code> (the default), the JAR is created anyway with only a
manifest.
-If <code>skip</code>, the JAR is not created and a warning is issued.
-If <code>fail</code>, the JAR is not created and the build is halted with an
error.</p>
<p>(The Jar task is a shortcut for specifying the manifest file of a JAR
file.
The same thing can be accomplished by using the <i>fullpath</i>
attribute of a zipfileset in a Zip task. The one difference is that if the
@@ -122,11 +118,6 @@
<td valign="top">update</td>
<td valign="top">indicates whether to update or overwrite
the destination file if it already exists.</td>
- <td valign="top" align="center">No</td>
- </tr>
- <tr>
- <td valign="top">whenempty</td>
- <td valign="top">Behavior to use if no files match.</td>
<td valign="top" align="center">No</td>
</tr>
</table>
1.9 +0 -5 jakarta-ant/docs/manual/CoreTasks/war.html
Index: war.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/war.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- war.html 2001/10/30 10:05:34 1.8
+++ war.html 2001/11/08 16:16:08 1.9
@@ -99,11 +99,6 @@
the destination file if it already exists.</td>
<td valign="top" align="center">No</td>
</tr>
- <tr>
- <td valign="top">whenempty</td>
- <td valign="top">Behavior to use if no files match.</td>
- <td valign="top" align="center">No</td>
- </tr>
</table>
<h3>Nested elements</h3>
<h4>lib</h4>
1.28 +5 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
Index: Jar.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Jar.java 2001/11/01 19:33:13 1.27
+++ Jar.java 2001/11/08 16:16:08 1.28
@@ -91,6 +91,11 @@
setEncoding("UTF8");
}
+ public void setWhenempty(WhenEmpty we) {
+ log("JARs are never empty, they contain at least a manifest file",
+ Project.MSG_WARN);
+ }
+
/**
* @deprecated use setFile(File) instead.
*/
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
