Re: JSP 2.2 & EL 2.2 implementation complete

[Mark Thomas]

On 24/05/2010 06:20, deligeli wrote:
> 
> I tried to download the el-api2.2 jar from GlassFish. and it doesn't work.
> 
> see my thread here:
> 
> http://old.nabble.com/using-new-el-api-2.2-with-myfaces2.0-and-tomcat6-ts28649111.html
> 
> could you please help?

Yes, but since that is a question for the users list, you'll need to
re-post your question there.

Mark



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

DO NOT REPLY [Bug 49330] my Bug

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49330

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #2 from Mark Thomas  2010-05-24 04:03:33 EDT ---
Spam. User blocked.

-- 
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

Re: svn commit: r947495 - /tomcat/trunk/build.properties.default

[Mark Thomas]

On 24/05/2010 02:32, sebb wrote:
> On 23/05/2010, ma...@apache.org  wrote:
>> Author: markt
>>  Date: Sun May 23 21:04:08 2010
>>  New Revision: 947495
>>
>>  URL: http://svn.apache.org/viewvc?rev=947495&view=rev
>>  Log:
>>  Restore -dev suffix post tag
> 
> By the way, it's possible to create the tag without having to change
> trunk versions.
> 
> Checkout trunk as a fresh working copy
> Update the working copy to fix the versions
> Checkin the working copy as the new tag.
> [SVN knows that most of the files are the same as trunk, so only the
> diffs are uploaded].
> 
> Just a thought.

Thanks. Didn't realise that. Very handy.

Mark



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

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

[kkolinko]

Author: kkolinko
Date: Mon May 24 10:41:17 2010
New Revision: 947592

URL: http://svn.apache.org/viewvc?rev=947592&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=947592&r1=947591&r2=947592&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 24 10:41:17 2010
@@ -148,7 +148,7 @@ PATCHES PROPOSED TO BACKPORT:
   to its toString() and expose as read only via JMX.
   http://svn.apache.org/viewvc?view=revision&revision=944396
   
http://people.apache.org/~rjung/patches/2010-05-14-loader-backport-r944396.patch
-  +1: rjung, markt
+  +1: rjung, markt, kkolinko
   -1: 
 
 * Fix missing message text and logging with unexpected logger issues in cluster



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

svn commit: r947595 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/bin/tool-wrapper.sh container/webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Mon May 24 10:48:03 2010
New Revision: 947595

URL: http://svn.apache.org/viewvc?rev=947595&view=rev
Log:
Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48840
Port the fix from catalina.sh to tool-wrapper.sh as well.

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=947595&r1=947594&r2=947595&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon May 24 10:48:03 2010
@@ -78,13 +78,6 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?view=revision&revision=749019
   -1:
 
-* Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48840
-  Port the fix from catalina.sh to tool-wrapper.sh as well.
-  http://svn.apache.org/viewvc?rev=946686&view=rev
-  (apply to /container/catalina/src/bin/tool-wrapper.sh)
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Fix ByteChunk.indexOf(String, ...) when the string is of length 1
   http://svn.apache.org/viewvc?rev=945231&view=rev
   +1: kkolinko

Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh?rev=947595&r1=947594&r2=947595&view=diff
==
--- tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh Mon May 24 
10:48:03 2010
@@ -42,7 +42,7 @@ CLASSPATH=
 
 # Get standard environment variables
 PRGDIR=`dirname "$PRG"`
-CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
+CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
 if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
   . "$CATALINA_HOME"/bin/setenv.sh
 fi

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=947595&r1=947594&r2=947595&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Mon May 24 
10:48:03 2010
@@ -51,7 +51,8 @@
   
   
 48840: Swallow output (if any) from use of cd when 
determining
-$CATALINA_HOME in catalina.sh script. Patch provided by mdietze. 
(markt)
+$CATALINA_HOME in catalina.sh and tool-wrapper.sh scripts. Based on 
patch
+provided by mdietze. (markt/kkolinko)
   
   
 49236: Do not use indexing when packing Tomcat JARs.



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

svn commit: r947596 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt bin/tool-wrapper.sh webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Mon May 24 10:50:27 2010
New Revision: 947596

URL: http://svn.apache.org/viewvc?rev=947596&view=rev
Log:
Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48840
Port the fix from catalina.sh to tool-wrapper.sh as well.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 24 10:50:27 2010
@@ -1 +1 @@
-/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,752323,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,77
 
0809,770876,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,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935983,939491,939551,940064,941356,941463,944409,944416,945808,945835
+/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,752323,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,77
 
0809,770876,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

DO NOT REPLY [Bug 48840] catalina.sh fails to set CATALINA_HOME on newer bash versions

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48840

--- Comment #11 from Konstantin Kolinko  2010-05-24 
06:52:54 EDT ---
The fix was also applied to tool-wrapper.sh. Will be in 5.5.30, 6.0.27.

-- 
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: r947598 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Mon May 24 11:01:59 2010
New Revision: 947598

URL: http://svn.apache.org/viewvc?rev=947598&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=947598&r1=947597&r2=947598&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 24 11:01:59 2010
@@ -60,8 +60,13 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Make user's role list immutable. Modify a copy in getRoles(DirContext, User)
   http://svn.apache.org/viewvc?rev=945841&view=rev
-  +1: markt, rjung
+  +1: markt, rjung, kkolinko
   -1: 
+kkolinko: There is one caveat with Collections.unmodifiableList(): the
+original list is still owned and modifieable by whoever created it,
+i.e. by the caller of User class constructor. Though with the current
+code of JNDIRealm that does not manifest itself and can be left as an
+API comment.
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
   Take account of TagVariableInfo when implementing the rules of JSP.5.3



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

