svn commit: r893427 - /tomcat/trunk/dist.xml

2009-12-23 Thread markt 
Author: markt
Date: Wed Dec 23 08:40:00 2009
New Revision: 893427

URL: http://svn.apache.org/viewvc?rev=893427&view=rev
Log:
Restore alphabetical order

Modified:
tomcat/trunk/dist.xml

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=893427&r1=893426&r2=893427&view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Wed Dec 23 08:40:00 2009
@@ -81,14 +81,14 @@
   
 
 
-
 
 
 
 
-
-
-
+
+
+
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread markt 
Author: markt
Date: Wed Dec 23 08:44:50 2009
New Revision: 893428

URL: http://svn.apache.org/viewvc?rev=893428&view=rev
Log:
Simplify, simplify

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=893428&r1=893427&r2=893428&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 08:44:50 2009
@@ -236,12 +236,9 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
   Implement fail-safe EOL conversion for source distributions
   Based on patches provided by sebb / kkolinko
-  http://people.apache.org/~markt/patches/2009-12-22-bug47609.patch
-  +1: markt, kkolinko (good as is, though better together with r893362)
+  http://people.apache.org/~markt/patches/2009-12-23-bug47609.patch
+  +1: markt, kkolinko
   -1: 
-  http://svn.apache.org/viewvc?rev=893362&view=rev
-  +1: kkolinko
-  -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774
   Ensure web application class loader is used when calling session listeners



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r892800 - in /tomcat/jk/trunk: native/common/jk_status.c xdocs/miscellaneous/changelog.xml

2009-12-23 Thread Mladen Turk 

On 12/23/2009 08:50 AM, Konstantin Kolinko wrote:

2009/12/21:

Author: mturk
Date: Mon Dec 21 12:39:29 2009
New Revision: 892800

URL: http://svn.apache.org/viewvc?rev=892800&view=rev
Log:
Fix #48305. Skip if property ends with .secret

Modified:
tomcat/jk/trunk/native/common/jk_status.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

+size_t nl = strlen(name);
+if (nl>  sizeof(".secret")&&
+strcmp(name + nl - 7, ".secret") == 0) {
+continue;
+}


What is sizeof(".secret")?  I suppose it is sizeof(char*) that is 4 or
8, and you are using an explicit '7' on the next line.


Right, should be 'sizeof(".secret") - 1'.

and sizeof("foo") is 4 -> strlen("foo") + 1 FYI :)


--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release build 6.0.21 (try 2)

2009-12-23 Thread jean-frederic clere 

On 12/22/2009 09:27 PM, Mark Thomas wrote:

Servlet TCK passes
JSP TCK passes - 1 failure

This one, however, can't be ignored. Remy hinted at it early today. The
fix for bug 47453 created a regression in that the constraint expressed
in JSP.2.3.4 namely thatA String literal can be provided, as
long as the return type of the deferred method signature is not
void  is not enforced. This needs to be fixed for 6.0.21 and
will, therefore, require a re-tag.


Sure.

Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread Mark Thomas 
On 23/12/2009 03:08, Konstantin Kolinko wrote:
> I would say that it is not so easy to review all places where
> isValid() is called.
> 
> I see two more approaches available here:
> A). Place fix in StandardSession.expire(boolean)
> That is, wrap the call to  listener.sessionDestroyed(event);  with
> setting and then clearing the TCCL.
> The fireContainerEvent() calls above and below that line probably do
> not need webapp's classLoader, though I am not sure.
> The Context reference is available there, so Loader can be obtained.
> 
> B). Implement a wrapper for HttpSessionListener that sets TCCL before
> calling the wrapped listener. Add wrappers when the listeners are
> added to the webapp.
> 
> The if (!(listeners[j] instanceof HttpSessionListener)) check in
> StandardSession.notify() code means that it has to be a wrapper that
> specifically implements the HttpSessionListener interface.
> 
> Any thoughts?

Moving the fix to StandardSession.expire() works for me.

Given that in normal circumstances the TCCL is set for the entire
method, I'd set the TCCL outside the loop that iterates over the
listeners and reset it just after the loop.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release build 6.0.21 (try 2)

2009-12-23 Thread jean-frederic clere 

On 12/23/2009 02:12 AM, Rainer Jung wrote:

On 23.12.2009 00:45, Konstantin Kolinko wrote:

2009/12/22 Mark Thomas:

(...)
Since we are going to have to re-tag anyway, it would be good if the
patches required to fix the various niggles above were applied before
the tag.

Mark


+1 to re-tag.

And I would like the fix to 47413 to be included in it. Patch already
proposed, though there might be comments.

To be sure: while applying the patches, we are still updating the
"6.0.21" section of changelog.xml?
That is, everybody agrees that the next tag will be 6.0.21 again? I am
+1 to drop the current TOMCAT_6_0_21/ and recreate it after the fixes
are applied.


IMHO: Our whole release process happens in public. So our artefacts can
be retrieved from the dev download pages and from looking at the files
there is nothing to decide, whether it is a later withdrawn release
candidate of 6.0.21 or the real release. So since we don't do real
release candidates (marking the files with rcX or dev or whatever) the
only safe thing would be to burn version number 6.0.21 and go for 6.0.22.


+1



The same problem IMHO applies to editing files in an svn tag (at least
if more than a couple of minutes have passed since tagging). After
editing it's not any more a tag that uniquely describes one version of
the code, instead it becomes a branch.


Well probably that is also a good idea.

Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread jfclere 
Author: jfclere
Date: Wed Dec 23 09:28:08 2009
New Revision: 893443

URL: http://svn.apache.org/viewvc?rev=893443&view=rev
Log:
my votes.

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=893443&r1=893442&r2=893443&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 09:28:08 2009
@@ -296,9 +296,10 @@
   http://svn.apache.org/viewvc?rev=893375&view=rev
   http://svn.apache.org/viewvc?rev=893378&view=rev
   +1: kkolinko
-  -1:
+  -1: jfclere
+  missing append="true" and doesn't apply I am working on a better proposal.
 
 * Fix regression (TCK failure) in fix for bug 47453
   http://svn.apache.org/viewvc?rev=893321&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, jfclere
   -1: 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release build 6.0.21 (try 2)

2009-12-23 Thread Konstantin Kolinko 
2009/12/23 Mladen Turk :
> On 12/23/2009 02:12 AM, Rainer Jung wrote:
>>
>> release candidates (marking the files with rcX or dev or whatever) the
>> only safe thing would be to burn version number 6.0.21 and go for 6.0.22.
>>
>
> +1
>
> Let's make a proper release.

+1

>
> I'd suggest to make a release on a specific SVN revision instead tag.
> That way if voted it can easily be tagged as 6.0.22 (that revision
> instead 6.0.x trunk)
> Having that, RM can have as many candidates without re-tagging or
> creating useless tags.
>

1. Rainer states a valid point that if those files are named "6.0.22"
someone can download them from people.apache.org and claim later that
it is ours.

If those are named differently, will PGP signatures still apply?

Though it would be good to do some testing with a 6.0.0-dev build as a
RC after several months of active development, or after reconfiguring
the build environment.

2. Do we change 6.0.0-dev -> 6.0.22 in the properties file in SVN
before that revision, or in the tag only, or change it only locally?
I would prefer it to be changed in the tag.

3. While RC voting goes, should we make "6.0.(n+1)" section
in changelog.xml and add new items there, optionally moving them
into "6.0.n" section if voting fails?

I think it is OK to trash one or more version numbers. It preserves consistency.
And will we ever beat HTTPD with their *.*.63 for 2.0.x?

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread Konstantin Kolinko 
2009/12/23  :
> Author: jfclere
> Date: Wed Dec 23 09:28:08 2009
> New Revision: 893443
>
> URL: http://svn.apache.org/viewvc?rev=893443&view=rev
> Log:
> my votes.
>
>   http://svn.apache.org/viewvc?rev=893375&view=rev
>   http://svn.apache.org/viewvc?rev=893378&view=rev
>   +1: kkolinko
> -  -1:
> +  -1: jfclere
> +  missing append="true" and doesn't apply I am working on a better proposal.

