svn commit: r1130919 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml
Author: markt Date: Fri Jun 3 07:30:56 2011 New Revision: 1130919 URL: http://svn.apache.org/viewvc?rev=1130919view=rev Log: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50726 Ensure that the use of the genStringAsCharArray does not result in String constants that are too long for valid Java code. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jun 3 07:30:56 2011 @@ -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,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1067039,1067139,1069824,1070420,1070609,1072042,1075458,1076212,1078412,1079801,1081334,1088460,1094089,1099586,1099772,1099789,1100145,1100822,1101094,1101144
DO NOT REPLY [Bug 50726] Jasper can generate uncompilable source code if genStringAsCharArray is turned on
https://issues.apache.org/bugzilla/show_bug.cgi?id=50726 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #8 from Mark Thomas ma...@apache.org 2011-06-03 07:31:01 UTC --- Fixed in 6.0.x and will be included in 6.0.33 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: r1130932 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/startup/ClassLoaderFactory.java webapps/docs/changelog.xml
Author: markt
Date: Fri Jun 3 08:01:35 2011
New Revision: 1130932
URL: http://svn.apache.org/viewvc?rev=1130932view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48863
Provide an warning if there is a problem with a class path entry but use debug
level logging if it is expected due to catalina home/base split
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
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=1130932r1=1130931r2=1130932view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jun 3 08:01:35 2011
@@ -97,13 +97,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kfujino, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48863
- Provide an warning if there is a problem with a class path entry but use
debug
- level logging if it is expected due to catalina home/base split
- http://people.apache.org/~kkolinko/patches/2011-03-02_tc6_48863.patch
- +1: kkolinko, markt, schultz
- -1:
-
* Fix possible threading issue in JSP compilation when development mode is
enabled
http://svn.apache.org/viewvc?rev=1078409view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java?rev=1130932r1=1130931r2=1130932view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
Fri Jun 3 08:01:35 2011
@@ -20,6 +20,7 @@ package org.apache.catalina.startup;
import java.io.File;
+import java.io.IOException;
import java.net.URL;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -198,28 +199,30 @@ public final class ClassLoaderFactory {
set.add(url);
} else if ( types[i] == IS_DIR ) {
File directory = new File(location);
-directory = new File(directory.getCanonicalPath());
-if (!directory.exists() || !directory.isDirectory() ||
-!directory.canRead())
- continue;
+directory = directory.getCanonicalFile();
+if (!validateFile(directory, IS_DIR)) {
+continue;
+}
URL url = directory.toURI().toURL();
if (log.isDebugEnabled())
log.debug( Including directory + url);
set.add(url);
} else if ( types[i] == IS_JAR ) {
File file=new File(location);
-file = new File(file.getCanonicalPath());
-if (!file.exists() || !file.canRead())
+file = file.getCanonicalFile();
+if (!validateFile(file, IS_JAR)) {
continue;
+}
URL url = file.toURI().toURL();
if (log.isDebugEnabled())
log.debug( Including jar file + url);
set.add(url);
} else if ( types[i] == IS_GLOB ) {
File directory=new File(location);
-if (!directory.exists() || !directory.isDirectory() ||
-!directory.canRead())
+directory = directory.getCanonicalFile();
+if (!validateFile(directory, IS_GLOB)) {
continue;
+}
if (log.isDebugEnabled())
log.debug( Including directory glob
+ directory.getAbsolutePath());
@@ -229,9 +232,10 @@ public final class ClassLoaderFactory {
if (!filename.endsWith(.jar))
continue;
File file = new File(directory, filenames[j]);
-file = new File(file.getCanonicalPath());
-if (!file.exists() || !file.canRead())
+file = file.getCanonicalFile();
+if (!validateFile(file, IS_JAR)) {
continue;
+}
if (log.isDebugEnabled())
log.debug(Including glob jar file
+ file.getAbsolutePath());
@@ -257,5 +261,41 @@ public final class ClassLoaderFactory {
}
-
+private static boolean validateFile(File file,
+Integer type)
DO NOT REPLY [Bug 48863] Log directory misconfiguration for class loaders
https://issues.apache.org/bugzilla/show_bug.cgi?id=48863 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #9 from Mark Thomas ma...@apache.org 2011-06-03 08:02:05 UTC --- Fixed in 6.0.x and will be in 6.0.33 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: r1130935 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/servlet/JspServletWrapper.java webapps/docs/changelog.xml
Author: markt Date: Fri Jun 3 08:10:00 2011 New Revision: 1130935 URL: http://svn.apache.org/viewvc?rev=1130935view=rev Log: Fix possible threading issue in JSP compilation when development mode is enabled Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jun 3 08:10:00 2011 @@ -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,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1075458,1076212,1078412,1079801,1081334,1088460,1094089,1099586,1099772,1099789,1100145,1100822,1101094,1101144
svn commit: r1130936 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/valves/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Fri Jun 3 08:17:02 2011
New Revision: 1130936
URL: http://svn.apache.org/viewvc?rev=1130936view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50887
Enable the provider to be configured when generating SSL certs
Based on a patch by pknopp
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1130936r1=1130935r2=1130936view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jun 3 08:17:02 2011
@@ -112,13 +112,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50887
- Enable the provider to be configured when generating SSL certs
- Based on a patch by pknopp
- https://issues.apache.org/bugzilla/attachment.cgi?id=26765
- +1: markt, kkolinko, schultz
- -1:
-
* Add additional configuration options to the DIGEST authenticator
http://people.apache.org/~markt/patches/2011-04-01-digest-tc6.patch
+1: markt
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1130936r1=1130935r2=1130936view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
Fri Jun 3 08:17:02 2011
@@ -44,6 +44,8 @@ errorReportValve.rootCauseInLogs=The ful
# Remote IP valve
remoteIpValve.syntax=Invalid regular expressions [{0}] provided.
+sslValve.invalidProvider=The SSL provider specified on the connector
associated with this request of [{0}] is invalid. The certificate data could
not be processed.
+
# HTTP status reports
http.100=The client may continue ({0}).
http.101=The server is switching protocols according to the Upgrade header
({0}).
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=1130936r1=1130935r2=1130936view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java Fri Jun
3 08:17:02 2011
@@ -20,6 +20,7 @@ package org.apache.catalina.valves;
import java.io.IOException;
import java.io.ByteArrayInputStream;
+import java.security.NoSuchProviderException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
@@ -28,7 +29,8 @@ import javax.servlet.ServletException;
import org.apache.catalina.valves.ValveBase;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-import org.apache.catalina.util.StringManager;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/*
* Valve to fill the SSL informations in the request
@@ -46,8 +48,10 @@ import org.apache.catalina.util.StringMa
* @version $Id$
*/
-public class SSLValve
-extends ValveBase {
+public class SSLValve extends ValveBase {
+
+private static final Log log = LogFactory.getLog(SSLValve.class);
+
/*
private static final String info =
SSLValve/1.0;
@@ -87,14 +91,25 @@ public class SSLValve
// ByteArrayInputStream bais = new
ByteArrayInputStream(strcerts.getBytes(UTF-8));
ByteArrayInputStream bais = new
ByteArrayInputStream(strcerts.getBytes());
X509Certificate jsseCerts[] = null;
+String providerName = (String) request.getConnector().getProperty(
+clientCertProvider);
try {
-CertificateFactory cf =
CertificateFactory.getInstance(X.509);
DO NOT REPLY [Bug 50887] Enhancement to set security-provider within AjpAprProcessor
https://issues.apache.org/bugzilla/show_bug.cgi?id=50887 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas ma...@apache.org 2011-06-03 08:16:53 UTC --- Fixed in 6.0.x and will be included in 6.0.33 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: r1130937 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt bin/digest.sh bin/shutdown.sh bin/startup.sh bin/version.sh webapps/docs/changelog.xml
Author: markt Date: Fri Jun 3 08:27:13 2011 New Revision: 1130937 URL: http://svn.apache.org/viewvc?rev=1130937view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47880 Clarify error messages in *.sh files to mention that if a script is not found it might be because execute permission is needed. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/bin/digest.sh tomcat/tc6.0.x/trunk/bin/shutdown.sh tomcat/tc6.0.x/trunk/bin/startup.sh tomcat/tc6.0.x/trunk/bin/version.sh tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jun 3 08:27:13 2011 @@ -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,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1075458,1076212,1078409,1078412,1079801,1081334,1088460,1094089,1099586,1099772,1099789,1100145,1100822,1101094,1101144
DO NOT REPLY [Bug 47880] Lack of +x permissions on script files results cryptic and confusing error messages
https://issues.apache.org/bugzilla/show_bug.cgi?id=47880 --- Comment #6 from Mark Thomas ma...@apache.org 2011-06-03 08:27:07 UTC --- Fixed in 6.0.x and will be included in 6.0.33 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
DO NOT REPLY [Bug 51315] New: Removing Valve from StandardContext causes IllegalArgumentException
https://issues.apache.org/bugzilla/show_bug.cgi?id=51315
Bug #: 51315
Summary: Removing Valve from StandardContext causes
IllegalArgumentException
Product: Tomcat 6
Version: 6.0.32
Platform: PC
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: violet...@apache.org
Classification: Unclassified
Hello,
I have the following scenario - runtime I want to remove one Valve from a
specified StandardContext.
I'm using the following method:
org.apache.catalina.core.StandardContext.removeValve(Valve valve)
which invokes
org.apache.catalina.core.StandardPipeline.removeValve(Valve valve)
The problem is that the following exception is thrown:
Caused by: java.lang.IllegalArgumentException: Configuration error: Must be
attached to a Context
at
org.apache.catalina.authenticator.AuthenticatorBase.setContainer(AuthenticatorBase.java:277)
at
org.apache.catalina.core.StandardPipeline.removeValve(StandardPipeline.java:537)
It appears that setContainer is invoked with null which leads to this
IlleagalArgumentException.
I want to propose the following change:
Index: AuthenticatorBase.java
===
--- AuthenticatorBase.java(revision 1100912)
+++ AuthenticatorBase.java(working copy)
@@ -273,7 +273,7 @@
*/
public void setContainer(Container container) {
-if (!(container instanceof Context))
+if (container != null !(container instanceof Context))
throw new IllegalArgumentException
(sm.getString(authenticator.notContext));
Please tell me if there is more appropriate way to remove a Valve if the one
above that I'm describing is not the correct one.
Thanks in advance.
Regards
Violeta Georgieva
--
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 51315] Removing Valve from StandardContext causes IllegalArgumentException
https://issues.apache.org/bugzilla/show_bug.cgi?id=51315 violet...@apache.org changed: What|Removed |Added OS/Version||Windows 7 -- 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 51315] Removing Valve from StandardContext causes IllegalArgumentException
https://issues.apache.org/bugzilla/show_bug.cgi?id=51315 violet...@apache.org changed: What|Removed |Added OS/Version||Windows 7 -- 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 51309] Patch to better stop support with CATALINA_PID
https://issues.apache.org/bugzilla/show_bug.cgi?id=51309 --- Comment #2 from Caio Cezar raizd...@gmail.com 2011-06-03 10:55:10 UTC --- (In reply to comment #1) Thanks for the patch. For future reference patches work best as attachments the lines are likely to get wrapped if you paste them in the comments box. The patch has been applied to 7.0.x and will be included in 7.0.15 onwards. I have proposed the patch for 6.0.x. Thanks Mark -- 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 51316] New: Tomcat does not redirect to configured http 500 error-page
https://issues.apache.org/bugzilla/show_bug.cgi?id=51316 Bug #: 51316 Summary: Tomcat does not redirect to configured http 500 error-page Product: Tomcat 5 Version: 5.5.27 Platform: PC OS/Version: Linux Status: NEW Severity: major Priority: P2 Component: Unknown AssignedTo: dev@tomcat.apache.org ReportedBy: kcla...@yahoo.com Classification: Unclassified Hi, I've seen several posts related to this bug, but most if not all are marked resolved or invalid. Unfortunately, I am still seeing the issue. I've been able to narrow it down to tomcat on Linux. Issue: Tomcat does not redirect to the HMAExceptionHandlerServlet servlet I have configured in the application specific web.xml when running on Linux I've tried searching all of the lists for an answer to this question. I've seen several postings by people having the same issue, but never a solution. My Tomcat version: Apache Tomcat 5.5.27 (I've also tried 5.5.33 and 6.0.32) running on: Fedora 2.6.27.5-117.fc10.x86_64 with JDK version: 1.6.0_25 A few things I would like to note: 1. This is a vanilla Tomcat 5.5.27 install. 2. When I copy the web application directly from the Linux Tomcat install to a Vanilla Tomcat install on Windows 7, the 500 redirect to my custom error servlet works. 3. When I invoke the Java HMAExceptionHandlerServlet configured to be used in the error-page block in the application specific web.xml directly from the URL in the browser, it works. It also works if I invoke it using the /error/ExceptionHandler servlet mapping url pattern. 4. If I change the error code to be 404, Tomcat correctly redirects to the custom error page. 5. Tomcat 5.5.33 does correctly redirect to the error-page when running on a Windows 7 machine. The only time I have an issue is on the Linux configuration above. 6. I see the error code logged in the access log. 192.168.xxx.xxx - - [02/Jun/2011:13:53:14 -0600] POST /HMAApp/faces/main/TaskSearchTab.jsp HTTP/1.0 500 1000 7. I see both the com.sun.rave.web.ui.appbase.ApplicationException and the java.lang.NullPointerException in the localhost log (both are configured in the application specific web.xml to redirect to the custom error servlet. Jun 2, 2011 1:53:14 PM org.apache.catalina.core.StandardWrapperValve invoke SEVERE: Servlet.service() for servlet Faces Servlet threw exception com.sun.rave.web.ui.appbase.ApplicationException at com.sun.rave.web.ui.appbase.faces.ViewHandlerImpl.cleanup(ViewHandlerImpl.java:559) at com.sun.rave.web.ui.appbase.faces.ViewHandlerImpl.renderView(ViewHandlerImpl.java:276) at com.sun.faces.lifecycle.RenderResponsePhase.execute(RenderResponsePhase.java:107) at com.sun.faces.lifecycle.LifecycleImpl.phase(LifecycleImpl.java:245) at com.sun.faces.lifecycle.LifecycleImpl.render(LifecycleImpl.java:137) at javax.faces.webapp.FacesServlet.service(FacesServlet.java:214) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:269) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) at com.sun.rave.web.ui.util.UploadFilter.doFilter(UploadFilter.java:198) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:213) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:172) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:117) at org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:581) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:108) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:174) at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:879) at org.apache.coyote.http11.Http11BaseProtocol$Http11ConnectionHandler.processConnection(Http11BaseProtocol.java:665) at org.apache.tomcat.util.net.PoolTcpEndpoint.processSocket(PoolTcpEndpoint.java:528) at org.apache.tomcat.util.net.LeaderFollowerWorkerThread.runIt(LeaderFollowerWorkerThread.java:81) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:689) at java.lang.Thread.run(Thread.java:662) Caused by: java.lang.NullPointerException at hmaapp.utilmanagement.OPProcMain.prerender(OPProcMain.java:2355) at com.sun.rave.web.ui.appbase.faces.ViewHandlerImpl.prerender(ViewHandlerImpl.java:771) at
Re: Plan for 7.0.15
I'd like to suggest that we include tomcat-jdbc.jar in the 7.0.15 release. DBCP will still be the default, but allows users to configure an alternative fairly easily without downloading separate libraries. It's easy to include in the build process, the jar is very small, so it doesn't bloat the distribution thoughts? Filip On 6/2/2011 7:36 AM, Mark Thomas wrote: All, Another month has rolled by so I am starting to look at a 7.0.15 release. The main things in this release will be the new NIO AJP connector along with the usual assortment of bug fixes. I want to finish the fix for BZ 51278 for 7.0.15 so with that work and running the TCKs before the tag, expect a tag sometime over the weekend with the vote early next week. The usual caveats about bug fixes taking longer than expected, $work priorities and $life getting in the way apply so the schedule may slip. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - No virus found in this message. Checked by AVG - www.avg.com Version: 10.0.1375 / Virus Database: 1511/3674 - Release Date: 06/01/11 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Plan for 7.0.15
On 03/06/2011 17:07, Filip Hanik - Dev Lists wrote: I'd like to suggest that we include tomcat-jdbc.jar in the 7.0.15 release. DBCP will still be the default, but allows users to configure an alternative fairly easily without downloading separate libraries. It's easy to include in the build process, the jar is very small, so it doesn't bloat the distribution thoughts? +1 to the idea of including jdbc-pool but there will be a fair number of changes required to build.xml (and maven scripts etc) and I'd prefer to get 7.0.15 out of the way and include this in 7.0.16 to give us a little longer to bed in the changes. Mark Filip On 6/2/2011 7:36 AM, Mark Thomas wrote: All, Another month has rolled by so I am starting to look at a 7.0.15 release. The main things in this release will be the new NIO AJP connector along with the usual assortment of bug fixes. I want to finish the fix for BZ 51278 for 7.0.15 so with that work and running the TCKs before the tag, expect a tag sometime over the weekend with the vote early next week. The usual caveats about bug fixes taking longer than expected, $work priorities and $life getting in the way apply so the schedule may slip. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - No virus found in this message. Checked by AVG - www.avg.com Version: 10.0.1375 / Virus Database: 1511/3674 - Release Date: 06/01/11 - 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
Re: Plan for 7.0.15
On 6/3/2011 10:13 AM, Mark Thomas wrote: On 03/06/2011 17:07, Filip Hanik - Dev Lists wrote: I'd like to suggest that we include tomcat-jdbc.jar in the 7.0.15 release. DBCP will still be the default, but allows users to configure an alternative fairly easily without downloading separate libraries. It's easy to include in the build process, the jar is very small, so it doesn't bloat the distribution thoughts? +1 to the idea of including jdbc-pool but there will be a fair number of changes required to build.xml (and maven scripts etc) and I'd prefer to get 7.0.15 out of the way and include this in 7.0.16 to give us a little longer to bed in the changes. sounds like a good plan Filip Mark Filip On 6/2/2011 7:36 AM, Mark Thomas wrote: All, Another month has rolled by so I am starting to look at a 7.0.15 release. The main things in this release will be the new NIO AJP connector along with the usual assortment of bug fixes. I want to finish the fix for BZ 51278 for 7.0.15 so with that work and running the TCKs before the tag, expect a tag sometime over the weekend with the vote early next week. The usual caveats about bug fixes taking longer than expected, $work priorities and $life getting in the way apply so the schedule may slip. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - No virus found in this message. Checked by AVG - www.avg.com Version: 10.0.1375 / Virus Database: 1511/3674 - Release Date: 06/01/11 - 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 - No virus found in this message. Checked by AVG - www.avg.com Version: 10.0.1382 / Virus Database: 1511/3678 - Release Date: 06/03/11 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1131126 - /tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Author: markt
Date: Fri Jun 3 18:07:24 2011
New Revision: 1131126
URL: http://svn.apache.org/viewvc?rev=1131126view=rev
Log:
Fix TCK failure exposed by the fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=51278
A previous change to ensure web.xml had precedence over fragments and
annotations was not complete. It handled filter definitions and servlet
definitions but not servlet mappings.
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1131126r1=1131125r2=1131126view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Fri Jun 3
18:07:24 2011
@@ -1429,9 +1429,9 @@ public class WebXml {
}
errorPages.putAll(temp.getErrorPages());
-// As per 'clarification' from the Servlet EG, filter mappings in the
+// As per 'clarification' from the Servlet EG, filter definitions in
the
// main web.xml override those in fragments and those in fragments
-// override mappings in annotations
+// override those in annotations
for (WebXml fragment : fragments) {
IteratorFilterMap iterFilterMaps =
fragment.getFilterMappings().iterator();
@@ -1585,19 +1585,25 @@ public class WebXml {
serviceRefs.putAll(temp.getServiceRefs());
mergeInjectionFlags.clear();
-// As per 'clarification' from the Servlet EG, servlet mappings in the
-// main web.xml override those in fragments and those in fragments
-// override mappings in annotations
+// As per 'clarification' from the Servlet EG, servlet definitions and
+// mappings in the main web.xml override those in fragments and those
in
+// fragments override those in annotations
+// Remove servlet definitions and mappings from fragments that are
+// defined in web.xml
for (WebXml fragment : fragments) {
-IteratorMap.EntryString,String iterServletMaps =
+IteratorMap.EntryString,String iterFragmentServletMaps =
fragment.getServletMappings().entrySet().iterator();
-while (iterServletMaps.hasNext()) {
-Map.EntryString,String servletMap = iterServletMaps.next();
-if (servletMappingNames.contains(servletMap.getValue())) {
-iterServletMaps.remove();
+while (iterFragmentServletMaps.hasNext()) {
+Map.EntryString,String servletMap =
+iterFragmentServletMaps.next();
+if (servletMappingNames.contains(servletMap.getValue()) ||
+servletMappings.containsKey(servletMap.getKey())) {
+iterFragmentServletMaps.remove();
}
}
}
+
+// Add fragment mappings
for (WebXml fragment : fragments) {
for (Map.EntryString,String mapping :
fragment.getServletMappings().entrySet()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1131132 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Jun 3 18:15:29 2011 New Revision: 1131132 URL: http://svn.apache.org/viewvc?rev=1131132view=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=1131132r1=1131131r2=1131132view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jun 3 18:15:29 2011 @@ -177,3 +177,10 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1130774view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51315 + Removing an authenticator valve triggers an IAE + Patch provided by Violeta Georgieva + https://issues.apache.org/bugzilla/show_bug.cgi?id=51315#c0 + +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 51315] Removing Valve from StandardContext causes IllegalArgumentException
https://issues.apache.org/bugzilla/show_bug.cgi?id=51315 Mark Thomas ma...@apache.org changed: What|Removed |Added OS/Version||All --- Comment #1 from Mark Thomas ma...@apache.org 2011-06-03 18:15:21 UTC --- You are doing exactly the right thing. That is a bug in 6.0.x (that is fixed in 7.0.x by the way). I have proposed your patch 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 51316] Tomcat does not redirect to configured http 500 error-page
https://issues.apache.org/bugzilla/show_bug.cgi?id=51316 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #1 from Mark Thomas ma...@apache.org 2011-06-03 21:03:12 UTC --- This works for me, on linux, with the latest 5.5.x. Before re-opening this issue, you'll need to provide the simplest possible test case that reproduces it on a clean 5.5.x install using the latest 5.5.x version. Based on the description, just two servlets and a web.xml should be all that are required. Right now, this looks like an issue in the framework you are using rather than a Tomcat issue. -- 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: r1131263 - in /tomcat/trunk: java/org/apache/catalina/session/JDBCStore.java java/org/apache/catalina/session/LocalStrings.properties webapps/docs/changelog.xml webapps/docs/config/manager
Author: markt
Date: Fri Jun 3 22:13:09 2011
New Revision: 1131263
URL: http://svn.apache.org/viewvc?rev=1131263view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51264
Allow the JDBC persistent session store to use a JNDI datasource to define the
database in which sessions are persisted.
Patch provided by Felix Schumacher.
Modified:
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/manager.xml
Modified: tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=1131263r1=1131262r2=1131263view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java Fri Jun 3
22:13:09 2011
@@ -33,6 +33,11 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Properties;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
import org.apache.catalina.Container;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Loader;
@@ -102,6 +107,16 @@ public class JDBCStore extends StoreBase
*/
protected String driverName = null;
+/**
+ * name of the JNDI resource
+ */
+protected String dataSourceName = null;
+
+/**
+ * DataSource to use
+ */
+protected DataSource dataSource = null;
+
// - Table
cols
/**
@@ -436,6 +451,27 @@ public class JDBCStore extends StoreBase
return (this.sessionLastAccessedCol);
}
+/**
+ * Set the JNDI name of a DataSource-factory to use for db access
+ *
+ * @param dataSourceName The JNDI name of the DataSource-factory
+ */
+public void setDataSourceName(String dataSourceName) {
+if (dataSourceName == null || .equals(dataSourceName.trim())) {
+manager.getContainer().getLogger().warn(
+sm.getString(getStoreName() + .missingDataSourceName));
+return;
+}
+this.dataSourceName = dataSourceName;
+}
+
+/**
+ * Return the name of the JNDI DataSource-factory
+ */
+public String getDataSourceName() {
+return this.dataSourceName;
+}
+
// - Public Methods
/**
@@ -866,6 +902,24 @@ public class JDBCStore extends StoreBase
if (dbConnection != null)
return (dbConnection);
+if (dataSourceName != null dataSource == null) {
+Context initCtx;
+try {
+initCtx = new InitialContext();
+Context envCtx = (Context) initCtx.lookup(java:comp/env);
+this.dataSource = (DataSource)
envCtx.lookup(this.dataSourceName);
+} catch (NamingException e) {
+manager.getContainer().getLogger().error(
+sm.getString(getStoreName() + .wrongDataSource,
+this.dataSourceName), e);
+ }
+}
+
+if (dataSource != null) {
+dbConnection = dataSource.getConnection();
+return dbConnection;
+}
+
// Instantiate our database driver if necessary
if (driver == null) {
try {
Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1131263r1=1131262r2=1131263view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Fri
Jun 3 22:13:09 2011
@@ -27,6 +27,8 @@ JDBCStore.checkConnectionDBClosed=The da
JDBCStore.checkConnectionDBReOpenFail=The re-open on the database failed. The
database could be down.
JDBCStore.checkConnectionSQLException=A SQL exception occurred {0}
JDBCStore.checkConnectionClassNotFoundException=JDBC driver class not found {0}
+JDBCStore.wrongDataSource=Can't open JNDI DataSource [{0}]
+JDBCStore.missingDataSourceName=No valid JNDI name was given.
managerBase.createRandom=Created random number generator for session ID
generation in {0}ms.
managerBase.createSession.ise=createSession: Too many active sessions
managerBase.sessionTimeout=Invalid session timeout setting {0}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1131263r1=1131262r2=1131263view=diff
DO NOT REPLY [Bug 51264] Context/Manager/Store configuration proposal
https://issues.apache.org/bugzilla/show_bug.cgi?id=51264 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas ma...@apache.org 2011-06-03 22:13:19 UTC --- Many thanks for the patch. It has been applied to 7.0.x and will be included in 7.0.15 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
DO NOT REPLY [Bug 51251] Patch to add version parameter to ant task
https://issues.apache.org/bugzilla/show_bug.cgi?id=51251 Mark Thomas ma...@apache.org changed: What|Removed |Added Attachment #27049|0 |1 is patch|| Attachment #27049|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
svn commit: r1131267 - in /tomcat/trunk: java/org/apache/catalina/ant/ webapps/docs/
Author: markt
Date: Fri Jun 3 22:22:35 2011
New Revision: 1131267
URL: http://svn.apache.org/viewvc?rev=1131267view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51251
Add web application version support to the Ant tasks.
Based on a patch provided by Eiji Takahashi.
Added:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/ant/ReloadTask.java
tomcat/trunk/java/org/apache/catalina/ant/SessionsTask.java
tomcat/trunk/java/org/apache/catalina/ant/StartTask.java
tomcat/trunk/java/org/apache/catalina/ant/StopTask.java
tomcat/trunk/java/org/apache/catalina/ant/UndeployTask.java
tomcat/trunk/webapps/docs/changelog.xml
Added:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java?rev=1131267view=auto
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
(added)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
Fri Jun 3 22:22:35 2011
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.ant;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import org.apache.tools.ant.BuildException;
+
+public abstract class AbstractCatalinaCommandTask extends
+AbstractCatalinaTask {
+
+/**
+ * The context path of the web application we are managing.
+ */
+protected String path = null;
+
+public String getPath() {
+return (this.path);
+}
+
+public void setPath(String path) {
+this.path = path;
+}
+
+/**
+ * The context version of the web application we are managing.
+ */
+protected String version = null;
+
+public String getVersion() {
+return (this.version);
+}
+
+public void setVersion(String version) {
+this.version = version;
+}
+
+// - Public Methods
+
+/**
+ * Create query string for the specified command.
+ *
+ * @param command Command to be executed
+ *
+ * @exception BuildException if an error occurs
+ */
+public StringBuilder createQueryString(String command) throws
BuildException {
+StringBuilder buffer = new StringBuilder();
+
+try {
+buffer.append(command);
+if (path == null) {
+throw new BuildException(Must specify 'path' attribute);
+} else {
+buffer.append(?path=);
+buffer.append(URLEncoder.encode(this.path, getCharset()));
+if (this.version != null) {
+buffer.append(version=);
+buffer.append(URLEncoder.encode(this.version,
getCharset()));
+}
+}
+} catch (UnsupportedEncodingException e) {
+throw new BuildException
+(Invalid 'charset' attribute: + getCharset());
+}
+return buffer;
+}
+
+}
\ No newline at end of file
Propchange:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
--
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/catalina/ant/ReloadTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ReloadTask.java?rev=1131267r1=1131266r2=1131267view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/ReloadTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ReloadTask.java Fri Jun 3
22:22:35 2011
@@ -19,8 +19,6 @@
package org.apache.catalina.ant;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import org.apache.tools.ant.BuildException;
@@ -33,28 +31,7 @@ import org.apache.tools.ant.BuildExcepti
* @version $Id$
* @since 4.1
*/
-public class ReloadTask extends
DO NOT REPLY [Bug 51251] Patch to add version parameter to ant task
https://issues.apache.org/bugzilla/show_bug.cgi?id=51251 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2011-06-03 22:23:18 UTC --- Thanks for the patch. I modified the patch slightly since the test got path == null that triggered an exception was lost in the refactoring. The patch has been applied to 7.0.x and will be included in 7.0.15 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
DO NOT REPLY [Bug 51142] Offer possible resolution of StringIndexOutOfBoundsException in Request.updateCounters when AJP packetSize is too small.
https://issues.apache.org/bugzilla/show_bug.cgi?id=51142 --- Comment #4 from Mark Thomas ma...@apache.org 2011-06-03 22:35:11 UTC --- No, you missed the key point in my review comment. Putting a try/catch around the point where the error is first seen is the wrong approach. The right approach is detecting when the packet length buffer length and taking the appropriate action at that point (500 response, log message etc.) -- 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: r1131263 - in /tomcat/trunk: java/org/apache/catalina/session/JDBCStore.java java/org/apache/catalina/session/LocalStrings.properties webapps/docs/changelog.xml webapps/docs/config/man
If NamingExceptionOccurs - should this instead rethrow a SqlException
instead of letting the logic keep going? Otherwise wouldn't a SqlException
be thrown later in the method?
-Tim
On Fri, Jun 3, 2011 at 6:13 PM, ma...@apache.org wrote:
Author: markt
Date: Fri Jun 3 22:13:09 2011
New Revision: 1131263
URL: http://svn.apache.org/viewvc?rev=1131263view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51264
Allow the JDBC persistent session store to use a JNDI datasource to define
the database in which sessions are persisted.
Patch provided by Felix Schumacher.
Modified:
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/manager.xml
Modified: tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=1131263r1=1131262r2=1131263view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java Fri Jun 3
22:13:09 2011
@@ -866,6 +902,24 @@ public class JDBCStore extends StoreBase
if (dbConnection != null)
return (dbConnection);
+if (dataSourceName != null dataSource == null) {
+Context initCtx;
+try {
+initCtx = new InitialContext();
+Context envCtx = (Context)
initCtx.lookup(java:comp/env);
+this.dataSource = (DataSource)
envCtx.lookup(this.dataSourceName);
+} catch (NamingException e) {
+manager.getContainer().getLogger().error(
+sm.getString(getStoreName() + .wrongDataSource,
+this.dataSourceName), e);
+ }
+}
+
+if (dataSource != null) {
+dbConnection = dataSource.getConnection();
+return dbConnection;
+}
+
Re: svn commit: r1131263 - in /tomcat/trunk: java/org/apache/catalina/session/JDBCStore.java java/org/apache/catalina/session/LocalStrings.properties webapps/docs/changelog.xml webapps/docs/config/man
On 03/06/2011 23:41, Tim Funk wrote:
If NamingExceptionOccurs - should this instead rethrow a SqlException
instead of letting the logic keep going? Otherwise wouldn't a SqlException
be thrown later in the method?
Don't think so. If the lookup is invalid dataSource will be null so it
should fall back to using the non-pooled settings (which may also fail)
Mark
-Tim
On Fri, Jun 3, 2011 at 6:13 PM, ma...@apache.org wrote:
Author: markt
Date: Fri Jun 3 22:13:09 2011
New Revision: 1131263
URL: http://svn.apache.org/viewvc?rev=1131263view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51264
Allow the JDBC persistent session store to use a JNDI datasource to define
the database in which sessions are persisted.
Patch provided by Felix Schumacher.
Modified:
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/manager.xml
Modified: tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=1131263r1=1131262r2=1131263view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java Fri Jun 3
22:13:09 2011
@@ -866,6 +902,24 @@ public class JDBCStore extends StoreBase
if (dbConnection != null)
return (dbConnection);
+if (dataSourceName != null dataSource == null) {
+Context initCtx;
+try {
+initCtx = new InitialContext();
+Context envCtx = (Context)
initCtx.lookup(java:comp/env);
+this.dataSource = (DataSource)
envCtx.lookup(this.dataSourceName);
+} catch (NamingException e) {
+manager.getContainer().getLogger().error(
+sm.getString(getStoreName() + .wrongDataSource,
+this.dataSourceName), e);
+ }
+}
+
+if (dataSource != null) {
+dbConnection = dataSource.getConnection();
+return dbConnection;
+}
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1131303 - /tomcat/jk/trunk/HOWTO-RELEASE.txt
Author: timw Date: Sat Jun 4 01:45:14 2011 New Revision: 1131303 URL: http://svn.apache.org/viewvc?rev=1131303view=rev Log: Updating JK release instructions - some files have changed, and some servers have moved. Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/HOWTO-RELEASE.txt?rev=1131303r1=1131302r2=1131303view=diff == --- tomcat/jk/trunk/HOWTO-RELEASE.txt (original) +++ tomcat/jk/trunk/HOWTO-RELEASE.txt Sat Jun 4 01:45:14 2011 @@ -32,9 +32,11 @@ Do a find for all the docs which include and replace it with the new version. These are the docs I found which had to be updated: +native/iis/README +native/netscape/README +native/STATUS.txt xdocs/index.xml xdocs/news/THISYEAR0101.xml -native/STATUS.txt Update the JK_VERISRELEASE define in native/common/jk_version.h, here is a svn diff that shows what I changed: @@ -87,23 +89,27 @@ Create the new source distribution A tool named jkrelease.sh in the directory tools creates a release tarball and a zip including signature files. + + Upload source distribution and documentation to www.apache.org --- First update the KEYS on the server if you have added a new pgp key. scp KEYS to the /www/www.apache.org/dist/tomcat/tomcat-connectors -directory on the www.apache.org server. +directory on the people.apache.org server. scp tomcat-connectors-1.2.29-src.tar.gz* to -/www/www.apache.org/dist/tomcat/tomcat-connectors/source +/www/www.apache.org/dist/tomcat/tomcat-connectors/jk/source scp tomcat-connectors-1.2.29-src.zip* to -/www/www.apache.org/dist/tomcat/tomcat-connectors/source +/www/www.apache.org/dist/tomcat/tomcat-connectors/jk/source -ssh to www.apache.org and cd to the +ssh to people.apache.org and cd to the /www/www.apache.org/dist/tomcat/tomcat-connectors/jk directory. -Remove the symlinks for current and replace them with a soft link +Modify README.html and update it to the current version. + +Remove the symlinks for current if present and replace them with a soft link to the new source distribution files. ln -s source/tomcat-connectors-1.2.29-src.tar.gz tomcat-connectors-src-current.tar.gz @@ -114,7 +120,7 @@ ln -s source/tomcat-connectors-1.2.29-sr Make sure the group write bit is set on all files and directories in the jk directory. -chmod -R g+w /www/www.apache.org/dist/tomcat/tomcat-connectors/ +chmod -R g+w /www/www.apache.org/dist/tomcat/tomcat-connectors/jk Build binaries and upload distributions to www.apache.org -- @@ -144,7 +150,7 @@ Remove old release distributions from ww Verify that the old versions of the source and binary distributions are -available at /www/archive.apache.org/dist/tomcat/tomcat-connector/jk . +available at /www/archive.apache.org/dist/tomcat/tomcat-connectors/jk . Copy old source distributions and binaries as needed, then remove the old source and binary distributions. @@ -152,18 +158,22 @@ Arrange the downloads_tomcat-connectors. --- Check tomcat-site out: + svn co https://svn.apache.org/repos/asf/tomcat/site site-tomcat +Arrange the file: xdocs/download-connectors.xml, updating all occurrences +of the version number to the just released version. -Arrange the file: xdocs/downloads/downloads.xml +Update xdocs/index.xml to reflect the new release of Tomcat Connectors. -Use ant to regenerate the corresponding html file: -docs/site/downloads/downloads_tomcat-connectors.html +Run ant from the site-tomcat directory to regenerate the corresponding html file: +docs/site/download-connectors.html Commit it after checking carefully the changes. Connect to people.apache.org and update the tomcat.apache.org site image, -the site tomcat.apache.org should reflect the change after a while. +the site tomcat.apache.org should reflect the change after a while: + cd /x1/www/tomcat.apache.org/site/downloads svn update downloads_tomcat-connectors.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51283] Session Fixation is solved without an invalidating of an existing HTTP session
https://issues.apache.org/bugzilla/show_bug.cgi?id=51283 --- Comment #4 from Michael michael_fur...@hotmail.com 2011-06-04 03:45:53 UTC --- (In reply to comment #3) As per my previous comment. Hi! Why you do not want to solve at as you suggested in the previous comment? I think session fixation configurable (do nothing / change ID / create new session) is great suggestion. Today it is only do nothing / change ID -- 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 51283] Session Fixation is solved without an invalidating of an existing HTTP session
https://issues.apache.org/bugzilla/show_bug.cgi?id=51283 --- Comment #5 from Christopher Schultz ch...@christopherschultz.net 2011-06-04 04:40:14 UTC --- Mark was suggesting that if a plausible use-case were to be presented where an application should need the container to protect users from itself, he might consider such a feature. Since no use-case was presented, he marked this bug as INVALID. I tend to agree: if the users cannot trust the webapp, they should be using it. -- 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