svn commit: r947603 - in /tomcat/tc5.5.x/trunk: STATUS.txt jasper/src/share/org/apache/jasper/compiler/Generator.java

[markt]

Author: markt
Date: Mon May 24 11:19:35 2010
New Revision: 947603

URL: http://svn.apache.org/viewvc?rev=947603&view=rev
Log:
Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
Take account of TagVariableInfo when implementing the rules of JSP.5.3

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=947603&r1=947602&r2=947603&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon May 24 11:19:35 2010
@@ -65,12 +65,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
-  Tag account of TagVariableInfo when implementing the rules of JSP.5.3
-  http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Configure Tomcat to use HttpOnly for session cookies by default
   
http://people.apache.org/~kkolinko/patches/2010-04-21_tc55_context_httpOnly.patch
   +1: kkolinko

Modified: 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java?rev=947603&r1=947602&r2=947603&view=diff
==
--- 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java 
(original)
+++ 
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java 
Mon May 24 11:19:35 2010
@@ -1713,6 +1713,21 @@ class Generator {
 pageInfo.getVarInfoNames().add(info.getVarName());
 }
 }
+TagVariableInfo[] tagInfos = n.getTagVariableInfos();
+if (tagInfos != null && tagInfos.length > 0) {
+for (int i = 0; i < tagInfos.length; i++) {
+TagVariableInfo tagInfo = tagInfos[i];
+if (tagInfo != null) {
+String name = tagInfo.getNameGiven();
+if (name == null) {
+String nameFromAttribute =
+tagInfo.getNameFromAttribute();
+name = n.getAttributeValue(nameFromAttribute);
+}
+pageInfo.getVarInfoNames().add(name);
+}
+}
+}
 
 if (n.implementsSimpleTag()) {
 generateCustomDoTag(n, handlerInfo, tagHandlerVar);



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

DO NOT REPLY [Bug 49331] New: Tomcat 6 documentation describes clustering MBeans that do not exist

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49331

   Summary: Tomcat 6 documentation describes clustering MBeans
that do not exist
   Product: Tomcat 6
   Version: unspecified
  Platform: PC
OS/Version: Mac OS X 10.5
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
AssignedTo: dev@tomcat.apache.org
ReportedBy: wilkins...@vmware.com


The clustering documentation
(http://tomcat.apache.org/tomcat-6.0-doc/cluster-howto.html#Monitoring%20your%20Cluster%20with%20JMX)
describes a number of MBeans which can be used to monitor a Tomcat cluster.
Having discussed this with Mark Thomas, I understand that these MBeans do not
exist in Tomcat 6 and therefore the documentation is misleading.

-- 
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: r947608 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Mon May 24 11:44:41 2010
New Revision: 947608

URL: http://svn.apache.org/viewvc?rev=947608&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=947608&r1=947607&r2=947608&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 24 11:44:41 2010
@@ -115,8 +115,15 @@ PATCHES PROPOSED TO BACKPORT:
 
   Expose properties of VirtualWebappLoader and WebappClassLoader via JMX.
   http://svn.apache.org/viewvc?view=revision&revision=936819
-  +1: rjung, markt
+  +1: rjung, markt, kkolinko
   -1: 
+   kkolinko:
+ 1) Descriptions should be written on a single line.
+When they are split into several lines it looks nasty in JConsole (JDK 
6u20)
+ 2) Maybe capitalize "uRLs" as "URLs"?
+I tested and either one of these two capitalization variants works 
correctly.
+Though you need to configure a VirtualWebappLoader to test that:
+without it the property is always a zero-length array.
 
   Add property "searchExternalFirst" to WebappLoader:
   If set, the external repositories will be searched before



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

svn commit: r947612 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Generator.java

[markt]

Author: markt
Date: Mon May 24 11:52:00 2010
New Revision: 947612

URL: http://svn.apache.org/viewvc?rev=947612&view=rev
Log:
Further fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
Take account of TagVariableInfo when implementing the rules of JSP.5.3

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=947612&r1=947611&r2=947612&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 24 11:52:00 2010
@@ -68,12 +68,6 @@ PATCHES PROPOSED TO BACKPORT:
 code of JNDIRealm that does not manifest itself and can be left as an
 API comment.
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
-  Take account of TagVariableInfo when implementing the rules of JSP.5.3
-  http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch
-  +1: markt, kkolinko, rjung
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48843
   Port deadlock prevention for worker allocation from NIO to BIO and APR
   https://issues.apache.org/bugzilla/attachment.cgi?id=25225

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=947612&r1=947611&r2=947612&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Mon May 
24 11:52:00 2010
@@ -1716,6 +1716,21 @@ class Generator {
 pageInfo.getVarInfoNames().add(info.getVarName());
 }
 }