append="true" is _not_ needed.

It was in the old approach where  generated the file, and
 added filename to it (thus append=true).

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893452 - /tomcat/jk/trunk/native/common/jk_connect.c

2009-12-23 Thread mturk 
Author: mturk
Date: Wed Dec 23 10:01:47 2009
New Revision: 893452

URL: http://svn.apache.org/viewvc?rev=893452&view=rev
Log:
Use smarter shutdown. In case we don't receive the full buffer break from loop. 
This shoud lower down the shutdown to 2 sec max

Modified:
tomcat/jk/trunk/native/common/jk_connect.c

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=893452&r1=893451&r2=893452&view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Wed Dec 23 10:01:47 2009
@@ -694,8 +694,8 @@
 char dummy[512];
 int rc = 0;
 int rd = 0;
+int rp = 0;
 int save_errno;
-fd_set rs;
 struct timeval tv;
 time_t start = time(NULL);
 
@@ -722,10 +722,16 @@
 return rc;
 }
 
-/* Set up to wait for readable data on socket... */
-FD_ZERO(&rs);
-
 do {
+#ifdef HAVE_POLL
+struct pollfd fds;
+
+fds.fd = sd;
+fds.events = POLLIN;
+#else
+fd_set rs;
+
+FD_ZERO(&rs);
 /* Read all data from the peer until we reach "end-of-file"
  * (FIN from peer) or we've exceeded our overall timeout. If the
  * backend does not send us bytes within 2 seconds
@@ -735,8 +741,14 @@
 FD_SET(sd, &rs);
 tv.tv_sec  = SECONDS_TO_LINGER;
 tv.tv_usec = 0;
-
-if (select((int)sd + 1, &rs, NULL, NULL, &tv) > 0) {
+#endif
+rp = 0;
+#ifdef HAVE_POLL
+if (poll(&fds, 1, SECONDS_TO_LINGER * 1000) > 0)
+#else
+if (select((int)sd + 1, &rs, NULL, NULL, &tv) > 0)
+#endif
+{
 do {
 #if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
 rc = recv(sd, &dummy[0], sizeof(dummy), 0);
@@ -746,7 +758,7 @@
 rc = read(sd, &dummy[0], sizeof(dummy));
 #endif
 if (rc > 0)
-rd += rc;
+rp += rc;
 } while (JK_IS_SOCKET_ERROR(rc) && (errno == EINTR || errno == 
EAGAIN));
 
 if (rc <= 0)
@@ -754,7 +766,27 @@
 }
 else
 break;
-
+rd += rp;
+if (rp < sizeof(dummy)) {
+/* We have readed less then size of buffer
+ * It's a good chance there will be no more data
+ * to read.
+ */
+if ((rc = sononblock(sd))) {
+rc = jk_close_socket(sd, l);
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+   "error setting  socket %d to nonblocking", sd);
+errno = save_errno;
+JK_TRACE_EXIT(l);
+return rc;
+}
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+   "shutting down the read side of socket %d", sd);
+shutdown(sd, SHUT_RD);
+break;
+}
 } while (difftime(time(NULL), start) < MAX_SECS_TO_LINGER);
 
 rc = jk_close_socket(sd, l);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread jean-frederic clere 

On 12/23/2009 10:35 AM, Konstantin Kolinko wrote:

2009/12/23:

Author: jfclere
Date: Wed Dec 23 09:28:08 2009
New Revision: 893443

URL: http://svn.apache.org/viewvc?rev=893443&view=rev
Log:
my votes.

   http://svn.apache.org/viewvc?rev=893375&view=rev
   http://svn.apache.org/viewvc?rev=893378&view=rev
   +1: kkolinko
-  -1:
+  -1: jfclere
+  missing append="true" and doesn't apply I am working on a better proposal.


append="true" is _not_ needed.


Yep in fact it doesn't apply and the format of the md5 files has changed 
now.


Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893456 - /tomcat/jk/trunk/native/common/jk_connect.c

2009-12-23 Thread mturk 
Author: mturk
Date: Wed Dec 23 10:19:31 2009
New Revision: 893456

URL: http://svn.apache.org/viewvc?rev=893456&view=rev
Log:
In case the read was transient use 2ms timeout for a second attempt.

Modified:
tomcat/jk/trunk/native/common/jk_connect.c

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=893456&r1=893455&r2=893456&view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Wed Dec 23 10:19:31 2009
@@ -671,7 +671,6 @@
 #define MAX_SECS_TO_LINGER 30
 #endif
 #define SECONDS_TO_LINGER  2
-
 #ifndef SHUT_WR
 #ifdef SD_SEND
 #define SHUT_WR SD_SEND
@@ -696,6 +695,7 @@
 int rd = 0;
 int rp = 0;
 int save_errno;
+int timeout = SECONDS_TO_LINGER * 1000;
 struct timeval tv;
 time_t start = time(NULL);
 
@@ -739,12 +739,12 @@
  * close the connection.
  */
 FD_SET(sd, &rs);
-tv.tv_sec  = SECONDS_TO_LINGER;
-tv.tv_usec = 0;
+tv.tv_sec  = timeout / 1000;
+tv.tv_usec = (timeout % 1000) * 1000;
 #endif
 rp = 0;
 #ifdef HAVE_POLL
-if (poll(&fds, 1, SECONDS_TO_LINGER * 1000) > 0)
+if (poll(&fds, 1, timeout) > 0)
 #else
 if (select((int)sd + 1, &rs, NULL, NULL, &tv) > 0)
 #endif
