svn commit: r615154 - /tomcat/tc6.0.x/trunk/STATUS.txt

2008-01-25 Thread pero 
Author: pero
Date: Fri Jan 25 01:09:58 2008
New Revision: 615154

URL: http://svn.apache.org/viewvc?rev=615154&view=rev
Log:
Cast my Vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=615154&r1=615153&r2=615154&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 25 01:09:58 2008
@@ -80,5 +80,5 @@
   Otherwise it's only reachable in the HTMLManager.
   http://people.apache.org/~rjung/patches/web_xml_expire.patch
   (backport of r614933 from trunk)
-  +1: rjung, fhanik
+  +1: rjung, fhanik, pero
   -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r614974 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/Http11NioProcessor.java

2008-01-25 Thread Peter Rossbach 

Hi Filip,

can you remove the STATUS.txt entry, please?

Thanks
Peter

Am 24.01.2008 um 21:23 schrieb [EMAIL PROTECTED]:


Author: fhanik
Date: Thu Jan 24 12:22:59 2008
New Revision: 614974

URL: http://svn.apache.org/viewvc?rev=614974&view=rev
Log:
vote and implement

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/ 
Http11NioProcessor.java


Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt? 
rev=614974&r1=614973&r2=614974&view=diff
== 


--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 24 12:22:59 2008
@@ -80,5 +80,5 @@
   Otherwise it's only reachable in the HTMLManager.
   http://people.apache.org/~rjung/patches/web_xml_expire.patch
   (backport of r614933 from trunk)
-  +1: rjung
+  +1: rjung, fhanik
   -1:

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/ 
Http11NioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/ 
apache/coyote/http11/Http11NioProcessor.java? 
rev=614974&r1=614973&r2=614974&view=diff
== 

--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/ 
Http11NioProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/ 
Http11NioProcessor.java Thu Jan 24 12:22:59 2008

@@ -751,7 +751,10 @@
 NioEndpoint.KeyAttachment attach =  
