buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1048 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1440871 Blamelist: kfujino Build succeeded! sincerely, -The Buildbot
Re: svn commit: r1440338 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
I will fix that. Thanks for review ! 2013/1/30 Konstantin Kolinko knst.koli...@gmail.com: 2013/1/30 ol...@apache.org: Author: olamy Date: Wed Jan 30 10:41:12 2013 New Revision: 1440338 URL: http://svn.apache.org/viewvc?rev=1440338view=rev Log: [MTOMCAT-190] Client Certificate settings for connector Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java 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=1440338r1=1440337r2=1440338view=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 Wed Jan 30 10:41:12 2013 +/** + * enable client authentication for https (if configured) + */ +@Parameter( property = maven.tomcat.https.clientAuth, defaultValue = false ) +protected boolean clientAuth = false; + 1. Why is it boolean? Tomcat 7 setting is a String with possible values of true, false and want. http://tomcat.apache.org/tomcat-7.0-doc/config/http.html#SSL_Support_-_BIO_and_NIO 2. If you are going to provide similar support for an APR connector, the setting name appears to be SSLVerifyClient with its own set of possible values. 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
svn commit: r1440891 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Author: olamy
Date: Thu Jan 31 09:58:35 2013
New Revision: 1440891
URL: http://svn.apache.org/viewvc?rev=1440891view=rev
Log:
fix possible values for clientAuth
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
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=1440891r1=1440890r2=1440891view=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
Thu Jan 31 09:58:35 2013
@@ -458,11 +458,12 @@ public abstract class AbstractRunMojo
/**
* enable client authentication for https (if configured)
+ * see a
href=http://tomcat.apache.org/tomcat-7.0-doc/config/http.html#SSL_Support_-_BIO_and_NIO;http://tomcat.apache.org/tomcat-7.0-doc/config/http.html#SSL_Support_-_BIO_and_NIO/a
*
* @since 2.1
*/
@Parameter( property = maven.tomcat.https.clientAuth, defaultValue =
false )
-protected boolean clientAuth = false;
+protected String clientAuth = false;
@Component( role = MavenFileFilter.class, hint = default )
protected MavenFileFilter mavenFileFilter;
@@ -1059,10 +1060,8 @@ public abstract class AbstractRunMojo
httpsConnector.setAttribute( keystoreType,
keystoreType );
}
-if ( clientAuth )
-{
-httpsConnector.setAttribute( clientAuth, clientAuth
);
-}
+httpsConnector.setAttribute( clientAuth, clientAuth );
+
embeddedTomcat.getEngine().getService().addConnector(
httpsConnector );
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1440892 - in /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner: Tomcat7Runner.java Tomcat7RunnerCli.java
Author: olamy
Date: Thu Jan 31 09:58:49 2013
New Revision: 1440892
URL: http://svn.apache.org/viewvc?rev=1440892view=rev
Log:
fix possible values for clientAuth
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1440892r1=1440891r2=1440892view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Thu Jan 31 09:58:49 2013
@@ -90,7 +90,7 @@ public class Tomcat7Runner
public boolean debug = false;
-public boolean clientAuth = false;
+public String clientAuth = false;
public String keyAlias = null;
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java?rev=1440892r1=1440891r2=1440892view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
Thu Jan 31 09:58:49 2013
@@ -178,7 +178,7 @@ public class Tomcat7RunnerCli
}
if ( line.hasOption( clientAuth.getOpt() ) )
{
-tomcat7Runner.clientAuth = true;
+tomcat7Runner.clientAuth = clientAuth.getOpt();
}
if ( line.hasOption( keyAlias.getOpt() ) )
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1440893 [2/29] - in /tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT: ./ apidocs/ apidocs/org/apache/tomcat/maven/common/deployer/class-use/ apidocs/org/apache/tomcat/maven/plugin/tomcat
== --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/apidocs/org/apache/tomcat/maven/runner/Tomcat7Runner.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/apidocs/org/apache/tomcat/maven/runner/Tomcat7Runner.html Thu Jan 31 10:13:28 2013 @@ -148,7 +148,7 @@ FIXME add junit for that but when https: /TR TR BGCOLOR=white CLASS=TableRowColor TD ALIGN=right VALIGN=top WIDTH=1%FONT SIZE=-1 -CODEnbsp;boolean/CODE/FONT/TD +CODEnbsp;A HREF=http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true; title=class or interface in java.langString/A/CODE/FONT/TD TDCODEBA HREF=../../../../../org/apache/tomcat/maven/runner/Tomcat7Runner.html#clientAuthclientAuth/A/B/CODE BR @@ -540,7 +540,7 @@ public boolean Bdebug/B/PRE A NAME=clientAuth!-- --/AH3 clientAuth/H3 PRE -public boolean BclientAuth/B/PRE +public A HREF=http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true; title=class or interface in java.langString/A BclientAuth/B/PRE DL DL /DL Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/archetype.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/archetype.html?rev=1440893r1=1440892r2=1440893view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/archetype.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/archetype.html Thu Jan 31 10:13:28 2013 @@ -1,6 +1,6 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 30, 2013 + | Generated by Apache Maven Doxia at Jan 31, 2013 | Rendered using Apache Maven Fluido Skin 1.3.0 -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en @@ -9,7 +9,7 @@ meta name=viewport content=width=device-width, initial-scale=1.0 / meta name=author content=Oliver Lamy / meta name=Date-Creation-mmdd content=20110113 / -meta name=Date-Revision-mmdd content=20130130 / +meta name=Date-Revision-mmdd content=20130131 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin - Tomcat Maven plugin Archetype/title link rel=stylesheet href=./css/apache-maven-fluido-1.3.0.min.css / @@ -228,7 +228,7 @@ - li id=publishDate class=pull-rightLast Published: 30 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 31 January 2013/li li class=divider pull-right|/li li id=projectVersion class=pull-rightVersion: 2.1-SNAPSHOT/li /ul Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/checkstyle-aggregate.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/checkstyle-aggregate.html?rev=1440893r1=1440892r2=1440893view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/checkstyle-aggregate.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/checkstyle-aggregate.html Thu Jan 31 10:13:28 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 30, 2013 + | Generated by Apache Maven Doxia at Jan 31, 2013 | Rendered using Apache Maven Fluido Skin 1.3.0 -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head meta charset=UTF-8 / meta name=viewport content=width=device-width, initial-scale=1.0 / -meta name=Date-Revision-mmdd content=20130130 / +meta name=Date-Revision-mmdd content=20130131 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin - Checkstyle Results/title link rel=stylesheet href=./css/apache-maven-fluido-1.3.0.min.css / @@ -226,7 +226,7 @@ - li id=publishDate class=pull-rightLast Published: 30 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 31 January 2013/li li class=divider pull-right|/li li id=projectVersion class=pull-rightVersion: 2.1-SNAPSHOT/li /ul @@ -236,7 +236,7 @@ div id=bodyColumn [... 6 lines stripped ...] Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/checkstyle.rss URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/checkstyle.rss?rev=1440893r1=1440892r2=1440893view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/checkstyle.rss (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/checkstyle.rss Thu Jan 31 10:13:28 2013 @@ -9,9 +9,9 @@ copyright#169;2005 - 2013 The Apache
svn commit: r1440893 [13/29] - in /tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT: ./ apidocs/ apidocs/org/apache/tomcat/maven/common/deployer/class-use/ apidocs/org/apache/tomcat/maven/plugin/tomca
Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/checkstyle.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/checkstyle.html?rev=1440893r1=1440892r2=1440893view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/checkstyle.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/checkstyle.html Thu Jan 31 10:13:28 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 30, 2013 + | Generated by Apache Maven Doxia at Jan 31, 2013 | Rendered using Apache Maven Fluido Skin 1.3.0 -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head meta charset=UTF-8 / meta name=viewport content=width=device-width, initial-scale=1.0 / -meta name=Date-Revision-mmdd content=20130130 / +meta name=Date-Revision-mmdd content=20130131 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin :: Tomcat 6.x - Checkstyle Results/title link rel=stylesheet href=./css/apache-maven-fluido-1.3.0.min.css / @@ -211,7 +211,7 @@ - li id=publishDate class=pull-rightLast Published: 30 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 31 January 2013/li li class=divider pull-right|/li li id=projectVersion class=pull-rightVersion: 2.1-SNAPSHOT/li /ul @@ -221,7 +221,7 @@ div id=bodyColumn -div class=sectionh2Checkstyle Resultsa name=Checkstyle_Results/a/h2pThe following document contains the results of a class=externalLink href=http://checkstyle.sourceforge.net/;Checkstyle/a.#160;a href=checkstyle.rssimg alt=rss feed src=images/rss.png //a/p/divdiv class=sectionh2Summarya name=Summary/a/h2table border=0 class=table table-stripedtr class=athFiles/ththInfos#160;img alt=Infos src=images/icon_info_sml.gif //ththWarnings#160;img alt=Warnings src=images/icon_warning_sml.gif //ththErrors#160;img alt=Errors src=images/icon_error_sml.gif //th/trtr class=btd28/tdtd1/tdtd13/tdtd7/td/tr/table/divdiv class=sectionh2Filesa name=Files/a/h2table border=0 class=table table-stripedtr class=athFiles/ththI#160;img alt=Infos src=images/icon_info_sml.gif //ththW#160;img alt=Warnings src=images/icon _warning_sml.gif //ththE#160;img alt=Errors src=images/icon_error_sml.gif //th/trtr class=btda href=#org.apache.tomcat.maven.plugin.tomcat6.AbstractCatalinaMojo.javaorg/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java/a/tdtd0/tdtd1/tdtd0/td/trtr class=atda href=#org.apache.tomcat.maven.plugin.tomcat6.AbstractI18NTomcat6Mojo.javaorg/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java/a/tdtd1/tdtd1/tdtd1/td/trtr class=btda href=#org.apache.tomcat.maven.plugin.tomcat6.AbstractRunMojo.javaorg/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java/a/tdtd0/tdtd7/tdtd2/td/trtr class=atda href=#org.apache.tomcat.maven.plugin.tomcat6.ExternalRepositoriesReloadableWebappLoader.javaorg/apache/tomcat/maven/plugin/tomcat6/ExternalRepositoriesReloadableWebappLoader.java/a/tdtd0/tdtd2/tdtd0/td/trtr class=btda href=#org.apache.tomc at.maven.plugin.tomcat6.RedeployOnlyMojo.javaorg/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java/a/tdtd0/tdtd0/tdtd3/td/trtr class=atda href=#org.apache.tomcat.maven.plugin.tomcat6.ShutdownMojo.javaorg/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java/a/tdtd0/tdtd0/tdtd1/td/trtr class=btda href=#org.apache.tomcat.maven.plugin.tomcat6.Webapp.javaorg/apache/tomcat/maven/plugin/tomcat6/Webapp.java/a/tdtd0/tdtd2/tdtd0/td/tr/table/divdiv class=sectionh2Rulesa name=Rules/a/h2table border=0 class=table table-stripedtr class=athRules/ththViolations/ththSeverity/th/trtr class=btdFileLength/tdtd0/tdtdimg alt=Errors src=images/icon_error_sml.gif /#160;Error/td/trtr class=atdRegexpHeaderullibheaderFile/b: ttquot;target/checkstyle-header.txtquot;/tt/li/ul/tdtd3/tdtdimg alt=Errors src=images/icon_erro r_sml.gif /#160;Error/td/trtr class=btdFileTabCharacterullibeachLine/b: ttquot;truequot;/tt/li/ul/tdtd0/tdtdimg alt=Errors src=images/icon_error_sml.gif /#160;Error/td/trtr class=atdLeftCurlyulliboption/b: ttquot;nlquot;/tt/li/ul/tdtd0/tdtdimg alt=Errors src=images/icon_error_sml.gif /#160;Error/td/trtr class=btdRightCurlyulliboption/b: ttquot;alonequot;/tt/li/ul/tdtd0/tdtdimg alt=Errors src=images/icon_error_sml.gif /#160;Error/td/trtr class=atdLineLengthullibmax/b: ttquot;120quot;/tt/lilibignorePattern/b: ttquot;@version|@see|@todo|TODOquot;/tt/li/ul/tdtd1/tdtdimg alt=Errors src=images/icon_error_sml.gif /#160;Error/td/trtr class=btdMemberName/tdtd0/tdtdimg alt=Errors src
svn commit: r1440893 [10/29] - in /tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT: ./ apidocs/ apidocs/org/apache/tomcat/maven/common/deployer/class-use/ apidocs/org/apache/tomcat/maven/plugin/tomca
Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/dependencies.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/dependencies.html?rev=1440893r1=1440892r2=1440893view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/dependencies.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/dependencies.html Thu Jan 31 10:13:28 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 30, 2013 + | Generated by Apache Maven Doxia at Jan 31, 2013 | Rendered using Apache Maven Fluido Skin 1.3.0 -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head meta charset=UTF-8 / meta name=viewport content=width=device-width, initial-scale=1.0 / -meta name=Date-Revision-mmdd content=20130130 / +meta name=Date-Revision-mmdd content=20130131 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin :: Integration Tests - Project Dependencies/title link rel=stylesheet href=./css/apache-maven-fluido-1.3.0.min.css / @@ -156,7 +156,7 @@ - li id=publishDate class=pull-rightLast Published: 30 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 31 January 2013/li li class=divider pull-right|/li li id=projectVersion class=pull-rightVersion: 2.1-SNAPSHOT/li /ul @@ -183,13 +183,13 @@ } } /script -a name=Dependency_Tree/adiv class=sectionh3Dependency Treea name=Dependency_Tree/a/h3ulliorg.apache.tomcat.maven:tomcat-maven-plugin-it:jar:2.1-SNAPSHOT img id=_1600755374 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_850499447', '_1600755374' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_850499447 style=display:nonetable border=0 class=table table-stripedtr class=athApache Tomcat Maven Plugin :: Integration Tests/th/trtr class=btdpbDescription: /bThe Tomcat Maven Plugin provides goals to manipulate WAR projects within the Tomcat servlet -container./ppbURL: /ba class=externalLink href=http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it;http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/a/ppbProject License: /ba class=externalLink href=http://www.apache.org/licenses/LICENSE-2.0.txt;The Apache Software License, Version 2.0/a/p/td/tr/table/divullijunit:junit:jar:4.10 (compile) img id=_1224372401 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_466988949', '_1224372401' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_466988949 style=display:nonetable border=0 class=table table-stripedtr class=athJUnit/th/trtr class=btdpbDescription: /bJUnit is a regression testing framework written by Erich Gamma and Kent Beck. -It is used by the developer who implements unit tests in Java./ppbURL: /ba class=externalLink href=http://junit.org;http://junit.org/a/ppbProject License: /ba class=externalLink href=http://www.opensource.org/licenses/cpl1.0.txt;Common Public License Version 1.0/a/p/td/tr/table/divulliorg.hamcrest:hamcrest-core:jar:1.1 (compile) img id=_2143246668 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_1429070149', '_2143246668' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_1429070149 style=display:nonetable border=0 class=table table-stripedtr class=athHamcrest Core/th/trtr class=btdpbDescription: /bThere is currently no description associated with this project./ppbProject License: /ba class=externalLink href=http://www.opensource.org/licenses/bsd-license.php;BSD style/a/p/td/tr/table/div/li/ul/liliju nit-addons:junit-addons:jar:1.4 (compile) img id=_161073461 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_142485470', '_161073461' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_142485470 style=display:nonetable border=0 class=table table-stripedtr class=athjunit-addons/th/trtr class=btdpbDescription: /bThere is currently no description associated with this project./ppbProject License: /bNo license is defined for this project./p/td/tr/table/divullixerces:xercesImpl:jar:2.6.2 (compile) img id=_1052197179 src=./images/icon_info_sml.gif alt=Information onclick=toggleDependencyDetail( '_722032124', '_1052197179' ); style=cursor: pointer;vertical-align:text-bottom;/imgdiv id=_722032124 style=display:nonetable border=0 class=table table-stripedtr class=athxercesImpl/th/trtr class=btdpbDescription: /bThere is curre ntly no description associated with this project./ppbProject License: /bNo
Re: svn commit: r1440892 - in /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner: Tomcat7Runner.java Tomcat7RunnerCli.java
On 31 January 2013 09:58, ol...@apache.org wrote:
Author: olamy
Date: Thu Jan 31 09:58:49 2013
New Revision: 1440892
URL: http://svn.apache.org/viewvc?rev=1440892view=rev
Log:
fix possible values for clientAuth
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1440892r1=1440891r2=1440892view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Thu Jan 31 09:58:49 2013
@@ -90,7 +90,7 @@ public class Tomcat7Runner
public boolean debug = false;
-public boolean clientAuth = false;
+public String clientAuth = false;
public String keyAlias = null;
Do these mutable values really need to be public?
Could they be private or package protected?
Exposing mutable fields makes it harder to test properly, as changes
may occur at any time.
Also changes to mutable fields are not thread-safe without synchronisation.
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java?rev=1440892r1=1440891r2=1440892view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
Thu Jan 31 09:58:49 2013
@@ -178,7 +178,7 @@ public class Tomcat7RunnerCli
}
if ( line.hasOption( clientAuth.getOpt() ) )
{
-tomcat7Runner.clientAuth = true;
+tomcat7Runner.clientAuth = clientAuth.getOpt();
}
if ( line.hasOption( keyAlias.getOpt() ) )
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1440893 [24/29] - in /tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT: ./ apidocs/ apidocs/org/apache/tomcat/maven/common/deployer/class-use/ apidocs/org/apache/tomcat/maven/plugin/tomca
Modified:
tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/run-war-mojo.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/run-war-mojo.html?rev=1440893r1=1440892r2=1440893view=diff
==
---
tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/run-war-mojo.html
(original)
+++
tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/run-war-mojo.html
Thu Jan 31 10:13:28 2013
@@ -1,13 +1,13 @@
!DOCTYPE html
!--
- | Generated by Apache Maven Doxia at Jan 30, 2013
+ | Generated by Apache Maven Doxia at Jan 31, 2013
| Rendered using Apache Maven Fluido Skin 1.3.0
--
html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en
head
meta charset=UTF-8 /
meta name=viewport content=width=device-width, initial-scale=1.0 /
-meta name=Date-Revision-mmdd content=20130130 /
+meta name=Date-Revision-mmdd content=20130131 /
meta http-equiv=Content-Language content=en /
titleApache Tomcat Maven Plugin :: Tomcat 7.x -
tomcat7:run-war/title
@@ -193,7 +193,7 @@
- li id=publishDate class=pull-rightLast Published: 30
January 2013/li li class=divider pull-right|/li
+ li id=publishDate class=pull-rightLast Published: 31
January 2013/li li class=divider pull-right|/li
li id=projectVersion class=pull-rightVersion:
2.1-SNAPSHOT/li
/ul
@@ -299,24 +299,31 @@ connector./li
Name aliases/abr //td
/tr
tr class=a
+tdba
href=#backgroundProcessorDelaybackgroundProcessorDelay/a/b/td
+tdttint/tt/td
+tdtt2.0/tt/td
+tdrepresents the delay in seconds between each classPathScanning
+change invocationbr /bDefault value is/b: tt-1/tt.br /bUser
property is/b: ttmaven.tomcat.backgroundProcessorDelay/tt./td
+ /tr
+ tr class=b
tdba href=#classLoaderClassclassLoaderClass/a/b/td
tdttString/tt/td
tdtt2.0/tt/td
tdClass loader class to set.br //td
/tr
- tr class=b
+ tr class=a
tdba href=#clientAuthclientAuth/a/b/td
-tdttboolean/tt/td
+tdttString/tt/td
tdtt2.1/tt/td
-tdenable client authentication for https (if configured)br
/bDefault value is/b: ttfalse/tt.br /bUser property is/b:
ttmaven.tomcat.https.clientAuth/tt./td
+tdenable client authentication for https (if configured) see a
class=externalLink
href=http://tomcat.apache.org/tomcat-7.0-doc/config/http.html#SSL_Support_-_BIO_and_NIO;http://tomcat.apache.org/tomcat-7.0-doc/config/http.html#SSL_Support_-_BIO_and_NIO/abr
/bDefault value is/b: ttfalse/tt.br /bUser property is/b:
ttmaven.tomcat.https.clientAuth/tt./td
/tr
- tr class=a
+ tr class=b
tdba href=#configurationDirconfigurationDir/a/b/td
tdttFile/tt/td
tdtt2.0/tt/td
tdThe directory to create the Tomcat server configuration
under.br /bDefault value is/b:
tt${project.build.directory}/tomcat/tt.br //td
/tr
- tr class=b
+ tr class=a
tdba href=#contextFilecontextFile/a/b/td
tdttFile/tt/td
tdtt2.0/tt/td
@@ -324,7 +331,7 @@ Name aliases/abr //td
pSince release 2.0, the file is filtered as a maven resource so
you can use interpolation tokens ${ }/pbr /bUser property is/b:
ttmaven.tomcat.contextFile/tt./td
/tr
- tr class=a
+ tr class=b
tdba href=#contextReloadablecontextReloadable/a/b/td
tdttboolean/tt/td
tdtt2.0/tt/td
@@ -332,20 +339,20 @@ you can use interpolation tokens ${ }/p
reloadable = quot;truequot;. The other way to use contextReloadable is to
add attribute reloadable = quot;truequot; in your context file.br
/bDefault value is/b: ttfalse/tt.br /bUser property is/b:
ttmaven.tomcat.contextReloadable/tt./td
/tr
- tr class=b
+ tr class=a
tdba href=#forkfork/a/b/td
tdttboolean/tt/td
tdtt1.0/tt/td
tdSet this to true to allow Maven to continue to execute after
invoking the run goal.br /bDefault value is/b: ttfalse/tt.br
/bUser property is/b: ttmaven.tomcat.fork/tt./td
/tr
- tr class=a
+ tr class=b
tdba href=#hostNamehostName/a/b/td
tdttString/tt/td
tdtt2.0/tt/td
tdconfigure host namebr /bDefault value is/b:
ttlocalhost/tt.br /bUser property is/b:
ttmaven.tomcat.hostName/tt./td
/tr
- tr class=b
+ tr class=a
tdba href=#httpsPorthttpsPort/a/b/td
tdttint/tt/td
tdtt1.0/tt/td
svn commit: r1440893 [17/29] - in /tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT: ./ apidocs/ apidocs/org/apache/tomcat/maven/common/deployer/class-use/ apidocs/org/apache/tomcat/maven/plugin/tomca
Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/roles-mojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/roles-mojo.html?rev=1440893r1=1440892r2=1440893view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/roles-mojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/roles-mojo.html Thu Jan 31 10:13:28 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 30, 2013 + | Generated by Apache Maven Doxia at Jan 31, 2013 | Rendered using Apache Maven Fluido Skin 1.3.0 -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head meta charset=UTF-8 / meta name=viewport content=width=device-width, initial-scale=1.0 / -meta name=Date-Revision-mmdd content=20130130 / +meta name=Date-Revision-mmdd content=20130131 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin :: Tomcat 6.x - tomcat6:roles/title @@ -213,7 +213,7 @@ - li id=publishDate class=pull-rightLast Published: 30 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 31 January 2013/li li class=divider pull-right|/li li id=projectVersion class=pull-rightVersion: 2.1-SNAPSHOT/li /ul Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-mojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-mojo.html?rev=1440893r1=1440892r2=1440893view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-mojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-mojo.html Thu Jan 31 10:13:28 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 30, 2013 + | Generated by Apache Maven Doxia at Jan 31, 2013 | Rendered using Apache Maven Fluido Skin 1.3.0 -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head meta charset=UTF-8 / meta name=viewport content=width=device-width, initial-scale=1.0 / -meta name=Date-Revision-mmdd content=20130130 / +meta name=Date-Revision-mmdd content=20130131 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin :: Tomcat 6.x - tomcat6:run/title @@ -213,7 +213,7 @@ - li id=publishDate class=pull-rightLast Published: 30 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 31 January 2013/li li class=divider pull-right|/li li id=projectVersion class=pull-rightVersion: 2.1-SNAPSHOT/li /ul Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-war-mojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-war-mojo.html?rev=1440893r1=1440892r2=1440893view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-war-mojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-war-mojo.html Thu Jan 31 10:13:28 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 30, 2013 + | Generated by Apache Maven Doxia at Jan 31, 2013 | Rendered using Apache Maven Fluido Skin 1.3.0 -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head meta charset=UTF-8 / meta name=viewport content=width=device-width, initial-scale=1.0 / -meta name=Date-Revision-mmdd content=20130130 / +meta name=Date-Revision-mmdd content=20130131 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin :: Tomcat 6.x - tomcat6:run-war/title @@ -213,7 +213,7 @@ - li id=publishDate class=pull-rightLast Published: 30 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 31 January 2013/li li class=divider pull-right|/li li id=projectVersion class=pull-rightVersion: 2.1-SNAPSHOT/li /ul @@ -311,24 +311,31 @@ NOTE The ajp connector will be started o Name aliases/abr //td /tr tr class=a +tdba href
svn commit: r1440893 [26/29] - in /tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT: ./ apidocs/ apidocs/org/apache/tomcat/maven/common/deployer/class-use/ apidocs/org/apache/tomcat/maven/plugin/tomca
/tomcat7/run/ShutdownMojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.html Thu Jan 31 10:13:28 2013 @@ -8,7 +8,7 @@ body div id=overviewa href=../../../../../../../../apidocs/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.htmlView Javadoc/a/divpre -a class=jxr_linenumber name=1 href=#11/a strong class=jxr_keywordpackage/strong org.apache.tomcat.maven.plugin.tomcat7.run; +a class=jxr_linenumber name=1 href=#11/a em class=jxr_commentpackage org.apache.tomcat.maven.plugin.tomcat7.run;/em a class=jxr_linenumber name=2 href=#22/a a class=jxr_linenumber name=3 href=#33/a em class=jxr_comment/*/em a class=jxr_linenumber name=4 href=#44/a em class=jxr_comment* Licensed to the Apache Software Foundation (ASF) under one/em Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/WarRunDependency.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/WarRunDependency.html?rev=1440893r1=1440892r2=1440893view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/WarRunDependency.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-maven-plugin/xref/org/apache/tomcat/maven/plugin/tomcat7/run/WarRunDependency.html Thu Jan 31 10:13:28 2013 @@ -8,7 +8,7 @@ body div id=overviewa href=../../../../../../../../apidocs/org/apache/tomcat/maven/plugin/tomcat7/run/WarRunDependency.htmlView Javadoc/a/divpre -a class=jxr_linenumber name=1 href=#11/a em class=jxr_commentpackage org.apache.tomcat.maven.plugin.tomcat7.run;/em +a class=jxr_linenumber name=1 href=#11/a strong class=jxr_keywordpackage/strong org.apache.tomcat.maven.plugin.tomcat7.run; a class=jxr_linenumber name=2 href=#22/a em class=jxr_comment/*/em a class=jxr_linenumber name=3 href=#33/a em class=jxr_comment * Licensed to the Apache Software Foundation (ASF) under one/em a class=jxr_linenumber name=4 href=#44/a em class=jxr_comment * or more contributor license agreements. See the NOTICE file/em Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/checkstyle.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/checkstyle.html?rev=1440893r1=1440892r2=1440893view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/checkstyle.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/checkstyle.html Thu Jan 31 10:13:28 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 30, 2013 + | Generated by Apache Maven Doxia at Jan 31, 2013 | Rendered using Apache Maven Fluido Skin 1.3.0 -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head meta charset=UTF-8 / meta name=viewport content=width=device-width, initial-scale=1.0 / -meta name=Date-Revision-mmdd content=20130130 / +meta name=Date-Revision-mmdd content=20130131 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin :: Tomcat 7.x War Runner - Checkstyle Results/title link rel=stylesheet href=./css/apache-maven-fluido-1.3.0.min.css / @@ -156,7 +156,7 @@ - li id=publishDate class=pull-rightLast Published: 30 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 31 January 2013/li li class=divider pull-right|/li li id=projectVersion class=pull-rightVersion: 2.1-SNAPSHOT/li /ul Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/checkstyle.rss URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/checkstyle.rss?rev=1440893r1=1440892r2=1440893view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/checkstyle.rss (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/checkstyle.rss Thu Jan 31 10:13:28 2013 @@ -29,30 +29,30 @@ tbody tr td - a href=http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/checkstyle.html#org.apache.tomcat.maven.runner.Tomcat7RunnerCli.java;org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java/a + a href=http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT
svn commit: r1440911 - in /tomcat/trunk: java/org/apache/coyote/http11/InternalNioInputBuffer.java test/org/apache/coyote/http11/TestInternalInputBuffer.java
Author: markt
Date: Thu Jan 31 11:21:03 2013
New Revision: 1440911
URL: http://svn.apache.org/viewvc?rev=1440911view=rev
Log:
Align NIO with BIO and APR and include leading blank lines when counting input
for HTTP header size limit
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1440911r1=1440910r2=1440911view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Thu
Jan 31 11:21:03 2013
@@ -145,7 +145,8 @@ public class InternalNioInputBuffer exte
/**
- * Maximum allowed size of the HTTP request line plus headers.
+ * Maximum allowed size of the HTTP request line plus headers plus any
+ * leading blank lines.
*/
private final int headerBufferSize;
@@ -154,22 +155,9 @@ public class InternalNioInputBuffer exte
*/
private int socketReadBufferSize;
-/**
- * Additional size we allocate to the buffer to be more effective when
- * skipping empty lines that may precede the request.
- */
-private static final int skipBlankLinesSize = 1024;
-
-/**
- * How many bytes in the buffer are occupied by skipped blank lines that
- * precede the request.
- */
-private int skipBlankLinesBytes;
-
// - Public Methods
-
@Override
public boolean supportsNonBlocking() {
return true;
@@ -277,22 +265,15 @@ public class InternalNioInputBuffer exte
if (useAvailableDataOnly) {
return false;
}
-// Ignore bytes that were read
-pos = lastValid = 0;
// Do a simple read with a short timeout
-if ( readSocket(true, false)==0 ) return false;
+if (!fill(true, false)) {
+return false;
+}
}
chr = buf[pos++];
} while ((chr == Constants.CR) || (chr == Constants.LF));
pos--;
-if (pos = skipBlankLinesSize) {
-// Move data, to have enough space for further reading
-// of headers and body
-System.arraycopy(buf, pos, buf, 0, lastValid - pos);
-lastValid -= pos;
-pos = 0;
-}
-skipBlankLinesBytes = pos;
+
parsingRequestLineStart = pos;
parsingRequestLinePhase = 2;
if (log.isDebugEnabled()) {
@@ -524,7 +505,7 @@ public class InternalNioInputBuffer exte
// limitation to enforce the meaning of headerBufferSize
// From the way how buf is allocated and how blank lines are being
// read, it should be enough to check (1) only.
-if (pos - skipBlankLinesBytes headerBufferSize
+if (pos headerBufferSize
|| buf.length - pos socketReadBufferSize) {
throw new IllegalArgumentException(
sm.getString(iib.requestheadertoolarge.error));
@@ -811,8 +792,7 @@ public class InternalNioInputBuffer exte
socketReadBufferSize =
socket.getBufHandler().getReadBuffer().capacity();
-int bufLength = skipBlankLinesSize + headerBufferSize
-+ socketReadBufferSize;
+int bufLength = headerBufferSize + socketReadBufferSize;
if (buf == null || buf.length bufLength) {
buf = new byte[bufLength];
}
@@ -838,7 +818,7 @@ public class InternalNioInputBuffer exte
if (parsingHeader) {
-if (lastValid == buf.length) {
+if (lastValid headerBufferSize) {
throw new IllegalArgumentException
(sm.getString(iib.requestheadertoolarge.error));
}
Modified:
tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java?rev=1440911r1=1440910r2=1440911view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java Thu
Jan 31 11:21:03 2013
@@ -27,12 +27,14 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
svn commit: r1440912 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/InternalNioInputBuffer.java test/org/apache/coyote/http11/TestInternalInputBuffer.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jan 31 11:24:37 2013
New Revision: 1440912
URL: http://svn.apache.org/viewvc?rev=1440912view=rev
Log:
Align NIO with BIO and APR and include leading blank lines when counting input
for HTTP header size limit
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/tc7.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1440911
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1440912r1=1440911r2=1440912view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Thu Jan 31 11:24:37 2013
@@ -145,7 +145,8 @@ public class InternalNioInputBuffer exte
/**
- * Maximum allowed size of the HTTP request line plus headers.
+ * Maximum allowed size of the HTTP request line plus headers plus any
+ * leading blank lines.
*/
private final int headerBufferSize;
@@ -154,18 +155,6 @@ public class InternalNioInputBuffer exte
*/
private int socketReadBufferSize;
-/**
- * Additional size we allocate to the buffer to be more effective when
- * skipping empty lines that may precede the request.
- */
-private static final int skipBlankLinesSize = 1024;
-
-/**
- * How many bytes in the buffer are occupied by skipped blank lines that
- * precede the request.
- */
-private int skipBlankLinesBytes;
-
// - Public Methods
@@ -234,22 +223,15 @@ public class InternalNioInputBuffer exte
if (useAvailableDataOnly) {
return false;
}
-// Ignore bytes that were read
-pos = lastValid = 0;
// Do a simple read with a short timeout
-if ( readSocket(true, false)==0 ) return false;
+if (!fill(true, false)) {
+return false;
+}
}
chr = buf[pos++];
} while ((chr == Constants.CR) || (chr == Constants.LF));
pos--;
-if (pos = skipBlankLinesSize) {
-// Move data, to have enough space for further reading
-// of headers and body
-System.arraycopy(buf, pos, buf, 0, lastValid - pos);
-lastValid -= pos;
-pos = 0;
-}
-skipBlankLinesBytes = pos;
+
parsingRequestLineStart = pos;
parsingRequestLinePhase = 2;
if (log.isDebugEnabled()) {
@@ -481,7 +463,7 @@ public class InternalNioInputBuffer exte
// limitation to enforce the meaning of headerBufferSize
// From the way how buf is allocated and how blank lines are being
// read, it should be enough to check (1) only.
-if (pos - skipBlankLinesBytes headerBufferSize
+if (pos headerBufferSize
|| buf.length - pos socketReadBufferSize) {
throw new IllegalArgumentException(
sm.getString(iib.requestheadertoolarge.error));
@@ -768,8 +750,7 @@ public class InternalNioInputBuffer exte
socketReadBufferSize =
socket.getBufHandler().getReadBuffer().capacity();
-int bufLength = skipBlankLinesSize + headerBufferSize
-+ socketReadBufferSize;
+int bufLength = headerBufferSize + socketReadBufferSize;
if (buf == null || buf.length bufLength) {
buf = new byte[bufLength];
}
@@ -795,7 +776,7 @@ public class InternalNioInputBuffer exte
if (parsingHeader) {
-if (lastValid == buf.length) {
+if (lastValid headerBufferSize) {
throw new IllegalArgumentException
(sm.getString(iib.requestheadertoolarge.error));
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java?rev=1440912r1=1440911r2=1440912view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
(original)
+++
svn commit: r1440926 - in /tomcat/trunk: java/javax/websocket/ java/org/apache/tomcat/websocket/ test/javax/websocket/ test/org/apache/tomcat/websocket/
Author: markt
Date: Thu Jan 31 12:15:23 2013
New Revision: 1440926
URL: http://svn.apache.org/viewvc?rev=1440926view=rev
Log:
Update WebSocket API to latest EG version (between v011 and v012)
Removed:
tomcat/trunk/test/javax/websocket/
Modified:
tomcat/trunk/java/javax/websocket/ClientEndpointConfiguration.java
tomcat/trunk/java/javax/websocket/ContainerProvider.java
tomcat/trunk/java/javax/websocket/DefaultClientConfiguration.java
tomcat/trunk/java/javax/websocket/Extension.java
tomcat/trunk/java/javax/websocket/RemoteEndpoint.java
tomcat/trunk/java/javax/websocket/Session.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified: tomcat/trunk/java/javax/websocket/ClientEndpointConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/ClientEndpointConfiguration.java?rev=1440926r1=1440925r2=1440926view=diff
==
--- tomcat/trunk/java/javax/websocket/ClientEndpointConfiguration.java
(original)
+++ tomcat/trunk/java/javax/websocket/ClientEndpointConfiguration.java Thu Jan
31 12:15:23 2013
@@ -23,7 +23,7 @@ public interface ClientEndpointConfigura
ListString getPreferredSubprotocols();
-ListString getExtensions();
+ListExtension getExtensions();
/**
* Provides the client with a mechanism to inspect and/or modify the
headers
Modified: tomcat/trunk/java/javax/websocket/ContainerProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/ContainerProvider.java?rev=1440926r1=1440925r2=1440926view=diff
==
--- tomcat/trunk/java/javax/websocket/ContainerProvider.java (original)
+++ tomcat/trunk/java/javax/websocket/ContainerProvider.java Thu Jan 31
12:15:23 2013
@@ -16,21 +16,12 @@
*/
package javax.websocket;
-import java.util.Map;
-import java.util.WeakHashMap;
-
/**
* Provides access to the implementation. This version of the API is hard-coded
* to use the Apache Tomcat WebSocket implementation.
*/
public class ContainerProvider {
-// Needs to be a WeakHashMap to prevent memory leaks when a context is
-// stopped
-private static MapClassLoader,WebSocketContainer classLoaderContainerMap
=
-new WeakHashMap();
-private static Object classLoaderContainerMapLock = new Object();
-
private static final String DEFAULT_PROVIDER_CLASS_NAME =
org.apache.tomcat.websocket.WsWebSocketContainer;
@@ -46,22 +37,15 @@ public class ContainerProvider {
}
/**
- * Obtain a reference to the per class loader ClientContainer used to
create
- * outgoing WebSocket connections.
+ * Create a new ClientContainer used to create outgoing WebSocket
+ * connections.
*/
-public static WebSocketContainer getClientContainer() {
-ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+public static WebSocketContainer createClientContainer() {
WebSocketContainer result = null;
-synchronized (classLoaderContainerMapLock) {
-result = classLoaderContainerMap.get(tccl);
-if (result == null) {
-try {
-result = clazz.newInstance();
-} catch (InstantiationException | IllegalAccessException e) {
-throw new IllegalArgumentException(e);
-}
-classLoaderContainerMap.put(tccl, result);
-}
+try {
+result = clazz.newInstance();
+} catch (InstantiationException | IllegalAccessException e) {
+throw new IllegalArgumentException(e);
}
return result;
}
Modified: tomcat/trunk/java/javax/websocket/DefaultClientConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/DefaultClientConfiguration.java?rev=1440926r1=1440925r2=1440926view=diff
==
--- tomcat/trunk/java/javax/websocket/DefaultClientConfiguration.java (original)
+++ tomcat/trunk/java/javax/websocket/DefaultClientConfiguration.java Thu Jan
31 12:15:23 2013
@@ -22,7 +22,7 @@ import java.util.Map;
public class DefaultClientConfiguration implements ClientEndpointConfiguration
{
private ListString preferredSubprotocols = new ArrayList();
-private ListString extensions = new ArrayList();
+private ListExtension extensions = new ArrayList();
private ListEncoder encoders = new ArrayList();
private ListDecoder decoders = new ArrayList();
@@ -38,12 +38,12 @@ public class DefaultClientConfiguration
}
@Override
-public ListString getExtensions() {
+public ListExtension getExtensions() {
return extensions;
}
public ClientEndpointConfiguration
Re: svn commit: r1440892 - in /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner: Tomcat7Runner.java Tomcat7RunnerCli.java
2013/1/31 sebb seb...@gmail.com:
On 31 January 2013 09:58, ol...@apache.org wrote:
Author: olamy
Date: Thu Jan 31 09:58:49 2013
New Revision: 1440892
URL: http://svn.apache.org/viewvc?rev=1440892view=rev
Log:
fix possible values for clientAuth
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1440892r1=1440891r2=1440892view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Thu Jan 31 09:58:49 2013
@@ -90,7 +90,7 @@ public class Tomcat7Runner
public boolean debug = false;
-public boolean clientAuth = false;
+public String clientAuth = false;
public String keyAlias = null;
Do these mutable values really need to be public?
Could they be private or package protected?
Maybe but here it's something used by the plugin and there is no
purpose to make a kind of public api...
The purpose is described here:
http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/executable-war-jar.html
Exposing mutable fields makes it harder to test properly, as changes
may occur at any time.
Also changes to mutable fields are not thread-safe without synchronisation.
The class is not marked as thread safe.
It's just a class which contains tomcat configuration to start only
ONE embeded tomcat.
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java?rev=1440892r1=1440891r2=1440892view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
Thu Jan 31 09:58:49 2013
@@ -178,7 +178,7 @@ public class Tomcat7RunnerCli
}
if ( line.hasOption( clientAuth.getOpt() ) )
{
-tomcat7Runner.clientAuth = true;
+tomcat7Runner.clientAuth = clientAuth.getOpt();
}
if ( line.hasOption( keyAlias.getOpt() ) )
{
-
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
--
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
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/3860 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1440926 Blamelist: markt Build succeeded! sincerely, -The Buildbot
svn commit: r1440946 - /tomcat/maven-plugin/trunk/.gitignore
Author: olamy Date: Thu Jan 31 13:11:34 2013 New Revision: 1440946 URL: http://svn.apache.org/viewvc?rev=1440946view=rev Log: update .gitignore Modified: tomcat/maven-plugin/trunk/.gitignore Modified: tomcat/maven-plugin/trunk/.gitignore URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/.gitignore?rev=1440946r1=1440945r2=1440946view=diff == --- tomcat/maven-plugin/trunk/.gitignore (original) +++ tomcat/maven-plugin/trunk/.gitignore Thu Jan 31 13:11:34 2013 @@ -2,6 +2,7 @@ target # idea *.iml .idea +out/ # eclipse .classpath .project - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1440948 - in /tomcat/maven-plugin/trunk: pom.xml tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Author: olamy
Date: Thu Jan 31 13:11:49 2013
New Revision: 1440948
URL: http://svn.apache.org/viewvc?rev=1440948view=rev
Log:
[MTOMCAT-186] Closing executable JAR does not call
ServletContextListener.contextDestroyed()
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1440948r1=1440947r2=1440948view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Thu Jan 31 13:11:49 2013
@@ -707,6 +707,7 @@
exclude*.sh/exclude
exclude.git/**/exclude
exclude.idea/**/exclude
+ excludeout/**/exclude
exclude.extract/**/exclude
exclude*.patch/exclude
/excludes
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1440948r1=1440947r2=1440948view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Thu Jan 31 13:11:49 2013
@@ -26,6 +26,8 @@ import org.apache.catalina.startup.Catal
import org.apache.catalina.startup.ContextConfig;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.valves.AccessLogValve;
+import org.apache.juli.ClassLoaderLogManager;
+import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.http.fileupload.FileUtils;
import org.apache.tomcat.util.http.fileupload.IOUtils;
@@ -46,6 +48,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
+import java.util.logging.LogManager;
/**
* FIXME add junit for that but when
https://issues.apache.org/bugzilla/show_bug.cgi?id=52028 fixed
@@ -399,12 +402,49 @@ public class Tomcat7Runner
}
tomcat.start();
+
+Runtime.getRuntime().addShutdownHook( new TomcatShutdownHook() );
+
}
waitIndefinitely();
}
+protected class TomcatShutdownHook
+extends Thread
+{
+
+protected TomcatShutdownHook()
+{
+// no op
+}
+
+@Override
+public void run()
+{
+try
+{
+Tomcat7Runner.this.stop();
+}
+catch ( Throwable ex )
+{
+ExceptionUtils.handleThrowable( ex );
+System.out.println( fail to properly shutdown Tomcat: +
ex.getMessage() );
+}
+finally
+{
+// If JULI is used, shut JULI down *after* the server shuts
down
+// so log messages aren't lost
+LogManager logManager = LogManager.getLogManager();
+if ( logManager instanceof ClassLoaderLogManager )
+{
+( (ClassLoaderLogManager) logManager ).shutdown();
+}
+}
+}
+}
+
private URL getContextXml( String warPath )
throws IOException
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1440950 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/test/resources/log4j2-test.xml tomcat7-maven-plugin/src/test/resources/log4j2-test.xml
Author: olamy
Date: Thu Jan 31 13:14:52 2013
New Revision: 1440950
URL: http://svn.apache.org/viewvc?rev=1440950view=rev
Log:
reduce log noise when executing unit tests
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/log4j2-test.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/log4j2-test.xml
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/log4j2-test.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/log4j2-test.xml?rev=1440950r1=1440949r2=1440950view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/log4j2-test.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/log4j2-test.xml
Thu Jan 31 13:14:52 2013
@@ -19,7 +19,7 @@
--
-configuration status=debug
+configuration
appenders
Console name=console target=SYSTEM_OUT
PatternLayout pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n/
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/log4j2-test.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/log4j2-test.xml?rev=1440950r1=1440949r2=1440950view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/log4j2-test.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/log4j2-test.xml
Thu Jan 31 13:14:52 2013
@@ -19,7 +19,7 @@
--
-configuration status=debug
+configuration
appenders
Console name=console target=SYSTEM_OUT
PatternLayout pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-186) Closing executable JAR does not call ServletContextListener.contextDestroyed()
[
https://issues.apache.org/jira/browse/MTOMCAT-186?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13567612#comment-13567612
]
Hudson commented on MTOMCAT-186:
Integrated in TomcatMavenPlugin-mvn3.x #231 (See
[https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/231/])
[MTOMCAT-186] Closing executable JAR does not call
ServletContextListener.contextDestroyed() (Revision 1440948)
Result = SUCCESS
olamy : http://svn.apache.org/viewvc/?view=revrev=1440948
Files :
* /tomcat/maven-plugin/trunk/pom.xml
*
/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Closing executable JAR does not call ServletContextListener.contextDestroyed()
--
Key: MTOMCAT-186
URL: https://issues.apache.org/jira/browse/MTOMCAT-186
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.0
Environment: Java 7, maven 3.0.3
Reporter: Tomasz Nurkiewicz
Assignee: Olivier Lamy (*$^¨%`£)
Priority: Minor
Fix For: 2.1
Attachments: listener.zip
Executable JAR created by {{tomcat7-maven-plugin:exec-war-only}} does not
call {{ServletContextListener.contextDestroyed()}} callback method when Java
process is killed or when Ctrl + C is pressed. There is no way (?) to cleanly
shutdown web application.
The same application (attached) deployed on standalone Tomcat works just
fine. Hitting Ctrl + C correctly undeploys and shuts down application.
Build attached application and run {{java -jar target/standalone.jar}}. Ctrl
+ C kills the process immediately. On the other hand {standalone.war}}
deployed to normal Tomcat under {{/webapps}} shuts down correctly and we can
see log statement from {{contextDestroyed()}}.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-186) Closing executable JAR does not call ServletContextListener.contextDestroyed()
[
https://issues.apache.org/jira/browse/MTOMCAT-186?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Olivier Lamy (*$^¨%`£) closed MTOMCAT-186.
--
Resolution: Fixed
Thanks [~kkolinko] for the advice.
It's now implemented see http://svn.apache.org/r1440948
SNAPSHOT deployed.
Closing executable JAR does not call ServletContextListener.contextDestroyed()
--
Key: MTOMCAT-186
URL: https://issues.apache.org/jira/browse/MTOMCAT-186
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.0
Environment: Java 7, maven 3.0.3
Reporter: Tomasz Nurkiewicz
Assignee: Olivier Lamy (*$^¨%`£)
Priority: Minor
Fix For: 2.1
Attachments: listener.zip
Executable JAR created by {{tomcat7-maven-plugin:exec-war-only}} does not
call {{ServletContextListener.contextDestroyed()}} callback method when Java
process is killed or when Ctrl + C is pressed. There is no way (?) to cleanly
shutdown web application.
The same application (attached) deployed on standalone Tomcat works just
fine. Hitting Ctrl + C correctly undeploys and shuts down application.
Build attached application and run {{java -jar target/standalone.jar}}. Ctrl
+ C kills the process immediately. On the other hand {standalone.war}}
deployed to normal Tomcat under {{/webapps}} shuts down correctly and we can
see log statement from {{contextDestroyed()}}.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-128) The plugin ignores and/or parses web.xml incorrectally when using tomcatWebXml option
[
https://issues.apache.org/jira/browse/MTOMCAT-128?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13567615#comment-13567615
]
Olivier Lamy (*$^¨%`£) commented on MTOMCAT-128:
any network issues accessing to
http://repository.apache.org/content/repositories/snapshots ?
what is the content of those files:
*
/home/gilberto.andrade/.m2/repository/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/tomcat7-maven-plugin-2.1-SNAPSHOT.jar
*
/home/gilberto.andrade/.m2/repository/org/sonatype/plugins/maven-metadata-apache.snapshots.xml
The plugin ignores and/or parses web.xml incorrectally when using
tomcatWebXml option
-
Key: MTOMCAT-128
URL: https://issues.apache.org/jira/browse/MTOMCAT-128
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat6, tomcat7
Affects Versions: 2.0-beta-1
Environment: openSUSE 12.1 32Bits
Reporter: Gilberto C Andrade
Assignee: Olivier Lamy (*$^¨%`£)
Priority: Trivial
Fix For: 2.1
In our project(jpa-spring-wicket) we need to filter the web.xml file,
changing some placeholder and putting it (the web.xml) in
${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml.
Using tomcat6-maven-plugin it find the correct file, but fail when parsing it:
quote
Caused by: java.lang.IllegalArgumentException: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.catalina.core.StandardContext.addParameter(StandardContext.java:2661)
... 52 more
Mar 16, 2012 11:49:12 AM org.apache.catalina.startup.ContextConfig
applicationWebConfig
SEVERE: Parse error in application web.xml file at
jndi:/localhost/a2p/WEB-INF/web.xml
org.xml.sax.SAXParseException; systemId: jndi:/localhost/a2p/WEB-INF/web.xml;
lineNumber: 15; columnNumber: 21; Error at (15, 21: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.tomcat.util.digester.Digester.createSAXException(Digester.java:2806)
/quote
Using tomcat7-maven-plugin it find the correct file, but ignores it so using
the original file which contain the ${placeholder}. Thus not initializing the
application:
quote
INFO - ContextLoader - Root WebApplicationContext:
initialization completed in 7808 ms
INFO - WebXmlFile - web.xml: url mapping found for filter
with name A2P: [/*]
Mar 16, 2012 12:08:16 PM org.apache.catalina.core.StandardContext filterStart
SEVERE: Exception starting filter A2P
java.lang.IllegalArgumentException: Invalid configuration type:
'${wicket.MODE}'. Must be development or deployment.
at
org.apache.wicket.protocol.http.WebApplication.getConfigurationType(WebApplication.java:670)
at org.apache.wicket.Application.configure(Application.java:297)
at
org.apache.wicket.protocol.http.WebApplication.internalInit(WebApplication.java:613)
at org.apache.wicket.Application.initApplication(Application.java:806)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:346)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:286)
at
org.apache.catalina.core.ApplicationFilterConfig.initFilter(ApplicationFilterConfig.java:277)
at
org.apache.catalina.core.ApplicationFilterConfig.getFilter(ApplicationFilterConfig.java:258)
/quote
The plugin configuration:
quote
plugin
groupIdorg.apache.tomcat.maven/groupId
artifactIdtomcat7-maven-plugin/artifactId
version2.0-beta-1/version
configuration
contextPath${project.build.finalName}/contextPath
tomcatWebXml${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml/tomcatWebXml
/configuration
/plugin
/quote
I have the jetty plugin setup as well and working, so I would try with tomcat
but without success until now.
Regards
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1440953 - in /tomcat/trunk/java/org/apache/tomcat/websocket: WsFrameBase.java WsFrameClient.java WsWebSocketContainer.java server/WsFrameServer.java
Author: markt
Date: Thu Jan 31 13:31:26 2013
New Revision: 1440953
URL: http://svn.apache.org/viewvc?rev=1440953view=rev
Log:
More consistent names
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1440953r1=1440952r2=1440953view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Thu Jan 31
13:31:26 2013
@@ -77,12 +77,12 @@ public abstract class WsFrameBase {
private int readPos = 0;
protected int writePos = 0;
-public WsFrameBase(int binaryBufferSize, int textBufferSize,
+public WsFrameBase(int binaryMerssageBufferSize, int textMessageBufferSize,
WsSession wsSession) {
-inputBuffer = new byte[binaryBufferSize];
-messageBufferBinary = ByteBuffer.allocate(binaryBufferSize);
-messageBufferText = CharBuffer.allocate(textBufferSize);
+inputBuffer = new byte[binaryMerssageBufferSize];
+messageBufferBinary = ByteBuffer.allocate(binaryMerssageBufferSize);
+messageBufferText = CharBuffer.allocate(textMessageBufferSize);
this.wsSession = wsSession;
}
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java?rev=1440953r1=1440952r2=1440953view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java Thu Jan 31
13:31:26 2013
@@ -31,8 +31,9 @@ public class WsFrameClient extends WsFra
private final CompletionHandlerInteger,Void handler;
public WsFrameClient(ByteBuffer response, AsynchronousSocketChannel
channel,
-int binaryBufferSize, int textBufferSize, WsSession wsSession) {
-super(binaryBufferSize, textBufferSize, wsSession);
+int binaryMessageBufferSize, int textMessageBufferSize,
+WsSession wsSession) {
+super(binaryMessageBufferSize, textMessageBufferSize, wsSession);
this.response = response;
this.channel = channel;
this.handler = new WsFrameClientCompletionHandler();
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1440953r1=1440952r2=1440953view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Thu
Jan 31 13:31:26 2013
@@ -52,11 +52,11 @@ public class WsWebSocketContainer implem
private static final Random random = new Random();
private static final Charset iso88591 = Charset.forName(ISO-8859-1);
private static final byte[] crlf = new byte[] {13, 10};
-private static final int defaultBufferSize = 8 * 1024;
+private static final int DEFAULT_BUFFER_SIZE = 8 * 1024;
private long defaultAsyncTimeout = -1;
-private int binaryBufferSize = defaultBufferSize;
-private int textBufferSize = defaultBufferSize;
+private int maxBinaryMessageBufferSize = DEFAULT_BUFFER_SIZE;
+private int maxTextMessageBufferSize = DEFAULT_BUFFER_SIZE;
@Override
public Session connectToServer(Class? annotatedEndpointClass, URI path)
@@ -125,7 +125,7 @@ public class WsWebSocketContainer implem
toWrite -= thisWrite.intValue();
}
// Same size as the WsFrame input buffer
-response = ByteBuffer.allocate(binaryBufferSize);
+response = ByteBuffer.allocate(maxBinaryMessageBufferSize);
HandshakeResponse handshakeResponse =
processResponse(response, channel);
@@ -154,7 +154,8 @@ public class WsWebSocketContainer implem
// Object creation will trigger input processing
@SuppressWarnings(unused)
WsFrameClient wsFrameClient = new WsFrameClient(response, channel,
-binaryBufferSize, textBufferSize, wsSession);
+maxBinaryMessageBufferSize, maxTextMessageBufferSize,
+wsSession);
return wsSession;
}
@@ -363,7 +364,7 @@ public class WsWebSocketContainer implem
@Override
public long
svn commit: r1440962 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsTimeout.java
Author: markt
Date: Thu Jan 31 14:02:32 2013
New Revision: 1440962
URL: http://svn.apache.org/viewvc?rev=1440962view=rev
Log:
REmove debug code.
Improve comment.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsTimeout.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsTimeout.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsTimeout.java?rev=1440962r1=1440961r2=1440962view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsTimeout.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsTimeout.java Thu Jan
31 14:02:32 2013
@@ -61,11 +61,11 @@ public class WsTimeout implements Runnab
while (iter.hasNext()) {
WsRemoteEndpointServer endpoint = iter.next();
if (endpoint.getTimeoutExpiry() now) {
-System.out.println(now);
endpoint.onTimeout();
} else {
-// Endpoints are ordered by timeout expiry so we reach this
-// point there is no need to check the remaining endpoints
+// Endpoints are ordered by timeout expiry so if this point
+// is reached there is no need to check the remaining
+// endpoints
break;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1440963 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
Author: markt
Date: Thu Jan 31 14:03:05 2013
New Revision: 1440963
URL: http://svn.apache.org/viewvc?rev=1440963view=rev
Log:
Fix logic error if timeout 1 (i.e.disabled/infinite)
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java?rev=1440963r1=1440962r2=1440963view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
Thu Jan 31 14:03:05 2013
@@ -102,9 +102,10 @@ public class WsRemoteEndpointServer exte
if (handler != null) {
// Async write is in progress
-timeoutExpiry = getAsyncSendTimeout() + System.currentTimeMillis();
-if (timeoutExpiry 0) {
+long timeout = getAsyncSendTimeout();
+if (timeout 0) {
// Register with timeout thread
+timeoutExpiry = timeout + System.currentTimeMillis();
wsTimeout.register(this);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1440965 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
Author: markt
Date: Thu Jan 31 14:09:31 2013
New Revision: 1440965
URL: http://svn.apache.org/viewvc?rev=1440965view=rev
Log:
Tweak the buffering so the limits apply to the buffers passed to the client and
have no impact on internal processing
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1440965r1=1440964r2=1440965view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Thu Jan 31
14:09:31 2013
@@ -399,7 +399,7 @@ public abstract class WsFrameBase {
}
-private boolean processDataBinary() {
+private boolean processDataBinary() throws IOException {
// Copy the available data to the buffer
while (!appendPayloadToMessage(messageBufferBinary)) {
// Frame not complete - what did we run out of?
@@ -408,6 +408,14 @@ public abstract class WsFrameBase {
return false;
} else {
// Ran out of message buffer - flush it
+if (!usePartial()) {
+CloseReason cr = new CloseReason(CloseCodes.TOO_BIG,
+sm.getString(wsFrame.bufferToSmall,
+Integer.valueOf(
+messageBufferBinary.capacity()),
+Long.valueOf(payloadLength)));
+throw new WsIOException(cr);
+}
messageBufferBinary.flip();
ByteBuffer copy =
ByteBuffer.allocate(messageBufferBinary.limit());
@@ -487,19 +495,8 @@ public abstract class WsFrameBase {
}
-private void checkRoomPayload() throws IOException {
+private void checkRoomPayload() {
if (inputBuffer.length - readPos - payloadLength + payloadWritten 0)
{
-if (Util.isControl(opCode)) {
-makeRoom();
-return;
-}
-if (!usePartial() (inputBuffer.length payloadLength)) {
-CloseReason cr = new CloseReason(CloseCodes.TOO_BIG,
-sm.getString(wsFrame.bufferToSmall,
-Integer.valueOf(inputBuffer.length),
-Long.valueOf(payloadLength)));
-throw new WsIOException(cr);
-}
makeRoom();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1440965 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
2013/1/31 ma...@apache.org:
Author: markt
Date: Thu Jan 31 14:09:31 2013
New Revision: 1440965
URL: http://svn.apache.org/viewvc?rev=1440965view=rev
Log:
Tweak the buffering so the limits apply to the buffers passed to the client
and have no impact on internal processing
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1440965r1=1440964r2=1440965view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Thu Jan 31
14:09:31 2013
@@ -399,7 +399,7 @@ public abstract class WsFrameBase {
}
-private boolean processDataBinary() {
+private boolean processDataBinary() throws IOException {
// Copy the available data to the buffer
while (!appendPayloadToMessage(messageBufferBinary)) {
// Frame not complete - what did we run out of?
@@ -408,6 +408,14 @@ public abstract class WsFrameBase {
return false;
} else {
// Ran out of message buffer - flush it
+if (!usePartial()) {
+CloseReason cr = new CloseReason(CloseCodes.TOO_BIG,
+sm.getString(wsFrame.bufferToSmall,
s/To/Too/
+Integer.valueOf(
+messageBufferBinary.capacity()),
+Long.valueOf(payloadLength)));
+throw new WsIOException(cr);
+}
messageBufferBinary.flip();
ByteBuffer copy =
ByteBuffer.allocate(messageBufferBinary.limit());
@@ -487,19 +495,8 @@ public abstract class WsFrameBase {
}
-private void checkRoomPayload() throws IOException {
+private void checkRoomPayload() {
if (inputBuffer.length - readPos - payloadLength + payloadWritten
0) {
-if (Util.isControl(opCode)) {
-makeRoom();
-return;
-}
-if (!usePartial() (inputBuffer.length payloadLength)) {
-CloseReason cr = new CloseReason(CloseCodes.TOO_BIG,
-sm.getString(wsFrame.bufferToSmall,
-Integer.valueOf(inputBuffer.length),
-Long.valueOf(payloadLength)));
-throw new WsIOException(cr);
-}
makeRoom();
}
}
-
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: svn commit: r1440953 - in /tomcat/trunk/java/org/apache/tomcat/websocket: WsFrameBase.java WsFrameClient.java WsWebSocketContainer.java server/WsFrameServer.java
2013/1/31 ma...@apache.org:
Author: markt
Date: Thu Jan 31 13:31:26 2013
New Revision: 1440953
URL: http://svn.apache.org/viewvc?rev=1440953view=rev
Log:
More consistent names
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1440953r1=1440952r2=1440953view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Thu Jan 31
13:31:26 2013
@@ -77,12 +77,12 @@ public abstract class WsFrameBase {
private int readPos = 0;
protected int writePos = 0;
-public WsFrameBase(int binaryBufferSize, int textBufferSize,
+public WsFrameBase(int binaryMerssageBufferSize, int
textMessageBufferSize,
WsSession wsSession) {
s/Merss/Mess/
-inputBuffer = new byte[binaryBufferSize];
-messageBufferBinary = ByteBuffer.allocate(binaryBufferSize);
-messageBufferText = CharBuffer.allocate(textBufferSize);
+inputBuffer = new byte[binaryMerssageBufferSize];
+messageBufferBinary = ByteBuffer.allocate(binaryMerssageBufferSize);
+messageBufferText = CharBuffer.allocate(textMessageBufferSize);
this.wsSession = wsSession;
}
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java?rev=1440953r1=1440952r2=1440953view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java Thu Jan
31 13:31:26 2013
@@ -31,8 +31,9 @@ public class WsFrameClient extends WsFra
private final CompletionHandlerInteger,Void handler;
public WsFrameClient(ByteBuffer response, AsynchronousSocketChannel
channel,
-int binaryBufferSize, int textBufferSize, WsSession wsSession) {
-super(binaryBufferSize, textBufferSize, wsSession);
+int binaryMessageBufferSize, int textMessageBufferSize,
+WsSession wsSession) {
+super(binaryMessageBufferSize, textMessageBufferSize, wsSession);
this.response = response;
this.channel = channel;
this.handler = new WsFrameClientCompletionHandler();
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1440953r1=1440952r2=1440953view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Thu Jan 31 13:31:26 2013
@@ -52,11 +52,11 @@ public class WsWebSocketContainer implem
private static final Random random = new Random();
private static final Charset iso88591 = Charset.forName(ISO-8859-1);
private static final byte[] crlf = new byte[] {13, 10};
-private static final int defaultBufferSize = 8 * 1024;
+private static final int DEFAULT_BUFFER_SIZE = 8 * 1024;
private long defaultAsyncTimeout = -1;
-private int binaryBufferSize = defaultBufferSize;
-private int textBufferSize = defaultBufferSize;
+private int maxBinaryMessageBufferSize = DEFAULT_BUFFER_SIZE;
+private int maxTextMessageBufferSize = DEFAULT_BUFFER_SIZE;
@Override
public Session connectToServer(Class? annotatedEndpointClass, URI path)
@@ -125,7 +125,7 @@ public class WsWebSocketContainer implem
toWrite -= thisWrite.intValue();
}
// Same size as the WsFrame input buffer
-response = ByteBuffer.allocate(binaryBufferSize);
+response = ByteBuffer.allocate(maxBinaryMessageBufferSize);
HandshakeResponse handshakeResponse =
processResponse(response, channel);
@@ -154,7 +154,8 @@ public class WsWebSocketContainer implem
// Object creation will trigger input processing
@SuppressWarnings(unused)
WsFrameClient wsFrameClient = new WsFrameClient(response, channel,
-binaryBufferSize, textBufferSize, wsSession);
+maxBinaryMessageBufferSize, maxTextMessageBufferSize,
+wsSession);
svn commit: r1440973 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties WsFrameBase.java
Author: markt
Date: Thu Jan 31 14:26:29 2013
New Revision: 1440973
URL: http://svn.apache.org/viewvc?rev=1440973view=rev
Log:
Fix typos spotted by kkolinko
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1440973r1=1440972r2=1440973view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Thu
Jan 31 14:26:29 2013
@@ -21,7 +21,7 @@ messageSendStateMachine.inProgress=Messa
# frames and therefore must be 123 bytes (not characters) or less in length.
# Messages are encoded using UTF-8 where a single character may be encoded in
# as many as 4 bytes.
-wsFrame.bufferToSmall=No async message support and buffer too small. Buffer
size: [{0}], Message size: [{1}]
+wsFrame.bufferTooSmall=No async message support and buffer too small. Buffer
size: [{0}], Message size: [{1}]
wsFrame.byteToLongFail=Too many bytes ([{0}]) were provided to be converted
into a long
wsFrame.controlFragmented=A fragmented control frame was received but control
frames may not be fragmented
wsFrame.controlPayloadTooBig=A control frame was sent with a payload of size
[{0}] which is larger than the maximum permitted of 125 bytes
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1440973r1=1440972r2=1440973view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Thu Jan 31
14:26:29 2013
@@ -77,11 +77,11 @@ public abstract class WsFrameBase {
private int readPos = 0;
protected int writePos = 0;
-public WsFrameBase(int binaryMerssageBufferSize, int textMessageBufferSize,
+public WsFrameBase(int binaryMessageBufferSize, int textMessageBufferSize,
WsSession wsSession) {
-inputBuffer = new byte[binaryMerssageBufferSize];
-messageBufferBinary = ByteBuffer.allocate(binaryMerssageBufferSize);
+inputBuffer = new byte[binaryMessageBufferSize];
+messageBufferBinary = ByteBuffer.allocate(binaryMessageBufferSize);
messageBufferText = CharBuffer.allocate(textMessageBufferSize);
this.wsSession = wsSession;
}
@@ -410,7 +410,7 @@ public abstract class WsFrameBase {
// Ran out of message buffer - flush it
if (!usePartial()) {
CloseReason cr = new CloseReason(CloseCodes.TOO_BIG,
-sm.getString(wsFrame.bufferToSmall,
+sm.getString(wsFrame.bufferTooSmall,
Integer.valueOf(
messageBufferBinary.capacity()),
Long.valueOf(payloadLength)));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1440973 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties WsFrameBase.java
2013/1/31 ma...@apache.org:
Author: markt
Date: Thu Jan 31 14:26:29 2013
New Revision: 1440973
URL: http://svn.apache.org/viewvc?rev=1440973view=rev
Log:
Fix typos spotted by kkolinko
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1440973r1=1440972r2=1440973view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Thu
Jan 31 14:26:29 2013
@@ -21,7 +21,7 @@ messageSendStateMachine.inProgress=Messa
# frames and therefore must be 123 bytes (not characters) or less in length.
# Messages are encoded using UTF-8 where a single character may be encoded in
# as many as 4 bytes.
-wsFrame.bufferToSmall=No async message support and buffer too small. Buffer
size: [{0}], Message size: [{1}]
+wsFrame.bufferTooSmall=No async message support and buffer too small. Buffer
size: [{0}], Message size: [{1}]
wsFrame.byteToLongFail=Too many bytes ([{0}]) were provided to be converted
into a long
s/To/Too/ above as well
wsFrame.controlFragmented=A fragmented control frame was received but
control frames may not be fragmented
wsFrame.controlPayloadTooBig=A control frame was sent with a payload of size
[{0}] which is larger than the maximum permitted of 125 bytes
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1440973r1=1440972r2=1440973view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Thu Jan 31
14:26:29 2013
@@ -77,11 +77,11 @@ public abstract class WsFrameBase {
private int readPos = 0;
protected int writePos = 0;
-public WsFrameBase(int binaryMerssageBufferSize, int
textMessageBufferSize,
+public WsFrameBase(int binaryMessageBufferSize, int
textMessageBufferSize,
WsSession wsSession) {
-inputBuffer = new byte[binaryMerssageBufferSize];
-messageBufferBinary = ByteBuffer.allocate(binaryMerssageBufferSize);
+inputBuffer = new byte[binaryMessageBufferSize];
+messageBufferBinary = ByteBuffer.allocate(binaryMessageBufferSize);
messageBufferText = CharBuffer.allocate(textMessageBufferSize);
this.wsSession = wsSession;
}
@@ -410,7 +410,7 @@ public abstract class WsFrameBase {
// Ran out of message buffer - flush it
if (!usePartial()) {
CloseReason cr = new CloseReason(CloseCodes.TOO_BIG,
-sm.getString(wsFrame.bufferToSmall,
+sm.getString(wsFrame.bufferTooSmall,
Integer.valueOf(
messageBufferBinary.capacity()),
Long.valueOf(payloadLength)));
-
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: svn commit: r1440973 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties WsFrameBase.java
On 31/01/2013 14:30, Konstantin Kolinko wrote:
2013/1/31 ma...@apache.org:
Author: markt
Date: Thu Jan 31 14:26:29 2013
New Revision: 1440973
URL: http://svn.apache.org/viewvc?rev=1440973view=rev
Log:
Fix typos spotted by kkolinko
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1440973r1=1440972r2=1440973view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Thu Jan 31 14:26:29 2013
@@ -21,7 +21,7 @@ messageSendStateMachine.inProgress=Messa
# frames and therefore must be 123 bytes (not characters) or less in length.
# Messages are encoded using UTF-8 where a single character may be encoded
in
# as many as 4 bytes.
-wsFrame.bufferToSmall=No async message support and buffer too small. Buffer
size: [{0}], Message size: [{1}]
+wsFrame.bufferTooSmall=No async message support and buffer too small.
Buffer size: [{0}], Message size: [{1}]
wsFrame.byteToLongFail=Too many bytes ([{0}]) were provided to be converted
into a long
s/To/Too/ above as well
Not this time. You can read it either way and I meant Conversion of
byte to Long failed rather than byte array too long.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1440997 - in /tomcat/site/trunk: docs/whoweare.html xdocs/whoweare.xml
Author: violetagg Date: Thu Jan 31 14:49:04 2013 New Revision: 1440997 URL: http://svn.apache.org/viewvc?rev=1440997view=rev Log: added myself in the whoweare page Modified: tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/whoweare.xml Modified: tomcat/site/trunk/docs/whoweare.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1440997r1=1440996r2=1440997view=diff == --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Thu Jan 31 14:49:04 2013 @@ -290,6 +290,12 @@ A complete list of all the Apache Commit p +bVioleta Georgieva/b (violetagg at apache.org)br +/p + + + +p bHenri Gomez/b (hgomez at apache.org)br /p Modified: tomcat/site/trunk/xdocs/whoweare.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1440997r1=1440996r2=1440997view=diff == --- tomcat/site/trunk/xdocs/whoweare.xml (original) +++ tomcat/site/trunk/xdocs/whoweare.xml Thu Jan 31 14:49:04 2013 @@ -67,6 +67,9 @@ A complete list of all the Apache Commit pbTim Funk/b (funkman at apache.org)br//p !--Your bio goes here-- +pbVioleta Georgieva/b (violetagg at apache.org)br//p +!--Your bio goes here-- + pbHenri Gomez/b (hgomez at apache.org)br//p !--Your bio goes here-- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1440997 - in /tomcat/site/trunk: docs/whoweare.html xdocs/whoweare.xml
Welcome aboard ! 2013/1/31 violet...@apache.org: Author: violetagg Date: Thu Jan 31 14:49:04 2013 New Revision: 1440997 URL: http://svn.apache.org/viewvc?rev=1440997view=rev Log: added myself in the whoweare page Modified: tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/whoweare.xml Modified: tomcat/site/trunk/docs/whoweare.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1440997r1=1440996r2=1440997view=diff == --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Thu Jan 31 14:49:04 2013 @@ -290,6 +290,12 @@ A complete list of all the Apache Commit p +bVioleta Georgieva/b (violetagg at apache.org)br +/p + + + +p bHenri Gomez/b (hgomez at apache.org)br /p Modified: tomcat/site/trunk/xdocs/whoweare.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1440997r1=1440996r2=1440997view=diff == --- tomcat/site/trunk/xdocs/whoweare.xml (original) +++ tomcat/site/trunk/xdocs/whoweare.xml Thu Jan 31 14:49:04 2013 @@ -67,6 +67,9 @@ A complete list of all the Apache Commit pbTim Funk/b (funkman at apache.org)br//p !--Your bio goes here-- +pbVioleta Georgieva/b (violetagg at apache.org)br//p +!--Your bio goes here-- + pbHenri Gomez/b (hgomez at apache.org)br//p !--Your bio goes here-- - 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
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/3863 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1440973 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[jira] [Commented] (MTOMCAT-128) The plugin ignores and/or parses web.xml incorrectally when using tomcatWebXml option
[
https://issues.apache.org/jira/browse/MTOMCAT-128?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13567758#comment-13567758
]
Gilberto C Andrade commented on MTOMCAT-128:
Yes, I have this problem:
{code}
gilberto.andrade@A37710:~$ cat
/home/gilberto.andrade/.m2/repository/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/tomcat7-maven-plugin-2.1-SNAPSHOT.jar
!DOCTYPE HTML PUBLIC -//IETF//DTD HTML 2.0//EN
htmlhead
title302 Found/title
/headbody
h1Found/h1
pThe document has moved a
href=https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/tomcat7-maven-plugin-2.1-SNAPSHOT.jar;here/a./p
hr
addressApache/2.2.20 (Ubuntu) Server at repository.apache.org Port
80/address
/body/html
{code}
and
{code}
gilberto.andrade@A37710:~$ cat
/home/gilberto.andrade/.m2/repository/org/sonatype/plugins/maven-metadata-apache.snapshots.xml
!DOCTYPE HTML PUBLIC -//IETF//DTD HTML 2.0//EN
htmlhead
title302 Found/title
/headbody
h1Found/h1
pThe document has moved a
href=https://repository.apache.org/content/repositories/snapshots/org/sonatype/plugins/maven-metadata.xml;here/a./p
hr
addressApache/2.2.20 (Ubuntu) Server at repository.apache.org Port
80/address
/body/html
gilberto.andrade@A37710:~$
{code}
The plugin ignores and/or parses web.xml incorrectally when using
tomcatWebXml option
-
Key: MTOMCAT-128
URL: https://issues.apache.org/jira/browse/MTOMCAT-128
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat6, tomcat7
Affects Versions: 2.0-beta-1
Environment: openSUSE 12.1 32Bits
Reporter: Gilberto C Andrade
Assignee: Olivier Lamy (*$^¨%`£)
Priority: Trivial
Fix For: 2.1
In our project(jpa-spring-wicket) we need to filter the web.xml file,
changing some placeholder and putting it (the web.xml) in
${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml.
Using tomcat6-maven-plugin it find the correct file, but fail when parsing it:
quote
Caused by: java.lang.IllegalArgumentException: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.catalina.core.StandardContext.addParameter(StandardContext.java:2661)
... 52 more
Mar 16, 2012 11:49:12 AM org.apache.catalina.startup.ContextConfig
applicationWebConfig
SEVERE: Parse error in application web.xml file at
jndi:/localhost/a2p/WEB-INF/web.xml
org.xml.sax.SAXParseException; systemId: jndi:/localhost/a2p/WEB-INF/web.xml;
lineNumber: 15; columnNumber: 21; Error at (15, 21: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.tomcat.util.digester.Digester.createSAXException(Digester.java:2806)
/quote
Using tomcat7-maven-plugin it find the correct file, but ignores it so using
the original file which contain the ${placeholder}. Thus not initializing the
application:
quote
INFO - ContextLoader - Root WebApplicationContext:
initialization completed in 7808 ms
INFO - WebXmlFile - web.xml: url mapping found for filter
with name A2P: [/*]
Mar 16, 2012 12:08:16 PM org.apache.catalina.core.StandardContext filterStart
SEVERE: Exception starting filter A2P
java.lang.IllegalArgumentException: Invalid configuration type:
'${wicket.MODE}'. Must be development or deployment.
at
org.apache.wicket.protocol.http.WebApplication.getConfigurationType(WebApplication.java:670)
at org.apache.wicket.Application.configure(Application.java:297)
at
org.apache.wicket.protocol.http.WebApplication.internalInit(WebApplication.java:613)
at org.apache.wicket.Application.initApplication(Application.java:806)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:346)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:286)
at
org.apache.catalina.core.ApplicationFilterConfig.initFilter(ApplicationFilterConfig.java:277)
at
org.apache.catalina.core.ApplicationFilterConfig.getFilter(ApplicationFilterConfig.java:258)
/quote
The plugin configuration:
quote
plugin
groupIdorg.apache.tomcat.maven/groupId
artifactIdtomcat7-maven-plugin/artifactId
version2.0-beta-1/version
configuration
contextPath${project.build.finalName}/contextPath
tomcatWebXml${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml/tomcatWebXml
/configuration
/plugin
/quote
I have the jetty plugin setup as well and working, so I would try with tomcat
but without success until now.
Regards
--
This message
[jira] [Commented] (MTOMCAT-128) The plugin ignores and/or parses web.xml incorrectally when using tomcatWebXml option
[
https://issues.apache.org/jira/browse/MTOMCAT-128?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13567762#comment-13567762
]
Olivier Lamy (*$^¨%`£) commented on MTOMCAT-128:
weird which maven version are you using ?
Last one follow redirect.
To fix that you can probably use directly
https://repository.apache.org/content/repositories/snapshots as snapshots
repository. (note https rather than http)
The plugin ignores and/or parses web.xml incorrectally when using
tomcatWebXml option
-
Key: MTOMCAT-128
URL: https://issues.apache.org/jira/browse/MTOMCAT-128
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat6, tomcat7
Affects Versions: 2.0-beta-1
Environment: openSUSE 12.1 32Bits
Reporter: Gilberto C Andrade
Assignee: Olivier Lamy (*$^¨%`£)
Priority: Trivial
Fix For: 2.1
In our project(jpa-spring-wicket) we need to filter the web.xml file,
changing some placeholder and putting it (the web.xml) in
${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml.
Using tomcat6-maven-plugin it find the correct file, but fail when parsing it:
quote
Caused by: java.lang.IllegalArgumentException: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.catalina.core.StandardContext.addParameter(StandardContext.java:2661)
... 52 more
Mar 16, 2012 11:49:12 AM org.apache.catalina.startup.ContextConfig
applicationWebConfig
SEVERE: Parse error in application web.xml file at
jndi:/localhost/a2p/WEB-INF/web.xml
org.xml.sax.SAXParseException; systemId: jndi:/localhost/a2p/WEB-INF/web.xml;
lineNumber: 15; columnNumber: 21; Error at (15, 21: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.tomcat.util.digester.Digester.createSAXException(Digester.java:2806)
/quote
Using tomcat7-maven-plugin it find the correct file, but ignores it so using
the original file which contain the ${placeholder}. Thus not initializing the
application:
quote
INFO - ContextLoader - Root WebApplicationContext:
initialization completed in 7808 ms
INFO - WebXmlFile - web.xml: url mapping found for filter
with name A2P: [/*]
Mar 16, 2012 12:08:16 PM org.apache.catalina.core.StandardContext filterStart
SEVERE: Exception starting filter A2P
java.lang.IllegalArgumentException: Invalid configuration type:
'${wicket.MODE}'. Must be development or deployment.
at
org.apache.wicket.protocol.http.WebApplication.getConfigurationType(WebApplication.java:670)
at org.apache.wicket.Application.configure(Application.java:297)
at
org.apache.wicket.protocol.http.WebApplication.internalInit(WebApplication.java:613)
at org.apache.wicket.Application.initApplication(Application.java:806)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:346)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:286)
at
org.apache.catalina.core.ApplicationFilterConfig.initFilter(ApplicationFilterConfig.java:277)
at
org.apache.catalina.core.ApplicationFilterConfig.getFilter(ApplicationFilterConfig.java:258)
/quote
The plugin configuration:
quote
plugin
groupIdorg.apache.tomcat.maven/groupId
artifactIdtomcat7-maven-plugin/artifactId
version2.0-beta-1/version
configuration
contextPath${project.build.finalName}/contextPath
tomcatWebXml${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml/tomcatWebXml
/configuration
/plugin
/quote
I have the jetty plugin setup as well and working, so I would try with tomcat
but without success until now.
Regards
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] New Tomcat committer: Violeta Georgieva (violetagg)
On behalf of the Tomcat committers I am pleased to announce that Violeta Georgieva (violetagg) has been voted in as a new Tomcat committer. Please join me in welcoming her. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-128) The plugin ignores and/or parses web.xml incorrectally when using tomcatWebXml option
[
https://issues.apache.org/jira/browse/MTOMCAT-128?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13567778#comment-13567778
]
Olivier Lamy (*$^¨%`£) commented on MTOMCAT-128:
why this groupId org.sonatype.plugins ??
this is not something hosted @ asf
The plugin ignores and/or parses web.xml incorrectally when using
tomcatWebXml option
-
Key: MTOMCAT-128
URL: https://issues.apache.org/jira/browse/MTOMCAT-128
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat6, tomcat7
Affects Versions: 2.0-beta-1
Environment: openSUSE 12.1 32Bits
Reporter: Gilberto C Andrade
Assignee: Olivier Lamy (*$^¨%`£)
Priority: Trivial
Fix For: 2.1
In our project(jpa-spring-wicket) we need to filter the web.xml file,
changing some placeholder and putting it (the web.xml) in
${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml.
Using tomcat6-maven-plugin it find the correct file, but fail when parsing it:
quote
Caused by: java.lang.IllegalArgumentException: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.catalina.core.StandardContext.addParameter(StandardContext.java:2661)
... 52 more
Mar 16, 2012 11:49:12 AM org.apache.catalina.startup.ContextConfig
applicationWebConfig
SEVERE: Parse error in application web.xml file at
jndi:/localhost/a2p/WEB-INF/web.xml
org.xml.sax.SAXParseException; systemId: jndi:/localhost/a2p/WEB-INF/web.xml;
lineNumber: 15; columnNumber: 21; Error at (15, 21: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.tomcat.util.digester.Digester.createSAXException(Digester.java:2806)
/quote
Using tomcat7-maven-plugin it find the correct file, but ignores it so using
the original file which contain the ${placeholder}. Thus not initializing the
application:
quote
INFO - ContextLoader - Root WebApplicationContext:
initialization completed in 7808 ms
INFO - WebXmlFile - web.xml: url mapping found for filter
with name A2P: [/*]
Mar 16, 2012 12:08:16 PM org.apache.catalina.core.StandardContext filterStart
SEVERE: Exception starting filter A2P
java.lang.IllegalArgumentException: Invalid configuration type:
'${wicket.MODE}'. Must be development or deployment.
at
org.apache.wicket.protocol.http.WebApplication.getConfigurationType(WebApplication.java:670)
at org.apache.wicket.Application.configure(Application.java:297)
at
org.apache.wicket.protocol.http.WebApplication.internalInit(WebApplication.java:613)
at org.apache.wicket.Application.initApplication(Application.java:806)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:346)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:286)
at
org.apache.catalina.core.ApplicationFilterConfig.initFilter(ApplicationFilterConfig.java:277)
at
org.apache.catalina.core.ApplicationFilterConfig.getFilter(ApplicationFilterConfig.java:258)
/quote
The plugin configuration:
quote
plugin
groupIdorg.apache.tomcat.maven/groupId
artifactIdtomcat7-maven-plugin/artifactId
version2.0-beta-1/version
configuration
contextPath${project.build.finalName}/contextPath
tomcatWebXml${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml/tomcatWebXml
/configuration
/plugin
/quote
I have the jetty plugin setup as well and working, so I would try with tomcat
but without success until now.
Regards
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] New Tomcat committer: Violeta Georgieva (violetagg)
Welcome, Violeta! I'm glad SAP decided to use an open source web container for its application server! Some day I'll convince them to use another good Apache product instead of Web Dynpro! ;-) On Thu, Jan 31, 2013 at 5:22 PM, Mark Thomas ma...@apache.org wrote: On behalf of the Tomcat committers I am pleased to announce that Violeta Georgieva (violetagg) has been voted in as a new Tomcat committer. Please join me in welcoming her. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org -- Martin Grigorov jWeekend Training, Consulting, Development http://jWeekend.com http://jweekend.com/
[jira] [Commented] (MTOMCAT-128) The plugin ignores and/or parses web.xml incorrectally when using tomcatWebXml option
[
https://issues.apache.org/jira/browse/MTOMCAT-128?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13567786#comment-13567786
]
Gilberto C Andrade commented on MTOMCAT-128:
My settings.xml:
?xml version=1.0 encoding=UTF-8?
settings xsi:schemaLocation=http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd;
xmlns=http://maven.apache.org/SETTINGS/1.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
localRepository/home/gilberto.andrade/.m2/repository/localRepository
pluginGroups
pluginGrouporg.sonatype.plugins/pluginGroup
pluginGroupcom.ning.maven.plugins/pluginGroup
pluginGrouporg.apache.tomcat.maven/pluginGroup
/pluginGroups
Is there anything wrong here?
The plugin ignores and/or parses web.xml incorrectally when using
tomcatWebXml option
-
Key: MTOMCAT-128
URL: https://issues.apache.org/jira/browse/MTOMCAT-128
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat6, tomcat7
Affects Versions: 2.0-beta-1
Environment: openSUSE 12.1 32Bits
Reporter: Gilberto C Andrade
Assignee: Olivier Lamy (*$^¨%`£)
Priority: Trivial
Fix For: 2.1
In our project(jpa-spring-wicket) we need to filter the web.xml file,
changing some placeholder and putting it (the web.xml) in
${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml.
Using tomcat6-maven-plugin it find the correct file, but fail when parsing it:
quote
Caused by: java.lang.IllegalArgumentException: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.catalina.core.StandardContext.addParameter(StandardContext.java:2661)
... 52 more
Mar 16, 2012 11:49:12 AM org.apache.catalina.startup.ContextConfig
applicationWebConfig
SEVERE: Parse error in application web.xml file at
jndi:/localhost/a2p/WEB-INF/web.xml
org.xml.sax.SAXParseException; systemId: jndi:/localhost/a2p/WEB-INF/web.xml;
lineNumber: 15; columnNumber: 21; Error at (15, 21: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.tomcat.util.digester.Digester.createSAXException(Digester.java:2806)
/quote
Using tomcat7-maven-plugin it find the correct file, but ignores it so using
the original file which contain the ${placeholder}. Thus not initializing the
application:
quote
INFO - ContextLoader - Root WebApplicationContext:
initialization completed in 7808 ms
INFO - WebXmlFile - web.xml: url mapping found for filter
with name A2P: [/*]
Mar 16, 2012 12:08:16 PM org.apache.catalina.core.StandardContext filterStart
SEVERE: Exception starting filter A2P
java.lang.IllegalArgumentException: Invalid configuration type:
'${wicket.MODE}'. Must be development or deployment.
at
org.apache.wicket.protocol.http.WebApplication.getConfigurationType(WebApplication.java:670)
at org.apache.wicket.Application.configure(Application.java:297)
at
org.apache.wicket.protocol.http.WebApplication.internalInit(WebApplication.java:613)
at org.apache.wicket.Application.initApplication(Application.java:806)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:346)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:286)
at
org.apache.catalina.core.ApplicationFilterConfig.initFilter(ApplicationFilterConfig.java:277)
at
org.apache.catalina.core.ApplicationFilterConfig.getFilter(ApplicationFilterConfig.java:258)
/quote
The plugin configuration:
quote
plugin
groupIdorg.apache.tomcat.maven/groupId
artifactIdtomcat7-maven-plugin/artifactId
version2.0-beta-1/version
configuration
contextPath${project.build.finalName}/contextPath
tomcatWebXml${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml/tomcatWebXml
/configuration
/plugin
/quote
I have the jetty plugin setup as well and working, so I would try with tomcat
but without success until now.
Regards
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-128) The plugin ignores and/or parses web.xml incorrectally when using tomcatWebXml option
[
https://issues.apache.org/jira/browse/MTOMCAT-128?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13567792#comment-13567792
]
Olivier Lamy (*$^¨%`£) commented on MTOMCAT-128:
{code}
curl -I
https://repository.apache.org/content/repositories/snapshots/org/sonatype/plugins/maven-metadata.xml
HTTP/1.1 404 The server has not found anything matching the request URI
Date: Thu, 31 Jan 2013 16:46:41 GMT
Server: Noelios-Restlet-Engine/1.1.6-SONATYPE-5348-V4
Vary: Accept-Charset,Accept-Encoding,Accept-Language,Accept
Content-Type: text/html;charset=ISO-8859-1
Cache-Control: must-revalidate,no-cache,no-store
Content-Length: 1533
Set-Cookie: rememberMe=deleteMe; Path=/; Max-Age=0; Expires=Wed, 30-Jan-2013
16:46:41 GMT
{code}
so maven see 404 and doesn't care of that.
Can you cleanup your local repo ?
rm -rf /home/gilberto.andrade/.m2/repository/org/sonatype/plugins
rm -rf /home/gilberto.andrade/.m2/repository/org/apache/tomcat
then try again with -U
The plugin ignores and/or parses web.xml incorrectally when using
tomcatWebXml option
-
Key: MTOMCAT-128
URL: https://issues.apache.org/jira/browse/MTOMCAT-128
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat6, tomcat7
Affects Versions: 2.0-beta-1
Environment: openSUSE 12.1 32Bits
Reporter: Gilberto C Andrade
Assignee: Olivier Lamy (*$^¨%`£)
Priority: Trivial
Fix For: 2.1
In our project(jpa-spring-wicket) we need to filter the web.xml file,
changing some placeholder and putting it (the web.xml) in
${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml.
Using tomcat6-maven-plugin it find the correct file, but fail when parsing it:
quote
Caused by: java.lang.IllegalArgumentException: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.catalina.core.StandardContext.addParameter(StandardContext.java:2661)
... 52 more
Mar 16, 2012 11:49:12 AM org.apache.catalina.startup.ContextConfig
applicationWebConfig
SEVERE: Parse error in application web.xml file at
jndi:/localhost/a2p/WEB-INF/web.xml
org.xml.sax.SAXParseException; systemId: jndi:/localhost/a2p/WEB-INF/web.xml;
lineNumber: 15; columnNumber: 21; Error at (15, 21: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.tomcat.util.digester.Digester.createSAXException(Digester.java:2806)
/quote
Using tomcat7-maven-plugin it find the correct file, but ignores it so using
the original file which contain the ${placeholder}. Thus not initializing the
application:
quote
INFO - ContextLoader - Root WebApplicationContext:
initialization completed in 7808 ms
INFO - WebXmlFile - web.xml: url mapping found for filter
with name A2P: [/*]
Mar 16, 2012 12:08:16 PM org.apache.catalina.core.StandardContext filterStart
SEVERE: Exception starting filter A2P
java.lang.IllegalArgumentException: Invalid configuration type:
'${wicket.MODE}'. Must be development or deployment.
at
org.apache.wicket.protocol.http.WebApplication.getConfigurationType(WebApplication.java:670)
at org.apache.wicket.Application.configure(Application.java:297)
at
org.apache.wicket.protocol.http.WebApplication.internalInit(WebApplication.java:613)
at org.apache.wicket.Application.initApplication(Application.java:806)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:346)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:286)
at
org.apache.catalina.core.ApplicationFilterConfig.initFilter(ApplicationFilterConfig.java:277)
at
org.apache.catalina.core.ApplicationFilterConfig.getFilter(ApplicationFilterConfig.java:258)
/quote
The plugin configuration:
quote
plugin
groupIdorg.apache.tomcat.maven/groupId
artifactIdtomcat7-maven-plugin/artifactId
version2.0-beta-1/version
configuration
contextPath${project.build.finalName}/contextPath
tomcatWebXml${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml/tomcatWebXml
/configuration
/plugin
/quote
I have the jetty plugin setup as well and working, so I would try with tomcat
but without success until now.
Regards
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-128) The plugin ignores and/or parses web.xml incorrectally when using tomcatWebXml option
[ https://issues.apache.org/jira/browse/MTOMCAT-128?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13567806#comment-13567806 ] Gilberto C Andrade commented on MTOMCAT-128: gilberto.andrade@A37710:~/dev/netbeans-config/reca$ mvn clean tomcat7:run -U [INFO] Scanning for projects... Downloading: http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/maven-metadata.xml [WARNING] Checksum validation failed, expected !DOCTYPE but is 991a6c7b11f614906b14932cd6da49132ff2d5fa for http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/maven-metadata.xml [WARNING] Checksum validation failed, expected !DOCTYPE but is 991a6c7b11f614906b14932cd6da49132ff2d5fa for http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/maven-metadata.xml Downloaded: http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/maven-metadata.xml (408 B at 0.3 KB/sec) [WARNING] The metadata /home/gilberto.andrade/.m2/repository/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/maven-metadata-apache.snapshots.xml is invalid: end tag name /body must match start tag name hr from line 7 (position: TEXT seen .../address\n/body... @9:8) Downloading: http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/maven-metadata.xml [WARNING] Checksum validation failed, expected !DOCTYPE but is 991a6c7b11f614906b14932cd6da49132ff2d5fa for http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/maven-metadata.xml [WARNING] Checksum validation failed, expected !DOCTYPE but is 991a6c7b11f614906b14932cd6da49132ff2d5fa for http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/maven-metadata.xml Downloaded: http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/maven-metadata.xml (408 B at 0.4 KB/sec) [WARNING] The metadata /home/gilberto.andrade/.m2/repository/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/maven-metadata-apache.snapshots.xml is invalid: end tag name /body must match start tag name hr from line 7 (position: TEXT seen .../address\n/body... @9:8) [WARNING] The POM for org.apache.tomcat.maven:tomcat7-maven-plugin:jar:2.1-SNAPSHOT is invalid, transitive dependencies (if any) will not be available, enable debug logging for more details [WARNING] Failed to retrieve plugin descriptor for org.apache.tomcat.maven:tomcat7-maven-plugin:2.1-SNAPSHOT: Failed to parse plugin descriptor for org.apache.tomcat.maven:tomcat7-maven-plugin:2.1-SNAPSHOT (/home/gilberto.andrade/.m2/repository/org/apache/tomcat/maven/tomcat7-maven-plugin/2.1-SNAPSHOT/tomcat7-maven-plugin-2.1-SNAPSHOT.jar): error in opening zip file Downloading: http://repository.apache.org/content/repositories/snapshots/org/sonatype/plugins/maven-metadata.xml Downloading: http://repository.apache.org/content/repositories/snapshots/com/ning/maven/plugins/maven-metadata.xml Downloading: http://10.121.0.20/nexus/content/groups/public/org/sonatype/plugins/maven-metadata.xml Downloading: http://10.121.0.20/nexus/content/groups/public/com/ning/maven/plugins/maven-metadata.xml [WARNING] Checksum validation failed, expected !DOCTYPE but is 42b6a1762e310b461c052c6f0485e27ee726cafc for http://repository.apache.org/content/repositories/snapshots/org/sonatype/plugins/maven-metadata.xml [WARNING] Checksum validation failed, expected !DOCTYPE but is 8e05b41e2e84155240f72e1a29f0dcab2d655b31 for http://repository.apache.org/content/repositories/snapshots/com/ning/maven/plugins/maven-metadata.xml [WARNING] Checksum validation failed, expected !DOCTYPE but is 42b6a1762e310b461c052c6f0485e27ee726cafc for http://repository.apache.org/content/repositories/snapshots/org/sonatype/plugins/maven-metadata.xml Downloaded: http://repository.apache.org/content/repositories/snapshots/org/sonatype/plugins/maven-metadata.xml (371 B at 0.4 KB/sec) Downloading: http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/maven-metadata.xml [WARNING] Checksum validation failed, expected !DOCTYPE but is 8e05b41e2e84155240f72e1a29f0dcab2d655b31 for http://repository.apache.org/content/repositories/snapshots/com/ning/maven/plugins/maven-metadata.xml Downloaded: http://repository.apache.org/content/repositories/snapshots/com/ning/maven/plugins/maven-metadata.xml (373 B at 0.3 KB/sec) Downloading: http://10.121.0.20/nexus/content/groups/public/org/apache/tomcat/maven/maven-metadata.xml [WARNING] Checksum validation failed, expected !DOCTYPE but is
Re: [VOTE] Release Apache Tomcat Native 1.1.26
On Mon, 2013-01-28 at 12:33 +0100, Rainer Jung wrote: On 25.01.2013 17:01, jean-frederic clere wrote: Version 1.1.26 is bug fixing release. The proposed release artefacts can be found at [1], and the build was done using tag [2]. The VOTE will remain open for at least 48 hours. The Apache Tomcat Native 1.1.26 is [X] Stable, go ahead and release [ ] Broken because of ... +1 to release +1 as well. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1441152 - in /tomcat/trunk/java/org/apache/tomcat/websocket: WsRemoteEndpointBase.java WsRemoteEndpointClient.java server/WsRemoteEndpointServer.java
Author: markt
Date: Thu Jan 31 19:25:07 2013
New Revision: 1441152
URL: http://svn.apache.org/viewvc?rev=1441152view=rev
Log:
Rename and expand the header buffer to make it an output buffer prior to
implementing masking and batching
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java?rev=1441152r1=1441151r2=1441152view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java Thu
Jan 31 19:25:07 2013
@@ -44,16 +44,15 @@ public abstract class WsRemoteEndpointBa
private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
-// TODO Make the size of this conversion buffer configurable
-private final ByteBuffer toBytes = ByteBuffer.allocate(8192);
-private final AtomicBoolean toBytesInProgress = new AtomicBoolean(false);
+// TODO Make the size of these buffers configurable
+private final ByteBuffer intermediateBuffer = ByteBuffer.allocate(8192);
+protected final ByteBuffer outputBuffer = ByteBuffer.allocate(8192);
+private final AtomicBoolean charToByteInProgress = new
AtomicBoolean(false);
private final CharsetEncoder encoder =
Charset.forName(UTF8).newEncoder();
private final MessageSendStateMachine state = new
MessageSendStateMachine();
private volatile long asyncSendTimeout = -1;
-// Max length for WebSocket frame header is 14 bytes
-protected final ByteBuffer header = ByteBuffer.allocate(14);
protected ByteBuffer payload = null;
@@ -108,27 +107,29 @@ public abstract class WsRemoteEndpointBa
// The toBytes buffer needs to be protected from multiple threads and
// the state check happens to late.
-if (!toBytesInProgress.compareAndSet(false, true)) {
+if (!charToByteInProgress.compareAndSet(false, true)) {
throw new IllegalStateException(sm.getString(
wsRemoteEndpoint.concurrentMessageSend));
}
try {
encoder.reset();
-toBytes.clear();
+intermediateBuffer.clear();
CharBuffer cb = CharBuffer.wrap(fragment);
-CoderResult cr = encoder.encode(cb, toBytes, true);
-toBytes.flip();
+CoderResult cr = encoder.encode(cb, intermediateBuffer, true);
+intermediateBuffer.flip();
while (cr.isOverflow()) {
-sendMessageBlocking(Constants.OPCODE_TEXT, toBytes, false);
-toBytes.clear();
-cr = encoder.encode(cb, toBytes, true);
-toBytes.flip();
+sendMessageBlocking(
+Constants.OPCODE_TEXT, intermediateBuffer, false);
+intermediateBuffer.clear();
+cr = encoder.encode(cb, intermediateBuffer, true);
+intermediateBuffer.flip();
}
-sendMessageBlocking(Constants.OPCODE_TEXT, toBytes, isLast);
+sendMessageBlocking(
+Constants.OPCODE_TEXT, intermediateBuffer, isLast);
} finally {
// Make sure flag is reset before method exists
-toBytesInProgress.set(false);
+charToByteInProgress.set(false);
}
}
@@ -206,7 +207,7 @@ public abstract class WsRemoteEndpointBa
boolean isFirst = state.startMessage(opCode, isLast);
-header.clear();
+outputBuffer.clear();
byte first = 0;
if (isLast) {
@@ -220,37 +221,37 @@ public abstract class WsRemoteEndpointBa
}
// If not the first fragment, it is a continuation with opCode of zero
-header.put(first);
+outputBuffer.put(first);
byte masked = getMasked();
// Next write the mask length length
if (payload.limit() 126) {
-header.put((byte) (payload.limit() | masked));
+outputBuffer.put((byte) (payload.limit() | masked));
} else if (payload.limit() 65536) {
-header.put((byte) (126 | masked));
-header.put((byte) (payload.limit() 8));
-header.put((byte) (payload.limit() 0xFF));
+outputBuffer.put((byte) (126 | masked));
+outputBuffer.put((byte) (payload.limit() 8));
+outputBuffer.put((byte) (payload.limit() 0xFF));
} else {
// Will never be more than 2^31-1
-header.put((byte) (127 | masked));
-
[jira] [Commented] (MTOMCAT-128) The plugin ignores and/or parses web.xml incorrectally when using tomcatWebXml option
[
https://issues.apache.org/jira/browse/MTOMCAT-128?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13568039#comment-13568039
]
Olivier Lamy (*$^¨%`£) commented on MTOMCAT-128:
Please use https://repository.apache.org/content/repositories/snapshots (note
it's httpS ) as maven 3.0.3 can have issues with following redirect and/or
upgrade to maven 3.0.4
The plugin ignores and/or parses web.xml incorrectally when using
tomcatWebXml option
-
Key: MTOMCAT-128
URL: https://issues.apache.org/jira/browse/MTOMCAT-128
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat6, tomcat7
Affects Versions: 2.0-beta-1
Environment: openSUSE 12.1 32Bits
Reporter: Gilberto C Andrade
Assignee: Olivier Lamy (*$^¨%`£)
Priority: Trivial
Fix For: 2.1
In our project(jpa-spring-wicket) we need to filter the web.xml file,
changing some placeholder and putting it (the web.xml) in
${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml.
Using tomcat6-maven-plugin it find the correct file, but fail when parsing it:
quote
Caused by: java.lang.IllegalArgumentException: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.catalina.core.StandardContext.addParameter(StandardContext.java:2661)
... 52 more
Mar 16, 2012 11:49:12 AM org.apache.catalina.startup.ContextConfig
applicationWebConfig
SEVERE: Parse error in application web.xml file at
jndi:/localhost/a2p/WEB-INF/web.xml
org.xml.sax.SAXParseException; systemId: jndi:/localhost/a2p/WEB-INF/web.xml;
lineNumber: 15; columnNumber: 21; Error at (15, 21: Duplicate context
initialization parameter contextConfigLocation
at
org.apache.tomcat.util.digester.Digester.createSAXException(Digester.java:2806)
/quote
Using tomcat7-maven-plugin it find the correct file, but ignores it so using
the original file which contain the ${placeholder}. Thus not initializing the
application:
quote
INFO - ContextLoader - Root WebApplicationContext:
initialization completed in 7808 ms
INFO - WebXmlFile - web.xml: url mapping found for filter
with name A2P: [/*]
Mar 16, 2012 12:08:16 PM org.apache.catalina.core.StandardContext filterStart
SEVERE: Exception starting filter A2P
java.lang.IllegalArgumentException: Invalid configuration type:
'${wicket.MODE}'. Must be development or deployment.
at
org.apache.wicket.protocol.http.WebApplication.getConfigurationType(WebApplication.java:670)
at org.apache.wicket.Application.configure(Application.java:297)
at
org.apache.wicket.protocol.http.WebApplication.internalInit(WebApplication.java:613)
at org.apache.wicket.Application.initApplication(Application.java:806)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:346)
at
org.apache.wicket.protocol.http.WicketFilter.init(WicketFilter.java:286)
at
org.apache.catalina.core.ApplicationFilterConfig.initFilter(ApplicationFilterConfig.java:277)
at
org.apache.catalina.core.ApplicationFilterConfig.getFilter(ApplicationFilterConfig.java:258)
/quote
The plugin configuration:
quote
plugin
groupIdorg.apache.tomcat.maven/groupId
artifactIdtomcat7-maven-plugin/artifactId
version2.0-beta-1/version
configuration
contextPath${project.build.finalName}/contextPath
tomcatWebXml${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml/tomcatWebXml
/configuration
/plugin
/quote
I have the jetty plugin setup as well and working, so I would try with tomcat
but without success until now.
Regards
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] New Tomcat committer: Violeta Georgieva (violetagg)
2013/1/31 Mark Thomas ma...@apache.org: On behalf of the Tomcat committers I am pleased to announce that Violeta Georgieva (violetagg) has been voted in as a new Tomcat committer. Welcome! Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1441183 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Thu Jan 31 20:45:00 2013 New Revision: 1441183 URL: http://svn.apache.org/viewvc?rev=1441183view=rev Log: ecj 4.2.1 is now in central repository Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1441183r1=1441182r2=1441183view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Thu Jan 31 20:45:00 2013 @@ -270,7 +270,7 @@ dependency groupIdorg.eclipse.jdt.core.compiler/groupId artifactIdecj/artifactId -version3.7.1/version +version4.2.1/version /dependency dependency - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 50604] Incorrect dependency in jasper.pom for eclipse ecj
https://issues.apache.org/bugzilla/show_bug.cgi?id=50604 --- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com --- The ecj 4.2.1 bundle has been uploaded to Maven Central by Ralph Schaer Details: http://markmail.org/message/cb4jfopm4hbtq6dz Many thanks to him. -- 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: r1440926 - in /tomcat/trunk: java/javax/websocket/ java/org/apache/tomcat/websocket/ test/javax/websocket/ test/org/apache/tomcat/websocket/
2013/1/31 ma...@apache.org:
Author: markt
Date: Thu Jan 31 12:15:23 2013
New Revision: 1440926
URL: http://svn.apache.org/viewvc?rev=1440926view=rev
Log:
Update WebSocket API to latest EG version (between v011 and v012)
Removed:
tomcat/trunk/test/javax/websocket/
Modified:
tomcat/trunk/java/javax/websocket/ClientEndpointConfiguration.java
tomcat/trunk/java/javax/websocket/ContainerProvider.java
tomcat/trunk/java/javax/websocket/DefaultClientConfiguration.java
tomcat/trunk/java/javax/websocket/Extension.java
tomcat/trunk/java/javax/websocket/RemoteEndpoint.java
tomcat/trunk/java/javax/websocket/Session.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified: tomcat/trunk/java/javax/websocket/RemoteEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/RemoteEndpoint.java?rev=1440926r1=1440925r2=1440926view=diff
==
--- tomcat/trunk/java/javax/websocket/RemoteEndpoint.java (original)
+++ tomcat/trunk/java/javax/websocket/RemoteEndpoint.java Thu Jan 31 12:15:23
2013
@@ -80,8 +80,8 @@ public interface RemoteEndpoint {
void sendObjectByCompletion(Object obj, SendHandler completion);
-void sendPing(ByteBuffer applicationData) throws IOException;
+void sendPing(ByteBuffer applicationData) throws IOException,
IllegalArgumentException;
-void sendPong(ByteBuffer applicationData) throws IOException;
+void sendPong(ByteBuffer applicationData) throws IOException,
IllegalArgumentException;
It is unusual to add a runtime exception to the official API. Usually
they are just documented.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] New Tomcat committer: Violeta Georgieva (violetagg)
On 31.01.2013 21:43, Konstantin Kolinko wrote: 2013/1/31 Mark Thomas ma...@apache.org: On behalf of the Tomcat committers I am pleased to announce that Violeta Georgieva (violetagg) has been voted in as a new Tomcat committer. Welcome! ... and keep up the good work! Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] New Tomcat committer: Violeta Georgieva (violetagg)
Violeta, On 1/31/13 11:22 AM, Mark Thomas wrote: On behalf of the Tomcat committers I am pleased to announce that Violeta Georgieva (violetagg) has been voted in as a new Tomcat committer. Please join me in welcoming her. Welcome! Great work on your recent patches. I would have voted for you if I could have... I'm not on the PMC :( -chris signature.asc Description: OpenPGP digital signature
[Bug 54513] New: NullPointerException in AprEndpoint$Poller.run
https://issues.apache.org/bugzilla/show_bug.cgi?id=54513
Bug ID: 54513
Summary: NullPointerException in AprEndpoint$Poller.run
Product: Tomcat 8
Version: trunk
Hardware: PC
OS: Windows XP
Status: NEW
Severity: normal
Priority: P2
Component: Connectors
Assignee: dev@tomcat.apache.org
Reporter: knst.koli...@gmail.com
Classification: Unclassified
Trunk at r1441188, running the test suite with APR connector, Native 1.1.26
Windows 32-bit with JDK 7u11.
I encountered the following when running
org.apache.catalina.loader.TestVirtualContext test
On second re-run of the test the same issue happened, so it is as if there is
something specific here. I have not encountered the issue with the rest of
testsuite yet.
[[[
Feb 01, 2013 2:07:26 AM org.apache.tomcat.util.net.AprEndpoint$Poller run
WARNING: Unexpected poller error
java.lang.NullPointerException
at
org.apache.tomcat.util.net.AprEndpoint$AprSocketWrapper.access$200(AprEndpoint.java:2198)
at org.apache.tomcat.util.net.AprEndpoint$Poller.run(AprEndpoint.java:1632)
at java.lang.Thread.run(Thread.java:722)
]]]
The code at AprEndpoint$Poller.run(AprEndpoint.java:1632) is
1628 for (int n = 0; n rv; n++) {
1629 timeouts.remove(desc[n*2+1]);
1630 AprSocketWrapper wrapper = connections.get(
1631 Long.valueOf(desc[n*2+1]));
1632 wrapper.pollerFlags = wrapper.pollerFlags ~((int) desc[n*2]);
I suspect that wrapper is null here.
The above code is specific to Tomcat trunk and is not present in 7.0.x.
When this happened, the test hung for 15 minutes (1000 secs) waiting on a
socket read. When time out passed, it continued to run all the other tests.
[[[
Testcase: testAdditionalWebInfClassesPaths took 1 006,735 sec
Caused an ERROR
Read timed out
java.net.SocketTimeoutException: Read timed out
at java.net.SocketInputStream.socketRead0(Native Method)
at java.net.SocketInputStream.read(SocketInputStream.java:150)
at java.net.SocketInputStream.read(SocketInputStream.java:121)
at java.io.BufferedInputStream.fill(BufferedInputStream.java:235)
at java.io.BufferedInputStream.read1(BufferedInputStream.java:275)
at java.io.BufferedInputStream.read(BufferedInputStream.java:334)
at sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:633)
at sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:579)
at
sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1322)
at java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:468)
at
org.apache.catalina.startup.TomcatBaseTest.methodUrl(TomcatBaseTest.java:247)
at
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:219)
at
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:213)
at
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:202)
at
org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:326)
at
org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:320)
at
org.apache.catalina.loader.TestVirtualContext.testAdditionalWebInfClassesPaths(TestVirtualContext.java:311)
]]]
--
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 54513] NullPointerException in AprEndpoint$Poller.run
https://issues.apache.org/bugzilla/show_bug.cgi?id=54513 --- Comment #1 from Konstantin Kolinko knst.koli...@gmail.com --- Created attachment 29911 -- https://issues.apache.org/bugzilla/attachment.cgi?id=29911action=edit TEST-org.apache.catalina.loader.TestVirtualContext.APR.txt JUnit test result 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 54513] NullPointerException in AprEndpoint$Poller.run
https://issues.apache.org/bugzilla/show_bug.cgi?id=54513 --- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com --- Created attachment 29912 -- https://issues.apache.org/bugzilla/attachment.cgi?id=29912action=edit thread_dump_2013-02-01.txt Thread dump, taken with jvisualvm during the 15-minutes pause -- 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: [ANN] New Tomcat committer: Violeta Georgieva (violetagg)
On behalf of the Tomcat committers I am pleased to announce that Violeta Georgieva (violetagg) has been voted in as a new Tomcat committer. Welcome, Violeta! -- Keiichi.Fujino - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.1.26
2013/1/25 jean-frederic clere jfcl...@gmail.com: Version 1.1.26 is bug fixing release. The proposed release artefacts can be found at [1], and the build was done using tag [2]. The VOTE will remain open for at least 48 hours. The Apache Tomcat Native 1.1.26 is [x] Stable, go ahead and release [ ] Broken because of ... Tested 32-bit version on WinXP, a) Tomcat 7.0.x testsuite + JDK 6u38 b) Tomcat trunk testsuite + JDK 7u11. Tomcat 7.0 : all OK Tomcat trunk: failing tests: (1) TEST-org.apache.catalina.loader.TestVirtualContext.APR.txt (2) TEST-org.apache.tomcat.websocket.TestWsWebSocketContainer.APR.txt (1) - filed https://issues.apache.org/bugzilla/show_bug.cgi?id=54513 The issue is reproducible, I had it in 4 re-runs of this test in a row. (2): failing tests: testTimeoutServerContainer testTimeoutServerEndpoint testSmallBinaryBufferClientTextMessage testSmallBinaryBufferServerTextMessage Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54513] NullPointerException in AprEndpoint$Poller.run
https://issues.apache.org/bugzilla/show_bug.cgi?id=54513 --- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com --- I suspect that wrapper is null here. Yes, it is null. I added the following code at line 1632: [[[ if (wrapper==null) throw new NullPointerException(wrapper is null, n: + n + , rv: +rv+, desc[n*2+1]: + desc[n*2+1]); ]]] It results in the following on console: [junit] WARNING: Unexpected poller error [junit] java.lang.NullPointerException: wrapper is null, n: 0, rv: 1, desc[n*2+1]: 52898296 [junit] at org.apache.tomcat.util.net.AprEndpoint$Poller.run(AprEndpoint.java:1632) [junit] at java.lang.Thread.run(Thread.java:722) -- 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 54513] NullPointerException in AprEndpoint$Poller.run
https://issues.apache.org/bugzilla/show_bug.cgi?id=54513 --- Comment #4 from Konstantin Kolinko knst.koli...@gmail.com --- Reproduced this issue with Native 1.1.24, but a bit different. I was not able to reproduce the NPE, but SocketInputStream.socketRead0 in the test hung in the same way. There were two variants: a) no error message is printed b) Feb 01, 2013 H:MM:SS AM org.apache.tomcat.util.net.AprEndpoint$Poller run WARNING: Error processing socket timeout There were a pair of runs with 1.1.26 and with 1.1.24 when the issue did not reproduce. thread_dump_2013-02-01.txt (14.90 KB, text/plain) What is odd in the thread dump is that there are two threads: http-apr-127.0.0.1-auto-2-Poller http-apr-127.0.0.1-auto-1-Poller All other threads besides this poller one are auto-2. It is the second test, but the poller thread from the first test has not stopped. -- 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
[Tomcat Wiki] Update of FAQ/Deployment by KonstantinKolinko
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The FAQ/Deployment page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/FAQ/Deployment?action=diffrev1=8rev2=9
Comment:
Update for Tomcat 7
== Answers ==
Anchor(Q1)'''Why does tomcat 5 create context configuration files?'''
+ ''Tomcat 5'', ''Tomcat 6'':
+
- Unlike tomcat 4.x, tomcat 5.x creates context configuration files for you in
its conf/[Engine name]/[Host name] directory. This is part of the change in
tomcat's configuration mechanism from version 4.x to make overall configuration
more robust, flexible, and enterprise-friendly. Note, however, that this has
changed the recommended deployment practices for web applications. These
context configuration files are created by tomcat, but not removed by tomcat,
because the user may have changed them or other files in the conf directory.
The suggested practice for tomcat 5 is to place context configuration files in
the META-INF/context.xml directory of your webapp, and use Tomcat's Manager
webapp to deploy/undeploy your applications. More details can be found here:
[[http://marc.info/?l=tomcat-userm=107590945807699w=2|MARC Archive]]
+ Unlike tomcat 4.x, tomcat 5.x creates context configuration files for you in
its `conf/[Engine name]/[Host name]` directory. This is part of the change in
tomcat's configuration mechanism from version 4.x to make overall configuration
more robust, flexible, and enterprise-friendly. Note, however, that this has
changed the recommended deployment practices for web applications. These
context configuration files are created by tomcat, but not removed by tomcat,
because the user may have changed them or other files in the conf directory.
The suggested practice for tomcat 5 is to place context configuration files as
`META-INF/context.xml` in your webapp, and use Tomcat's Manager webapp to
deploy/undeploy your applications. More details can be found here:
[[http://marc.info/?l=tomcat-userm=107590945807699w=2|MARC Archive]]
+
+ ''Tomcat 7'':
+
+ In Tomcat 7 the default behaviour has been changed to do not auto-create
those context configuration files.
+
+ The recommended practice of using `META-INF/context.xml` files is still the
same. Those files are discovered and processed in the same way. The difference
is that they are not copied to the `conf/[Engine name]/[Host name]` directory.
+
+ This is convenient, as you do not need to care of those copied files when
undeploying your application, and you do not need to care whether the `conf`
directory is writeable.
+ This change in behaviour is documented in the
[[http://tomcat.apache.org/migration-7.html|Migration Guide]].
Anchor(Q2)'''Why does the memory usage increase when I redeploy a web
application?'''
- Because the Classloader (and the Class objects it loaded) cannot be recycled.
They are stored in the permanent heap generation by the JVM, and when you
redepoy a new class loader is created, which loads another copy of all these
classes. This can cause {{{OufOfMemoryErrors}}} eventually.
+ Because the Classloader (and the Class objects it loaded) cannot be recycled.
They are stored in the permanent heap generation by the JVM, and when you
redeploy a new class loader is created, which loads another copy of all these
classes. This can cause {{{OufOfMemoryErrors}}} eventually.
[[CategoryFAQ|CategoryFAQ]]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of FAQ/Deployment by KonstantinKolinko
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The FAQ/Deployment page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/FAQ/Deployment?action=diffrev1=9rev2=10
Comment:
More details on PermGen leaks
Anchor(Q2)'''Why does the memory usage increase when I redeploy a web
application?'''
+ That is because your web application has a memory leak.
+
- Because the Classloader (and the Class objects it loaded) cannot be recycled.
They are stored in the permanent heap generation by the JVM, and when you
redeploy a new class loader is created, which loads another copy of all these
classes. This can cause {{{OufOfMemoryErrors}}} eventually.
+ A common issue are !PermGen memory leaks. They happen because the
Classloader (and the Class objects it loaded) cannot be recycled unless some
requirements are met (*). They are stored in the permanent heap generation by
the JVM, and when you redeploy a new class loader is created, which loads
another copy of all these classes. This can cause {{{OufOfMemoryErrors}}}
eventually.
+
+ (*) The requirement is that all classes loaded by this classloader should be
able to be gc'ed at the same time.
+
+ Starting with Tomcat 6.0.25 there is a tool in the Manager webapp to help
diagnose such misbehaving applications. See [[FAQ/Memory]] and
[[MemoryLeakProtection]].
- [[CategoryFAQ|CategoryFAQ]]
+ [[CategoryFAQ]]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of FAQ/Developing by KonstantinKolinko
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The FAQ/Developing page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/FAQ/Developing?action=diffrev1=16rev2=17
Comment:
Improve formatting (indent)
}}}
There are a number of ways you can do this depending on how you normally
start Tomcat:
- * If you are using '''shell scripts''' to start Tomcat, start it with the
following command:
- {{{
- catalina jpda start
- }}}
- It will start Tomcat so that a remote debugger can be connected to port 8000.
+ * If you are using '''shell scripts''' to start Tomcat, start it with the
following command:
- The above mentioned options can be provided by setting certain environment
variables. See the comments at the top of {{{catalina.sh}}} or {{{.bat}}} file
for details.
+ {{{
+ catalina jpda start
+ }}}
- For example, the port number and JPDA transport implementation can be set
with {{{JPDA_ADDRESS=8000}}} and {{{JPDA_TRANSPORT=dt_socket}}}.
+ It will start Tomcat so that a remote debugger can be connected to port 8000.
+ The above mentioned options can be provided by setting certain environment
variables. See the comments at the top of {{{catalina.sh}}} or {{{.bat}}} file
for details.
+
+ For example, the port number and JPDA transport implementation can be set
with {{{JPDA_ADDRESS=8000}}} and {{{JPDA_TRANSPORT=dt_socket}}}.
+
- * If you run Tomcat using '''service wrapper''', add the above JVM
options before any other JVM options. Check the documentation for the service
wrapper to determine how to set JVM options.
+ * If you run Tomcat using '''service wrapper''', add the above JVM options
before any other JVM options. Check the documentation for the service wrapper
to determine how to set JVM options.
+
- * If you start Tomcat from within an IDE, check the documentation for the
IDE to determine how to set the required JVM options.
+ * If you start Tomcat from within an IDE, check the documentation for the
IDE to determine how to set the required JVM options.
The port does not need to be set to 8000, it may be any value appropriate for
your system.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of FAQ/KnownIssues by KonstantinKolinko
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The FAQ/KnownIssues page has been changed by KonstantinKolinko: http://wiki.apache.org/tomcat/FAQ/KnownIssues?action=diffrev1=10rev2=11 Comment: Remove obsolete Tomcat 5.5 links. * The currently open bugs and enhancement requests in Bugzilla * [[https://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;bug_status=NEEDINFO;product=Tomcat%207|Open Tomcat 7 bugs]] * [[https://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;bug_status=NEEDINFO;product=Tomcat%206|Open Tomcat 6 bugs]] -* [[https://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;bug_status=NEEDINFO;product=Tomcat%205|Open Tomcat 5 bugs]] * The latest (from svn) change log entries for all newer versions * [[http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml| Tomcat 8 change log]] * [[http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml| Tomcat 7 change log]] * [[http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml| Tomcat 6 change log]] -* [[http://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml| Tomcat 5 change log]] + log]] Anchor(OracleJREIssues) === What are the known issues with the Oracle JRE? === - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of FAQ/KnownIssues by KonstantinKolinko
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The FAQ/KnownIssues page has been changed by KonstantinKolinko: http://wiki.apache.org/tomcat/FAQ/KnownIssues?action=diffrev1=11rev2=12 Comment: Typo * [[http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml| Tomcat 8 change log]] * [[http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml| Tomcat 7 change log]] * [[http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml| Tomcat 6 change log]] - log]] Anchor(OracleJREIssues) === What are the known issues with the Oracle JRE? === - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
