Re: [VOTE] Release Apache Tomcat Connectors 1.2.33
On 03/09/2012 01:00 PM, Mladen Turk wrote: Release candidate artefacts [1] based on tag [2] are ready for vote. The vote will stay open for at least 72 hours. Apache Tomcat Connectors 1.2.33 release candidate is [+1] Stable, release [-1] Do not release because of ... +1 (just for the record) C'mon guys, we need more votes here :) Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1299994 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java tomcat7-maven-plugin/src/main/java/org/apache/tomca
Author: olamy Date: Tue Mar 13 07:53:02 2012 New Revision: 124 URL: http://svn.apache.org/viewvc?rev=124&view=rev Log: fix default-value and add missing @since for new configuration field Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java?rev=124&r1=123&r2=124&view=diff == --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java (original) +++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java Tue Mar 13 07:53:02 2012 @@ -255,10 +255,10 @@ public abstract class AbstractRunMojo private String keystorePass; /** - * Override the default keystoreType for the HTTPS connector (if enabled) + * Override the type of keystore file to be used for the server certificate. If not specified, the default value is "JKS". * - * @parameter - * @since 1.1 + * @parameter default-value="JKS" + * @since 2.0.1 */ private String keystoreType; Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=124&r1=123&r2=124&view=diff == --- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java (original) +++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java Tue Mar 13 07:53:02 2012 @@ -258,6 +258,7 @@ public abstract class AbstractRunMojo /** * Override the type of keystore file to be used for the server certificate. If not specified, the default value is "JKS". * @parameter default-value="JKS" + * @since 2.0.1 */ private String keystoreType; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1299689 - in /tomcat/maven-plugin/trunk: (...)
2012/3/13 Konstantin Kolinko :
> 2012/3/12 :
>> Author: olamy
>> Date: Mon Mar 12 14:36:22 2012
>> New Revision: 1299689
>>
>> URL: http://svn.apache.org/viewvc?rev=1299689&view=rev
>> Log:
>> [MTOMCAT-126] Add support for keystoreType
>> Submitted by Cédric Couralet.
>>
>> Modified:
>>
>> tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
>>
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
>>
>> Modified:
>> tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java?rev=1299689&r1=1299688&r2=1299689&view=diff
>> ==
>> ---
>> tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
>> (original)
>> +++
>> tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
>> Mon Mar 12 14:36:22 2012
>> @@ -71,7 +71,7 @@ import java.util.Set;
>> *
>> * @author Jurgen Lust
>> * @author Mark Hobson
>> - * @version $Id: AbstractRunMojo.java 14033 2011-05-04 17:51:15Z
>> bimargulies $
>> + * @version $Id$
>> */
>> public abstract class AbstractRunMojo
>> extends AbstractI18NTomcat6Mojo
>> @@ -253,6 +253,14 @@ public abstract class AbstractRunMojo
>> * @since 1.1
>> */
>> private String keystorePass;
>> +
>> + /**
>> + * Override the default keystoreType for the HTTPS connector (if
>> enabled)
>> + *
>> + * @parameter
>
> No "@parameter default-value=" here?
> Your code for Tomcat 7 below has "default-value".
Good catch. Just fixed that.
Thanks for the review.
>
> It is @since 2.0.1, not 1.1 as written below?
>
>> + * @since 1.1
>> + */
>> + private String keystoreType;
>>
>> /**
>> *
>> @@ -767,6 +775,10 @@ public abstract class AbstractRunMojo
>> {
>> httpsConnector.setAttribute( "keystorePass",
>> keystorePass );
>> }
>> + if ( keystoreType != null )
>> + {
>> + httpsConnector.setAttribute( "keystoreType",
>> keystoreType );
>> + }
>> container.addConnector( httpsConnector );
>>
>> }
>>
>> Modified:
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1299689&r1=1299688&r2=1299689&view=diff
>> ==
>> ---
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
>> (original)
>> +++
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
>> Mon Mar 12 14:36:22 2012
>> @@ -254,7 +254,13 @@ public abstract class AbstractRunMojo
>> * @since 1.1
>> */
>> private String keystorePass;
>> -
>> +
>> + /**
>> + * Override the type of keystore file to be used for the server
>> certificate. If not specified, the default value is "JKS".
>> + * @parameter default-value="JKS"
>> + */
>> + private String keystoreType;
>> +
>> /**
>> *
>> * Enables or disables naming support for the embedded Tomcat server.
>> @@ -752,6 +758,10 @@ public abstract class AbstractRunMojo
>> {
>> httpsConnector.setAttribute( "keystorePass",
>> keystorePass );
>> }
>> + if ( keystoreType != null )
>> + {
>> + httpsConnector.setAttribute( "keystoreType",
>> keystoreType);
>> + }
>> embeddedTomcat.getEngine().getService().addConnector(
>> httpsConnector );
>>
>> }
>>
>>
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
--
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Connectors 1.2.33
>> Release candidate artefacts [1] based on tag [2] are ready for vote. >> The vote will stay open for at least 72 hours. >> >> Apache Tomcat Connectors 1.2.33 release candidate is >> [+1] Stable, release >> [-1] Do not release because of ... >> > > +1 (just for the record) +1 (works on OSX Lion) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-125) mvn tomcat7:run got "javax.naming.NameNotFoundException: Name jdbc is not bound in this Context"
[ https://issues.apache.org/jira/browse/MTOMCAT-125?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13228311#comment-13228311 ] guofeng zhang commented on MTOMCAT-125: --- I add the jdbc driver and commons-dbcp to the plugin's dependencies. I have a sample project, but I donot know how to attach it here. I have posted it in the mailing list. The following is the output on the Console (I use WIndows 7): Mar 13, 2012 7:04:23 PM org.apache.coyote.AbstractProtocol init INFO: Initializing ProtocolHandler ["http-bio-9090"] Mar 13, 2012 7:04:23 PM org.apache.catalina.core.StandardService startInternal INFO: Starting service Tomcat Mar 13, 2012 7:04:23 PM org.apache.catalina.core.StandardEngine startInternal INFO: Starting Servlet Engine: Apache Tomcat/7.0.25 Mar 13, 2012 7:04:24 PM org.apache.catalina.startup.ContextConfig getDefaultWebXmlFragment INFO: No global web.xml found Mar 13, 2012 7:04:24 PM org.apache.catalina.startup.ContextConfig webConfig SEVERE: Unable to determine URL for WEB-INF/classes javax.naming.NameNotFoundException: Resource /WEB-INF/classes not found at org.apache.naming.resources.BaseDirContext.listBindings(BaseDirContext.java:733) at org.apache.naming.resources.ProxyDirContext.listBindings(ProxyDirContext.java:546) at org.apache.catalina.startup.ContextConfig.webConfig(ContextConfig.java:1197) at org.apache.catalina.startup.ContextConfig.configureStart(ContextConfig.java:825) at org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java:300) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90) at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5161) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150) at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1568) at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1558) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:722) Mar 13, 2012 7:04:27 PM org.apache.catalina.core.StandardContext addApplicationListener INFO: The listener "com.sun.faces.config.ConfigureListener" is already configured for this context. The duplicate defini tion has been ignored. Mar 13, 2012 7:04:27 PM com.sun.faces.config.ConfigureListener contextInitialized INFO: Initializing Mojarra 2.1.4 (SNAPSHOT 2007) for context '/webds' Mar 13, 2012 7:04:27 PM com.sun.faces.spi.InjectionProviderFactory createInstance INFO: JSF1048: PostConstruct/PreDestroy annotations present. ManagedBeans methods marked with these annotations will ha ve said annotations processed. javax.naming.NameNotFoundException: Name jdbc is not bound in this Context at org.apache.naming.NamingContext.lookup(NamingContext.java:820) at org.apache.naming.NamingContext.lookup(NamingContext.java:168) at org.apache.naming.factory.ResourceLinkFactory.getObjectInstance(ResourceLinkFactory.java:94) at javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:321) at org.apache.naming.NamingContext.lookup(NamingContext.java:843) at org.apache.naming.NamingContext.lookup(NamingContext.java:154) at org.apache.naming.NamingContext.lookup(NamingContext.java:831) at org.apache.naming.NamingContext.lookup(NamingContext.java:154) at org.apache.naming.NamingContext.lookup(NamingContext.java:831) at org.apache.naming.NamingContext.lookup(NamingContext.java:154) at org.apache.naming.NamingContext.lookup(NamingContext.java:831) at org.apache.naming.NamingContext.lookup(NamingContext.java:168) at org.apache.naming.SelectorContext.lookup(SelectorContext.java:158) at javax.naming.InitialContext.lookup(InitialContext.java:411) at sample.DatabaseInitializer.processEvent(DatabaseInitializer.java:32) at javax.faces.event.SystemEvent.processListener(SystemEvent.java:106) at com.sun.faces.application.ApplicationImpl.processListeners(ApplicationImpl.java:2168) at com.sun.faces.application.ApplicationImpl.invokeListenersFor(ApplicationImpl.java:2144) at com.sun.faces.application.ApplicationImpl.publishEvent(ApplicationImpl.java:302) at com.sun.faces.config.ConfigManager.publishPostConfigEvent(ConfigManager.java:600) at com.sun.faces.config.ConfigManager.initialize(ConfigManager.java:369) at com.sun.face
[jira] [Updated] (MTOMCAT-125) mvn tomcat7:run got "javax.naming.NameNotFoundException: Name jdbc is not bound in this Context"
[ https://issues.apache.org/jira/browse/MTOMCAT-125?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] guofeng zhang updated MTOMCAT-125: -- Attachment: iview-global.zip I attached the sample for reproducing it. > mvn tomcat7:run got "javax.naming.NameNotFoundException: Name jdbc is not > bound in this Context" > > > Key: MTOMCAT-125 > URL: https://issues.apache.org/jira/browse/MTOMCAT-125 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.0-beta-1 > Environment: JDK 7, Tomcat 7.0.25, tomcat7-maven-plugin/2.0-beta-1 >Reporter: guofeng zhang >Assignee: Olivier Lamy > Attachments: iview-global.zip > > > I configured the datatsource as global naming datasource in server.xml, > > auth="Container" >maxPoolSize="100" minPoolSize="10" >name="jdbc/iviewDS" >testQuery="select count(*) from T_ROLE" >factory=".." >type="javax.sql.DataSource" >uniqueResourceName="jdbc/iviewDS"/> > The server.xml is copied to src\main\tomcatconf, (this also copyied by the > plugin to target\tomcat\conf, so it is used). > then in webapp/META-INF/context.xml, I have: > name="jdbc/iviewDS" > global="jdbc/iviewDS" > type="javax.sql.DataSource" > /> > And in web.xml: > > datasoruce > jdbc/iviewDS > javax.sql.DataSource > Container > > In my code, I lookup the datasource using 'java:/comp/env/jdbc/iviewDS'. > This works well when I deploy the app into tomcat/app directory. -- 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: r1300108 - /tomcat/trunk/build.xml
Author: markt Date: Tue Mar 13 12:56:31 2012 New Revision: 1300108 URL: http://svn.apache.org/viewvc?rev=1300108&view=rev Log: Exclude Eclipse files if jdbc-pool has been opened in Eclipse as a separate module Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1300108&r1=1300107&r2=1300108&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Tue Mar 13 12:56:31 2012 @@ -465,6 +465,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1300109 - /tomcat/trunk/res/checkstyle/org-import-control.xml
Author: markt Date: Tue Mar 13 12:56:51 2012 New Revision: 1300109 URL: http://svn.apache.org/viewvc?rev=1300109&view=rev Log: Update import control for latest spdy changes Modified: tomcat/trunk/res/checkstyle/org-import-control.xml Modified: tomcat/trunk/res/checkstyle/org-import-control.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-import-control.xml?rev=1300109&r1=1300108&r2=1300109&view=diff == --- tomcat/trunk/res/checkstyle/org-import-control.xml (original) +++ tomcat/trunk/res/checkstyle/org-import-control.xml Tue Mar 13 12:56:51 2012 @@ -116,8 +116,13 @@ - + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1300110 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/coyote/spdy/ java/org/apache/tomcat/jni/socket/ java/org/apache/tomcat/spdy/ modules/jdbc-pool/src/test/java/org
Author: markt
Date: Tue Mar 13 13:04:38 2012
New Revision: 1300110
URL: http://svn.apache.org/viewvc?rev=1300110&view=rev
Log:
Fix more Eclipse warnings:
- generics
- @Override
- unnecessary casts
- unnecessary code
- static field access
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContextJni.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyFrame.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug51582.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1300110&r1=1300109&r2=1300110&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue Mar
13 13:04:38 2012
@@ -187,7 +187,7 @@ public class Http11AprProtocol extends A
// TODO: map of protocols
public void setNpnHandler(String impl) {
try {
-Class c = Class.forName(impl);
+Class c = Class.forName(impl);
npnHandler = (NpnHandler) c.newInstance();
} catch (Exception ex) {
getLog().warn("Failed to init light protocol " + impl, ex);
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java?rev=1300110&r1=1300109&r2=1300110&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java Tue Mar 13
13:04:38 2012
@@ -32,6 +32,7 @@ import org.apache.coyote.RequestInfo;
import org.apache.coyote.Response;
import org.apache.coyote.http11.upgrade.UpgradeInbound;
import org.apache.tomcat.spdy.SpdyConnection;
+import org.apache.tomcat.spdy.SpdyContext;
import org.apache.tomcat.spdy.SpdyFrame;
import org.apache.tomcat.spdy.SpdyStream;
import org.apache.tomcat.util.ExceptionUtils;
@@ -220,7 +221,7 @@ public class SpdyProcessor extends Abstr
@Override
public void action(ActionCode actionCode, Object param) {
-if (spdy.getSpdyContext().debug) {
+if (SpdyContext.debug) {
// System.err.println(actionCode);
}
@@ -473,7 +474,8 @@ public class SpdyProcessor extends Abstr
}
@Override
-public SocketState process(SocketWrapper socket) throws IOException {
+public SocketState process(SocketWrapper socket)
+throws IOException {
throw new IOException("Unimplemented");
}
@@ -533,7 +535,7 @@ public class SpdyProcessor extends Abstr
throw new IOException("Name too long");
}
request.requestURI().setBytes(frame.data, frame.off, valueLen);
-if (spdy.getSpdyContext().debug) {
+if (SpdyContext.debug) {
System.err.println("URL= " + request.requestURI());
}
frame.advance(valueLen);
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java?rev=1300110&r1=1300109&r2=1300110&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java Tue Mar 13
13:04:38 2012
@@ -81,6 +81,7 @@ public class SpdyProxyProtocol extends A
return cHandler;
}
+@Override
public void start() throws Exception {
super.start();
spdyContext = new SpdyContextProxy() {
Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java?rev=1300110&r1=1300109&r2=1300110&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java Tue Mar 13
13:04:38 2012
@@ -117,6 +117,7 @@ public class AprSocket implements Runnab
poller = null;
}
+@Override
public String toString() {
return (context.isServer() ? "AprSrv-" : "AprCli-") +
Long
svn commit: r1300154 [2/2] - in /tomcat/trunk: ./ java/org/apache/coyote/ java/org/apache/tomcat/util/http/parser/ test/org/apache/tomcat/util/http/parser/
Added: tomcat/trunk/java/org/apache/tomcat/util/http/parser/Token.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/Token.java?rev=1300154&view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/Token.java (added)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/Token.java Tue Mar 13
14:39:24 2012
@@ -0,0 +1,131 @@
+/* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
+/*
JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true
*/
+package org.apache.tomcat.util.http.parser;
+
+/**
+ * Describes the input token stream.
+ */
+@SuppressWarnings("all") // Ignore warnings in generated code
+public class Token implements java.io.Serializable {
+
+ /**
+ * The version identifier for this Serializable class.
+ * Increment only if the serialized form of the
+ * class changes.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * An integer that describes the kind of this token. This numbering
+ * system is determined by JavaCCParser, and a table of these numbers is
+ * stored in the file ...Constants.java.
+ */
+ public int kind;
+
+ /** The line number of the first character of this Token. */
+ public int beginLine;
+ /** The column number of the first character of this Token. */
+ public int beginColumn;
+ /** The line number of the last character of this Token. */
+ public int endLine;
+ /** The column number of the last character of this Token. */
+ public int endColumn;
+
+ /**
+ * The string image of the token.
+ */
+ public String image;
+
+ /**
+ * A reference to the next regular (non-special) token from the input
+ * stream. If this is the last token from the input stream, or if the
+ * token manager has not read tokens beyond this one, this field is
+ * set to null. This is true only if this token is also a regular
+ * token. Otherwise, see below for a description of the contents of
+ * this field.
+ */
+ public Token next;
+
+ /**
+ * This field is used to access special tokens that occur prior to this
+ * token, but after the immediately preceding regular (non-special) token.
+ * If there are no such special tokens, this field is set to null.
+ * When there are more than one such special token, this field refers
+ * to the last of these special tokens, which in turn refers to the next
+ * previous special token through its specialToken field, and so on
+ * until the first special token (whose specialToken field is null).
+ * The next fields of special tokens refer to other special tokens that
+ * immediately follow it (without an intervening regular token). If there
+ * is no such token, this field is null.
+ */
+ public Token specialToken;
+
+ /**
+ * An optional attribute value of the Token.
+ * Tokens which are not used as syntactic sugar will often contain
+ * meaningful values that will be used later on by the compiler or
+ * interpreter. This attribute value is often different from the image.
+ * Any subclass of Token that actually wants to return a non-null value can
+ * override this method as appropriate.
+ */
+ public Object getValue() {
+return null;
+ }
+
+ /**
+ * No-argument constructor
+ */
+ public Token() {}
+
+ /**
+ * Constructs a new token for the specified Image.
+ */
+ public Token(int kind)
+ {
+this(kind, null);
+ }
+
+ /**
+ * Constructs a new token for the specified Image and Kind.
+ */
+ public Token(int kind, String image)
+ {
+this.kind = kind;
+this.image = image;
+ }
+
+ /**
+ * Returns the image.
+ */
+ public String toString()
+ {
+return image;
+ }
+
+ /**
+ * Returns a new Token object, by default. However, if you want, you
+ * can create and return subclass objects based on the value of ofKind.
+ * Simply add the cases to the switch for all those special cases.
+ * For example, if you have a subclass of Token called IDToken that
+ * you want to create if ofKind is ID, simply add something like :
+ *
+ *case MyParserConstants.ID : return new IDToken(ofKind, image);
+ *
+ * to the following switch statement. Then you can cast matchedToken
+ * variable to the appropriate type and use sit in your lexical actions.
+ */
+ public static Token newToken(int ofKind, String image)
+ {
+switch(ofKind)
+{
+ default : return new Token(ofKind, image);
+}
+ }
+
+ public static Token newToken(int ofKind)
+ {
+return newToken(ofKind, null);
+ }
+
+}
+/* JavaCC - OriginalChecksum=2104130aa3f9189e35a4571dc4c8f0c9 (do not edit
this line) */
Propchange: tomcat/trunk/java/org/apache/tomcat/util/http/parser/Token.java
--
svn:eol-style = native
Added: tomcat/trunk/java/org/apache/tomcat/util/http/parser/TokenMgr
svn commit: r1300155 - in /tomcat/trunk: java/org/apache/catalina/connector/Response.java test/org/apache/catalina/connector/TestResponse.java
Author: markt
Date: Tue Mar 13 14:41:27 2012
New Revision: 1300155
URL: http://svn.apache.org/viewvc?rev=1300155&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52811
Make use of the newly added HttpParser to correctly process Content-Type headers
As well as the problem identified in the bug report, this fixes a couple of
related issues:
- setting the content type via (set|add)Header bypassed some checks
- avoids parsing the content-type header multiple times
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1300155&r1=1300154&r2=1300155&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Tue Mar 13
14:41:27 2012
@@ -19,6 +19,7 @@ package org.apache.catalina.connector;
import java.io.IOException;
import java.io.PrintWriter;
+import java.io.StringReader;
import java.net.MalformedURLException;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -52,6 +53,9 @@ import org.apache.tomcat.util.buf.UEncod
import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.http.ServerCookie;
+import org.apache.tomcat.util.http.parser.AstMediaType;
+import org.apache.tomcat.util.http.parser.HttpParser;
+import org.apache.tomcat.util.http.parser.ParseException;
import org.apache.tomcat.util.net.URL;
import org.apache.tomcat.util.res.StringManager;
@@ -684,7 +688,6 @@ public class Response
* @param type The new content type
*/
@Override
-@SuppressWarnings("deprecation") // isSpace (deprecated) cannot be
replaced by isWhiteSpace
public void setContentType(String type) {
if (isCommitted()) {
@@ -696,39 +699,30 @@ public class Response
return;
}
-// Ignore charset if getWriter() has already been called
-if (usingWriter) {
-if (type != null) {
-int index = type.indexOf(";");
-if (index != -1) {
-type = type.substring(0, index);
-}
-}
+if (type == null) {
+coyoteResponse.setContentType(null);
+return;
}
-coyoteResponse.setContentType(type);
+AstMediaType m = null;
+HttpParser hp = new HttpParser(new StringReader(type));
+try {
+ m = hp.MediaType();
+} catch (ParseException e) {
+// Invalid - Assume no charset and just pass through whatever
+// the user provided.
+coyoteResponse.setContentTypeNoCharset(type);
+return;
+}
-// Check to see if content type contains charset
-if (type != null) {
-int index = type.indexOf(";");
-if (index != -1) {
-int len = type.length();
-index++;
-// N.B. isSpace (deprecated) cannot be replaced by isWhiteSpace
-while (index < len && Character.isSpace(type.charAt(index))) {
-index++;
-}
-if (index+7 < len
-&& type.charAt(index) == 'c'
-&& type.charAt(index+1) == 'h'
-&& type.charAt(index+2) == 'a'
-&& type.charAt(index+3) == 'r'
-&& type.charAt(index+4) == 's'
-&& type.charAt(index+5) == 'e'
-&& type.charAt(index+6) == 't'
-&& type.charAt(index+7) == '=') {
-isCharacterEncodingSet = true;
-}
+coyoteResponse.setContentTypeNoCharset(m.toStringNoCharset());
+
+String charset = m.getCharset();
+if (charset != null) {
+// Ignore charset if getWriter() has already been called
+if (!usingWriter) {
+coyoteResponse.setCharacterEncoding(charset);
+isCharacterEncodingSet = true;
}
}
}
@@ -1013,8 +1007,31 @@ public class Response
return;
}
+char cc=name.charAt(0);
+if (cc=='C' || cc=='c') {
+if (checkSpecialHeader(name, value))
+return;
+}
+
coyoteResponse.addHeader(name, value);
+}
+
+/**
+ * An extended version of this exists in {@link
org.apache.coyote.Response}.
+ * This check is required here to ensure that the usingWriter checks in
+ * {@link #setContentType(String)} are applied since usingWriter is not
+ * visible to {@link
svn commit: r1300157 - in /tomcat/tc7.0.x/trunk: ./ .gitignore build.xml java/org/apache/tomcat/util/http/parser/ test/org/apache/tomcat/util/http/parser/
Author: markt Date: Tue Mar 13 14:43:57 2012 New Revision: 1300157 URL: http://svn.apache.org/viewvc?rev=1300157&view=rev Log: Add an HTTP header parser. The driver for this was an attempt to fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52811 Parsing HTTP headers as per RFC2616 is not always as simple as it first appears. For headers that only use tokens the simple approach will normally be sufficient. However, for the other headers, while simple code meets 99.9% of cases, there are often some edge cases that make things far more complicated. The purpose of this parser is to let the parser worry about the edge cases. It provides strict parsing of HTTP header values assuming that wrapped header lines have already been unwrapped. (The Tomcat header processing code does the unwrapping.) The parser currently supports parsing of the following HTTP header values as per RFC 2616: - Content-Type Support for additional headers will be provided as required. A quick scan of the Tomcat code base suggested a couple of places where using this parser may be useful such as Ranges in the default servlet but there was not - at this point - a compelling case for immediate replacement. The expectation is that as problems are identified in header parsing, the fix will typically extend this parser to support the problematic header and then use the parser rather than custom code. Added: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/ (props changed) - copied from r1300154, tomcat/trunk/java/org/apache/tomcat/util/http/parser/ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/parser/ - copied from r1300154, tomcat/trunk/test/org/apache/tomcat/util/http/parser/ Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/.gitignore tomcat/tc7.0.x/trunk/build.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 13 14:43:57 2012 @@ -1 +1 @@ -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339 ,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208 145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,123
svn commit: r1300161 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/Response.java java/org/apache/coyote/Response.java test/org/apache/catalina/connector/TestResponse.java
Author: markt Date: Tue Mar 13 14:45:54 2012 New Revision: 1300161 URL: http://svn.apache.org/viewvc?rev=1300161&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52811 Make use of the newly added HttpParser to correctly process Content-Type headers As well as the problem identified in the bug report, this fixes a couple of related issues: - setting the content type via (set|add)Header bypassed some checks - avoids parsing the content-type header multiple times Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/Response.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestResponse.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 13 14:45:54 2012 @@ -1 +1 @@ -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339 ,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208 145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1 232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154 +/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,117820
svn commit: r1300162 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Mar 13 14:47:15 2012 New Revision: 1300162 URL: http://svn.apache.org/viewvc?rev=1300162&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=1300162&r1=1300161&r2=1300162&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 13 14:47:15 2012 @@ -166,6 +166,13 @@ PATCHES PROPOSED TO BACKPORT: +1: markt -1: +* https://issues.apache.org/bugzilla/show_bug.cgi?id=52811 + Fix parsing of Content-Type + http://svn.apache.org/viewvc?rev=1300155&view=rev (new HTTP header parser) + http://svn.apache.org/viewvc?rev=1300161&view=rev (the actual fix) + +1: markt + -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
DO NOT REPLY [Bug 52811] HttpServletResponse.setContentType() parses the content type incorrectly
https://issues.apache.org/bugzilla/show_bug.cgi?id=52811 --- Comment #1 from Mark Thomas 2012-03-13 14:48:09 UTC --- That was fun. Lots of sneaky edge cases parsing that little lot. Ended up implementing a new HTTP header parser. Fixed in trunk and 7.0.x and will be included in 7.0.27 onwards. I have proposed the fix for 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT] Was: [VOTE] Release Apache Tomcat Connectors 1.2.33
With 3 binding +1 votes (Henri, Mladen and Rainer) and no other votes I declare this vote as passed. Will copy the artefacts to dist and create ANN after 24 hrs for mirror sync. On 03/09/2012 01:00 PM, Mladen Turk wrote: Release candidate artefacts [1] based on tag [2] are ready for vote. The vote will stay open for at least 72 hours. Apache Tomcat Connectors 1.2.33 release candidate is [+1] Stable, release [-1] Do not release because of ... [1] https://svn.apache.org/repos/asf/tomcat/jk/tags/JK_1_2_33 [2] http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.33 Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52899] New: JMXProxy Servlet MBeanDumper exposing non-properties causing exceptions/memory leak
https://issues.apache.org/bugzilla/show_bug.cgi?id=52899
Bug #: 52899
Summary: JMXProxy Servlet MBeanDumper exposing non-properties
causing exceptions/memory leak
Product: Tomcat 7
Version: 7.0.26
Platform: PC
OS/Version: Windows Vista
Status: NEW
Severity: minor
Priority: P2
Component: Manager
AssignedTo: dev@tomcat.apache.org
ReportedBy: hodg...@gmail.com
Classification: Unclassified
Once we upgraded to 7.0.26 we see the following exception in the logs when
viewing the Tomcat JDBC pool properties through the JMXProxy Servlet.
As you can see in the following the data is retrieved correctly but a SEVERE
exception appears in the logs.
http://localhost:8080/manager/jmxproxy/?qry=bean:name=eventingDataSource
OK - Number of results: 1
Name: bean:name=eventingDataSource
modelerType: org.apache.tomcat.jdbc.pool.DataSource
MaxIdle: 100
JdbcInterceptors:
org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer
DefaultTransactionIsolation: -1
ValidationQuery: SELECT 1 FROM dual
TestOnConnect: false
Password: Password not available as DataSource/JMX operation.
AbandonWhenPercentageFull: 0
TestOnReturn: false
Username:
NumActive: 0
MinIdle: 10
PoolSize: 4
ValidationInterval: 180
Connection:
ProxyConnection[PooledConnection[oracle.jdbc.driver.T4CConnection@17f8b39]]
NumIdle: 2
AccessToUnderlyingConnectionAllowed: true
Url: jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST =
localhost)(PORT = 1580))(CONNECT_DATA =(SERVER = DEDICATED)( SERVICE_NAME =
anywhere.com )(INSTANCE_NAME = xxx)(SID = xxx)))
Size: 4
Active: 2
AlternateUsernameAllowed: false
TestOnBorrow: true
LoginTimeout: 6
MaxActive: 100
MaxAge: 0
SuspectTimeout: 0
Pool: org.apache.tomcat.jdbc.pool.ConnectionPool@9283bf
NumTestsPerEvictionRun: 0
Name: Tomcat Connection Pool[1-6300663]
MaxWait: 6000
PoolProperties: ConnectionPool[defaultAutoCommit=null; defaultReadOnly=null;
defaultTransactionIsolation=-1; defaultCatalog=null;
driverClassName=oracle.jdbc.driver.OracleDriver; maxActive=100; maxIdle=100;
minIdle=10; initialSize=10; maxWait=6000; testOnBorrow=true;
testOnReturn=false; timeBetweenEvictionRunsMillis=3;
numTestsPerEvictionRun=0; minEvictableIdleTimeMillis=3;
testWhileIdle=false; testOnConnect=false; password=x;
url=jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST =
localhost)(PORT = 1580))(CONNECT_DATA =(SERVER = DEDICATED)( SERVICE_NAME =
anywhere.com )(INSTANCE_NAME = xxx)(SID = xxx))); username=xxx;
validationQuery=SELECT 1 FROM dual; validationInterval=180;
accessToUnderlyingConnectionAllowed=true; removeAbandoned=true;
removeAbandonedTimeout=60; logAbandoned=true; connectionProperties=null;
initSQL=null;
jdbcInterceptors=org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer;
jmxEnabled=true; fairQueue=false; useEquals=false; abandonWhenPercentageFull=0;
maxAge=0; useLock=false; dataSource=null; dataSourceJNDI=null;
alternateUsernameAllowed=false;
PoolName: Tomcat Connection Pool[1-6300663]
WaitCount: 0
JmxEnabled: true
TestWhileIdle: false
UseEquals: false
UseLock: false
DriverClassName: oracle.jdbc.driver.OracleDriver
RemoveAbandonedTimeout: 60
DbProperties: {user=, password=}
Idle: 2
LogAbandoned: true
FairQueue: false
PoolSweeperEnabled: true
ConnectionAsync:
org.apache.tomcat.jdbc.pool.ConnectionPool$ConnectionFuture@e9c2d3
JdbcInterceptorsAsArray:
Array[org.apache.tomcat.jdbc.pool.PoolProperties$InterceptorDefinition] of
length 2
org.apache.tomcat.jdbc.pool.PoolProperties$InterceptorDefinition@125f027
org.apache.tomcat.jdbc.pool.PoolProperties$InterceptorDefinition@1b99628
RemoveAbandoned: true
TimeBetweenEvictionRunsMillis: 3
MinEvictableIdleTimeMillis: 3
InitialSize: 10
Mar 6, 2012 9:18:20 AM org.apache.catalina.mbeans.MBeanDumper dumpBeans
SEVERE: Error getting attribute bean:name=eventingDataSource PooledConnection
javax.management.MBeanException: RuntimeException thrown in RequiredModelMBean
while trying to invoke operation getPooledConnection
at
javax.management.modelmbean.RequiredModelMBean.invokeMethod(RequiredModelMBean.java:1091)
at
javax.management.modelmbean.RequiredModelMBean.invoke(RequiredModelMBean.java:955)
at
org.springframework.jmx.export.SpringModelMBean.invoke(SpringModelMBean.java:90)
at
javax.management.modelmbean.RequiredModelMBean.getAttribute(RequiredModelMBean.java:1358)
at
org.springframework.jmx.export.SpringModelMBean.getAttribute(SpringModelMBean.java:109)
at
com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.getAttribute(DefaultMBeanServerInterceptor.java:666)
at
com.sun.jmx.mbeanserver.JmxMBeanServer.ge
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2847 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1300155 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r553 - in /release/tomcat/tomcat-connectors/jk: ./ binaries/ binaries/windows/ binaries/windows/symbols/
Author: mturk Date: Tue Mar 13 17:10:07 2012 New Revision: 553 Log: Add 1.2.33 artifacts and remove old one Added: release/tomcat/tomcat-connectors/jk/.htaccess (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/README.html (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/HEADER.html (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/README.html (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-x86_64-symbols.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-x86_64-symbols.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-x86_64-symbols.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-x86_64-symbols.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.0.x.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.0.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.0.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.0.x.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.2.x.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.2.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.2.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.2.x.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.4.x.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.4.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.4.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.4.x.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iis.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iis.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iis.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iis.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iplanet.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iplanet.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iplanet.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iplanet.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-x86_64-iis.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-x86_64-iis.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-x86_64-iis.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-x86_64-iis.zip.sha1 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz (with props) release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz.md5 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz.sha1 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.zip (with props) release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.zip.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.zip.md5 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.zip.sha1 Removed: release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.32-windows-
svn commit: r553 - in /release/tomcat/tomcat-connectors/jk: ./ binaries/ binaries/windows/ binaries/windows/symbols/
Author: mturk Date: Tue Mar 13 17:10:07 2012 New Revision: 553 Log: Add 1.2.33 artifacts and remove old one Added: release/tomcat/tomcat-connectors/jk/.htaccess (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/README.html (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/HEADER.html (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/README.html (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-x86_64-symbols.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-x86_64-symbols.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-x86_64-symbols.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-x86_64-symbols.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.0.x.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.0.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.0.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.0.x.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.2.x.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.2.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.2.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.2.x.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.4.x.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.4.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.4.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-httpd-2.4.x.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iis.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iis.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iis.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iis.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iplanet.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iplanet.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iplanet.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-i386-iplanet.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-x86_64-iis.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-x86_64-iis.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-x86_64-iis.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.33-windows-x86_64-iis.zip.sha1 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz (with props) release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz.md5 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz.sha1 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.zip (with props) release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.zip.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.zip.md5 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.zip.sha1 Removed: release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.32-windows-
svn commit: r1300245 - in /tomcat/jk/trunk/xdocs: index.xml news/20120301.xml
Author: mturk Date: Tue Mar 13 17:18:38 2012 New Revision: 1300245 URL: http://svn.apache.org/viewvc?rev=1300245&view=rev Log: Update 1.2.33 release notes Modified: tomcat/jk/trunk/xdocs/index.xml tomcat/jk/trunk/xdocs/news/20120301.xml Modified: tomcat/jk/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1300245&r1=1300244&r2=1300245&view=diff == --- tomcat/jk/trunk/xdocs/index.xml (original) +++ tomcat/jk/trunk/xdocs/index.xml Tue Mar 13 17:18:38 2012 @@ -46,6 +46,17 @@ manual is described in more detail below +13 March 2012 - JK-1.2.33 released +The Apache Tomcat team is proud to announce the immediate availability +of Tomcat Connectors 1.2.33 Stable. This release contains mainly bug fixes + +Download the http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz";>JK 1.2.33 release sources +| http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz.asc";>PGP signature + +Download the http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/";>binaries for selected platforms. + + + 8 July 2011 - JK-1.2.32 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Connectors 1.2.32 Stable. This release contains mainly bug fixes Modified: tomcat/jk/trunk/xdocs/news/20120301.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20120301.xml?rev=1300245&r1=1300244&r2=1300245&view=diff == --- tomcat/jk/trunk/xdocs/news/20120301.xml (original) +++ tomcat/jk/trunk/xdocs/news/20120301.xml Tue Mar 13 17:18:38 2012 @@ -31,6 +31,20 @@ + + + +The Apache Tomcat team is proud to announce the immediate availability +of Tomcat Connectors 1.2.33. This is a stable release concentrating mainly on +some bug fixes. + +Please see the ChangeLog for a full list of changes. + +If you find any bugs while using this release, please fill in the +https://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors";>Bugzilla +Bug Report. + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1300247 - in /tomcat/jk/trunk/native: STATUS.txt common/jk_version.h configure.in
Author: mturk
Date: Tue Mar 13 17:21:16 2012
New Revision: 1300247
URL: http://svn.apache.org/viewvc?rev=1300247&view=rev
Log:
Bump the version to 1.2.34-dev
Modified:
tomcat/jk/trunk/native/STATUS.txt
tomcat/jk/trunk/native/common/jk_version.h
tomcat/jk/trunk/native/configure.in
Modified: tomcat/jk/trunk/native/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1300247&r1=1300246&r2=1300247&view=diff
==
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Tue Mar 13 17:21:16 2012
@@ -18,7 +18,8 @@ Last modified at [$Date$]
Release:
-1.2.33 : in development
+1.2.34 : in development
+1.2.33 : released March 13, 2012
1.2.32 : released July 8, 2011
1.2.31 : released November 1, 2010
1.2.30 : released March 1, 2010
Modified: tomcat/jk/trunk/native/common/jk_version.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1300247&r1=1300246&r2=1300247&view=diff
==
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Tue Mar 13 17:21:16 2012
@@ -26,10 +26,10 @@
/** START OF AREA TO MODIFY BEFORE RELEASING */
#define JK_VERMAJOR 1
#define JK_VERMINOR 2
-#define JK_VERFIX 33
+#define JK_VERFIX 34
/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 1
+#define JK_VERISRELEASE 0
/* Beta number */
#define JK_VERBETA 0
#define JK_BETASTRING "0"
Modified: tomcat/jk/trunk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.in?rev=1300247&r1=1300246&r2=1300247&view=diff
==
--- tomcat/jk/trunk/native/configure.in (original)
+++ tomcat/jk/trunk/native/configure.in Tue Mar 13 17:21:16 2012
@@ -26,7 +26,7 @@ AC_CANONICAL_SYSTEM
dnl package and version. (synchronization with common/jk_version.h ?)
PACKAGE=mod_jk
-VERSION=1.2.33
+VERSION=1.2.34
AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1300253 - in /tomcat/site/trunk: docs/download-connectors.html docs/index.html docs/oldnews.html xdocs/download-connectors.xml xdocs/index.xml xdocs/oldnews.xml
Author: mturk Date: Tue Mar 13 17:35:19 2012 New Revision: 1300253 URL: http://svn.apache.org/viewvc?rev=1300253&view=rev Log: Add 1.2.33 release notes Modified: tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/xdocs/download-connectors.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1300253&r1=1300252&r2=1300253&view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Tue Mar 13 17:35:19 2012 @@ -281,20 +281,20 @@ - -JK 1.2.32 Source Release tar.gz + +JK 1.2.33 Source Release tar.gz (e.g. Unix, Linux, Mac OS) -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.tar.gz.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.tar.gz.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz.md5";>MD5] @@ -304,20 +304,20 @@ - -JK 1.2.32 Source Release zip + +JK 1.2.33 Source Release zip (e.g. Windows) -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.zip.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.zip.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.zip.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.zip.md5";>MD5] @@ -350,7 +350,7 @@ -tomcat-connectors-1.2.32-src.* is signed by Mladen Turk (564C17A3). +tomcat-connectors-1.2.33-src.* is signed by Mladen Turk (564C17A3). @@ -387,7 +387,7 @@ % pgpk -a KEYS -% pgpv tomcat-connectors-1.2.32-src.tar.gz.asc +% pgpv tomcat-connectors-1.2.33-src.tar.gz.asc or @@ -395,7 +395,7 @@ % pgp -ka KEYS -% pgp tomcat-connectors-1.2.32-src.tar.gz.asc +% pgp tomcat-connectors-1.2.33-src.tar.gz.asc or @@ -403,7 +403,7 @@ % gpg --import KEYS -% gpg --verify tomcat-connectors-1.2.32-src.tar.gz.asc +% gpg --verify tomcat-connectors-1.2.33-src.tar.gz.asc Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1300253&r1=1300252&r2=1300253&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Mar 13 17:35:19 2012 @@ -233,6 +233,39 @@ project logo are trademarks of the Apach + +Tomcat Connectors 1.2.23 Released2012-03-12 + + + + + + + +The Apache Tomcat Project is proud to announce the release of version 1.2.33 of +Apache Tomcat Connectors. +This version is principally a bugfix release. + + + + +Download | +ChangeLog for 1.2.33 + + + + + + + + + + + + + + + Tomcat Native 1.1.23 Released2012-03-02 @@ -386,74 +419,6 @@ Apache Tomcat. This release includes sec - -Tomcat Native 1.1.22 Released2011-08-08 - - - - - - - -The Apache Tomcat Project is proud to announce the release of version 1.1.22 of Tomcat Native. -This version is principally a bugfix release. - - - - -Download | -ChangeLog for 1.1.22 - - - - - - - - - - - - - - - - -Tomcat Connectors 1.2.32 Released2011-07-08 - - - - - - - -The Apache Tomcat Project is proud to announce the release of version 1.2.32 of -Apache Tomcat Connectors. This release includes both bug fixes and new features -compared to version 1.2.31. -Full details of these changes and new features, are available in the -Tomcat Connectors changelog. - - - - - -Download | -ChangeLog for 1.2.32 - - - - - - - - - - - - - - - Old news Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1300253&r1=1300252&r2=1300253&view=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Tue
Re: svn commit: r1300245 - in /tomcat/jk/trunk/xdocs: index.xml news/20120301.xml
2012/3/13 : > Author: mturk > Date: Tue Mar 13 17:18:38 2012 > New Revision: 1300245 > > URL: http://svn.apache.org/viewvc?rev=1300245&view=rev > Log: > Update 1.2.33 release notes > > Modified: > tomcat/jk/trunk/xdocs/index.xml > tomcat/jk/trunk/xdocs/news/20120301.xml > > Modified: tomcat/jk/trunk/xdocs/index.xml > URL: > http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1300245&r1=1300244&r2=1300245&view=diff > == > --- tomcat/jk/trunk/xdocs/index.xml (original) > +++ tomcat/jk/trunk/xdocs/index.xml Tue Mar 13 17:18:38 2012 > @@ -46,6 +46,17 @@ manual is described in more detail below > > > > +13 March 2012 > - JK-1.2.33 released > +The Apache Tomcat team is proud to announce the immediate availability > + of Tomcat Connectors 1.2.33 Stable. This release contains mainly bug > fixes > + > +Download the href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz";>JK > 1.2.33 release sources There is a policy to do not link to www.apache.org/dist directly, except for checksum/signature files. It'd be better to link to http://tomcat.apache.org/download-connectors.cgi > + | href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.33-src.tar.gz.asc";>PGP > signature > + > +Download the href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/";>binaries > for selected platforms. > + > + > + > 8 July 2011 - > JK-1.2.32 released > The Apache Tomcat team is proud to announce the immediate availability > of Tomcat Connectors 1.2.32 Stable. This release contains mainly bug fixes > > Modified: tomcat/jk/trunk/xdocs/news/20120301.xml > URL: > http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20120301.xml?rev=1300245&r1=1300244&r2=1300245&view=diff > == > --- tomcat/jk/trunk/xdocs/news/20120301.xml (original) > +++ tomcat/jk/trunk/xdocs/news/20120301.xml Tue Mar 13 17:18:38 2012 > @@ -31,6 +31,20 @@ > > > > + > + > + > + The Apache Tomcat team is proud to announce the immediate availability > + of Tomcat Connectors 1.2.33. This is a stable release concentrating > mainly on > + some bug fixes. > + > + Please see the href="../miscellaneous/changelog.html">ChangeLog for a full list of > changes. > + > + If you find any bugs while using this release, please fill in the > + href="https://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors";>Bugzilla > + Bug Report. > + > + > > > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Connectors 1.2.33
A spot belated, but: [+1] Stable, release Tested on OS X Snow Leopard and Windows 2003 Server. No problems encountered. Will be building on AIX/PPC64, HPUX/PARISC, HPUX/IA64, Solaris 10/Sparc, Solaris 10/x64 and a bunch of CentOS/RHEL versions soon. cheers tim On Sat, Mar 10, 2012 at 1:00 AM, Mladen Turk wrote: > Release candidate artefacts [1] based on tag [2] are ready for vote. > The vote will stay open for at least 72 hours. > > Apache Tomcat Connectors 1.2.33 release candidate is > [+1] Stable, release > [-1] Do not release because of ... > > > [1] https://svn.apache.org/repos/asf/tomcat/jk/tags/JK_1_2_33 > [2] http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.33 > > > Regards > -- > ^TM > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULT] Was: [VOTE] Release Apache Tomcat Connectors 1.2.33
Thanks Mladen The source distribution for 1.2.32 ended up in the root of the jk archive [1] (which I've only just found now ;), but all the other releases have gone into the source subdirectory [2]. I assume this was unintentional? [1] http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/ [2] http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/ cheers tim On Wed, Mar 14, 2012 at 3:49 AM, Mladen Turk wrote: > With 3 binding +1 votes (Henri, Mladen and Rainer) and no other votes > I declare this vote as passed. > > Will copy the artefacts to dist and create ANN after 24 hrs for mirror sync. > > On 03/09/2012 01:00 PM, Mladen Turk wrote: >> >> Release candidate artefacts [1] based on tag [2] are ready for vote. >> The vote will stay open for at least 72 hours. >> >> Apache Tomcat Connectors 1.2.33 release candidate is >> [+1] Stable, release >> [-1] Do not release because of ... >> >> >> [1] https://svn.apache.org/repos/asf/tomcat/jk/tags/JK_1_2_33 >> [2] http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.33 > > > > Regards > -- > ^TM > > - > 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
DO NOT REPLY [Bug 52905] New: Commons Daemon 1.0.9 can't find libcap.so
https://issues.apache.org/bugzilla/show_bug.cgi?id=52905 Bug #: 52905 Summary: Commons Daemon 1.0.9 can't find libcap.so Product: Tomcat 7 Version: 7.0.26 Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Packaging AssignedTo: dev@tomcat.apache.org ReportedBy: asaik...@gmail.com Classification: Unclassified Commons Daemon 1.0.9 which ships with tomcat 7.0.26 has some issues when building jsvc on on debian systems. This issue has been fixed in commons daemon 1.0.10 see details at https://issues.apache.org/jira/browse/DAEMON-242 I ran into exactly the same problem with a jsvc I built on RHEL 5.8 and then tried to run on RHEL 6.2, as a workaround i have upgraded the commons daemon to version 1.0.10 on my tomcat 7.0.26 would be nice if commons daemon-1.0.10 shipped with tomcat. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1300461 - in /tomcat/trunk/java/org/apache/tomcat/spdy: SpdyConnection.java SpdyContext.java SpdyContextJni.java SpdyContextProxy.java
Author: costin
Date: Wed Mar 14 04:37:44 2012
New Revision: 1300461
URL: http://svn.apache.org/viewvc?rev=1300461&view=rev
Log:
Fix spdy stream closing / removing from channels
Fix/simplify draining.
Use the java6 compression by default - not only avoids jzlib depenency, but
it's also 20..30% faster.
Refactor creation of sockets to allow Jetty-style java7 NPN.
Modified:
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContext.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContextJni.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContextProxy.java
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java?rev=1300461&r1=1300460&r2=1300461&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java Wed Mar 14
04:37:44 2012
@@ -138,18 +138,19 @@ public abstract class SpdyConnection { /
*/
SpdyFrame out;
-boolean draining = false;
-
private int goAway = Integer.MAX_VALUE;
public SpdyConnection(SpdyContext spdyContext) {
this.spdyContext = spdyContext;
outCondition = framerLock.newCondition();
+if (spdyContext.compression) {
+setCompressSupport(new CompressDeflater6());
+}
}
@Override
public String toString() {
-return "SpdyCon open=" + channels.size();
+return "SpdyCon open=" + channels.size() + " " + lastChannel;
}
public void dump(PrintWriter out) {
@@ -205,15 +206,7 @@ public abstract class SpdyConnection { /
public void drain() {
synchronized (nbDrain) {
-if (draining) {
-return;
-}
-draining = true;
-}
-
-_drain();
-synchronized (nbDrain) {
-draining = false;
+_drain();
}
}
@@ -308,9 +301,13 @@ public abstract class SpdyConnection { /
}
synchronized (channels) {
-if (out.stream != null &&
-out.stream.finRcvd && out.stream.finSent) {
-channels.remove(out.streamId);
+if (out.stream != null) {
+if (out.isHalfClose()) {
+out.stream.finSent = true;
+}
+if (out.stream.finRcvd && out.stream.finSent) {
+channels.remove(out.streamId);
+}
}
}
out = null;
@@ -345,7 +342,7 @@ public abstract class SpdyConnection { /
public void send(SpdyFrame oframe, SpdyStream proc)
throws IOException {
queueFrame(oframe, proc, oframe.pri == 0 ? outQueue : prioriyQueue);
-nonBlockingDrain();
+drain();
}
private void queueFrame(SpdyFrame oframe, SpdyStream proc,
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContext.java?rev=1300461&r1=1300460&r2=1300461&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContext.java Wed Mar 14
04:37:44 2012
@@ -51,8 +51,8 @@ public class SpdyContext {
public static boolean debug = false;
-boolean tls = true;
-boolean compression = true;
+protected boolean tls = true;
+protected boolean compression = false;
/**
* Get a frame - frames are heavy buffers, may be reused.
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContextJni.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContextJni.java?rev=1300461&r1=1300460&r2=1300461&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContextJni.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContextJni.java Wed Mar 14
04:37:44 2012
@@ -30,6 +30,8 @@ public class SpdyContextJni extends Spdy
//AprSocketContext socketCtx;
public SpdyContextJni() {
+compression = true;
+tls = true;
con = new AprSocketContext();
//if (insecureCerts) {
con.customVerification(new TlsCertVerifier() {
@@ -144,10 +146,6 @@ public class SpdyContextJni extends Spdy
public SpdyConnectionAprSocket(SpdyContext spdyContext) {
super(spdyContext);
-//setCompressSupport(new CompressJzlib());
-if (spdyContext.compression) {
-setCompressSupport(new Compres
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2848 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1300461 Blamelist: costin Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
