conor 2003/01/30 02:28:24
Modified: src/main/org/apache/tools/ant defaultManifest.mf
src/main/org/apache/tools/ant/taskdefs Manifest.java
Log:
Make Create-By attribute in manifest compliant with spec by listing
the java implementation version and vendor. Add an Ant-Version field to
show the Ant version
PR: 12219
Revision Changes Path
1.4 +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.4
diff -u -w -u -r1.3 -r1.4
--- defaultManifest.mf 30 Oct 2001 10:05:39 -0000 1.3
+++ defaultManifest.mf 30 Jan 2003 10:28:24 -0000 1.4
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
-Created-By: Apache Ant @VERSION@
+Ant-Version: Apache Ant @VERSION@
1.38 +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.37
retrieving revision 1.38
diff -u -w -u -r1.37 -r1.38
--- Manifest.java 4 Oct 2002 12:43:46 -0000 1.37
+++ Manifest.java 30 Jan 2003 10:28:24 -0000 1.38
@@ -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
@@ -729,7 +729,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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