@@ -768,6 +768,13 @@
 break;
 rd += rp;
 if (rp < sizeof(dummy)) {
+if (timeout > SECONDS_TO_LINGER) {
+/* Try once again with 1000 times smaller timeout
+ * In our case 2 msec.
+ */
+timeout = SECONDS_TO_LINGER;
+continue;
+}
 /* We have readed less then size of buffer
  * It's a good chance there will be no more data
  * to read.
@@ -787,6 +794,7 @@
 shutdown(sd, SHUT_RD);
 break;
 }
+timeout = SECONDS_TO_LINGER * 1000;
 } while (difftime(time(NULL), start) < MAX_SECS_TO_LINGER);
 
 rc = jk_close_socket(sd, l);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893458 - /tomcat/jk/trunk/native/common/jk_connect.c

2009-12-23 Thread mturk 
Author: mturk
Date: Wed Dec 23 10:22:40 2009
New Revision: 893458

URL: http://svn.apache.org/viewvc?rev=893458&view=rev
Log:
Allow shutdown for zero reads as well

Modified:
tomcat/jk/trunk/native/common/jk_connect.c

Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=893458&r1=893457&r2=893458&view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Wed Dec 23 10:22:40 2009
@@ -761,7 +761,7 @@
 rp += rc;
 } while (JK_IS_SOCKET_ERROR(rc) && (errno == EINTR || errno == 
EAGAIN));
 
-if (rc <= 0)
+if (rc < 0)
 break;
 }
 else



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread jfclere 
Author: jfclere
Date: Wed Dec 23 10:52:19 2009
New Revision: 893468

URL: http://svn.apache.org/viewvc?rev=893468&view=rev
Log:
My proposal.

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=893468&r1=893467&r2=893468&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 10:52:19 2009
@@ -297,7 +297,11 @@
   http://svn.apache.org/viewvc?rev=893378&view=rev
   +1: kkolinko
   -1: jfclere
-  missing append="true" and doesn't apply I am working on a better proposal.
+  Below my proposal:
+* Fixes for MD5 files generation
+  http://people.apache.org/~jfclere/patches/patch.20091223
+  +1: jfclere
+  -1:
 
 * Fix regression (TCK failure) in fix for bug 47453
   http://svn.apache.org/viewvc?rev=893321&view=rev



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release build 6.0.21 (try 2)

2009-12-23 Thread Rainer Jung 

On 23.12.2009 10:33, Konstantin Kolinko wrote:

2009/12/23 Mladen Turk:

On 12/23/2009 02:12 AM, Rainer Jung wrote:


release candidates (marking the files with rcX or dev or whatever) the
only safe thing would be to burn version number 6.0.21 and go for 6.0.22.



+1

Let's make a proper release.


+1



I'd suggest to make a release on a specific SVN revision instead tag.
That way if voted it can easily be tagged as 6.0.22 (that revision
instead 6.0.x trunk)
Having that, RM can have as many candidates without re-tagging or
creating useless tags.



1. Rainer states a valid point that if those files are named "6.0.22"
someone can download them from people.apache.org and claim later that
it is ours.

If those are named differently, will PGP signatures still apply?

Though it would be good to do some testing with a 6.0.0-dev build as a
RC after several months of active development, or after reconfiguring
the build environment.

2. Do we change 6.0.0-dev ->  6.0.22 in the properties file in SVN
before that revision, or in the tag only, or change it only locally?
I would prefer it to be changed in the tag.

3. While RC voting goes, should we make "6.0.(n+1)" section
in changelog.xml and add new items there, optionally moving them
into "6.0.n" section if voting fails?

I think it is OK to trash one or more version numbers. It preserves consistency.
And will we ever beat HTTPD with their *.*.63 for 2.0.x?


I expect making RC from some svn revision and then rebrand as release 
after voting needs some experimentation in order to find a stable 
process for it (where is the version number hidden in the RC, how easy 
can the RC be differentiated from the full release). Using an RC tag or 
an svn revision for that will be the smallest problem.


We can inspect, how the commons people do their RCs and releases.

So I suggest we try that for TC 7 and find out how to do that in a good 
way (or not) before we try with 6.0. Let's stick to the existing process 
for 6.0 and do the experiments with 7.


Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread kkolinko 
Author: kkolinko
Date: Wed Dec 23 11:08:53 2009
New Revision: 893473

URL: http://svn.apache.org/viewvc?rev=893473&view=rev
Log:
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=893473&r1=893472&r2=893473&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 11:08:53 2009
@@ -300,7 +300,7 @@
   Below my proposal:
 * Fixes for MD5 files generation
   http://people.apache.org/~jfclere/patches/patch.20091223
-  +1: jfclere
+  +1: jfclere, kkolinko
   -1:
 
 * Fix regression (TCK failure) in fix for bug 47453



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893474 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/Validator.java java/org/apache/jasper/resources/LocalStrings.properties

2009-12-23 Thread markt 
74&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 11:18:49 2009
@@ -302,8 +302,3 @@
   http://people.apache.org/~jfclere/patches/patch.20091223
   +1: jfclere, kkolinko
   -1:
-
-* Fix regression (TCK failure) in fix for bug 47453
-  http://svn.apache.org/viewvc?rev=893321&view=rev
-  +1: markt, kkolinko, jfclere
-  -1: 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?rev=893474&r1=893473&r2=893474&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Wed Dec 
23 11:18:49 2009
@@ -1116,6 +1116,14 @@
 } else {
 expectedType = "java.lang.Object";
 }
+if ("void".equals(expectedType)) {
+// Can't specify a literal for a
+// deferred method with an expected 
type
+// of void - JSP.2.3.4
+err.jspError(n,
+"jsp.error.literal_with_void",
+tldAttrs[j].getName());
+}
 }
 if (tldAttrs[j].isDeferredValue()) {
 // The String litteral must be castable to 
what is declared as type

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=893474&r1=893473&r2=893474&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
Wed Dec 23 11:18:49 2009
@@ -352,6 +352,7 @@
 jsp.error.var_and_varReader=Only one of \'var\' or \'varReader\' may be 
specified
 jsp.error.missing_var_or_varReader=Missing \'var\' or \'varReader\' attribute
 jsp.warning.bad.urlpattern.propertygroup=Bad value {0} in the url-pattern 
subelement in web.xml
+jsp.error.literal_with_void=A literal value was specified for attribute {0} 
that is defined as a deferred method with a return type of void. JSP.2.3.4 does 
not permit literal values in this case
 jsp.error.unknown_attribute_type=Unknown attribute type ({1}) for attribute 
{0}.
 jsp.error.coerce_to_type=Cannot coerce value ({2}) to type ({1}) for attribute 
{0}.
 jsp.error.jspelement.missing.name=Mandatory XML-style \'name\' attribute 
missing



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release build 6.0.21 (try 2)

2009-12-23 Thread Mladen Turk 

On 12/23/2009 11:59 AM, Rainer Jung wrote:


So I suggest we try that for TC 7 and find out how to do that in a good
way (or not) before we try with 6.0. Let's stick to the existing process
for 6.0 and do the experiments with 7.



We can easily make a script similar to the one we have for mod_jk
It can either come from tag or trunk (in which case it caries rX)



Regards
--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread markt 
Author: markt
Date: Wed Dec 23 11:33:48 2009
New Revision: 893476

URL: http://svn.apache.org/viewvc?rev=893476&view=rev
Log:
Withdraw superceded patch & vote for new patch

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=893476&r1=893475&r2=893476&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 11:33:48 2009
@@ -286,12 +286,6 @@
   +1: kkolinko
   -1:
 
-* Correctly generate MD5s for Windows zips
-  http://svn.apache.org/viewvc?rev=893273&view=rev
-  +1: markt, kkolinko
-  -1: 
-   kkolinko: r893375 proposed below fixes this issue as well
-
 * Fixes for MD5 files generation
   http://svn.apache.org/viewvc?rev=893375&view=rev
   http://svn.apache.org/viewvc?rev=893378&view=rev
@@ -300,5 +294,5 @@
   Below my proposal:
 * Fixes for MD5 files generation
   http://people.apache.org/~jfclere/patches/patch.20091223
-  +1: jfclere, kkolinko
+  +1: jfclere, kkolinko, markt
   -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread rjung 
Author: rjung
Date: Wed Dec 23 11:39:53 2009
New Revision: 893479

URL: http://svn.apache.org/viewvc?rev=893479&view=rev
Log:
Vote and comment.

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=893479&r1=893478&r2=893479&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 11:39:53 2009
@@ -266,7 +266,7 @@
 * Log threads that are started but not stopped by web applications
   http://svn.apache.org/viewvc?view=revision&revision=885241
   http://svn.apache.org/viewvc?view=revision&revision=885260
-  +1: markt, jim
+  +1: markt, jim, rjung
   -1: 
 
 * More memory leak protection: ThreadLocals, RMI references, optionally 
stopping
@@ -275,9 +275,6 @@
   http://svn.apache.org/viewvc?view=revision&revision=892843
   +1: markt, jim
   -1: 
-  rjung: I added the second commit after Mark proposed and votes. It is
- a comment typo change only. Will need more time to vote on
- the whole proposal though.
 
 * Fix second part of 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47413#c8
   Coerce result of composite EL expression (${a}${b}) from String to the 
expected type.
@@ -296,3 +293,10 @@
   http://people.apache.org/~jfclere/patches/patch.20091223
   +1: jfclere, kkolinko, markt
   -1:
+  rjung: I'm confused now, which of the three proposals are still relevant.
+ I'm +0 for jfc's proposal.
+ One question before going +1: where does '*' as a filename prefix
+ come from? If we generate the format output by "md5sum", then
+ everyone can easily check with "md5sum -c". For this we would need
+ to use '  ' (two spaces) instead of ' *' as a separator between md5
+ and file name.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread Mark Thomas 
On 23/12/2009 11:39, rj...@apache.org wrote:
> Author: rjung
> Date: Wed Dec 23 11:39:53 2009
> New Revision: 893479
> 
> URL: http://svn.apache.org/viewvc?rev=893479&view=rev
> Log:
> Vote and comment.
> 
> 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=893479&r1=893478&r2=893479&view=diff
> ==
> --- tomcat/tc6.0.x/trunk/STATUS.txt (original)
> +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 11:39:53 2009
> @@ -266,7 +266,7 @@
>  * Log threads that are started but not stopped by web applications
>http://svn.apache.org/viewvc?view=revision&revision=885241
>http://svn.apache.org/viewvc?view=revision&revision=885260
> -  +1: markt, jim
> +  +1: markt, jim, rjung
>-1: 
>  
>  * More memory leak protection: ThreadLocals, RMI references, optionally 
> stopping
> @@ -275,9 +275,6 @@
>http://svn.apache.org/viewvc?view=revision&revision=892843
>+1: markt, jim
>-1: 
> -  rjung: I added the second commit after Mark proposed and votes. It is
> - a comment typo change only. Will need more time to vote on
> - the whole proposal though.
>  
>  * Fix second part of 
> https://issues.apache.org/bugzilla/show_bug.cgi?id=47413#c8
>Coerce result of composite EL expression (${a}${b}) from String to the 
> expected type.
> @@ -296,3 +293,10 @@
>http://people.apache.org/~jfclere/patches/patch.20091223
>+1: jfclere, kkolinko, markt
>-1:
> +  rjung: I'm confused now, which of the three proposals are still relevant.
> + I'm +0 for jfc's proposal.

AFAICT, JFC's patch is a port of Konstantin's patches that won't apply
cleanly to 6.0.x

> + One question before going +1: where does '*' as a filename prefix
> + come from?
man mdssum

> + If we generate the format output by "md5sum", then
> + everyone can easily check with "md5sum -c". For this we would need
> + to use '  ' (two spaces) instead of ' *' as a separator between md5
> + and file name.
-1. As per the manual, '*' indicates binary files, ' ' indicates text
files. These are all binary.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893492 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/loader/LocalStrings.properties java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml

2009-12-23 Thread markt 
Author: markt
Date: Wed Dec 23 12:32:02 2009
New Revision: 893492

URL: http://svn.apache.org/viewvc?rev=893492&view=rev
Log:
Log threads that are started but not stopped by web applications

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 23 12:32:02 2009
@@ -1,2 +1,2 @@
 /tomcat:883362
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885991,886019,888072,889363,889606,889716,890139,890265,890349-890350,8904
 
17,891185-891187,891583,892198,892341,892415,892464,892555,892814,892817,892887,893321
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885991,886019,888072,889363,889606,889716,890139,890265,8903
 
49-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892814,892817,892887,893321

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=893492&r1=8934

svn commit: r893493 - in /tomcat/trunk/webapps/examples/jsp/tagplugin: howto.html notes.html

2009-12-23 Thread kkolinko 
Author: kkolinko
Date: Wed Dec 23 12:36:57 2009
New Revision: 893493

URL: http://svn.apache.org/viewvc?rev=893493&view=rev
Log:
Properly close  tags in tagplugin documentation pages.

Modified:
tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html
tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html

Modified: tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html?rev=893493&r1=893492&r2=893493&view=diff
==
--- tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/howto.html Wed Dec 23 12:36:57 
2009
@@ -17,6 +17,8 @@
 
   
 Tag Plugin Implementation
+  
+  
 How to write tag plugins
 
   To write a plugin, you'll need to download the source for Tomcat 5.
@@ -39,5 +41,5 @@
 classes.
   
 
-  
+  
 

Modified: tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html?rev=893493&r1=893492&r2=893493&view=diff
==
--- tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/notes.html Wed Dec 23 12:36:57 
2009
@@ -17,6 +17,8 @@
 
   
 Tag Plugin Introduction
+  
+  
 Tag Plugins: Introductory Notes
 
   Tomcat 5 provides a framework for implementing tag plugins.  The
@@ -34,6 +36,6 @@
   They do serve as examples to show plugins in action (just
   examine the generated Java files), and how they can be implemented.
 
-  
+  
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release build 6.0.21 (try 2)

2009-12-23 Thread Mark Thomas 
On 23/12/2009 08:55, jean-frederic clere wrote:
> On 12/22/2009 09:27 PM, Mark Thomas wrote:
>> Servlet TCK passes
>> JSP TCK passes - 1 failure
>>
>> This one, however, can't be ignored. Remy hinted at it early today. The
>> fix for bug 47453 created a regression in that the constraint expressed
>> in JSP.2.3.4 namely thatA String literal can be provided, as
>> long as the return type of the deferred method signature is not
>> void  is not enforced. This needs to be fixed for 6.0.21 and
>> will, therefore, require a re-tag.
> 
> Sure.

Are you going to re-tag trunk as 6.0.21 or 6.0.22. I have no strong
preference. Whilst this is happening in the open, it is only happening
on the dev list and folks on the dev list are not end users so I am not
concerned about re-using 6.0.21

If you do want to go for 6.0.22, we'll need to modify the changelog to
reflect which changes were post the 6.0.21 tag.

Before tagging I think we should try and commit the MD5 fix and the
source file line endings fix.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread rjung 
Author: rjung
Date: Wed Dec 23 12:39:34 2009
New Revision: 893494

URL: http://svn.apache.org/viewvc?rev=893494&view=rev
Log:
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=893494&r1=893493&r2=893494&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 12:39:34 2009
@@ -285,12 +285,5 @@
   Below my proposal:
 * Fixes for MD5 files generation
   http://people.apache.org/~jfclere/patches/patch.20091223
-  +1: jfclere, kkolinko, markt
+  +1: jfclere, kkolinko, markt, rjung
   -1:
-  rjung: I'm confused now, which of the three proposals are still relevant.
- I'm +0 for jfc's proposal.
- One question before going +1: where does '*' as a filename prefix
- come from? If we generate the format output by "md5sum", then
- everyone can easily check with "md5sum -c". For this we would need
- to use '  ' (two spaces) instead of ' *' as a separator between md5
- and file name.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893496 - /tomcat/trunk/webapps/examples/WEB-INF/web.xml

2009-12-23 Thread kkolinko 
Author: kkolinko
Date: Wed Dec 23 12:40:59 2009
New Revision: 893496

URL: http://svn.apache.org/viewvc?rev=893496&view=rev
Log:
Enforce presence of charset in content-type header of textual mime-types in the 
Examples webapp
a) by using a filter, b) by adding mime-type mappings for htm/html files

Modified:
tomcat/trunk/webapps/examples/WEB-INF/web.xml

Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=893496&r1=893495&r2=893496&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Wed Dec 23 12:40:59 2009
@@ -53,6 +53,12 @@
 
 
 
+
+
+Add Charset to Content-Type Filter
+
org.apache.catalina.filters.AddDefaultCharsetFilter
+
+
 
 Compression Filter
 compressionFilters.CompressionFilter
@@ -84,6 +90,11 @@
 
 -->
 
+
+Add Charset to Content-Type Filter
+/*
+
+

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

2009-12-23 Thread Rainer Jung 

On 23.12.2009 13:10, Mark Thomas wrote:

On 23/12/2009 11:39, rj...@apache.org wrote:

+ One question before going +1: where does '*' as a filename prefix
+ come from?

man mdssum


Thanks! I thought it came from simulating some alternative ant way of 
doing things.


As you said, all files are binary in the sense of what md5sum thinks is 
a binary: when you create an md5 with md5sum without flags on Unix it 
usually won't put the '*' there, but you can convince it to add the '*' 
by using the "-b" flag. Looks like it's useful for Windows when to 
decide whether to open the file in text or binary mode during checking 
the md5.


Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893498 - in /tomcat/tc6.0.x/trunk: STATUS.txt dist.xml extras.xml webapps/docs/changelog.xml

2009-12-23 Thread markt 
Author: markt
Date: Wed Dec 23 12:44:37 2009
New Revision: 893498

URL: http://svn.apache.org/viewvc?rev=893498&view=rev
Log:
Fixes for MD5 files generation.
This is the jfclere/kkolinko patch

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=893498&r1=893497&r2=893498&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 12:44:37 2009
@@ -276,14 +276,3 @@
   http://svn.apache.org/viewvc?rev=893001&view=rev
   +1: kkolinko
   -1:
-
-* Fixes for MD5 files generation
-  http://svn.apache.org/viewvc?rev=893375&view=rev
-  http://svn.apache.org/viewvc?rev=893378&view=rev
-  +1: kkolinko
-  -1: jfclere
-  Below my proposal:
-* Fixes for MD5 files generation
-  http://people.apache.org/~jfclere/patches/patch.20091223
-  +1: jfclere, kkolinko, markt, rjung
-  -1:

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=893498&r1=893497&r2=893498&view=diff
==
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Dec 23 12:44:37 2009
@@ -302,10 +302,9 @@
 
 
 
-
-
+
+  
+
   
 
 
@@ -363,10 +362,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -392,10 +390,10 @@
   
   
 
-
-
+
+
+  
+
 
 
 
@@ -423,10 +421,10 @@
 
   
 
-
-
+
+
+  
+
 
 
 
@@ -455,10 +453,9 @@
   
 
 
-
-
+
+  
+
 
   
 
@@ -472,10 +469,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -536,10 +532,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -561,10 +556,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -586,10 +580,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -598,10 +591,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -613,10 +605,19 @@
  tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
   
 
-
-
+
+  
+
   
 
+  
+  
+  
+
+
+
+
+
+
+  
 

Modified: tomcat/tc6.0.x/trunk/extras.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=893498&r1=893497&r2=893498&view=diff
==
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Dec 23 12:44:37 2009
@@ -61,6 +61,9 @@
   
   
 
+  
+  
+
   
   
 
@@ -168,8 +171,9 @@
   
 
-
+
+  
+
 
 
@@ -186,9 +190,9 @@
   
 
-
-
+
+  
+
   
 
   
@@ -241,9 +245,9 @@
   

-
-   
+
+  
+
   
 
   
@@ -258,9 +262,10 @@
   
 
-
+
+
+  
+
   
 
   
   
 
+  
+  
+  
+
+
+
+
+
+
+  
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=893498&r1=893497&r2=893498&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Dec 23 12:44:37 2009
@@ -726,6 +726,9 @@
 Further improvements to the administrative user name and password
 handling in the Windows installer. (kkolinko)
   
+  
+Correct MD5 generation in the build process. (jfclere/kkolinko)
+  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release build 6.0.21 (try 2)

2009-12-23 Thread jean-frederic clere 

On 12/23/2009 01:38 PM, Mark Thomas wrote:

On 23/12/2009 08:55, jean-frederic clere wrote:

On 12/22/2009 09:27 PM, Mark Thomas wrote:

Servlet TCK passes
JSP TCK passes - 1 failure

This one, however, can't be ignored. Remy hinted at it early today. The
fix for bug 47453 created a regression in that the constraint expressed
in JSP.2.3.4 namely thatA String literal can be provided, as
long as the return type of the deferred method signature is not
void   is not enforced. This needs to be fixed for 6.0.21 and
will, therefore, require a re-tag.


Sure.


Are you going to re-tag trunk as 6.0.21 or 6.0.22.


I will re-tag trunk as 6.0.22

 I have no strong

preference. Whilst this is happening in the open, it is only happening
on the dev list and folks on the dev list are not end users so I am not
concerned about re-using 6.0.21

If you do want to go for 6.0.22, we'll need to modify the changelog to
reflect which changes were post the 6.0.21 tag.


Yep.



Before tagging I think we should try and commit the MD5 fix and the
source file line endings fix.


Sure

Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893499 - in /tomcat/tc6.0.x/trunk: ./ webapps/examples/jsp/tagplugin/howto.html webapps/examples/jsp/tagplugin/notes.html

2009-12-23 Thread kkolinko 
Author: kkolinko
Date: Wed Dec 23 12:55:43 2009
New Revision: 893499

URL: http://svn.apache.org/viewvc?rev=893499&view=rev
Log:
Properly close  tags in tagplugin documentation pages.
Its a documentation fix, no need to vote.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/webapps/examples/jsp/tagplugin/howto.html
tomcat/tc6.0.x/trunk/webapps/examples/jsp/tagplugin/notes.html

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 23 12:55:43 2009
@@ -1,2 +1,2 @@
 /tomcat:883362
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885991,886019,888072,889363,889606,889716,890139,890265,8903
 
49-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892814,892817,892887,893321
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885991,886019,888072,889363,889606,889716,890139,890265,8903
 
49-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892814,892817,892887,893321,893493

Modified: tomcat/tc6.0.x/trunk/webapps/examples/jsp/tagplugin/howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/jsp/tagplugin/howto.html?rev=893499&r1=8

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

2009-12-23 Thread kkolinko 
Author: kkolinko
Date: Wed Dec 23 13:02:46 2009
New Revision: 893501

URL: http://svn.apache.org/viewvc?rev=893501&view=rev
Log:
proposal

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=893501&r1=893500&r2=893501&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 13:02:46 2009
@@ -276,3 +276,13 @@
   http://svn.apache.org/viewvc?rev=893001&view=rev
   +1: kkolinko
   -1:
+
+* Enforce presence of charset in content-type header of textual mime-types in 
the Examples webapp
+  step 1) copy AddDefaultCharsetFilter from trunk
+   mkdir "java/org/apache/catalina/filters"
+   svn add "java/org/apache/catalina/filters"
+   svn copy 
https://svn.apache.org/repos/asf/tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
 java/org/apache/catalina/filters/
+  step 2) merge r893496 from trunk
+   http://svn.apache.org/viewvc?rev=893496&view=rev
+  +1: kkolinko
+  -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread kkolinko 
Author: kkolinko
Date: Wed Dec 23 13:11:41 2009
New Revision: 893505

URL: http://svn.apache.org/viewvc?rev=893505&view=rev
Log:
Withdraw the StringBuilder patches, as there is not enough support for them.

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=893505&r1=893504&r2=893505&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 13:11:41 2009
@@ -68,171 +68,6 @@
   -1: funkman : api change in Session.java for .x.x release
 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47893
-  Use StringBuilder instead of StringBuffer
-  -0: markt for all SBuilder->SBuffer patches. Code cleanup is fine in trunk 
but
-no need to backport it
-  -0: funkman
-  -1: fhanik Is there a real benefit, other than clouding the revision 
history? ;)
-  I'd consider 6.0.x to be in maintenance mode not clean up/refactor mode.
-
-  The patches, as well as patches for individual files inside them, are
-  independent of each other. Vote for as many as you want.
-  There are 51 of them.
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_ant.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_authenticator.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_connector.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_core.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_deploy.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_ha.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_loader.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_manager.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_manager_host.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_mbeans.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_realm.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_servlets.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_session.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_ssi.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_startup.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_tribes.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_tribes_group.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_tribes_group_int.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_tribes_io.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_tribes_membership.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_tribes_tipis.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_tribes_transport.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_tribes_util.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_users.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_util.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_c_valves.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_coyote.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_el_parser.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_el_util.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_jasper.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-02_StringBuilder_o_a_jasper_compiler.patch
-  +1: kkolinko
-  -1:
-  
http://people.apache.org/~kkolinko/patches/2009-11-

DO NOT REPLY [Bug 48438] New: RC2 of 6.0.21: java.security.AccessControlException on Error 500 page

2009-12-23 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48438

   Summary: RC2 of 6.0.21: java.security.AccessControlException on
Error 500 page
   Product: Tomcat 6
   Version: 6.0.20
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: knst.koli...@gmail.com


Created an attachment (id=24753)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24753)
/webapps/examples/jsp/tagplugin/if.jsp

Steps to reproduce:
1. Download and install 6.0.21 release candidate "try2"
2. Replace /webapps/examples/jsp/tagplugin/if.jsp with the file attacted to
this bug report. It has a few lines added to reproduce bug 48112.
3. Run  catalina start -security
4. Access http://localhost:8080/examples/jsp/tagplugin/if.jsp
5. Observe Error 500 page with java.security.AccessControlException

java.security.AccessControlException: access denied
(java.lang.RuntimePermission accessClassInPackage.org.apache.jasper.security)
java.security.AccessControlContext.checkPermission(Unknown Source)
java.security.AccessController.checkPermission(Unknown Source)
java.lang.SecurityManager.checkPermission(Unknown Source)
java.lang.SecurityManager.checkPackageAccess(Unknown Source)
sun.misc.Launcher$AppClassLoader.loadClass(Unknown Source)
java.lang.ClassLoader.loadClass(Unknown Source)
java.lang.ClassLoader.loadClass(Unknown Source)
java.lang.ClassLoader.loadClassInternal(Unknown Source)
org.apache.jasper.runtime.ProtectedFunctionMapper.getMapForFunction(ProtectedFunctionMapper.java:145)
org.apache.jsp.jsp.tagplugin.if_jsp.(if_jsp.java:13)

The full stack trace will be in an attachment.

6. If run without Security manager, the error report as described in bug 48112
is observed, that is
(..)
org.apache.el.parser.ParseException: Encountered "  "\' ""
at line 1, column 11.
(..)

5. is the unexpected result, 6. is the expected result

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 48438] RC2 of 6.0.21: java.security.AccessControlException on Error 500 page

2009-12-23 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48438

--- Comment #1 from Konstantin Kolinko  2009-12-23 
05:28:43 UTC ---
Created an attachment (id=24754)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24754)
localhost.2009-12-23.log that contains the full stack trace

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893515 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

2009-12-23 Thread markt 
Author: markt
Date: Wed Dec 23 13:54:37 2009
New Revision: 893515

URL: http://svn.apache.org/viewvc?rev=893515&view=rev
Log:
There will be a 6.0.22 next

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=893515&r1=893514&r2=893515&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Dec 23 13:54:37 2009
@@ -33,6 +33,24 @@
   
 
 
+
+  
+
+  
+Log errors if a web application starts a thread but fails to stop the
+thread when the web application stops or is reloaded. Failure to stop a
+thread is very likely to result in a memory leak. (markt)
+  
+
+
+  
+
+  
+Correct MD5 generation in the build process. (jfclere/kkolinko)
+  
+
+  
+
 
   
 
@@ -278,11 +296,6 @@
 Ensure JDBC driver de-registration works with a security manager.
 (markt)
   
-  
-Log errors if a web application starts a thread but fails to stop the
-thread when the web application stops or is reloaded. Failure to stop a
-thread is very likely to result in a memory leak. (markt)
-  
   
 48214: Ensure JDBC driver de-registration is not too 
zealous.
 (markt)
@@ -726,9 +739,6 @@
 Further improvements to the administrative user name and password
 handling in the Windows installer. (kkolinko)
   
-  
-Correct MD5 generation in the build process. (jfclere/kkolinko)
-  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 48438] RC2 of 6.0.21: java.security.AccessControlException on Error 500 page

2009-12-23 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48438

--- Comment #2 from Konstantin Kolinko  2009-12-23 
06:01:26 UTC ---
Retrying to reproduce this with
\webapps\examples\jsp\jsp2\el\basic-arithmetic.jsp

If I add the following four lines to the end of the file:
48112:
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"; %>


When running with Security Manager I observe three different behaviors:

A). The proper error report from bug 48112
(..)
org.apache.el.parser.ParseException: Encountered "  "\' ""
at line 1, column 11.
(..)

To reproduce:
1. Clear the working directory
2. Start Tomcat
3. Remove added lines from basic-arithmetic.jsp, so that it becomes valid
4. Browse http://localhost:8080/examples/jsp/jsp2/el/basic-arithmetic.jsp
5. Add the lines to basic-arithmetic.jsp
6. Reload the page in the browser
7. Observe the error

B). AccessControlException

To reproduce:
1. Clear the working directory
2. Start Tomcat
3. Add the lines to basic-arithmetic.jsp
4. Browse http://localhost:8080/examples/jsp/jsp2/el/basic-arithmetic.jsp
5. Observe the error

C). NoClassDefFoundError

To reproduce:
1. Run A) or B)
2. Stop Tomcat and do *not* clear the working directory
3. Start Tomcat
4. Browse http://localhost:8080/examples/jsp/jsp2/el/basic-arithmetic.jsp
5. Observe the error


java.lang.NoClassDefFoundError: Could not initialize class
org.apache.jsp.jsp.jsp2.el.basic_002darithmetic_jsp
sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
sun.reflect.NativeConstructorAccessorImpl.newInstance(Unknown Source)
sun.reflect.DelegatingConstructorAccessorImpl.newInstance(Unknown Source)
java.lang.reflect.Constructor.newInstance(Unknown Source)
java.lang.Class.newInstance0(Unknown Source)
java.lang.Class.newInstance(Unknown Source)
   
org.apache.jasper.servlet.JspServletWrapper.getServlet(JspServletWrapper.java:145)

I observe the following oddity:
1. Run B)
2. In the working folder both java and class file for the page are present:
basic_002darithmetic_jsp.class
basic_002darithmetic_jsp.java

So, how does it produce a class file when java file generation should have
failed with an exception?

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 48438] RC2 of 6.0.21: java.security.AccessControlException on Error 500 page

2009-12-23 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48438

--- Comment #3 from Konstantin Kolinko  2009-12-23 
06:08:21 UTC ---
Created an attachment (id=24755)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24755)
localhost.2009-12-23.log for Comment 2

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 48438] RC2 of 6.0.21: java.security.AccessControlException on Error 500 page

2009-12-23 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48438

Konstantin Kolinko  changed:

   What|Removed |Added

  Attachment #24755|application/octet-stream|text/plain
  mime type||

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 48438] RC2 of 6.0.21: java.security.AccessControlException on Error 500 page

2009-12-23 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48438

--- Comment #4 from Konstantin Kolinko  2009-12-23 
06:15:23 UTC ---
Additional observation for A):

That org.apache.el.parser.ParseException: occurs at run time, not at compile
time!

It explains why the class file is generated.

You can see the stacktrace for this case in attachment 24755.

It is
 at org.apache.el.parser.ELParser.generateParseException(ELParser.java:2142)
 at org.apache.el.parser.ELParser.jj_consume_token(ELParser.java:2024)
 (.. a dozen of ELParser methods)
 (.. a pair of ExpressionBuilder methods)
 at
org.apache.el.ExpressionFactoryImpl.createValueExpression(ExpressionFactoryImpl.java:68)
 at org.apache.jasper.runtime.PageContextImpl$13.run(PageContextImpl.java:919)
 at java.security.AccessController.doPrivileged(Native Method)
 at
org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate(PageContextImpl.java:913)
 at
org.apache.jsp.jsp.jsp2.el.basic_002darithmetic_jsp._jspx_meth_c_005fout_005f0(basic_002darithmetic_jsp.java:205)
 at
org.apache.jsp.jsp.jsp2.el.basic_002darithmetic_jsp._jspService(basic_002darithmetic_jsp.java:179)

So it occurs in _jspService() of a running page, when it calls
PageContextImpl.proprietaryEvaluate to evaluate an EL expression.

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893524 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/connector/CoyoteAdapter.java webapps/docs/changelog.xml

2009-12-23 Thread kkolinko 
Author: kkolinko
Date: Wed Dec 23 14:28:12 2009
New Revision: 893524

URL: http://svn.apache.org/viewvc?rev=893524&view=rev
Log:
Remove unneeded line from the method that normalizes decodedURI.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 23 14:28:12 2009
@@ -1,2 +1,2 @@
 /tomcat:883362
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885991,886019,888072,889363,889606,889716,890139,890265,8903
 
49-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892814,892817,892887,893321,893493
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885991,886019,888072,889363,889606,889716,890139,890265,8903
 
49-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892887,893321,893493

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

svn commit: r893530 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

2009-12-23 Thread kkolinko 
Author: kkolinko
Date: Wed Dec 23 14:39:44 2009
New Revision: 893530

URL: http://svn.apache.org/viewvc?rev=893530&view=rev
Log:
Mark 6.0.21 as not released

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=893530&r1=893529&r2=893530&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Dec 23 14:39:44 2009
@@ -59,7 +59,7 @@
 
   
 
-
+
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

2009-12-23 Thread kkolinko 
Author: kkolinko
Date: Wed Dec 23 14:47:53 2009
New Revision: 893535

URL: http://svn.apache.org/viewvc?rev=893535&view=rev
Log:
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=893535&r1=893534&r2=893535&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 14:47:53 2009
@@ -97,7 +97,7 @@
   threads.
   http://svn.apache.org/viewvc?view=revision&revision=885901
   http://svn.apache.org/viewvc?view=revision&revision=892843
-  +1: markt, jim
+  +1: markt, jim, kkolinko
   -1: 
 
 * Fix second part of 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47413#c8



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893564 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ webapps/docs/ webapps/docs/config/

2009-12-23 Thread markt 
Author: markt
Date: Wed Dec 23 16:31:31 2009
New Revision: 893564

URL: http://svn.apache.org/viewvc?rev=893564&view=rev
Log:
The remaining memory leak protection changes. ThreadLocals, RMi and an option 
to stop threads

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 23 16:31:31 2009
@@ -1,2 +1,2 @@
 /tomcat:883362
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885991,886019,888072,889363,889606,889716,890139,890265,8903
 
49-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892887,893321,893493
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,88807

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

2009-12-23 Thread rjung 
Author: rjung
Date: Wed Dec 23 16:36:44 2009
New Revision: 893568

URL: http://svn.apache.org/viewvc?rev=893568&view=rev
Log:
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=893568&r1=893567&r2=893568&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 16:36:44 2009
@@ -72,7 +72,7 @@
   Implement fail-safe EOL conversion for source distributions
   Based on patches provided by sebb / kkolinko
   http://people.apache.org/~markt/patches/2009-12-23-bug47609.patch
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893570 - in /tomcat/trunk/modules/jdbc-pool: .classpath build.properties.default java/org/apache/tomcat/jdbc/pool/ProxyConnection.java

2009-12-23 Thread fhanik 
Author: fhanik
Date: Wed Dec 23 16:40:47 2009
New Revision: 893570

URL: http://svn.apache.org/viewvc?rev=893570&view=rev
Log:
Fix how we detect what class is being invoked so we can multiplex the method 
invocation correctly



Modified:
tomcat/trunk/modules/jdbc-pool/.classpath
tomcat/trunk/modules/jdbc-pool/build.properties.default

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java

Modified: tomcat/trunk/modules/jdbc-pool/.classpath
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/.classpath?rev=893570&r1=893569&r2=893570&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/.classpath (original)
+++ tomcat/trunk/modules/jdbc-pool/.classpath Wed Dec 23 16:40:47 2009
@@ -6,7 +6,6 @@



-   
-   
+   

 

Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=893570&r1=893569&r2=893570&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Wed Dec 23 16:40:47 
2009
@@ -28,7 +28,7 @@
 version.major=1
 version.minor=0
 version.build=8
-version.patch=
+version.patch=.1
 version.suffix=
 
 # - Default Base Path for Dependent Packages -

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java?rev=893570&r1=893569&r2=893570&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
 Wed Dec 23 16:40:47 2009
@@ -97,7 +97,7 @@
 return this.toString();
 } else if (compare(GETCONNECTION_VAL,method) && connection!=null) {
 return connection.getConnection();
-} else if (method.getClass().equals(XAConnection.class)) {
+} else if (method.getDeclaringClass().equals(XAConnection.class)) {
 try {
 return method.invoke(connection.getXAConnection(),args);
 }catch (Throwable t) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893572 - in /tomcat/tc6.0.x/trunk: STATUS.txt dist.xml webapps/docs/changelog.xml

2009-12-23 Thread markt 
Author: markt
Date: Wed Dec 23 16:42:40 2009
New Revision: 893572

URL: http://svn.apache.org/viewvc?rev=893572&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
Implement fail-safe EOL conversion for source distributions
Based on patches provided by sebb / kkolinko

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=893572&r1=893571&r2=893572&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 16:42:40 2009
@@ -68,13 +68,6 @@
   -1: funkman : api change in Session.java for .x.x release
 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
-  Implement fail-safe EOL conversion for source distributions
-  Based on patches provided by sebb / kkolinko
-  http://people.apache.org/~markt/patches/2009-12-23-bug47609.patch
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774
   Ensure web application class loader is used when calling session listeners
   http://svn.apache.org/viewvc?rev=890530&view=rev

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=893572&r1=893571&r2=893572&view=diff
==
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Dec 23 16:42:40 2009
@@ -86,6 +86,23 @@
   
   
 
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
   
   
@@ -587,6 +604,10 @@
 
   
   
+
+  
+
 
   
 
@@ -598,9 +619,10 @@
 
   
   
-   
+
+  
+
 
   

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=893572&r1=893571&r2=893572&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Dec 23 16:42:40 2009
@@ -74,6 +74,10 @@
   
 Correct MD5 generation in the build process. (jfclere/kkolinko)
   
+  
+47609: Provide fail-safe EOL conversion for build process.
+Based on patches by sebb/kkolinko. (markt)
+  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893577 - in /tomcat/trunk/modules/jdbc-pool: build.properties.default java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java

2009-12-23 Thread fhanik 
Author: fhanik
Date: Wed Dec 23 17:12:10 2009
New Revision: 893577

URL: http://svn.apache.org/viewvc?rev=893577&view=rev
Log:
Allow null usernames and passwords to be passed in, so that one can call 
DataSource.getConnection()


Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java

Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=893577&r1=893576&r2=893577&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Wed Dec 23 17:12:10 
2009
@@ -28,7 +28,7 @@
 version.major=1
 version.minor=0
 version.build=8
-version.patch=.1
+version.patch=.2
 version.suffix=
 
 # - Default Base Path for Dependent Packages -

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=893577&r1=893576&r2=893577&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
 Wed Dec 23 17:12:10 2009
@@ -385,8 +385,12 @@
 poolProperties.setDbProperties(new Properties());
 }
 
-
poolProperties.getDbProperties().setProperty("user",poolProperties.getUsername());
-
poolProperties.getDbProperties().setProperty("password",poolProperties.getPassword());
+if (poolProperties.getUsername()!=null) {
+
poolProperties.getDbProperties().setProperty("user",poolProperties.getUsername());
+}
+if (poolProperties.getPassword()!=null) {
+
poolProperties.getDbProperties().setProperty("password",poolProperties.getPassword());
+}
 
 value = properties.getProperty(PROP_INITSQL);
 if (value != null) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893579 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_22/

2009-12-23 Thread jfclere 
Author: jfclere
Date: Wed Dec 23 17:23:53 2009
New Revision: 893579

URL: http://svn.apache.org/viewvc?rev=893579&view=rev
Log:
Release 6.0.22

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_22/   (props changed)
  - copied from r893578, tomcat/tc6.0.x/trunk/

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_22/
--
--- svn:ignore (added)
+++ svn:ignore Wed Dec 23 17:23:53 2009
@@ -0,0 +1,3 @@
+output
+.settings
+build.properties

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_22/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 23 17:23:53 2009
@@ -0,0 +1,2 @@
+/tomcat:883362
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
 
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902
 
65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[VOTE] Release build 6.0.22

2009-12-23 Thread jean-frederic clere 

The candidates binaries are available here:
http://people.apache.org/~jfclere/tomcat-6/v6.0.22/

According to the release process, the 6.0.22 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[ ] Stable

6.0.21 was too broken to be used. Take your time I won't release before 
next week and before enough votes.


Merry Christmas

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893617 - in /tomcat/trunk/java/org/apache/jasper/compiler: Generator.java Node.java Validator.java

2009-12-23 Thread markt 
Author: markt
Date: Wed Dec 23 20:05:25 2009
New Revision: 893617

URL: http://svn.apache.org/viewvc?rev=893617&view=rev
Log:
JSP 2.2 - Add omit attribute to 

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=893617&r1=893616&r2=893617&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Wed Dec 23 
20:05:25 2009
@@ -1950,6 +1950,10 @@
 for (int i = 0; attrs != null && i < attrs.length; i++) {
 String attrStr = null;
 if (attrs[i].isNamedAttribute()) {
+if (attrs[i].getNamedAttributeNode().isOmit()) {
+// Skip this attribute - JSP.5-7
+continue;
+}
 attrStr = generateNamedAttributeValue(attrs[i]
 .getNamedAttributeNode());
 } else {

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Node.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Node.java?rev=893617&r1=893616&r2=893617&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Node.java Wed Dec 23 20:05:25 
2009
@@ -1864,6 +1864,10 @@
 // True if this node is to be trimmed, or false otherwise
 private boolean trim = true;
 
+// True if this attribute should be omitted from the output if
+// used with a , otherwise false
+private boolean omit = false;
+
 private ChildInfo childInfo;
 
 private String name;
@@ -1886,6 +1890,10 @@
 // (if null or true, leave default of true)
 trim = false;
 }
+if ("true".equals(this.getAttributeValue("omit"))) {
+// (if null or false, leave default of false)
+omit = true;
+}
 childInfo = new ChildInfo();
 name = this.getAttributeValue("name");
 if (name != null) {
@@ -1925,6 +1933,10 @@
 return trim;
 }
 
+public boolean isOmit() {
+return omit;
+}
+
 /**
  * @return A unique temporary variable name to store the result in.
  * (this probably could go elsewhere, but it's convenient here)

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=893617&r1=893616&r2=893617&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Wed Dec 23 
20:05:25 2009
@@ -482,7 +482,8 @@
 
 private static final JspUtil.ValidAttribute[] attributeAttrs = {
 new JspUtil.ValidAttribute("name", true),
-new JspUtil.ValidAttribute("trim") };
+new JspUtil.ValidAttribute("trim"),
+new JspUtil.ValidAttribute("omit")};
 
 private static final JspUtil.ValidAttribute[] invokeAttrs = {
 new JspUtil.ValidAttribute("fragment", true),



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r893640 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

2009-12-23 Thread markt 
Author: markt
Date: Wed Dec 23 22:20:59 2009
New Revision: 893640

URL: http://svn.apache.org/viewvc?rev=893640&view=rev
Log:
JSP 2.2 - Update to JSP.5.1 - Sync only required for session and application 
scope

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=893640&r1=893639&r2=893640&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Wed Dec 23 
22:20:59 2009
@@ -1343,12 +1343,13 @@
 }
 }
 
+// JSP.5.1, Sematics, para 1 - lock not required for request or
+// page scope
 String scopename = "PageContext.PAGE_SCOPE"; // Default to page
-String lock = "_jspx_page_context";
+String lock = null;
 
 if ("request".equals(scope)) {
 scopename = "PageContext.REQUEST_SCOPE";
-lock = "request";
 } else if ("session".equals(scope)) {
 scopename = "PageContext.SESSION_SCOPE";
 lock = "session";
@@ -1365,11 +1366,13 @@
 out.print(name);
 out.println(" = null;");
 
-// Lock while getting or creating bean
-out.printin("synchronized (");
-out.print(lock);
-out.println(") {");
-out.pushIndent();
+// Lock (if required) while getting or creating bean
+if (lock != null) {
+out.printin("synchronized (");
+out.print(lock);
+out.println(") {");
+out.pushIndent();
+}
 
 // Locate bean from context
 out.printin(name);
@@ -1472,8 +1475,10 @@
 out.printil("}");
 
 // End of lock block
-out.popIndent();
-out.printil("}");
+if (lock != null) {
+out.popIndent();
+out.printil("}");
+}
 
 n.setEndJavaLine(out.getJavaLine());
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 44679] Cookies are treated differently between 6.0.16 and 6.0.14

2009-12-23 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=44679

--- Comment #38 from Matt  2009-12-23 14:25:22 UTC ---
I'm having the same issue as David Lewis, where my cookies have a colon in the
name and therefore aren't being parsed correctly.  I've read through all the
comments and I can't see anything that directly addresses the problem.  Even if
I quote the name I get the same behavior.  Is this simply not supported in any
way?  I never ran into this issue before because the app was running on an
older version of Tomcat 5.5, and I just moved it along with another website to
Tomcat 6.0.20.  I can change my code to use a different name, but I would like
to be able to continue to use the cookies that are already stored in client
browsers.

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 44679] Cookies are treated differently between 6.0.16 and 6.0.14

2009-12-23 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=44679

--- Comment #39 from Mark Thomas  2009-12-23 14:43:05 GMT ---
(In reply to comment #38)
You can always parse the cookie header yourself. Note Bugzilla isn't a support
forum . If you need further assistance, please use the users list.

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 47806] HTTP 500 internal server error

2009-12-23 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47806

--- Comment #1 from Chin Hou  2009-12-23 15:30:40 UTC 
---
mostly the same problem here. still no idea



Me: w2003
compaq evo w6000
apache tomcat 5.5.28
isapi_redirect.dll 1.2.28
IIS 6
——–
Hello everyone,

I finally get to the “incorrect function” point. It seems that this Problem
has different causes.
If u read my logs u will c IIS says http 500 error (Internal server error)
and i cant find any solution or hint to my last 2 ISAPI log Entries.

my log files:

isapi log:
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_util.c (458):
Pre-processed log time stamp format is ‘[%a %b %d %H:%M:%S.000 %Y] ‘
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [info] jk_isapi_plugin.c (2405):
Starting Jakarta/ISAPI/isapi_redirector/1.2.28
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2423): Detected IIS version 6.0
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2425): Using ini file C:\Tomcat\ISAPI\isapi_redirect.properties.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2431): Using log file C:\Tomcat\logs\isapi_redirect.log.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2432): Using log level 1.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2433): Using extension uri /jakarta/isapi_redirect.dll.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2434): Using worker file C:\Tomcat\conf\workers.properties.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2435): Using worker mount file C:\Tomcat\conf\uriworkermap.properties.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2437): Using rewrite rule file .
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2439): Using uri select 3.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2440): Using no chunked encoding.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2442): Using notification event SF_NOTIFY_AUTH_COMPLETE (0×0400)
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2452): Using uri header TOMCATURI6A6B:.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2453): Using query header TOMCATQUERY6A6B:.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2454): Using worker header TOMCATWORKER6A6B:.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2455): Using worker index TOMCATWORKERIDX6A6B:.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2456): Using translate header TOMCATTRANSLATE6A6B:.
[Tue Dec 08 19:40:00.484 2009] [2400:2684] [debug] jk_isapi_plugin.c
(2457): Using a default of 250 connections per pool.
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_map.c (491): Adding
property ‘/admin/*’ with value ‘wlb’ to map.
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_map.c (491): Adding
property ‘/manager/*’ with value ‘wlb’ to map.
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_map.c (491): Adding
property ‘/jsp-examples/*’ with value ‘wlb’ to map.
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_map.c (491): Adding
property ‘/servlets-examples/*’ with value ‘wlb’ to map.
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_map.c (491): Adding
property ‘/examples/*’ with value ‘wlb’ to map.
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_map.c (491): Adding
property ‘!/servlets-examples/*.jpeg’ with value ‘wlb’ to map.
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_map.c (491): Adding
property ‘/jkmanager’ with value ‘jkstatus’ to map.
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_uri_worker_map.c
(1102): Loading urimaps from C:\Tomcat\conf\uriworkermap.properties with reload
check interval 60 seconds
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_uri_worker_map.c
(720): wildchar rule ‘/admin/*=wlb’ source ‘uriworkermap’ was added
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_uri_worker_map.c
(720): wildchar rule ‘/manager/*=wlb’ source ‘uriworkermap’ was added
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_uri_worker_map.c
(720): wildchar rule ‘/jsp-examples/*=wlb’ source ‘uriworkermap’ was added
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_uri_worker_map.c
(720): wildchar rule ‘/servlets-examples/*=wlb’ source ‘uriworkermap’ was added
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_uri_worker_map.c
(720): wildchar rule ‘/examples/*=wlb’ source ‘uriworkermap’ was added
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk_uri_worker_map.c
(720): wildchar rule ‘/servlets-examples/*.jpeg=wlb’ source ‘uriworkermap’ was
added
[Tue Dec 08 19:40:00.515 2009] [2400:2684] [debug] jk