ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From umag...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Jar.java
Date Sun, 07 Jul 2002 20:14:32 GMT
umagesh     2002/07/07 13:14:31

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               docs/manual/CoreTasks Tag: ANT_15_BRANCH jar.html
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
                        Jar.java
  Log:
  Hide the filesetmanifest attribute for Ant 1.5, so as to avoid potential JarInputStream
related support issues.
  
  To be revisited in the 1.6 release timeframe.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.56 +8 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.263.2.55
  retrieving revision 1.263.2.56
  diff -u -r1.263.2.55 -r1.263.2.56
  --- WHATSNEW	4 Jul 2002 11:24:10 -0000	1.263.2.55
  +++ WHATSNEW	7 Jul 2002 20:14:31 -0000	1.263.2.56
  @@ -1,6 +1,14 @@
   Changes from Ant 1.5beta3 to current CVS version
   ==============================================
   
  +Changes that could break older environments:
  +--------------------------------------------
  +
  +* The filesetmanifest attribute added to <jar> after the 1.4.1 
  +  release has been removed for now.  This change may affect only
  +  the 1.5Beta/1.6Alpha users.  An attempt will be made to add this
  +  feature back into Ant 1.6.
  +
   Fixed bugs:
   -----------
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.16.2.5  +1 -16     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.16.2.4
  retrieving revision 1.16.2.5
  diff -u -r1.16.2.4 -r1.16.2.5
  --- jar.html	20 Jun 2002 09:40:30 -0000	1.16.2.4
  +++ jar.html	7 Jul 2002 20:14:31 -0000	1.16.2.5
  @@ -31,9 +31,7 @@
   The extended fileset and groupfileset attributes from the zip task are
   also available in the jar task.
   See the <a href="zip.html">Zip</a> task for more details and examples.</p>
  -<p>If the manifest is omitted, a simple one will be supplied by Ant.
  -If there is a manifest or manifests in your set of files, these manifests can
  -be used if <i>filesetmanifests</i> is set to <i>merge</i> or <i>mergewithoutmain</i>.</p>
  +<p>If the manifest is omitted, a simple one will be supplied by Ant.</p>
   <p>The <code>update</code> parameter controls what happens if the
   JAR file already exists. When set to <code>yes</code>, the JAR file is
   updated with the files specified. When set to <code>no</code> (the
  @@ -119,19 +117,6 @@
     <tr>
       <td valign="top">manifest</td>
       <td valign="top">the manifest file to use.  This can be either the location of
a manifest, or the name of a jar added through a fileset.  If its the name of an added jar,
the task expects the manifest to be in the jar at META-INF/MANIFEST.MF</td>
  -    <td valign="top" align="center">No</td>
  -  </tr>
  -  <tr>
  -    <td valign="top">filesetmanifest</td>
  -    <td valign="top">behavior when a Manifest is found in a zipfileset or
  -    zipgroupfileset file is found.  Valid values are &quot;skip&quot;,
  -    &quot;merge&quot;, and &quot;mergewithoutmain&quot;.  &quot;merge&quot;
  -    will merge all of manifests together, and merge this into any other
  -    specified manifests.  &quot;mergewithoutmain&quot; merges everything
  -    but the Main section of the manifests.  Default value is &quot;skip&quot;.
  -    <b>Note:</b> if this attribute's value is not &quot;skip&quot;,
the
  -    created jar will not be readable by using java.util.jar.JarInputStream
  -    </td>
       <td valign="top" align="center">No</td>
     </tr>
     <tr>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.51.2.10 +7 -5      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.51.2.9
  retrieving revision 1.51.2.10
  diff -u -r1.51.2.9 -r1.51.2.10
  --- Jar.java	4 Jul 2002 15:35:11 -0000	1.51.2.9
  +++ Jar.java	7 Jul 2002 20:14:31 -0000	1.51.2.10
  @@ -244,10 +244,12 @@
        *
        * @param config setting for found manifest behavior.
        */
  +    /*
       public void setFilesetmanifest(FilesetManifestConfig config) {
           filesetManifestConfig = config;
           mergeManifestsMain = "merge".equals(config.getValue());
       }
  +    */
   
       /**
        * Adds a zipfileset to include in the META-INF directory.
  @@ -298,7 +300,7 @@
                   finalManifest.merge(configuredManifest);
                   finalManifest.merge(manifest, !mergeManifestsMain);
               }
  -            
  +
               return finalManifest;
   
           } catch (ManifestException e) {
  @@ -307,7 +309,7 @@
           }
       }
   
  -    private void writeManifest(ZipOutputStream zOut, Manifest manifest) 
  +    private void writeManifest(ZipOutputStream zOut, Manifest manifest)
            throws IOException {
           for (Enumeration e = manifest.getWarnings();
                e.hasMoreElements();) {
  @@ -328,7 +330,7 @@
                         System.currentTimeMillis(), null);
           super.initZipOutputStream(zOut);
       }
  -    
  +
       protected void finalizeZipOutputStream(ZipOutputStream zOut)
               throws IOException, BuildException {
           if (manifestOnFinalize) {
  @@ -430,7 +432,7 @@
               } else {
                   manifest = getManifest(file);
               }
  -        } else if (filesetManifestConfig != null && 
  +        } else if (filesetManifestConfig != null &&
                      !filesetManifestConfig.getValue().equals("skip")) {
               // we add this to our group of fileset manifests
               log("Found manifest to merge in file " + file,
  @@ -492,7 +494,7 @@
                   Manifest currentManifest =
                       new Manifest(new InputStreamReader(theZipFile
                                                          .getInputStream(entry)));
  -                Manifest newManifest = createManifest();                              
                        
  +                Manifest newManifest = createManifest();
                   if (!currentManifest.equals(newManifest)) {
                       log("Updating jar since jar manifest has changed",
                           Project.MSG_VERBOSE);
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message