I'd like to see this working in 1.5, so I overcame my own sense of laziness here. :) I had to do some odd snipping in the diff, but a patch that works should be attached. -Brian
> -----Original Message----- > From: Magesh Umasankar [mailto:[EMAIL PROTECTED] > Sent: Tuesday, May 21, 2002 11:44 AM > To: Ant Developers List > Subject: Re: cvs commit: > jakarta-ant/src/main/org/apache/tools/ant/taskdefs Jar.java > > > Rereading it, I think it may be a good enough fix > for now to say that JarInputStream will not work > if Jar was created with filesetmanifest=true. > > Being the lazy guy that I am, I want to first > ask if you would like to send in a patch... ;-) > > Cheers, > Magesh > > *********************************************** > * He who won't take responsibility for his * > * mistakes is usually the first one to point * > * a finger at someone else's. * > *********************************************** > ----- Original Message ----- > From: "Brian Deitte" <[EMAIL PROTECTED]> > To: "'Ant Developers List'" <[EMAIL PROTECTED]> > Sent: Tuesday, May 21, 2002 11:13 AM > Subject: RE: cvs commit: > jakarta-ant/src/main/org/apache/tools/ant/taskdefs > Jar.java > > > > Hmm, I looked at the horribly-out-of-date custom version of > Ant I'm using, > and I see I have the manifest creation in > finalizeOutputStream. Now I know > why its still working for me. > > > > The only solution I see is to move manifest creation to > finalizeOutputStream only when filesetmanifest is true, and > just note that a > limitation of using filesetmanifest is that JarInputStream won't work. > > > > As for Kevin Gross' other question, I couldn't google > anything useful for > "index-list manifest". If index-list is a main attribute, > then he could do > what I do for Class-Path settings, which is specify a > separate manifest with > the correct main manifest settings and then use > filesetmanifest="mergewithoutmain". > > > > -Brian > > > > > -----Original Message----- > > > From: Magesh Umasankar [mailto:[EMAIL PROTECTED] > > > Sent: Thursday, May 16, 2002 5:32 PM > > > To: Ant Developers List > > > Subject: Re: cvs commit: > > > jakarta-ant/src/main/org/apache/tools/ant/taskdefs Jar.java > > > > > > > > > Hi Brian: > > > This was the issue reported and I checke dthat it was valid. > > > Iprovided a fix, but it clashed with another fix as pointed out > > > by Conor - so I ended up reverting it. > > > > > > http://marc.theaimsgroup.com/?t=102053683600001&r=1&w=2 > > > > > > Conor's resaon for rejecting the fix I put in is here: > > > http://marc.theaimsgroup.com/?l=ant-dev&m=102142231417706&w=2 > > > > > > Cheers, > > > Magesh > > > > > > ********************************************* > > > * There are two types of people in this * > > > * world, good and bad. The good sleep * > > > * better, but the bad seem to enjoy the * > > > * waking hours much more. - Woody Allen * > > > ********************************************* > > > ----- Original Message ----- > > > From: "Brian Deitte" <[EMAIL PROTECTED]> > > > To: "'Ant Developers List'" <[EMAIL PROTECTED]> > > > Sent: Thursday, May 16, 2002 3:34 PM > > > Subject: RE: cvs commit: > > > jakarta-ant/src/main/org/apache/tools/ant/taskdefs > > > Jar.java > > > > > > > > > > Hi Magesh, I was in software endgame mode and haven't been > > > reading the > > > list for awhile. Could you explain how manifest merging > is mucking up > > > things? > > > > > > > > > -----Original Message----- > > > > > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > > > > > Sent: Wednesday, May 15, 2002 4:07 PM > > > > > To: [EMAIL PROTECTED] > > > > > Subject: cvs commit: > > > > > jakarta-ant/src/main/org/apache/tools/ant/taskdefs > > > > > Jar.java > > > > > > > > > > > > > > > umagesh 02/05/15 13:06:30 > > > > > > > > > > Modified: src/main/org/apache/tools/ant/taskdefs Tag: > > > > > ANT_15_BRANCH > > > > > Jar.java > > > > > Log: > > > > > Revert changes to keep JarInputStream happy. Need to > > > > > investigate better way to merge manifests - Brian?? > > > > > > > > > > Revision Changes Path > > > > > No revision > > > > > > > > > > > > > > > No revision > > > > > > > > > > > > > > > 1.51.2.2 +5 -6 > > > > > 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/J > > > > > ar.java,v > > > > > retrieving revision 1.51.2.1 > > > > > retrieving revision 1.51.2.2 > > > > > diff -u -r1.51.2.1 -r1.51.2.2 > > > > > --- Jar.java 8 May 2002 22:27:46 -0000 1.51.2.1 > > > > > +++ Jar.java 15 May 2002 20:06:30 -0000 1.51.2.2 > > > > > @@ -223,11 +223,6 @@ > > > > > > > > > > protected void > initZipOutputStream(ZipOutputStream zOut) > > > > > throws IOException, BuildException { > > > > > - super.initZipOutputStream(zOut); > > > > > - } > > > > > - > > > > > - protected void > > > finalizeZipOutputStream(ZipOutputStream zOut) > > > > > - throws IOException, BuildException { > > > > > String ls = System.getProperty("line.separator"); > > > > > > > > > > try { > > > > > @@ -278,13 +273,17 @@ > > > > > new > ByteArrayInputStream(baos.toByteArray()); > > > > > super.zipFile(bais, zOut, > "META-INF/MANIFEST.MF", > > > > > > System.currentTimeMillis(), null); > > > > > - super.finalizeZipOutputStream(zOut); > > > > > + super.initZipOutputStream(zOut); > > > > > } catch (ManifestException e) { > > > > > log("Manifest is invalid: " + e.getMessage(), > > > > > Project.MSG_ERR); > > > > > throw new BuildException("Invalid Manifest", > > > > > e, getLocation()); > > > > > } finally { > > > > > > System.getProperties().put("line.separator", ls); > > > > > } > > > > > + } > > > > > + > > > > > + protected void > > > finalizeZipOutputStream(ZipOutputStream zOut) > > > > > + throws IOException, BuildException { > > > > > if (index) { > > > > > createIndexList(zOut); > > > > > } > > > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > To unsubscribe, e-mail: > > > > <mailto:[EMAIL PROTECTED]> > > > > For additional commands, e-mail: > > > <mailto:[EMAIL PROTECTED]> > > > > > > > > -- > > > > To unsubscribe, e-mail: > > > <mailto:[EMAIL PROTECTED]> > > > > For additional commands, e-mail: > > > <mailto:[EMAIL PROTECTED]> > > > > > > > > > > > > > -- > > > To unsubscribe, e-mail: > > > <mailto:[EMAIL PROTECTED]> > > > For additional commands, e-mail: > > > <mailto:[EMAIL PROTECTED]> > > > > > > > -- > > To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> > For additional commands, e-mail: <mailto:[EMAIL PROTECTED]> > -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
Jar.java.diff
Description: Binary data
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