+TagVariableInfo[] tagInfos = n.getTagVariableInfos();
+if (tagInfos != null && tagInfos.length > 0) {
+for (int i = 0; i < tagInfos.length; i++) {
+TagVariableInfo tagInfo = tagInfos[i];
+if (tagInfo != null) {
+String name = tagInfo.getNameGiven();
+if (name == null) {
+String nameFromAttribute =
+tagInfo.getNameFromAttribute();
+name = n.getAttributeValue(nameFromAttribute);
+}
+pageInfo.getVarInfoNames().add(name);
+}
+}
+}
 
 if (n.implementsSimpleTag()) {
 generateCustomDoTag(n, handlerInfo, tagHandlerVar);



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

svn commit: r947616 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon May 24 12:05:44 2010
New Revision: 947616

URL: http://svn.apache.org/viewvc?rev=947616&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
Return roles defined by both userRoleName and roleName mechanisms
Patch provided by 'eric'
Also make user's role list immutable

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

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 24 12:05:44 2010
@@ -1 +1 @@
-/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,752323,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,77
 
0809,770876,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,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935983,939491,939551,940064,941356,941463,944409,944416,945808,945835,946686
+/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,752323,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,77
 
0809,770876,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,79124

DO NOT REPLY [Bug 48729] JNDIRealm.java not parsing roles correctly

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48729

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2010-05-24 08:05:51 EDT ---
This has been fixed in 6.0.x and will be included in 6.0.27 onwards.

-- 
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: r947617 - /tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml

[rjung]

Author: rjung
Date: Mon May 24 12:08:24 2010
New Revision: 947617

URL: http://svn.apache.org/viewvc?rev=947617&view=rev
Log:
According to Konstantin's review comments:
- eliminate line breaks in descriptions
- change capitalization of attribute from "uRLs" to
  "URLs".

Modified:
tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml

Modified: tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml?rev=947617&r1=947616&r2=947617&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml Mon May 
24 12:08:24 2010
@@ -18,8 +18,7 @@
 
 
   
@@ -30,8 +29,7 @@
 writeable="false"/>
 
 
 
 
 
 
 
 
@@ -138,8 +134,7 @@
 writeable="false"/>
 
 
 
 
 
-
 



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

DO NOT REPLY [Bug 48971] memory leak protection : stopping TimeThreads should be optional and disabled by default

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48971

--- Comment #7 from Mark Thomas  2010-05-24 10:22:30 EDT ---
The approach suggested by Sylvain on the dev list was to set the Thread's
context class loader to null. I'm not 100% about the side-effects of that
either. However, that did trigger another idea - setting the context class
loader to the parent of the webapp class loader, normally the common class
loader. In that case, we still need to log an error - it is just the corrective
action that changes.

I'll test this idea out over the next day or so.

-- 
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: r947652 - in /tomcat/trunk/bin: catalina.bat catalina.sh

[markt]

Author: markt
Date: Mon May 24 14:28:20 2010
New Revision: 947652

URL: http://svn.apache.org/viewvc?rev=947652&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48976
Document JAVA_ENDORSED_DIRS

Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/catalina.sh

Modified: tomcat/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=947652&r1=947651&r2=947652&view=diff
==
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Mon May 24 14:28:20 2010
@@ -42,6 +42,12 @@ rem
 rem   JAVA_OPTS   (Optional) Java runtime options used when the "start",
 rem   "stop", or "run" command is executed.
 rem
+rem   JAVA_ENDORSED_DIRS (Optional) Lists of of semi-comma separated 
directories
+rem   containing some jars in order to allow replacement of 
APIs 
+rem   created outside of the JCP (i.e. DOM and SAX from W3C). 
+rem   It can also be used to update the XML parser 
implementation.
+rem   Defaults to $CATALINA_HOME/endorsed.
+rem
 rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
 rem   command is executed. The default is "dt_socket".
 rem

Modified: tomcat/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=947652&r1=947651&r2=947652&view=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Mon May 24 14:28:20 2010
@@ -46,6 +46,12 @@
 #   JAVA_OPTS   (Optional) Java runtime options used when the "start",
 #   "stop", or "run" command is executed.
 #
+#   JAVA_ENDORSED_DIRS (Optional) Lists of of semi-comma separated directories
+#   containing some jars in order to allow replacement of APIs 
+#   created outside of the JCP (i.e. DOM and SAX from W3C). 
+#   It can also be used to update the XML parser 
implementation.
+#   Defaults to $CATALINA_HOME/endorsed.
+#
 #   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
 #   command is executed. The default is "dt_socket".
 #



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

svn commit: r947659 - in /tomcat/tc6.0.x/trunk: bin/catalina.bat bin/catalina.sh webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon May 24 14:49:36 2010
New Revision: 947659

URL: http://svn.apache.org/viewvc?rev=947659&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48976
Document JAVA_ENDORSED_DIRS
Patch provided by Laurent Vaills

Modified:
tomcat/tc6.0.x/trunk/bin/catalina.bat
tomcat/tc6.0.x/trunk/bin/catalina.sh
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=947659&r1=947658&r2=947659&view=diff
==
--- tomcat/tc6.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.bat Mon May 24 14:49:36 2010
@@ -42,6 +42,12 @@ rem
 rem   JAVA_OPTS   (Optional) Java runtime options used when the "start",
 rem   "stop", or "run" command is executed.
 rem
+rem   JAVA_ENDORSED_DIRS (Optional) Lists of of semi-comma separated 
directories
+rem   containing some jars in order to allow replacement of 
APIs 
+rem   created outside of the JCP (i.e. DOM and SAX from W3C). 
+rem   It can also be used to update the XML parser 
implementation.
+rem   Defaults to $CATALINA_HOME/endorsed.
+rem
 rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
 rem   command is executed. The default is "dt_socket".
 rem

Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?rev=947659&r1=947658&r2=947659&view=diff
==
--- tomcat/tc6.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.sh Mon May 24 14:49:36 2010
@@ -46,6 +46,12 @@
 #   JAVA_OPTS   (Optional) Java runtime options used when the "start",
 #   "stop", or "run" command is executed.
 #
+#   JAVA_ENDORSED_DIRS (Optional) Lists of of semi-comma separated directories
+#   containing some jars in order to allow replacement of APIs 
+#   created outside of the JCP (i.e. DOM and SAX from W3C). 
+#   It can also be used to update the XML parser 
implementation.
+#   Defaults to $CATALINA_HOME/endorsed.
+#
 #   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
 #   command is executed. The default is "dt_socket".
 #

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=947659&r1=947658&r2=947659&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 24 14:49:36 2010
@@ -108,6 +108,10 @@
 48903: Fix deadlock in webapp class loader. (rjung)
   
   
+48976: Document JAVA_ENDORSED_DIRS in start-up scripts. 
Patch
+provided by Laurent Vaills. (markt)
+  
+  
 48983: Improve debug logging for situations when
 RemoteIpValve is bypassed. Patch provided by Cyrille Le
 Clerc. (markt)



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

DO NOT REPLY [Bug 48976] Document JAVA_ENDORSED_DIRS in the header of catalina.{sh,bat}

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48976

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2010-05-24 10:50:14 EDT ---
Thanks for the patch. It has been applied to trunk and 6.0.x and will be
included in 6.0.27 onwards.

-- 
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

Re: svn commit: r947652 - in /tomcat/trunk/bin: catalina.bat catalina.sh

[sebb]

On 24/05/2010, ma...@apache.org  wrote:
> Author: markt
>  Date: Mon May 24 14:28:20 2010
>  New Revision: 947652
>
>  URL: http://svn.apache.org/viewvc?rev=947652&view=rev
>  Log:
>  Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48976
>  Document JAVA_ENDORSED_DIRS
>
>  Modified:
> tomcat/trunk/bin/catalina.bat
> tomcat/trunk/bin/catalina.sh
>
>  Modified: tomcat/trunk/bin/catalina.bat
>  URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=947652&r1=947651&r2=947652&view=diff
>  
> ==
>  --- tomcat/trunk/bin/catalina.bat (original)
>  +++ tomcat/trunk/bin/catalina.bat Mon May 24 14:28:20 2010
>  @@ -42,6 +42,12 @@ rem
>   rem   JAVA_OPTS   (Optional) Java runtime options used when the "start",
>   rem   "stop", or "run" command is executed.
>   rem
>  +rem   JAVA_ENDORSED_DIRS (Optional) Lists of of semi-comma separated 
> directories

What's a semi-comma?

>  +rem   containing some jars in order to allow replacement of 
> APIs
>  +rem   created outside of the JCP (i.e. DOM and SAX from 
> W3C).
>  +rem   It can also be used to update the XML parser 
> implementation.
>  +rem   Defaults to $CATALINA_HOME/endorsed.
>  +rem
>   rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
>   rem   command is executed. The default is "dt_socket".
>   rem
>
>  Modified: tomcat/trunk/bin/catalina.sh
>  URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=947652&r1=947651&r2=947652&view=diff
>  
> ==
>  --- tomcat/trunk/bin/catalina.sh (original)
>  +++ tomcat/trunk/bin/catalina.sh Mon May 24 14:28:20 2010
>  @@ -46,6 +46,12 @@
>   #   JAVA_OPTS   (Optional) Java runtime options used when the "start",
>   #   "stop", or "run" command is executed.
>   #
>  +#   JAVA_ENDORSED_DIRS (Optional) Lists of of semi-comma separated 
> directories

What's a semi-comma?

>  +#   containing some jars in order to allow replacement of 
> APIs
>  +#   created outside of the JCP (i.e. DOM and SAX from W3C).
>  +#   It can also be used to update the XML parser 
> implementation.
>  +#   Defaults to $CATALINA_HOME/endorsed.
>  +#
>   #   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
>   #   command is executed. The default is "dt_socket".
>   #
>
>
>
>  -
>  To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>  For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

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

About the default value of variable JAVA_ENDORSED_DIRS

[Laurent Vaills]

Hi,

Thanks to have accepted my patch for the bug
#48976.

I have a question about the variable JAVA_ENDORSED_DIRS : why the default
value is set to CATALINA_HOME/endorsed ?
I think, like the others variables (CATALINA_OUT, CATALINA_TMPDIR, ...),
that the default value should instead be CATALINA_BASE/endorsed ?
With this default value, only some "instances" of Tomcat can decide to
override some libraries without forcing the other to do the same.

What do you think ?

Laurent

Re: About the default value of variable JAVA_ENDORSED_DIRS

[Mark Thomas]

On 24/05/2010 17:35, Laurent Vaills wrote:
> Hi,
> 
> Thanks to have accepted my patch for the bug
> #48976.
> 
> I have a question about the variable JAVA_ENDORSED_DIRS : why the default
> value is set to CATALINA_HOME/endorsed ?

History.

> I think, like the others variables (CATALINA_OUT, CATALINA_TMPDIR, ...),
> that the default value should instead be CATALINA_BASE/endorsed ?
> With this default value, only some "instances" of Tomcat can decide to
> override some libraries without forcing the other to do the same.
> 
> What do you think ?

Worth looking at. If you want to take a look at this, please open a new
bugzilla enhancement. Ideally, we'd like patches for trunk and 6.0.x

Mark



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

svn commit: r947714 - in /tomcat/tc6.0.x/trunk/bin: catalina.bat catalina.sh

[markt]

Author: markt
Date: Mon May 24 16:57:18 2010
New Revision: 947714

URL: http://svn.apache.org/viewvc?rev=947714&view=rev
Log:
Correct path separator

Modified:
tomcat/tc6.0.x/trunk/bin/catalina.bat
tomcat/tc6.0.x/trunk/bin/catalina.sh

Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=947714&r1=947713&r2=947714&view=diff
==
--- tomcat/tc6.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.bat Mon May 24 16:57:18 2010
@@ -42,7 +42,7 @@ rem
 rem   JAVA_OPTS   (Optional) Java runtime options used when the "start",
 rem   "stop", or "run" command is executed.
 rem
-rem   JAVA_ENDORSED_DIRS (Optional) Lists of of semi-comma separated 
directories
+rem   JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon separated 
directories
 rem   containing some jars in order to allow replacement of 
APIs 
 rem   created outside of the JCP (i.e. DOM and SAX from W3C). 
 rem   It can also be used to update the XML parser 
implementation.

Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?rev=947714&r1=947713&r2=947714&view=diff
==
--- tomcat/tc6.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.sh Mon May 24 16:57:18 2010
@@ -46,7 +46,7 @@
 #   JAVA_OPTS   (Optional) Java runtime options used when the "start",
 #   "stop", or "run" command is executed.
 #
-#   JAVA_ENDORSED_DIRS (Optional) Lists of of semi-comma separated directories
+#   JAVA_ENDORSED_DIRS (Optional) Lists of of colon separated directories
 #   containing some jars in order to allow replacement of APIs 
 #   created outside of the JCP (i.e. DOM and SAX from W3C). 
 #   It can also be used to update the XML parser 
implementation.



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

svn commit: r947717 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

[markt]

Author: markt
Date: Mon May 24 17:03:37 2010
New Revision: 947717

URL: http://svn.apache.org/viewvc?rev=947717&view=rev
Log:
Fix some TCK failures with the BIO AJP connector when using a security manager

Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=947717&r1=947716&r2=947717&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Mon 
May 24 17:03:37 2010
@@ -129,9 +129,9 @@ public final class SecurityClassLoad {
 
 private final static void loadUtilPackage(ClassLoader loader)
 throws Exception {
-String basePackage = "org.apache.catalina.";
-loader.loadClass(basePackage + "util.Enumerator");
-loader.loadClass(basePackage + "util.ParameterMap");
+String basePackage = "org.apache.catalina.util.";
+loader.loadClass(basePackage + "Enumerator");
+loader.loadClass(basePackage + "ParameterMap");
 }
 
 
@@ -237,6 +237,10 @@ public final class SecurityClassLoad {
 loader.loadClass(basePackage + "util.net.SSLSupport$CipherData");
 loader.loadClass
 (basePackage + "util.net.JIoEndpoint$PrivilegedSetTccl");
+// Make sure system property is read at this point
+Class clazz = loader.loadClass(
+basePackage + "util.http.FastHttpDateFormat");
+clazz.newInstance();
 }
 }
 



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

DO NOT REPLY [Bug 48990] Build fails on Linux when skip.installer set to true

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48990

--- Comment #4 from Mark Thomas  2010-05-24 13:26:19 EDT ---
Created an attachment (id=25477)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25477)
Alternative patch