(NioEndpoint.KeyAttachment)socket.getAttachment(false);

 if (attach != null) {
 attach.setComet(comet);
-if (!comet) {
+if (comet) {
+Integer comettimeout = (Integer)  
request.getAttribute("org.apache.tomcat.comet.timeout");
+if (comettimeout != null) attach.setTimeout 
(comettimeout.longValue());

+} else {
 //reset the timeout
 attach.setTimeout 
(endpoint.getSocketProperties().getSoTimeout());

 }
@@ -889,6 +892,10 @@
 NioEndpoint.KeyAttachment attach =  
(NioEndpoint.KeyAttachment) key.attachment();

 if (attach != null)  {
 attach.setComet(comet);
+if (comet) {
+Integer comettimeout = (Integer)  
request.getAttribute("org.apache.tomcat.comet.timeout");
+if (comettimeout != null)  
attach.setTimeout(comettimeout.longValue());

+}
 }
 }
 } catch (InterruptedIOException e) {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: DOS-Lineends in many files contained in distribution tar.gz

2008-01-25 Thread jean-frederic clere 

Rainer Jung wrote:

Hi,

I stumbled today over DOS line endings in the web.xml file of the 
manager contained in TC 6.0.14 tar.gz download.


A little check reveals, that the following files have DOS line endings, 
although the tar.gz is supposed to use Unix convention were appropriate:


- RELEASE-NOTES
- bin/catalina-tasks.xml

and in webapps all files with suffixes:

Count Suffix
 286 html
  46 java
  48 jsp
  12 txt
  11 xml
   5 properties
   4 tag
   3 tld
   2 jspf
   2 jspx
   2 svg
   1 xsd
   1 xsl
   1 mdl

All of those suffixes under webapps always have DOS lineendings (one 
file even has mixed ending: webapps/manager/sessionDetail.jsp misses the 
^M in the last line).


I don't know if dist.xml is actually used for packaging. It uses fixcrlf 
for a couple of files (mainly *.sh, *.txt, conf/*, some [A-Z]*) but it 
would be nice, if we would also transform the above mentioned.


+1

Cheers

Jean-Frederic



Regards,

Rainer



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]





-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 44294] - Support for EL functions with varargs

2008-01-25 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=44294





--- Additional Comments From [EMAIL PROTECTED]  2008-01-25 02:44 ---
Created an attachment (id=21426)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=21426&action=view)
AstFunction.patch


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 44294] New: - Support for EL functions with varargs

2008-01-25 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=44294

   Summary: Support for EL functions with varargs
   Product: Tomcat 6
   Version: 6.0.14
  Platform: Other
OS/Version: other
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Jasper
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Varargs  could
be supported easily since it is possible to retrieve the information whether or
not method has vargargs and vararg can only exist as last argument.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: DOS-Lineends in many files contained in distribution tar.gz

2008-01-25 Thread Peter Rossbach 

Hi Rainer,

+1..


Is it fix with followig patch?
===
Index: tomcat60/dist.xml
===
--- /tomcat60/dist.xml  (Revision 613549)
+++ tomcat/tomcat60/dist.xml(Arbeitskopie)
@@ -561,6 +561,22 @@
   
 includes="*.txt,LICENSE,NOTICE" eol="lf"/>

 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   tarfile="${tomcat.release}/v${version}/bin/$ 
{final.name}.tar.gz">
   

==

Peter


Am 25.01.2008 um 01:47 schrieb Rainer Jung:


Hi,

I stumbled today over DOS line endings in the web.xml file of the  
manager contained in TC 6.0.14 tar.gz download.


A little check reveals, that the following files have DOS line  
endings, although the tar.gz is supposed to use Unix convention  
were appropriate:


- RELEASE-NOTES
- bin/catalina-tasks.xml

and in webapps all files with suffixes:

Count Suffix
 286 html
  46 java
  48 jsp
  12 txt
  11 xml
   5 properties
   4 tag
   3 tld
   2 jspf
   2 jspx
   2 svg
   1 xsd
   1 xsl
   1 mdl

All of those suffixes under webapps always have DOS lineendings  
(one file even has mixed ending: webapps/manager/sessionDetail.jsp  
misses the ^M in the last line).


I don't know if dist.xml is actually used for packaging. It uses  
fixcrlf for a couple of files (mainly *.sh, *.txt, conf/*, some [A- 
Z]*) but it would be nice, if we would also transform the above  
mentioned.


Regards,

Rainer



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]





-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 42866] - Using a function via EL produces ClassNotFoundException

2008-01-25 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=42866





--- Additional Comments From [EMAIL PROTECTED]  2008-01-25 02:34 ---
Isn't this a duplicate of 


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Patch for tomcat 5.5.25 to actually close on Connection: close

2008-01-25 Thread Remy Maucherat 
On Thu, 2008-01-24 at 17:11 -0500, John Wehle wrote:
> Currently if a servlet uses:
> 
>   res.setHeader("Connection", "close");
> 
> tomcat just sets the header and sends the reponse to the client.  It
> then waits for the client to close the connection.  In some cases (i.e.
> buggy client) the client doesn't process the close which causes resources
> to be unduly tied up on the server until the connectionTimeout is reached
> which then closes the connection.  This also causes the user to experience
> a browser delay corresponding to connectionTimeout.
> 
> This patches causes tomcat to close a connection after sending a response
> which includes "Connection: close".

The rationale is that a servlet has no business dealing with the
connection behavior: if the client has problems, you can add appropriate
configuration in the connector.

Rémy



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: DOS-Lineends in many files contained in distribution tar.gz

2008-01-25 Thread Rainer Jung 

Hi Filip,

Filip Hanik - Dev Lists schrieb:

what effect do the line endings actually have, from a functionality point?


It's more the human factor. I expect none of the mentioned files to fail 
fatally with DOS style on Unix. On the other hand some of those are also 
explicitely for humans and I find it very dirty to provide a tar.gz 
download with DOS text files in it.


Maybe more convincing: the way we do it provides Unix style LICENSE and 
NOTICE file inside the deployer ZIP. So our procedure really is broken.


Bill Wrowe's approach seems to be easy. Fix once the props in svn and 
then do two release builds, one based on a DOS style checkout, and 
another one based on a Unix style checkout. It would allow an easier 
dist.xml and still better release files.


only if it affects the distro in a negative way would I actually go 
through all this trouble. but I haven't had any problems so far, and we 
are on all kinds of platforms


It depends on your definition of problem: users say: "We downloaded the 
Unix tarball and there are mostly Windows files in there. What went 
wrong with your release?".


Regards,

Rainer


Filip

Rainer Jung wrote:

Hello,

no unfortunately I don't expect the patch to work. The fixcrlf is done 
before packaging and in the dist.xml the various packagings (dist, 
deployer, source, ...) are included in alternating platform order, so 
first dist Win, then dist Unix, then deployer Win, then deployer Unix 
and so on. If we change the line endings for some deliverable to unix, 
we can't use the files later in another Win deliverable.


Example: Look at the 6.0.14 deployer zip. The LICENSE file included 
has unix line ends, because it got "fixed" for inclusion in the unix 
core distro before the Win deployer zip was produced.


So we either:

- reorder the targets underneath "release" (Windows first and Unix 
afterwards (which then would make release builds on a windows system 
OK, but not on a unix system). Then the default target works, but 
calling the dist.xml with other targets alternating between target 
platforms without clean in between would produce buggy deliverables.


If we reorder, we need to check, if there are side effects between the 
tasks, s.t. reordering breaks the release build.


- cleanup and prepare for each of the targets underneath or "release".

Either way, since in the source tgz target there is already an exclude 
list, I would prefer to update that exclude list and use the same one 
whereever possible, so something like:


===
--- dist.xml(revision 608958)
+++ dist.xml(working copy)
@@ -560,8 +560,12 @@

   
   
-eol="lf"/>

+
+includes="*.txt,LICENSE,NOTICE,RELEASE-NOTES" eol="lf"/>

+
 
++ 
excludes="**/*.jar,**/*.classes,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.pdf,**/*.war" 
eol="lf"/>

   
tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz">
   prefix="${final.name}">

@@ -711,7 +715,7 @@
   
   
- excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war" 
eol="lf"/>
+ 
excludes="**/*.jar,**/*.classes,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.pdf,**/*.war" 
eol="lf"/>

 
   

But I think we first have to correct the ordering issue.

However I'm not sure, if I should go into it, because I'm not the 
biggest ant guy :)


Remy: Since you are the RM of 6.0: are you going into this topic, or 
should we try to solve it?


Regards,

Rainer


Peter Rossbach wrote:

Hi Rainer,

+1..


Is it fix with followig patch?
===
Index: tomcat60/dist.xml
===
--- /tomcat60/dist.xml(Revision 613549)
+++ tomcat/tomcat60/dist.xml(Arbeitskopie)
@@ -561,6 +561,22 @@
   
 eol="lf"/>

 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   
tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz">
   prefix="${final.name}">

==

Peter


Am 25.01.2008 um 01:47 schrieb Rainer Jung:


Hi,

I stumbled today over DOS line endings in the web.xml file of the 
manager contained in TC 6.0.14 tar.gz download.


A little check reveals, that the following files have DOS line 
endings, although the tar.gz is supposed to use Unix convention were 
appropriate:


- RELEASE-NOTES
- bin/catalina-tasks.xml

and in webapps all files with suffixes:

Count Suffix
 286 html
  46 java
  48 jsp
  12 txt
  11 xml
   5 properties
   4 tag
   3 tld
   2 jspf
   2 jspx
   2 svg
   1 xsd
   1 xsl
   1 mdl

All of those suffixes under webapps always have DOS lineendings (one 
file even has mixed ending: webapps/manager/sessionDetail.jsp misses 
the ^M in the last line).


I don't know if dist.xml is actually used for packaging. It uses 
fixcrlf for a couple of files (mainly *.sh, *.txt, conf/*, some 
[A-Z]*) but it would be nice, if we would also transform the

Re: DOS-Lineends in many files contained in distribution tar.gz

2008-01-25 Thread William A. Rowe, Jr. 

Rainer Jung wrote:


- cleanup and prepare for each of the targets underneath or "release".

Either way, since in the source tgz target there is already an exclude 
list, I would prefer to update that exclude list and use the same one 
whereever possible, so something like:


FYI - this is all overkill.  If you are packaging on win32, svn export
does your cr/lf line endings by default, but you can create a unix
package with svn export --native-eol LF.  Contrawise on unix, you can
create the win32 .zip with svn export --native-eol CRLF.

No second guessing, whatever eol-style metadata is applied to subversion
is what's used, and you won't find fragility that a line-ends conversion
script might introduce.  It's something to consider.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r615281 - /tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml

2008-01-25 Thread rjung 
Author: rjung
Date: Fri Jan 25 09:27:03 2008
New Revision: 615281

URL: http://svn.apache.org/viewvc?rev=615281&view=rev
Log:
Add entries for expire command on ManagerServlet to
manager web.xml. Otherwise it will only work
in the HTMLManager, although it's also implemented in
the Manager servlet.

Modified:
tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml

Modified: tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml?rev=615281&r1=615280&r2=615281&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml Fri Jan 25 09:27:03 
2008
@@ -70,6 +70,10 @@
   
   
 Manager
+  /expire
+  
+  
+Manager
   /sessions
   
   
@@ -150,6 +154,7 @@
   /jmxproxy/*
   /html/*
   /list
+  /expire
   /sessions
   /start
   /stop



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r614974 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/Http11NioProcessor.java

2008-01-25 Thread Filip Hanik - Dev Lists 

you got it
Filip

Peter Rossbach wrote:

Hi Filip,

can you remove the STATUS.txt entry, please?

Thanks
Peter

Am 24.01.2008 um 21:23 schrieb [EMAIL PROTECTED]:


Author: fhanik
Date: Thu Jan 24 12:22:59 2008
New Revision: 614974

URL: http://svn.apache.org/viewvc?rev=614974&view=rev
Log:
vote and implement

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 



Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=614974&r1=614973&r2=614974&view=diff 

== 


--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 24 12:22:59 2008
@@ -80,5 +80,5 @@
   Otherwise it's only reachable in the HTMLManager.
   http://people.apache.org/~rjung/patches/web_xml_expire.patch
   (backport of r614933 from trunk)
-  +1: rjung
+  +1: rjung, fhanik
   -1:

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 

URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=614974&r1=614973&r2=614974&view=diff 

== 

--- 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
Thu Jan 24 12:22:59 2008

@@ -751,7 +751,10 @@
 NioEndpoint.KeyAttachment attach = 
(NioEndpoint.KeyAttachment)socket.getAttachment(false);

 if (attach != null) {
 attach.setComet(comet);
-if (!comet) {
+if (comet) {
+Integer comettimeout = (Integer) 
request.getAttribute("org.apache.tomcat.comet.timeout");
+if (comettimeout != null) 
attach.setTimeout(comettimeout.longValue());

+} else {
 //reset the timeout
 
attach.setTimeout(endpoint.getSocketProperties().getSoTimeout());

 }
@@ -889,6 +892,10 @@
 NioEndpoint.KeyAttachment attach = 
(NioEndpoint.KeyAttachment) key.attachment();

 if (attach != null)  {
 attach.setComet(comet);
+if (comet) {
+Integer comettimeout = (Integer) 
request.getAttribute("org.apache.tomcat.comet.timeout");
+if (comettimeout != null) 
attach.setTimeout(comettimeout.longValue());

+}
 }
 }
 } catch (InterruptedIOException e) {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]







No virus found in this incoming message.
Checked by AVG Free Edition. 
Version: 7.5.516 / Virus Database: 269.19.11/1243 - Release Date: 1/25/2008 11:24 AM
  



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Patch for tomcat 5.5.25 to actually close on Connection: close

2008-01-25 Thread Peter Rossbach 

Hi Remy,

True, but today it exists a lot of applications/Service that want  
control the connection.

At my Comet example I have also miss this simple feature.
I feel that the patch looks good.

Peter



Am 25.01.2008 um 13:14 schrieb Remy Maucherat:


On Thu, 2008-01-24 at 17:11 -0500, John Wehle wrote:

Currently if a servlet uses:

  res.setHeader("Connection", "close");

tomcat just sets the header and sends the reponse to the client.  It
then waits for the client to close the connection.  In some cases  
(i.e.
buggy client) the client doesn't process the close which causes  
resources
to be unduly tied up on the server until the connectionTimeout is  
reached
which then closes the connection.  This also causes the user to  
experience

a browser delay corresponding to connectionTimeout.

This patches causes tomcat to close a connection after sending a  
response

which includes "Connection: close".


The rationale is that a servlet has no business dealing with the
connection behavior: if the client has problems, you can add  
appropriate

configuration in the connector.

Rémy



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: DOS-Lineends in many files contained in distribution tar.gz

2008-01-25 Thread Rainer Jung 
Thanks Bill and Mladen. It makes sense to check for wrong svn metadata, 
although the problem at the moment is, that unix distributions are build 
on the windows platform.


So even with correct settings those files have Windows line endings 
without correcting. Bill Wrowes comments are interesting, because it 
might be easier to do two passes through the same build procedure with 
different export flags. Combined with your script, we then wouldn't need 
to manage fragile file lists.


Since I never did a TC release, I think it's time for Mark, Filip or 
Remy to comment, what they prefer.


Regards,

Rainer


Mladen Turk wrote:

William A. Rowe, Jr. wrote:

Rainer Jung wrote:


- cleanup and prepare for each of the targets underneath or "release".

Either way, since in the source tgz target there is already an 
exclude list, I would prefer to update that exclude list and use the 
same one whereever possible, so something like:


FYI - this is all overkill.  If you are packaging on win32, svn export
does your cr/lf line endings by default, but you can create a unix
package with svn export --native-eol LF.  Contrawise on unix, you can
create the win32 .zip with svn export --native-eol CRLF.




I did set svn properties for all non-binary files to
have eol-style native. However it seems that lots of files
have been added since the last update, and commiters didn't
follow the suggestion for svn config file [auto-props]
I posted few years back :)

Here are two windows scripts that will setup the correct props
for all files in the repo.

Regards,
Mladen


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: DOS-Lineends in many files contained in distribution tar.gz

2008-01-25 Thread Mladen Turk 

William A. Rowe, Jr. wrote:

Rainer Jung wrote:


- cleanup and prepare for each of the targets underneath or "release".

Either way, since in the source tgz target there is already an exclude 
list, I would prefer to update that exclude list and use the same one 
whereever possible, so something like:


FYI - this is all overkill.  If you are packaging on win32, svn export
does your cr/lf line endings by default, but you can create a unix
package with svn export --native-eol LF.  Contrawise on unix, you can
create the win32 .zip with svn export --native-eol CRLF.




I did set svn properties for all non-binary files to
have eol-style native. However it seems that lots of files
have been added since the last update, and commiters didn't
follow the suggestion for svn config file [auto-props]
I posted few years back :)

Here are two windows scripts that will setup the correct props
for all files in the repo.

Regards,
Mladen

@echo off
if "%OS%" == "Windows_NT" setlocal

if "%1" == "" (
set SCRIPT_NAME=%~f0
) else (
set SCRIPT_NAME=%~f1
)

for /D %%i in (*) do (
cd %%i
svn propset svn:eol-style native *.java
svn propset svn:eol-style native *.properties
svn propset svn:eol-style native *.xml
svn propset svn:eol-style native *.xsd
svn propset svn:eol-style native *.xsl
svn propset svn:eol-style native *.dtd
svn propset svn:eol-style native *.tld
svn propset svn:eol-style native *.html
svn propset svn:eol-style native *.txt
svn propset svn:eol-style native *.jsp
svn propset svn:eol-style native *.jspx
svn propset svn:eol-style native *.jspf
svn propset svn:eol-style native *.sh
svn propset svn:eol-style native *.bat
svn propset svn:eol-style native *.svg
svn propset svn:mime-type image/gif *.gif
svn propset svn:mime-type image/jpeg *.jpg
svn propset svn:mime-type image/bmp *.bmp
svn propset svn:mime-type application/pdf *.pdf
svn propset svn:mime-type application/pdf *.pdf
svn propset svn:mime-type image/x-icon *.ico

call %SCRIPT_NAME% %SCRIPT_NAME%
cd ..
)
@echo off
if "%OS%" == "Windows_NT" setlocal

if "%1" == "" (
set SCRIPT_NAME=%~f0
) else (
set SCRIPT_NAME=%~f1
)

for /D %%i in (*) do (
cd %%i
svn propset svn:executable *.sh
svn propset svn:executable *.bat
svn propset svn:executable *.exe
call %SCRIPT_NAME% %SCRIPT_NAME%
cd ..
)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r615282 - /tomcat/tc6.0.x/trunk/STATUS.txt

2008-01-25 Thread rjung 
Author: rjung
Date: Fri Jan 25 09:28:24 2008
New Revision: 615282

URL: http://svn.apache.org/viewvc?rev=615282&view=rev
Log:
Patch applied, remove item.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=615282&r1=615281&r2=615282&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 25 09:28:24 2008
@@ -68,11 +68,3 @@
   Not essential for 6.0.16
   +1: markt, remm, pero
   -1: 
-
-* Include expire command of manager webapp's Manager servlet
-  in URL mapping and security constraint.
-  Otherwise it's only reachable in the HTMLManager.
-  http://people.apache.org/~rjung/patches/web_xml_expire.patch
-  (backport of r614933 from trunk)
-  +1: rjung, fhanik, pero
-  -1:



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r615270 - /tomcat/tc6.0.x/trunk/STATUS.txt

2008-01-25 Thread fhanik 
Author: fhanik
Date: Fri Jan 25 09:10:19 2008
New Revision: 615270

URL: http://svn.apache.org/viewvc?rev=615270&view=rev
Log:
remove patch already included

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=615270&r1=615269&r2=615270&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 25 09:10:19 2008
@@ -69,12 +69,6 @@
   +1: markt, remm, pero
   -1: 
 
-* Fix regression to removal of connection specific comet timeout
-  http://people.apache.org/~fhanik/patches/comet-timeout.patch
-  Would like for 6.0.16, trivial fix
-  +1: fhanik, jim (by inspection), pero
-  -1:
-
 * Include expire command of manager webapp's Manager servlet
   in URL mapping and security constraint.
   Otherwise it's only reachable in the HTMLManager.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 43701] - Error while starting tomcat

2008-01-25 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43701


[EMAIL PROTECTED] changed:

   What|Removed |Added

 OS/Version|Windows Server 2003 |Windows XP
   Priority|P2  |P1




-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: DOS-Lineends in many files contained in distribution tar.gz

2008-01-25 Thread Rainer Jung 

Hello,

no unfortunately I don't expect the patch to work. The fixcrlf is done 
before packaging and in the dist.xml the various packagings (dist, 
deployer, source, ...) are included in alternating platform order, so 
first dist Win, then dist Unix, then deployer Win, then deployer Unix 
and so on. If we change the line endings for some deliverable to unix, 
we can't use the files later in another Win deliverable.


Example: Look at the 6.0.14 deployer zip. The LICENSE file included has 
unix line ends, because it got "fixed" for inclusion in the unix core 
distro before the Win deployer zip was produced.


So we either:

- reorder the targets underneath "release" (Windows first and Unix 
afterwards (which then would make release builds on a windows system OK, 
but not on a unix system). Then the default target works, but calling 
the dist.xml with other targets alternating between target platforms 
without clean in between would produce buggy deliverables.


If we reorder, we need to check, if there are side effects between the 
tasks, s.t. reordering breaks the release build.


- cleanup and prepare for each of the targets underneath or "release".

Either way, since in the source tgz target there is already an exclude 
list, I would prefer to update that exclude list and use the same one 
whereever possible, so something like:


===
--- dist.xml(revision 608958)
+++ dist.xml(working copy)
@@ -560,8 +560,12 @@

   
   
-eol="lf"/>

+
+includes="*.txt,LICENSE,NOTICE,RELEASE-NOTES" eol="lf"/>

+
 
++ 
excludes="**/*.jar,**/*.classes,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.pdf,**/*.war" 
eol="lf"/>

 
   
@@ -711,7 +715,7 @@
   
   
- excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war" 
eol="lf"/>
+ 
excludes="**/*.jar,**/*.classes,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.pdf,**/*.war" 
eol="lf"/>

 
   

But I think we first have to correct the ordering issue.

However I'm not sure, if I should go into it, because I'm not the 
biggest ant guy :)


Remy: Since you are the RM of 6.0: are you going into this topic, or 
should we try to solve it?


Regards,

Rainer


Peter Rossbach wrote:

Hi Rainer,

+1..


Is it fix with followig patch?
===
Index: tomcat60/dist.xml
===
--- /tomcat60/dist.xml(Revision 613549)
+++ tomcat/tomcat60/dist.xml(Arbeitskopie)
@@ -561,6 +561,22 @@
   
 eol="lf"/>

 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
   
==

Peter


Am 25.01.2008 um 01:47 schrieb Rainer Jung:


Hi,

I stumbled today over DOS line endings in the web.xml file of the 
manager contained in TC 6.0.14 tar.gz download.


A little check reveals, that the following files have DOS line 
endings, although the tar.gz is supposed to use Unix convention were 
appropriate:


- RELEASE-NOTES
- bin/catalina-tasks.xml

and in webapps all files with suffixes:

Count Suffix
 286 html
  46 java
  48 jsp
  12 txt
  11 xml
   5 properties
   4 tag
   3 tld
   2 jspf
   2 jspx
   2 svg
   1 xsd
   1 xsl
   1 mdl

All of those suffixes under webapps always have DOS lineendings (one 
file even has mixed ending: webapps/manager/sessionDetail.jsp misses 
the ^M in the last line).


I don't know if dist.xml is actually used for packaging. It uses 
fixcrlf for a couple of files (mainly *.sh, *.txt, conf/*, some 
[A-Z]*) but it would be nice, if we would also transform the above 
mentioned.


Regards,

Rainer


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: DOS-Lineends in many files contained in distribution tar.gz

2008-01-25 Thread Filip Hanik - Dev Lists 

what effect do the line endings actually have, from a functionality point?

only if it affects the distro in a negative way would I actually go 
through all this trouble. but I haven't had any problems so far, and we 
are on all kinds of platforms


Filip

Rainer Jung wrote:

Hello,

no unfortunately I don't expect the patch to work. The fixcrlf is done 
before packaging and in the dist.xml the various packagings (dist, 
deployer, source, ...) are included in alternating platform order, so 
first dist Win, then dist Unix, then deployer Win, then deployer Unix 
and so on. If we change the line endings for some deliverable to unix, 
we can't use the files later in another Win deliverable.


Example: Look at the 6.0.14 deployer zip. The LICENSE file included 
has unix line ends, because it got "fixed" for inclusion in the unix 
core distro before the Win deployer zip was produced.


So we either:

- reorder the targets underneath "release" (Windows first and Unix 
afterwards (which then would make release builds on a windows system 
OK, but not on a unix system). Then the default target works, but 
calling the dist.xml with other targets alternating between target 
platforms without clean in between would produce buggy deliverables.


If we reorder, we need to check, if there are side effects between the 
tasks, s.t. reordering breaks the release build.


- cleanup and prepare for each of the targets underneath or "release".

Either way, since in the source tgz target there is already an exclude 
list, I would prefer to update that exclude list and use the same one 
whereever possible, so something like:


===
--- dist.xml(revision 608958)
+++ dist.xml(working copy)
@@ -560,8 +560,12 @@

   
   
-eol="lf"/>

+
+includes="*.txt,LICENSE,NOTICE,RELEASE-NOTES" eol="lf"/>

+
 
++ 
excludes="**/*.jar,**/*.classes,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.pdf,**/*.war" 
eol="lf"/>

   
tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz">
   prefix="${final.name}">

@@ -711,7 +715,7 @@
   
   
- excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war" 
eol="lf"/>
+ 
excludes="**/*.jar,**/*.classes,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.pdf,**/*.war" 
eol="lf"/>

 
   

But I think we first have to correct the ordering issue.

However I'm not sure, if I should go into it, because I'm not the 
biggest ant guy :)


Remy: Since you are the RM of 6.0: are you going into this topic, or 
should we try to solve it?


Regards,

Rainer


Peter Rossbach wrote:

Hi Rainer,

+1..


Is it fix with followig patch?
===
Index: tomcat60/dist.xml
===
--- /tomcat60/dist.xml(Revision 613549)
+++ tomcat/tomcat60/dist.xml(Arbeitskopie)
@@ -561,6 +561,22 @@
   
 eol="lf"/>

 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   
tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz">
   prefix="${final.name}">

==

Peter


Am 25.01.2008 um 01:47 schrieb Rainer Jung:


Hi,

I stumbled today over DOS line endings in the web.xml file of the 
manager contained in TC 6.0.14 tar.gz download.


A little check reveals, that the following files have DOS line 
endings, although the tar.gz is supposed to use Unix convention were 
appropriate:


- RELEASE-NOTES
- bin/catalina-tasks.xml

and in webapps all files with suffixes:

Count Suffix
 286 html
  46 java
  48 jsp
  12 txt
  11 xml
   5 properties
   4 tag
   3 tld
   2 jspf
   2 jspx
   2 svg
   1 xsd
   1 xsl
   1 mdl

All of those suffixes under webapps always have DOS lineendings (one 
file even has mixed ending: webapps/manager/sessionDetail.jsp misses 
the ^M in the last line).


I don't know if dist.xml is actually used for packaging. It uses 
fixcrlf for a couple of files (mainly *.sh, *.txt, conf/*, some 
[A-Z]*) but it would be nice, if we would also transform the above 
mentioned.


Regards,

Rainer


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]






-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]