svn commit: r1345398 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Jun 1 23:59:37 2012 New Revision: 1345398 URL: http://svn.apache.org/viewvc?rev=1345398&view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1345398&r1=1345397&r2=1345398&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jun 1 23:59:37 2012 @@ -170,6 +170,16 @@ PATCHES PROPOSED TO BACKPORT: (r1343897 in TC7) +1: kkolinko, kfujino -1: + +* For https://issues.apache.org/bugzilla/show_bug.cgi?id=52055 + Ensure that filters are recycled. + Inspired by r1334790 (TC7), r565964 (TC6 Nio) + I do not have evidence that this change matters, but it should not hurt. + The nextRequest() method already recycles the filters. If it has been called, + then lastActiveFilter is -1 and the new code will be NOOP. + http://people.apache.org/~kkolinko/patches/2012-06-02_tc6_recycle.patch + +1: kkolinko + -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 52055] ChunkedInputFilter is not recycled for servlet 3.0 asynchronous request
https://issues.apache.org/bugzilla/show_bug.cgi?id=52055 --- Comment #16 from Konstantin Kolinko --- (In reply to comment #14) Thank you. Fixed this in 6.0 as well, will be in 6.0.36. -- 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: r1345389 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/filters/ChunkedInputFilter.java webapps/docs/changelog.xml
Author: kkolinko Date: Fri Jun 1 23:06:21 2012 New Revision: 1345389 URL: http://svn.apache.org/viewvc?rev=1345389&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52055#c14 Correctly reset ChunkedInputFilter.needCRLFParse flag when the filter is recycled. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1345389&r1=1345388&r2=1345389&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jun 1 23:06:21 2012 @@ -162,14 +162,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: -* https://issues.apache.org/bugzilla/show_bug.cgi?id=52055#c14 - Correctly reset ChunkedInputFilter.needCRLFParse flag when the filter is - recycled. - http://svn.apache.org/viewvc?rev=1342795&view=rev - (r1342797 in Tomcat 7) - +1: kkolinko, markt, kfujino - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53267 Ensure that using the GC Daemon Protection feature of the JreMemoryLeakPreventionListener does not trigger a Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1345389&r1=1345388&r2=1345389&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Fri Jun 1 23:06:21 2012 @@ -243,6 +243,7 @@ public class ChunkedInputFilter implemen pos = 0; lastValid = 0; endChunk = false; +needCRLFParse = false; trailingHeaders.recycle(); } Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1345389&r1=1345388&r2=1345389&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jun 1 23:06:21 2012 @@ -131,6 +131,10 @@ or later. (rjung) +52055#c14: Correctly reset ChunkedInputFilter.needCRLFParse +flag when the filter is recycled. (kkolinko) + + 52606: Ensure replayed POST bodies are available when using AJP. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345384 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Fri Jun 1 22:56:24 2012 New Revision: 1345384 URL: http://svn.apache.org/viewvc?rev=1345384&view=rev Log: Correct wording Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1345384&r1=1345383&r2=1345384&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jun 1 22:56:24 2012 @@ -265,16 +265,17 @@ data source implementations support it. (kkolinko) -Fix several trivial HTML markup errors in sample servlets. (kkolinko) +Fix several HTML markup errors in servlets of examples web application. +(kkolinko) - + 53254 (1340160): Add in the ability to purge connections from the pool (fhanik) - + When a connection is reconnected due to failed validation make sure the ConnectionState is reset or it will assume - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345382 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/ webapps/examples/WEB-INF/classes/
Author: kkolinko
Date: Fri Jun 1 22:53:14 2012
New Revision: 1345382
URL: http://svn.apache.org/viewvc?rev=1345382&view=rev
Log:
Fix several HTML markup errors in example servlets
e.g. duplicate tag preceding and following
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1345382&r1=1345381&r2=1345382&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jun 1 22:53:14 2012
@@ -162,13 +162,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko
-1:
-* Fix several trivial HTML markup errors in example servlets
- e.g. duplicate tag preceding and following
-
http://people.apache.org/~kkolinko/patches/2012-05-13_tc6_sampleservlets.patch
- (backport of revs 1337719 1337734 1337741 1337745)
- +1: kkolinko, rjung, markt
- -1:
-
* https://issues.apache.org/bugzilla/show_bug.cgi?id=52055#c14
Correctly reset ChunkedInputFilter.needCRLFParse flag when the filter is
recycled.
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1345382&r1=1345381&r2=1345382&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jun 1 22:53:14 2012
@@ -203,6 +203,10 @@
Correct documentation for enableLookups attribute
of a Connector. By default DNS lookups are disabled. (kkolinko)
+
+Fix several HTML markup errors in servlets of examples web application.
+(kkolinko)
+
Modified:
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=1345382&r1=1345381&r2=1345382&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
(original)
+++ tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
Fri Jun 1 22:53:14 2012
@@ -43,13 +43,12 @@ public class CookieExample extends HttpS
PrintWriter out = response.getWriter();
out.println("");
-out.println("");
out.println("");
String title = rb.getString("cookies.title");
out.println("" + title + "");
out.println("");
-out.println("");
+out.println("");
// relative links
Modified:
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?rev=1345382&r1=1345381&r2=1345382&view=diff
==
---
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
(original)
+++
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
Fri Jun 1 22:53:14 2012
@@ -43,13 +43,12 @@ public class RequestHeaderExample extend
PrintWriter out = response.getWriter();
out.println("");
-out.println("");
out.println("");
String title = rb.getString("requestheader.title");
out.println("" + title + "");
out.println("");
-out.println("");
+out.println("");
// all links relative
Modified:
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1345382&r1=1345381&r2=1345382&view=diff
==
---
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
(original)
+++
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
Fri Jun 1 22:53:14 2012
@@ -44,7 +44,6 @@ public class RequestInfoExample extends
PrintWriter out = response.getWriter();
out.println("");
-out.println("");
out.println("");
String title = rb.getString("requestinfo.title");
@@ -70,7 +69,7 @@ public class RequestInfoExample extends
out.println("");
[Tomcat Wiki] Update of "AccessLogValve" by KonstantinKolinko
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "AccessLogValve" page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/AccessLogValve?action=diff&rev1=5&rev2=6
Comment:
Expand the text, clarify server.xml question
- First read this http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html and
http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/valves/AccessLogValve.html
+ First read the
[[http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html|Valve chapter]] in
''Configuration Reference Guide''. There is also
[[http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/valves/AccessLogValve.html|javadoc]]
for the class.
- Add something like this to your context file (also can be added to Host) (or
is it conf/server.xml file?)
+ The following is an example of AccessLogValve configuration. If you want it
to log requests processed by your web application, add it to the
[[http://tomcat.apache.org/tomcat-7.0-doc/config/context.html|context file]] of
your application (`META-INF/context.xml`). If you want it to log all requests,
add it to the '''Host''' element in {{{conf/server.xml}}} file.
+
+ Starting with Tomcat 7 an AccessLogValve is already configured in the default
conf/server.xml file that is shipped with Tomcat.
{{{
svn commit: r1345367 - in /tomcat/trunk/java/org/apache/catalina: core/ startup/ util/
Author: markt
Date: Fri Jun 1 22:03:10 2012
New Revision: 1345367
URL: http://svn.apache.org/viewvc?rev=1345367&view=rev
Log:
Refactor some duplicate code into an new utility class with an eye to the
proposed patch for BZ 5
Added:
tomcat/trunk/java/org/apache/catalina/util/Introspection.java (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1345367&r1=1345366&r2=1345367&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Fri
Jun 1 22:03:10 2012
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.core;
-
import java.beans.Introspector;
import java.io.IOException;
import java.io.InputStream;
@@ -52,6 +49,7 @@ import javax.xml.ws.WebServiceRef;
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Globals;
import org.apache.catalina.security.SecurityUtil;
+import org.apache.catalina.util.Introspection;
import org.apache.tomcat.InstanceManager;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
@@ -61,6 +59,16 @@ import org.apache.tomcat.util.res.String
*/
public class DefaultInstanceManager implements InstanceManager {
+// Used when there are no annotations in a class
+private static final AnnotationCacheEntry[] ANNOTATIONS_EMPTY
+= new AnnotationCacheEntry[0];
+
+/**
+ * The string manager for this package.
+ */
+protected static final StringManager sm =
+StringManager.getManager(Constants.Package);
+
private final Context context;
private final Map> injectionMap;
protected final ClassLoader classLoader;
@@ -73,10 +81,6 @@ public class DefaultInstanceManager impl
private final Map, AnnotationCacheEntry[]> annotationCache =
new WeakHashMap, AnnotationCacheEntry[]>();
-// Used when there are no annotations in a class
-private static final AnnotationCacheEntry[] ANNOTATIONS_EMPTY
-= new AnnotationCacheEntry[0];
-
public DefaultInstanceManager(Context context, Map> injectionMap, org.apache.catalina.Context catalinaContext, ClassLoader
containerClassLoader) {
classLoader = catalinaContext.getLoader().getClassLoader();
privileged = catalinaContext.getPrivileged();
@@ -286,19 +290,7 @@ public class DefaultInstanceManager impl
if (context != null) {
// Initialize fields annotations for resource injection if
// JNDI is enabled
-Field[] fields = null;
-if (Globals.IS_SECURITY_ENABLED) {
-final Class clazz2 = clazz;
-fields = AccessController.doPrivileged(
-new PrivilegedAction(){
-@Override
-public Field[] run(){
-return clazz2.getDeclaredFields();
-}
-});
-} else {
-fields = clazz.getDeclaredFields();
-}
+Field[] fields = Introspection.getDeclaredFields(clazz);
for (Field field : fields) {
if (injections != null &&
injections.containsKey(field.getName())) {
annotations.add(new AnnotationCacheEntry(
@@ -338,30 +330,15 @@ public class DefaultInstanceManager impl
}
// Initialize methods annotations
-Method[] methods = null;
-if (Globals.IS_SECURITY_ENABLED) {
-final Class clazz2 = clazz;
-methods = AccessController.doPrivileged(
-new PrivilegedAction(){
-@Override
-public Method[] run(){
-return clazz2.getDeclaredMethods();
-}
-});
-} else {
-methods = clazz.getDeclaredMethods();
-}
+Method[] methods = Introspection.getDeclaredMethods(clazz)
svn commit: r1345359 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationContext.java webapps/docs/changelog.xml
Author: kkolinko
Date: Fri Jun 1 21:42:24 2012
New Revision: 1345359
URL: http://svn.apache.org/viewvc?rev=1345359&view=rev
Log:
Merged revision 1345357 from tomcat/trunk:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=53257
Review of r1344902:
restore passing DirContextURLStreamHandler instance into the new URL.
Note that we use "new DirContextURLStreamHandler(DirContext)" and
thus the handler will not need to call DirContextURLStreamHandler#get() to
retrieve the context.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1345357
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1345359&r1=1345358&r2=1345359&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Fri Jun 1 21:42:24 2012
@@ -67,6 +67,7 @@ import org.apache.catalina.connector.Con
import org.apache.catalina.deploy.FilterDef;
import org.apache.catalina.util.ResourceSet;
import org.apache.catalina.util.ServerInfo;
+import org.apache.naming.resources.DirContextURLStreamHandler;
import org.apache.naming.resources.Resource;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.CharChunk;
@@ -533,8 +534,9 @@ public class ApplicationContext
String hostName = context.getParent().getName();
try {
resources.lookup(normPath);
-return new URI("jndi",
-getJNDIUri(hostName, fullPath), null).toURL();
+URI uri = new URI("jndi", getJNDIUri(hostName, fullPath),
null);
+return new URL(null, uri.toString(),
+new DirContextURLStreamHandler(resources));
} catch (NamingException e) {
// Ignore
} catch (Exception e) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1345359&r1=1345358&r2=1345359&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jun 1 21:42:24 2012
@@ -146,14 +146,15 @@
JreMemoryLeakPreventionListener. (markt)
-53257: Ensure that resources, inclusing JSP files, that have
+53257: Ensure that resources, including JSP files, that have
names that include characters with special meanings in URLs (such as
ampersand, semicolon, plus, hash and percent) are correctly handled.
This bug is partially a regression caused by the original fix for
51584 and partially an existing issue that had not
previously
been identified. This fix reverts the original fix for
51584,
correctly fixes that issue and fixes the additional issues identified
by
-the test cases that were also added as part of this fix. (markt)
+the test cases that were also added as part of this fix.
+(markt/kkolinko)
53267: Ensure that using the GC Daemon Protection feature of
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345357 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
Author: kkolinko
Date: Fri Jun 1 21:33:19 2012
New Revision: 1345357
URL: http://svn.apache.org/viewvc?rev=1345357&view=rev
Log:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=53257
Review of r1344902:
Restore passing DirContextURLStreamHandler instance into the new URL.
Note that we use "new DirContextURLStreamHandler(DirContext)" and
thus the handler will not need to call DirContextURLStreamHandler#get() to
retrieve the context.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1345357&r1=1345356&r2=1345357&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Jun
1 21:33:19 2012
@@ -67,6 +67,7 @@ import org.apache.catalina.connector.Con
import org.apache.catalina.deploy.FilterDef;
import org.apache.catalina.util.ResourceSet;
import org.apache.catalina.util.ServerInfo;
+import org.apache.naming.resources.DirContextURLStreamHandler;
import org.apache.naming.resources.Resource;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.CharChunk;
@@ -517,8 +518,9 @@ public class ApplicationContext
String hostName = context.getParent().getName();
try {
resources.lookup(normPath);
-return new URI("jndi",
-getJNDIUri(hostName, fullPath), null).toURL();
+URI uri = new URI("jndi", getJNDIUri(hostName, fullPath),
null);
+return new URL(null, uri.toString(),
+new DirContextURLStreamHandler(resources));
} catch (NamingException e) {
// Ignore
} catch (Exception e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-158) WAR Overlay Does Not Include Resources
[ https://issues.apache.org/jira/browse/MTOMCAT-158?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Robert Hollencamp updated MTOMCAT-158: -- Attachment: MTOMCAT-158-1.diff This patch will serve files out of WAR overlays if they are not found in docBase. It only applies to the tomcat6 component. If I receive positive feedback, I will work it into the tomcat7 component as well > WAR Overlay Does Not Include Resources > -- > > Key: MTOMCAT-158 > URL: https://issues.apache.org/jira/browse/MTOMCAT-158 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat6, tomcat7 >Affects Versions: 2.0 >Reporter: Robert Hollencamp >Assignee: Olivier Lamy (*$^¨%`£) > Attachments: MTOMCAT-158-1.diff > > > When running tomcat[67]:run on a web application that includes WAR overlays, > static resources in those WAR overlays are not seen by the spawned tomcat > server. > Currently, WAR overlays are extracted (to target/apache-tomcat-maven-plugin) > and CLASS files are added to the classpath. > WAR overlays can also contain static resources, like JSP, CSS, JS, etc. > Tomcat needs to be aware of these resources -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa 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] [Created] (MTOMCAT-158) WAR Overlay Does Not Include Resources
Robert Hollencamp created MTOMCAT-158: - Summary: WAR Overlay Does Not Include Resources Key: MTOMCAT-158 URL: https://issues.apache.org/jira/browse/MTOMCAT-158 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat6, tomcat7 Affects Versions: 2.0 Reporter: Robert Hollencamp Assignee: Olivier Lamy (*$^¨%`£) When running tomcat[67]:run on a web application that includes WAR overlays, static resources in those WAR overlays are not seen by the spawned tomcat server. Currently, WAR overlays are extracted (to target/apache-tomcat-maven-plugin) and CLASS files are added to the classpath. WAR overlays can also contain static resources, like JSP, CSS, JS, etc. Tomcat needs to be aware of these resources -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa 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
[Tomcat Wiki] Update of "AccessLogValve" by RogerPack
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "AccessLogValve" page has been changed by RogerPack:
http://wiki.apache.org/tomcat/AccessLogValve?action=diff&rev1=4&rev2=5
First read this http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html and
http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/valves/AccessLogValve.html
- Add something like this to your context file (also can be added to Host)
+ Add something like this to your context file (also can be added to Host) (or
is it conf/server.xml file?)
{{{
[jira] [Commented] (MTOMCAT-100) support war overlay to add war external dependencies in tomcat run
[ https://issues.apache.org/jira/browse/MTOMCAT-100?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13287640#comment-13287640 ] Olivier Lamy (*$^¨%`£) commented on MTOMCAT-100: @Robert this issue is closed. So please an other one and attach your patch. Thanks. > support war overlay to add war external dependencies in tomcat run > --- > > Key: MTOMCAT-100 > URL: https://issues.apache.org/jira/browse/MTOMCAT-100 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat6, tomcat7 >Reporter: Olivier Lamy (*$^¨%`£) >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.0-beta-1 > > > /WEB-INF/lib/*.jar and /WEB-INF/classes will added to web app classloader > when using tomcat*:run to do as war overlays does. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa 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
Re: [VOTE] Release Apache Tomcat Connectors 1.2.37
A bit late (sorry) [X] Stable, go ahead and release Built on OSX Lion. No problem - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53333] NPE is thrown for env-entry without env-entry-type but with injection-target specified
https://issues.apache.org/bugzilla/show_bug.cgi?id=5 --- Comment #2 from Mark Thomas --- Thanks for pointing this out. It is definitely a bug. As I started to look at this I found some clean-up that could be done. It changes the failure point although I think the patch is currently trying to identify the type at the correct point. However, I'm not sure that NamingResources is the best home for the actual functionality. I think some refactoring may be in order. I'm looking at the now. I also think that the specification wording is ambiguous. There is type may be ommitted or MUST match the type of the injection target and type MUST be assignment compatible with the type of the injection target Clearly the wording is different but I am not convinced that the meaning is. It depends what is meant by "match". I am leaning towards implementing the more flexible "assignment compatible" in all cases. -- 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: r1345325 - /tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
Author: markt
Date: Fri Jun 1 19:57:26 2012
New Revision: 1345325
URL: http://svn.apache.org/viewvc?rev=1345325&view=rev
Log:
entries Map->Set since only the key was ever used
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java?rev=1345325&r1=1345324&r2=1345325&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java Fri Jun
1 19:57:26 2012
@@ -14,18 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.deploy;
-
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashMap;
-import java.util.Hashtable;
+import java.util.HashSet;
+import java.util.Set;
import javax.naming.NamingException;
@@ -85,11 +83,9 @@ public class NamingResources extends Lif
/**
- * List of naming entries, keyed by name. The value is the entry type, as
- * declared by the user.
+ * Set of naming entries, keyed by name.
*/
-private Hashtable entries =
-new Hashtable();
+private Set entries = new HashSet();
/**
@@ -205,10 +201,10 @@ public class NamingResources extends Lif
*/
public void addEjb(ContextEjb ejb) {
-if (entries.containsKey(ejb.getName())) {
+if (entries.contains(ejb.getName())) {
return;
} else {
-entries.put(ejb.getName(), ejb.getType());
+entries.add(ejb.getName());
}
synchronized (ejbs) {
@@ -227,7 +223,7 @@ public class NamingResources extends Lif
*/
public void addEnvironment(ContextEnvironment environment) {
-if (entries.containsKey(environment.getName())) {
+if (entries.contains(environment.getName())) {
ContextEnvironment ce = findEnvironment(environment.getName());
ContextResourceLink rl = findResourceLink(environment.getName());
if (ce != null) {
@@ -252,7 +248,7 @@ public class NamingResources extends Lif
}
}
-entries.put(environment.getName(), environment.getType());
+entries.add(environment.getName());
synchronized (envs) {
environment.setNamingResources(this);
@@ -293,10 +289,10 @@ public class NamingResources extends Lif
*/
public void addLocalEjb(ContextLocalEjb ejb) {
-if (entries.containsKey(ejb.getName())) {
+if (entries.contains(ejb.getName())) {
return;
} else {
-entries.put(ejb.getName(), ejb.getType());
+entries.add(ejb.getName());
}
synchronized (localEjbs) {
@@ -315,10 +311,10 @@ public class NamingResources extends Lif
*/
public void addMessageDestinationRef(MessageDestinationRef mdr) {
-if (entries.containsKey(mdr.getName())) {
+if (entries.contains(mdr.getName())) {
return;
} else {
-entries.put(mdr.getName(), mdr.getType());
+entries.add(mdr.getName());
}
synchronized (mdrs) {
@@ -349,10 +345,10 @@ public class NamingResources extends Lif
*/
public void addResource(ContextResource resource) {
-if (entries.containsKey(resource.getName())) {
+if (entries.contains(resource.getName())) {
return;
} else {
-entries.put(resource.getName(), resource.getType());
+entries.add(resource.getName());
}
synchronized (resources) {
@@ -380,10 +376,10 @@ public class NamingResources extends Lif
*/
public void addResourceEnvRef(ContextResourceEnvRef resource) {
-if (entries.containsKey(resource.getName())) {
+if (entries.contains(resource.getName())) {
return;
} else {
-entries.put(resource.getName(), resource.getType());
+entries.add(resource.getName());
}
synchronized (resourceEnvRefs) {
@@ -402,14 +398,10 @@ public class NamingResources extends Lif
*/
public void addResourceLink(ContextResourceLink resourceLink) {
-if (entries.containsKey(resourceLink.getName())) {
+if (entries.contains(resourceLink.getName())) {
return;
} else {
-String value = resourceLink.getType();
-if (value == null) {
-value = "";
-}
-entries.put(resourceLink.getName(), value);
+entries.add(resourceLink.getName
Re: JIRA configuration for MTOMCAT - attachments not allowed?
On 01/06/2012 19:53, Konstantin Kolinko wrote: > Hi! > > Looking at Tomcat Maven Plugin issues in JIRA, e.g. > there is no way to submit an attachment. There is no "Attach Files" button. > > If I look at some Apache Commons issues, the "Attach Files" button is there. > So that is some issue with configuration of MTOMCAT project in JIRA. Nope. That is user error. Try looking at an open issue rather than a resolved one. Mark > > For example: > https://issues.apache.org/jira/browse/MTOMCAT-100 > https://issues.apache.org/jira/browse/DAEMON-245 > > Is this issue (configure MTOMCAT to allow attachments) something > that we can fix by ourselves, before escalating to infra? > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
JIRA configuration for MTOMCAT - attachments not allowed?
Hi! Looking at Tomcat Maven Plugin issues in JIRA, e.g. there is no way to submit an attachment. There is no "Attach Files" button. If I look at some Apache Commons issues, the "Attach Files" button is there. So that is some issue with configuration of MTOMCAT project in JIRA. For example: https://issues.apache.org/jira/browse/MTOMCAT-100 https://issues.apache.org/jira/browse/DAEMON-245 Is this issue (configure MTOMCAT to allow attachments) something that we can fix by ourselves, before escalating to infra? 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-100) support war overlay to add war external dependencies in tomcat run
[ https://issues.apache.org/jira/browse/MTOMCAT-100?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13287591#comment-13287591 ] Robert Hollencamp commented on MTOMCAT-100: --- I incorporated the functionality Olivier Bazoud linked to into the tomcat6 plugin. Can somebody from the project review the diff and let me know what they think? It should be pretty trivial to add this to the tomcat7 plugin http://pastebin.com/tU0daHZA > support war overlay to add war external dependencies in tomcat run > --- > > Key: MTOMCAT-100 > URL: https://issues.apache.org/jira/browse/MTOMCAT-100 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat6, tomcat7 >Reporter: Olivier Lamy (*$^¨%`£) >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.0-beta-1 > > > /WEB-INF/lib/*.jar and /WEB-INF/classes will added to web app classloader > when using tomcat*:run to do as war overlays does. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa 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: r1345312 - in /tomcat/tc7.0.x/trunk: ./ res/rat/rat-excludes.txt
Author: kkolinko Date: Fri Jun 1 18:38:58 2012 New Revision: 1345312 URL: http://svn.apache.org/viewvc?rev=1345312&view=rev Log: Merged revision( 1345309 from tomcat/trunk: Update exclude rules for RAT report Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1345309 Modified: tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt?rev=1345312&r1=1345311&r2=1345312&view=diff == --- tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt (original) +++ tomcat/tc7.0.x/trunk/res/rat/rat-excludes.txt Fri Jun 1 18:38:58 2012 @@ -25,6 +25,8 @@ - package-list files in API documentation (javadoc) are generated - bug52121-part1, bug52121-part2 files in tests are test data for a hard to reproduce testcase and should be used as is. + - other trivial test files, such as textual files containing only "OK' string, + are also excluded. output/build/webapps/docs/*.html output/build/webapps/docs/appdev/*.html @@ -53,5 +55,9 @@ output/dist/webapps/docs/jspapi/package- output/dist/webapps/docs/servletapi/package-list output/dist/src/test/org/apache/coyote/http11/filters/bug52121-part1 output/dist/src/test/org/apache/coyote/http11/filters/bug52121-part2 +output/dist/src/test/webapp-3.0/bug53257/*.txt +output/dist/src/test/webapp-3.0-fragments/WEB-INF/classes/*.txt test/org/apache/coyote/http11/filters/bug52121-part1 test/org/apache/coyote/http11/filters/bug52121-part2 +test/webapp-3.0/bug53257/*.txt +test/webapp-3.0-fragments/WEB-INF/classes/*.txt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345311 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ContainerBase.java test/org/apache/jasper/compiler/TestCompiler.java
Author: kkolinko
Date: Fri Jun 1 18:35:34 2012
New Revision: 1345311
URL: http://svn.apache.org/viewvc?rev=1345311&view=rev
Log:
Merged revisions r1345287 r1345290 from tomcat/trunk:
Remove trailing whitespace from ContainerBase.java
Add one more test for
https://issues.apache.org/bugzilla/show_bug.cgi?id=53257
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1345287-1345290
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1345311&r1=1345310&r2=1345311&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java Fri
Jun 1 18:35:34 2012
@@ -1592,13 +1592,13 @@ public abstract class ContainerBase exte
private ThreadGroup group;
private AtomicInteger threadNumber = new AtomicInteger(1);
private String namePrefix;
-
+
public StartStopThreadFactory(String namePrefix) {
SecurityManager s = System.getSecurityManager();
group = (s != null) ? s.getThreadGroup() :
Thread.currentThread().getThreadGroup();
this.namePrefix = namePrefix;
}
-
+
@Override
public Thread newThread(Runnable r) {
Thread thread = new Thread(group, r, namePrefix +
threadNumber.getAndIncrement());
Modified: tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1345311&r1=1345310&r2=1345311&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java Fri
Jun 1 18:35:34 2012
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -84,6 +85,7 @@ public class TestCompiler extends Tomcat
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
+// foo;bar.jsp
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo%3bbar.jsp");
@@ -116,6 +118,7 @@ public class TestCompiler extends Tomcat
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
+// foo#bar.jsp
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo%23bar.jsp");
@@ -132,6 +135,7 @@ public class TestCompiler extends Tomcat
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
+// foo%bar.jsp
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo%25bar.jsp");
@@ -157,6 +161,21 @@ public class TestCompiler extends Tomcat
}
@Test
+public void testBug53257f() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp-3.0");
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+tomcat.start();
+
+// Check that URL decoding is not done twice
+ByteChunk res = new ByteChunk();
+int rc = getUrl("http://localhost:"; + getPort() +
+"/test/bug53257/foo%2525bar.jsp", res, null);
+assertEquals(404, rc);
+}
+
+@Test
public void testBug51584() throws Exception {
Tomcat tomcat = getTomcatInstance();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345309 - /tomcat/trunk/res/rat/rat-excludes.txt
Author: kkolinko Date: Fri Jun 1 18:32:08 2012 New Revision: 1345309 URL: http://svn.apache.org/viewvc?rev=1345309&view=rev Log: Update exclude rules for RAT report Modified: tomcat/trunk/res/rat/rat-excludes.txt Modified: tomcat/trunk/res/rat/rat-excludes.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/res/rat/rat-excludes.txt?rev=1345309&r1=1345308&r2=1345309&view=diff == --- tomcat/trunk/res/rat/rat-excludes.txt (original) +++ tomcat/trunk/res/rat/rat-excludes.txt Fri Jun 1 18:32:08 2012 @@ -25,6 +25,8 @@ - package-list files in API documentation (javadoc) are generated - bug52121-part1, bug52121-part2 files in tests are test data for a hard to reproduce testcase and should be used as is. + - other trivial test files, such as textual files containing only "OK' string, + are also excluded. output/build/webapps/docs/*.html output/build/webapps/docs/appdev/*.html @@ -53,5 +55,9 @@ output/dist/webapps/docs/jspapi/package- output/dist/webapps/docs/servletapi/package-list output/dist/src/test/org/apache/coyote/http11/filters/bug52121-part1 output/dist/src/test/org/apache/coyote/http11/filters/bug52121-part2 +output/dist/src/test/webapp-3.0/bug53257/*.txt +output/dist/src/test/webapp-3.0-fragments/WEB-INF/classes/*.txt test/org/apache/coyote/http11/filters/bug52121-part1 test/org/apache/coyote/http11/filters/bug52121-part2 +test/webapp-3.0/bug53257/*.txt +test/webapp-3.0-fragments/WEB-INF/classes/*.txt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1345021 - in /tomcat/tc7.0.x/trunk: ./ build.xml test/webapp-3.0/bug53257/index.jsp
On 01/06/2012 17:02, Konstantin Kolinko wrote: > 2012/6/1 : >> + >> + > > OK. I'll add them to res/rat/rat-excludes.txt, for RAT reports done by > buildbot > http://tomcat.apache.org/ci.html#Buildbot Cheers >> + > > ?? I do not see any files there. Did you forget to commit something? Yes. Sorry. Fixed now. > There are no test failures though (apart the usual TestCometProcessor). That is expected. The file is required to trigger the failure (which has been fixed anyway). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345295 - in /tomcat/tc7.0.x/trunk: ./ test/webapp-3.0-fragments/WEB-INF/classes/#Bug51584.txt
Author: markt Date: Fri Jun 1 18:09:21 2012 New Revision: 1345295 URL: http://svn.apache.org/viewvc?rev=1345295&view=rev Log: Add missing test case file Added: tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/classes/#Bug51584.txt - copied unchanged from r1345294, tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/classes/#Bug51584.txt Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1345294 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345294 - /tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/classes/#Bug51584.txt
Author: markt Date: Fri Jun 1 18:08:36 2012 New Revision: 1345294 URL: http://svn.apache.org/viewvc?rev=1345294&view=rev Log: Another missed file Added: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/classes/#Bug51584.txt (with props) Added: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/classes/#Bug51584.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/classes/%23Bug51584.txt?rev=1345294&view=auto == (empty) Propchange: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/classes/#Bug51584.txt -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345290 - /tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
Author: kkolinko
Date: Fri Jun 1 18:02:56 2012
New Revision: 1345290
URL: http://svn.apache.org/viewvc?rev=1345290&view=rev
Log:
One more test, to be sure
https://issues.apache.org/bugzilla/show_bug.cgi?id=53257
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1345290&r1=1345289&r2=1345290&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java Fri Jun 1
18:02:56 2012
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -84,6 +85,7 @@ public class TestCompiler extends Tomcat
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
+// foo;bar.jsp
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo%3bbar.jsp");
@@ -116,6 +118,7 @@ public class TestCompiler extends Tomcat
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
+// foo#bar.jsp
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo%23bar.jsp");
@@ -132,6 +135,7 @@ public class TestCompiler extends Tomcat
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
+// foo%bar.jsp
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo%25bar.jsp");
@@ -157,6 +161,21 @@ public class TestCompiler extends Tomcat
}
@Test
+public void testBug53257f() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp-3.0");
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+tomcat.start();
+
+// Check that URL decoding is not done twice
+ByteChunk res = new ByteChunk();
+int rc = getUrl("http://localhost:"; + getPort() +
+"/test/bug53257/foo%2525bar.jsp", res, null);
+assertEquals(404, rc);
+}
+
+@Test
public void testBug51584() throws Exception {
Tomcat tomcat = getTomcatInstance();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345287 - /tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
Author: kkolinko
Date: Fri Jun 1 17:44:49 2012
New Revision: 1345287
URL: http://svn.apache.org/viewvc?rev=1345287&view=rev
Log:
Remove trailing whitespace
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1345287&r1=1345286&r2=1345287&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Fri Jun 1
17:44:49 2012
@@ -1604,13 +1604,13 @@ public abstract class ContainerBase exte
private ThreadGroup group;
private AtomicInteger threadNumber = new AtomicInteger(1);
private String namePrefix;
-
+
public StartStopThreadFactory(String namePrefix) {
SecurityManager s = System.getSecurityManager();
group = (s != null) ? s.getThreadGroup() :
Thread.currentThread().getThreadGroup();
this.namePrefix = namePrefix;
}
-
+
@Override
public Thread newThread(Runnable r) {
Thread thread = new Thread(group, r, namePrefix +
threadNumber.getAndIncrement());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53341] Unable to build tomcat-connectors in centos 5.6
https://issues.apache.org/bugzilla/show_bug.cgi?id=53341 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Konstantin Kolinko --- The build output says: > /usr/local/src/httpd-2.4.2/include/ap_hooks.h:39:17: error: apr.h: No such > file or directory So an HTTPD header cannot find APR header that it depends on. You should check why it happens. The paths in gcc command look OK, but maybe those directories are empty or not readable. > /usr/local/src/httpd-2.4.2/include/httpd.h:1746: This again is HTTPD header, not ours, and you certainly have to resolve earlier errors first. I see no issue with mod_jk here. I think it is something wrong with your build environment and it is not a bug neither here nor in httpd. It would be better to ask on the users mailing list. Bugzilla is not a support forum. -- 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 53346] New: Support for changing MaxActive via JMX
https://issues.apache.org/bugzilla/show_bug.cgi?id=53346 Priority: P2 Bug ID: 53346 CC: you...@gmail.com Assignee: dev@tomcat.apache.org Summary: Support for changing MaxActive via JMX Severity: normal Classification: Unclassified OS: All Reporter: brooke_hedr...@millamilla.com Hardware: PC Status: NEW Version: unspecified Component: jdbc-pool Depends on: 53254 Product: Tomcat Modules +++ This bug was initially created as a clone of Bug #53254 +++ It is a common function of a connection pool to support resizing the connection pool - ex: MaxActive. The commons-dbcp BasicDataSource is an example of this. It would be great if this pool supported such an operation as well. It would be useful if the operation were exposed through JMX too. -- 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 53254] Support for purging connection pool
https://issues.apache.org/bugzilla/show_bug.cgi?id=53254 Brooke Hedrick changed: What|Removed |Added Blocks||53346 -- 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: r1345021 - in /tomcat/tc7.0.x/trunk: ./ build.xml test/webapp-3.0/bug53257/index.jsp
2012/6/1 : > Author: markt > Date: Fri Jun 1 09:08:37 2012 > New Revision: 1345021 > > URL: http://svn.apache.org/viewvc?rev=1345021&view=rev > Log: > Fix checkstyle warnings in Ant build > > Modified: > tomcat/tc7.0.x/trunk/ (props changed) > tomcat/tc7.0.x/trunk/build.xml > tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp > > Propchange: tomcat/tc7.0.x/trunk/ > -- > Merged /tomcat/trunk:r1345020 > > Modified: tomcat/tc7.0.x/trunk/build.xml > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1345021&r1=1345020&r2=1345021&view=diff > == > --- tomcat/tc7.0.x/trunk/build.xml (original) > +++ tomcat/tc7.0.x/trunk/build.xml Fri Jun 1 09:08:37 2012 > @@ -467,6 +467,9 @@ > > > > + > + OK. I'll add them to res/rat/rat-excludes.txt, for RAT reports done by buildbot http://tomcat.apache.org/ci.html#Buildbot > + ?? I do not see any files there. Did you forget to commit something? There are no test failures though (apart the usual TestCometProcessor). > > > > Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53337] IllegalStateException when trying to render a JSP after startAsync
https://issues.apache.org/bugzilla/show_bug.cgi?id=53337 --- Comment #5 from rstoyanc...@yahoo.com --- I corrected one issue with the sample. Calling ServletB succeeds in all cases. Calling ServletA doesn't. I updated the instructions at the project page and updated the .war attachment. -- 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 53337] IllegalStateException when trying to render a JSP after startAsync
https://issues.apache.org/bugzilla/show_bug.cgi?id=53337 rstoyanc...@yahoo.com changed: What|Removed |Added Attachment #28866|0 |1 is obsolete|| Attachment #28873|0 |1 is obsolete|| --- Comment #4 from rstoyanc...@yahoo.com --- Created attachment 28874 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28874&action=edit Updated .war file -- 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 53337] IllegalStateException when trying to render a JSP after startAsync
https://issues.apache.org/bugzilla/show_bug.cgi?id=53337 --- Comment #3 from rstoyanc...@yahoo.com --- Created attachment 28873 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28873&action=edit Updated .war file -- 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 53338] mod_jk 1.2.36 doesn't work in windows
https://issues.apache.org/bugzilla/show_bug.cgi?id=53338 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mladen Turk --- We have 1.2.37 released which fixes 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 53343] Cannot use SSLv3
https://issues.apache.org/bugzilla/show_bug.cgi?id=53343 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID Severity|major |trivial --- Comment #2 from Konstantin Kolinko --- You could edit the title... OK, closing as INVALID. -- 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 53344] Cannot use SSLv3+TLSv1 in Http11AprProtocol
https://issues.apache.org/bugzilla/show_bug.cgi?id=53344 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #2 from Konstantin Kolinko --- This feature has already been implemented (will be in 6.0.36) Hint: links to changelog pages are gathered on this page: http://tomcat.apache.org/bugreport.html#Changelog *** This bug has been marked as a duplicate of bug 51477 *** -- 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 51477] Support all protocol combinations in SSLProtocol of APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 Konstantin Kolinko changed: What|Removed |Added CC||1983-01...@gmx.net --- Comment #21 from Konstantin Kolinko --- *** Bug 53344 has been marked as a duplicate of this bug. *** -- 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-trunk-test (in module tomcat-trunk) 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-trunk-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 8 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 39 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-01062012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-01062012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-01062012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-01062012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-01062012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org .eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-01062012.jar:/srv/gump/public/workspace
[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) 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-tc7.0.x-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 8 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-01062012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-01062012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-01062012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-01062012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-01062012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-01062012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-01062012.jar:/srv/gump/ public/workspace/junit/dist/junit-01062012.jar - [junit] at org.junit.ru
[Bug 53344] Cannot use SSLv3+TLSv1 in Http11AprProtocol
https://issues.apache.org/bugzilla/show_bug.cgi?id=53344 --- Comment #1 from Michael Osipov <1983-01...@gmx.net> --- Created attachment 28870 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28870&action=edit Patched AprEndpoint with SSLv3+TLSv1 parallel 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 53344] New: Cannot use SSLv3+TLSv1 in Http11AprProtocol
https://issues.apache.org/bugzilla/show_bug.cgi?id=53344 Priority: P2 Bug ID: 53344 Assignee: dev@tomcat.apache.org Summary: Cannot use SSLv3+TLSv1 in Http11AprProtocol Severity: major Classification: Unclassified OS: All Reporter: 1983-01...@gmx.net Hardware: All Status: NEW Version: 6.0.35 Component: Connectors Product: Tomcat 6 The SSLProtocol parameter does not allow the combination of SSLv3+TLSv1 which is actually highly preferred. The underlying libtcnative supports that (since 1.1.21: Support arbitrary protocol combinations of SSLv2, SSLv3 and TLSv1. (rjung)) though. APR supports that anyway. Please add support to use both of them. I have created a patch to make that work. Documentation has to be adapted accordingly. A sslcan on the Tomcat servers shows full support from APR and OpenSSL: $ sslscan :18443 | grep Accepted Accepted SSLv3 256 bits DHE-RSA-AES256-SHA Accepted SSLv3 256 bits ADH-AES256-SHA Accepted SSLv3 256 bits AES256-SHA Accepted SSLv3 168 bits EDH-RSA-DES-CBC3-SHA Accepted SSLv3 168 bits ADH-DES-CBC3-SHA Accepted SSLv3 168 bits DES-CBC3-SHA Accepted SSLv3 128 bits DHE-RSA-AES128-SHA Accepted SSLv3 128 bits ADH-AES128-SHA Accepted SSLv3 128 bits AES128-SHA Accepted TLSv1 256 bits DHE-RSA-AES256-SHA Accepted TLSv1 256 bits ADH-AES256-SHA Accepted TLSv1 256 bits AES256-SHA Accepted TLSv1 168 bits EDH-RSA-DES-CBC3-SHA Accepted TLSv1 168 bits ADH-DES-CBC3-SHA Accepted TLSv1 168 bits DES-CBC3-SHA Accepted TLSv1 128 bits DHE-RSA-AES128-SHA Accepted TLSv1 128 bits ADH-AES128-SHA Accepted TLSv1 128 bits AES128-SHA -- 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 53343] Cannot use SSLv3
https://issues.apache.org/bugzilla/show_bug.cgi?id=53343 --- Comment #1 from Michael Osipov <1983-01...@gmx.net> --- Please void this ticket. I accidentially hit ENTER. -- 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 53343] New: Cannot use SSLv3
https://issues.apache.org/bugzilla/show_bug.cgi?id=53343 Priority: P2 Bug ID: 53343 Assignee: dev@tomcat.apache.org Summary: Cannot use SSLv3 Severity: major Classification: Unclassified OS: All Reporter: 1983-01...@gmx.net Hardware: All Status: NEW Version: 6.0.35 Component: Connectors Product: Tomcat 6 -- 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] [Updated] (MTOMCAT-157) use new Maven Plugins annotations
[ https://issues.apache.org/jira/browse/MTOMCAT-157?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) updated MTOMCAT-157: --- Fix Version/s: 2.0 Assignee: Olivier Lamy (*$^¨%`£) > use new Maven Plugins annotations > - > > Key: MTOMCAT-157 > URL: https://issues.apache.org/jira/browse/MTOMCAT-157 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug >Reporter: Olivier Lamy (*$^¨%`£) >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.0 > > > And as now annotations from parent classes even in external modules, study > how to reuse mojo parameters instead of copy/paste ! -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa 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] [Created] (MTOMCAT-157) use new Maven Plugins annotations
Olivier Lamy (*$^¨%`£) created MTOMCAT-157: -- Summary: use new Maven Plugins annotations Key: MTOMCAT-157 URL: https://issues.apache.org/jira/browse/MTOMCAT-157 Project: Apache Tomcat Maven Plugin Issue Type: Bug Reporter: Olivier Lamy (*$^¨%`£) And as now annotations from parent classes even in external modules, study how to reuse mojo parameters instead of copy/paste ! -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa 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 53301] Servlet init method called twice with embedded Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=53301 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #8 from Mark Thomas --- Thanks for the analysis Konstantin - that made the fix very simple. Fixed in trunk and 7.0.x and will be included in 7.0.28 onwards. I also included a test case for this. -- 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: r1345041 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java test/org/apache/catalina/startup/TestTomcat.java webapps/docs/changelog.xml
Author: markt
Date: Fri Jun 1 10:19:01 2012
New Revision: 1345041
URL: http://svn.apache.org/viewvc?rev=1345041&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53301
Prevent double initialisation of servlets when using existing servlet instances
with embedded Tomcat
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1345039
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1345041&r1=1345040&r2=1345041&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java Fri Jun
1 10:19:01 2012
@@ -826,7 +826,6 @@ public class Tomcat {
*/
public static class ExistingStandardWrapper extends StandardWrapper {
private final Servlet existing;
-boolean init = false;
@SuppressWarnings("deprecation")
public ExistingStandardWrapper( Servlet existing ) {
@@ -850,9 +849,9 @@ public class Tomcat {
instance.init(facade);
return instance;
} else {
-if (!init) {
+if (!instanceInitialized) {
existing.init(facade);
-init = true;
+instanceInitialized = true;
}
return existing;
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1345041&r1=1345040&r2=1345041&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java Fri
Jun 1 10:19:01 2012
@@ -28,10 +28,12 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -159,6 +161,34 @@ public class TestTomcat extends TomcatBa
}
/**
+ * Simple servlet to test initialization of servlet instances.
+ */
+private static class InitCount extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+private AtomicInteger callCount = new AtomicInteger(0);
+
+@Override
+public void init() throws ServletException {
+super.init();
+callCount.incrementAndGet();
+}
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.setContentType("text/plain");
+resp.getWriter().print("OK");
+}
+
+public int getCallCount() {
+return callCount.intValue();
+}
+}
+
+
+/**
* Simple Realm that uses a configurable {@link Map} to link user names and
* passwords.
*/
@@ -397,4 +427,24 @@ public class TestTomcat extends TomcatBa
}
assertNull(e);
}
+
+@Test
+public void testBug53301() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// Must have a real docBase - just use temp
+org.apache.catalina.Context ctx =
+tomcat.addContext("", System.getProperty("java.io.tmpdir"));
+
+InitCount initCount = new InitCount();
+Tomcat.addServlet(ctx, "initCount", initCount);
+ctx.addServletMapping("/", "initCount");
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() + "/");
+assertEquals("OK", res.toString());
+
+assertEquals(1, initCount.getCallCount());
+}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1345041&r1=1345040&r2=1345041&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jun 1 10:19:01 2012
@@ -165,6 +165,10 @@
to co
svn commit: r1345039 - in /tomcat/trunk: java/org/apache/catalina/startup/Tomcat.java test/org/apache/catalina/startup/TestTomcat.java
Author: markt
Date: Fri Jun 1 10:16:50 2012
New Revision: 1345039
URL: http://svn.apache.org/viewvc?rev=1345039&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53301
Prevent double initialisation of servlets when using existing servlet instances
with embedded Tomcat
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1345039&r1=1345038&r2=1345039&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Fri Jun 1
10:16:50 2012
@@ -797,7 +797,6 @@ public class Tomcat {
*/
public static class ExistingStandardWrapper extends StandardWrapper {
private final Servlet existing;
-boolean init = false;
@SuppressWarnings("deprecation")
public ExistingStandardWrapper( Servlet existing ) {
@@ -821,9 +820,9 @@ public class Tomcat {
instance.init(facade);
return instance;
} else {
-if (!init) {
+if (!instanceInitialized) {
existing.init(facade);
-init = true;
+instanceInitialized = true;
}
return existing;
}
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1345039&r1=1345038&r2=1345039&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Fri Jun 1
10:16:50 2012
@@ -28,10 +28,12 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -159,6 +161,34 @@ public class TestTomcat extends TomcatBa
}
/**
+ * Simple servlet to test initialization of servlet instances.
+ */
+private static class InitCount extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+private AtomicInteger callCount = new AtomicInteger(0);
+
+@Override
+public void init() throws ServletException {
+super.init();
+callCount.incrementAndGet();
+}
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+resp.setContentType("text/plain");
+resp.getWriter().print("OK");
+}
+
+public int getCallCount() {
+return callCount.intValue();
+}
+}
+
+
+/**
* Simple Realm that uses a configurable {@link Map} to link user names and
* passwords.
*/
@@ -397,4 +427,24 @@ public class TestTomcat extends TomcatBa
}
assertNull(e);
}
+
+@Test
+public void testBug53301() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// Must have a real docBase - just use temp
+org.apache.catalina.Context ctx =
+tomcat.addContext("", System.getProperty("java.io.tmpdir"));
+
+InitCount initCount = new InitCount();
+Tomcat.addServlet(ctx, "initCount", initCount);
+ctx.addServletMapping("/", "initCount");
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() + "/");
+assertEquals("OK", res.toString());
+
+assertEquals(1, initCount.getCallCount());
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345035 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Fri Jun 1 09:53:58 2012 New Revision: 1345035 URL: http://svn.apache.org/viewvc?rev=1345035&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=1345035&r1=1345034&r2=1345035&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jun 1 09:53:58 2012 @@ -174,7 +174,7 @@ PATCHES PROPOSED TO BACKPORT: recycled. http://svn.apache.org/viewvc?rev=1342795&view=rev (r1342797 in Tomcat 7) - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53267 @@ -183,7 +183,7 @@ PATCHES PROPOSED TO BACKPORT: full GC every hour. http://svn.apache.org/viewvc?view=revision&revision=1343895 (r1343897 in TC7) - +1: kkolinko + +1: kkolinko, kfujino -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53342] If starting immediately after Tomcat stop fail, BindException will throw.
https://issues.apache.org/bugzilla/show_bug.cgi?id=53342 Keiichi Fujino changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Keiichi Fujino --- Fixed in trunk and 7.0.x. Will be in 7.0.28. -- 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: r1345033 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/core/ContainerBase.java webapps/docs/changelog.xml
Author: kfujino
Date: Fri Jun 1 09:48:58 2012
New Revision: 1345033
URL: http://svn.apache.org/viewvc?rev=1345033&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53342
To avoid BindException, make startStopThreads into a demon thread.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1345033&r1=1345032&r2=1345033&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java Fri
Jun 1 09:48:58 2012
@@ -31,8 +31,10 @@ import java.util.concurrent.BlockingQueu
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -1084,7 +1086,8 @@ public abstract class ContainerBase exte
startStopExecutor = new ThreadPoolExecutor(
getStartStopThreadsInternal(),
getStartStopThreadsInternal(), 10, TimeUnit.SECONDS,
-startStopQueue);
+startStopQueue,
+new StartStopThreadFactory(getName() + "-startStop-"));
startStopExecutor.allowCoreThreadTimeOut(true);
super.initInternal();
}
@@ -1584,4 +1587,24 @@ public abstract class ContainerBase exte
return null;
}
}
+
+private static class StartStopThreadFactory implements ThreadFactory {
+private ThreadGroup group;
+private AtomicInteger threadNumber = new AtomicInteger(1);
+private String namePrefix;
+
+public StartStopThreadFactory(String namePrefix) {
+SecurityManager s = System.getSecurityManager();
+group = (s != null) ? s.getThreadGroup() :
Thread.currentThread().getThreadGroup();
+this.namePrefix = namePrefix;
+}
+
+@Override
+public Thread newThread(Runnable r) {
+Thread thread = new Thread(group, r, namePrefix +
threadNumber.getAndIncrement());
+thread.setDaemon(true);
+return thread;
+}
+}
+
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1345033&r1=1345032&r2=1345033&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jun 1 09:48:58 2012
@@ -169,6 +169,10 @@
property name from its setter method if the name starts with several
uppercase characters. (kkolinko)
+
+53342: To avoid BindException, make startStopThreads into a
+demon thread. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53285] Web app configuration fails when security-role-ref does not contain role-link
https://issues.apache.org/bugzilla/show_bug.cgi?id=53285 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report and the test case. This has been fixed in trunk and 7.0.x and will be included in 7.0.28 onwards. -- 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: r1345031 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/deploy/ServletDef.java java/org/apache/catalina/startup/WebRuleSet.java webapps/docs/changelog.xml
Author: markt
Date: Fri Jun 1 09:43:15 2012
New Revision: 1345031
URL: http://svn.apache.org/viewvc?rev=1345031&view=rev
Log:
Modify how the digester processes security-role-ref since link is optional and
null parameters are not handled by IntrospectionUtils
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ServletDef.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1345029
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ServletDef.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ServletDef.java?rev=1345031&r1=1345030&r2=1345031&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ServletDef.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ServletDef.java Fri
Jun 1 09:43:15 2012
@@ -215,7 +215,9 @@ public class ServletDef implements Seria
/**
* Add a security-role-ref to the set of security-role-refs associated
* with this servlet.
+ * @deprecated
*/
+@Deprecated
public void addSecurityRoleRef(String roleName, String roleLink) {
SecurityRoleRef srr = new SecurityRoleRef();
srr.setName(roleName);
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=1345031&r1=1345030&r2=1345031&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java Fri
Jun 1 09:43:15 2012
@@ -386,10 +386,15 @@ public class WebRuleSet extends RuleSetB
digester.addCallMethod(fullPrefix + "/servlet/run-as/role-name",
"setRunAs", 0);
-digester.addCallMethod(fullPrefix + "/servlet/security-role-ref",
- "addSecurityRoleRef", 2);
-digester.addCallParam(fullPrefix +
"/servlet/security-role-ref/role-link", 1);
-digester.addCallParam(fullPrefix +
"/servlet/security-role-ref/role-name", 0);
+digester.addObjectCreate(fullPrefix + "/servlet/security-role-ref",
+ "org.apache.catalina.deploy.SecurityRoleRef");
+digester.addSetNext(fullPrefix + "/servlet/security-role-ref",
+"addSecurityRoleRef",
+"org.apache.catalina.deploy.SecurityRoleRef");
+digester.addCallMethod(fullPrefix +
"/servlet/security-role-ref/role-link",
+ "setLink", 0);
+digester.addCallMethod(fullPrefix +
"/servlet/security-role-ref/role-name",
+ "setName", 0);
digester.addCallMethod(fullPrefix + "/servlet/servlet-class",
"setServletClass", 0);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1345031&r1=1345030&r2=1345031&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jun 1 09:43:15 2012
@@ -161,6 +161,10 @@
full GC every hour. (markt)
+53285: Do not require security-role-ref
elements
+to contain a role-link element. (markt)
+
+
53322: When processing resource injection, correctly infer
property name from its setter method if the name starts with several
uppercase characters. (kkolinko)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345030 - /tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
Author: markt
Date: Fri Jun 1 09:41:18 2012
New Revision: 1345030
URL: http://svn.apache.org/viewvc?rev=1345030&view=rev
Log:
Remove unnecessary code
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java?rev=1345030&r1=1345029&r2=1345030&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java Fri Jun 1
09:41:18 2012
@@ -213,20 +213,6 @@ public class ServletDef implements Seria
}
/**
- * Add a security-role-ref to the set of security-role-refs associated
- * with this servlet.
- * @deprecated
- */
-@Deprecated
-public void addSecurityRoleRef(String roleName, String roleLink) {
-SecurityRoleRef srr = new SecurityRoleRef();
-srr.setName(roleName);
-srr.setLink(roleLink);
-securityRoleRefs.add(srr);
-}
-
-
-/**
* The multipart configuration, if any, for this servlet
*/
private MultipartDef multipartDef = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345029 - in /tomcat/trunk/java/org/apache/catalina: deploy/ServletDef.java startup/WebRuleSet.java
Author: markt
Date: Fri Jun 1 09:40:59 2012
New Revision: 1345029
URL: http://svn.apache.org/viewvc?rev=1345029&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53285
Modify how the digester processes security-role-ref since link is optional and
null parameters are not handled by IntrospectionUtils
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java?rev=1345029&r1=1345028&r2=1345029&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java Fri Jun 1
09:40:59 2012
@@ -215,7 +215,9 @@ public class ServletDef implements Seria
/**
* Add a security-role-ref to the set of security-role-refs associated
* with this servlet.
+ * @deprecated
*/
+@Deprecated
public void addSecurityRoleRef(String roleName, String roleLink) {
SecurityRoleRef srr = new SecurityRoleRef();
srr.setName(roleName);
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=1345029&r1=1345028&r2=1345029&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Fri Jun 1
09:40:59 2012
@@ -386,10 +386,15 @@ public class WebRuleSet extends RuleSetB
digester.addCallMethod(fullPrefix + "/servlet/run-as/role-name",
"setRunAs", 0);
-digester.addCallMethod(fullPrefix + "/servlet/security-role-ref",
- "addSecurityRoleRef", 2);
-digester.addCallParam(fullPrefix +
"/servlet/security-role-ref/role-link", 1);
-digester.addCallParam(fullPrefix +
"/servlet/security-role-ref/role-name", 0);
+digester.addObjectCreate(fullPrefix + "/servlet/security-role-ref",
+ "org.apache.catalina.deploy.SecurityRoleRef");
+digester.addSetNext(fullPrefix + "/servlet/security-role-ref",
+"addSecurityRoleRef",
+"org.apache.catalina.deploy.SecurityRoleRef");
+digester.addCallMethod(fullPrefix +
"/servlet/security-role-ref/role-link",
+ "setLink", 0);
+digester.addCallMethod(fullPrefix +
"/servlet/security-role-ref/role-name",
+ "setName", 0);
digester.addCallMethod(fullPrefix + "/servlet/servlet-class",
"setServletClass", 0);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1345026 - /tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
Author: kfujino
Date: Fri Jun 1 09:38:31 2012
New Revision: 1345026
URL: http://svn.apache.org/viewvc?rev=1345026&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53342
To avoid BindException, make startStopThreads into a demon thread.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1345026&r1=1345025&r2=1345026&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Fri Jun 1
09:38:31 2012
@@ -31,8 +31,10 @@ import java.util.concurrent.BlockingQueu
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -1042,7 +1044,8 @@ public abstract class ContainerBase exte
startStopExecutor = new ThreadPoolExecutor(
getStartStopThreadsInternal(),
getStartStopThreadsInternal(), 10, TimeUnit.SECONDS,
-startStopQueue);
+startStopQueue,
+new StartStopThreadFactory(getName() + "-startStop-"));
startStopExecutor.allowCoreThreadTimeOut(true);
super.initInternal();
}
@@ -1596,4 +1599,23 @@ public abstract class ContainerBase exte
return null;
}
}
+
+private static class StartStopThreadFactory implements ThreadFactory {
+private ThreadGroup group;
+private AtomicInteger threadNumber = new AtomicInteger(1);
+private String namePrefix;
+
+public StartStopThreadFactory(String namePrefix) {
+SecurityManager s = System.getSecurityManager();
+group = (s != null) ? s.getThreadGroup() :
Thread.currentThread().getThreadGroup();
+this.namePrefix = namePrefix;
+}
+
+@Override
+public Thread newThread(Runnable r) {
+Thread thread = new Thread(group, r, namePrefix +
threadNumber.getAndIncrement());
+thread.setDaemon(true);
+return thread;
+}
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53342] If starting immediately after Tomcat stop fail, BindException will throw.
https://issues.apache.org/bugzilla/show_bug.cgi?id=53342 --- Comment #1 from Keiichi Fujino --- Created attachment 28869 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28869&action=edit patch against trunk -- 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 53342] New: If starting immediately after Tomcat stop fail, BindException will throw.
https://issues.apache.org/bugzilla/show_bug.cgi?id=53342 Priority: P2 Bug ID: 53342 Assignee: dev@tomcat.apache.org Summary: If starting immediately after Tomcat stop fail, BindException will throw. Severity: normal Classification: Unclassified OS: All Reporter: kfuj...@apache.org Hardware: All Status: NEW Version: trunk Component: Catalina Product: Tomcat 7 e.g. When Context#stop throw LifecycleException, the main thread stops, but startStopThreads of Host/Engine will remain for a while. Because, startStopThreads is not a demon thread. As a result, even if a main thread stops, Acceptor Threads of 8080/8009 is not stopped. keepAliveTime for 10 seconds is set up now. === startStopExecutor = new ThreadPoolExecutor( getStartStopThreadsInternal(), getStartStopThreadsInternal(), 10, TimeUnit.SECONDS, startStopQueue); === Therefore, in order to avoid BindException, the waiting for 10 seconds is required. I think that I need to make startStopThreads into a demon thread. Best Regards. -- 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: r1345021 - in /tomcat/tc7.0.x/trunk: ./ build.xml test/webapp-3.0/bug53257/index.jsp
Author: markt
Date: Fri Jun 1 09:08:37 2012
New Revision: 1345021
URL: http://svn.apache.org/viewvc?rev=1345021&view=rev
Log:
Fix checkstyle warnings in Ant build
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1345020
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1345021&r1=1345020&r2=1345021&view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Jun 1 09:08:37 2012
@@ -467,6 +467,9 @@
+
+
+
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp?rev=1345021&r1=1345020&r2=1345021&view=diff
==
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp Fri Jun 1 09:08:37
2012
@@ -13,7 +13,8 @@
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.
---%><%@page contentType="text/plain; charset=UTF-8"
+--%>
+<%@page contentType="text/plain; charset=UTF-8"
%><%@page import="java.net.URL,java.net.URLConnection"%><%
String[] testFiles = new String[] {"foo;bar.txt", "foo&bar.txt",
"foo#bar.txt", "foo%bar.txt", "foo+bar.txt"};
@@ -22,13 +23,13 @@
if (url == null) {
out.print("FAIL (url) - " + testFile + "\n");
} else {
- URLConnection conn = url.openConnection();
- long lastModified = conn.getLastModified();
- if (lastModified == -1) {
- out.print("FAIL (last modified)- " + testFile + "\n");
- } else {
- out.print("PASS - " + testFile + "\n");
- }
+URLConnection conn = url.openConnection();
+long lastModified = conn.getLastModified();
+if (lastModified == -1) {
+out.print("FAIL (last modified)- " + testFile + "\n");
+} else {
+out.print("PASS - " + testFile + "\n");
+}
}
}
%>
\ 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
svn commit: r1345020 - in /tomcat/trunk: build.xml test/webapp-3.0/bug53257/index.jsp
Author: markt
Date: Fri Jun 1 09:06:53 2012
New Revision: 1345020
URL: http://svn.apache.org/viewvc?rev=1345020&view=rev
Log:
Fix checkstyle warnings in Ant build
Modified:
tomcat/trunk/build.xml
tomcat/trunk/test/webapp-3.0/bug53257/index.jsp
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1345020&r1=1345019&r2=1345020&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Jun 1 09:06:53 2012
@@ -478,6 +478,9 @@
+
+
+
Modified: tomcat/trunk/test/webapp-3.0/bug53257/index.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug53257/index.jsp?rev=1345020&r1=1345019&r2=1345020&view=diff
==
--- tomcat/trunk/test/webapp-3.0/bug53257/index.jsp (original)
+++ tomcat/trunk/test/webapp-3.0/bug53257/index.jsp Fri Jun 1 09:06:53 2012
@@ -13,7 +13,8 @@
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.
---%><%@page contentType="text/plain; charset=UTF-8"
+--%>
+<%@page contentType="text/plain; charset=UTF-8"
%><%@page import="java.net.URL,java.net.URLConnection"%><%
String[] testFiles = new String[] {"foo;bar.txt", "foo&bar.txt",
"foo#bar.txt", "foo%bar.txt", "foo+bar.txt"};
@@ -22,13 +23,13 @@
if (url == null) {
out.print("FAIL (url) - " + testFile + "\n");
} else {
- URLConnection conn = url.openConnection();
- long lastModified = conn.getLastModified();
- if (lastModified == -1) {
- out.print("FAIL (last modified)- " + testFile + "\n");
- } else {
- out.print("PASS - " + testFile + "\n");
- }
+URLConnection conn = url.openConnection();
+long lastModified = conn.getLastModified();
+if (lastModified == -1) {
+out.print("FAIL (last modified)- " + testFile + "\n");
+} else {
+out.print("PASS - " + testFile + "\n");
+}
}
}
%>
\ 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: [VOTE] Release Apache Tomcat Connectors 1.2.37
On 29.05.2012 11:23, Mladen Turk wrote: Hi, Apache Tomcat Connectors 1.2.37 release candidate is ready for vote at [1]. This version solves regression(s) found in released version 1.2.36 which can crash web server if configured in certain way. The VOTE will remain open for at least 48 hours. The Apache Tomcat Connectors 1.2.37 is [X] Stable, go ahead and release [ ] Broken because of ... +1 I only did some formal release checks. Details: - Sigs and hashes OK - key in KEYS file - gz and zip for src identical - src consistent with svn tag, except for the following expected deltas: - LICENSE and NOTICE moved one directory up (OK) - KEYS not in dist (OK) - deprectated jk2 xdocs missing in dist (OK) - additional generated files in dist: aclocal.m4, configure, Makefile.in, config.h.in, html docs in docs (OK) - additional auto tool copied files in dist: install-sh, ltmain.sh, missing (OK) - build.properties.autoconf, native/build.xml and the jkant directory missing from dist. Builds succesfully on - Solaris 8 Sparc as 32 Bit Binaries against 2.2 - Tool chain: - platform gcc except for Solaris (gcc 4.1.2 for Solaris 8) - CFLAGS: -O2 -g -Wall -fno-strict-aliasing (and -mpcu=v9 on Solaris) Additional observations (not a regression, at least not from 1.2.36): The LICENSE, NOTICE and *.pdb files contained in the binary zips for Windows extract with permissions 700 for me on Unix (even when using umask 022). All other files are OK. Maybe some possible improvement of setting the perms after build and before zipping. File ltmain.sh in src tar and zip has perms 644 instead of 755. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