skip.installer should do just that. No need to skip the .zip distros.

-- 
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: r947723 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Mon May 24 17:27:55 2010
New Revision: 947723

URL: http://svn.apache.org/viewvc?rev=947723&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=947723&r1=947722&r2=947723&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 24 17:27:55 2010
@@ -177,5 +177,11 @@ Index: java/org/apache/tomcat/util/buf/B
  for( int srcPos=srcOff + 1; srcPos< srcEnd; ) {
  if( buff[myPos++] != src.charAt( srcPos++ ))
   
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48990
+  Fix the skip.installer build property so once set, the Windows installer is
+  skipped but all the other artifacts are created
+  https://issues.apache.org/bugzilla/attachment.cgi?id=25477&action=edit
+  +1: markt
+  -1: 
 
   



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

DO NOT REPLY [Bug 48990] Build fails on Linux when skip.installer set to true

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48990

--- Comment #5 from Mark Thomas  2010-05-24 13:28:05 EDT ---
Alternative patch proposed for 6.0.x

-- 
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 48971] memory leak protection : stopping TimeThreads should be optional and disabled by default

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48971

--- Comment #8 from sylvain.laur...@gmail.com 2010-05-24 17:43:33 EDT ---
Hello Mark,

I had tried this too, but I still had the leak because I often had some
ProtectionDomain instances that referenced the webapp classloader.

