svn commit: r1416808 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Tue Dec 4 08:08:16 2012 New Revision: 1416808 URL: http://svn.apache.org/viewvc?rev=1416808&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1416808&r1=1416807&r2=1416808&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 4 08:08:16 2012 @@ -105,14 +105,14 @@ PATCHES PROPOSED TO BACKPORT: do the change before displaying the login form. http://svn.apache.org/viewvc?view=revision&revision=1408044 (r1408043 in trunk) - +1: kkolinko + +1: kkolinko, kfujino -1: * Introduce property "tomcat.output" that is used to specify location of the build output directory. This simplifies build configuration when the output directory is located outside of the source tree. http://svn.apache.org/viewvc?view=revision&revision=1408376 - +1: kkolinko + +1: kkolinko, kfujino -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54087 @@ -120,13 +120,13 @@ PATCHES PROPOSED TO BACKPORT: header rather than throwing an exception. http://svn.apache.org/viewvc?view=revision&revision=1408254 (r1408248 in trunk, by markt) - +1: kkolinko + +1: kkolinko, kfujino -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54220 ErrorReportValve invoked on non-error responses http://svn.apache.org/viewvc?rev=1416537&view=rev (ErrorReportValve.java only) - +1: markt + +1: markt, kfujino -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54242] New: NPE in tagPlugins:ForEach
https://issues.apache.org/bugzilla/show_bug.cgi?id=54242 Bug ID: 54242 Summary: NPE in tagPlugins:ForEach Product: Tomcat 7 Version: trunk Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Jasper Assignee: dev@tomcat.apache.org Reporter: xs...@ebay.com Classification: Unclassified Created attachment 29689 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29689&action=edit Patch for ForEach There is not NULL pointer handling for iterator in ForEach. If the iterator is NULL, there is a NPE. -- 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
[Bug 54242] NPE in tagPlugins:ForEach
https://issues.apache.org/bugzilla/show_bug.cgi?id=54242 Sheldon Shao changed: What|Removed |Added Attachment #29689|0 |1 is patch|| -- 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
[Bug 54241] NPE in BodyContentImpl
https://issues.apache.org/bugzilla/show_bug.cgi?id=54241 Sheldon Shao changed: What|Removed |Added Attachment #29688|0 |1 is patch|| -- 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
[Bug 54240] Configurable system level tagPlugins.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=54240 Sheldon Shao changed: What|Removed |Added Attachment #29687|0 |1 is patch|| -- 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
[Bug 54241] NPE in BodyContentImpl
https://issues.apache.org/bugzilla/show_bug.cgi?id=54241 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- I have a number of concerns with this proposed change: 1. Writers generally do throw NPEs when called with null. 2. I'm not convinced 35410 should have been fixed since toString() should never return null (else all sorts of standard code patterns break). 3. The patch should ideally include a test case. 4. The proposed patch only addresses one possible NPE of many. -- 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
[Bug 54242] NPE in tagPlugins:ForEach
https://issues.apache.org/bugzilla/show_bug.cgi?id=54242 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- The JSTL spec does indeed require that null is treated like an empty collection. The patch does not include a test case. -- 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
[Bug 54239] Extensible EL Interpreter
https://issues.apache.org/bugzilla/show_bug.cgi?id=54239 --- Comment #3 from Mark Thomas --- Comment on attachment 29685 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29685 ELInterpreterFactory In principle this looks like a good idea. I have a couple of concerns with the patch as currently written: 1. No documentation. 2. No test cases. 3. The use of enum for the default instance is rather odd. 4. I dislike the use of system properties when they are not necessary. If the class name was handled as a servlet context initialization parameters then Tomcat already has the necessary plumbing for global, per host and per web application configuration. 5. Error messages need to use the standard i18n support. -- 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
[Bug 54240] Configurable system level tagPlugins.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=54240 --- Comment #1 from Mark Thomas --- Comment on attachment 29687 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29687 Patch for TagPluginManager.java No objections in principle. Some comments on the proposed solution: 1. I don't see a need for a system property here. Servlet context initialization parameters are a better choice. 2. No documentation. 3. Patch doesn't follow Tomcat coding standards. -- 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: r1416816 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_34: ./ build.properties.default
Author: markt Date: Tue Dec 4 08:46:27 2012 New Revision: 1416816 URL: http://svn.apache.org/viewvc?rev=1416816&view=rev Log: Tag 7.0.34 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_34/ (props changed) - copied from r1416815, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_34/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_34/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_34/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_34/ -- --- bugtraq:message (added) +++ bugtraq:message Tue Dec 4 08:46:27 2012 @@ -0,0 +1 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_34/ -- bugtraq:number = true Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_34/ -- bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_34/ -- bugtraq:warnifnoissue = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_34/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 4 08:46:27 2012 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_34/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 4 08:46:27 2012 @@ -0,0 +1 @@ +/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112 ,1240114,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342 320,1342476,1342498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1 352056,1352059,1352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,13
svn commit: r1416817 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default
Author: markt Date: Tue Dec 4 08:47:18 2012 New Revision: 1416817 URL: http://svn.apache.org/viewvc?rev=1416817&view=rev Log: Prep for next release cycle Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1416817&r1=1416816&r2=1416817&view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Tue Dec 4 08:47:18 2012 @@ -27,7 +27,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=34 +version.build=35 version.patch=0 version.suffix=-dev Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1416817&r1=1416816&r2=1416817&view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Tue Dec 4 08:47:18 2012 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=7.0.34 +maven.asf.release.deploy.version=7.0.35 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: SPDY on the roadmap?
On 03/12/2012 21:26, Elgs Chen wrote: > Dear Tomcat Developers, > > I'm wondering if there's anything about SPDY connector implementation on the > Tomcat roadmap? I'm hoping to get some insight about it with Tomcat. There is an implementation in trunk. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1416836 - in /tomcat/trunk: java/org/apache/tomcat/websocket/WsProtocolHandler.java java/org/apache/tomcat/websocket/WsSession.java webapps/examples/WEB-INF/classes/websocket/echo/EchoEnd
Author: markt
Date: Tue Dec 4 09:33:39 2012
New Revision: 1416836
URL: http://svn.apache.org/viewvc?rev=1416836&view=rev
Log:
WebSocket 1.0 implementation part 8 of many
Start to join up the upgrade ProtocolHandler, the WebSocket session and the
Echo end point implementation
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsProtocolHandler.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsProtocolHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsProtocolHandler.java?rev=1416836&r1=1416835&r2=1416836&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsProtocolHandler.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsProtocolHandler.java Tue
Dec 4 09:33:39 2012
@@ -16,6 +16,12 @@
*/
package org.apache.tomcat.websocket;
+import java.io.IOException;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
import javax.servlet.http.ProtocolHandler;
import javax.servlet.http.WebConnection;
import javax.websocket.Endpoint;
@@ -26,16 +32,98 @@ import javax.websocket.Endpoint;
public class WsProtocolHandler implements ProtocolHandler {
private final Endpoint ep;
+private final ClassLoader applicationClassLoader;
+private final WsSession session;
public WsProtocolHandler(Endpoint ep) {
this.ep = ep;
+applicationClassLoader =
Thread.currentThread().getContextClassLoader();
+session = new WsSession();
}
@Override
public void init(WebConnection connection) {
-ep.onOpen(new WsSession());
+// Need to call onOpen using the web application's class loader
+Thread t = Thread.currentThread();
+ClassLoader cl = t.getContextClassLoader();
+t.setContextClassLoader(applicationClassLoader);
+try {
+ep.onOpen(session);
+} finally {
+t.setContextClassLoader(cl);
+}
+
+ServletInputStream sis;
+ServletOutputStream sos;
+try {
+sis = connection.getInputStream();
+sos = connection.getOutputStream();
+} catch (IOException e) {
+throw new IllegalStateException(e);
+}
+
+sis.setReadListener(new WsReadListener(this));
+sos.setWriteListener(new WsWriteListener(this));
+}
+
+
+private void onError(Throwable throwable) {
+// Need to call onError using the web application's class loader
+Thread t = Thread.currentThread();
+ClassLoader cl = t.getContextClassLoader();
+t.setContextClassLoader(applicationClassLoader);
+try {
+ep.onError(throwable);
+} finally {
+t.setContextClassLoader(cl);
+}
+}
+
+private static class WsReadListener implements ReadListener {
+
+private final WsProtocolHandler wsProtocolHandler;
+
+private WsReadListener(WsProtocolHandler wsProtocolHandler) {
+this.wsProtocolHandler = wsProtocolHandler;
+}
+
+@Override
+public void onDataAvailable() {
+// TODO Auto-generated method stub
+
+}
+
+@Override
+public void onAllDataRead() {
+// Will never happen with WebSocket
+throw new IllegalStateException();
+}
+
+@Override
+public void onError(Throwable throwable) {
+wsProtocolHandler.onError(throwable);
+}
+}
+
+
+private static class WsWriteListener implements WriteListener {
+
+private final WsProtocolHandler wsProtocolHandler;
+
+private WsWriteListener(WsProtocolHandler wsProtocolHandler) {
+this.wsProtocolHandler = wsProtocolHandler;
+}
+
+@Override
+public void onWritePossible() {
+// TODO Auto-generated method stub
+
+}
-// TODO Message handling
+@Override
+public void onError(Throwable throwable) {
+wsProtocolHandler.onError(throwable);
+}
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1416836&r1=1416835&r2=1416836&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Tue Dec 4
09:33:39 2012
@@ -18,12 +18,14 @@ package org.apache.tomcat.websocket;
import java.io.IOException;
import java.net.URI;
+import java.util.LinkedHashSet;
import java.util.List;
import
[Bug 54017] new String instance is generated for constant string in Generator.convertString
https://issues.apache.org/bugzilla/show_bug.cgi?id=54017
--- Comment #2 from Konstantin Kolinko ---
Regarding this fix ( r1402122 r1402123 ),
The JSP 2.2 spec chapter JSP.1.14.2.1 "Conversions from String values"
defines conversion to an Object as
[quote]
"As if new String(string-literal). This results in new String("")
if the string is empty."
[/quote]
This should be the reason for the original code changed by this fix.
Actually I agree with OP and Mark and I see no good reason to use a
String(String) constructor here.
The only good point I see in String(String) constructor is that it trims the
backing char array to contain only the needed count of characters, but I do not
think it is important here.
--
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
[Bug 54241] NPE in BodyContentImpl
https://issues.apache.org/bugzilla/show_bug.cgi?id=54241 --- Comment #2 from Konstantin Kolinko --- What is your stacktrace and in what case this issue is triggered? 1. I agree with Mark that Writer.write((String)null) should throw an NPE 2. Regarding bug 35410 I think that the fix is wrong but in another way Expressions are defined in two places in JSP 2.2, a) JSP.1.12.3 "Expressions" b) JSP.9.4.3 "Expressions" b) says that <%= expr %> is out.print(expr) and JspWriter.print(String) is defined to print null value as "null", not "". So using the test from bug 35410 I expect "null null null". The actual result in 7.0.33 is "null null". The generated java code is out.print( test ); I think it should generate out.print( String.valueOf(test) ); The behaviour of JspWriterImpl.print(Object) could be "improved" to handle obj.toString() returning null, but I do not think that such change is needed, because its current behaviour is consistent with PrintWriter.print(Object) which results in an NPE. My reading is that the spec says that the value of the expression should be coerced to String *before* printing it. -- 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
[Bug 54240] Configurable system level tagPlugins.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=54240 Konstantin Kolinko changed: What|Removed |Added OS||All Severity|normal |enhancement --- Comment #2 from Konstantin Kolinko --- For this implementation to work, one would need to put the configuration file into classpath. I think that is not a good place for a configuration file. If it were implemented via context initialization parameters or parameters of JspServlet, I wonder how it will behave during offline generation of JSPs (aka the jspc tool of Jasper). Some testing is needed. -- 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
[Bug 54242] NPE in tagPlugins:ForEach
https://issues.apache.org/bugzilla/show_bug.cgi?id=54242
--- Comment #2 from Konstantin Kolinko ---
I think generating an "if(itemsV != null){ }" clause around the whole iteration
loop will be more effective. An iterator is a temporary object that is GC'ed.
--
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
[Bug 54239] Extensible EL Interpreter
https://issues.apache.org/bugzilla/show_bug.cgi?id=54239 Sheldon Shao changed: What|Removed |Added OS||All --- Comment #4 from Sheldon Shao --- Thanks Mark. I'll provide document & test cases for BUG 54239-54242. -- 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
[Bug 54240] Configurable system level tagPlugins.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=54240 --- Comment #3 from Sheldon Shao --- TagPlugin is good for making tag libraris more efficently. The target for tag libraries is to share between multiple web applications. Same as TagPlugin. Imagine that one enterprise has many web applications. It's better to share same tagPlugins & tagPlugins.xml for all applications. So that all applications can benifit from it. Currently the solution is putting the tagPlugins.xml under WEB-INF. It is not good for shareing this tagPlugins.xml with other applications. Now the solution still supports tagPlugins.xml under WEB-INF. Instead, it also supports an system level tagPlugins.xml. This tagPlugins.xml might be packaged with those implementations of TagPlugin. I think TagPlugin implementations must provide such kind of configuration file. That's the idea of Zero-Configuration for web applications. -- 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
[jira] [Created] (MTOMCAT-188) Allow for the creation of a war that is both executable and deployable
Mitch Kyle created MTOMCAT-188: -- Summary: Allow for the creation of a war that is both executable and deployable Key: MTOMCAT-188 URL: https://issues.apache.org/jira/browse/MTOMCAT-188 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Components: tomcat7 Affects Versions: 2.0-beta-1 Reporter: Mitch Kyle Assignee: Olivier Lamy (*$^¨%`£) Priority: Minor Currently with the exec-war/-only goals, a jar or war is created that is executable but not deployable to an existing tomcat meaning two release artifacts would be required to take this approach. Ideally, a new goal would be added for creating war files that can be deployed to an existing tomcat or excuted directly. Steps a. Allow tomcat7-war-runner to copy the running war to the webapps folder if some property is set b. Add a goal to build some war with tomcat7-war-runner overlayed and add a manifest with main-class set. If this sounds interesting, I can have a patch available soon and any feedback would be great. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54240] Configurable system level tagPlugins.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=54240 --- Comment #4 from Konstantin Kolinko --- (In reply to comment #3) Your way goes to multiple tag libraries. If each one is self-contained, it could configure itself, without a global tagPlugin file. I do not know whether API is available in TagPluginManager, but there are already hooks to plug libraries in a container: a) support for a Listener in Tag Library Descriptor (TLD) file b) ServletContainerInitializer in Servlet 3.0 specification -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1415184 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java webapps/docs/changelog.xml
2012/12/3 Brian Burch :
> On 03/12/12 16:22, Brian Burch wrote:
>>
>> On 03/12/12 11:44, Brian Burch wrote:
>>>
>>> On 02/12/12 22:00, Konstantin Kolinko wrote:
>>
>>
According to Buildbot logs, testBasicLoginSessionTimeout() runs for 2
minutes (125 seconds), mainly due to a sleep() call.
I wish there were a way to speed up this test.
My thoughts
a) Maybe use reflection to reduce StandardSession.lastAccessedTime and
thisAccessedTime by some fixed amount (6) instead of waiting for
that time to pass.
>>>
>>>
>>> That would speed up the test... but it sounds like adding a time machine
>>> to the test class! My feeling is this would add inappropriate logical
>>> complexity to a test that has always created and destroyed a tomcat
>>> instance for each test case (there are now 15).
>>>
>>> However, I intend to replicate most of the improvements from this test
>>> class into the other authenticator tests, so I am already apprehensive
>>> about adding too many 60+ second delays to the entire suite.
>>>
>>> Mark and I briefly discussed adding a new protected method for use by
>>> these timeout tests:
>>>
>>> org.apache.catalina.session.StandardSession.setSessionTimeoutSecs(int
>>> secs)
>>
>>
>> Silly me! Sorry if that left you wondering what I meant. That particular
>> method already exists, is public, and is called setSessionTimeout.
>>
>> What I meant to suggest was this:
>>
>> org.apache.catalina.core.StandardContext.setSessionTimeoutSecs(int
>> timeout)
>>
>> because it would be much simpler to modify the Context in the test
>> setUp, rather than each individual Session.
>>
>>> What do you think?
>
>
> The change seemed almost trivial to me, but I couldn't work out how to
> implement it without changing the public api, i.e.
>
> I have only found one place where it is used:
>
> org.apache.catalina.session.ManagerBase.setContext(Context context)
>
> has this logic:
>
> // Register with the new Context (if any)
> if (this.context != null) {
> setMaxInactiveInterval(this.context.getSessionTimeout() * 60);
> this.context.addPropertyChangeListener(this);
> }
>
> I wanted to move the "60" back into StandardContext, but that doesn't work
> because it means changing the org.apache.catalina.Context api to work in
> seconds instead of minutes. ManagerBase and StandardContext are in different
> packages, so a protected accessor for the timeout in seconds wouldn't work
> either.
>
> On the other hand, I wondered about defining an alternative timeout in
> seconds within the ManagerBase, which would only be used by unit tests.
> ManagerBase would use its own timeout if non-zero, otherwise use the Context
> value in minutes.
>
> I would really appreciate some guidance on the best way to proceed. (Perhaps
> it is better to keep things simple by living with an 80 seconds test time?)
>
I see two other ways besides modifying the context class:
a) call ManagerBase.setMaxInactiveInterval(), as it is public.
b) сall HttpSession.setMaxInactiveInterval() on that specific session,
e.g. from a HttpSessionListener
BTW, using an HttpSessionListener you can note whether the session has
actually expired (whether sessionDestroyed() was called for it).
The listener could be used to further speed up the test. As far as the
listener knows that all created sessions have expired, the test can
proceed. (So if the background thread runs sooner that in 15 seconds,
the test can continue sooner).
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Trivial Update of "FAQ/Password" by KonstantinKolinko
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "FAQ/Password" page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/FAQ/Password?action=diff&rev1=8&rev2=9
Comment:
s/as/runs as/ and several other minor corrections
= Passwords =
== Why are plain text passwords in the config files? ==
- Because there isn't a a good way to "secure" them. When Tomcat needs to
connect to a database, it needs the original password. While the password could
be encoded, there still needs to be a mechanism to decode it. And since the
source to Tomcat is freely available, the attacker would know the decoding
method. So at best, the password is obscured - but not really protected. Please
see the user and dev list archives for flames wars about this topic. That said,
any configuration file that does contain a password needs to be appropriately
secured. That means limiting access to the file to the user that Tomcat process
as and root (or the administrator on Windows).
+ Because there is no good way to "secure" them. When Tomcat needs to connect
to a database, it needs the original password. While the password could be
encoded, there still needs to be a mechanism to decode it. And since the source
to Tomcat is freely available, the attacker would know the decoding method. So
at best, the password is obscured - but not really protected. Please see the
user and dev list archives for flame wars about this topic.
+
+ That said, any configuration file that does contain a password needs to be
appropriately secured. That means limiting access to the file so that it could
be read only by the user that Tomcat process runs as and root (or the
administrator on Windows).
In [[http://www.catb.org/~esr/writings/cathedral-bazaar/|The Cathedral and
the Bazaar]], Eric S. Raymond recounts a story where his fetchmail users asked
for encrypted passwords in the .fetchmailrc file (which is almost identical to
the situation posed here with server.xml). He refused
[[http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/ar01s09.html|using
the same arguments posed here]]: encrypting or otherwise obfuscating the
password in server.xml does not provide any real security: only "security by
obscurity" which isn't actually secure.
@@ -20, +22 @@
. Now, whenever you write {{{&resources;}}} in the text below, it will be
replaced by the content of the file "resources.txt". The file path is relative
to the conf directory.
* Write your own datasource implementation which wraps your datasource and
obscure your brains out ([[http://en.wikipedia.org/wiki/XOR_cipher|XOR]] and
[[http://en.wikipedia.org/wiki/ROT13|ROT13]] are great candidates for this
since their strength matches the protection you'll actually get). See the docs
on how to do this.
* Write your own {{{javax.naming.spi.ObjectFactory}}} implementation that
creates and configures your datasource.
- * (Tomcat 7) Write your own
{{{org.apache.tomcat.util.IntrospectionUtils.PropertySource}}} implementation
to 'decrypt' passwords that are 'encrypted' in catalina.properties and
referenced via ${...} in server.xml. You'll need to set the system property
{{{org.apache.tomcat.util.digester.PROPERTY_SOURCE}}} to point to your
!PropertySource implementation.
+ * (Tomcat 7) Write your own
{{{org.apache.tomcat.util.IntrospectionUtils.PropertySource}}} implementation
to 'decrypt' passwords that are 'encrypted' in catalina.properties and
referenced via ${...} in server.xml. You will need to set the system property
{{{org.apache.tomcat.util.digester.PROPERTY_SOURCE}}} to point to your
!PropertySource implementation.
[[CategoryFAQ]]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-189) additionalClassesDirs parameter handling expanded to include run and run-war goals
Nick Lloyd created MTOMCAT-189: -- Summary: additionalClassesDirs parameter handling expanded to include run and run-war goals Key: MTOMCAT-189 URL: https://issues.apache.org/jira/browse/MTOMCAT-189 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Affects Versions: 2.1 Reporter: Nick Lloyd Priority: Minor I contributed the original patch to add the functionality to add additional directories to the classpath for the run goal. This patch expands on that, adding the functionality to both run and run-war goals in the tomcat6 and tomcat7 plugin artifacts. Please review and incorporate as you see fit. My organization is using this internally. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417003 - /tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
Author: kkolinko
Date: Tue Dec 4 15:51:09 2012
New Revision: 1417003
URL: http://svn.apache.org/viewvc?rev=1417003&view=rev
Log:
Review of r1416258
'&&' has higher priority than '||', so the brackets are needed.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java?rev=1417003&r1=1417002&r2=1417003&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java Tue
Dec 4 15:51:09 2012
@@ -184,7 +184,7 @@ public class PojoMethodMapping {
} else if (type.equals(byte.class) || type.equals(Byte.class)) {
return Byte.valueOf(value);
} else if (value.length() == 1 &&
-type.equals(char.class) || type.equals(Character.class)) {
+(type.equals(char.class) || type.equals(Character.class))) {
return Character.valueOf(value.charAt(0));
} else if (type.equals(double.class) || type.equals(Double.class)) {
return Double.valueOf(value);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1416258 - in /tomcat/trunk: java/javax/websocket/ java/org/apache/tomcat/websocket/ webapps/examples/WEB-INF/classes/websocket/echo/ webapps/examples/websocket/
2012/12/3 :
> Author: markt
> Date: Sun Dec 2 21:01:52 2012
> New Revision: 1416258
>
> URL: http://svn.apache.org/viewvc?rev=1416258&view=rev
> Log:
> WebSocket 1.0 implementation part 7 of many
> Complete path parameter passing for POJOs
>
> Added:
> tomcat/trunk/java/org/apache/tomcat/websocket/PathParam.java (with
> props)
> Modified:
> tomcat/trunk/java/javax/websocket/WebSocketPathParam.java
> tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
> tomcat/trunk/java/org/apache/tomcat/websocket/UriTemplate.java
> tomcat/trunk/java/org/apache/tomcat/websocket/WsEndpointPojo.java
>
> tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
> tomcat/trunk/webapps/examples/websocket/echo.html
>
> Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java?rev=1416258&r1=1416257&r2=1416258&view=diff
>
> public class PojoMethodMapping {
(...)
> +
> +private static Object coerceToType(Class type, String value) {
> +
> +if (type.equals(String.class)) {
The above probably needs " || type.equals(Object.class)".
> +return value;
> +} else if (type.equals(boolean.class) || type.equals(Boolean.class))
> {
> +return Boolean.valueOf(value);
> +} else if (type.equals(byte.class) || type.equals(Byte.class)) {
> +return Byte.valueOf(value);
> +} else if (value.length() == 1 &&
> +type.equals(char.class) || type.equals(Character.class)) {
> +return Character.valueOf(value.charAt(0));
Corrected by r1417003.
> +} else if (type.equals(double.class) || type.equals(Double.class)) {
> +return Double.valueOf(value);
> +} else if (type.equals(float.class) || type.equals(Float.class)) {
> +return Float.valueOf(value);
> +} else if (type.equals(int.class) || type.equals(Integer.class)) {
> +return Integer.valueOf(value);
> +} else if (type.equals(long.class) || type.equals(Long.class)) {
> +return Long.valueOf(value);
> +} else if (type.equals(short.class) || type.equals(Short.class)) {
> +return Short.valueOf(value);
> +} else {
> +// TODO
> +throw new IllegalArgumentException();
> +}
> }
> }
"if (value==null) { return value; }" could be added to the method,
but I see that it actually never happens, as a call to this method is
just skipped when the value is null.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-189) additionalClassesDirs parameter handling expanded to include run and run-war goals
[ https://issues.apache.org/jira/browse/MTOMCAT-189?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13509815#comment-13509815 ] Arne Franken commented on MTOMCAT-189: -- why don't you just add additional dependencies to the plugin configuration instead of adding classes / jars manually into the classpath? The additional property means more code that needs to be tested, maintained and documented... I was wondering why it was even there... > additionalClassesDirs parameter handling expanded to include run and run-war > goals > -- > > Key: MTOMCAT-189 > URL: https://issues.apache.org/jira/browse/MTOMCAT-189 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement >Affects Versions: 2.1 >Reporter: Nick Lloyd >Priority: Minor > > I contributed the original patch to add the functionality to add additional > directories to the classpath for the run goal. This patch expands on that, > adding the functionality to both run and run-war goals in the tomcat6 and > tomcat7 plugin artifacts. > Please review and incorporate as you see fit. My organization is using this > internally. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417021 - /tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
Author: kkolinko
Date: Tue Dec 4 16:30:36 2012
New Revision: 1417021
URL: http://svn.apache.org/viewvc?rev=1417021&view=rev
Log:
Simplify a loop
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java?rev=1417021&r1=1417020&r2=1417021&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java Tue
Dec 4 16:30:36 2012
@@ -47,17 +47,16 @@ public class PojoMethodMapping {
Method open = null;
Method close = null;
Method error = null;
-Method[] methods = clazzPojo.getMethods();
-for (int i = 0; i < methods.length; i++) {
+for (Method method: clazzPojo.getMethods()) {
if (open == null &&
-methods[i].getAnnotation(WebSocketOpen.class) != null) {
-open = methods[i];
+method.getAnnotation(WebSocketOpen.class) != null) {
+open = method;
} else if (close == null &&
-methods[i].getAnnotation(WebSocketClose.class) != null) {
-close = methods[i];
+method.getAnnotation(WebSocketClose.class) != null) {
+close = method;
} else if (error == null &&
-methods[i].getAnnotation(WebSocketError.class) != null) {
-error = methods[i];
+method.getAnnotation(WebSocketError.class) != null) {
+error = method;
}
}
this.onOpen = open;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-189) additionalClassesDirs parameter handling expanded to include run and run-war goals
[ https://issues.apache.org/jira/browse/MTOMCAT-189?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13509840#comment-13509840 ] Nick Lloyd commented on MTOMCAT-189: This is meant to support modifications that you can make to a regular tomcat installation via the conf/catalina.properties files where you can add directories to the different classloaders. Why this matters is if you want to have directories containing configuration files that you want to access across servlets via the classpath. Different beast from adding dependencies. Note that this functionality already exists in tomcat6-maven-plugin for the run goal, I am simply expanding it to include run-war and also incorporating the change into tomcat7-maven-plugin. > additionalClassesDirs parameter handling expanded to include run and run-war > goals > -- > > Key: MTOMCAT-189 > URL: https://issues.apache.org/jira/browse/MTOMCAT-189 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement >Affects Versions: 2.1 >Reporter: Nick Lloyd >Priority: Minor > > I contributed the original patch to add the functionality to add additional > directories to the classpath for the run goal. This patch expands on that, > adding the functionality to both run and run-war goals in the tomcat6 and > tomcat7 plugin artifacts. > Please review and incorporate as you see fit. My organization is using this > internally. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-188) Allow for the creation of a war that is both executable and deployable
[ https://issues.apache.org/jira/browse/MTOMCAT-188?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) updated MTOMCAT-188: --- Fix Version/s: 2.1 > Allow for the creation of a war that is both executable and deployable > -- > > Key: MTOMCAT-188 > URL: https://issues.apache.org/jira/browse/MTOMCAT-188 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat7 >Affects Versions: 2.0-beta-1 >Reporter: Mitch Kyle >Assignee: Olivier Lamy (*$^¨%`£) >Priority: Minor > Fix For: 2.1 > > > Currently with the exec-war/-only goals, a jar or war is created that is > executable but not deployable to an existing tomcat meaning two release > artifacts would be required to take this approach. > Ideally, a new goal would be added for creating war files that can be > deployed to an existing tomcat or excuted directly. > Steps > a. Allow tomcat7-war-runner to copy the running war to the webapps folder if > some property is set > b. Add a goal to build some war with tomcat7-war-runner overlayed and add a > manifest with main-class set. > If this sounds interesting, I can have a patch available soon and any > feedback would be great. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-189) additionalClassesDirs parameter handling expanded to include run and run-war goals
[ https://issues.apache.org/jira/browse/MTOMCAT-189?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) updated MTOMCAT-189: --- Fix Version/s: 2.1 > additionalClassesDirs parameter handling expanded to include run and run-war > goals > -- > > Key: MTOMCAT-189 > URL: https://issues.apache.org/jira/browse/MTOMCAT-189 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement >Affects Versions: 2.1 >Reporter: Nick Lloyd >Priority: Minor > Fix For: 2.1 > > > I contributed the original patch to add the functionality to add additional > directories to the classpath for the run goal. This patch expands on that, > adding the functionality to both run and run-war goals in the tomcat6 and > tomcat7 plugin artifacts. > Please review and incorporate as you see fit. My organization is using this > internally. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-187) Scan resources executing run goal
[ https://issues.apache.org/jira/browse/MTOMCAT-187?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) updated MTOMCAT-187: --- Fix Version/s: 2.1 > Scan resources executing run goal > - > > Key: MTOMCAT-187 > URL: https://issues.apache.org/jira/browse/MTOMCAT-187 > Project: Apache Tomcat Maven Plugin > Issue Type: Question > Components: tomcat7 >Affects Versions: 2.0-beta-1 >Reporter: Sergio Fernández >Assignee: Olivier Lamy (*$^¨%`£) >Priority: Minor > Labels: maven > Fix For: 2.1 > > > I tried to find this detail at the documentation, but sorry but I didn't. > The question is: does the plugin has any way to force the goal tomcat7:run to > scan (and updated when are modified) resources? Something equivalent to > scanIntervalSeconds in the maven jetty plugin. > Thanks in advance. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417040 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
Author: kkolinko
Date: Tue Dec 4 17:18:32 2012
New Revision: 1417040
URL: http://svn.apache.org/viewvc?rev=1417040&view=rev
Log:
Fix trailing whitespace as reported by Checkstyle.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java?rev=1417040&r1=1417039&r2=1417040&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
Tue Dec 4 17:18:32 2012
@@ -98,7 +98,7 @@ public class DataSource extends DataSour
@Override
public ObjectName preRegister(MBeanServer server, ObjectName name) throws
Exception {
try {
-if ( isJmxEnabled() ) {
+if ( isJmxEnabled() ) {
this.oname = createObjectName(name);
if (oname!=null) registerJmx();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417044 - /tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
Author: kkolinko Date: Tue Dec 4 17:23:31 2012 New Revision: 1417044 URL: http://svn.apache.org/viewvc?rev=1417044&view=rev Log: Address Mark's comment to r1413324. Check that two messages were echoed back. Modified: tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Modified: tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java?rev=1417044&r1=1417043&r2=1417044&view=diff == --- tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java (original) +++ tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Tue Dec 4 17:23:31 2012 @@ -88,10 +88,11 @@ public class TestUpgrade extends TomcatB pw.println(MESSAGE); pw.flush(); -String response = reader.readLine(); - // Note: BufferedReader.readLine() strips new lines // ServletInputStream.readLine() does not strip new lines +String response = reader.readLine(); +Assert.assertEquals(MESSAGE, response); +response = reader.readLine(); Assert.assertEquals(MESSAGE, response); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1416258 - in /tomcat/trunk: java/javax/websocket/ java/org/apache/tomcat/websocket/ webapps/examples/WEB-INF/classes/websocket/echo/ webapps/examples/websocket/
On 04/12/2012 15:57, Konstantin Kolinko wrote:
> 2012/12/3 :
>> Author: markt
>> Date: Sun Dec 2 21:01:52 2012
>> New Revision: 1416258
>>
>> URL: http://svn.apache.org/viewvc?rev=1416258&view=rev
>> Log:
>> WebSocket 1.0 implementation part 7 of many
>> Complete path parameter passing for POJOs
>> Modified:
>> tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java?rev=1416258&r1=1416257&r2=1416258&view=diff
>>
>
>> public class PojoMethodMapping {
> (...)
>
>> +
>> +private static Object coerceToType(Class type, String value) {
>> +
>> +if (type.equals(String.class)) {
>
> The above probably needs " || type.equals(Object.class)".
Why? Object isn't a permitted parameter type unless I have missed
something in the Ws draft spec.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54244] New: HTTP Connector SSL support section should give examples for sslEnabledProtocols and sslProtocols
https://issues.apache.org/bugzilla/show_bug.cgi?id=54244 Bug ID: 54244 Summary: HTTP Connector SSL support section should give examples for sslEnabledProtocols and sslProtocols Product: Tomcat 7 Version: 7.0.33 Hardware: PC OS: Mac OS X 10.4 Status: NEW Severity: enhancement Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net Classification: Unclassified Neither of these two configuration attributes have any examples for valid values except for sslProtocol which specifies "TLS" as the default. Also, it is unclear what the difference between these two attributes is: does setting the sslProtocol enable just a single protocol? One of these attributes likely takes a value like SSLv2, SSLv3, TLSv1, etc. or maybe SSLv3+TLSv1 but it's not clear which one (or both). Even if the list of valid values is JVM-specific (e.g. not every JVM supports TLSv1.2), some examples should be given. -- 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
[Bug 54244] HTTP Connector SSL support section should give examples for sslEnabledProtocols and sslProtocol
https://issues.apache.org/bugzilla/show_bug.cgi?id=54244 Christopher Schultz changed: What|Removed |Added Summary|HTTP Connector SSL support |HTTP Connector SSL support |section should give |section should give |examples for|examples for |sslEnabledProtocols and |sslEnabledProtocols and |sslProtocols|sslProtocol -- 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: r1417057 - /tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml
Author: kkolinko Date: Tue Dec 4 17:44:14 2012 New Revision: 1417057 URL: http://svn.apache.org/viewvc?rev=1417057&view=rev Log: Followup to r1414046. Mark tomcat-websocket.jar fragment as metadata-complete. It initializes itself through a ServletContainerInitializer. There is no need for Tomcat to scan this jar for servlets, filters or listeners. Modified: tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml Modified: tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml?rev=1417057&r1=1417056&r2=1417057&view=diff == --- tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml (original) +++ tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml Tue Dec 4 17:44:14 2012 @@ -20,6 +20,6 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"; version="3.0" - metadata-complete="false"> + metadata-complete="true"> org.apache.tomcat.websocket \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1416258 - in /tomcat/trunk: java/javax/websocket/ java/org/apache/tomcat/websocket/ webapps/examples/WEB-INF/classes/websocket/echo/ webapps/examples/websocket/
2012/12/4 Mark Thomas :
> On 04/12/2012 15:57, Konstantin Kolinko wrote:
>> 2012/12/3 :
>>> Author: markt
>>> Date: Sun Dec 2 21:01:52 2012
>>> New Revision: 1416258
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1416258&view=rev
>>> Log:
>>> WebSocket 1.0 implementation part 7 of many
>>> Complete path parameter passing for POJOs
>
>
>>> Modified:
>>> tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java?rev=1416258&r1=1416257&r2=1416258&view=diff
>>>
>>
>>> public class PojoMethodMapping {
>> (...)
>>
>>> +
>>> +private static Object coerceToType(Class type, String value) {
>>> +
>>> +if (type.equals(String.class)) {
>>
>> The above probably needs " || type.equals(Object.class)".
>
> Why? Object isn't a permitted parameter type unless I have missed
> something in the Ws draft spec.
>
I was not reading the spec, just thought that something was missing.
Reading JavaWebSocket_JSR356_006EDR.pdf,
(Early draft preview from http://www.jcp.org/en/jsr/detail?id=356 )
For the methods annotated with @WebSocketOpen, @WebSocketClose and
@WebSocketError the only allowed type for these parameters is String.
So the whole coerceToType() can be removed?
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1416258 - in /tomcat/trunk: java/javax/websocket/ java/org/apache/tomcat/websocket/ webapps/examples/WEB-INF/classes/websocket/echo/ webapps/examples/websocket/
On 04/12/2012 18:01, Konstantin Kolinko wrote:
> 2012/12/4 Mark Thomas :
>> On 04/12/2012 15:57, Konstantin Kolinko wrote:
>>> 2012/12/3 :
Author: markt
Date: Sun Dec 2 21:01:52 2012
New Revision: 1416258
URL: http://svn.apache.org/viewvc?rev=1416258&view=rev
Log:
WebSocket 1.0 implementation part 7 of many
Complete path parameter passing for POJOs
>>
>>
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java?rev=1416258&r1=1416257&r2=1416258&view=diff
>>>
public class PojoMethodMapping {
>>> (...)
>>>
+
+private static Object coerceToType(Class type, String value) {
+
+if (type.equals(String.class)) {
>>>
>>> The above probably needs " || type.equals(Object.class)".
>>
>> Why? Object isn't a permitted parameter type unless I have missed
>> something in the Ws draft spec.
>>
>
> I was not reading the spec, just thought that something was missing.
>
> Reading JavaWebSocket_JSR356_006EDR.pdf,
> (Early draft preview from http://www.jcp.org/en/jsr/detail?id=356 )
>
> For the methods annotated with @WebSocketOpen, @WebSocketClose and
> @WebSocketError the only allowed type for these parameters is String.
>
> So the whole coerceToType() can be removed?
The section before that states that primitives and their object
equivalents can also be used. The specification needs to be clarified
here (and should be in time for v9)
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417106 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Dec 4 18:38:40 2012 New Revision: 1417106 URL: http://svn.apache.org/viewvc?rev=1417106&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1417106&r1=1417105&r2=1417106&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 4 18:38:40 2012 @@ -126,7 +126,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54220 ErrorReportValve invoked on non-error responses http://svn.apache.org/viewvc?rev=1416537&view=rev (ErrorReportValve.java only) - +1: markt, kfujino + +1: markt, kfujino, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
CVE-2012-4534 Apache Tomcat denial of service
CVE-2012-4534 Apache Tomcat denial of service Severity: Important Vendor: The Apache Software Foundation Versions Affected: - Tomcat 7.0.0 to 7.0.27 - Tomcat 6.0.0 to 6.0.35 Description: When using the NIO connector with sendfile and HTTPS enabled, if a client breaks the connection while reading the response an infinite loop is entered leading to a denial of service. This was originally reported as https://issues.apache.org/bugzilla/show_bug.cgi?id=52858. Mitigation: Users of affected versions should apply one of the following mitigations: - Tomcat 7.0.x users should upgrade to 7.0.28 or later - Tomcat 6.0.x users should upgrade to 6.0.36 or later Credit: The security implications of this bug were identified by Arun Neelicattu of the Red Hat Security Response Team. References: http://tomcat.apache.org/security.html http://tomcat.apache.org/security-7.html http://tomcat.apache.org/security-6.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
CVE-2012-3546 Apache Tomcat Bypass of security constraints
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 CVE-2012-3546 Apache Tomcat Bypass of security constraints Severity: Important Vendor: The Apache Software Foundation Versions Affected: - - Tomcat 7.0.0 to 7.0.29 - - Tomcat 6.0.0 to 6.0.35 Earlier unsupported versions may also be affected Description: When using FORM authentication it was possible to bypass the security constraint checks in the FORM authenticator by appending "/j_security_check" to the end of the URL if some other component (such as the Single-Sign-On valve) had called request.setUserPrincipal() before the call to FormAuthenticator#authenticate(). Mitigation: Users of affected versions should apply one of the following mitigations: - - Tomcat 7.0.x users should upgrade to 7.0.30 or later - - Tomcat 6.0.x users should upgrade to 6.0.36 or later Credit: This issue was identified by The Tomcat security team References: http://tomcat.apache.org/security.html http://tomcat.apache.org/security-7.html http://tomcat.apache.org/security-6.html -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBAgAGBQJQvlNnAAoJEBDAHFovYFnnsJoP/i6/NEKy6+tAcMZ0vKV5CGci 2Epf7NbfWHZhyYZlI445kHoCGQAvMaD0pXlLBUTlzVd2N9Jugk1j2WNPzvOlsaZ0 jx3qeuvNhVZzAa2LIDVSj8ENVNYMiA/S4reZu2u9lHqw5tTP5fapJXDNphSnr0kR A662JdkQlirQtFylkvqFdMoZ3N/vEPwzD8Cs80fafEhEqcoOtrO6yOyaR/kwEFeI 5cxbm/om4+T9cVkRduGqhzLRBWnDiCeBguXiUJXDQorOWmzHq438cNd4ylfFRa1W RBsin8aVY6LMIUqdWWqUnG8SPI7qp7odMRzhI1yLw+y4ykrV5coKeTvalIsh+3ZE FWP7kYmrOYS8NToq56Fxn8bYAuAsJiOsVZ4ox0ozR9HQCEqLEpXTa31hEowUBtig LO0HRgQIeh4rdgxxR2V46JiRw8URNfGevKrhez5B8UAb8hj02SM/3hyg3S3pL2Jn fl0vLnf1+DACd0mUuGmSQNLx5VznW6fkYHZWgmV3SigaroKL4+BbqCO7WvuNs9aA Y8dYt08IgF0O/Kt1vQdks31KEDIqHJOtrZBCySdvVLGz1x+MxluWssZGQELCcj0v ByfH80yh/uIU2Zk9QTaJlEkuODyWTYxmYRk34R3/zZ57za+NQLlpe0cfBRy33wjt VCfhXK6n3npDlmhpeBDw =pOlX -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
CVE-2012-4431 Apache Tomcat Bypass of CSRF prevention filter
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 CVE-2012-4431 Apache Tomcat Bypass of CSRF prevention filter Severity: Important Vendor: The Apache Software Foundation Versions Affected: - - Tomcat 7.0.0 to 7.0.31 - - Tomcat 6.0.0 to 6.0.35 Description: The CSRF prevention filter could be bypassed if a request was made to a protected resource without a session identifier present in the request. Mitigation: Users of affected versions should apply one of the following mitigations: - - Tomcat 7.0.x users should upgrade to 7.0.32 or later - - Tomcat 6.0.x users should upgrade to 6.0.36 or later Credit: This issue was identified by The Tomcat security team References: http://tomcat.apache.org/security.html http://tomcat.apache.org/security-7.html http://tomcat.apache.org/security-6.html -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBAgAGBQJQvlNvAAoJEBDAHFovYFnnY80QAMvP1gIpG00vfIdiFabpJX55 UEmkPuTSefxZ6NMvAL8GkuUe8CoC6KinCgOx+s8eGlEiHtWFoYvM/Ckg8E3a8SY6 MfD8GLo2av/LdULGSCBrbaL2wFbgixPTBpgR9YS4bdpTK5nVqBZyZOjOzptqRDnE BQXDLLKa65/z7cF57l+XcLs1+JW3KJGRiGJzBNUrJK1x/AzfgRgk4jgvYdyDWdpI zuXKgwBbunblPL4sZhZA2mhoswBIMIJIaHXOAD28Ddt9IIae0UFptY6LmExOkSsa PtshA4EBlO8JTPPcfwtqA/bkHAWCzB1QshkYD57rLF3t1ouDQWI6j8l+q3AYIxzv a0Ix4qzE2hekcjGSCUMZUqNgcaGSjsggaOEo5zauM01osPQxbfpH41eH5fIWlMKi vrxRjYJwLyLdkj3bZFuP7Uq1GL4BLjeKDfqsL4aqcfdBPZea6C9rToEkB8EjD4vf DVdrX4Ivg3ImMMnL+gkX4+5aLp+jpw23G9gZbX1DJn+648iv3yFoK5ysOWy1GAAO x1Iq3pa49NigJ0ipjZvxc07THIoiK/t49/3fWzMR1Xm819oJC2/Qf512l/FpEltK kQ0y8BC4+7ypUZyhtwE3jzLW1x2j4ZBK8l1nX0X92WepJ6piro/7o80qiyDMfqPC hbmBu213eSXnV9kRHveI =jich -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417137 - in /tomcat/site/trunk: docs/security-6.html docs/security-7.html xdocs/security-6.xml xdocs/security-7.xml
Author: markt Date: Tue Dec 4 19:48:32 2012 New Revision: 1417137 URL: http://svn.apache.org/viewvc?rev=1417137&view=rev Log: Publish vulnerability info Modified: tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/xdocs/security-6.xml tomcat/site/trunk/xdocs/security-7.xml Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1417137&r1=1417136&r2=1417137&view=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Tue Dec 4 19:48:32 2012 @@ -389,6 +389,77 @@ Affects: 6.0.0-6.0.35 + + +Important: Bypass of security constraints + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-3546"; rel="nofollow">CVE-2012-3546 + + + +When using FORM authentication it was possible to bypass the security + constraint checks in the FORM authenticator by appending + /j_security_check to the end of the URL if some other + component (such as the Single-Sign-On valve) had called + request.setUserPrincipal() before the call to + FormAuthenticator#authenticate(). + + + +This was fixed in revision http://svn.apache.org/viewvc?view=rev&rev=1381035";>1381035. + + +This issue was identified by the Tomcat security team on 13 July 2012 and + made public on 4 December 2012. + + +Affects: 6.0.0-6.0.36 + + + +Important: Bypass of CSRF prevention filter + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4431"; rel="nofollow">CVE-2012-4431 + + + +The CSRF prevention filter could be bypassed if a request was made to a + protected resource without a session identifier present in the request. + + + +This was fixed in revision http://svn.apache.org/viewvc?view=rev&rev=1394456";>1394456. + + +This issue was identified by the Tomcat security team on 8 September 2012 + and made public on 4 December 2012. + + +Affects: 6.0.0-6.0.36 + + + +Important: Denial of service + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4534"; rel="nofollow">CVE-2012-4534 + + + +When using the NIO connector with sendfile and HTTPS enabled, if a client + breaks the connection while reading the response an infinite loop is + entered leading to a denial of service. This was originally reported as + https://issues.apache.org/bugzilla/show_bug.cgi?id=52858";>bug + 52858. + + + +This was fixed in revision http://svn.apache.org/viewvc?view=rev&rev=1372035";>1372035. + + +The security implications of this bug were reported to the Tomcat + security team by Arun Neelicattu of the Red Hat Security Response Team on + 3 October 2012 and made public on 4 December 2012. + + +Affects: 6.0.0-6.0.35 + Modified: tomcat/site/trunk/docs/security-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1417137&r1=1417136&r2=1417137&view=diff == --- tomcat/site/trunk/docs/security-7.html (original) +++ tomcat/site/trunk/docs/security-7.html Tue Dec 4 19:48:32 2012 @@ -368,6 +368,52 @@ Affects: 7.0.0-7.0.29 + + +Important: Bypass of security constraints + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-3546"; rel="nofollow">CVE-2012-3546 + + + +When using FORM authentication it was possible to bypass the security + constraint checks in the FORM authenticator by appending + /j_security_check to the end of the URL if some other + component (such as the Single-Sign-On valve) had called + request.setUserPrincipal() before the call to + FormAuthenticator#authenticate(). + + + +This was fixed in revision http://svn.apache.org/viewvc?view=rev&rev=1377892";>1377892. + + +This issue was identified by the Tomcat security team on 13 July 2012 and + made public on 4 December 2012. + + +Affects: 7.0.0-7.0.29 + + + +Important: Bypass of CSRF prevention filter + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4431"; rel="nofollow">CVE-2012-4431 + + + +The CSRF prevention filter could be bypassed if a request was made to a + protected resource without a session identifier present in the request. + + + +This was fixed in revision http://svn.apache.org/viewvc?view=rev&rev=1393088";>1393088. + + +This issue was identified by the Tomcat security team on 8 September 2012 + and made public on 4 December 2012. + + +Affects: 7.0.0-7.0.31 + @@ -412,6 +458,31 @@ Affects: 7.0.0-7.0.27 + + +Important: Denial of service + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-4534"; rel="nofollow">CVE-2012-4534 + + + +When using the NIO connector with sendfile and HTTPS enabled,
svn commit: r1417149 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: schultz Date: Tue Dec 4 20:19:52 2012 New Revision: 1417149 URL: http://svn.apache.org/viewvc?rev=1417149&view=rev Log: Votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1417149&r1=1417148&r2=1417149&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 4 20:19:52 2012 @@ -106,13 +106,14 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?view=revision&revision=1408044 (r1408043 in trunk) +1: kkolinko, kfujino + +0: schultz - Is there a specific reason for this change? -1: * Introduce property "tomcat.output" that is used to specify location of the build output directory. This simplifies build configuration when the output directory is located outside of the source tree. http://svn.apache.org/viewvc?view=revision&revision=1408376 - +1: kkolinko, kfujino + +1: kkolinko, kfujino, schultz -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54087 @@ -120,13 +121,13 @@ PATCHES PROPOSED TO BACKPORT: header rather than throwing an exception. http://svn.apache.org/viewvc?view=revision&revision=1408254 (r1408248 in trunk, by markt) - +1: kkolinko, kfujino + +1: kkolinko, kfujino, schultz -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54220 ErrorReportValve invoked on non-error responses http://svn.apache.org/viewvc?rev=1416537&view=rev (ErrorReportValve.java only) - +1: markt, kfujino, kkolinko + +1: markt, kfujino, kkolinko, schultz -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54245] New: TomcatRepo\build.xml:2668: TomcatRepo\output\manifests\default does not exist
https://issues.apache.org/bugzilla/show_bug.cgi?id=54245 Bug ID: 54245 Summary: TomcatRepo\build.xml:2668: TomcatRepo\output\manifests\default does not exist Product: Tomcat 8 Version: trunk Hardware: PC Status: NEW Severity: trivial Priority: P2 Component: Packaging Assignee: dev@tomcat.apache.org Reporter: violet...@apache.org Classification: Unclassified Hi, I'm using Tomcat Git repository available in github - g...@github.com:apache/tomcat.git When I tried to build Tomcat sources I received the following problem: TomcatRepo/build.xml:2668: TomcatRepo/output/manifests/default does not exist This problem does not happen when I use Tomcat SVN repository. The problem is the following: In the SVN repository there is an empty directory TomcatRepo/res/META-INF/default. This directory is copied to the output directory by the "build-manifests" target. In the Git repository there is no such directory - https://github.com/apache/tomcat/tree/trunk/res/META-INF That's because you cannot add an empty folder to the Git repository. If you really want an empty directory then you should add .gitignore file in it. http://www.dotkam.com/2010/08/21/making-git-to-add-empty-directories/ Regards Violeta Georgieva -- 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
[Bug 54235] tomcat jdbc pool stackoverflow error used with spring
https://issues.apache.org/bugzilla/show_bug.cgi?id=54235 Konstantin Kolinko changed: What|Removed |Added OS||All --- Comment #1 from Konstantin Kolinko --- 1. The call to ConnectionPool.borrowConnection( ) is caused by setting which causes ConnectionPool.init() to create 5 connections. 2. The call to PooledConnection.connectUsingDataSource() is seriously wrong. It should have called PooledConnection.connectUsingDriver() instead. This can happen only if poolProperties.getDataSource() is not null. I do not see how this could have happened. Did Spring injected a recursive reference by calling DataSource.setDataSource()? 3. When you define the pool via , it is created using org.apache.tomcat.jdbc.pool.DataSourceFactory. The factory calls dataSource.createPool(). So it might be better to add init-method="createPool". -- 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: r1417160 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: schultz Date: Tue Dec 4 20:36:41 2012 New Revision: 1417160 URL: http://svn.apache.org/viewvc?rev=1417160&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1417160&r1=1417159&r2=1417160&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 4 20:36:41 2012 @@ -105,8 +105,7 @@ PATCHES PROPOSED TO BACKPORT: do the change before displaying the login form. http://svn.apache.org/viewvc?view=revision&revision=1408044 (r1408043 in trunk) - +1: kkolinko, kfujino - +0: schultz - Is there a specific reason for this change? + +1: kkolinko, kfujino, schultz -1: * Introduce property "tomcat.output" that is used to specify location of - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417193 - /tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
Author: markt Date: Tue Dec 4 21:20:25 2012 New Revision: 1417193 URL: http://svn.apache.org/viewvc?rev=1417193&view=rev Log: Fix comment typo Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=1417193&r1=1417192&r2=1417193&view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Tue Dec 4 21:20:25 2012 @@ -50,7 +50,7 @@ public final class MessageBytes implemen public static final int T_CHARS = 3; private int hashCode=0; -// did we computed the hashcode ? +// did we compute the hashcode ? private boolean hasHashCode=false; // Internal objects to represent array + offset, and specific methods - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417194 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: ByteChunk.java CharChunk.java
Author: markt
Date: Tue Dec 4 21:21:11 2012
New Revision: 1417194
URL: http://svn.apache.org/viewvc?rev=1417194&view=rev
Log:
Replicate the equals() and hashCode() strategy from MessageBytes to silence
some FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1417194&r1=1417193&r2=1417194&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Dec 4
21:21:11 2012
@@ -101,6 +101,10 @@ public final class ByteChunk implements
*/
public static final Charset DEFAULT_CHARSET = B2CConverter.ISO_8859_1;
+private int hashCode=0;
+// did we compute the hashcode ?
+private boolean hasHashCode = false;
+
// byte[]
private byte[] buff;
@@ -141,6 +145,7 @@ public final class ByteChunk implements
start=0;
end=0;
isSet=false;
+hasHashCode = false;
}
public void reset() {
@@ -157,6 +162,7 @@ public final class ByteChunk implements
start=0;
end=0;
isSet=true;
+hasHashCode = false;
}
/**
@@ -171,6 +177,7 @@ public final class ByteChunk implements
start = off;
end = start+ len;
isSet=true;
+hasHashCode = false;
}
public void setCharset(Charset charset) {
@@ -488,6 +495,14 @@ public final class ByteChunk implements
// equals
+@Override
+public boolean equals(Object obj) {
+if (obj instanceof ByteChunk) {
+return equals((ByteChunk) obj);
+}
+return false;
+}
+
/**
* Compares the message bytes to the specified String object.
* @param s the String to compare
@@ -626,6 +641,19 @@ public final class ByteChunk implements
// Hash code
+@Override
+public int hashCode() {
+if (hasHashCode) {
+return hashCode;
+}
+int code = 0;
+
+code = hash();
+hashCode = code;
+hasHashCode = true;
+return code;
+}
+
// normal hash.
public int hash() {
return hashBytes( buff, start, end-start);
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1417194&r1=1417193&r2=1417194&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Dec 4
21:21:11 2012
@@ -57,6 +57,11 @@ public final class CharChunk implements
}
//
+
+private int hashCode = 0;
+// did we compute the hashcode ?
+private boolean hasHashCode = false;
+
// char[]
private char buff[];
@@ -99,6 +104,7 @@ public final class CharChunk implements
public void recycle() {
//buff=null;
isSet=false; // XXX
+hasHashCode = false;
start=0;
end=0;
}
@@ -113,6 +119,7 @@ public final class CharChunk implements
start=0;
end=0;
isSet=true;
+hasHashCode = false;
}
@@ -125,6 +132,7 @@ public final class CharChunk implements
start=off;
end=start + len;
isSet=true;
+hasHashCode = false;
}
/** Maximum amount of data in this buffer.
@@ -455,6 +463,14 @@ public final class CharChunk implements
// equals
+@Override
+public boolean equals(Object obj) {
+if (obj instanceof CharChunk) {
+return equals((CharChunk) obj);
+}
+return false;
+}
+
/**
* Compares the message bytes to the specified String object.
* @param s the String to compare
@@ -578,6 +594,19 @@ public final class CharChunk implements
// Hash code
+@Override
+public int hashCode() {
+if (hasHashCode) {
+return hashCode;
+}
+int code = 0;
+
+code = hash();
+hashCode = code;
+hasHashCode = true;
+return code;
+}
+
// normal hash.
public int hash() {
int code=0;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417199 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt
Date: Tue Dec 4 21:37:03 2012
New Revision: 1417199
URL: http://svn.apache.org/viewvc?rev=1417199&view=rev
Log:
Fix FindBugs warnings
volatile int -> AtomicIntger so operations are actually atomic
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1417199&r1=1417198&r2=1417199&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Dec 4
21:37:03 2012
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -1134,7 +1135,7 @@ public class AprEndpoint extends Abstrac
private int[] addSocketTimeout;
private int[] addSocketFlags;
-private volatile int addCount = 0;
+private AtomicInteger addCount = new AtomicInteger(0);
private boolean comet = true;
@@ -1167,7 +1168,7 @@ public class AprEndpoint extends Abstrac
addSocket = new long[size];
addSocketTimeout = new int[size];
addSocketFlags = new int[size];
-addCount = 0;
+addCount.set(0);
}
/**
@@ -1176,7 +1177,7 @@ public class AprEndpoint extends Abstrac
@Override
public void destroy() {
// Close all sockets in the add queue
-for (int i = 0; i < addCount; i++) {
+for (int i = 0; i < addCount.get(); i++) {
if (comet) {
processSocket(addSocket[i], SocketStatus.STOP);
} else {
@@ -1187,7 +1188,7 @@ public class AprEndpoint extends Abstrac
closePollset(connectionPollset);
Pool.destroy(pool);
keepAliveCount = 0;
-addCount = 0;
+addCount.set(0);
try {
while (this.isAlive()) {
this.interrupt();
@@ -1231,7 +1232,7 @@ public class AprEndpoint extends Abstrac
synchronized (this) {
// Add socket to the list. Newly added sockets will wait
// at most for pollTime before being polled
-if (addCount >= addSocket.length) {
+if (addCount.get() >= addSocket.length) {
// Can't do anything: close the socket right away
if (comet) {
processSocket(socket, SocketStatus.ERROR);
@@ -1240,10 +1241,10 @@ public class AprEndpoint extends Abstrac
}
return;
}
-addSocket[addCount] = socket;
-addSocketTimeout[addCount] = timeout;
-addSocketFlags[addCount] = flags;
-addCount++;
+addSocket[addCount.get()] = socket;
+addSocketTimeout[addCount.get()] = timeout;
+addSocketFlags[addCount.get()] = flags;
+addCount.incrementAndGet();
// TODO: interrupt poll ?
this.notify();
}
@@ -1271,9 +1272,9 @@ public class AprEndpoint extends Abstrac
if (!running) {
break;
}
-if (keepAliveCount < 1 && addCount < 1) {
+if (keepAliveCount < 1 && addCount.get() < 1) {
synchronized (this) {
-while (keepAliveCount < 1 && addCount < 1 && running) {
+while (keepAliveCount < 1 && addCount.get() < 1 &&
running) {
// Reset maintain time.
maintainTime = 0;
try {
@@ -1290,11 +1291,11 @@ public class AprEndpoint extends Abstrac
}
try {
// Add sockets which are waiting to the poller
-if (addCount > 0) {
+if (addCount.get() > 0) {
synchronized (this) {
int successCount = 0;
try {
-for (int i = (addCount - 1); i >= 0; i--) {
+for (int i = (addCount.get() - 1); i >= 0;
i--) {
int timeout = addSocketTimeout[i];
if (timeout > 0) {
// Convert milliseconds to microseconds
@@ -1316,7 +1317,7 @@ public class AprEndpoint extends Abstrac
svn commit: r1417201 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: markt
Date: Tue Dec 4 21:38:54 2012
New Revision: 1417201
URL: http://svn.apache.org/viewvc?rev=1417201&view=rev
Log:
Fix FindBugs warning
Avoid NPE (although given an OOME has occurred I'm not sure it matters)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1417201&r1=1417200&r2=1417201&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Dec 4
21:38:54 2012
@@ -1617,7 +1617,9 @@ public class NioEndpoint extends Abstrac
} catch (OutOfMemoryError oom) {
try {
oomParachuteData = null;
-
socket.getPoller().cancelledKey(key,SocketStatus.ERROR);
+if (socket != null) {
+
socket.getPoller().cancelledKey(key,SocketStatus.ERROR);
+}
releaseCaches();
log.error("", oom);
}catch ( Throwable oomt ) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54191] TomEE 1.5+ SNAPSHOT struggling with PrimeFaces p:calendar readonlyInput="#{someEL ? 'true' : 'false'}"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54191 --- Comment #6 from Konstantin Kolinko --- It looks as if your pf_usersController.loggedInViaIpad returns 'Y' occasionally. How that property is evaluated? Do you parse the user-agent header of each request? Maybe your ajax calls are loosing the session, or the session expires. (-> ask on the users list). As Mark already wrote, you have to provide a simple web application that reproduces the issue. (It does not need to be a plain JSP application. Using myfaces in it is OK. If you use any custom code in it, the source code for it will be needed). -- 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: r1417218 - in /tomcat/trunk: build.xml res/META-INF/default/.gitignore
Author: markt Date: Tue Dec 4 22:08:26 2012 New Revision: 1417218 URL: http://svn.apache.org/viewvc?rev=1417218&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54245 Keep git happy about a currently empty directory Added: tomcat/trunk/res/META-INF/default/.gitignore Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1417218&r1=1417217&r2=1417218&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Tue Dec 4 22:08:26 2012 @@ -2672,7 +2672,8 @@ Read the Building page on the Apache Tom - + Added: tomcat/trunk/res/META-INF/default/.gitignore URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/default/.gitignore?rev=1417218&view=auto == --- tomcat/trunk/res/META-INF/default/.gitignore (added) +++ tomcat/trunk/res/META-INF/default/.gitignore Tue Dec 4 22:08:26 2012 @@ -0,0 +1,24 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - +# Git ignores empty directories and the unit tests require this directory to +# be present for the welcome file tests to pass. The presence of this file +# doesn't break the unit tests. +# +# Ignore everything in this directory +* +# Except this file +!.gitignore \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54245] TomcatRepo\build.xml:2668: TomcatRepo\output\manifests\default does not exist
https://issues.apache.org/bugzilla/show_bug.cgi?id=54245 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas --- Thanks for the report. -- 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: r1417224 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/Util.java
Author: kkolinko
Date: Tue Dec 4 22:29:35 2012
New Revision: 1417224
URL: http://svn.apache.org/viewvc?rev=1417224&view=rev
Log:
Review of r1412576, which was a fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=54170
Reduce GC. There is no need to copy characters into a new char[] array here.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/Util.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Util.java?rev=1417224&r1=1417223&r2=1417224&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Util.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Util.java Tue Dec 4
22:29:35 2012
@@ -23,9 +23,8 @@ public class Util {
}
public static boolean objectNameValueNeedsQuote(String input) {
-char[] chars = input.toCharArray();
for (int i = 0; i < input.length(); i++) {
-char ch = chars[i];
+char ch = input.charAt(i);
if (ch == ',' || ch == '=' || ch == ':' || ch == '*' || ch == '?')
{
return true;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417226 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/modeler/Util.java
Author: kkolinko
Date: Tue Dec 4 22:32:09 2012
New Revision: 1417226
URL: http://svn.apache.org/viewvc?rev=1417226&view=rev
Log:
Merged revision 1417224 from tomcat/trunk:
Review of r1412576, which was a fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=54170
Reduce GC. There is no need to copy characters into a new char[] array here.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Util.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1417224
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Util.java?rev=1417226&r1=1417225&r2=1417226&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Util.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Util.java Tue Dec
4 22:32:09 2012
@@ -23,9 +23,8 @@ public class Util {
}
public static boolean objectNameValueNeedsQuote(String input) {
-char[] chars = input.toCharArray();
for (int i = 0; i < input.length(); i++) {
-char ch = chars[i];
+char ch = input.charAt(i);
if (ch == ',' || ch == '=' || ch == ':' || ch == '*' || ch == '?')
{
return true;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54191] TomEE 1.5+ SNAPSHOT struggling with PrimeFaces p:calendar readonlyInput="#{someEL ? 'true' : 'false'}"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54191 --- Comment #7 from smithh032772 --- Thanks for reviewing the issue and the responses. Honestly, right now, I am too busy to build a simple project that duplicates the issue. I really just wanted to report the issue. I am quite sure that I'm not losing the session, but I could or would need to confirm or test for that. Yes, I am using some reusable code (that was posted in a forum) that parses the user agent on every request. Coincidentally, I did modify this code when migrating from JSF managed beans to CDI managed beans (running on TomEE 1.5.1 SNAPSHOT). I am willing to attach LoginFilter.java and the code that parses the user agent. I resolved the issue already with a workaround, and I am fine with the issue being marked with the WORKSFORME status. Thanks, Howard -- 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
[Bug 54191] TomEE 1.5+ SNAPSHOT struggling with PrimeFaces p:calendar readonlyInput="#{someEL ? 'true' : 'false'}"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54191 --- Comment #8 from smithh032772 --- Created attachment 29691 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29691&action=edit LoginFilter.java parses user agent and populates user bean, etc... Attached LoginFilter.java -- 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
[Bug 54191] TomEE 1.5+ SNAPSHOT struggling with PrimeFaces p:calendar readonlyInput="#{someEL ? 'true' : 'false'}"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54191 --- Comment #9 from smithh032772 --- Created attachment 29692 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29692&action=edit Parses user agent Attached UserAgentInfo.java -- 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
[Bug 54191] TomEE 1.5+ SNAPSHOT struggling with PrimeFaces p:calendar readonlyInput="#{someEL ? 'true' : 'false'}"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54191 --- Comment #10 from smithh032772 --- Even though I developed a workaround for this issue, I tried to half-way revert my code back to the code that initially could duplicate this issue. I only added the EL to the readonlyInput="..." property of p:calendar. See below. I attempted to duplicate this issue, but I was 'not' able to duplicate this issue with yesterday's version of TomEE 1.5.1 SNAPSHOT, apache-tomee-1.5.1-20121203.041800-97-plus.zip. I set debug = true in LoginFilter, and the following was in server log: Dec 04, 2012 5:45:47 PM org.apache.catalina.startup.Catalina start INFO: Server startup in 26926 ms LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/login.jsf LoginFilter.doFilter(): ajaxRequest = false; ajaxHeader = null LoginFilter.doFilter(): agent.getUserAgent() = mozilla/5.0 (windows nt 6.0; wow64) applewebkit/537.11 (khtml, like gecko) chrome/23.0.1271.95 safari/537.11 Dec 04, 2012 5:45:55 PM org.apache.myfaces.el.unified.ResolverBuilderBase sortELResolvers INFO: Chain of EL resolvers for Faces sorted with: org.apache.myfaces.el.unified.OpenWebBeansELResolverComparator@3707cedb and the result order is [org.apache.myfaces.el.unified.resolver.implicitobject.ImplicitObjectResolver@619da816, org.apache.myfaces.el.unified.resolver.CompositeComponentELResolver@35866e6b, org.apache.myfaces.el.FlashELResolver@cbb4e41, org.apache.myfaces.el.unified.resolver.ManagedBeanResolver@5d0e93ee, org.apache.myfaces.el.unified.resolver.ResourceResolver@68121dfc, javax.el.ResourceBundleELResolver@7d6ec0c4, org.apache.myfaces.el.unified.resolver.ResourceBundleResolver@7231c431, javax.el.MapELResolver@2147a789, javax.el.ListELResolver@67482470, javax.el.ArrayELResolver@31506a09, javax.el.BeanELResolver@16618e2a, org.apache.webbeans.el.WebBeansELResolver@5ebc72e0] LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/login.jsf LoginFilter.doFilter(): ajaxRequest = false; ajaxHeader = null [EL Info]: 2012-12-04 17:45:57.189--ServerSession(534087359)--EclipseLink, version: Eclipse Persistence Services - 2.3.2.v2025-r10461 [EL Info]: 2012-12-04 17:45:57.776--ServerSession(534087359)--file:/C:/apache-tomee-plus-1.5.1-SNAPSHOT/webapps/mcmsweb/WEB-INF/classes/_mcmsPU login successful GoogleCalendarUtil: calendarList.getEntries().size() = 2 GoogleCalendarUtil: calendar ID/summary = oleta...@gmail.com/mcmsweb GoogleCalendarUtil: calendar ID/summary = 998449989...@developer.gserviceaccount.com/998449989...@developer.gserviceaccount.com GoogleCalendarUtil: events.getItems().size() = 250 pf_UsersController.loginUser(): administrator logged in at Tue Dec 04 17:45:58 EST 2012 LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/index.jsf LoginFilter.doFilter(): ajaxRequest = false; ajaxHeader = null LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/index.jsf LoginFilter.doFilter(): ajaxRequest = true; ajaxHeader = XMLHttpRequest LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/index.jsf LoginFilter.doFilter(): ajaxRequest = true; ajaxHeader = XMLHttpRequest LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/index.jsf LoginFilter.doFilter(): ajaxRequest = true; ajaxHeader = XMLHttpRequest LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/index.jsf LoginFilter.doFilter(): ajaxRequest = true; ajaxHeader = XMLHttpRequest LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/index.jsf LoginFilter.doFilter(): ajaxRequest = true; ajaxHeader = XMLHttpRequest LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/index.jsf LoginFilter.doFilter(): ajaxRequest = true; ajaxHeader = XMLHttpRequest LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/index.jsf LoginFilter.doFilter(): ajaxRequest = false; ajaxHeader = null LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/index.jsf LoginFilter.doFilter(): ajaxRequest = false; ajaxHeader = null LoginFilter
[Bug 54191] TomEE 1.5+ SNAPSHOT struggling with PrimeFaces p:calendar readonlyInput="#{someEL ? 'true' : 'false'}"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54191 --- Comment #11 from smithh032772 --- As I mentioned earlier, please mark this issue as WORKSFORME. Thanks, Howard -- 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
[Bug 54191] TomEE 1.5+ SNAPSHOT struggling with PrimeFaces p:calendar readonlyInput="#{someEL ? 'true' : 'false'}"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54191 Konstantin Kolinko changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INVALID --- Comment #12 from Konstantin Kolinko --- Your UserAgentInfo class does not support multithreading. The problem is that you store a reference to this class in a field of your LoginFilter class. Note that the Filter is created only once and the single instance of the filter processes all incoming requests. So the same UserAgentInfo instance is reused by multiple requests in parallel and thus contains wrong data. -- 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: r1417232 - /tomcat/trunk/res/META-INF/default/.gitignore
Author: kkolinko Date: Tue Dec 4 23:04:10 2012 New Revision: 1417232 URL: http://svn.apache.org/viewvc?rev=1417232&view=rev Log: svn:eol-style = native Modified: tomcat/trunk/res/META-INF/default/.gitignore (contents, props changed) Modified: tomcat/trunk/res/META-INF/default/.gitignore URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/default/.gitignore?rev=1417232&r1=1417231&r2=1417232&view=diff == --- tomcat/trunk/res/META-INF/default/.gitignore (original) +++ tomcat/trunk/res/META-INF/default/.gitignore Tue Dec 4 23:04:10 2012 @@ -1,24 +1,24 @@ -# - -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Git ignores empty directories and the unit tests require this directory to -# be present for the welcome file tests to pass. The presence of this file -# doesn't break the unit tests. -# -# Ignore everything in this directory -* -# Except this file +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - +# Git ignores empty directories and the unit tests require this directory to +# be present for the welcome file tests to pass. The presence of this file +# doesn't break the unit tests. +# +# Ignore everything in this directory +* +# Except this file !.gitignore \ No newline at end of file Propchange: tomcat/trunk/res/META-INF/default/.gitignore -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54191] TomEE 1.5+ SNAPSHOT struggling with PrimeFaces p:calendar readonlyInput="#{someEL ? 'true' : 'false'}"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54191 --- Comment #13 from smithh032772 --- Per my experience and per test results, my LoginFilter supports multithreading and any/all requests. Per design (and working as expected), userAgentInfo is only referenced when user is not logged in. Once user is logged in and user agent info is stored in user bean, then there is no longer a need for user agent. This is all working as designed. I just ran another test to confirm what I stated above. Below, you will see that I 1st logged in via my laptop (Google chrome browser), and then afterwards, I logged in via my galaxy nexus (google chrome browser as well), and the last request was from my laptop to look at my users page, which shows how many sessions each user have open (a homegrown session monitor). Dec 04, 2012 6:01:41 PM org.apache.catalina.startup.Catalina start INFO: Server startup in 19674 ms LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/javax.faces.resource/images/ui-bg_flat_0_2d5972_40x100.png.jsf LoginFilter.doFilter(): ajaxRequest = false; ajaxHeader = null LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/index.jsf LoginFilter.doFilter(): ajaxRequest = false; ajaxHeader = null LoginFilter.doFilter(): agent.getUserAgent() = mozilla/5.0 (windows nt 6.0; wow64) applewebkit/537.11 (khtml, like gecko) chrome/23.0.1271.95 safari/537.11 LoginFilter.doFilter(): agent.getUserAgent() = mozilla/5.0 (windows nt 6.0; wow64) applewebkit/537.11 (khtml, like gecko) chrome/23.0.1271.95 safari/537.11 LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/login.jsf LoginFilter.doFilter(): ajaxRequest = false; ajaxHeader = null LoginFilter.doFilter(): agent.getUserAgent() = mozilla/5.0 (windows nt 6.0; wow64) applewebkit/537.11 (khtml, like gecko) chrome/23.0.1271.95 safari/537.11 Dec 04, 2012 6:02:11 PM org.apache.myfaces.el.unified.ResolverBuilderBase sortELResolvers INFO: Chain of EL resolvers for Faces sorted with: org.apache.myfaces.el.unified.OpenWebBeansELResolverComparator@7850c424 and the result order is [org.apache.myfaces.el.unified.resolver.implicitobject.ImplicitObjectResolver@7e7d5531, org.apache.myfaces.el.unified.resolver.CompositeComponentELResolver@566444d7, org.apache.myfaces.el.FlashELResolver@50e3ab90, org.apache.myfaces.el.unified.resolver.ManagedBeanResolver@1314a46d, org.apache.myfaces.el.unified.resolver.ResourceResolver@3036f9e4, javax.el.ResourceBundleELResolver@69500076, org.apache.myfaces.el.unified.resolver.ResourceBundleResolver@34e78fe, javax.el.MapELResolver@14e96d64, javax.el.ListELResolver@690ccaf5, javax.el.ArrayELResolver@46e0d0b4, javax.el.BeanELResolver@51a5fdc6, org.apache.webbeans.el.WebBeansELResolver@68b7fc0a] LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/login.jsf LoginFilter.doFilter(): ajaxRequest = false; ajaxHeader = null [EL Info]: 2012-12-04 18:02:28.03--ServerSession(1717835602)--EclipseLink, version: Eclipse Persistence Services - 2.3.2.v2025-r10461 [EL Info]: 2012-12-04 18:02:28.593--ServerSession(1717835602)--file:/C:/apache-tomee-plus-1.5.1-SNAPSHOT/webapps/mcmsweb/WEB-INF/classes/_mcmsPU login successful GoogleCalendarUtil: calendarList.getEntries().size() = 2 GoogleCalendarUtil: calendar ID/summary = oleta...@gmail.com/mcmsweb GoogleCalendarUtil: calendar ID/summary = 998449989...@developer.gserviceaccount.com/998449989...@developer.gserviceaccount.com GoogleCalendarUtil: events.getItems().size() = 250 pf_UsersController.loginUser(): administrator logged in at Tue Dec 04 18:02:29 EST 2012 LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/index.jsf LoginFilter.doFilter(): ajaxRequest = false; ajaxHeader = null LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/login.jsf LoginFilter.doFilter(): ajaxRequest = false; ajaxHeader = null LoginFilter.doFilter(): isAndroid = true LoginFilter.doFilter(): agent.getUserAgent() = mozilla/5.0 (linux; android 4.1.1; galaxy nexus build/jro03u) applewebkit/535.19 (khtml, like gecko) chrome/18.0.1025.166 mobile safari/535.19 LoginFilter.doFilter(): session = NOT null LoginFilter.doFilter(): pf_usersController = NOT null LoginFilter.doFilter(): req.getRequestURI() = /mcmsweb/loginViaMobile.jsf LoginFilter.doFilter(): ajaxRequest = false; ajaxHeader = null LoginFilter.doFilter(): isAndroid = true LoginFilter.doFilter(): agent.getUserAgent() = mozilla/5.0 (linux; android 4.1.1; galaxy nexus build/jro03u) applewebkit/535
[Bug 54191] TomEE 1.5+ SNAPSHOT struggling with PrimeFaces p:calendar readonlyInput="#{someEL ? 'true' : 'false'}"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54191 --- Comment #14 from Konstantin Kolinko --- (In reply to comment #12) > Your UserAgentInfo class does not support multithreading. > > The problem is that you store a reference to this class in a field of your > LoginFilter class. > s/UserAgentInfo/pf_UsersController/ above. It is pf_UsersController instance that is stored in LoginFilter.userBEan field and is shared across requests. -- 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
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3637 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1417224 Blamelist: kkolinko,markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
Re: buildbot failure in ASF Buildbot on tomcat-trunk
2012/12/5 : > The Buildbot has detected a new failure on builder tomcat-trunk while > building ASF Buildbot. > Full details are available at: > http://ci.apache.org/builders/tomcat-trunk/builds/3637 > > Buildbot URL: http://ci.apache.org/ > > Buildslave for this Build: bb-vm_ubuntu > > Build Reason: scheduler > Build Source Stamp: [branch tomcat/trunk] 1417224 > Blamelist: kkolinko,markt > > BUILD FAILED: failed compile_1 > TEST-org.apache.catalina.core.TestAsyncContextImpl.NIO.txt Testcase: testAsyncStartNoComplete took 5.277 sec FAILED Uri: /, Status: 500, Time: 853 junit.framework.AssertionFailedError: Uri: /, Status: 500, Time: 853 at org.apache.catalina.valves.TesterAccessLogValve.validateAccessLog(TesterAccessLogValve.java:81) at org.apache.catalina.core.TestAsyncContextImpl.testAsyncStartNoComplete(TestAsyncContextImpl.java:181) It was expected to complete no sooner than in 1000 ms (with error margin of 100). The actual value in the access log was 853. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54191] TomEE 1.5+ SNAPSHOT struggling with PrimeFaces p:calendar readonlyInput="#{someEL ? 'true' : 'false'}"
https://issues.apache.org/bugzilla/show_bug.cgi?id=54191 --- Comment #15 from smithh032772 --- > It is pf_UsersController instance that is stored in LoginFilter.userBEan > field and is shared across requests. You are correct. pf_UsersController is CDI @SessionScoped bean that is available and referenced by LoginFilter during each request. > It looks as if your pf_usersController.loggedInViaIpad returns 'Y' > occasionally. loggedInViaIpad will only be true when iPad device/user is logged in. This is why I was 'not' able to duplicate this issue...today. I didn't login via iPad. I logged in via laptop and Android device/phone. :) > How that property is evaluated? Do you parse the user-agent header of each > request? We've already discussed this. :) > Maybe your ajax calls are loosing the session, or the session expires. (-> ask on the users list). I did not see this behavior at all. My opinion is that the earlier version of TomEE 1.5.1 SNAPSHOT (tomcat 7.0.32 at the time, I think) had some issue with the EL, but I might be wrong. I just wanted to log the defect, just in case, it really was an issue. My workaround resolves this issue for me, and anyone else that does an internet search might possibly discover this issue and my workaround. Hope it helps someone. Thanks again. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1417201 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
2012/12/5 :
> Author: markt
> Date: Tue Dec 4 21:38:54 2012
> New Revision: 1417201
>
> URL: http://svn.apache.org/viewvc?rev=1417201&view=rev
> Log:
> Fix FindBugs warning
> Avoid NPE (although given an OOME has occurred I'm not sure it matters)
I think it is worth backporting.
If NPE happens, log.error("", oom); will be skipped. It is better to
always log OOMs, as things might start going weird after them.
Maybe move log.error(); statement higher by several lines.
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
>
> Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1417201&r1=1417200&r2=1417201&view=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Dec 4
> 21:38:54 2012
> @@ -1617,7 +1617,9 @@ public class NioEndpoint extends Abstrac
> } catch (OutOfMemoryError oom) {
> try {
> oomParachuteData = null;
> -
> socket.getPoller().cancelledKey(key,SocketStatus.ERROR);
> +if (socket != null) {
> +
> socket.getPoller().cancelledKey(key,SocketStatus.ERROR);
> +}
> releaseCaches();
> log.error("", oom);
> }catch ( Throwable oomt ) {
>
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1417199 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
2012/12/5 :
> Author: markt
> Date: Tue Dec 4 21:37:03 2012
> New Revision: 1417199
>
> URL: http://svn.apache.org/viewvc?rev=1417199&view=rev
> Log:
> Fix FindBugs warnings
> volatile int -> AtomicIntger so operations are actually atomic
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
>
> Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1417199&r1=1417198&r2=1417199&view=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Dec 4
> 21:37:03 2012
> @@ -25,6 +25,7 @@ import java.util.Iterator;
> import java.util.concurrent.ConcurrentLinkedQueue;
> import java.util.concurrent.Executor;
> import java.util.concurrent.RejectedExecutionException;
> +import java.util.concurrent.atomic.AtomicInteger;
>
> import org.apache.juli.logging.Log;
> import org.apache.juli.logging.LogFactory;
> @@ -1134,7 +1135,7 @@ public class AprEndpoint extends Abstrac
> private int[] addSocketTimeout;
> private int[] addSocketFlags;
>
> -private volatile int addCount = 0;
> +private AtomicInteger addCount = new AtomicInteger(0);
>
> private boolean comet = true;
>
> @@ -1167,7 +1168,7 @@ public class AprEndpoint extends Abstrac
> addSocket = new long[size];
> addSocketTimeout = new int[size];
> addSocketFlags = new int[size];
> -addCount = 0;
> +addCount.set(0);
> }
>
> /**
> @@ -1176,7 +1177,7 @@ public class AprEndpoint extends Abstrac
> @Override
> public void destroy() {
> // Close all sockets in the add queue
> -for (int i = 0; i < addCount; i++) {
> +for (int i = 0; i < addCount.get(); i++) {
> if (comet) {
> processSocket(addSocket[i], SocketStatus.STOP);
Using an atomic "addCount" while addSocket array is not protected by
synchronization is slightly weird. Both of them are supposed to be in
sync with each other.
> } else {
> @@ -1187,7 +1188,7 @@ public class AprEndpoint extends Abstrac
> closePollset(connectionPollset);
> Pool.destroy(pool);
> keepAliveCount = 0;
> -addCount = 0;
> +addCount.set(0);
> try {
> while (this.isAlive()) {
> this.interrupt();
> @@ -1231,7 +1232,7 @@ public class AprEndpoint extends Abstrac
> synchronized (this) {
> // Add socket to the list. Newly added sockets will wait
> // at most for pollTime before being polled
> -if (addCount >= addSocket.length) {
> +if (addCount.get() >= addSocket.length) {
> // Can't do anything: close the socket right away
> if (comet) {
> processSocket(socket, SocketStatus.ERROR);
> @@ -1240,10 +1241,10 @@ public class AprEndpoint extends Abstrac
> }
> return;
> }
> -addSocket[addCount] = socket;
> -addSocketTimeout[addCount] = timeout;
> -addSocketFlags[addCount] = flags;
> -addCount++;
> +addSocket[addCount.get()] = socket;
> +addSocketTimeout[addCount.get()] = timeout;
> +addSocketFlags[addCount.get()] = flags;
> +addCount.incrementAndGet();
> // TODO: interrupt poll ?
> this.notify();
> }
> @@ -1271,9 +1272,9 @@ public class AprEndpoint extends Abstrac
> if (!running) {
> break;
> }
> -if (keepAliveCount < 1 && addCount < 1) {
> +if (keepAliveCount < 1 && addCount.get() < 1) {
> synchronized (this) {
> -while (keepAliveCount < 1 && addCount < 1 &&
> running) {
> +while (keepAliveCount < 1 && addCount.get() < 1 &&
> running) {
> // Reset maintain time.
> maintainTime = 0;
> try {
> @@ -1290,11 +1291,11 @@ public class AprEndpoint extends Abstrac
> }
> try {
> // Add sockets which are waiting to the poller
> -if (addCount > 0) {
> +if (addCount.get() > 0) {
> synchronized (this) {
> int successCount = 0;
> try {
> -for (int i = (addCount - 1); i >= 0; i--) {
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3638 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1417232 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
[Bug 53281] Tomcat returns garbage data with HTTP/0.9 200 OK header when SSL port is accessed using http
https://issues.apache.org/bugzilla/show_bug.cgi?id=53281 Bruce Li changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID |--- --- Comment #7 from Bruce Li --- Why is it resolved as invalid? Is there any solution to this issue? -- 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
[Bug 53281] Tomcat returns garbage data with HTTP/0.9 200 OK header when SSL port is accessed using http
https://issues.apache.org/bugzilla/show_bug.cgi?id=53281 Konstantin Kolinko changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |INVALID --- Comment #8 from Konstantin Kolinko --- There are several reasons. The first one is that one has to prove that there is an issue. So far nobody reproduced this issue. Tomcat connectors do not behave as the OP describes. -- 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: r1417282 - in /tomcat/trunk/webapps/docs/config: ajp.xml executor.xml http.xml
Author: kkolinko Date: Wed Dec 5 05:34:16 2012 New Revision: 1417282 URL: http://svn.apache.org/viewvc?rev=1417282&view=rev Log: Clarify the docs that the thread priority value is a number and not some weird string value. A thread on users@ from Dec 02 2012: http://tomcat.markmail.org/thread/iud2m7j743qwx4ui Modified: tomcat/trunk/webapps/docs/config/ajp.xml tomcat/trunk/webapps/docs/config/executor.xml tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/ajp.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1417282&r1=1417281&r2=1417282&view=diff == --- tomcat/trunk/webapps/docs/config/ajp.xml (original) +++ tomcat/trunk/webapps/docs/config/ajp.xml Wed Dec 5 05:34:16 2012 @@ -285,9 +285,10 @@ The priority of the acceptor threads. The threads used to accept - new connections. The default value is - java.lang.Thread#NORM_PRIORITY. See the JavaDoc for the - java.lang.Thread class for more details on what this priority means. + new connections. The default value is 5 (the value of the + java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc + for the java.lang.Thread class for more details on what + this priority means. @@ -411,9 +412,10 @@ The priority of the request processing threads within the JVM. - The default value is java.lang.Thread#NORM_PRIORITY. - See the JavaDoc for the java.lang.Thread class for more details on - what this priority means. + The default value is 5 (the value of the + java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc + for the java.lang.Thread class for more details on what + this priority means. Modified: tomcat/trunk/webapps/docs/config/executor.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/executor.xml?rev=1417282&r1=1417281&r2=1417282&view=diff == --- tomcat/trunk/webapps/docs/config/executor.xml (original) +++ tomcat/trunk/webapps/docs/config/executor.xml Wed Dec 5 05:34:16 2012 @@ -83,7 +83,8 @@ - (int) The thread priority for threads in the executor, the default is Thread.NORM_PRIORITY + (int) The thread priority for threads in the executor, the default is + 5 (the value of the Thread.NORM_PRIORITY constant) (boolean) Whether the threads should be daemon threads or not, the default is true Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1417282&r1=1417281&r2=1417282&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Wed Dec 5 05:34:16 2012 @@ -279,9 +279,10 @@ The priority of the acceptor threads. The threads used to accept - new connections. The default value is - java.lang.Thread#NORM_PRIORITY. See the JavaDoc for the - java.lang.Thread class for more details on what this priority means. + new connections. The default value is 5 (the value of the + java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc + for the java.lang.Thread class for more details on what + this priority means. @@ -497,9 +498,10 @@ The priority of the request processing threads within the JVM. - The default value is java.lang.Thread#NORM_PRIORITY. - See the JavaDoc for the java.lang.Thread class for more details on - what this priority means. + The default value is 5 (the value of the + java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc + for the java.lang.Thread class for more details on what + this priority means. @@ -621,9 +623,11 @@ -(int)The priority of the poller threads. The default value is -java.lang.Thread#NORM_PRIORITY. See the JavaDoc for the -java.lang.Thread class for more details on what this priority means. +(int)The priority of the poller threads. +The default value is 5 (the value of the +java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc +for the java.lang.Thread class for more details on what +this priority means. @@ -807,10 +811,11 @@ -(int)The priority of the acceptor and poller threads. The default -value is java.lang.Thread#NORM_PRIORITY. See the JavaDoc -for the java.lang.Thread class for more details on what this priority -means. +(int)The priority of the acceptor and poller threads. +The default value is 5 (the value of the +java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc +
svn commit: r1417284 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/ajp.xml webapps/docs/config/executor.xml webapps/docs/config/http.xml
Author: kkolinko Date: Wed Dec 5 05:40:40 2012 New Revision: 1417284 URL: http://svn.apache.org/viewvc?rev=1417284&view=rev Log: Merged revision 1417282 from tomcat/trunk: Clarify the docs that the thread priority value is a number and not some weird string value. A thread on users@ from Dec 02 2012: http://tomcat.markmail.org/thread/iud2m7j743qwx4ui Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml tomcat/tc7.0.x/trunk/webapps/docs/config/executor.xml tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1417282 Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml?rev=1417284&r1=1417283&r2=1417284&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml Wed Dec 5 05:40:40 2012 @@ -285,9 +285,10 @@ The priority of the acceptor threads. The threads used to accept - new connections. The default value is - java.lang.Thread#NORM_PRIORITY. See the JavaDoc for the - java.lang.Thread class for more details on what this priority means. + new connections. The default value is 5 (the value of the + java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc + for the java.lang.Thread class for more details on what + this priority means. @@ -411,9 +412,10 @@ The priority of the request processing threads within the JVM. - The default value is java.lang.Thread#NORM_PRIORITY. - See the JavaDoc for the java.lang.Thread class for more details on - what this priority means. + The default value is 5 (the value of the + java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc + for the java.lang.Thread class for more details on what + this priority means. Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/executor.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/executor.xml?rev=1417284&r1=1417283&r2=1417284&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/executor.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/executor.xml Wed Dec 5 05:40:40 2012 @@ -83,7 +83,8 @@ - (int) The thread priority for threads in the executor, the default is Thread.NORM_PRIORITY + (int) The thread priority for threads in the executor, the default is + 5 (the value of the Thread.NORM_PRIORITY constant) (boolean) Whether the threads should be daemon threads or not, the default is true Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1417284&r1=1417283&r2=1417284&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Wed Dec 5 05:40:40 2012 @@ -279,9 +279,10 @@ The priority of the acceptor threads. The threads used to accept - new connections. The default value is - java.lang.Thread#NORM_PRIORITY. See the JavaDoc for the - java.lang.Thread class for more details on what this priority means. + new connections. The default value is 5 (the value of the + java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc + for the java.lang.Thread class for more details on what + this priority means. @@ -497,9 +498,10 @@ The priority of the request processing threads within the JVM. - The default value is java.lang.Thread#NORM_PRIORITY. - See the JavaDoc for the java.lang.Thread class for more details on - what this priority means. + The default value is 5 (the value of the + java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc + for the java.lang.Thread class for more details on what + this priority means. @@ -621,9 +623,11 @@ -(int)The priority of the poller threads. The default value is -java.lang.Thread#NORM_PRIORITY. See the JavaDoc for the -java.lang.Thread class for more details on what this priority means. +(int)The priority of the poller threads. +The default value is 5 (the value of the +java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc +for the java.lang.Thread class for more details on what +this priority means. @@ -807,10 +811,11 @@ -(int)The priority of the acceptor and poller threads. The defa
svn commit: r1417285 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/config/executor.xml webapps/docs/config/http.xml
Author: kkolinko Date: Wed Dec 5 05:50:22 2012 New Revision: 1417285 URL: http://svn.apache.org/viewvc?rev=1417285&view=rev Log: Clarify the docs that the thread priority value is a number and not some weird string value. A thread on users@ from Dec 02 2012: http://tomcat.markmail.org/thread/iud2m7j743qwx4ui Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/config/executor.xml tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1417282 Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/executor.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/executor.xml?rev=1417285&r1=1417284&r2=1417285&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/executor.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/executor.xml Wed Dec 5 05:50:22 2012 @@ -83,7 +83,8 @@ - (int) The thread priority for threads in the executor, the default is Thread.NORM_PRIORITY + (int) The thread priority for threads in the executor, the default is + 5 (the value of the Thread.NORM_PRIORITY constant) (boolean) Whether the threads should be daemon threads or not, the default is true Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?rev=1417285&r1=1417284&r2=1417285&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Wed Dec 5 05:50:22 2012 @@ -431,9 +431,10 @@ The priority of the request processing threads within the JVM. - The default value is java.lang.Thread#NORM_PRIORITY. - See the JavaDoc for the java.lang.Thread class for more details on - what this priority means. + The default value is 5 (the value of the + java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc + for the java.lang.Thread class for more details on what + this priority means. @@ -482,16 +483,18 @@ (int)The priority of the poller threads. - The default value is java.lang.Thread#NORM_PRIORITY. - See the JavaDoc for the java.lang.Thread class for more details on - what this priority means. +The default value is 5 (the value of the +java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc +for the java.lang.Thread class for more details on what +this priority means. (int)The priority of the acceptor threads. The threads used to accept new connections. - The default value is java.lang.Thread#NORM_PRIORITY. - See the JavaDoc for the java.lang.Thread class for more details on - what this priority means. +The default value is 5 (the value of the +java.lang.Thread.NORM_PRIORITY constant). See the JavaDoc +for the java.lang.Thread class for more details on what +this priority means. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417286 - in /tomcat/site/trunk: docs/security-3.html docs/security-4.html docs/security-5.html xdocs/security-3.xml xdocs/security-4.xml xdocs/security-5.xml
Author: kkolinko Date: Wed Dec 5 05:58:24 2012 New Revision: 1417286 URL: http://svn.apache.org/viewvc?rev=1417286&view=rev Log: Update vulnerabilities pages to mention that Tomcat 5.5 is not supported any more. Modified: tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/xdocs/security-3.xml tomcat/site/trunk/xdocs/security-4.xml tomcat/site/trunk/xdocs/security-5.xml Modified: tomcat/site/trunk/docs/security-3.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-3.html?rev=1417286&r1=1417285&r2=1417286&view=diff == --- tomcat/site/trunk/docs/security-3.html (original) +++ tomcat/site/trunk/docs/security-3.html Wed Dec 5 05:58:24 2012 @@ -256,7 +256,7 @@ Please note that Tomcat 3 is no longer supported. Further vulnerabilities - in the 3.x branches will not be fixed. Users should upgrade to 5.5.x, + in the 3.x branches will not be fixed. Users should upgrade to 6.x or 7.x to obtain security fixes. Modified: tomcat/site/trunk/docs/security-4.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=1417286&r1=1417285&r2=1417286&view=diff == --- tomcat/site/trunk/docs/security-4.html (original) +++ tomcat/site/trunk/docs/security-4.html Wed Dec 5 05:58:24 2012 @@ -284,7 +284,7 @@ Please note that Tomcat 4.0.x and 4.1.x are no longer supported. Further vulnerabilities in the 4.0.x and 4.1.x branches will not be fixed. Users - should upgrade to 5.5.x, 6.x or 7.x to obtain security fixes. + should upgrade to 6.x or 7.x to obtain security fixes. Please send comments or corrections for these vulnerabilities to the Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1417286&r1=1417285&r2=1417286&view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Wed Dec 5 05:58:24 2012 @@ -300,9 +300,9 @@ provides a workaround are listed at the end of this page. -Please note that Tomcat 5.0.x is no longer supported. Further - vulnerabilities in the 5.0.x branch will not be fixed. Users should - upgrade to 5.5.x, 6.x or 7.x to obtain security fixes. Vulnerabilities fixed +Please note that Tomcat 5.0.x and 5.5.x are no longer supported. Further + vulnerabilities in the 5.0.x and 5.5.x branches will not be fixed. Users should + upgrade to 6.x or 7.x to obtain security fixes. Vulnerabilities fixed in Tomcat 5.5.26 onwards have not been assessed to determine if they are present in the 5.0.x branch. Modified: tomcat/site/trunk/xdocs/security-3.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-3.xml?rev=1417286&r1=1417285&r2=1417286&view=diff == --- tomcat/site/trunk/xdocs/security-3.xml (original) +++ tomcat/site/trunk/xdocs/security-3.xml Wed Dec 5 05:58:24 2012 @@ -22,7 +22,7 @@ version with a question mark. Please note that Tomcat 3 is no longer supported. Further vulnerabilities - in the 3.x branches will not be fixed. Users should upgrade to 5.5.x, + in the 3.x branches will not be fixed. Users should upgrade to 6.x or 7.x to obtain security fixes. Please send comments or corrections for these vulnerabilities to the Modified: tomcat/site/trunk/xdocs/security-4.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-4.xml?rev=1417286&r1=1417285&r2=1417286&view=diff == --- tomcat/site/trunk/xdocs/security-4.xml (original) +++ tomcat/site/trunk/xdocs/security-4.xml Wed Dec 5 05:58:24 2012 @@ -27,7 +27,7 @@ Please note that Tomcat 4.0.x and 4.1.x are no longer supported. Further vulnerabilities in the 4.0.x and 4.1.x branches will not be fixed. Users - should upgrade to 5.5.x, 6.x or 7.x to obtain security fixes. + should upgrade to 6.x or 7.x to obtain security fixes. Please send comments or corrections for these vulnerabilities to the Tomcat Security Team. Modified: tomcat/site/trunk/xdocs/security-5.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?rev=1417286&r1=1417285&r2=1417286&view=diff == --- tomcat/site/trunk/xdocs/security-5.xml (original) +++ tomcat/site/trunk/xdocs/security-5.xml Wed Dec 5 05:58:24 2012 @@ -25,9 +25,9 @@ but have either been incorrectly reported against Tomcat or where Tomcat
RE: svn commit: r1417282 - in /tomcat/trunk/webapps/docs/config: ajp.xml executor.xml http.xml
> From: kkoli...@apache.org [mailto:kkoli...@apache.org] > Subject: svn commit: r1417282 - in /tomcat/trunk/webapps/docs/config: ajp.xml > executor.xml http.xml > Author: kkolinko > Date: Wed Dec 5 05:34:16 2012 > New Revision: 1417282 > Modified: tomcat/trunk/webapps/docs/config/ajp.xml > URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml? > rev=1417282&r1=1417281&r2=1417282&view=diff > == > --- tomcat/trunk/webapps/docs/config/ajp.xml (original) > +++ tomcat/trunk/webapps/docs/config/ajp.xml Wed Dec 5 05:34:16 2012 > @@ -285,9 +285,10 @@ > > >The priority of the acceptor threads. The threads used to accept > - new connections. The default value is > - java.lang.Thread#NORM_PRIORITY. See the JavaDoc for the > - java.lang.Thread class for more details on what this priority > means. > + new connections. The default value is 5 (the value of the The value of NORM_PRIORITY on Windows 64-bit JDK 7 appears to be 1, not 5. I haven't checked other versions or platforms. - Chuck THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY MATERIAL and is thus for use only by the intended recipient. If you received this in error, please contact the sender and delete the e-mail and its attachments from all computers.
[Bug 54240] Configurable system level tagPlugins.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=54240 --- Comment #5 from Sheldon Shao --- Yes. Maybe it needs separated tagPlugins.xml for every tld file. So the solution can be like this, 1. Check all resources in classpath with name "META-INF/jasper/tagPlugins.xml" 2. Parse them one by one and put all the tagPlugins into tagPluginManager. 3. Load tagPlugins configurations from "WEB-INF/tagPlugins.xml" if it existed. With this new solution. TagPlugin declared in "META-INF/jasper/tagPlugins.xml" can be override by WebApp. Tag library provider can also provide its own tagPlugins configurations for tag library. What's your opinion ? (In reply to comment #4) > (In reply to comment #3) -- 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
[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed
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-taglibs-standard has an issue affecting its community
integration.
This issue affects 2 projects,
and has been outstanding for 224 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-taglibs-standard : Standard Taglib
- tomcat-taglibs-standard-install : JSP Taglibs
Full details are available at:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html
That said, some information snippets are provided here.
The following annotations (debug/informational/warning/error messages) were
provided:
-INFO- Optional dependency httpunit failed with reason build failed
-DEBUG- (Apache Gump generated) Apache Maven Settings in:
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
-INFO- Failed with reason build failed
-DEBUG- Maven POM in:
/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml
-INFO- Failed to extract fallback artifacts from Gump Repository
The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html
Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build)
Work ended in a state of : Failed
Elapsed: 23 secs
Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
install
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard]
M2_HOME: /opt/maven2
-
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Nothing to compile - all classes are up to date
[debug] execute contextualize
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/src/test/resources
[INFO] Copying 3 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] Tests are skipped.
[INFO] [bundle:bundle {execution: default-bundle}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar
to
/srv/gump/public/workspace/mvnlocalrepo/shared/org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] [bundle:install {execution: default-install}]
[INFO] Parsing
file:/srv/gump/public/workspace/mvnlocalrepo/shared/repository.xml
[INFO] Installing
org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] Writing OBR metadata
[INFO]
[INFO] Building JSTL Implementation
[INFO]task-segment: [install]
[INFO]
[INFO] [remote-resources:process {execution: default}]
[INFO] snapshot org.apache.taglibs:taglibs-standard-spec:1.2-SNAPSHOT: checking
for updates from apache.snapshots
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 14 resources
[INFO] Copying 3 resources
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 96 source files to
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/target/classes
[INFO] -
[ERROR] COMPILATION ERROR :
[INFO] -
[ERROR]
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
error: DataSourceWrapper is not abstract and does not override abstract method
getParentLogger() in CommonDataSource
[INFO] 1 error
[INFO] -
[INFO]
[ERROR] BUILD FAILURE
[INFO]
[INFO] Compilation failure
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
error: DataSourceWrapper is not abstract and does not override abstract method
getParentLogger() in CommonDataSource
[INFO]
[INFO] For more information, run Maven with the -e switch
[INFO] --
[jira] [Commented] (MTOMCAT-187) Scan resources executing run goal
[ https://issues.apache.org/jira/browse/MTOMCAT-187?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13510338#comment-13510338 ] Sergio Fernández commented on MTOMCAT-187: -- so, bug confirmed? awaiting to have it fix it at 2.1-SNAPSHOT thanks! > Scan resources executing run goal > - > > Key: MTOMCAT-187 > URL: https://issues.apache.org/jira/browse/MTOMCAT-187 > Project: Apache Tomcat Maven Plugin > Issue Type: Question > Components: tomcat7 >Affects Versions: 2.0-beta-1 >Reporter: Sergio Fernández >Assignee: Olivier Lamy (*$^¨%`£) >Priority: Minor > Labels: maven > Fix For: 2.1 > > > I tried to find this detail at the documentation, but sorry but I didn't. > The question is: does the plugin has any way to force the goal tomcat7:run to > scan (and updated when are modified) resources? Something equivalent to > scanIntervalSeconds in the maven jetty plugin. > Thanks in advance. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
