DO NOT REPLY [Bug 52482] New: Socket acception fails

2012-01-18 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52482

 Bug #: 52482
   Summary: Socket acception fails
   Product: Tomcat 7
   Version: 7.0.23
  Platform: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: denizdurmu...@gmail.com
Classification: Unclassified


I will try to give you a brief description about this...

When I create my WAR file and put into webapps folder, either by manager or
manually, tomcat "seems" running, but actually it keeps logging these: 


INFO: Server startup in 606 ms
Jan 18, 2012 4:51:16 PM org.apache.coyote.http11.AbstractHttp11Processor
process
SEVERE: Error processing request
java.security.AccessControlException: access denied
("java.lang.RuntimePermission" "setContextClassLoader")
at
java.security.AccessControlContext.checkPermission(AccessControlContext.java:366)
at
java.security.AccessController.checkPermission(AccessController.java:555)
at java.lang.SecurityManager.checkPermission(SecurityManager.java:549)
at java.lang.Thread.setContextClassLoader(Thread.java:1485)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:213)
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:98)
at
org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:928)
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:118)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:407)
at
org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:987)
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:539)
at
org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:298)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
at java.lang.Thread.run(Thread.java:722)

Jan 18, 2012 4:51:16 PM org.apache.coyote.http11.AbstractHttp11Processor
endRequest
SEVERE: Error finishing response
java.lang.ExceptionInInitializerError
at
org.apache.coyote.http11.AbstractHttp11Processor.prepareResponse(AbstractHttp11Processor.java:1398)
at
org.apache.coyote.http11.AbstractHttp11Processor.action(AbstractHttp11Processor.java:756)
at org.apache.coyote.Response.action(Response.java:168)
at
org.apache.coyote.http11.AbstractOutputBuffer.endRequest(AbstractOutputBuffer.java:310)
at
org.apache.coyote.http11.InternalOutputBuffer.endRequest(InternalOutputBuffer.java:158)
at
org.apache.coyote.http11.AbstractHttp11Processor.endRequest(AbstractHttp11Processor.java:1586)
at
org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1022)
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:539)
at
org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:298)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
at java.lang.Thread.run(Thread.java:722)
Caused by: java.security.AccessControlException: access denied
("java.util.PropertyPermission"
"org.apache.tomcat.util.http.FastHttpDateFormat.CACHE_SIZE" "read")
at
java.security.AccessControlContext.checkPermission(AccessControlContext.java:366)
at
java.security.AccessController.checkPermission(AccessController.java:555)
at java.lang.SecurityManager.checkPermission(SecurityManager.java:549)
at java.lang.SecurityManager.checkPropertyAccess(SecurityManager.java:1302)
at java.lang.System.getProperty(System.java:742)
at
org.apache.tomcat.util.http.FastHttpDateFormat.(FastHttpDateFormat.java:38)
... 12 more

Jan 18, 2012 4:51:19 PM org.apache.tomcat.util.net.JIoEndpoint$Acceptor run
SEVERE: Socket accept failed
java.security.AccessControlException: access denied
("java.net.SocketPermission" "127.0.0.1:53243" "accept,resolve")
at
java.security.AccessControlContext.checkPermission(AccessControlContext.java:366)
at
java.security.AccessController.checkPermission(AccessController.java:555)
at java.lang.SecurityManager.checkPermission(SecurityManager.java:549)
at java.lang.SecurityManager.checkAccept(SecurityManager.java:1174)
at java.net.ServerSocket.implAccept(ServerSocket.java:526)
at java.net.ServerSocket.accept(ServerSocket.java:490)
at
org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:60)
at
org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:207)
at java.lang.Thread.run(Thread.java:722)

Jan 18, 2012 4:51:19 PM org.apache.tomcat.util.net.JIoEndpoint$Acceptor run
SEVERE: Socket accept failed
java

Re: svn commit: r1183612 [2/2] - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

2012-01-18 Thread Brian Burch

On 18/01/12 08:26, William A. Rowe Jr. wrote:

On 1/13/2012 8:30 PM, Brian Burch wrote:

On 14/01/12 09:45, Filip Hanik - Dev Lists wrote:

No grudge held :)
I'm just bringing it up since very many files have been reformatted for
the sake of formatting. And when tracing down a problem, I, and I
suspect others too, often use SVN history to figure out what and how
changed. So a formatting change that makes satisfies a personal
formatting preference for one developer, down the line can make it a lot
harder to trace changes for others.


I don't want to throw petrol on glowing embers, and I realise my own efforts 
barely count.
However, when I've been researching the history of changes in logic that I 
didn't fully
understand, the svn history has been unhelpful and confusing. Now I understand 
why!


One very useful trick is svn diff -x --ignore-all-whitespace -x 
--ignore-eol-style


Thanks for the tip, Will.

I use Netbeans as my IDE: on the miscellaneous properties tabbed pane 
for the diff command, I already had the checkbox set for "ignore leading 
and trailing whitespace", but didn't have "ignore changes in inner 
whitespace" set.


It is hard to remember exactly what was causing me confusion at the 
time, but that must have been a contributory factor. I suspect seeing 
changes that were "no change" confused me and drove me to the command 
line, where I saw the changes were HUGE and yet for no apparent 
difference - just loads of lines deleted and re-added.


I hope it is already policy that "editorial mass changes" should be 
clearly marked in the commit message text and should not alter any 
logic, signatures, etc.


Brian

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



DO NOT REPLY [Bug 52482] Socket acception fails

2012-01-18 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52482

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID
 OS/Version||All

--- Comment #1 from Mark Thomas  2012-01-18 09:19:01 UTC ---
This is not a bug and Bugzilla is not a support forum. You have already asked
about this on the users list and been told what the problem is. Please continue
this on the users list.

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

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



DO NOT REPLY [Bug 52482] Socket acception fails

2012-01-18 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52482

--- Comment #2 from Deniz  2012-01-18 09:26:35 UTC ---
okay, and as a head-ups, nobody told me anything about the problem on the
list...

thank you for your response

-- 
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 51621] Missing jars in Deployer

2012-01-18 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51621

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2012-01-18 09:31:08 UTC ---
This issue is fixed. If you need further assistance, the users list is the
place to ask. Bugzilla is not a support forum.

-- 
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 52474] Do not load listeners declared with blank spaces on tld file.

2012-01-18 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52474

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #2 from Mark Thomas  2012-01-18 09:32:50 UTC ---
The error is in the TLD file, not how Tomcat handles 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



DO NOT REPLY [Bug 47230] Include sample cert attributes for SSL connectors

2012-01-18 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47230

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX

--- Comment #1 from Mark Thomas  2012-01-18 09:36:48 UTC ---
Almost two years with no patch and no further interest. Also, server.xml
includes a comment regarding JSSE and APR so I think that is sufficient.
Therefore, closing as WONTFIX.

-- 
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: r1232813 - /tomcat/trunk/webapps/docs/config/listeners.xml

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 10:22:51 2012
New Revision: 1232813

URL: http://svn.apache.org/viewvc?rev=1232813&view=rev
Log:
Correct typo in documentation

Modified:
tomcat/trunk/webapps/docs/config/listeners.xml

Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1232813&r1=1232812&r2=1232813&view=diff
==
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Wed Jan 18 10:22:51 2012
@@ -329,7 +329,7 @@
 
 The ThreadLocal Leak Prevention Listener triggers the
 renewal of threads in Executor pools when a
-Contextis being stopped to avoid thread-local
+Context is being stopped to avoid thread-local
 related memory leaks. Active threads will be renewed one by one when they
 come back to the pool after executing their task.
 



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



svn commit: r1232815 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/listeners.xml

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 10:26:41 2012
New Revision: 1232815

URL: http://svn.apache.org/viewvc?rev=1232815&view=rev
Log:
Merged revision 1232813 from tomcat/trunk:
Correct typos in documentation

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 18 10:26:41 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158