The urgent thing to do is to fix the current issue by making the stopping of
TimerThread optional, and open a new BZ issue for an enhancement in this
matter.

-- 
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: r947837 - in /tomcat/trunk/bin: catalina.bat catalina.sh

[kkolinko]

Author: kkolinko
Date: Mon May 24 22:19:23 2010
New Revision: 947837

URL: http://svn.apache.org/viewvc?rev=947837&view=rev
Log:
Correct a typo

Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/catalina.sh

Modified: tomcat/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=947837&r1=947836&r2=947837&view=diff
==
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Mon May 24 22:19:23 2010
@@ -42,7 +42,7 @@ rem
 rem   JAVA_OPTS   (Optional) Java runtime options used when the "start",
 rem   "stop", or "run" command is executed.
 rem
-rem   JAVA_ENDORSED_DIRS (Optional) Lists of of semi-comma separated 
directories
+rem   JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon separated 
directories
 rem   containing some jars in order to allow replacement of 
APIs 
 rem   created outside of the JCP (i.e. DOM and SAX from W3C). 
 rem   It can also be used to update the XML parser 
implementation.

Modified: tomcat/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=947837&r1=947836&r2=947837&view=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Mon May 24 22:19:23 2010
@@ -46,7 +46,7 @@
 #   JAVA_OPTS   (Optional) Java runtime options used when the "start",
 #   "stop", or "run" command is executed.
 #
-#   JAVA_ENDORSED_DIRS (Optional) Lists of of semi-comma separated directories
+#   JAVA_ENDORSED_DIRS (Optional) Lists of of colon separated directories
 #   containing some jars in order to allow replacement of APIs 
 #   created outside of the JCP (i.e. DOM and SAX from W3C). 
 #   It can also be used to update the XML parser 
