Would someone with access to commiting the CVS check if he/she can fix this line termination problem?

Thanks,

Zorzella

John York wrote:
yeah, you just need to make sure the patch was generated from the same format for the TableTag.java file as the one you're trying to patch. Hopefully both are in unix format, if not, we outta convert them...


On Fri, 21 Feb 2003, Luiz-Otavio Zorzella wrote:



Wicked... I can apply it with no probs.

$ patch -p0 < ~/DISPLAYCOLLECTIONPATH.txt
patching file src//org/apache/taglibs/display/TableTag.java

You know -- I think it has something to do with DOS line termination. For some weird reason, this file (and only this file) comes DOS line-terminated to me, even though cvs does say "kv" substitutions! I think it was checked in from a UNIX box, but with DOS line-feed... If that is the case, I THINK to solve it, one needs to, from a UNIX box:

$ dos2unix src/org/apache/taglibs/display/TableTag.java
$ cvs commit -m "Fix line termination"

I'm attaching the patched file itself here. Check it out.... and let me know how it goes.

Zorzella

Matt Raible wrote:

I don't know what's up with this patch, but I don't want to commit it
after I received the following errors:

$patch -p0 < DISPLAYCOLLECTIONPATH.txt
patching file `src//org/apache/taglibs/display/TableTag.java'
Hunk #1 FAILED at 15.
Hunk #2 FAILED at 37.
Hunk #3 FAILED at 171.
Hunk #4 FAILED at 744.
Hunk #5 FAILED at 808.
Hunk #6 FAILED at 837.
Hunk #7 FAILED at 855.
Hunk #8 FAILED at 880.
Hunk #9 FAILED at 911.
Hunk #10 FAILED at 936.
Hunk #11 FAILED at 959.
Hunk #12 FAILED at 1216.
Hunk #13 FAILED at 1229.
Hunk #14 FAILED at 1314.
Hunk #15 FAILED at 1403.

Matt



-----Original Message-----
From: Luiz-Otavio Zorzella [mailto:[EMAIL PROTECTED] Sent: Thursday, February 20, 2003 2:13 PM
To: Matt Raible
Cc: [EMAIL PROTECTED]
Subject: Re: FW: [displaytag-devel] VOTE: release 0.8.5 now



Matt,


I just realized the Collection cleanup patch was applied against only one of the two files (it was not applied to the TableTag.java file). Do you wish me to re-send the patch for the second file through SF? I'm sending it in this email, anyway, if you want just to apply it.

Thanks a lot,

Zorzella

Matt Raible wrote:


Done.

In the future, maybe we should try to use the patch manager from SF for these? I don't know - it's pretty easy to do them as an e-mail attachment. As soon as we get JIRA setup, I believe we can submit patches to bugs and such too.

Matt




-----Original Message-----
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] On Behalf Of Luiz-Otavio Zorzella
Sent: Wednesday, February 12, 2003 7:17 PM
To: Matt Raible; [EMAIL PROTECTED]
Subject: Re: FW: [displaytag-devel] VOTE: release 0.8.5 now



Matt,


no problem at all... I'm using the table tag libs in here,
and they are great... I'm happy to help out make them better...


Can I get you interested in another patch? This is the

beggining of a



cleanup of the internal data structures used by the tags to

store the



collection of objects to iterate over.

The original code only works with Lists. With the patch, it

will work



with Collections, Iterators and Maps as well (though some

functions,



like group totals are not available to these, due to limitations on the structures themselves). I'm also working on adding support for ResultSets, but I need a little more time for that...

Though the patch is not trivial (i.e. more than 10 lines
:^>), I'm using it here successfully. Furthermore, it pretty much only changes declarations from List to Object and class casts, so it should work without any doubt in whatever it was working before...


Cheers,

Zorzella

Matt Raible wrote:



Done - thanks for the syntax.

Matt





-----Original Message-----
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] On
Behalf Of Luiz-Otavio Zorzella
Sent: Tuesday, February 11, 2003 7:14 PM
To: Matt Raible
Cc: [EMAIL PROTECTED]
Subject: Re: FW: [displaytag-devel] VOTE: release 0.8.5 now


I don't know about Tortoise CVS, though I can certainly

send you the



patch in whichever format you like best. I successfully

applied my



own patch against a clean tree, like this:

$ cd cvs/displaytag
$ patch -p0 < ~/DISPLAYNESTEDPATCH.txt
patching file src/org/apache/taglibs/display/ColumnTag.java

Let me know...

Zorzella

Matt Raible wrote:




Anyone know how to apply this sucker? I tried to figure it

out using





TortoiseCVS, but gave up after 5 minutes of banging my

head against



the wall.

Thanks,

Matt

-----Original Message-----
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] On

Behalf Of



Luiz-Otavio Zorzella
Sent: Tuesday, February 11, 2003 9:19 AM
To: John York
Cc: Kasper van Benten; [EMAIL PROTECTED]
Subject: Re: [displaytag-devel] VOTE: release 0.8.5 now


+1


I sent a trivial bugfix patch to allow column elements to

be nested




inside other tags, but I have yet not gotten any feedback. I'd
appreciate if this could be included in the release. Patch

included,





again, as attachment.

Zorzella

John York wrote:





+1

I'm assuming Ed has been using and tested this stuff. It

wouldn't be





great to release 'arbitrarily' and have problems with

it from the



start. But I agree, we need to start somewhere and this

sounds like a





good thing to me.



On Tue, 11 Feb 2003, Kasper van Benten wrote:







+1

Let's roll a release!

Gerhard Froehlich wrote:







Hi,
I would like to generate the first voting.

"Let's release Ed's current 0.8.5 immediatly, do

afterwards some




cleanup and release 0.9 quick to get started!"

+1






-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld =

Something 2 See!





http://www.vasoftware.com _______________________________________________
displaytag-devel mailing list

[EMAIL PROTECTED]





https://lists.sourceforge.net/lists/listinfo/displaytag-devel


-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld =

Something 2 See!



http://www.vasoftware.com _______________________________________________
displaytag-devel mailing list

[EMAIL PROTECTED]



https://lists.sourceforge.net/lists/listinfo/displaytag-devel






------------------------------------------------------- This SF.NET email is sponsored by: SourceForge Enterprise Edition + IBM + LinuxWorld =

Something 2 See!




http://www.vasoftware.com
_______________________________________________
displaytag-devel mailing list

[EMAIL PROTECTED]



https://lists.sourceforge.net/lists/listinfo/displaytag-devel




-------------------------------------------------------
This SF.NET email is sponsored by: FREE SSL Guide from

Thawte are you



planning your Web Server Security? Click here to get a FREE

Thawte SSL



guide and find the answers to all your SSL security issues. http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0026en
_______________________________________________
displaytag-devel mailing list [EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/displaytag-devel





------------------------------------------------------- This SF.net email is sponsored by: SlickEdit Inc. Develop an edge. The most comprehensive and flexible code editor you can use. Code faster. C/C++, C#, Java, HTML, XML, many more. FREE 30-Day Trial. www.slickedit.com/sourceforge _______________________________________________ displaytag-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/displaytag-devel







-------------------------------------------------------
This SF.net email is sponsored by: SlickEdit Inc. Develop an edge.
The most comprehensive and flexible code editor you can use.
Code faster. C/C++, C#, Java, HTML, XML, many more. FREE 30-Day Trial.
www.slickedit.com/sourceforge
_______________________________________________
displaytag-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/displaytag-devel

Reply via email to