DO NOT REPLY [Bug 52474] Do not load listeners declared with blank spaces on tld file.

2012-01-18 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52474

--- Comment #3 from Helio Frota  2012-01-18 10:26:50 UTC 
---
Hello Mark Thomas,

Servlet specification 2.5:

"SRV.13.2

Rules for Processing the Deployment Descriptor

This section lists some general rules that Web containers and developers must
note concerning the processing of the deployment descriptor for a Web
application.

• Web containers must remove all leading and trailing whitespace, which is de-
fined as “S(white space)” in XML 1.0 (http://www.w3.org/TR/2000/WD-xml-
2e-2814), for the element content of the text nodes of a deployment de-
scriptor."

JSP Specification:

JSP.7.1.9
Event Listeners
A tag library may include classes that are event listeners (see the Servlet 2.5
specification). The listeners classes are listed in the tag library descriptor
and the JSP container automatically instantiates them and registers them. A
Container is required to locate all TLD files (see Section JSP.7.3.1 for
details on how they are identified), read their listener elements, and treat
the event listeners as extensions of those listed in web.xml.
The order in which the listeners are registered is undefined, but they are
registered before application start.

So if the TLD file should be treated as an extension of the web.xml file, so
the container should deal with the removal of any blank space right ?

-- 
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 Apache Tomcat 7.0.25

2012-01-18 Thread Konstantin Kolinko
2012/1/17 Mark Thomas :
> The proposed Apache Tomcat 7.0.25 release is now available for voting.
>
> It can be obtained from:
> http://people.apache.org/~markt/dev/tomcat-7/v7.0.25/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-082/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_25/
>
> The proposed 7.0.25 release is:
> [ ] Broken - do not release
> [x] Stable - go ahead and release as 7.0.25 Stable
>

Testsuite did run successfully,
with BIO, NIO and APR (1.1.22.0) on 32-bit WinXP JDK 6u29.

Tested standard applications running with Security Manager enabled,
deployment, undeployment and did not observe any problems.

Best regards,
Konstantin Kolinko

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



svn commit: r1232842 - /tomcat/trunk/res/rat/rat-excludes.txt

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 11:50:28 2012
New Revision: 1232842

URL: http://svn.apache.org/viewvc?rev=1232842&view=rev
Log:
Add package-list files to rat-excludes.txt

Modified:
tomcat/trunk/res/rat/rat-excludes.txt

Modified: tomcat/trunk/res/rat/rat-excludes.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/rat/rat-excludes.txt?rev=1232842&r1=1232841&r2=1232842&view=diff
==
--- tomcat/trunk/res/rat/rat-excludes.txt (original)
+++ tomcat/trunk/res/rat/rat-excludes.txt Wed Jan 18 11:50:28 2012
@@ -22,6 +22,7 @@
   - *.html files in documentation are generated from XML sources
   - *.md5 files are generated and cannot contain license
   - *.manifest JAR manifest files cannot contain license
+  - package-list files in API documentation (javadoc) are generated
   - bug52121-part1, bug52121-part2 files in tests are test data for a hard
   to reproduce testcase and should be used as is.
 