implementation.



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

DO NOT REPLY [Bug 49198] There are no binaries for mod_jk for 64bit?

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49198

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX

--- Comment #4 from Mark Thomas  2010-05-24 18:34:59 EDT ---
No point providing 64-bit mod_jk while there is no matching httpd 64-bit binary
for Windows.

-- 
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 49335] New: Client certificate not passed to Tomcat

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49335

   Summary: Client certificate not passed to Tomcat
   Product: Tomcat Connectors
   Version: 1.2.30
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: mod_jk
AssignedTo: dev@tomcat.apache.org
ReportedBy: ma...@apache.org


Windows XP 64 bit, fully patched
httpd 2.2.15
mod_jk 1.2.30
Tomcat 7.0.0-RC3

I have been unable to get mod_jk to pass SSL certificate information to Tomcat.
The set-up works since if I switch my JkMount for a ProxyPass (using
mod_proxy_ajp) Tomcat receives the client certificate information. I am
therefore sure that the SSL authentication is correctly set-up in httpd.

Running the mod_jk log at debug level shows mod_jk recognises that this is an
SSL request but fails to pass on the client certificate.

-- 
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

Re: [VOTE] Release Tomcat 7.0.0 based on Tomcat 7.0.0 RC3

[Mark Thomas]

On 23/05/2010 23:38, Mark Thomas wrote:
> All,
> 
> The next Tomcat 7.0.0 release candiate is ready for testing. 7.0.0-RC3
> can be obtained from:
> http://people.apache.org/~markt/dev/tomcat-7/v7.0.0-RC3/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC3/
> 
> Please test this release candidate and provide feedback.
> 
> The 7.0.0-RC3 tag is
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release 7.0.0 Alpha based on 7.0.0-RC3
> [X] Beta   - go ahead and release 7.0.0 Beta based on 7.0.0-RC3
> [ ] Stable - go ahead and release 7.0.0 Stable based on 7.0.0-RC3

Servlet TCK passes with security manager for HTTP BIO
Servlet TCK passes with security manager for HTTP NIO apart from
CLIENT-CERT [1]
Servlet TCK passes with security manager for HTTP APR/native
Servlet TCK fails with security manager for AJP BIO [2]
Servlet TCK fails with security manager for AJP APR/native [3]
JSP TCK passes with security manager for HTTP BIO
EL TCK passes with security manager

I don't see any show-stoppers in the current open bug list.

The following issues were noted:
- [1] https://issues.apache.org/bugzilla/show_bug.cgi?id=49284
- [2] Security manager specific issues - fixed in r947717
- [3] Async issues - may be one issue breaking subsequent tests

[1] has been thay way for numerous stable 6.0.x releases, [3] can be
worked around by not using APR/native and [2] is unlikely to be an issue
given that the use of a security manager is pretty rare.

My Beta vote is based more on what I expect the early adopters will
discover rather than these issues.

I'd like to get 7.0.0 out there ASAP and start getting some user feedback.

Mark



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

DO NOT REPLY [Bug 49335] Client certificate not passed to Tomcat

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49335

--- Comment #1 from Konstantin Kolinko  2010-05-24 
20:03:24 EDT ---
Is it reproducible in 7.0 RC3 only, or in 6.0.x as well?

Is Tomcat running with 32-bit or 64-bit JRE? Is Tomcat-Native used?

Does this certificate fit into a single AJP packet, along with other request
headers? Sure that it does fit, because otherwise there must be an error
logged.

I wonder, how the AJP packet created by mod_jk differs from the one created by
mod_proxy_ajp.


In mod_jk the place where SSL certificate is appended to the packet is
native\common\jk_ajp_common.c
-- look for SC_A_SSL_CERT there

In mod_proxy_ajp of Apache 2.2.x the SSL certificates are appended in
modules\proxy\ajp_header.c
-- look for SC_A_SSL_CERT there

By quick look the code there looks quite similar, but there might be a
difference on how information on the presence of a certificate is obtained.

What JkOptions directives are used in the configuration?
I see that mod_jk can send a whole certificate chain if +ForwardSSLCertChain
option is used (off by default). It looks that mod_proxy_ajp cannot send the
certificate chain.

-- 
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: r947931 - in /tomcat/trunk/modules/tomcat-lite: java/org/apache/tomcat/lite/servlet/ java/org/apache/tomcat/servlets/config/ java/org/apache/tomcat/servlets/config/deploy/ java/org/apache/

[costin]

Author: costin
Date: Tue May 25 06:09:40 2010
New Revision: 947931

URL: http://svn.apache.org/viewvc?rev=947931&view=rev
Log:
Removing the mini-'servlet' code from lite. The goal is to implement connector 
and http client, this creates confusion. 
 


Removed:
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ConfigLoader.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/ServletContextConfig.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/config/deploy/
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jsp/
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/jspc/
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/

tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/SimpleServlet.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/servlet/


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

svn commit: r947932 - in /tomcat/trunk/modules/tomcat-lite: examples/ java/org/apache/tomcat/integration/ java/org/apache/tomcat/integration/jmx/ java/org/apache/tomcat/integration/simple/ test/org/ap

[costin]

Author: costin
Date: Tue May 25 06:12:38 2010
New Revision: 947932

URL: http://svn.apache.org/viewvc?rev=947932&view=rev
Log:
Remove the 'integration' - ObjectManager and wrapping of DI frameworks. Lite is 
just a library/connector - doesn't need it, instead will integrate 
it with existing tomcat JNI model. I may add it back for an example of using 
tomcat-lite standalone, but for now it's better to avoid confusion.

