svn commit: r1430741 - in /tomcat/tc6.0.x/trunk: ./ RUNNING.txt
Author: kkolinko Date: Wed Jan 9 09:15:01 2013 New Revision: 1430741 URL: http://svn.apache.org/viewvc?rev=1430741view=rev Log: CTR: docs Review the section on setting the environment variables. It is a merge of r1430481 from tomcat/trunk Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/RUNNING.txt Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1430481 Modified: tomcat/tc6.0.x/trunk/RUNNING.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/RUNNING.txt?rev=1430741r1=1430740r2=1430741view=diff == --- tomcat/tc6.0.x/trunk/RUNNING.txt (original) +++ tomcat/tc6.0.x/trunk/RUNNING.txt Wed Jan 9 09:15:01 2013 @@ -75,34 +75,41 @@ to prepare the command that starts Tomca (3.1) Set CATALINA_HOME (required) and CATALINA_BASE (optional) -The CATALINA_HOME and CATALINA_BASE environment variables are used to -specify the location of Apache Tomcat and the location of its active -configuration, respectively. - -The CATALINA_HOME environment variable should be set as defined in (2.2) -above. The Tomcat startup scripts have some logic to set this variable -automatically if it is absent (based on the location of the script in -Unixes and on the current directory in Windows), but this logic might not work -in all circumstances. - -The CATALINA_BASE environment variable is optional and is further described -in the Multiple Tomcat Instances section below. If it is absent, it defaults -to be equal to CATALINA_HOME. +The CATALINA_HOME environment variable should be set to the location of the +root directory of the binary distribution of Tomcat. + +An example was given in (2.2) above. + +The Tomcat startup scripts have some logic to set this variable +automatically if it is absent, based on the location of the startup script +in *nix and on the current directory in Windows. That logic might not work +in all circumstances, so setting the variable explicitly is recommended. + +The CATALINA_BASE environment variable specifies location of the root +directory of the active configuration of Tomcat. It is optional. It +defaults to be equal to CATALINA_HOME. + +Using distinct values for the CATALINA_HOME and CATALINA_BASE variables is +recommended to simplify further upgrades and maintenance. It is documented +in the Multiple Tomcat Instances section below. (3.2) Set JRE_HOME or JAVA_HOME (required) -The JRE_HOME variable is used to specify location of a JRE that is used to -start Tomcat. +These variables are used to specify location of a Java Runtime +Environment or of a Java Development Kit that is used to start Tomcat. -The JAVA_HOME variable is used to specify location of a JDK. It is used instead -of JRE_HOME. +The JRE_HOME variable is used to specify location of a JRE. The JAVA_HOME +variable is used to specify location of a JDK. Using JAVA_HOME provides access to certain additional startup options that are not allowed when JRE_HOME is used. If both JRE_HOME and JAVA_HOME are specified, JRE_HOME is used. +The recommended place to specify these variables is a setenv script. See +below. + (3.3) Other variables (optional) @@ -123,32 +130,31 @@ A similar variable is JAVA_OPTS. It is u specification of options that are used both to start and to stop Tomcat as well as for other commands. -Do not use JAVA_OPTS to specify memory limits. You do not need much memory -for a small process that is used to stop Tomcat. Those settings belong to -CATALINA_OPTS. - -Another frequently used variable is CATALINA_PID (on *nix platforms only). It -specifies the location of the file where process id of the forked Tomcat java -process will be written. This setting is optional. It will enable the +Note: Do not use JAVA_OPTS to specify memory limits. You do not need much +memory for a small process that is used to stop Tomcat. Those settings +belong to CATALINA_OPTS. + +Another frequently used variable is CATALINA_PID (on *nix only). It +specifies the location of the file where process id of the forked Tomcat +java process will be written. This setting is optional. It will enable the following features: - - better protection against duplicate start attempts and - - allows forceful termination of Tomcat process when it does not react to - the standard shutdown command. + * better protection against duplicate start attempts and + * allows forceful termination of Tomcat process when it does not react to +the standard shutdown command. -(3.4) setenv script (optional) +(3.4) Using the setenv script (optional, recommended) Apart from CATALINA_HOME and CATALINA_BASE, all environment variables can -be specified in the setenv script. - -The script is named setenv.bat (Windows) or setenv.sh (*nix). It can be -placed either into CATALINA_BASE/bin or into CATALINA_HOME/bin. The file -has to be readable. - -By
Re: svn commit: r1429864 - /tomcat/trunk/build.xml
2013/1/7 ma...@apache.org:
Author: markt
Date: Mon Jan 7 16:01:01 2013
New Revision: 1429864
URL: http://svn.apache.org/viewvc?rev=1429864view=rev
Log:
Build the missing jni and spdy source JARs
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1429864r1=1429863r2=1429864view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jan 7 16:01:01 2013
@@ -120,6 +120,8 @@
property name=catalina-tribes-src.jar
value=${tomcat.src.jars}/catalina-tribes-src.jar/
property name=catalina-ha-src.jar
value=${tomcat.src.jars}/catalina-ha-src.jar/
property name=catalina-ant-src.jar
value=${tomcat.src.jars}/catalina-ant-src.jar/
+ property name=tomcat-jni-src.jar
value=${tomcat.src.jars}/tomcat-jni-src.jar/
+ property name=tomcat-spdy-src.jar
value=${tomcat.src.jars}/tomcat-spdy-src.jar/
property name=tomcat-coyote-src.jar
value=${tomcat.src.jars}/tomcat-coyote-src.jar/
property name=tomcat-api-src.jar
value=${tomcat.src.jars}/tomcat-api-src.jar/
property name=tomcat-util-src.jar
value=${tomcat.src.jars}/tomcat-util-src.jar/
@@ -897,7 +899,7 @@
/xslt
/target
- target name=deploy depends=package,build-docs
+ target name=deploy depends=package,build-docs,build-tomcat-jdbc
description=Default. Builds a working Tomcat instance
copy tofile=${tomcat.build}/bin/tomcat-native.tar.gz
@@ -987,7 +989,9 @@
copy file=${tomcat-dbcp.jar} todir=${tomcat.build}/lib
failonerror=false/
copy file=${jdt.jar} todir=${tomcat.build}/lib /
+ /target
+ target name=build-tomcat-jdbc depends=package
!-- build the jdbc-pool jar and source jar--
echo message=Building Tomcat JDBC pool libraries/
ant antfile=${tomcat.jdbc.dir}/build.xml dir=${tomcat.jdbc.dir}
inheritall=false target=build
@@ -2239,7 +2243,7 @@ Apache Tomcat ${version} native binaries
/target
!-- Packages the source code in JARs to match the binary JARs --
- target name=package-src-jar depends=build-manifests
+ target name=package-src-jar depends=build-manifests,build-tomcat-jdbc
I wonder why package-src-jar has to depend on this new
build-tomcat-jdbc target.
If you care about copying the jdbc-pool.xml file, that action is
performed by compile-prepare.
For example, the validate target depends on compile-prepare, as
Checkstyle has to see the current copy jdbc-pool.xml file instead of
a stale one.
Best regards,
Konstantin Kolinko
mkdir dir=${tomcat.src.jars} /
@@ -2330,6 +2334,16 @@ Apache Tomcat ${version} native binaries
notice=${tomcat.manifests}/tomcat-coyote.jar.notice
license=${tomcat.manifests}/tomcat-coyote.license /
+!-- SPDY --
+jarIt jarfile=${tomcat-spdy-src.jar}
+ filesDir=java
+ filesId=files.tomcat-spdy /
+
+!-- JNI --
+jarIt jarfile=${tomcat-jni-src.jar}
+ filesDir=java
+ filesId=files.tomcat-jni /
+
!-- Jasper Implementation JAR File --
jarIt jarfile=${jasper-src.jar}
filesDir=java
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54386] [FR] Jar's static content extraction for CDN from (JSR315-§10.10)
https://issues.apache.org/bugzilla/show_bug.cgi?id=54386 --- Comment #7 from Peter Rader p.ra...@gmx.net --- You got me, i am working in a madhouse. Well, the classpath:/META-INF/resources/ identifier load the correct resources, as it is result of the current webapp-classloader. This is even better than use ant scripts (indeed pathological). To use an CDN for those static resources ANT must be installed then? Finally i must life with that fact then. Tomcat already have a deployment-process. To calculate what resources the defaultservlet would serve should not be a manual job of a person imo. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430753 - in /tomcat/native/trunk: NOTICE build.xml xdocs/style.xsl
Author: kkolinko
Date: Wed Jan 9 09:59:16 2013
New Revision: 1430753
URL: http://svn.apache.org/viewvc?rev=1430753view=rev
Log:
s/2012/2013/g
Modified:
tomcat/native/trunk/NOTICE
tomcat/native/trunk/build.xml
tomcat/native/trunk/xdocs/style.xsl
Modified: tomcat/native/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/NOTICE?rev=1430753r1=1430752r2=1430753view=diff
==
--- tomcat/native/trunk/NOTICE (original)
+++ tomcat/native/trunk/NOTICE Wed Jan 9 09:59:16 2013
@@ -1,5 +1,5 @@
Apache Tomcat Native Library
-Copyright 2002-2012 The Apache Software Foundation
+Copyright 2002-2013 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/native/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.xml?rev=1430753r1=1430752r2=1430753view=diff
==
--- tomcat/native/trunk/build.xml (original)
+++ tomcat/native/trunk/build.xml Wed Jan 9 09:59:16 2013
@@ -30,7 +30,7 @@
property name=project value=tomcat-native /
property name=name value=Tomcat Native /
property name=title value=Tomcat Native Library/
-property name=year value=2012 /
+property name=year value=2013 /
property name=version.major value=2 /
property name=version.minor value=0 /
property name=version.build value=0 /
@@ -179,7 +179,7 @@
packagenames=org.apache.tomcat.*
windowtitle=${title} (Version ${version})
doctitle=lt;h1gt;${title} (Version ${version})lt;/h1gt;
-bottom=Copyright 2002-2012 The Apache Software Foundation.lt;!--
+bottom=Copyright 2002-2013 The Apache Software Foundation.lt;!--
Licensed under the Apache License, Version 2.0 (the 'License');
you may not use this file except in compliance with the License.
Modified: tomcat/native/trunk/xdocs/style.xsl
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/style.xsl?rev=1430753r1=1430752r2=1430753view=diff
==
--- tomcat/native/trunk/xdocs/style.xsl (original)
+++ tomcat/native/trunk/xdocs/style.xsl Wed Jan 9 09:59:16 2013
@@ -178,7 +178,7 @@
xsl:commentPAGE FOOTER/xsl:comment
trtd colspan=2
div align=centerfont color={$body-link} size=-1em
-Copyright #169; 2008-2012, Apache Software Foundation
+Copyright #169; 2008-2013, Apache Software Foundation
/em/font/div
/td/tr
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430759 - /tomcat/native/branches/1.1.x/NOTICE
Author: kkolinko
Date: Wed Jan 9 10:06:00 2013
New Revision: 1430759
URL: http://svn.apache.org/viewvc?rev=1430759view=rev
Log:
Remove svn:mergeinfo property from the file
(was: /tomcat/native/trunk/NOTICE.txt:r815411 )
Modified:
tomcat/native/branches/1.1.x/NOTICE (props changed)
Propchange: tomcat/native/branches/1.1.x/NOTICE
('svn:mergeinfo' removed)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430763 - in /tomcat/native/branches/1.1.x: ./ NOTICE build.xml xdocs/style.xsl
Author: kkolinko
Date: Wed Jan 9 10:09:56 2013
New Revision: 1430763
URL: http://svn.apache.org/viewvc?rev=1430763view=rev
Log:
s/2012/2013/g
It is a merge of r1430753 from tomcat/native/trunk
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/NOTICE
tomcat/native/branches/1.1.x/build.xml
tomcat/native/branches/1.1.x/xdocs/style.xsl
Propchange: tomcat/native/branches/1.1.x/
--
Merged /tomcat/native/trunk:r1430753
Modified: tomcat/native/branches/1.1.x/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/NOTICE?rev=1430763r1=1430762r2=1430763view=diff
==
--- tomcat/native/branches/1.1.x/NOTICE (original)
+++ tomcat/native/branches/1.1.x/NOTICE Wed Jan 9 10:09:56 2013
@@ -1,5 +1,5 @@
Apache Tomcat Native Library
-Copyright 2002-2012 The Apache Software Foundation
+Copyright 2002-2013 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/native/branches/1.1.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.xml?rev=1430763r1=1430762r2=1430763view=diff
==
--- tomcat/native/branches/1.1.x/build.xml (original)
+++ tomcat/native/branches/1.1.x/build.xml Wed Jan 9 10:09:56 2013
@@ -30,7 +30,7 @@
property name=project value=tomcat-native /
property name=name value=Tomcat Native /
property name=title value=Tomcat Native Library/
-property name=year value=2012 /
+property name=year value=2013 /
property name=version.major value=1 /
property name=version.minor value=1 /
property name=version.build value=23 /
@@ -175,7 +175,7 @@
packagenames=org.apache.tomcat.*
windowtitle=${title} (Version ${version})
doctitle=lt;h1gt;${title} (Version ${version})lt;/h1gt;
-bottom=Copyright 2002-2012 The Apache Software Foundation.lt;!--
+bottom=Copyright 2002-2013 The Apache Software Foundation.lt;!--
Licensed under the Apache License, Version 2.0 (the 'License');
you may not use this file except in compliance with the License.
Modified: tomcat/native/branches/1.1.x/xdocs/style.xsl
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/style.xsl?rev=1430763r1=1430762r2=1430763view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/style.xsl (original)
+++ tomcat/native/branches/1.1.x/xdocs/style.xsl Wed Jan 9 10:09:56 2013
@@ -178,7 +178,7 @@
xsl:commentPAGE FOOTER/xsl:comment
trtd colspan=2
div align=centerfont color={$body-link} size=-1em
-Copyright #169; 2008-2012, Apache Software Foundation
+Copyright #169; 2008-2013, Apache Software Foundation
/em/font/div
/td/tr
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430771 - /tomcat/trunk/modules/jdbc-pool/build.xml
Author: markt
Date: Wed Jan 9 10:38:44 2013
New Revision: 1430771
URL: http://svn.apache.org/viewvc?rev=1430771view=rev
Log:
This dir is created by the prepare target
Modified:
tomcat/trunk/modules/jdbc-pool/build.xml
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=1430771r1=1430770r2=1430771view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Wed Jan 9 10:38:44 2013
@@ -137,7 +137,6 @@
/target
target name=build depends=prepare,download
-mkdir dir=${tomcat.pool}/
!-- compile org.apache.tomcat.jdbc--
javac srcdir=${basedir}/src/main/java destdir=${tomcat.classes}
debug=${compile.debug}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1429864 - /tomcat/trunk/build.xml
On 09/01/2013 09:28, Konstantin Kolinko wrote: 2013/1/7 ma...@apache.org: Author: markt Date: Mon Jan 7 16:01:01 2013 New Revision: 1429864 URL: http://svn.apache.org/viewvc?rev=1429864view=rev I wonder why package-src-jar has to depend on this new build-tomcat-jdbc target. Because it copies the tomcat-jdbc-src.jar which is generated as a result of building the pool. We'd need to extract the building of the tomcat-jdbc-src jar into a separate target and call that. I'll take a look. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430773 - in /tomcat/trunk: build.xml modules/jdbc-pool/build.xml
Author: markt
Date: Wed Jan 9 10:47:41 2013
New Revision: 1430773
URL: http://svn.apache.org/viewvc?rev=1430773view=rev
Log:
Reduce the dependencies for building the source JARs
Modified:
tomcat/trunk/build.xml
tomcat/trunk/modules/jdbc-pool/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1430773r1=1430772r2=1430773view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Jan 9 10:47:41 2013
@@ -994,13 +994,24 @@
target name=build-tomcat-jdbc depends=package
!-- build the jdbc-pool jar and source jar--
echo message=Building Tomcat JDBC pool libraries/
-ant antfile=${tomcat.jdbc.dir}/build.xml dir=${tomcat.jdbc.dir}
inheritall=false target=build
+ant antfile=${tomcat.jdbc.dir}/build.xml dir=${tomcat.jdbc.dir}
+inheritall=false target=build
property name=tomcat.pool value=${tomcat.pool} /
property name=tomcat.juli.jar value=${tomcat-juli.jar} /
property name=skip.download value=set/
/ant
copy file=${tomcat-jdbc.jar} todir=${tomcat.build}/lib/
+ /target
+ target name=build-tomcat-jdbc-src
+!-- build the jdbc-pool source jar--
+echo message=Building Tomcat JDBC pool src JAR/
+ant antfile=${tomcat.jdbc.dir}/build.xml dir=${tomcat.jdbc.dir}
+inheritall=false target=build-src
+ property name=tomcat.pool value=${tomcat.pool} /
+ property name=tomcat.juli.jar value=${tomcat-juli.jar} /
+ property name=skip.download value=set/
+/ant
/target
target name=examples-sources description=Create examples sources
@@ -2243,7 +2254,8 @@ Apache Tomcat ${version} native binaries
/target
!-- Packages the source code in JARs to match the binary JARs --
- target name=package-src-jar depends=build-manifests,build-tomcat-jdbc
+ target name=package-src-jar
+ depends=build-manifests,build-tomcat-jdbc-src
mkdir dir=${tomcat.src.jars} /
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=1430773r1=1430772r2=1430773view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Wed Jan 9 10:47:41 2013
@@ -136,7 +136,7 @@
delete
file=${basedir}/src/main/java/org/apache/tomcat/jdbc/pool/package.html/
/target
- target name=build depends=prepare,download
+ target name=build depends=prepare,download,build-src
!-- compile org.apache.tomcat.jdbc--
javac srcdir=${basedir}/src/main/java destdir=${tomcat.classes}
debug=${compile.debug}
@@ -160,7 +160,9 @@
/fileset
fileset refid=license.notice/
/jar
+ /target
+ target name=build-src
!-- connection pool source file--
jar jarfile=${tomcat-jdbc-src.jar} update=true
fileset dir=${basedir}/src/main/java
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430775 - /tomcat/trunk/build.xml
Author: markt
Date: Wed Jan 9 10:49:43 2013
New Revision: 1430775
URL: http://svn.apache.org/viewvc?rev=1430775view=rev
Log:
Tab police
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1430775r1=1430774r2=1430775view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Jan 9 10:49:43 2013
@@ -2255,7 +2255,7 @@ Apache Tomcat ${version} native binaries
!-- Packages the source code in JARs to match the binary JARs --
target name=package-src-jar
- depends=build-manifests,build-tomcat-jdbc-src
+ depends=build-manifests,build-tomcat-jdbc-src
mkdir dir=${tomcat.src.jars} /
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430776 - in /tomcat/tc7.0.x/trunk: ./ build.xml modules/jdbc-pool/build.xml
Author: markt
Date: Wed Jan 9 10:50:27 2013
New Revision: 1430776
URL: http://svn.apache.org/viewvc?rev=1430776view=rev
Log:
Reduce the dependencies for building the source JARs
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1430771,1430773
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1430776r1=1430775r2=1430776view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Wed Jan 9 10:50:27 2013
@@ -943,13 +943,24 @@
!-- build the jdbc-pool jar and source jar--
echo message=Building Tomcat JDBC pool libraries/
-ant antfile=${tomcat.jdbc.dir}/build.xml dir=${tomcat.jdbc.dir}
inheritall=false target=build
+ant antfile=${tomcat.jdbc.dir}/build.xml dir=${tomcat.jdbc.dir}
+inheritall=false target=build
property name=tomcat.pool value=${tomcat.pool} /
property name=tomcat.juli.jar value=${tomcat-juli.jar} /
property name=skip.download value=set/
/ant
copy file=${tomcat-jdbc.jar} todir=${tomcat.build}/lib/
+ /target
+ target name=build-tomcat-jdbc-src
+!-- build the jdbc-pool source jar--
+echo message=Building Tomcat JDBC pool src JAR/
+ant antfile=${tomcat.jdbc.dir}/build.xml dir=${tomcat.jdbc.dir}
+inheritall=false target=build-src
+ property name=tomcat.pool value=${tomcat.pool} /
+ property name=tomcat.juli.jar value=${tomcat-juli.jar} /
+ property name=skip.download value=set/
+/ant
/target
target name=examples-sources description=Create examples sources
@@ -2170,7 +2181,8 @@ Apache Tomcat ${version} native binaries
/target
!-- Packages the source code in JARs to match the binary JARs --
- target name=package-src-jar depends=build-manifests
+ target name=package-src-jar
+ depends=build-manifests,build-tomcat-jdbc-src
mkdir dir=${tomcat.src.jars} /
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml?rev=1430776r1=1430775r2=1430776view=diff
==
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml Wed Jan 9 10:50:27 2013
@@ -136,8 +136,7 @@
delete
file=${basedir}/src/main/java/org/apache/tomcat/jdbc/pool/package.html/
/target
- target name=build depends=prepare,download
-mkdir dir=${tomcat.pool}/
+ target name=build depends=prepare,download,build-src
!-- compile org.apache.tomcat.jdbc--
javac srcdir=${basedir}/src/main/java destdir=${tomcat.classes}
debug=${compile.debug}
@@ -161,7 +160,9 @@
/fileset
fileset refid=license.notice/
/jar
+ /target
+ target name=build-src
!-- connection pool source file--
jar jarfile=${tomcat-jdbc-src.jar} update=true
fileset dir=${basedir}/src/main/java
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430785 - /tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
Author: kkolinko
Date: Wed Jan 9 11:06:44 2013
New Revision: 1430785
URL: http://svn.apache.org/viewvc?rev=1430785view=rev
Log:
Reduce visibility.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java?rev=1430785r1=1430784r2=1430785view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java Wed Jan 9 11:06:44
2013
@@ -64,8 +64,7 @@ public final class Ascii {
/**
* Returns true if the specified ASCII character is a digit.
*/
-
-public static boolean isDigit(int c) {
+private static boolean isDigit(int c) {
return isDigit[c 0xff];
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430791 - /tomcat/trunk/build.xml
Author: markt
Date: Wed Jan 9 11:18:53 2013
New Revision: 1430791
URL: http://svn.apache.org/viewvc?rev=1430791view=rev
Log:
Tab police
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1430791r1=1430790r2=1430791view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Jan 9 11:18:53 2013
@@ -995,7 +995,7 @@
!-- build the jdbc-pool jar and source jar--
echo message=Building Tomcat JDBC pool libraries/
ant antfile=${tomcat.jdbc.dir}/build.xml dir=${tomcat.jdbc.dir}
-inheritall=false target=build
+ inheritall=false target=build
property name=tomcat.pool value=${tomcat.pool} /
property name=tomcat.juli.jar value=${tomcat-juli.jar} /
property name=skip.download value=set/
@@ -1007,7 +1007,7 @@
!-- build the jdbc-pool source jar--
echo message=Building Tomcat JDBC pool src JAR/
ant antfile=${tomcat.jdbc.dir}/build.xml dir=${tomcat.jdbc.dir}
-inheritall=false target=build-src
+ inheritall=false target=build-src
property name=tomcat.pool value=${tomcat.pool} /
property name=tomcat.juli.jar value=${tomcat-juli.jar} /
property name=skip.download value=set/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430799 - in /tomcat/trunk: java/org/apache/tomcat/util/http/parser/HttpParser.java test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
Author: kkolinko
Date: Wed Jan 9 11:41:18 2013
New Revision: 1430799
URL: http://svn.apache.org/viewvc?rev=1430799view=rev
Log:
Avoid ArrayIndexOutOfBoundsException in HttpParser on incorrect input.
Inspired by o.a.t.util.buf.HexUtils.getDec()
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1430799r1=1430798r2=1430799view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java Wed
Jan 9 11:41:18 2013
@@ -52,6 +52,7 @@ public class HttpParser {
private static final MapString,Integer fieldTypes = new HashMap();
+// Arrays used by isToken(), isHex()
private static final boolean isToken[] = new boolean[128];
private static final boolean isHex[] = new boolean[128];
@@ -238,6 +239,24 @@ public class HttpParser {
return result.toString();
}
+private static boolean isToken(int c) {
+// Fast for correct values, slower for incorrect ones
+try {
+return isToken[c];
+} catch (ArrayIndexOutOfBoundsException ex) {
+return false;
+}
+}
+
+private static boolean isHex(int c) {
+// Fast for correct values, slower for incorrect ones
+try {
+return isHex[c];
+} catch (ArrayIndexOutOfBoundsException ex) {
+return false;
+}
+}
+
private static SkipConstantResult skipConstant(StringReader input,
String constant) throws IOException {
int len = constant.length();
@@ -277,7 +296,7 @@ public class HttpParser {
c = input.read();
}
-while (c != -1 isToken[c]) {
+while (c != -1 isToken(c)) {
result.append((char) c);
c = input.read();
}
@@ -381,7 +400,7 @@ public class HttpParser {
}
c = input.read();
-while (c != -1 isToken[c]) {
+while (c != -1 isToken(c)) {
result.append((char) c);
c = input.read();
}
@@ -419,7 +438,7 @@ public class HttpParser {
c = input.read();
}
-while (c != -1 isHex[c]) {
+while (c != -1 isHex(c)) {
result.append((char) c);
c = input.read();
}
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java?rev=1430799r1=1430798r2=1430799view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
Wed Jan 9 11:41:18 2013
@@ -196,6 +196,16 @@ public class TestAuthorizationDigest {
}
@Test
+public void testQuotedNonTokenQop2() throws Exception {
+String header = Digest qop=\{auth\;
+
+StringReader input = new StringReader(header);
+
+MapString,String result = HttpParser.parseAuthorizationDigest(input);
+Assert.assertNull(result);
+}
+
+@Test
public void testUnclosedQuotedTokenQop() throws Exception {
String header = Digest qop=\auth;
@@ -204,4 +214,34 @@ public class TestAuthorizationDigest {
MapString,String result = HttpParser.parseAuthorizationDigest(input);
Assert.assertNull(result);
}
+
+@Test
+public void testWrongCharacterInToken() throws Exception {
+String header = Digest \u044f;
+
+StringReader input = new StringReader(header);
+
+MapString,String result = HttpParser.parseAuthorizationDigest(input);
+Assert.assertNull(result);
+}
+
+@Test
+public void testWrongCharacterInQuotedToken() throws Exception {
+String header = Digest qop=\\u044f\;
+
+StringReader input = new StringReader(header);
+
+MapString,String result = HttpParser.parseAuthorizationDigest(input);
+Assert.assertNull(result);
+}
+
+@Test
+public void testWrongCharacterInHex() throws Exception {
+String header = Digest nc=\u044f;
+
+StringReader input = new StringReader(header);
+
+MapString,String result = HttpParser.parseAuthorizationDigest(input);
+Assert.assertNull(result);
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail:
svn commit: r1430806 - in /tomcat/trunk: java/org/apache/catalina/deploy/WebXml.java java/org/apache/catalina/startup/ContextConfig.java test/org/apache/catalina/deploy/TestWebXmlOrdering.java
Author: markt
Date: Wed Jan 9 11:56:22 2013
New Revision: 1430806
URL: http://svn.apache.org/viewvc?rev=1430806view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54391
Provide a value for the javax.servlet.context.orderedLibs attribute
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1430806r1=1430805r2=1430806view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Wed Jan 9
11:56:22 2013
@@ -32,6 +32,7 @@ import java.util.Map.Entry;
import java.util.Set;
import javax.servlet.MultipartConfigElement;
+import javax.servlet.ServletContext;
import javax.servlet.SessionCookieConfig;
import javax.servlet.SessionTrackingMode;
import javax.servlet.descriptor.JspPropertyGroupDescriptor;
@@ -566,6 +567,10 @@ public class WebXml {
public void setURL(URL url) { this.uRL = url; }
public URL getURL() { return uRL; }
+// Name of jar file
+private String jarName = null;
+public void setJarName(String jarName) { this.jarName = jarName; }
+public String getJarName() { return jarName; }
@Override
public String toString() {
@@ -2084,19 +2089,23 @@ public class WebXml {
* the order that the fragments must be processed as per the rules in the
* Servlet spec.
*
- * @param application The application web.xml file
- * @param fragments The map of fragment names to web fragments
+ * @param applicationThe application web.xml file
+ * @param fragments The map of fragment names to web fragments
+ * @param servletContext The servlet context the fragments are associated
+ * with
* @return Ordered list of web-fragment.xml files to process
*/
public static SetWebXml orderWebFragments(WebXml application,
-MapString,WebXml fragments) {
+MapString,WebXml fragments, ServletContext servletContext) {
SetWebXml orderedFragments = new LinkedHashSet();
boolean absoluteOrdering =
(application.getAbsoluteOrdering() != null);
+boolean orderingPresent = false;
if (absoluteOrdering) {
+orderingPresent = true;
// Only those fragments listed should be processed
SetString requestedOrder = application.getAbsoluteOrdering();
@@ -2127,6 +2136,7 @@ public class WebXml {
IteratorString before =
fragment.getBeforeOrdering().iterator();
while (before.hasNext()) {
+orderingPresent = true;
String beforeEntry = before.next();
if (!beforeEntry.equals(ORDER_OTHERS)) {
WebXml beforeFragment = fragments.get(beforeEntry);
@@ -2139,6 +2149,7 @@ public class WebXml {
}
IteratorString after =
fragment.getAfterOrdering().iterator();
while (after.hasNext()) {
+orderingPresent = true;
String afterEntry = after.next();
if (!afterEntry.equals(ORDER_OTHERS)) {
WebXml afterFragment = fragments.get(afterEntry);
@@ -2198,6 +2209,20 @@ public class WebXml {
orderFragments(orderedFragments, afterSet);
}
+// Avoid NPE when unit testing
+if (servletContext != null) {
+// Publish the ordered fragments
+ListString orderedJarFileNames = null;
+if (orderingPresent) {
+orderedJarFileNames = new ArrayList();
+for (WebXml fragment: orderedFragments) {
+orderedJarFileNames.add(fragment.getJarName());
+}
+}
+servletContext.setAttribute(ServletContext.ORDERED_LIBS,
+orderedJarFileNames);
+}
+
return orderedFragments;
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1430806r1=1430805r2=1430806view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Jan 9
11:56:22 2013
@@ -1166,7 +1166,8 @@ public class ContextConfig implements Li
// Step 2. Order the fragments.
SetWebXml orderedFragments = null;
-
svn commit: r1430808 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/deploy/WebXml.java java/org/apache/catalina/startup/ContextConfig.java test/org/apache/catalina/deploy/TestWebXmlOrdering.j
Author: markt
Date: Wed Jan 9 11:57:57 2013
New Revision: 1430808
URL: http://svn.apache.org/viewvc?rev=1430808view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54391
Provide a value for the javax.servlet.context.orderedLibs attribute
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1430806
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1430808r1=1430807r2=1430808view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java Wed Jan 9
11:57:57 2013
@@ -32,6 +32,7 @@ import java.util.Map.Entry;
import java.util.Set;
import javax.servlet.MultipartConfigElement;
+import javax.servlet.ServletContext;
import javax.servlet.SessionCookieConfig;
import javax.servlet.SessionTrackingMode;
import javax.servlet.descriptor.JspPropertyGroupDescriptor;
@@ -575,6 +576,10 @@ public class WebXml {
public void setURL(URL url) { this.uRL = url; }
public URL getURL() { return uRL; }
+// Name of jar file
+private String jarName = null;
+public void setJarName(String jarName) { this.jarName = jarName; }
+public String getJarName() { return jarName; }
@Override
public String toString() {
@@ -2094,19 +2099,23 @@ public class WebXml {
* the order that the fragments must be processed as per the rules in the
* Servlet spec.
*
- * @param application The application web.xml file
- * @param fragments The map of fragment names to web fragments
+ * @param applicationThe application web.xml file
+ * @param fragments The map of fragment names to web fragments
+ * @param servletContext The servlet context the fragments are associated
+ * with
* @return Ordered list of web-fragment.xml files to process
*/
public static SetWebXml orderWebFragments(WebXml application,
-MapString,WebXml fragments) {
+MapString,WebXml fragments, ServletContext servletContext) {
SetWebXml orderedFragments = new LinkedHashSetWebXml();
boolean absoluteOrdering =
(application.getAbsoluteOrdering() != null);
+boolean orderingPresent = false;
if (absoluteOrdering) {
+orderingPresent = true;
// Only those fragments listed should be processed
SetString requestedOrder = application.getAbsoluteOrdering();
@@ -2137,6 +2146,7 @@ public class WebXml {
IteratorString before =
fragment.getBeforeOrdering().iterator();
while (before.hasNext()) {
+orderingPresent = true;
String beforeEntry = before.next();
if (!beforeEntry.equals(ORDER_OTHERS)) {
WebXml beforeFragment = fragments.get(beforeEntry);
@@ -2149,6 +2159,7 @@ public class WebXml {
}
IteratorString after =
fragment.getAfterOrdering().iterator();
while (after.hasNext()) {
+orderingPresent = true;
String afterEntry = after.next();
if (!afterEntry.equals(ORDER_OTHERS)) {
WebXml afterFragment = fragments.get(afterEntry);
@@ -2208,6 +2219,20 @@ public class WebXml {
orderFragments(orderedFragments, afterSet);
}
+// Avoid NPE when unit testing
+if (servletContext != null) {
+// Publish the ordered fragments
+ListString orderedJarFileNames = null;
+if (orderingPresent) {
+orderedJarFileNames = new ArrayList();
+for (WebXml fragment: orderedFragments) {
+orderedJarFileNames.add(fragment.getJarName());
+}
+}
+servletContext.setAttribute(ServletContext.ORDERED_LIBS,
+orderedJarFileNames);
+}
+
return orderedFragments;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1430808r1=1430807r2=1430808view=diff
==
---
[Bug 54391] Provide value for javax.servlet.context.orderedLibs attribute
https://issues.apache.org/bugzilla/show_bug.cgi?id=54391 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- This has been fixed in trunk and 7.0.x and will be included in 7.0.35 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430809 - /tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
Author: kkolinko
Date: Wed Jan 9 11:59:51 2013
New Revision: 1430809
URL: http://svn.apache.org/viewvc?rev=1430809view=rev
Log:
Followup to r1430799:
Fix trailing whitespace
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1430809r1=1430808r2=1430809view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java Wed
Jan 9 11:59:51 2013
@@ -52,7 +52,7 @@ public class HttpParser {
private static final MapString,Integer fieldTypes = new HashMap();
-// Arrays used by isToken(), isHex()
+// Arrays used by isToken(), isHex()
private static final boolean isToken[] = new boolean[128];
private static final boolean isHex[] = new boolean[128];
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430810 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
Author: markt
Date: Wed Jan 9 12:00:23 2013
New Revision: 1430810
URL: http://svn.apache.org/viewvc?rev=1430810view=rev
Log:
Java 6 not 7
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1430810r1=1430809r2=1430810view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java Wed Jan 9
12:00:23 2013
@@ -2224,7 +2224,7 @@ public class WebXml {
// Publish the ordered fragments
ListString orderedJarFileNames = null;
if (orderingPresent) {
-orderedJarFileNames = new ArrayList();
+orderedJarFileNames = new ArrayListString();
for (WebXml fragment: orderedFragments) {
orderedJarFileNames.add(fragment.getJarName());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54379] Implement support for post-construct and pre-destroy elements in web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=54379 --- Comment #2 from Mark Thomas ma...@apache.org --- Could you provide a progress update please. This is (currently) the only remaining issue that needs fixing before the 7.0.35 tag. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430812 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/parser/HttpParser.java test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java webapps/docs/changelog.
Author: kkolinko
Date: Wed Jan 9 12:08:01 2013
New Revision: 1430812
URL: http://svn.apache.org/viewvc?rev=1430812view=rev
Log:
Merged revisions r1430799 r1430809 from tomcat/trunk:
Avoid ArrayIndexOutOfBoundsException in HttpParser on incorrect input.
Inspired by o.a.t.util.buf.HexUtils.getDec()
Also moved changelog entry for BZ 54390 into a different section.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1430799,1430809
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1430812r1=1430811r2=1430812view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
Wed Jan 9 12:08:01 2013
@@ -53,6 +53,7 @@ public class HttpParser {
private static final MapString,Integer fieldTypes =
new HashMapString,Integer();
+// Arrays used by isToken(), isHex()
private static final boolean isToken[] = new boolean[128];
private static final boolean isHex[] = new boolean[128];
@@ -240,6 +241,24 @@ public class HttpParser {
return result.toString();
}
+private static boolean isToken(int c) {
+// Fast for correct values, slower for incorrect ones
+try {
+return isToken[c];
+} catch (ArrayIndexOutOfBoundsException ex) {
+return false;
+}
+}
+
+private static boolean isHex(int c) {
+// Fast for correct values, slower for incorrect ones
+try {
+return isHex[c];
+} catch (ArrayIndexOutOfBoundsException ex) {
+return false;
+}
+}
+
private static SkipConstantResult skipConstant(StringReader input,
String constant) throws IOException {
int len = constant.length();
@@ -279,7 +298,7 @@ public class HttpParser {
c = input.read();
}
-while (c != -1 isToken[c]) {
+while (c != -1 isToken(c)) {
result.append((char) c);
c = input.read();
}
@@ -383,7 +402,7 @@ public class HttpParser {
}
c = input.read();
-while (c != -1 isToken[c]) {
+while (c != -1 isToken(c)) {
result.append((char) c);
c = input.read();
}
@@ -421,7 +440,7 @@ public class HttpParser {
c = input.read();
}
-while (c != -1 isHex[c]) {
+while (c != -1 isHex(c)) {
result.append((char) c);
c = input.read();
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java?rev=1430812r1=1430811r2=1430812view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
Wed Jan 9 12:08:01 2013
@@ -196,6 +196,16 @@ public class TestAuthorizationDigest {
}
@Test
+public void testQuotedNonTokenQop2() throws Exception {
+String header = Digest qop=\{auth\;
+
+StringReader input = new StringReader(header);
+
+MapString,String result = HttpParser.parseAuthorizationDigest(input);
+Assert.assertNull(result);
+}
+
+@Test
public void testUnclosedQuotedTokenQop() throws Exception {
String header = Digest qop=\auth;
@@ -204,4 +214,34 @@ public class TestAuthorizationDigest {
MapString,String result = HttpParser.parseAuthorizationDigest(input);
Assert.assertNull(result);
}
+
+@Test
+public void testWrongCharacterInToken() throws Exception {
+String header = Digest \u044f;
+
+StringReader input = new StringReader(header);
+
+MapString,String result = HttpParser.parseAuthorizationDigest(input);
+Assert.assertNull(result);
+}
+
+@Test
+public void testWrongCharacterInQuotedToken() throws Exception {
+String header = Digest qop=\\u044f\;
+
+StringReader input = new StringReader(header);
+
+MapString,String result = HttpParser.parseAuthorizationDigest(input);
+Assert.assertNull(result);
+}
[Bug 54379] Implement support for post-construct and pre-destroy elements in web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=54379 --- Comment #3 from Violeta Georgieva violet...@apache.org --- I'm preparing the test cases just now. I'll be ready till end of the day is that OK? -- 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 54379] Implement support for post-construct and pre-destroy elements in web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=54379 --- Comment #4 from Mark Thomas ma...@apache.org --- That sounds great. Thanks. -- 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: r1427821 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/runtime/ test/org/apache/jasper/runtime/ test/webapp-3.0/bug5nnnn/ webapps/docs/
2013/1/2 ma...@apache.org:
Author: markt
Date: Wed Jan 2 15:11:24 2013
New Revision: 1427821
URL: http://svn.apache.org/viewvc?rev=1427821view=rev
Log:
Revert the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=35410
as it is not specification compliant
Remove the remainder of the write(String) method as well as it serves no
purpose since it is identical to the method it overrides.
Add some test cases to confirm the expected/correct behaviour
Note: BZ 35410 claims there is no requirement for Object.toString() to be
non-null. Many have argued (and I agree) that null is not a String
representation and therefore not a valid return value for Object.toString().
Added:
tomcat/tc7.0.x/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java
- copied unchanged from r1427804,
tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug54241a.jsp
- copied unchanged from r1427804,
tomcat/trunk/test/webapp-3.0/bug5/bug54241a.jsp
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug54241b.jsp
- copied unchanged from r1427804,
tomcat/trunk/test/webapp-3.0/bug5/bug54241b.jsp
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1427804
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java?rev=1427821r1=1427820r2=1427821view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
Wed Jan 2 15:11:24 2013
@@ -339,21 +339,6 @@ public class JspWriterImpl extends JspWr
}
}
-/**
- * Write a string. This method cannot be inherited from the Writer class
- * because it must suppress I/O exceptions.
- */
-@Override
-public void write(String s) throws IOException {
-// Simple fix for Bugzilla 35410
-// Calling the other write function so as to init the buffer anyways
-if(s == null) {
-write(s, 0, 0);
-} else {
-write(s, 0, s.length());
-}
-}
-
static String lineSeparator = System.getProperty(line.separator);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1427821r1=1427820r2=1427821view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 2 15:11:24 2013
@@ -54,6 +54,19 @@
issues to not pop up wrt. others).
--
section name=Tomcat 7.0.35 (markt)
+ subsection name=Jasper
+changelog
+ fix
+bug54241/bug: Revert the fix for bug35410/bug as it was not
+compliant with the JSP specification, specifically that
+codelt;%= obj %gt;/code must be translated to
+codeout.write(String.valueOf(obj))/code which will trigger a
+codeNullPointerException/code if codeobj.toString()/code
returns
+codenull/code. The fix for bug35410/bug incorrectly
suppressed
+the codeNullPointerException/code in this case.
+ /fix
This is wrong!
It should be out.print(String.valueOf(obj)).
There is a difference between print(String) and write(String) methods
in JspWriter (and in PrintWriter as well). The former prints null,
the latter throws NPE.
IIRC, the generated code incorrectly calls print(Object) which causes NPE.
+/changelog
+ /subsection
/section
section name=Tomcat 7.0.34 (markt) rtext=2012-12-12
subsection name=Catalina
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: r1430827 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Wed Jan 9 12:42:48 2013 New Revision: 1430827 URL: http://svn.apache.org/viewvc?rev=1430827view=rev Log: Add issue number for r1429124, move according to the sort order. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1430827r1=1430826r2=1430827view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 9 12:42:48 2013 @@ -74,10 +74,6 @@ Allow web applications to be stopped cleanly even if filters shown exceptions when their destroy() method is called. (markt/kkolinko) /fix - add -Make HTTP Digest authentication header parsing tolerant of invalid -headers sent by known buggy clients. (markt) - /add fix Fix memory leak of servlet instances when running with a SecurityManager and either init() or destroy() methods fail @@ -109,6 +105,10 @@ need to be encoded in URLs such as spaces. Based on a patch by Polina Genova. (markt) /fix + add +bug54372/bug: Make HTTP Digest authentication header parsing +tolerant of invalid headers sent by known buggy clients. (markt) + /add fix bug54377/bug: Correctly set request attributes for AccessLog in RemoteIpFilter. Patch by Violeta Georgieva. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54372] Digest Authentication fails on Safari and IE8/9
https://issues.apache.org/bugzilla/show_bug.cgi?id=54372 --- Comment #6 from Konstantin Kolinko knst.koli...@gmail.com --- By the way, a workaround was implemented in r1429124 It will be included in 7.0.35 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430850 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Jan 9 13:39:13 2013 New Revision: 1430850 URL: http://svn.apache.org/viewvc?rev=1430850view=rev Log: Correct changelog Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1430850r1=1430849r2=1430850view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 9 13:39:13 2013 @@ -154,7 +154,7 @@ bug54241/bug: Revert the fix for bug35410/bug as it was not compliant with the JSP specification, specifically that codelt;%= obj %gt;/code must be translated to -codeout.write(String.valueOf(obj))/code which will trigger a +codeout.print(String.valueOf(obj))/code which will trigger a codeNullPointerException/code if codeobj.toString()/code returns codenull/code. The fix for bug35410/bug incorrectly suppressed the codeNullPointerException/code in this case. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430852 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Jan 9 13:42:39 2013 New Revision: 1430852 URL: http://svn.apache.org/viewvc?rev=1430852view=rev Log: Better description of %= obj =% Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1430852r1=1430851r2=1430852view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 9 13:42:39 2013 @@ -154,7 +154,8 @@ bug54241/bug: Revert the fix for bug35410/bug as it was not compliant with the JSP specification, specifically that codelt;%= obj %gt;/code must be translated to -codeout.print(String.valueOf(obj))/code which will trigger a +codeout.print(obj)/code which in turn becomes +codeout.write(String.valueOf(obj))/code. This will trigger a codeNullPointerException/code if codeobj.toString()/code returns codenull/code. The fix for bug35410/bug incorrectly suppressed the codeNullPointerException/code in this case. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430854 - in /tomcat/sandbox/rewrite/trunk/src/main/resources: ./ org/ org/apache/ org/apache/catalina/ org/apache/catalina/valves/ org/apache/catalina/valves/rewrite/ org/apache/catalina
Author: remm Date: Wed Jan 9 13:43:51 2013 New Revision: 1430854 URL: http://svn.apache.org/viewvc?rev=1430854view=rev Log: - Descriptor for the valve (just in case). Added: tomcat/sandbox/rewrite/trunk/src/main/resources/ tomcat/sandbox/rewrite/trunk/src/main/resources/org/ tomcat/sandbox/rewrite/trunk/src/main/resources/org/apache/ tomcat/sandbox/rewrite/trunk/src/main/resources/org/apache/catalina/ tomcat/sandbox/rewrite/trunk/src/main/resources/org/apache/catalina/valves/ tomcat/sandbox/rewrite/trunk/src/main/resources/org/apache/catalina/valves/rewrite/ tomcat/sandbox/rewrite/trunk/src/main/resources/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml (with props) Added: tomcat/sandbox/rewrite/trunk/src/main/resources/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/rewrite/trunk/src/main/resources/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml?rev=1430854view=auto == Binary file - no diff available. Propchange: tomcat/sandbox/rewrite/trunk/src/main/resources/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml -- svn:mime-type = application/xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54394] New: Connector ciphers not populated in AprEndpoint SSLCipherSuite
https://issues.apache.org/bugzilla/show_bug.cgi?id=54394
Bug ID: 54394
Summary: Connector ciphers not populated in AprEndpoint
SSLCipherSuite
Product: Tomcat 7
Version: 7.0.20
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Connectors
Assignee: dev@tomcat.apache.org
Reporter: mgai...@hotmail.com
Classification: Unclassified
org.apache.catalina.connector.Connector:
public void setProtocol(String protocol) {
if (AprLifecycleListener.isAprAvailable()) {
if (HTTP/1.1.equals(protocol)) {
setProtocolHandlerClassName
(org.apache.coyote.http11.Http11AprProtocol);
} else if (AJP/1.3.equals(protocol)) {
setProtocolHandlerClassName
(org.apache.coyote.ajp.AjpAprProtocol);
} else if (protocol != null) {
setProtocolHandlerClassName(protocol);
} else {
setProtocolHandlerClassName
(org.apache.coyote.http11.Http11AprProtocol);
}
} else {
if (HTTP/1.1.equals(protocol)) {
setProtocolHandlerClassName
(org.apache.coyote.http11.Http11Protocol);
} else if (AJP/1.3.equals(protocol)) {
setProtocolHandlerClassName
(org.apache.coyote.ajp.AjpProtocol);
} else if (protocol != null) {
setProtocolHandlerClassName(protocol);
}
}
}
setProtocol assigns
protocolHandlerClassName=org.apache.coyote.http11.Http11AprProtocol
public Connector(String protocol) {
setProtocol(protocol);
// Instantiate protocol handler
try {
Class? clazz = Class.forName(protocolHandlerClassName);
this.protocolHandler = (ProtocolHandler) clazz.newInstance();
} catch (Exception e) {
log.error
(sm.getString
(coyoteConnector.protocolHandlerInstantiationFailed, e));
}
}
/*** Return a configured property. */
public Object getProperty(String name) {
String repl = name;
if (replacements.get(name) != null) {
repl = replacements.get(name);
}
return IntrospectionUtils.getProperty(protocolHandler, repl);
}
org.apache.tomcat.util.IntrospectionUtils
public static Object getProperty(Object o, String name) {
String getter = get + capitalize(name);
String isGetter = is + capitalize(name);
try {
Method methods[] = findMethods(o.getClass());
Method getPropertyMethod = null;
// First, the ideal case - a getFoo() method
for (int i = 0; i methods.length; i++) {
Class? paramT[] = methods[i].getParameterTypes();
if (getter.equals(methods[i].getName()) paramT.length == 0)
{
return methods[i].invoke(o, (Object[]) null);
/snip
org.apache.coyote.http11.Http11AprProtocol
public void init() throws Exception {
endpoint.setName(getName());
public String getName() {
String encodedAddr = ;
if (getAddress() != null) {
encodedAddr = + getAddress();
if (encodedAddr.startsWith(/))
encodedAddr = encodedAddr.substring(1);
encodedAddr = URLEncoder.encode(encodedAddr) + -;
}
return (http- + encodedAddr + endpoint.getPort());
}
return the SSLCipherSuite() for the specified endpoint
public String getSSLCipherSuite() { return endpoint.getSSLCipherSuite(); }
(assume Endpoint is Apr and Not Nio or Jio)
org.apache.tomcat.util.net.AprEndpoint
protected String SSLCipherSuite = ALL;
public String getSSLCipherSuite() { return SSLCipherSuite; }
public void setSSLCipherSuite(String SSLCipherSuite) { this.SSLCipherSuite
= SSLCipherSuite; }
JDK 1.6
TC 7.0.2
Martin Gainty
9 Jan 2013
--
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 54394] Connector ciphers not populated in AprEndpoint SSLCipherSuite
https://issues.apache.org/bugzilla/show_bug.cgi?id=54394 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID OS||All -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-197) tomcat7:undeploy goal not ignoring non-war projects
Glen Mazza created MTOMCAT-197: -- Summary: tomcat7:undeploy goal not ignoring non-war projects Key: MTOMCAT-197 URL: https://issues.apache.org/jira/browse/MTOMCAT-197 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat7 Affects Versions: 2.1 Reporter: Glen Mazza Assignee: Olivier Lamy (*$^¨%`£) Hello, the new tomcat7:undeploy goal is not ignoring non-war projects (packaginganything but war/packaging) (like tomcat7:deploy and tomcat:undeploy already correctly do), creating errors and extra WAR deletion attempts. Whatever config you do to tomcat7:deploy that causes it to skip non-war projects needs to be added to this goal as well. Using this project w/2.1-SNAPSHOT of Maven Tomcat plugin: https://github.com/gmazza/blog-samples/tree/master/web_service_tutorial running tomcat:undeploy from the base folder should cause it to be ignored for three poms (base,client, and service) while activated only for war. Compare: Codehaus tomcat:undeploy (good, correctly skipping non-war projects): [INFO] [INFO] Building Tutorial: Basic WSDL-First Web Service 1.0-SNAPSHOT [INFO] [INFO] [INFO] Skipping non-war project [INFO] [INFO] [INFO] Building -- Web Service Provider 1.0-SNAPSHOT [INFO] [INFO] [INFO] --- tomcat-maven-plugin:1.1:undeploy (default-cli) @ web-service-tutorial-service --- [INFO] Skipping non-war project [INFO] [INFO] [INFO] Building -- Service WAR file 1.0-SNAPSHOT [INFO] [INFO] [INFO] --- tomcat-maven-plugin:1.1:undeploy (default-cli) @ web-service-tutorial-war --- [INFO] Undeploying application at http://localhost:8080/doubleit [INFO] OK - Undeployed application at context path /doubleit [INFO] Apache tomcat7:deploy (good, correctly skipping non-war projects): [INFO] [INFO] Building Tutorial: Basic WSDL-First Web Service 1.0-SNAPSHOT [INFO] [INFO] [INFO] Skipping non-war project [INFO] [INFO] [INFO] [INFO] Building -- Web Service Provider 1.0-SNAPSHOT [INFO] [INFO] [INFO] --- tomcat7-maven-plugin:2.1-SNAPSHOT:deploy (default-cli) @ web-service-tutorial-service --- [INFO] Skipping non-war project [INFO] [INFO] Building -- Service WAR file 1.0-SNAPSHOT [INFO] [INFO] Uploading: http://localhost:8080/manager/text/deploy?path=%2Fdoubleit Uploaded: http://localhost:8080/manager/text/deploy?path=%2Fdoubleit (7723 KB at 66574.0 KB/sec) -- tomcat7:undeploy (bad, always running undeploy ) [INFO] [INFO] Building Tutorial: Basic WSDL-First Web Service 1.0-SNAPSHOT [INFO] [INFO] [INFO] FAIL - No context exists for path /web-service-tutorial-1.0-SNAPSHOT [INFO] [INFO] Building -- Web Service Provider 1.0-SNAPSHOT [INFO] [INFO] Undeploying application at http://localhost:8080/doubleit [INFO] OK - Undeployed application at context path /doubleit [INFO] [INFO] Building -- Service WAR file 1.0-SNAPSHOT [INFO] [INFO] --- tomcat7-maven-plugin:2.1-SNAPSHOT:undeploy (default-cli) @ web-service-tutorial-war --- [INFO] Undeploying application at http://localhost:8080/doubleit [INFO] FAIL - No context exists for path /doubleit [INFO] [INFO] Building -- SOAP Client 1.0-SNAPSHOT [INFO]
Rewrite functionality for 8
Hi, I ported a valve providing mod_rewrite functionality (most of it) for Tomcat 8, and committed it in the sandbox. This could be easily placed in the main repository, where it would provide an additional item in the new features department for this major release. I have a documentation page for it that could be included. The basics is that it uses a rewrite.properties that has the same contents as the configuration for mod_rewrite. The rewrite.properties is placed in the host config folder if the valve is declared in a Host, or in WEB-INF in the webapp if declared in a Context. The main differences with mod_rewrite are: - (the big one) no proxy flag - no SSL attributes - less file related flags available - allows virtual host rewriting using a host flag (it replaces the host header instead of the URL and maps again) Point 2 and 3 are probably relatively easy to fix, while obviously a proxy is a more involving endeavor. There are rewrite solutions out there already, but this one does not use complex tricks (because it can simply start over request processing instead of doing more complex request dispatching, which also impacts the Servlet state), and is mod_rewrite compatible. Comments ? Is it nice or useless ? Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-197) tomcat7:undeploy goal not ignoring non-war projects
[ https://issues.apache.org/jira/browse/MTOMCAT-197?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) updated MTOMCAT-197: --- Fix Version/s: 2.1 tomcat7:undeploy goal not ignoring non-war projects --- Key: MTOMCAT-197 URL: https://issues.apache.org/jira/browse/MTOMCAT-197 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat7 Affects Versions: 2.1 Reporter: Glen Mazza Assignee: Olivier Lamy (*$^¨%`£) Fix For: 2.1 Hello, the new tomcat7:undeploy goal is not ignoring non-war projects (packaginganything but war/packaging) (like tomcat7:deploy and tomcat:undeploy already correctly do), creating errors and extra WAR deletion attempts. Whatever config you do to tomcat7:deploy that causes it to skip non-war projects needs to be added to this goal as well. Using this project w/2.1-SNAPSHOT of Maven Tomcat plugin: https://github.com/gmazza/blog-samples/tree/master/web_service_tutorial running tomcat:undeploy from the base folder should cause it to be ignored for three poms (base,client, and service) while activated only for war. Compare: Codehaus tomcat:undeploy (good, correctly skipping non-war projects): [INFO] [INFO] Building Tutorial: Basic WSDL-First Web Service 1.0-SNAPSHOT [INFO] [INFO] [INFO] Skipping non-war project [INFO] [INFO] [INFO] Building -- Web Service Provider 1.0-SNAPSHOT [INFO] [INFO] [INFO] --- tomcat-maven-plugin:1.1:undeploy (default-cli) @ web-service-tutorial-service --- [INFO] Skipping non-war project [INFO] [INFO] [INFO] Building -- Service WAR file 1.0-SNAPSHOT [INFO] [INFO] [INFO] --- tomcat-maven-plugin:1.1:undeploy (default-cli) @ web-service-tutorial-war --- [INFO] Undeploying application at http://localhost:8080/doubleit [INFO] OK - Undeployed application at context path /doubleit [INFO] Apache tomcat7:deploy (good, correctly skipping non-war projects): [INFO] [INFO] Building Tutorial: Basic WSDL-First Web Service 1.0-SNAPSHOT [INFO] [INFO] [INFO] Skipping non-war project [INFO] [INFO] [INFO] [INFO] Building -- Web Service Provider 1.0-SNAPSHOT [INFO] [INFO] [INFO] --- tomcat7-maven-plugin:2.1-SNAPSHOT:deploy (default-cli) @ web-service-tutorial-service --- [INFO] Skipping non-war project [INFO] [INFO] Building -- Service WAR file 1.0-SNAPSHOT [INFO] [INFO] Uploading: http://localhost:8080/manager/text/deploy?path=%2Fdoubleit Uploaded: http://localhost:8080/manager/text/deploy?path=%2Fdoubleit (7723 KB at 66574.0 KB/sec) -- tomcat7:undeploy (bad, always running undeploy ) [INFO] [INFO] Building Tutorial: Basic WSDL-First Web Service 1.0-SNAPSHOT [INFO] [INFO] [INFO] FAIL - No context exists for path /web-service-tutorial-1.0-SNAPSHOT [INFO] [INFO] Building -- Web Service Provider 1.0-SNAPSHOT [INFO] [INFO] Undeploying application at http://localhost:8080/doubleit [INFO] OK - Undeployed application at context path /doubleit [INFO] [INFO] Building -- Service WAR file 1.0-SNAPSHOT [INFO] [INFO] --- tomcat7-maven-plugin:2.1-SNAPSHOT:undeploy
Re: Rewrite functionality for 8
Nice! Thanks, Yoav On Wed, Jan 9, 2013 at 10:04 AM, Remy Maucherat r...@apache.org wrote: Hi, I ported a valve providing mod_rewrite functionality (most of it) for Tomcat 8, and committed it in the sandbox. This could be easily placed in the main repository, where it would provide an additional item in the new features department for this major release. I have a documentation page for it that could be included. The basics is that it uses a rewrite.properties that has the same contents as the configuration for mod_rewrite. The rewrite.properties is placed in the host config folder if the valve is declared in a Host, or in WEB-INF in the webapp if declared in a Context. The main differences with mod_rewrite are: - (the big one) no proxy flag - no SSL attributes - less file related flags available - allows virtual host rewriting using a host flag (it replaces the host header instead of the URL and maps again) Point 2 and 3 are probably relatively easy to fix, while obviously a proxy is a more involving endeavor. There are rewrite solutions out there already, but this one does not use complex tricks (because it can simply start over request processing instead of doing more complex request dispatching, which also impacts the Servlet state), and is mod_rewrite compatible. Comments ? Is it nice or useless ? Rémy - 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: r1430921 - /tomcat/trunk/webapps/docs/config/http.xml
Author: markt Date: Wed Jan 9 15:57:48 2013 New Revision: 1430921 URL: http://svn.apache.org/viewvc?rev=1430921view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54244 Clarify documentation for BIO/NIO SSL config attributes sslEnabledProtocols and sslProtocol Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1430921r1=1430920r2=1430921view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Wed Jan 9 15:57:48 2013 @@ -1018,8 +1018,16 @@ /attribute attribute name=sslEnabledProtocols required=false - pThe list of SSL protocols to use. If not specified, the JVM default is - used./p + pThe comma separated list of SSL protocols to support for HTTPS + connections. If specified, only the protocols listed will be supported. If + not specified, the JVM default is used. The permitted values may be + obtained from the JVM documentation for the allowed values for + codeSSLSocket.setEnabledProtocols()/code e.g. + a href=http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#jssenames; + Oracle Java 6/a and + a href=http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#jssenames; + Oracle Java 7/a. Note: There is overlap between this attribute and + codesslProtocol/code./p /attribute attribute name=sslImplementationName required=false @@ -1030,8 +1038,16 @@ /attribute attribute name=sslProtocol required=false - pThe version of the SSL protocol to use. If not specified, - the default is codeTLS/code./p + pThe the SSL protocol(s) to use (a single value may enable multiple + protocols - see the JVM documentation for details). If not specified, the + default is codeTLS/code. The permitted values may be obainted from the + JVM documentation for the allowed values for algorithm when creating an + codeSSLContext/code instance e.g. + a href=http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#SSLContext; + Oracle Java 6/a and + a href=http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#SSLContext; + Oracle Java 7/a.Note: There is overlap between this attribute and + codesslEnabledProtocols/code./p /attribute attribute name=trustManagerClassName required=false - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430922 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Author: markt
Date: Wed Jan 9 15:58:01 2013
New Revision: 1430922
URL: http://svn.apache.org/viewvc?rev=1430922view=rev
Log:
Fix whitespace
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1430922r1=1430921r2=1430922view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Wed Jan 9 15:58:01 2013
@@ -719,7 +719,7 @@ public class JSSESocketFactory implement
* @param protocols the protocols to use.
*/
protected void setEnabledProtocols(SSLServerSocket socket,
-String []protocols){
+String[] protocols){
if (protocols != null) {
socket.setEnabledProtocols(protocols);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430923 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/http.xml
Author: markt Date: Wed Jan 9 16:01:11 2013 New Revision: 1430923 URL: http://svn.apache.org/viewvc?rev=1430923view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54244 Clarify documentation for BIO/NIO SSL config attributes sslEnabledProtocols and sslProtocol Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1430921 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1430923r1=1430922r2=1430923view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 9 16:01:11 2013 @@ -180,6 +180,16 @@ /fix /changelog /subsection + subsection name=Web applications +changelog + fix +bug54244/bug: Clarify the documentation for the BIO and NIO SSL +configuration attributes codesslEnabledProtocols/code and +codesslProtocol/code within the documentation web application. +(markt) + /fix +/changelog + /subsection subsection name=Other changelog fix Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1430923r1=1430922r2=1430923view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Wed Jan 9 16:01:11 2013 @@ -1018,8 +1018,16 @@ /attribute attribute name=sslEnabledProtocols required=false - pThe list of SSL protocols to use. If not specified, the JVM default is - used./p + pThe comma separated list of SSL protocols to support for HTTPS + connections. If specified, only the protocols listed will be supported. If + not specified, the JVM default is used. The permitted values may be + obtained from the JVM documentation for the allowed values for + codeSSLSocket.setEnabledProtocols()/code e.g. + a href=http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#jssenames; + Oracle Java 6/a and + a href=http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#jssenames; + Oracle Java 7/a. Note: There is overlap between this attribute and + codesslProtocol/code./p /attribute attribute name=sslImplementationName required=false @@ -1030,8 +1038,16 @@ /attribute attribute name=sslProtocol required=false - pThe version of the SSL protocol to use. If not specified, - the default is codeTLS/code./p + pThe the SSL protocol(s) to use (a single value may enable multiple + protocols - see the JVM documentation for details). If not specified, the + default is codeTLS/code. The permitted values may be obainted from the + JVM documentation for the allowed values for algorithm when creating an + codeSSLContext/code instance e.g. + a href=http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#SSLContext; + Oracle Java 6/a and + a href=http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#SSLContext; + Oracle Java 7/a.Note: There is overlap between this attribute and + codesslEnabledProtocols/code./p /attribute attribute name=trustManagerClassName required=false - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1430966 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/UndeployMojo.java
Author: olamy
Date: Wed Jan 9 17:24:37 2013
New Revision: 1430966
URL: http://svn.apache.org/viewvc?rev=1430966view=rev
Log:
[MTOMCAT-197] tomcat7:undeploy goal not ignoring non-war projects
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/UndeployMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/UndeployMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/UndeployMojo.java?rev=1430966r1=1430965r2=1430966view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/UndeployMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/UndeployMojo.java
Wed Jan 9 17:24:37 2013
@@ -24,6 +24,7 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
import org.apache.tomcat.maven.plugin.tomcat7.AbstractCatalinaMojo;
+import org.apache.tomcat.maven.plugin.tomcat7.AbstractWarCatalinaMojo;
import java.io.IOException;
@@ -34,7 +35,7 @@ import java.io.IOException;
*/
@Mojo( name = undeploy )
public class UndeployMojo
-extends AbstractCatalinaMojo
+extends AbstractWarCatalinaMojo
{
// --
// Mojo Parameters
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-197) tomcat7:undeploy goal not ignoring non-war projects
[ https://issues.apache.org/jira/browse/MTOMCAT-197?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) closed MTOMCAT-197. -- Resolution: Fixed fixed http://svn.apache.org/r1430966 tomcat7:undeploy goal not ignoring non-war projects --- Key: MTOMCAT-197 URL: https://issues.apache.org/jira/browse/MTOMCAT-197 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat7 Affects Versions: 2.1 Reporter: Glen Mazza Assignee: Olivier Lamy (*$^¨%`£) Fix For: 2.1 Hello, the new tomcat7:undeploy goal is not ignoring non-war projects (packaginganything but war/packaging) (like tomcat7:deploy and tomcat:undeploy already correctly do), creating errors and extra WAR deletion attempts. Whatever config you do to tomcat7:deploy that causes it to skip non-war projects needs to be added to this goal as well. Using this project w/2.1-SNAPSHOT of Maven Tomcat plugin: https://github.com/gmazza/blog-samples/tree/master/web_service_tutorial running tomcat:undeploy from the base folder should cause it to be ignored for three poms (base,client, and service) while activated only for war. Compare: Codehaus tomcat:undeploy (good, correctly skipping non-war projects): [INFO] [INFO] Building Tutorial: Basic WSDL-First Web Service 1.0-SNAPSHOT [INFO] [INFO] [INFO] Skipping non-war project [INFO] [INFO] [INFO] Building -- Web Service Provider 1.0-SNAPSHOT [INFO] [INFO] [INFO] --- tomcat-maven-plugin:1.1:undeploy (default-cli) @ web-service-tutorial-service --- [INFO] Skipping non-war project [INFO] [INFO] [INFO] Building -- Service WAR file 1.0-SNAPSHOT [INFO] [INFO] [INFO] --- tomcat-maven-plugin:1.1:undeploy (default-cli) @ web-service-tutorial-war --- [INFO] Undeploying application at http://localhost:8080/doubleit [INFO] OK - Undeployed application at context path /doubleit [INFO] Apache tomcat7:deploy (good, correctly skipping non-war projects): [INFO] [INFO] Building Tutorial: Basic WSDL-First Web Service 1.0-SNAPSHOT [INFO] [INFO] [INFO] Skipping non-war project [INFO] [INFO] [INFO] [INFO] Building -- Web Service Provider 1.0-SNAPSHOT [INFO] [INFO] [INFO] --- tomcat7-maven-plugin:2.1-SNAPSHOT:deploy (default-cli) @ web-service-tutorial-service --- [INFO] Skipping non-war project [INFO] [INFO] Building -- Service WAR file 1.0-SNAPSHOT [INFO] [INFO] Uploading: http://localhost:8080/manager/text/deploy?path=%2Fdoubleit Uploaded: http://localhost:8080/manager/text/deploy?path=%2Fdoubleit (7723 KB at 66574.0 KB/sec) -- tomcat7:undeploy (bad, always running undeploy ) [INFO] [INFO] Building Tutorial: Basic WSDL-First Web Service 1.0-SNAPSHOT [INFO] [INFO] [INFO] FAIL - No context exists for path /web-service-tutorial-1.0-SNAPSHOT [INFO] [INFO] Building -- Web Service Provider 1.0-SNAPSHOT [INFO] [INFO] Undeploying application at http://localhost:8080/doubleit [INFO] OK - Undeployed application at context path /doubleit [INFO] [INFO] Building -- Service WAR file 1.0-SNAPSHOT [INFO] [INFO] ---
[jira] [Created] (MTOMCAT-198) Fix base classes for redeploy and redeploy-only goals
Glen Mazza created MTOMCAT-198: -- Summary: Fix base classes for redeploy and redeploy-only goals Key: MTOMCAT-198 URL: https://issues.apache.org/jira/browse/MTOMCAT-198 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat7 Affects Versions: 2.1 Reporter: Glen Mazza Assignee: Olivier Lamy (*$^¨%`£) Hi, I've noticed some problems with certain of the goals: 1.) The redeploy-only goal is incorrectly spelled redeplo-goal 2.) I believe the redeploy MOJO should extend the *DeployMojo*, not the AbstractDeployWarMojo, as it by definition is the DeployMojo with the isUpdate() set to true. 3.) The redeploy-only mojo should extend the DeployOnlyMojo (same reason). 4.) The redeploy-only mojo incorrectly has @Execute( phase = LifecyclePhase.PACKAGE ) defined. -- 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: r1430970 - in /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy: RedeployMojo.java RedeployOnlyMojo.java
Author: olamy
Date: Wed Jan 9 17:45:18 2013
New Revision: 1430970
URL: http://svn.apache.org/viewvc?rev=1430970view=rev
Log:
[MTOMCAT-198] Fix base classes for redeploy and redeploy-only goals
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java?rev=1430970r1=1430969r2=1430970view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java
Wed Jan 9 17:45:18 2013
@@ -32,7 +32,7 @@ import org.apache.maven.plugins.annotati
@Mojo( name = redeploy )
@Execute( phase = LifecyclePhase.PACKAGE )
public class RedeployMojo
-extends AbstractDeployWarMojo
+extends DeployMojo
{
@Override
protected boolean isUpdate()
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java?rev=1430970r1=1430969r2=1430970view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java
Wed Jan 9 17:45:18 2013
@@ -28,10 +28,9 @@ import org.apache.maven.plugins.annotati
*
* @since 2.1
*/
-@Mojo( name = redeplo-only )
-@Execute( phase = LifecyclePhase.PACKAGE )
+@Mojo( name = redeploy-only )
public class RedeployOnlyMojo
-extends AbstractDeployWarMojo
+extends DeployOnlyMojo
{
@Override
protected boolean isUpdate()
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-198) Fix base classes for redeploy and redeploy-only goals
[ https://issues.apache.org/jira/browse/MTOMCAT-198?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) closed MTOMCAT-198. -- Resolution: Fixed Fix Version/s: 2.1 fixed http://svn.apache.org/r1430970 Thanks ! Fix base classes for redeploy and redeploy-only goals - Key: MTOMCAT-198 URL: https://issues.apache.org/jira/browse/MTOMCAT-198 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat7 Affects Versions: 2.1 Reporter: Glen Mazza Assignee: Olivier Lamy (*$^¨%`£) Fix For: 2.1 Hi, I've noticed some problems with certain of the goals: 1.) The redeploy-only goal is incorrectly spelled redeplo-goal 2.) I believe the redeploy MOJO should extend the *DeployMojo*, not the AbstractDeployWarMojo, as it by definition is the DeployMojo with the isUpdate() set to true. 3.) The redeploy-only mojo should extend the DeployOnlyMojo (same reason). 4.) The redeploy-only mojo incorrectly has @Execute( phase = LifecyclePhase.PACKAGE ) defined. -- 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: r1430971 - in /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy: DeployMojo.java DeployOnlyMojo.java RedeployMojo.java RedeployOnl
Author: olamy
Date: Wed Jan 9 17:45:54 2013
New Revision: 1430971
URL: http://svn.apache.org/viewvc?rev=1430971view=rev
Log:
fix format and not used imports
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployOnlyMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/UndeployMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.java?rev=1430971r1=1430970r2=1430971view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.java
Wed Jan 9 17:45:54 2013
@@ -28,8 +28,8 @@ import org.apache.maven.plugins.annotati
*
* @author Mark Hobson markhob...@gmail.com
*/
-@Mojo( name = deploy )
-@Execute( phase = LifecyclePhase.PACKAGE )
+@Mojo(name = deploy)
+@Execute(phase = LifecyclePhase.PACKAGE)
public class DeployMojo
extends AbstractDeployWarMojo
{
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployOnlyMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployOnlyMojo.java?rev=1430971r1=1430970r2=1430971view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployOnlyMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployOnlyMojo.java
Wed Jan 9 17:45:54 2013
@@ -27,7 +27,7 @@ import org.apache.maven.plugins.annotati
* @author olamy
* @since 1.0-alpha-2
*/
-@Mojo( name = deploy-only )
+@Mojo(name = deploy-only)
public class DeployOnlyMojo
extends AbstractDeployWarMojo
{
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java?rev=1430971r1=1430970r2=1430971view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java
Wed Jan 9 17:45:54 2013
@@ -29,8 +29,8 @@ import org.apache.maven.plugins.annotati
* @author Olivier Lamy
* @since 2.1
*/
-@Mojo( name = redeploy )
-@Execute( phase = LifecyclePhase.PACKAGE )
+@Mojo(name = redeploy)
+@Execute(phase = LifecyclePhase.PACKAGE)
public class RedeployMojo
extends DeployMojo
{
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java?rev=1430971r1=1430970r2=1430971view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java
Wed Jan 9 17:45:54 2013
@@ -19,8 +19,6 @@ package org.apache.tomcat.maven.plugin.t
* under the License.
*/
-import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
/**
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/UndeployMojo.java
URL:
[Bug 54386] [FR] Jar's static content extraction for CDN from (JSR315-§10.10)
https://issues.apache.org/bugzilla/show_bug.cgi?id=54386 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #8 from Christopher Schultz ch...@christopherschultz.net --- (In reply to comment #7) Well, the classpath:/META-INF/resources/ identifier load the correct resources, as it is result of the current webapp-classloader. This is even better than use ant scripts (indeed pathological). Well, perhaps it is more convenient for you. Adding something like this to Tomcat doesn't make any sense because it's a deployment detail, not anything to do with actually running the web application. Think about it this way: you want to modify Tomcat so that it can launch a webapp and dump a .zip file (or fill a directory) containing all your static content. Then what are you going to do? scp it up to a CDN, right? Well, that's going to have to be manual anyway, so what's the problem with manually-generating the .zip file or content directory? Or do you propose that Tomcat be fit with connectors to upload static content to popular CDNs so you can just go to a JSP page and click upload static content and have it work? Do you see how this is really not Tomcat's business, now? To use an CDN for those static resources ANT must be installed then? Finally i must life with that fact then. Ant must be installed on the host where you prepare your builds. How do you to builds, today? If you use Java and you don't use Ant, then you probably use Maven. I'm sure Maven can be taught to do this stuff, too -- I just don't know how. If you use some other build process, then use that: unzipping files and re-zipping them is not rocket science... you can do it with a 50-line shell script if you have to. I just used Ant because it's awfully convenient. Once the static content has been extracted, you can upload it to your CDN which of course does not need Ant to be installed. Tomcat already have a deployment-process. To calculate what resources the defaultservlet would serve should not be a manual job of a person imo. The point is that using Tomcat as a conflict-resolution system is ... unnecessary. You could easily write a servlet that can dump your static resources to a ZIP file and return it in the response. There is no need for Tomcat to implement this functionality. -- 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: Rewrite functionality for 8
Remy, On 1/9/13 10:04 AM, Remy Maucherat wrote: Hi, I ported a valve providing mod_rewrite functionality (most of it) for Tomcat 8, and committed it in the sandbox. This could be easily placed in the main repository, where it would provide an additional item in the new features department for this major release. I have a documentation page for it that could be included. The basics is that it uses a rewrite.properties that has the same contents as the configuration for mod_rewrite. The rewrite.properties is placed in the host config folder if the valve is declared in a Host, or in WEB-INF in the webapp if declared in a Context. The main differences with mod_rewrite are: - (the big one) no proxy flag - no SSL attributes - less file related flags available - allows virtual host rewriting using a host flag (it replaces the host header instead of the URL and maps again) Point 2 and 3 are probably relatively easy to fix, while obviously a proxy is a more involving endeavor. There are rewrite solutions out there already, but this one does not use complex tricks (because it can simply start over request processing instead of doing more complex request dispatching, which also impacts the Servlet state), and is mod_rewrite compatible. Comments ? Is it nice or useless ? I haven't looked at the code but my first reaction was why not use url-rewrite? When you say that it can re-start request processing, you mean that you can essentially perform internal rewrites/forwards/etc. without having to use the request dispatcher? Certainly reducing stack size is not a bad idea and should improve performance. The fact that it is mostly compatible with mod_rewrite configuration syntax is definitely a plus, though url-rewrite 4 can read mod_rewrite-style configuration files, too. Finally, there is the spec-versus-implementation issue. It's great that Tomcat could provide this kind of capability, but since it is out-of-spec we might be doing a disservice to our users. I know I'm always irritated when someone posts to the users' list that they are switching from JBoss/Sun/Jetty/Whatever and Tomcat doesn't mirror some out-of-spec capability and they are all mad about it. That's what I like about url-rewrite: you make it a part of your webapp and it should work everywhere. In general, I'm -0 on the idea mostly given the existence of a well-supported alternate tool (url-rewrite) and the risks of vendor lock-in (even when the vendor is the ASF ;). -chris signature.asc Description: OpenPGP digital signature
Re: Time for tcnative 1.1.25?
All, Bump: any interest? I'd roll it myself, but I've never done something like that and I'd need a large amount of hand-holding. Thanks, -chris On 12/21/12 3:54 PM, Christopher Schultz wrote: All, There is a particular fix in tcnative-trunk ant the 1.1.x branch to the ssl.c::hasOp function that I'd like to get out there in the wild: there are now two Tomcat enhancements (one committed, one not yet committed) that rely upon it: https://issues.apache.org/bugzilla/show_bug.cgi?id=53481 https://issues.apache.org/bugzilla/show_bug.cgi?id=54324 Once another version of tcnative 1.1.x is released, Tomcat can truly support these SSL-related features. Would anyone (Mladen?) be willing to roll another release in the near future? Thanks, -chris signature.asc Description: OpenPGP digital signature
[jira] [Created] (MTOMCAT-199) Text cleanup of goal definitions
Glen Mazza created MTOMCAT-199: -- Summary: Text cleanup of goal definitions Key: MTOMCAT-199 URL: https://issues.apache.org/jira/browse/MTOMCAT-199 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Components: tomcat6, tomcat7 Affects Versions: 2.1 Reporter: Glen Mazza Assignee: Olivier Lamy (*$^¨%`£) Priority: Minor Attached patch has suggested text improvements for several of the goals (Tomcat 6 and 7 plugin.) -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-199) Text cleanup of goal definitions
[ https://issues.apache.org/jira/browse/MTOMCAT-199?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Glen Mazza updated MTOMCAT-199: --- Attachment: goalDefs.patch Text cleanup of goal definitions Key: MTOMCAT-199 URL: https://issues.apache.org/jira/browse/MTOMCAT-199 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Components: tomcat6, tomcat7 Affects Versions: 2.1 Reporter: Glen Mazza Assignee: Olivier Lamy (*$^¨%`£) Priority: Minor Attachments: goalDefs.patch Attached patch has suggested text improvements for several of the goals (Tomcat 6 and 7 plugin.) -- 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: r1431048 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java
Author: olamy Date: Wed Jan 9 20:39:41 2013 New Revision: 1431048 URL: http://svn.apache.org/viewvc?rev=1431048view=rev Log: fix link Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java?rev=1431048r1=1431047r2=1431048view=diff == --- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java (original) +++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java Wed Jan 9 20:39:41 2013 @@ -26,7 +26,7 @@ import org.apache.maven.plugins.annotati * Create a self executable jar file containing all necessary Apache Tomcat classes. * This allows for using just codejava -jar mywebapp.jar/code to run your webapp without * needing to install a Tomcat instance. - * More details a href=http://tomcat.apache.org/maven-plugin-2.0-beta-1/executable-war-jar.html;here/a. + * More details a href=http://tomcat.apache.org/maven-plugin-2.0/executable-war-jar.html;here/a. * * @author Olivier Lamy * @since 2.0 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-199) Text cleanup of goal definitions
[ https://issues.apache.org/jira/browse/MTOMCAT-199?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) closed MTOMCAT-199. -- Resolution: Fixed Fix Version/s: 2.1 fixed http://svn.apache.org/r1431047 Thanks ! Text cleanup of goal definitions Key: MTOMCAT-199 URL: https://issues.apache.org/jira/browse/MTOMCAT-199 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Components: tomcat6, tomcat7 Affects Versions: 2.1 Reporter: Glen Mazza Assignee: Olivier Lamy (*$^¨%`£) Priority: Minor Fix For: 2.1 Attachments: goalDefs.patch Attached patch has suggested text improvements for several of the goals (Tomcat 6 and 7 plugin.) -- 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] [Resolved] (MTOMCAT-193) Odd need to create an empty context.xml file for the Apache Tomcat Maven plugin to work
[ https://issues.apache.org/jira/browse/MTOMCAT-193?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Glen Mazza resolved MTOMCAT-193. Resolution: Duplicate Duplicate of MTOMCAT-119 Odd need to create an empty context.xml file for the Apache Tomcat Maven plugin to work --- Key: MTOMCAT-193 URL: https://issues.apache.org/jira/browse/MTOMCAT-193 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat7 Affects Versions: 2.0 Environment: Ubuntu Linux, JDK 7, CXF 2.7.1 Reporter: Glen Mazza Assignee: Olivier Lamy (*$^¨%`£) Priority: Minor Hi, I switched from the Codehaus to the Apache Tomcat plugin for Apache CXF's REST archetype: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml?r1=1417501r2=1418739diff_format=h For mvn clean install to work with the new plugin I needed to add an empty META-INF/context.xml file: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/META-INF/ This file was never needed by the Codehaus plugin. If I didn't add it for the Apache one, mvn clean install returns this error: [INFO] --- maven-surefire-plugin:2.10:test (default-test) @ testrest --- [INFO] Skipping execution of surefire because it has already been run for this configuration [INFO] [INFO] --- maven-war-plugin:2.1.1:war (default-war) @ testrest --- [INFO] Packaging webapp [INFO] Assembling webapp [testrest] in [/media/work1/opensource/testrest/target/testrest-0.0.1-SNAPSHOT] [INFO] Processing war project [INFO] Copying webapp resources [/media/work1/opensource/testrest/src/main/webapp] [INFO] Webapp assembled in [29 msecs] [INFO] Building war: /media/work1/opensource/testrest/target/testrest-0.0.1-SNAPSHOT.war [INFO] WEB-INF/web.xml already added, skipping [INFO] [INFO] tomcat7-maven-plugin:2.0:run-war (start-tomcat) @ testrest [INFO] [INFO] --- tomcat7-maven-plugin:2.0:run-war (start-tomcat) @ testrest --- [INFO] Running war on http://localhost:56114/jaxrs-service [INFO] Creating Tomcat server configuration at /media/work1/opensource/testrest/target/tomcat [INFO] create webapp with contextPath: /jaxrs-service Dec 08, 2012 2:37:48 PM org.apache.coyote.AbstractProtocol init INFO: Initializing ProtocolHandler [http-bio-56114] Dec 08, 2012 2:37:48 PM org.apache.catalina.core.StandardService startInternal INFO: Starting service Tomcat Dec 08, 2012 2:37:48 PM org.apache.catalina.core.StandardEngine startInternal INFO: Starting Servlet Engine: Apache Tomcat/7.0.30 Dec 08, 2012 2:37:48 PM org.apache.catalina.startup.ContextConfig processContextConfig SEVERE: Missing context.xml: file:/media/work1/opensource/testrest/target/testrest-0.0.1-SNAPSHOT/META-INF/context.xml java.io.FileNotFoundException: /media/work1/opensource/testrest/target/testrest-0.0.1-SNAPSHOT/META-INF/context.xml (No such file or directory) at java.io.FileInputStream.open(Native Method) at java.io.FileInputStream.init(FileInputStream.java:138) at java.io.FileInputStream.init(FileInputStream.java:97) at sun.net.www.protocol.file.FileURLConnection.connect(FileURLConnection.java:90) at sun.net.www.protocol.file.FileURLConnection.getInputStream(FileURLConnection.java:188) at java.net.URL.openStream(URL.java:1037) at org.apache.catalina.startup.ContextConfig.processContextConfig(ContextConfig.java:618) at org.apache.catalina.startup.ContextConfig.contextConfig(ContextConfig.java:599) at org.apache.catalina.startup.ContextConfig.init(ContextConfig.java:837) at org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java:387) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90) at org.apache.catalina.util.LifecycleBase.setStateInternal(LifecycleBase.java:401) at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:110) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:139) at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1559) at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1549) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at
svn commit: r1431052 [6/13] - 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
Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/sonar.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/sonar.html?rev=1431052r1=1431051r2=1431052view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/sonar.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/sonar.html Wed Jan 9 20:46:35 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 7, 2013 + | Generated by Apache Maven Doxia at Jan 9, 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=20130107 / +meta name=Date-Revision-mmdd content=20130109 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin :: Integration Tests - Sonar/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: 07 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 09 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/tomcat-maven-plugin-it/source-repository.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/source-repository.html?rev=1431052r1=1431051r2=1431052view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/source-repository.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/source-repository.html Wed Jan 9 20:46:35 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 7, 2013 + | Generated by Apache Maven Doxia at Jan 9, 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=20130107 / +meta name=Date-Revision-mmdd content=20130109 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin :: Integration Tests - Source Repository/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: 07 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 09 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/tomcat-maven-plugin-it/team-list.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/team-list.html?rev=1431052r1=1431051r2=1431052view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/team-list.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/team-list.html Wed Jan 9 20:46:35 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 7, 2013 + | Generated by Apache Maven Doxia at Jan 9, 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=20130107 / +meta name=Date-Revision-mmdd content=20130109 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin :: Integration Tests - Team list/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: 07 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 09 January 2013/li li class=divider pull-right|/li li id=projectVersion class=pull-rightVersion: 2.1-SNAPSHOT/li
svn commit: r1431052 [13/13] - 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-war-runner/dependency-management.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/dependency-management.html?rev=1431052r1=1431051r2=1431052view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/dependency-management.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/dependency-management.html Wed Jan 9 20:46:35 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 7, 2013 + | Generated by Apache Maven Doxia at Jan 9, 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=20130107 / +meta name=Date-Revision-mmdd content=20130109 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin :: Tomcat 7.x War Runner - Project Dependency Management/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: 07 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 09 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/distribution-management.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/distribution-management.html?rev=1431052r1=1431051r2=1431052view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/distribution-management.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/distribution-management.html Wed Jan 9 20:46:35 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 7, 2013 + | Generated by Apache Maven Doxia at Jan 9, 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=20130107 / +meta name=Date-Revision-mmdd content=20130109 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin :: Tomcat 7.x War Runner - Project Distribution Management/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: 07 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 09 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/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/index.html?rev=1431052r1=1431051r2=1431052view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/index.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat7-war-runner/index.html Wed Jan 9 20:46:35 2013 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at Jan 7, 2013 + | Generated by Apache Maven Doxia at Jan 9, 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=20130107 / +meta name=Date-Revision-mmdd content=20130109 / meta http-equiv=Content-Language content=en / titleApache Tomcat Maven Plugin :: Tomcat 7.x War Runner - About/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: 07 January 2013/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 09 January 2013/li li class=divider pull-right|/li
[Bug 54395] New: JdbcInterceptor config parameter parsing errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=54395 Bug ID: 54395 Summary: JdbcInterceptor config parameter parsing errors Product: Tomcat Modules Version: unspecified Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: jdbc-pool Assignee: dev@tomcat.apache.org Reporter: inetdev...@gmail.com Classification: Unclassified The parameter value for a JdbcInterceptor config is parsed incorrectly if there is any white-space following the closing parentheses (it includes the closing paren in the parameter value). I will be attaching two items momentarily: * a patch to resolve the issue * a unit test that fails in TRUNK but passes post-patch. The parser can behave unpredictably in several other boundary cases (extra white-space, spurious semicolons, empty parm lists, etc.) so I have attempted to document the current behavior in the unit test for clarity. It may be worth considering a more uniform response to incorrect config(s), but I skipped that here to keep it simple. I may submit an enhancement request later (with some suggestions as a patch). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54395] JdbcInterceptor config parameter parsing errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=54395 --- Comment #1 from Glen Taylor inetdev...@gmail.com --- Created attachment 29833 -- https://issues.apache.org/bugzilla/attachment.cgi?id=29833action=edit Patch for PoolProperties.java -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54395] JdbcInterceptor config parameter parsing errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=54395 --- Comment #2 from Glen Taylor inetdev...@gmail.com --- Created attachment 29835 -- https://issues.apache.org/bugzilla/attachment.cgi?id=29835action=edit New unit test for parser -- 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 54395] JdbcInterceptor config parameter parsing errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=54395
--- Comment #3 from Christopher Schultz ch...@christopherschultz.net ---
FWIW, test cases using the following idiom:
caught = null;
try {
props.getJdbcInterceptorsAsArray();
} catch (Exception e) {
caught = e;
}
assertNull(caught);
can be written somewhat more simply like this:
try {
props.getJdbcInterceptorsAsArray();
} catch (Exception e) {
assertFail(Didn't expect exception);
}
Likewise:
caught = null;
try {
props.getJdbcInterceptorsAsArray();
} catch (Exception e) {
caught = e;
}
assertNotNull(caught);
can be written like this:
try {
props.getJdbcInterceptorsAsArray();
assertFail(Expected Exception);
} catch (Exception e) {
// Expected
}
--
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 54395] JdbcInterceptor config parameter parsing errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=54395 Glen Taylor inetdevboy+apa...@gmail.com changed: What|Removed |Added Attachment #29835|0 |1 is obsolete|| --- Comment #4 from Glen Taylor inetdevboy+apa...@gmail.com --- Created attachment 29836 -- https://issues.apache.org/bugzilla/attachment.cgi?id=29836action=edit Updated unit test per comments Well, the JUnit 3.8.1 pulled in by Maven doesn't have an assertFail(String) method, but I think the fail(String) alternative is there in spirit. Point(s) taken, unit test attachment updated. I had been doing more with the Exception in case 1, and didn't refactor far enough when that changed, and case 2 was copy/paste laziness (blah,blah). Thanks for the good suggestions. -- 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 54395] JdbcInterceptor config parameter parsing errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=54395 Glen Taylor inetdevboy+apa...@gmail.com changed: What|Removed |Added Attachment #29836|application/octet-stream|text/plain mime type|| -- 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 54395] JdbcInterceptor config parameter parsing errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=54395
--- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com ---
(In reply to comment #3)
FWIW, test cases using the following idiom:
(..)
can be written somewhat more simply like this:
try {
props.getJdbcInterceptorsAsArray();
} catch (Exception e) {
assertFail(Didn't expect exception);
}
1. Just add throws Exception to the test method. JUnit notices the thrown
exception and the test does not pass.
2. It is the first time I am seeing assertFail. A typo? The method that I
know about is called fail(message) (Assert.fail(..)).
--
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 52918] Add WebSocket Support to Tomcat 6
https://issues.apache.org/bugzilla/show_bug.cgi?id=52918 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com --- I think it is better and more realistic to focus on existing implementation in Tomcat 7 and on the new Websocket API that will be in Tomcat 8. Due to the lack of interest, I am closing this as WONTFIX and will remove Filip's proposal from the STATUS file. Note, that the patch does not include latest changes from Tomcat 7, such as r1380841 and maybe others. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1431160 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Jan 10 00:10:24 2013 New Revision: 1431160 URL: http://svn.apache.org/viewvc?rev=1431160view=rev Log: Remove Filip's proposal. The issue was closed as WONTFIX. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1431160r1=1431159r2=1431160view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 10 00:10:24 2013 @@ -149,20 +149,3 @@ PATCHES/ISSUES THAT ARE STALLED markt - r1172614 needs to be included in this proposal. With that patch, my testing shows that the unloading works as designed -1: - -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52918 - Add WebSocket support to Tomcat 6 - +1: fhanik - -0: jfclere - -0: kkolinko: - - Interesting, but I do not think there is much interest in it. - If one needs this feature I would suggest to upgrade to Tomcat 7. - If one cannot upgrade to Tomcat 7 then they probably cannot - upgrade to a later Tomcat 6 either. - - The protocol specification still evolves. I think it is too risky - to implement websockets for Tomcat 6. - - Formally, the proposal does not have a link to the patch. - - The patch in Bugzilla does not include latest changes from Tomcat 7. E.g. -http://svn.apache.org/viewvc?view=revisionrevision=1380841 - (Is one supposed to just copy the current version of websocket - package from Tomcat 7 here?) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1431161 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Jan 10 00:17:22 2013 New Revision: 1431161 URL: http://svn.apache.org/viewvc?rev=1431161view=rev Log: Note that the fix for 54260 has to be backported, if we ever implement JSP unloading in Tomcat 6. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1431161r1=1431160r2=1431161view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 10 00:17:22 2013 @@ -148,4 +148,5 @@ PATCHES/ISSUES THAT ARE STALLED We can stall this item until we get some feedback about 7.0.5. markt - r1172614 needs to be included in this proposal. With that patch, my testing shows that the unloading works as designed + kkolinko - r1428358 (r1428355) is needed - a fix for BZ 54260. -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1431164 - /tomcat/trunk/webapps/docs/config/http.xml
Author: kkolinko Date: Thu Jan 10 00:40:30 2013 New Revision: 1431164 URL: http://svn.apache.org/viewvc?rev=1431164view=rev Log: A pair of typos Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1431164r1=1431163r2=1431164view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Thu Jan 10 00:40:30 2013 @@ -1040,13 +1040,13 @@ attribute name=sslProtocol required=false pThe the SSL protocol(s) to use (a single value may enable multiple protocols - see the JVM documentation for details). If not specified, the - default is codeTLS/code. The permitted values may be obainted from the + default is codeTLS/code. The permitted values may be obtained from the JVM documentation for the allowed values for algorithm when creating an codeSSLContext/code instance e.g. a href=http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#SSLContext; Oracle Java 6/a and a href=http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#SSLContext; - Oracle Java 7/a.Note: There is overlap between this attribute and + Oracle Java 7/a. Note: There is overlap between this attribute and codesslEnabledProtocols/code./p /attribute - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1431165 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/http.xml
Author: kkolinko Date: Thu Jan 10 00:42:05 2013 New Revision: 1431165 URL: http://svn.apache.org/viewvc?rev=1431165view=rev Log: Merged revision 1431164 from tomcat/trunk: A pair of typos Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1431164 Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1431165r1=1431164r2=1431165view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Thu Jan 10 00:42:05 2013 @@ -1040,13 +1040,13 @@ attribute name=sslProtocol required=false pThe the SSL protocol(s) to use (a single value may enable multiple protocols - see the JVM documentation for details). If not specified, the - default is codeTLS/code. The permitted values may be obainted from the + default is codeTLS/code. The permitted values may be obtained from the JVM documentation for the allowed values for algorithm when creating an codeSSLContext/code instance e.g. a href=http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#SSLContext; Oracle Java 6/a and a href=http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#SSLContext; - Oracle Java 7/a.Note: There is overlap between this attribute and + Oracle Java 7/a. Note: There is overlap between this attribute and codesslEnabledProtocols/code./p /attribute - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1431171 - /tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
Author: kkolinko
Date: Thu Jan 10 01:24:46 2013
New Revision: 1431171
URL: http://svn.apache.org/viewvc?rev=1431171view=rev
Log:
Fix release of processors in AjpNioProtocol. Wrong object was used as a key in
the connections map.
connections is MapS,ProcessorS, so the key in the map is socket, not
its wrapper.
Found this in a review inspired by a similar fix in r1426662.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1431171r1=1431170r2=1431171view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Thu Jan 10
01:24:46 2013
@@ -146,7 +146,8 @@ public class AjpNioProtocol extends Abst
*/
@Override
public void release(SocketWrapperNioChannel socket) {
-ProcessorNioChannel processor = connections.remove(socket);
+ProcessorNioChannel processor =
+connections.remove(socket.getSocket());
if (processor != null) {
processor.recycle(true);
recycledProcessors.push(processor);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1431172 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ajp/AjpNioProtocol.java webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Jan 10 01:31:39 2013
New Revision: 1431172
URL: http://svn.apache.org/viewvc?rev=1431172view=rev
Log:
Merged revisions 1431171 from tomcat/trunk:
Fix release of processors in AjpNioProtocol. Wrong object was used as a key in
the connections map.
connections is MapS,ProcessorS. The key in the map is socket, not its
wrapper.
Found this in a review inspired by a similar fix in r1426662.
(r1426662 itself is specific to Tomcat 8 and does not need a backport).
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1431171
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1431172r1=1431171r2=1431172view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Thu Jan
10 01:31:39 2013
@@ -143,7 +143,8 @@ public class AjpNioProtocol extends Abst
*/
@Override
public void release(SocketWrapperNioChannel socket) {
-ProcessorNioChannel processor = connections.remove(socket);
+ProcessorNioChannel processor =
+connections.remove(socket.getSocket());
if (processor != null) {
processor.recycle(true);
recycledProcessors.offer(processor);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1431172r1=1431171r2=1431172view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 10 01:31:39 2013
@@ -146,6 +146,10 @@
a Reader to read a request body with a BOM for those encodings that
require byte order marks. (markt)
/fix
+ fix
+Fix release of processors in codeAjpNioProtocol/code. Wrong object
+was used as a key in the connections map. (kkolinko)
+ /fix
/changelog
/subsection
subsection name=Jasper
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1431181 - in /tomcat/tc7.0.x/trunk: ./ build.xml
Author: kkolinko
Date: Thu Jan 10 02:37:42 2013
New Revision: 1431181
URL: http://svn.apache.org/viewvc?rev=1431181view=rev
Log:
Merged revisions r1430775 r1430791 from tomcat/trunk:
Tabs - spaces, as reminded by Checkstyle
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1430775,1430791
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1431181r1=1431180r2=1431181view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Thu Jan 10 02:37:42 2013
@@ -944,7 +944,7 @@
!-- build the jdbc-pool jar and source jar--
echo message=Building Tomcat JDBC pool libraries/
ant antfile=${tomcat.jdbc.dir}/build.xml dir=${tomcat.jdbc.dir}
-inheritall=false target=build
+ inheritall=false target=build
property name=tomcat.pool value=${tomcat.pool} /
property name=tomcat.juli.jar value=${tomcat-juli.jar} /
property name=skip.download value=set/
@@ -956,7 +956,7 @@
!-- build the jdbc-pool source jar--
echo message=Building Tomcat JDBC pool src JAR/
ant antfile=${tomcat.jdbc.dir}/build.xml dir=${tomcat.jdbc.dir}
-inheritall=false target=build-src
+ inheritall=false target=build-src
property name=tomcat.pool value=${tomcat.pool} /
property name=tomcat.juli.jar value=${tomcat-juli.jar} /
property name=skip.download value=set/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 52135] Global error page is not handled
https://issues.apache.org/bugzilla/show_bug.cgi?id=52135 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #15 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to comment #14) The fix is said to have gone into 7.0.29 I have added support for this to trunk and 7.0.x and it will be included in 7.0.29 onwards. I tested this on 7.0.30.Iam still facing this issue. Works for me, tested current 7.0.x trunk (it is near to be tagged as 7.0.35). Whatever does not work for you, you have to provide the details, including the steps required to reproduce the issue. If it is indeed a bug, open a new issue. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 52135] Global error page is not handled
https://issues.apache.org/bugzilla/show_bug.cgi?id=52135 --- Comment #16 from Konstantin Kolinko knst.koli...@gmail.com --- Created attachment 29837 -- https://issues.apache.org/bugzilla/attachment.cgi?id=29837action=edit globalerrortest.war For the record: a sample web application that I used to test that it DOES work with the current 7.0.x. Assessing index.jsp triggers a compilation error, and the error page is displayed. I should also note that the implementation for this feature ( r1355734 ) did include a test case. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54060] DigestAuthenticator doesn't parse Authorization header correctly
https://issues.apache.org/bugzilla/show_bug.cgi?id=54060 --- Comment #11 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to comment #10) The reason, it seems, is that their Digest response includes either algorithm=MD5 when it should be algorithm=MD5, or qop=auth when it should be qop=auth. Quoting of qop was allowed by r1429124 (following bug 54372 ). What clients quote the algorithm field? (I do not mind to fix it in the same way, but I would like to know the reason). -- 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 54395] JdbcInterceptor config parameter parsing errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=54395 --- Comment #6 from Christopher Schultz ch...@christopherschultz.net --- Sorry, yes, I meant fail(). As for throws Exception doesn't that change a failure into an error when JUnit runs? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-validate : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 40 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-10012013.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-10012013.jar:/srv/gump/public/workspace/junit/dist/junit-10012013.jar:/srv/gump/ public/workspace/junit/dist/junit-dep-10012013.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-14.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-10012013.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-10012013.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-10012013.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-10012013-dep.jar - Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 5.7-SNAPSHOT on 2316 files [checkstyle] /srv/gump/public/workspace/tomcat-7.0.x/build.xml:947:5: File contains tab characters (this is the first instance). BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:450: Got 1 errors and 0 warnings. Total time: 38 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 1210012013, vmgump.apache.org:vmgump:1210012013 Gump E-mail Identifier (unique within run) #41. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of HowTo/SSLCiphers by KonstantinKolinko
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The HowTo/SSLCiphers page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/HowTo/SSLCiphers
Comment:
New FAQ page - how configure the list of ciphers on a Connector
New page:
= How do I restrict the list of SSL ciphers used by Connector =
Firstly, the configuration attribute and its values depend on what HTTPS
implementation you are using. You may be using either Java-based implementation
aka JSSE mdash; with BIO and NIO connectors, or OpenSSL-based implementation
mdash; with APR connector.
'''Links:'''
* [[http://tomcat.apache.org/tomcat-7.0-doc/config/http.html|HTTP Connector
configuration reference (Tomcat 7)]]
== Using Java implementation ==
For BIO and NIO connectors the attribute that specifies the list of ciphers is
called '''ciphers''' and multiple values are separated by a comma (`,`). For
the list of possible values see the list of cipher suite names for your version
of Java, e.g.
*
[[http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#jssenames|Oracle
Java 6]]
*
[[http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#jssenames|Oracle
Java 7]]
See thread Default SSL ciphers supported by Tomcat 6 from October 2009
[[http://markmail.org/message/zn4namfhypyxum23|here]] for a short program that
displays available ciphers in your particular JVM.
'''Sample configuration:'''
{{{
ciphers=SSL_RSA_WITH_RC4_128_MD5,
SSL_RSA_WITH_RC4_128_SHA,
TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
TLS_ECDHE_RSA_WITH_RC4_128_SHA,
TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
TLS_ECDH_RSA_WITH_RC4_128_SHA
}}}
== Using OpenSSL implementation (APR connector) ==
For APR connector the attribute that specifies the list of ciphers is called
'''SSLCipherSuite''' and multiple values are separated by a colon (`:`).
Generally, it is configured in the same way as `SSLCipherSuite` directive of
[[http://httpd.apache.org/docs/2.4/mod/mod_ssl.html#sslciphersuite|mod_ssl of
Apache HTTPD server]].
For the list of possible values see
[[http://www.openssl.org/docs/ssl/SSL_CTX_set_cipher_list.html|OpenSSL
documentation]], or run `openssl.exe ciphers -v`.
'''Sample configurations:'''
a)
{{{
SSLCipherSuite=RSA:!EXP:!NULL:+HIGH:+MEDIUM:-LOW
}}}
b)
{{{
SSLCipherSuite=RC4-SHA
}}}
[[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/Security by KonstantinKolinko
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The FAQ/Security page has been changed by KonstantinKolinko: http://wiki.apache.org/tomcat/FAQ/Security?action=diffrev1=13rev2=14 Comment: Add link to HowTo/SSLCiphers 1. [[#Q8|Has Tomcat's security been independently analyzed or audited?]] 1. [[#Q9|How do I change the Server header in the response?]] 1. [[#Q10|Why are passwords in plain text?]] + 1. [[#Q11|How can I restrict the list of ciphers used for HTTPS?]] == Answers == @@ -79, +80 @@ We have a page dedicated to this topic. [[FAQ/Password]] + Anchor(Q11) + === How can I restrict the list of ciphers used for HTTPS? === + + See [[HowTo/SSLCiphers]]. [[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 HowTo by KonstantinKolinko
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The HowTo page has been changed by KonstantinKolinko: http://wiki.apache.org/tomcat/HowTo?action=diffrev1=118rev2=119 Comment: Add link to HowTo/SSLCiphers == How to configure two-way SSL authentication on Tomcat using self-signed certificates for testing/development == See http://java-notes.com/index.php/two-way-ssl-on-tomcat + + == How do I restrict the list of SSL ciphers used for HTTPS == + See [[HowTo/SSLCiphers]]. == How do I make Tomcat startup faster? == See HowTo/FasterStartUp - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
