ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Manifest.java
Date Thu, 30 Jan 2003 10:47:43 GMT
conor       2003/01/30 02:47:42

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               src/main/org/apache/tools/ant Tag: ANT_15_BRANCH
                        defaultManifest.mf
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
                        Manifest.java
  Log:
  Merge fix for 12219
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.118 +5 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.263.2.117
  retrieving revision 1.263.2.118
  diff -u -w -u -r1.263.2.117 -r1.263.2.118
  --- WHATSNEW	29 Jan 2003 11:47:43 -0000	1.263.2.117
  +++ WHATSNEW	30 Jan 2003 10:47:42 -0000	1.263.2.118
  @@ -91,6 +91,11 @@
   
   * **/.DS_Store has been added to the list of default pattern excludes.
   
  +
  +* The Created-BY header in the default manifest now contains the JVM vendor and
  +  version according to the jar specification. A new header Ant-Version provides 
  +  the Ant version used to create the jar.  
  +
   Changes from Ant 1.5.1Beta1 to 1.5.1
   ====================================
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +1 -1      jakarta-ant/src/main/org/apache/tools/ant/defaultManifest.mf
  
  Index: defaultManifest.mf
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/defaultManifest.mf,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -w -u -r1.3 -r1.3.2.1
  --- defaultManifest.mf	30 Oct 2001 10:05:39 -0000	1.3
  +++ defaultManifest.mf	30 Jan 2003 10:47:42 -0000	1.3.2.1
  @@ -1,3 +1,3 @@
   Manifest-Version: 1.0
  -Created-By: Apache Ant @VERSION@
  +Ant-Version: Apache Ant @VERSION@ 
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.33.2.7  +8 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java
  
  Index: Manifest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java,v
  retrieving revision 1.33.2.6
  retrieving revision 1.33.2.7
  diff -u -w -u -r1.33.2.6 -r1.33.2.7
  --- Manifest.java	4 Oct 2002 13:07:14 -0000	1.33.2.6
  +++ Manifest.java	30 Jan 2003 10:47:42 -0000	1.33.2.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -731,7 +731,13 @@
                       + defManifest);
               }
               try {
  -                return new Manifest(new InputStreamReader(in, "ASCII"));
  +                Manifest defaultManifest 
  +                    = new Manifest(new InputStreamReader(in, "ASCII"));
  +                Attribute createdBy = new Attribute("Created-By", 
  +                    System.getProperty("java.vm.version") + " ("
  +                    + System.getProperty("java.vm.vendor") + ")" );
  +                defaultManifest.getMainSection().storeAttribute(createdBy);
  +                return defaultManifest;
               } catch (UnsupportedEncodingException e) {
                   return new Manifest(new InputStreamReader(in));
               }
  
  
  

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


Mime
View raw message