Removed:
tomcat/trunk/modules/tomcat-lite/examples/

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/DynamicObject.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/ObjectManager.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/jmx/
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/integration/simple/

tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/PropertiesSpiTest.java


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

DO NOT REPLY [Bug 49316] org.apache.tomcat.lite.util.Base64 broken

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49316

Costin Manolache  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Costin Manolache  2010-05-25 02:20:47 
EDT ---
Removed, thank you.

-- 
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: r947933 - /tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java

[costin]

Author: costin
Date: Tue May 25 06:21:36 2010
New Revision: 947933

URL: http://svn.apache.org/viewvc?rev=947933&view=rev
Log:
Broken, not used. Source in o.a.t.util.buf was removed as well. 

Removed:

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java


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

svn commit: r947935 - in /tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io: SslChannel.java SslConnector.java SslProvider.java jsse/ jsse/JsseSslProvider.java jsse/SslChannel.java

[costin]

Author: costin
Date: Tue May 25 06:42:26 2010
New Revision: 947935

URL: http://svn.apache.org/viewvc?rev=947935&view=rev
Log:
Moved the JSSE code to separate package. Added a bunch of workarounds to 
support harmony/android, there seems to be a problem with the ciphers.
Probably the code will go away after I add APR support - too many problems, in 
particular SPDY can't be implemented as it relies on SSL protocol negotiation.
For now it mostly works on android.


Added:

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SslProvider.java
   (with props)
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/JsseSslProvider.java
   (with props)

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/SslChannel.java
   (with props)
Removed:

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SslChannel.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SslConnector.java

Added: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SslProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SslProvider.java?rev=947935&view=auto
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SslProvider.java
 (added)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SslProvider.java
 Tue May 25 06:42:26 2010
@@ -0,0 +1,24 @@
+/*
+ */
+package org.apache.tomcat.lite.io;
+
+import java.io.IOException;
+
+public interface SslProvider {
+
+public static final String ATT_SSL_CERT = "SslCert";
+public static final String ATT_SSL_CIPHER = "SslCipher";
+public static final String ATT_SSL_KEY_SIZE = "SslKeySize";
+public static final String ATT_SSL_SESSION_ID = "SslSessionId";
+
+/** 
+ * Wrap channel with SSL.
+ * 
+ * The result will start a handshake 
+ */
+public IOChannel channel(IOChannel net, String host, int port) 
+throws IOException;
+
+public IOChannel serverChannel(IOChannel net) throws IOException;
+
+}

Propchange: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SslProvider.java
--
svn:eol-style = native

Added: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/JsseSslProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/JsseSslProvider.java?rev=947935&view=auto
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/JsseSslProvider.java
 (added)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/JsseSslProvider.java
 Tue May 25 06:42:26 2010