@@ -38,10 +39,6 @@ output/dist/webapps/docs/architecture/*.
 output/dist/webapps/docs/config/*.html
 output/dist/webapps/docs/funcspecs/*.html
 output/dist/webapps/docs/tribes/*.html
-output/dist/src/test/org/apache/coyote/http11/filters/bug52121-part1
-output/dist/src/test/org/apache/coyote/http11/filters/bug52121-part2
-test/org/apache/coyote/http11/filters/bug52121-part1
-test/org/apache/coyote/http11/filters/bug52121-part2
 output/embed/*.md5
 output/extras/*.md5
 modules/jdbc-pool/resources/MANIFEST.MF
@@ -50,3 +47,11 @@ output/dist/src/res/META-INF/*.manifest
 output/jdbc-pool/resources/MANIFEST.MF
 output/manifests/*.manifest
 res/META-INF/*.manifest
+output/dist/webapps/docs/api/package-list
+output/dist/webapps/docs/elapi/package-list
+output/dist/webapps/docs/jspapi/package-list
+output/dist/webapps/docs/servletapi/package-list
+output/dist/src/test/org/apache/coyote/http11/filters/bug52121-part1
+output/dist/src/test/org/apache/coyote/http11/filters/bug52121-part2
+test/org/apache/coyote/http11/filters/bug52121-part1
+test/org/apache/coyote/http11/filters/bug52121-part2



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



svn commit: r1232843 - /tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java

2012-01-18 Thread markt
Author: markt
Date: Wed Jan 18 11:51:53 2012
New Revision: 1232843

URL: http://svn.apache.org/viewvc?rev=1232843&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52480
When converting class path entries from URLs to files/directories,
ensure that any URL encoded characters are converted. Fixes JSP
compilation with javac when Tomcat is installed at a path that includes
spaces.

Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1232843&r1=1232842&r2=1232843&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Wed Jan 18 
11:51:53 2012
@@ -28,11 +28,13 @@ import java.io.FilePermission;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.net.URLDecoder;
 import java.net.URLStreamHandlerFactory;
 import java.util.ArrayList;
 import java.util.jar.JarFile;
@@ -1027,9 +1029,9 @@ public class WebappLoader extends Lifecy
 for (int i = 0; i < repositories.length; i++) {
 String repository = repositories[i].toString();
 if (repository.startsWith("file://"))
-repository = repository.substring(7);
+repository = utf8Decode(repository.substring(7));
 else if (repository.startsWith("file:"))
-repository = repository.substring(5);
+repository = utf8Decode(repository.substring(5));
 else if (repository.startsWith("jndi:"))
 repository =
 servletContext.getRealPath(repository.substring(5));
@@ -1053,6 +1055,16 @@ public class WebappLoader extends Lifecy
 
 }
 
+private String utf8Decode(String input) {
+String result = null;
+try {
+result = URLDecoder.decode(input, "UTF-8");
+} catch (UnsupportedEncodingException uee) {
+// Impossible. All JVMs are required to support UTF-8.
+}
+return result;
+}
+
 // try to extract the classpath from a loader that is not URLClassLoader
 private String getClasspath( ClassLoader loader ) {
 try {



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



Re: svn commit: r1232843 - /tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java

2012-01-18 Thread Konstantin Kolinko
2012/1/18  :
> Author: markt
> Date: Wed Jan 18 11:51:53 2012
> New Revision: 1232843
>
> URL: http://svn.apache.org/viewvc?rev=1232843&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52480
> When converting class path entries from URLs to files/directories,
> ensure that any URL encoded characters are converted. Fixes JSP
> compilation with javac when Tomcat is installed at a path that includes
> spaces.


I wonder why this code performs substring() calls upon textual value of the URL.
Couldn't it just call URL.getPath() ?

(In the opposite way the conversion would be done via
file.toURI().toURL().toExternalForm() )

Best regards,
Konstantin Kolinko
>
> Modified:
>    tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
>
> Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1232843&r1=1232842&r2=1232843&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Wed Jan 18 
> 11:51:53 2012
> @@ -28,11 +28,13 @@ import java.io.FilePermission;
>  import java.io.IOException;
>  import java.io.InputStream;
>  import java.io.OutputStream;
> +import java.io.UnsupportedEncodingException;
>  import java.lang.reflect.Constructor;
>  import java.lang.reflect.Method;
>  import java.net.MalformedURLException;
>  import java.net.URL;
>  import java.net.URLClassLoader;
> +import java.net.URLDecoder;
>  import java.net.URLStreamHandlerFactory;
>  import java.util.ArrayList;
>  import java.util.jar.JarFile;
> @@ -1027,9 +1029,9 @@ public class WebappLoader extends Lifecy
>             for (int i = 0; i < repositories.length; i++) {
>                 String repository = repositories[i].toString();
>                 if (repository.startsWith("file://"))
> -                    repository = repository.substring(7);
> +                    repository = utf8Decode(repository.substring(7));
>                 else if (repository.startsWith("file:"))
> -                    repository = repository.substring(5);
> +                    repository = utf8Decode(repository.substring(5));
>                 else if (repository.startsWith("jndi:"))
>                     repository =
>                         servletContext.getRealPath(repository.substring(5));
> @@ -1053,6 +1055,16 @@ public class WebappLoader extends Lifecy
>
>     }
>
> +    private String utf8Decode(String input) {
> +        String result = null;
> +        try {
> +            result = URLDecoder.decode(input, "UTF-8");
> +        } catch (UnsupportedEncodingException uee) {
> +            // Impossible. All JVMs are required to support UTF-8.
> +        }
> +        return result;
> +    }
> +
>     // try to extract the classpath from a loader that is not URLClassLoader
>     private String getClasspath( ClassLoader loader ) {
>         try {
>
>
>
> -
> 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



svn commit: r1232850 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/WebappLoader.java webapps/docs/changelog.xml

2012-01-18 Thread markt
Author: markt
Date: Wed Jan 18 12:05:43 2012
New Revision: 1232850

URL: http://svn.apache.org/viewvc?rev=1232850&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52480
When converting class path entries from URLs to files/directories,
ensure that any URL encoded characters are converted. Fixes JSP
compilation with javac when Tomcat is installed at a path that includes
spaces.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 18 12:05:43 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813
+/tomcat

Re: svn commit: r1232843 - /tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java

2012-01-18 Thread Mark Thomas
On 18/01/2012 12:01, Konstantin Kolinko wrote:
> 2012/1/18  :
>> Author: markt
>> Date: Wed Jan 18 11:51:53 2012
>> New Revision: 1232843
>>
>> URL: http://svn.apache.org/viewvc?rev=1232843&view=rev
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52480
>> When converting class path entries from URLs to files/directories,
>> ensure that any URL encoded characters are converted. Fixes JSP
>> compilation with javac when Tomcat is installed at a path that includes
>> spaces.
> 
> 
> I wonder why this code performs substring() calls upon textual value of the 
> URL.
> Couldn't it just call URL.getPath() ?

Slight differences in the result I think. Mainly leading '/' characters.

> (In the opposite way the conversion would be done via
> file.toURI().toURL().toExternalForm() )

File.toURI().toURL() is how the URLs are constructed in the first place.

Mark

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



DO NOT REPLY [Bug 52480] TC7 + AntCompiler problems with whitespace in pathname

2012-01-18 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52480

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2012-01-18 12:07:48 UTC ---
Fixed in trunk and 7.0.x will be included in 7.0.26 onwards. It didn't make it
in time for 7.0.25 which is currently in progress.

-- 
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 52483] New: Print JkOptions's options in log file and jkstatus page

2012-01-18 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52483

 Bug #: 52483
   Summary: Print JkOptions's options in log file and jkstatus
page
   Product: Tomcat Connectors
   Version: 1.2.32
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: mod_jk
AssignedTo: dev@tomcat.apache.org
ReportedBy: dome...@gmail.com
Classification: Unclassified


Is useful to me to check that server at runtime properly takes JkOtions
argument.

-- 
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: r1232855 - in /tomcat/trunk/modules/jdbc-pool: ./ doc/ src/main/java/org/apache/tomcat/jdbc/pool/ src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ src/main/java/org/apache/tomcat/jdb

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 12:33:47 2012
New Revision: 1232855

URL: http://svn.apache.org/viewvc?rev=1232855&view=rev
Log:
Replace tab characters and remove trailing whitespaces in jdbc-pool, as advised 
by Checkstyle

Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
tomcat/trunk/modules/jdbc-pool/doc/package.xsl

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/PoolCleanerTest.java

Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=1232855&r1=1232854&r2=1232855&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Wed Jan 18 12:33:47 
2012
@@ -16,7 +16,7 @@
 # -
 # build.properties.sample
 #
-# This is an example "build.properties" file, used to customize building 
+# This is an example "build.properties" file, used to customize building
 # Tomcat JDBC Pool for your local environment.  It defines the location of all 
external
 # modules that Tomcat JDBC Pool depends on.  Copy this file to 
"build.properties"
 # in the top-level source directory, and customize it as needed.
@@ -60,7 +60,7 @@ testdb.validationQuery=SELECT 1
 # Derby
 #testdb.url=jdbc:derby:derbyDB;create=true
 #testdb.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
-#testdb.validationQuery=VALUES 1   
+#testdb.validationQuery=VALUES 1
 
 # - JUnit Unit Test Suite, version 3.7 or later -
 junit.home=${base.path}/junit3.8.2

Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=1232855&r1=1232854&r2=1232855&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Wed Jan 18 12:33:47 2012
@@ -283,8 +283,8 @@
 
 
 
-   
-   
+
+
 
 
   
@@ -296,8 +296,8 @@
 
 
 
-   
-   
+
+
 
 
   
@@ -427,8 +427,8 @@
 
   
   
-   
-   
+
+
   
 
   

Modified: tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/changelog.xml?rev=1232855&r1=1232854&r2=1232855&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/doc/changelog.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Wed Jan 18 12:33:47 2012
@@ -31,7 +31,7 @@
 
   
 
-  1207712 Pool cleaner should be a global thread, not 
spawn one thread per connection pool. (fhanik) 
+  1207712 Pool cleaner should be a global thread, not 
spawn one thread per connection pool. (fhanik)
   1073531 50805 Only initialize connections 
once when async (fhanik)
   1076380 50857 Correctly handle timeouts when 
the pool is busy when async (fhanik)
   Added QueryTimeoutInterceptor to be able to configure timeouts on 
running queries automatically.

Modified: tomcat/trunk/modules/jdbc-pool/doc/package.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/package.xsl?rev=1232855&r1=1232854&r2=1232855&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/doc/package.xsl (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/package.xsl Wed Jan 18 12:33:47 2012
@@ -72,10 +72,10 @@
   
   
 
-   
-   .noPrint {display: none;}
-   td#mainBody {width: 100%;}
-   
+
+.noPrint {display: none;}
+td#mainBody {width: 100%;}
+
 
 
 
   
   
-  
+
   
   
   

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1232855&r1=1232854&r2=1232855&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy

svn commit: r1232856 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 12:36:25 2012
New Revision: 1232856

URL: http://svn.apache.org/viewvc?rev=1232856&view=rev
Log:
Correct license header, as advised by Checkstyle

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml?rev=1232856&r1=1232855&r2=1232856&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
 Wed Jan 18 12:36:25 2012
@@ -6,7 +6,9 @@
   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
+
+  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.



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



svn commit: r1232863 - in /tomcat/trunk/modules/jdbc-pool/src: main/java/org/apache/tomcat/jdbc/pool/ main/java/org/apache/tomcat/jdbc/pool/interceptor/ main/java/org/apache/tomcat/jdbc/pool/jmx/ test

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 12:45:06 2012
New Revision: 1232863

URL: http://svn.apache.org/viewvc?rev=1232863&view=rev
Log:
jdbc-pool: Applied "Organize imports" command to classes where imports order 
problems were reported by Checkstyle.

It reordered imports as necessary
and removed one unneeded import (imported class is in the same package as the 
source).

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/CreateTestTable.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestAsyncQueue.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1232863&r1=1232862&r2=1232863&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
 Wed Jan 18 12:45:06 2012
@@ -21,14 +21,13 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Properties;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 /**
  * Represents a pooled connection
  * and holds a reference to the {@link java.sql.Connection} object

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1232863&r1=1232862&r2=1232863&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
 Wed Jan 18 12:45:06 2012
@@ -29,8 +29,8 @@ import javax.management.openmbean.Simple
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.jdbc.pool.ConnectionPool;
-import org.apache.tomcat.jdbc.pool.PooledConnection;
 import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorProperty;
+import org.apache.tomcat.jdbc.pool.PooledConnection;
 
 /**
  * Slow query report interceptor. Tracks timing of query executions.

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java?rev=1232863&r1=1232862&r2=1232863&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
 Wed Jan 18 12:45:06 2012
@@ -46,8 +46,8 @@ import javax.management.openmbean.OpenDa
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.jdbc.pool.ConnectionPool;
-import org.apache.tomcat.jdbc.pool.PooledConnection;
 im

svn commit: r1232867 - in /tomcat/trunk/modules/jdbc-pool/src: main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java test/java/org/a

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 12:52:08 2012
New Revision: 1232867

URL: http://svn.apache.org/viewvc?rev=1232867&view=rev
Log:
Fix order of field modifiers, as suggested by Checkstyle
s/final static/static final/

Now Checkstyle checks for jdbc-pool pass successfully.

Modified:

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

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=1232867&r1=1232866&r2=1232867&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
 Wed Jan 18 12:52:08 2012
@@ -58,50 +58,50 @@ import org.apache.juli.logging.LogFactor
 public class DataSourceFactory implements ObjectFactory {
 private static final Log log = LogFactory.getLog(DataSourceFactory.class);
 
-protected final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
-protected final static String PROP_DEFAULTREADONLY = "defaultReadOnly";
-protected final static String PROP_DEFAULTTRANSACTIONISOLATION = 
"defaultTransactionIsolation";
-protected final static String PROP_DEFAULTCATALOG = "defaultCatalog";
-
-protected final static String PROP_DRIVERCLASSNAME = "driverClassName";
-protected final static String PROP_PASSWORD = "password";
-protected final static String PROP_URL = "url";
-protected final static String PROP_USERNAME = "username";
-
-protected final static String PROP_MAXACTIVE = "maxActive";
-protected final static String PROP_MAXIDLE = "maxIdle";
-protected final static String PROP_MINIDLE = "minIdle";
-protected final static String PROP_INITIALSIZE = "initialSize";
-protected final static String PROP_MAXWAIT = "maxWait";
-protected final static String PROP_MAXAGE = "maxAge";
-
-protected final static String PROP_TESTONBORROW = "testOnBorrow";
-protected final static String PROP_TESTONRETURN = "testOnReturn";
-protected final static String PROP_TESTWHILEIDLE = "testWhileIdle";
-protected final static String PROP_TESTONCONNECT = "testOnConnect";
-protected final static String PROP_VALIDATIONQUERY = "validationQuery";
-protected final static String PROP_VALIDATOR_CLASS_NAME = 
"validatorClassName";
-
-protected final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = 
"timeBetweenEvictionRunsMillis";
-protected final static String PROP_NUMTESTSPEREVICTIONRUN = 
"numTestsPerEvictionRun";
-protected final static String PROP_MINEVICTABLEIDLETIMEMILLIS = 
"minEvictableIdleTimeMillis";
-
-protected final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = 
"accessToUnderlyingConnectionAllowed";
-
-protected final static String PROP_REMOVEABANDONED = "removeAbandoned";
-protected final static String PROP_REMOVEABANDONEDTIMEOUT = 
"removeAbandonedTimeout";
-protected final static String PROP_LOGABANDONED = "logAbandoned";
-protected final static String PROP_ABANDONWHENPERCENTAGEFULL = 
"abandonWhenPercentageFull";
-
-protected final static String PROP_POOLPREPAREDSTATEMENTS = 
"poolPreparedStatements";
-protected final static String PROP_MAXOPENPREPAREDSTATEMENTS = 
"maxOpenPreparedStatements";
-protected final static String PROP_CONNECTIONPROPERTIES = 
"connectionProperties";
-
-protected final static String PROP_INITSQL = "initSQL";
-protected final static String PROP_INTERCEPTORS = "jdbcInterceptors";
-protected final static String PROP_VALIDATIONINTERVAL = 
"validationInterval";
-protected final static String PROP_JMX_ENABLED = "jmxEnabled";
-protected final static String PROP_FAIR_QUEUE = "fairQueue";
+protected static final String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
+protected static final String PROP_DEFAULTREADONLY = "defaultReadOnly";
+protected static final String PROP_DEFAULTTRANSACTIONISOLATION = 
"defaultTransactionIsolation";
+protected static final String PROP_DEFAULTCATALOG = "defaultCatalog";
+
+protected static final String PROP_DRIVERCLASSNAME = "driverClassName";
+protected static final String PROP_PASSWORD = "password";
+protected static final String PROP_URL = "url";
+protected static final String PROP_USERNAME = "username";
+
+protected static final String PROP_MAXACTIVE = "maxActive";
+protected static final String PROP_MAXIDLE = "maxIdle";
+protected static final String PROP_MINIDLE = "minIdle";
+pro

svn commit: r1232869 - /tomcat/trunk/build.xml

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 12:56:33 2012
New Revision: 1232869

URL: http://svn.apache.org/viewvc?rev=1232869&view=rev
Log:
Enable checkstyle checks for jdbc-pool

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1232869&r1=1232868&r2=1232869&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Jan 18 12:56:33 2012
@@ -467,6 +467,9 @@
 
 
   
+  
+
+  
 
 
 



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



Re: [VOTE] Release Apache Tomcat 7.0.25

2012-01-18 Thread Olivier Lamy
2012/1/17 Mark Thomas :
> The proposed Apache Tomcat 7.0.25 release is now available for voting.
>
> It can be obtained from:
> http://people.apache.org/~markt/dev/tomcat-7/v7.0.25/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-082/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_25/
>
> The proposed 7.0.25 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 7.0.25 Stable
>
> I dropped both alpha and beta as if it is not stable, I'll re-roll the
> release.
>
> Cheers,
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

Tested maven artifacts with the maven plugin.
Added a sample on how to write unit test with embeded using the new
port 0 auto allocation (very useful !)
I have added this in maven archetype too.

Thanks !
-- 
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

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



svn commit: r1232874 - in /tomcat/tc7.0.x/trunk: ./ build.xml modules/ webapps/docs/changelog.xml

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 13:32:35 2012
New Revision: 1232874

URL: http://svn.apache.org/viewvc?rev=1232874&view=rev
Log:
Merged revision 1232869 from tomcat/trunk:
Fix code style issues in jdbc-pool (here: update externals to pick up the fix)
Enable checkstyle checks for jdbc-pool in Tomcat's build.xml

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/modules/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 18 13:32:35 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232843
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,115

svn commit: r1232879 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 13:43:44 2012
New Revision: 1232879

URL: http://svn.apache.org/viewvc?rev=1232879&view=rev
Log:
Rearrange earlier jdbc-pool fixes into its distinct sections in the Changelog 
file.

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

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1232879&r1=1232878&r2=1232879&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 18 13:43:44 2012
@@ -324,7 +324,7 @@
   
 
   
-1207712 Pool cleaner should be a global thread, not spawn
+1207712: Pool cleaner should be a global thread, not spawn
 one thread per connection pool. (fhanik)
   
 
@@ -696,6 +696,29 @@
   
 
   
+  
+
+  
+52015: In jdbc-pool: JdbcInterceptor passes not 'this' but 
+'proxy' to getNext().invoke. (kfujino)
+  
+  
+In jdbc-pool: Improve handling of Errors that originate from methods
+invoked through reflection. In TrapException interceptor:
+rethrow Error as is, without wrapping it in a RuntimeException.
+(kkolinko)
+  
+  
+In jdbc-pool: Unwrap InvocationTargetException if it is caught in
+ResultSetProxy, like we do it elsewhere. (kkolinko)
+  
+  
+When building jdbc-pool from within Tomcat, use Tomcat's
+output directory location. This allows to move all build
+output away from the source tree. (kkolinko)
+  
+
+  
   
 
   
@@ -706,10 +729,6 @@
 Remove some unused code from the packaged renamed Commons BCEL. (markt)
   
   
-52015: In jdbc-pool: JdbcInterceptor passes not 'this' but 
-'proxy' to getNext().invoke. (kfujino)
-  
-  
 52059: In Windows uninstaller: Do not forget to remove
 Tomcat keys from 32-bit registry on deinstallation. (kkolinko)
   
@@ -745,21 +764,6 @@
 JAR is now required by the Ant tasks. Patch provided by Volker Krebs.
 (markt)
   
-  
-In jdbc-pool: Improve handling of Errors that originate from methods
-invoked through reflection. In TrapException interceptor:
-rethrow Error as is, without wrapping it in a RuntimeException.
-(kkolinko)
-  
-  
-In jdbc-pool: Unwrap InvocationTargetException if it is caught in
-ResultSetProxy, like we do it elsewhere. (kkolinko)
-  
-  
-When building jdbc-pool from within Tomcat, use Tomcat's
-output directory location. This allows to move all build
-output away from the source tree. (kkolinko)
-  
 
   
 
@@ -945,7 +949,7 @@
   
 
   
-  
+  
 
   
 In jdbc-pool: Avoid IllegalArgumentException when setting maxActive 
@@ -953,7 +957,7 @@
 ArrayBlockingQueue doesn't allow capacity of 0 or less. (kfujino)
   
   
-48392 (1169796): In jdbc-pool: Fix typo in
+48392 (1169796): Fix typo in
 StatementDecoratorInterceptor. (fhanik) 
   
   
@@ -968,9 +972,13 @@
 It removes from the active connection list. (kfujino)
   
   
-51871: In jdbc-pool: Fix dependency in Maven POM file of
+51871: Fix dependency in Maven POM file of
 tomcat-jbdc. (kkolinko)
   
+
+  
+  
+
   
 Update the "test" target in the default build file to report a test
 failure only after all available connector variants (bio, nio, apr)
@@ -1097,12 +1105,16 @@
   
 
   
-  
+  
 
   
 51583 (1157874, 1162102): Fix
 shutdown delay in jdbc-pool. (fhanik/kkolinko)
   
+
+  
+  
+
   
 51558: Don't force the use of StandardManager when 
using
 any of the Tomcat#addWebapp() methods. (markt)
@@ -1482,6 +1494,13 @@
   
 
   
+  
+
+  
+Include jdbc-pool into Tomcat release. (fhanik)
+  
+
+  
   
 
   
@@ -1490,9 +1509,6 @@
   
 Update to Eclipse JDT Compiler 3.7. (markt)
   
-  
-Include jdbc-pool into tomcat release. (fhanik)
-  
 
   
 



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



svn commit: r1232882 - in /tomcat/tc7.0.x/trunk: ./ res/rat/rat-excludes.txt

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 13:53:09 2012
New Revision: 1232882

URL: http://svn.apache.org/viewvc?rev=1232882&view=rev
Log:
Merged revision 1232842 from tomcat/trunk:
Add package-list files to rat-excludes.txt

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 18 13:53:09 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232843,1232869
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,11603

svn commit: r1232984 [3/3] - in /tomcat/site/trunk: docs/migration-6.html docs/migration-7.html docs/migration.html xdocs/migration-6.xml xdocs/migration-7.xml xdocs/migration.xml

2012-01-18 Thread kkolinko
Modified: tomcat/site/trunk/xdocs/migration.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=1232984&r1=1232983&r2=1232984&view=diff
==
--- tomcat/site/trunk/xdocs/migration.xml (original)
+++ tomcat/site/trunk/xdocs/migration.xml Wed Jan 18 18:28:41 2012
@@ -34,667 +34,27 @@ accordingly.
 
 
 
-   This section lists all the known changes between 5.5.x and 6.0.x which 
may
-  cause backwards compatibility problems when upgrading.
-  
-  
-
-Apache Tomcat 6.0.x requires Java 5 or later, unlike Apache Tomcat 
5.5.x which
-could use a compatibility package to run on JRE 1.4.
-
-  
-
-  
-
-
-
-Apache Tomcat 5.5.x used, by default, a directory structure including
-common, shared and server 
subdirectories.
-Apache Tomcat 6.0.x uses a single lib directory.
-
-The lib directory is the direct replacement for both
-common/lib and common/classes subdirectories:
-it accepts both JARs and exploded class hierarchies.
-
-The conf/catalina.properties file can be used to modify
-the directory structure.
-
-Starting with version 6.0.21, Apache Tomcat supports both the
-$CATALINA_BASE/lib and $CATALINA_HOME/lib
-directories. The jars and classes in $CATALINA_BASE/lib
-are earlier on the class path and thus take precedence.
-
-
-
-
-
-The $CATALINA_HOME/common/endorsed subdirectory is replaced
-by the $CATALINA_HOME/endorsed directory. This directory is
-absent by default.
-
-The JAVA_ENDORSED_DIRS environment variable can be used
-with setenv.bat|sh scripts to provide alternative
-location of this directory.
-
-
-
-
-The Manager and Host Manager web applications are no longer in
-server/webapps. All of the default web applications
-are now located in the webapps directory.
-
-Note, that if deployOnStartup or autoDeploy
-options on the Host are enabled, the
-META-INF/context.xml files of manager and host-manager
-applications will be copied into the
-$CATALINA_BASE/conf/[engine_name]/[host_name]
-directory when Tomcat starts for the first time.
-
-When using a shared webhosting environment, it is recommended to forbid
-the use of context.xml inside the web applications (using the
-deployXML attribute of the Host element).
-(This option is also available in Tomcat 5.5).
-
-
-
-  
-
-  
-
-As a result of the modification of the directory structure, the
-common, shared and server classloaders have been merged into one.
-Effectively, the shared and server classloaders are not configured by
-default and the common classloader is mapped to the lib
-directory, as described above.
-This behavior and structure can be modified using the 
-conf/catalina.properties file.
-
-  
-
-  
-
-Apache Tomcat 5.5.x relied on the
-http://commons.apache.org/logging/";>Apache Commons Logging
-library for its internal logging. Apache Tomcat 6.0.x and later no more
-uses the library directly, but uses a private copy of it. The classes are
-in the org.apache.juli.logging package.
-
-
-The rationale behind this change is that so that application logging
-can be as independent as possible from the container, while still having
-the possibility of being unified.
-
-By default only a subset of Apache Commons Logging classes that are
-needed to perform logging to java.util.logging is included
-with Tomcat. If you want to configure Tomcat to redirect its logging into
-http://logging.apache.org/log4j/";>Log4J, or any other logging
-framework supported by the full Apache Commons Logging library, you will
-have to replace one of Tomcat JARs with the full implementation. The JAR
-is available as an extras component. See the logging and extras
-documentation for more details.
-
-  
-
-  
-
-As Apache Tomcat no longer directly uses the
-http://commons.apache.org/logging/";>Apache Commons Logging
-library, the commons-logging-api.jar library is no longer
-provided for the web applications. The web applications that use
-Apache Commons Logging have to provide their own copy of that library.
-It is recommended to put it into their WEB-INF/lib directory,
-like any other JAR.
-
-  
-
-  
-
-For all SSL enabled connectors, the SSLEnabled flag must 
be set
-to true to enable encryption. Tomcat no longer relies on using
-the protocol and other parameters to determine if the transport should be
-encrypted, to give maximum flexibility in proxied scenarios.
-
-  
-
-  
-
-The Connector thread pools have been simplified. They
-now grow to the maximum size specified but never shrink. The attributes
-associated with shrinking the thread pool (e.g. 
minSpareThreads)
-will be ignored. If you require a thread pool that grows and shrinks with
-demand you'll need to

svn commit: r1232984 [1/3] - in /tomcat/site/trunk: docs/migration-6.html docs/migration-7.html docs/migration.html xdocs/migration-6.xml xdocs/migration-7.xml xdocs/migration.xml

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 18:28:41 2012
New Revision: 1232984

URL: http://svn.apache.org/viewvc?rev=1232984&view=rev
Log:
Split Migration Guide into separate pages for Tomcat 6.0.x and Tomcat 7.0.x

Added:
tomcat/site/trunk/docs/migration-6.html   (with props)
tomcat/site/trunk/docs/migration-7.html   (with props)
tomcat/site/trunk/xdocs/migration-6.xml   (with props)
tomcat/site/trunk/xdocs/migration-7.xml   (with props)
Modified:
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/xdocs/migration.xml

Added: tomcat/site/trunk/docs/migration-6.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-6.html?rev=1232984&view=auto
==
--- tomcat/site/trunk/docs/migration-6.html (added)
+++ tomcat/site/trunk/docs/migration-6.html Wed Jan 18 18:28:41 2012
@@ -0,0 +1,855 @@
+
+
+
+Apache Tomcat - Migration Guide - Tomcat 6.0.x
+
+
+
+
+
+
+
+
+
+http://tomcat.apache.org/";>
+Apache Tomcat
+
+http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" 
border="0">
+
+
+
+http://www.google.com/search"; method="get">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Apache Tomcat
+
+
+
+Home
+
+
+Taglibs
+
+
+Maven Plugin
+
+
+
+Download
+
+
+
+Which version?
+
+
+Tomcat 7.0
+
+
+Tomcat 6.0
+
+
+Tomcat 5.5
+
+
+Tomcat Connectors
+
+
+Tomcat Native
+
+
+http://archive.apache.org/dist/tomcat/";>Archives
+
+
+
+Documentation
+
+
+
+Tomcat 7.0
+
+
+Tomcat 6.0
+
+
+Tomcat 5.5
+
+
+Tomcat Connectors
+
+
+Tomcat Native
+
+
+http://wiki.apache.org/tomcat/FrontPage";>Wiki
+
+
+Migration Guide
+
+
+
+Problems?
+
+
+
+Security Reports
+
+
+Find help
+
+
+http://wiki.apache.org/tomcat/FAQ";>FAQ
+
+
+Mailing Lists
+
+
+Bug Database
+
+
+IRC
+
+
+
+Get Involved
+
+
+
+Overview
+
+
+SVN Repositories
+
+
+Buildbot
+
+
+https://reviews.apache.org/groups/tomcat/";>Reviewboard
+
+
+
+Media
+
+
+
+http://blogs.apache.org/tomcat/";>Blog
+
+
+http://twitter.com/theapachetomcat";>Twitter
+
+
+
+Misc
+
+
+
+Who We Are
+
+
+Heritage
+
+
+http://www.apache.org";>Apache Home
+
+
+Resources
+
+
+Contact
+
+
+Legal
+
+
+http://www.apache.org/foundation/sponsorship.html";>Sponsorship
+
+
+http://www.apache.org/foundation/thanks.html";>Thanks
+
+
+
+
+
+
+
+Table of 
Contents
+
+
+
+
+
+
+
+
+General
+
+
+Migrating from 5.5.x to 6.0.x
+
+
+Java 5 required
+
+
+Modified directory structure
+
+
+Shared libraries
+
+
+Endorsed libraries
+
+
+Default web applications
+
+
+
+
+Modified classloading
+
+
+Internal Logging API package 
renaming
+
+
+commons-logging.jar
+
+
+SSLEnabled attribute on 
Connector
+
+
+Connector thread pools
+
+
+Clustering configuration 
changes
+
+
+
+
+Upgrading 6.0.x
+
+
+Tomcat 6.0.x 
configuration file differences
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+General
+
+
+
+
+
+
+
+Please read general Migration Guide page first,
+for common considerations that apply to migration or upgrade between versions
+of Apache Tomcat.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Migrating from 
5.5.x to 6.0.x
+
+
+
+
+
+
+  
+ This section lists all the known changes between 5.5.x and 6.0.x which may
+  cause backwards compatibility problems when upgrading.
+  
+  
+
+
+
+Java 5 
required
+
+
+
+
+
+
+Apache Tomcat 6.0.x requires Java 5 or later, unlike Apache Tomcat 5.5.x 
which
+could use a compatibility package to run on JRE 1.4.
+
+  
+
+
+
+
+
+
+
+
+
+
+  
+
+
+
+Modified directory 
structure
+
+
+
+
+
+
+
+
+
+Shared 
libraries
+
+
+
+
+
+
+Apache Tomcat 5.5.x used, by default, a directory structure including
+common, shared and server 
subdirectories.
+Apache Tomcat 6.0.x uses a single lib directory.
+
+
+The lib directory is the direct replacement for both
+common/lib and common/classes subdirectories:
+it accepts both JARs and exploded class hierarchies.
+
+
+The conf/catalina.properties file can be used to modify
+the directory structure.
+
+
+Starting with version 6.0.21, Apache Tomcat supports both the
+$CATALINA_BASE/lib and $CATALINA_HOME/lib
+directories. The jars and classes in $CATALINA_BASE/lib
+are earlier on the class path and thus take precedence.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Endorsed 
libraries
+
+
+
+
+
+
+The $CATALINA_HOME/common/endorsed subdirectory is replaced
+by the $CATALINA_HOME/endorsed directory. This directory is
+absent by default.
+
+
+The JAVA_ENDORSED_DIRS environment variable can be used
+with setenv.bat|sh scripts to provide alternative
+location of this directory.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Default web 
applications
+
+
+
+
+
+
+The Manager and Host Manager web applications are no longer in
+server/webapps. All of the default web applications
+are now located in the webapps directory.
+
+
+Note, that if deployOnStartup or autoDeploy
+options on the Host are enabled, the
+META-INF/context.xml files of manager and host-manager
+applic

svn commit: r1232991 - in /tomcat/site/trunk: docs/stylesheets/tomcat.css xdocs/stylesheets/tomcat.css

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 18:37:15 2012
New Revision: 1232991

URL: http://svn.apache.org/viewvc?rev=1232991&view=rev
Log:
Hilite code tags using light cyan background, like we do for Tomcat 7 
documentation.

Modified:
tomcat/site/trunk/docs/stylesheets/tomcat.css
tomcat/site/trunk/xdocs/stylesheets/tomcat.css

Modified: tomcat/site/trunk/docs/stylesheets/tomcat.css
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/stylesheets/tomcat.css?rev=1232991&r1=1232990&r2=1232991&view=diff
==
--- tomcat/site/trunk/docs/stylesheets/tomcat.css (original)
+++ tomcat/site/trunk/docs/stylesheets/tomcat.css Wed Jan 18 18:37:15 2012
@@ -29,3 +29,5 @@
 padding: 5px 10px;
 margin: 0;
 }
+
+code {background-color:rgb(224,255,255);padding:0 0.1em;}

Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat.css
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat.css?rev=1232991&r1=1232990&r2=1232991&view=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/tomcat.css (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat.css Wed Jan 18 18:37:15 2012
@@ -29,3 +29,5 @@
 padding: 5px 10px;
 margin: 0;
 }
+
+code {background-color:rgb(224,255,255);padding:0 0.1em;}



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



Re: [VOTE] Release Apache Tomcat 7.0.25

2012-01-18 Thread Christopher Schultz


On 1/17/12 5:16 AM, Mark Thomas wrote:
> The proposed Apache Tomcat 7.0.25 release is now available for voting.
> 
> It can be obtained from:
> http://people.apache.org/~markt/dev/tomcat-7/v7.0.25/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-082/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_25/
> 
> The proposed 7.0.25 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 7.0.25 Stable

GPG signatures are okay
MD5 sums are okay
ZIP and tarball contents (bin and src) are the same
tcnative builds (against APR 1.4.2)
Unit tests pass (bio, nio, apr) on JRE 1.6.0_26/64-bit/MacOS)
Smoke tests work with my webapps

-chris



signature.asc
Description: OpenPGP digital signature


svn commit: r1233034 - in /tomcat/site/trunk: docs/migration-7.html xdocs/migration-7.xml

2012-01-18 Thread kkolinko
Author: kkolinko
Date: Wed Jan 18 20:09:15 2012
New Revision: 1233034

URL: http://svn.apache.org/viewvc?rev=1233034&view=rev
Log:
Amend the page.
Correct some descriptions.
Document Part class conflict with wildcard imports that someone observed on 
users@.
Correct description of CSRF protection (it is important what roles the user 
has, not what parts of application she accesses).

Modified:
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/xdocs/migration-7.xml

Modified: tomcat/site/trunk/docs/migration-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1233034&r1=1233033&r2=1233034&view=diff
==
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Wed Jan 18 20:09:15 2012
@@ -201,7 +201,10 @@
 Java 6 required
 
 
-General configuration
+Servlet 3.0 API
+
+
+Regular expressions
 
 
 Deployment
@@ -308,8 +311,68 @@ of Apache Tomcat.
 
 
 
-Apache Tomcat 7.0.x requires Java 6. Apache Tomcat 6.0.x required Java
-5.
+Apache Tomcat 7.0.x requires Java 6 or later. Apache Tomcat 6.0.x
+required Java 5.
+
+  
+
+
+
+
+
+
+
+
+
+
+  
+
+
+
+Servlet 3.0 
API
+
+
+
+
+
+
+Apache Tomcat 7 supports Java Servlet 3.0, JavaServer Pages 2.2 and
+Expression Language 2.2
+http://wiki.apache.org/tomcat/Specifications";>specifications.
+The changes between versions of specifications may be found in the
+Changes appendix in each of specification documents.
+
+
+
+In JSP pages that use wildcard import syntax the new classes added in
+Servlet API may conflict with ones in web applications.
+For example, if package "a" contains class Part,
+the following JSP page will cease to compile in Tomcat 7:
+
+
+
+
+
+
+
+
+
+
+<%@page import="a.*"%>
+<% Part page = new Part(); %>
+
+
+
+
+
+
+
+
+
+That happens because implicit import of javax.servlet.http.*
+and explicit import of a.* will provide conflicting
+definitions of class Part that was added in Servlet 3.0.
+The solution is to use explicit import, import="a.Part".
 
   
 
@@ -325,8 +388,8 @@ of Apache Tomcat.
   
 
 
-
-General 
configuration
+
+Regular 
expressions
 
 
 
@@ -368,6 +431,11 @@ of Apache Tomcat.
 
 
 
+
+Note that separate regular expressions can be concatenated using the
+ "|" operator (or). Using "|" works both in this
+ and in earlier Tomcat versions.
+
   
 
 
@@ -439,26 +507,27 @@ of Apache Tomcat.
 
 
 The roles required to use the Manager application were changed from the
-single manager role to the following four roles. You will need to
+single manager role to the following four roles. You will 
need to
 assign the role(s) required for the functionality you wish to access.
 
 
 
   
 
-manager-gui - allows access to the HTML GUI and the status
-  pages
+manager-gui - allows access to the HTML GUI
+  and the status pages
   
 
-manager-script - allows access to the text interface and the
-  status pages
+manager-script - allows access to the text interface
+  and the status pages
   
 
-manager-jmx - allows access to the JMX proxy and the status
-  pages
+manager-jmx - allows access to the JMX proxy
+  and the status pages
   
 
-manager-status - allows access to the status pages only
+manager-status - allows access to
+  the status pages only
 
 
 
@@ -472,9 +541,11 @@ of Apache Tomcat.
 users with the manager-gui role should not be granted
   either the manager-script or manager-jmx 
roles.
   
-if the text or jmx interfaces are accessed through a browser (e.g. for
-  testing since these interfaces are intended for tools not humans) 
then
-  the browser must be closed afterwards to terminate the session.
+if the Manager application is accessed through a browser by a user
+  who has manager-script or manager-jmx roles
+  (e.g. for testing the text or jmx interfaces since these interfaces
+  are intended for tools not humans) then all browser windows
+  must be closed afterwards to terminate the session.
 
 
 
@@ -524,19 +595,19 @@ of Apache Tomcat.
 
 
 The roles required to use the Host Manager application were changed from
-the single admin role to the following two roles. You will need to
+the single admin role to the following two roles. You will 
need to
 assign the role(s) required for the functionality you wish to access.
 
 
 
   
 
-admin-gui - allows access to the HTML GUI and the status
-  pages
+admin-gui - allows access to the HTML GUI
+  and the status pages
   
 
-admin-script - allows access to the text interface and the
-  status pages
+admin-script - allows access to the text interface
+  and the status pages
 
 
 
@@ -550,8 +621,10 @@ of Apache Tomcat.

Detecting failures of unit tests

2012-01-18 Thread Christopher Schultz
All,

I was testing 7.0.25 and "ant test" reports BUILD SUCCESSFUL but I
started looking at the TEST-*.txt files that are emitted and I was
wondering about a few things.

First, I should probably be look at the bottom of the file for the junit
summary that looks like this:

Testsuite: org.apache.tomcat.util.threads.TestLimitLatch
Tests run: 5, Failures: 0, Errors: 0, Time elapsed: 2.545 sec

Observing the "Failures: 0, Errors: 0" indicates that the tests have all
passed correctly, right?

I'm asking because I can also see things like this:

TEST-org.apache.catalina.connector.TestMaxConnections.APR.txt:INFO:
There were [4] passed requests and [2] connection failures

Obviously, that's an INFO line, but it does indicate a "failure" of some
kind.

There are also some log lines like this:

TEST-org.apache.catalina.startup.TestListener.NIO.txt:SEVERE: Context
[/] startup failed due to previous errors

Does that merely indicate that the test itself caused a failure, and
that the failure-to-startup was intentional?

Similarly:

TEST-org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.APR.txt:org.apache.catalina.tribes.ChannelException:
Send failed, and sender is disconnected. Not retrying.; Faulty
members:tcp://{127, 0, 0, 1}:4005;

Again, all test files say "Failures: 0, Errors: 0" so I guess everything
is okay. It's just tough to see those log lines without asking.

Thanks,
-chris



signature.asc
Description: OpenPGP digital signature


DO NOT REPLY [Bug 51181] Add support for Web Sockets

2012-01-18 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #26 from Mark Thomas  2012-01-18 22:35:07 UTC ---
I dug out my old ideas and have been updating them. You can see how far I have
got in [1]. Note that this is all very early days and pretty much everything is
subject to change and a lot of the detail is missing. That said, I think the
broad strokes are heading in the right direction.

Key points are:
- Limited connector (BIO/NIO/APR) specific code (thanks to the previous
re-factoring)
- Write apps by extending WebSocketServlet
- Also interface to implement / base class to extend for reading / writing
- Provide stream-based and message-based APIs (stream will be implemented first
and then message-based with configurable buffers on top off the streaming API)
- message-based API likely to be similar to Jetty's - will align to common API
if at all possible
- reading/writing will use blocking IO per message (much, much simpler to
implement and only the NIO connector could do non-blocking - could possibly add
non-blocking IO later if there is sufficient demand)

As soon as I have something that roughly works end to end (i.e. I can get the
WebSocket equivalent of HelloWorld working) I'll commit this to trunk with the
aim of back-porting it to 7.0.x once the integration points are stable. It
looks as if the integration points are going to be few and well defined so they
should be stable pretty quickly which bodes well for getting this into 7.0.x.

The message-based API isn't dissimilar to the Comet-style API proposed above
but rather than a single call-back with different event types, there will be
one call-back per event type (close, text message, binary message). Control
messages will be handled at a lower level.

One caveat and I can't stress this enough. The devil will be in the detail and
experience with the Servlet 3.0 async work has shown that what appears to be a
complete, working implementation may need a major re-write to make it stable.
It isn't beyond the realm of possibility that there is a huge logical flaw in
the approach I have taken so far that necessitates ripping most of this up and
starting again.

Finally, there has been an awful lot of interest in this enhancement request
but not much in the way of contributions. Hopefully as the code starts to get
committed, contributions will be easier. Discussions on the patch are best held
on the dev mailing list. I only wrote this progress report in BZ in case folks
who are cc'd on the bug aren't on the dev list.

[1] http://people.apache.org/~markt/patches/draft/2012-01-18-websocket.patch

-- 
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: Detecting failures of unit tests

2012-01-18 Thread Brian Burch

On 19/01/12 07:12, Christopher Schultz wrote:

All,

I was testing 7.0.25 and "ant test" reports BUILD SUCCESSFUL but I
started looking at the TEST-*.txt files that are emitted and I was
wondering about a few things.

First, I should probably be look at the bottom of the file for the junit
summary that looks like this:

Testsuite: org.apache.tomcat.util.threads.TestLimitLatch
Tests run: 5, Failures: 0, Errors: 0, Time elapsed: 2.545 sec

Observing the "Failures: 0, Errors: 0" indicates that the tests have all
passed correctly, right?

I'm asking because I can also see things like this:

TEST-org.apache.catalina.connector.TestMaxConnections.APR.txt:INFO:
There were [4] passed requests and [2] connection failures

Obviously, that's an INFO line, but it does indicate a "failure" of some
kind.

There are also some log lines like this:

TEST-org.apache.catalina.startup.TestListener.NIO.txt:SEVERE: Context
[/] startup failed due to previous errors

Does that merely indicate that the test itself caused a failure, and
that the failure-to-startup was intentional?

Similarly:

TEST-org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.APR.txt:org.apache.catalina.tribes.ChannelException:
Send failed, and sender is disconnected. Not retrying.; Faulty
members:tcp://{127, 0, 0, 1}:4005;

Again, all test files say "Failures: 0, Errors: 0" so I guess everything
is okay. It's just tough to see those log lines without asking.

Thanks,
-chris


1. I noticed this kind of message when I was looking for problems in my 
own new tomcat tests. Because they didn't originate from my own tests, I 
didn't follow it up. Sorry...


2. I've seen similar situations in other projects, but I don't know if 
my explanation is relevant to the tomcat tests... in all previous cases, 
my tests have been complex enough to require starting another thread so 
I could have both a client and server active during each individual test 
method of the class.


3. The tomcat tests (at least the ones I have worked on) subclass 
TomcatBaseTest, which starts Tomcat in a new thread, which puts them 
into the category I am talking about.


4. As far as I remember, it is possible for these sub-threads to "fail", 
or even interfere with each-other (clashes for port numbers or other 
shared resources), or even interfere with other completely different 
test classes doing the same kind of thing, while the main thread happily 
passes all its junit assertions and reports "success".


5. Forgive me if this is too vague, or too simplistic to be helpful. 
Your comment reminded me of myself (about 10 years ago) when everyone 
else was happily reading successful junit summaries and I started 
looking at the log files generated by the tests. I found the messages 
(like yours) difficult to understand, and even more difficult to 
diagnose - set a debugger break point in the sub-thread and you will 
screw up the timing of the tests, thus never even arriving at the 
troublesome code. I often had to catch the exception when it was thrown, 
then analyse the call stack - just like the old days of reading core dumps!


6. If you are still reading this, then I'll cheer you up by saying about 
5 in 6 of these "problems" came down to artefacts of the test design, 
rather than bugs in the logic actually under test. Unfortunately, I had 
to debug and fix all of them before I could stop worrying!


I hope this war story has been helpful.

Brian



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



[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

2012-01-18 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 8.x, a web server implementing Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 28 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-19012012.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-19012012.jar:/srv/gump/public/workspace/junit/dist/junit-19012012.jar:/srv/gump
 
/public/workspace/junit/dist/junit-dep-19012012.jar:/srv/gump/public/workspace/google-guava/build/dist/guava-19012012/guava-19012012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-19012012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-19012012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-19012012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-19012012-dep.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar
-
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/modules/jdbc-pool/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java:186:19:
 'static' modifier out of order with the JLS suggestions.
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/modules/jdbc-pool/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java:187:19:
 'static' modifier out of order with the JLS suggestions.
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/modules/jdbc-pool/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java:188:19:
 'static' modifier out of order with the JLS suggestions.
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/modules/jdbc-pool/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java:189:19:
 'static' modifier out of order with the JLS suggestions.
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/modules/jdbc-pool/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java:190:19:
 'static' modifier out of order with the JLS suggestions.
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/modules/jdbc-pool/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java:191:19:
 'static' modifier out of order with the JLS suggestions.
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/modules/jdbc-pool/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java:192:19:
 'static' modifier out of order with the JLS suggestions.
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/modules/jdbc-pool/jdbc-pool/src/test/java/org/apach

Re: Detecting failures of unit tests

2012-01-18 Thread Konstantin Kolinko
2012/1/19 Christopher Schultz :
> All,
>
> I was testing 7.0.25 and "ant test" reports BUILD SUCCESSFUL but I
> started looking at the TEST-*.txt files that are emitted and I was
> wondering about a few things.
>
> First, I should probably be look at the bottom of the file for the junit
> summary that looks like this:
>
> Testsuite: org.apache.tomcat.util.threads.TestLimitLatch
> Tests run: 5, Failures: 0, Errors: 0, Time elapsed: 2.545 sec
>
> Observing the "Failures: 0, Errors: 0" indicates that the tests have all
> passed correctly, right?
>
> I'm asking because I can also see things like this:
>
> TEST-org.apache.catalina.connector.TestMaxConnections.APR.txt:INFO:
> There were [4] passed requests and [2] connection failures

1. I was also puzzled.

I tried to comment some similar cases, but the work is far from being
complete. Especially I am puzzled by SEVERE messages.

This is one case where I wrote a comment. If you look closely [1]:

INFO: This test tries to create 10 connections to connector that has
maxConnections='4'. Expect half of them to fail.

[1] 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_file/TEST-org.apache.catalina.connector.TestMaxConnections.BIO.txt.html

Well, I see maybe I shall move that log statement. This test limits
the count of simultaneous connections. Some of connections are
rejected right away, but some will be caught in a OS' accept queue and
time out.
Both results are OK. That is in the sense of handling the limit, but
user's experience will be different.


In general to suppress certain SEVERE messages triggered by tests and
printed by ErrorReportValve I think a custom ErrorReportValve might be
needed.

>
> Obviously, that's an INFO line, but it does indicate a "failure" of some
> kind.
>
> There are also some log lines like this:
>
> TEST-org.apache.catalina.startup.TestListener.NIO.txt:SEVERE: Context
> [/] startup failed due to previous errors
>
> Does that merely indicate that the test itself caused a failure, and
> that the failure-to-startup was intentional?

2. That is likely a standard message, intentionally triggered by the test.

> Similarly:
>
> TEST-org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.APR.txt:org.apache.catalina.tribes.ChannelException:
> Send failed, and sender is disconnected. Not retrying.; Faulty
> members:tcp://{127, 0, 0, 1}:4005;
>
> Again, all test files say "Failures: 0, Errors: 0" so I guess everything
> is okay. It's just tough to see those log lines without asking.
>

3. That is standard message. It is expected and triggered by the test.
But personally I lack complete understanding of tribes tests. Some of
them fail occasionally (triggering Gump or Buildbot e-mails) and I do
not know what to do.

4. I have seen several cases where Tomcat shutdown was failing
(generating messages), but JUnit tests were not failing. Maybe that is
because of different threads.

I do not know how improve that.

I personally always review results and stdout for
"NullPointerException". NPEs are unexpected.

Best regards,
Konstantin Kolinko

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



DO NOT REPLY [Bug 38216] Extend Jmxproxy to allow call of MBean Operations

2012-01-18 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=38216

--- Comment #7 from Konstantin Kolinko  2012-01-19 
07:19:33 UTC ---
Created attachment 28173
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28173
2012-01-19_tc8_JMXProxyServlet.patch

Yours covers most common use case of method returning void/null.
I think null values inside arrays should be handled as well.
I am attaching patch that I am thinking about that covers null values in
getAttribute() operation as well.

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