From 7119b3f030ddaa3e88117fa37aeb17b65cdab485 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 20 Aug 2010 03:42:43 +0000 Subject: [PATCH] the zipfileset example is simply wrong git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@987373 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/Tasks/jar.html | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/docs/manual/Tasks/jar.html b/docs/manual/Tasks/jar.html index b12a6e129..111bad42f 100644 --- a/docs/manual/Tasks/jar.html +++ b/docs/manual/Tasks/jar.html @@ -468,13 +468,31 @@ and ${src}/resources/mypackage/image.gif, they will appear in the same directory in the JAR (and thus be considered in the same package by Java).

-

Using zipfileset

+

Merging archives

 <jar destfile="build/main/checksites.jar">
     <fileset dir="build/main/classes"/>
-    <zipfileset includes="**/*.class">
-      <fileset dir="lib/main" includes="**/*.jar"/>
-    </zipfileset>
+    <zipfileset includes="**/*.class" src="lib/main/some.jar"/>
+    <manifest>
+      <attribute name="Main-Class"
+            value="com.acme.checksites.Main"/>
+    </manifest>
+  </jar>
+

+ Creates an executable jar file with a main class "com.acme.checksites.Main", and + embeds all the classes from the jar lib/main/some.jar. +

+ +
 <jar destfile="build/main/checksites.jar">
+    <fileset dir="build/main/classes"/>
+    <restrict>
+     <name name="**/*.class"/>
+     <archives>
+       <zips>
+         <fileset dir="lib/main" includes="**/*.jar"/>
+       </zips>
+     </archives>
+    </restrict>
     <manifest>
       <attribute name="Main-Class"
             value="com.acme.checksites.Main"/>