@@ -0,0 +1,476 @@
+/*
+ */
+package org.apache.tomcat.lite.io.jsse;
+
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Socket;
+import java.security.Key;
+import java.security.KeyFactory;
+import java.security.KeyManagementException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.Principal;
+import java.security.PrivateKey;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.RSAKeyGenParameterSpec;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509ExtendedKeyManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.tomcat.lite.io.BBuffer;
+import org.apache.tomcat.lite.io.DumpChannel;
+import org.apache.tomcat.lite.io.IOChannel;
+import org.apache.tomcat.lite.io.IOConnector;
+import org.apache.tomcat.lite.io.SocketConnector;
+import org.apache.tomcat.lite.io.SslProvider;
+import org.apache.tomcat.lite.io.WrappedException;
+import org.apache.tomcat.lite.io.IOConnector.ConnectedCallback;
+
+
+public class JsseSslProvider implements SslProvider {
+
+/**
+ * TODO: option to require validation.
+ * TODO: remem

svn commit: r947936 - /tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java

[costin]

Author: costin
Date: Tue May 25 06:44:02 2010
New Revision: 947936

URL: http://svn.apache.org/viewvc?rev=947936&view=rev
Log:
More coyote support.

Modified:

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java

Modified: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java?rev=947936&r1=947935&r2=947936&view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java
 Tue May 25 06:44:02 2010
@@ -1,9 +1,9 @@
 package org.apache.coyote.lite;
 
-
-
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.ActionHook;
@@ -13,17 +13,27 @@ import org.apache.coyote.OutputBuffer;
 import org.apache.coyote.ProtocolHandler;
 import org.apache.coyote.Request;
 import org.apache.coyote.Response;
+import org.apache.tomcat.lite.http.HttpClient;
+import org.apache.tomcat.lite.http.HttpChannel;
+import org.apache.tomcat.lite.http.HttpConnectionPool;
 import org.apache.tomcat.lite.http.HttpConnector;
 import org.apache.tomcat.lite.http.HttpRequest;
 import org.apache.tomcat.lite.http.HttpResponse;
+import org.apache.tomcat.lite.http.HttpServer;
 import org.apache.tomcat.lite.http.MultiMap;
 import org.apache.tomcat.lite.http.HttpChannel.HttpService;
+import org.apache.tomcat.lite.http.HttpConnectionPool.RemoteServer;
+import org.apache.tomcat.lite.http.HttpConnector.HttpChannelEvents;
+import org.apache.tomcat.lite.http.HttpConnector.HttpConnection;
 import org.apache.tomcat.lite.http.MultiMap.Entry;
 import org.apache.tomcat.lite.io.CBuffer;
+import org.apache.tomcat.lite.io.IOConnector;
 import org.apache.tomcat.lite.io.SocketConnector;
+import org.apache.tomcat.lite.io.SslProvider;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.modeler.Registry;
 
 /**
  * Work in progress - use the refactored http as a coyote connector.
@@ -36,6 +46,17 @@ import org.apache.tomcat.util.http.MimeH
 public class LiteProtocolHandler implements ProtocolHandler {
 
 Adapter adapter;
+Map attributes = new HashMap();
+
+
+HttpConnector httpConnServer;
+int port = 8999;
+
+// Tomcat JMX integration
+Registry registry;
+
+public LiteProtocolHandler() {
+}
 
 @Override
 public void destroy() throws Exception {
@@ -48,16 +69,93 @@ public class LiteProtocolHandler impleme
 
 @Override
 public Object getAttribute(String name) {
-return null;
+// TODO: dynamic
+return attributes.get(name);
 }
 
 @Override
 public Iterator getAttributeNames() {
-return null;
+return attributes.keySet().iterator();
 }
 
 @Override
 public void init() throws Exception {
+registry = Registry.getRegistry(null, null);
+httpConnServer = HttpServer.newServer(port);
+
+httpConnServer.getDispatcher().setDefaultService(new HttpService() {
+@Override
+public void service(HttpRequest httpReq, HttpResponse httpRes)
+throws IOException {
+coyoteService(httpReq, httpRes);
+}
+
+});
+final String base = "" + port;
+bind("Httpconnector-" + port, httpConnServer);
+bind("HttpconnectorPool-" + port, httpConnServer.cpool);
+IOConnector io = httpConnServer.getIOConnector();
+int ioLevel = 0;
+while (io != null) {
+bind("IOConnector-" + (ioLevel++) + "-" + base, io);
+if (io instanceof SocketConnector) {
+bind("NioThread-" + base, 
+((SocketConnector) io).getSelector());
+
+}
+io = io.getNet();
+}
+httpConnServer.cpool.setEvents(new 
HttpConnectionPool.HttpConnectionPoolEvents() {
+
+@Override
+public void closedConnection(RemoteServer host, HttpConnection 
con) {
+unbind("HttpConnection-" + base + "-" + con.getId());
+}
+
+@Override
+public void newConnection(RemoteServer host, HttpConnection con) {
+bind("HttpConnection-" + base + "-" + con.getId(), con);
+}
+
+@Override
+public void newTarget(RemoteServer host) {
+bind("AsyncHttp-" + base + "-" + host.target, host);
+}
+
+@Override
+public void targetRemoved(RemoteServer host) {
+unbind("AsyncHttp-" + bas

svn commit: r947940 - in /tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite: http/ io/ proxy/

[costin]

Author: costin
Date: Tue May 25 06:54:47 2010
New Revision: 947940

URL: http://svn.apache.org/viewvc?rev=947940&view=rev
Log:
Various changes to better support coyote, remove integration package, prepare 
to replace jsse with apr, etc.


Added:

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpClient.java
   (with props)

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpServer.java
   (with props)

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/FutureCallbacks.java
  - copied, changed from r922426, 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/FutureCallbacks.java
Removed:

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/FutureCallbacks.java
Modified:

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/BaseMapper.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/Dispatcher.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/Http11Connection.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpChannel.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpConnector.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpMessage.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpRequest.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/MappingData.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/SpdyConnection.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/BBucket.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/CBuffer.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/DumpChannel.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOBuffer.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOChannel.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOConnector.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOOutputStream.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOReader.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/NioThread.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SocketIOChannel.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/proxy/SocksServer.java

Modified: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/BaseMapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/BaseMapper.java?rev=947940&r1=947939&r2=947940&view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/BaseMapper.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/BaseMapper.java
 Tue May 25 06:54:47 2010
@@ -21,6 +21,7 @@ package org.apache.tomcat.lite.http;
 import java.io.IOException;
 import java.util.logging.Logger;
 
+import org.apache.tomcat.lite.http.HttpChannel.HttpService;
 import org.apache.tomcat.lite.io.CBuffer;
 import org.apache.tomcat.lite.io.FileConnector;
 import org.apache.tomcat.lite.io.BBucket;
@@ -56,7 +57,7 @@ public class BaseMapper {
 /**
  * Context associated with this wrapper, used for wrapper mapping.
  */
-public BaseMapper.ContextMapping contextMapElement = new 
BaseMapper.ContextMapping();
+public BaseMapper.Context contextMapElement = new 
BaseMapper.Context(this);
 
 /**
  * Set context, used for wrapper mapping (request dispatcher).
@@ -238,7 +239,7 @@ public class BaseMapper {
  * @param resources Static resources of the context
  * @param ctxService 
  */
-public BaseMapper.ContextMapping addContext(String hostName, String path, 
Object context,
+public BaseMapper.Context addContext(String hostName, String path, Object 
context,
 String[] welcomeResources, FileConnector resources, 
 HttpChannel.HttpService ctxService) {
 
@@ -250,13 +251,18 @@ public class BaseMapper {
 
 int slashCount = slashCount(path);
 synchronized (host) {
-BaseMapper.ContextMapping[] contexts = host.contextList.contexts;
+BaseMapper.Context[] contexts = host.contextList.contexts;
 // Update nesting
 if (slashCount > host.contextList.nesting) {
 host.contextList.nesting = slashCount;
 }
-BaseMapper.ContextMapping[] newContexts = new 
BaseMapper.ContextMapping[contexts.length + 1];
-BaseMapper.ContextMapping newContext = new 
BaseMapper.ContextMapping();
+for (int i = 0; i < contexts.length; i++) {
+if (path.equals(contexts[i].name)) {
+