date:20110908

Author: markt
Date: Thu Sep  8 10:57:19 2011
New Revision: 1166620

URL: http://svn.apache.org/viewvc?rev=1166620view=rev
Log:
Add caching of postConstruct and preDestroy annotations

Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1166620r1=1166619r2=1166620view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Thu 
Sep  8 10:57:19 2011
@@ -141,6 +141,7 @@ public class DefaultInstanceManager impl
 private Object newInstance(Object instance, Class? clazz) throws 
IllegalAccessException, InvocationTargetException, NamingException {
 if (!ignoreAnnotations) {
 MapString, String injections = injectionMap.get(clazz.getName());
+populateAnnotationsCache(clazz, injections);
 processAnnotations(instance, injections);
 postConstruct(instance, clazz);
 }
@@ -170,41 +171,18 @@ public class DefaultInstanceManager impl
 postConstruct(instance, superClass);
 }
 
-Method[] methods = null;
-if (Globals.IS_SECURITY_ENABLED) {
-methods = AccessController.doPrivileged(
-new PrivilegedActionMethod[](){
-@Override
-public Method[] run(){
-return clazz.getDeclaredMethods();
-}
-});
-} else {
-methods = clazz.getDeclaredMethods();
-}
-Method postConstruct = null;
-for (Method method : methods) {
-if (method.isAnnotationPresent(PostConstruct.class)) {
-if ((postConstruct != null)
-|| (method.getParameterTypes().length != 0)
-|| (Modifier.isStatic(method.getModifiers()))
-|| (method.getExceptionTypes().length  0)
-|| (!method.getReturnType().getName().equals(void))) 
{
-throw new IllegalArgumentException(Invalid PostConstruct 
annotation);
-}
-postConstruct = method;
-}
-}
-
 // At the end the postconstruct annotated
 // method is invoked
-if (postConstruct != null) {
-boolean accessibility = postConstruct.isAccessible();
-postConstruct.setAccessible(true);
-postConstruct.invoke(instance);
-postConstruct.setAccessible(accessibility);
+ListAnnotationCacheEntry annotations = annotationCache.get(clazz);
+for (AnnotationCacheEntry entry : annotations) {
+if (entry.getType() == AnnotationCacheEntryType.POST_CONSTRUCT) {
+Method postConstruct = (Method) entry.getAccessibleObject();
+boolean accessibility = postConstruct.isAccessible();
+postConstruct.setAccessible(true);
+postConstruct.invoke(instance);
+postConstruct.setAccessible(accessibility);
+}
 }
-
 }
 
 
@@ -224,64 +202,42 @@ public class DefaultInstanceManager impl
 preDestroy(instance, superClass);
 }
 
-Method[] methods;
-if (Globals.IS_SECURITY_ENABLED) {
-methods = AccessController.doPrivileged(
-new PrivilegedActionMethod[](){
-@Override
-public Method[] run(){
-return clazz.getDeclaredMethods();
-}
-});
-} else {
-methods = clazz.getDeclaredMethods();
-}
-Method preDestroy = null;
-for (Method method : methods) {
-if (method.isAnnotationPresent(PreDestroy.class)) {
-if ((method.getParameterTypes().length != 0)
-|| (Modifier.isStatic(method.getModifiers()))
-|| (method.getExceptionTypes().length  0)
-|| (!method.getReturnType().getName().equals(void))) 
{
-throw new IllegalArgumentException(Invalid PreDestroy 
annotation);
-}
-preDestroy = method;
-break;
-}
-}
-
 // At the end the postconstruct annotated
 // method is invoked
-if (preDestroy != null) {
-boolean accessibility = preDestroy.isAccessible();
-preDestroy.setAccessible(true);
-preDestroy.invoke(instance);
-preDestroy.setAccessible(accessibility);
+ListAnnotationCacheEntry annotations = annotationCache.get(clazz);
+for (AnnotationCacheEntry entry : annotations) {
+if

svn commit: r1166622 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java

Author: markt
Date: Thu Sep  8 10:59:04 2011
New Revision: 1166622

URL: http://svn.apache.org/viewvc?rev=1166622view=rev
Log:
Add caching of postConstruct and preDestroy annotations

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep  8 10:59:04 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1166622r1=1166621r2=1166622view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
Thu Sep  8 10:59:04 2011
@@ -141,6 +141,7 @@ public class DefaultInstanceManager impl
 private Object newInstance(Object instance, Class? clazz) throws 
IllegalAccessException, InvocationTargetException, NamingException {
 if (!ignoreAnnotations) {
 MapString, String injections = injectionMap.get(clazz.getName());
+populateAnnotationsCache(clazz, injections);
 processAnnotations(instance, injections);
 postConstruct(instance, clazz);
 }
@@ -170,41 +171,18 @@ public class DefaultInstanceManager impl
 postConstruct(instance, superClass);
 }
 
-Method[] methods = null;
-if (Globals.IS_SECURITY_ENABLED) {
-methods = AccessController.doPrivileged(
-new PrivilegedActionMethod[](){
-@Override
-public Method[] run(){
-return clazz.getDeclaredMethods();
-}
-});
-} else {
-methods = clazz.getDeclaredMethods();
-}
-Method postConstruct = null;
-for (Method method : methods) {
-if (method.isAnnotationPresent(PostConstruct.class)) {
-if ((postConstruct != null)
-|| (method.getParameterTypes().length != 0)
-|| (Modifier.isStatic(method.getModifiers()))
-|| (method.getExceptionTypes().length  0)
-|| (!method.getReturnType().getName().equals(void))) 
{
-throw new IllegalArgumentException(Invalid PostConstruct 
annotation);
-}
-postConstruct = method;
-}
-}
-
 // At the end the postconstruct annotated
 // method is invoked
-if (postConstruct != null) {
-boolean accessibility = postConstruct.isAccessible();
-postConstruct.setAccessible(true);
-postConstruct.invoke(instance);
-postConstruct.setAccessible(accessibility);
+ListAnnotationCacheEntry annotations = annotationCache.get(clazz);
+for (AnnotationCacheEntry entry : annotations) {
+if (entry.getType() == AnnotationCacheEntryType.POST_CONSTRUCT) {
+Method postConstruct = (Method) entry.getAccessibleObject();
+boolean accessibility = postConstruct.isAccessible();
+

svn commit: r1166624 - /tomcat/tc7.0.x/trunk/modules/

2011-09-08 Thread kfujino

Author: kfujino
Date: Thu Sep  8 11:03:08 2011
New Revision: 1166624

URL: http://svn.apache.org/viewvc?rev=1166624view=rev
Log:
Update external.

Modified:
tomcat/tc7.0.x/trunk/modules/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/modules/
--
--- svn:externals (original)
+++ svn:externals Thu Sep  8 11:03:08 2011
@@ -1 +1 @@
-^/tomcat/trunk/modules/jdbc-pool@1163986 jdbc-pool
+^/tomcat/trunk/modules/jdbc-pool@1166619 jdbc-pool



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166626 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2011-09-08 Thread kfujino

Author: kfujino
Date: Thu Sep  8 11:08:56 2011
New Revision: 1166626

URL: http://svn.apache.org/viewvc?rev=1166626view=rev
Log:
update changelog for 1166619.

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=1166626r1=1166625r2=1166626view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep  8 11:08:56 2011
@@ -127,6 +127,11 @@
 less than or equal to 0.
 ArrayBlockingQueue doesn't allow capacity of 0 or less. (kfujino)
   /fix
+  fix
+In jdbc-pool: validatorClassName and suspectTimeout are ignored. 
+In order to support them correctly, validatorClassName and 
+suspectTimeout are added to a property list. (kfujino)
+  /fix
 /changelog
   /subsection  
 /section



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 51786] New: Discarded connection stay active in pool

2011-09-08 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=51786

 Bug #: 51786
   Summary: Discarded connection stay active in pool
   Product: Tomcat Modules
   Version: unspecified
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: jdbc-pool
AssignedTo: dev@tomcat.apache.org
ReportedBy: jul...@vaudour.net
Classification: Unclassified


Hi,
I wrote an JdbcInterceptor that flag connection as discarded in case of
Exception that makes the connection unusable.
The problem is:
when I call close on the connection, it is not returned to the pool and it is
still considered as an active connection in the pool.
The cause of the problem is those pieces of code in ProxyConnection:

if (compare(CLOSE_VAL,method)) {
if (isClosed()) return null; //noop for already closed.
PooledConnection poolc = this.connection;
this.connection = null;
pool.returnConnection(poolc);
return null;
}


and

public boolean isClosed() {
return connection==null || connection.isDiscarded();
}

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 51786] Discarded connection stay active in pool

2011-09-08 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=51786

seneque jul...@vaudour.net changed:

   What|Removed |Added

 CC||jul...@vaudour.net

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166644 - /tomcat/site/trunk/

Author: olamy
Date: Thu Sep  8 12:04:00 2011
New Revision: 1166644

URL: http://svn.apache.org/viewvc?rev=1166644view=rev
Log:
ignore idea file

Modified:
tomcat/site/trunk/   (props changed)

Propchange: tomcat/site/trunk/
--
--- svn:ignore (original)
+++ svn:ignore Thu Sep  8 12:04:00 2011
@@ -1 +1,2 @@
 .project
+*.iml



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166651 - /tomcat/maven-plugin/trunk/pom.xml

Author: olamy
Date: Thu Sep  8 12:21:56 2011
New Revision: 1166651

URL: http://svn.apache.org/viewvc?rev=1166651view=rev
Log:
use a versionned site deployment path

Modified:
tomcat/maven-plugin/trunk/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1166651r1=1166650r2=1166651view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Thu Sep  8 12:21:56 2011
@@ -320,7 +320,7 @@
   distributionManagement
 site
   idapache.website/id
-  urlscp://people.apache.org/www/tomcat.apache.org/maven-plugin/url
+  
urlscp://people.apache.org/www/tomcat.apache.org/maven-plugin-${project.version}/url
 /site
   /distributionManagement
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[jira] [Updated] (MTOMCAT-96) deployment of the site in the tomcat land

2011-09-08 Thread Olivier Lamy (JIRA)


 [ 
https://issues.apache.org/jira/browse/MTOMCAT-96?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Olivier Lamy updated MTOMCAT-96:


Fix Version/s: 2.0

 deployment of the site in the tomcat land
 -

 Key: MTOMCAT-96
 URL: https://issues.apache.org/jira/browse/MTOMCAT-96
 Project: Maven 2.x Tomcat Plugin
  Issue Type: Task
Reporter: Olivier Lamy
Assignee: Olivier Lamy
 Fix For: 2.0


 The goal is to deploy the generated maven site to 
 http://tomcat.apache.org/maven-plugin/ .
 And add a link to it in Tomcat home called Maven Plugin just below the 
 existing Taglibs link.
 Let me know if that makes sense ?

--
This message is automatically generated by JIRA.
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: r1166654 - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

Author: olamy
Date: Thu Sep  8 12:30:21 2011
New Revision: 1166654

URL: http://svn.apache.org/viewvc?rev=1166654view=rev
Log:
add a page for Maven Plugin and a link : so all pages regenerated (note : olamy 
is a French native so all typo fixes will be appreciate :-)

Added:
tomcat/site/trunk/docs/maven-plugin.html
tomcat/site/trunk/xdocs/maven-plugin.xml
Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/docs/contact.html
tomcat/site/trunk/docs/download-55.html
tomcat/site/trunk/docs/download-60.html
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/download-connectors.html
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/docs/findhelp.html
tomcat/site/trunk/docs/getinvolved.html
tomcat/site/trunk/docs/heritage.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/irc.html
tomcat/site/trunk/docs/legal.html
tomcat/site/trunk/docs/lists.html
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/resources.html
tomcat/site/trunk/docs/security-3.html
tomcat/site/trunk/docs/security-4.html
tomcat/site/trunk/docs/security-5.html
tomcat/site/trunk/docs/security-6.html
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/docs/security-impact.html
tomcat/site/trunk/docs/security-jk.html
tomcat/site/trunk/docs/security-native.html
tomcat/site/trunk/docs/security.html
tomcat/site/trunk/docs/svn.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/stylesheets/project.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1166654r1=1166653r2=1166654view=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Thu Sep  8 12:30:21 2011
@@ -57,6 +57,9 @@
 li
 a href=./taglibs/Taglibs/a
 /li
+li
+a href=./maven-plugin.htmlMaven Plugin/a
+/li
 /ul
 p
 strongDownload/strong

Modified: tomcat/site/trunk/docs/ci.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1166654r1=1166653r2=1166654view=diff
==
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Thu Sep  8 12:30:21 2011
@@ -56,6 +56,9 @@
 li
 a href=./taglibs/Taglibs/a
 /li
+li
+a href=./maven-plugin.htmlMaven Plugin/a
+/li
 /ul
 p
 strongDownload/strong

Modified: tomcat/site/trunk/docs/contact.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1166654r1=1166653r2=1166654view=diff
==
--- tomcat/site/trunk/docs/contact.html (original)
+++ tomcat/site/trunk/docs/contact.html Thu Sep  8 12:30:21 2011
@@ -56,6 +56,9 @@
 li
 a href=./taglibs/Taglibs/a
 /li
+li
+a href=./maven-plugin.htmlMaven Plugin/a
+/li
 /ul
 p
 strongDownload/strong

Modified: tomcat/site/trunk/docs/download-55.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=1166654r1=1166653r2=1166654view=diff
==
--- tomcat/site/trunk/docs/download-55.html (original)
+++ tomcat/site/trunk/docs/download-55.html Thu Sep  8 12:30:21 2011
@@ -56,6 +56,9 @@
 li
 a href=./taglibs/Taglibs/a
 /li
+li
+a href=./maven-plugin.htmlMaven Plugin/a
+/li
 /ul
 p
 strongDownload/strong

Modified: tomcat/site/trunk/docs/download-60.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1166654r1=1166653r2=1166654view=diff
==
--- tomcat/site/trunk/docs/download-60.html (original)
+++ tomcat/site/trunk/docs/download-60.html Thu Sep  8 12:30:21 2011
@@ -3,17 +3,17 @@
 html
 head
 titleApache Tomcat - Apache Tomcat 6 Downloads/title
-link rel=stylesheet href=stylesheets/tomcat.css type=text/css /
-link media=print rel=stylesheet href=stylesheets/tomcat-printer.css 
type=text/css /
+link type=text/css href=stylesheets/tomcat.css rel=stylesheet/
+link type=text/css href=stylesheets/tomcat-printer.css rel=stylesheet 
media=print/
 /head
-body vlink=#525D76 alink=#525D76 link=#525D76 text=#00 
bgcolor=#ff
-table cellspacing=0 width=100% border=0
+body bgcolor=#ff text=#00 link=#525D76 alink=#525D76 
vlink=#525D76
+table border=0 width=100% cellspacing=0
 !--PAGE HEADER--
 tr
 td
 !--PROJECT LOGO--
 a href=http://tomcat.apache.org/;
-img border=0 alt=Tomcat Logo align=left src=./images/tomcat.gif /
+img src=./images/tomcat.gif align=left alt=Tomcat Logo border=0/
 /a
 /td
 td
@@ -24,28 +24,28 @@
 td
 !--APACHE LOGO--
 a href=http://www.apache.org/;
-img border=0 alt=Apache Logo

svn commit: r1166655 - in /tomcat/site/trunk: docs/whoweare.html xdocs/whoweare.xml

Author: olamy
Date: Thu Sep  8 12:33:23 2011
New Revision: 1166655

URL: http://svn.apache.org/viewvc?rev=1166655view=rev
Log:
added myself in the whoweare page

Modified:
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/whoweare.xml

Modified: tomcat/site/trunk/docs/whoweare.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1166655r1=1166654r2=1166655view=diff
==
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Thu Sep  8 12:33:23 2011
@@ -340,6 +340,11 @@ A complete list of all the Apache Commit
 
 
 p
+bOlivier Lamy/b (olamy at apache.org)br/
+/p
+
+
+p
 bSylvain Laurent/b (slaurent at apache.org)br/
 /p
 

Modified: tomcat/site/trunk/xdocs/whoweare.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1166655r1=1166654r2=1166655view=diff
==
--- tomcat/site/trunk/xdocs/whoweare.xml (original)
+++ tomcat/site/trunk/xdocs/whoweare.xml Thu Sep  8 12:33:23 2011
@@ -85,6 +85,9 @@ A complete list of all the Apache Commit
 pbKonstantin Kolinko/b (kkolinko at apache.org)br//p
 !--Your bio goes here--
 
+pbOlivier Lamy/b (olamy at apache.org)br//p
+!--Your bio goes here--
+
 pbSylvain Laurent/b (slaurent at apache.org)br//p
 !--Your bio goes here--
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166686 - in /tomcat/trunk: java/org/apache/catalina/Globals.java java/org/apache/catalina/connector/Request.java java/org/apache/catalina/valves/SSLValve.java java/org/apache/tomcat/util

Author: markt
Date: Thu Sep  8 13:43:02 2011
New Revision: 1166686

URL: http://svn.apache.org/viewvc?rev=1166686view=rev
Log:
Tomcat 6 introduced a custom attribute for SSL session ID.
Servlet 3 introduced a standard attribute for this.
Support both, deprecating the custom attribute.

Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
tomcat/trunk/webapps/docs/ssl-howto.xml

Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1166686r1=1166685r2=1166686view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Thu Sep  8 13:43:02 2011
@@ -98,9 +98,15 @@ public final class Globals {
  * for this SSL connection (as an object of type java.lang.String).
  */
 public static final String SSL_SESSION_ID_ATTR =
+javax.servlet.request.ssl_session_id;
+/**
+ * Tomcat specific attribute as used in Tomcat 6.
+ * @deprecated
+ */
+@Deprecated
+public static final String SSL_SESSION_ID_TOMCAT_ATTR =
 javax.servlet.request.ssl_session;
 
-
 /**
  * The request attribute key for the session manager.
  * This one is a Tomcat extension to the Servlet spec.

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1166686r1=1166685r2=1166686view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Sep  8 
13:43:02 2011
@@ -965,6 +965,7 @@ public class Request
 attr = coyoteRequest.getAttribute(Globals.SSL_SESSION_ID_ATTR);
 if(attr != null) {
 attributes.put(Globals.SSL_SESSION_ID_ATTR, attr);
+attributes.put(Globals.SSL_SESSION_ID_TOMCAT_ATTR, attr);
 }
 attr = coyoteRequest.getAttribute(Globals.SSL_SESSION_MGR_ATTR);
 if(attr != null) {
@@ -985,6 +986,7 @@ public class Request
 Globals.CIPHER_SUITE_ATTR.equals(name) ||
 Globals.KEY_SIZE_ATTR.equals(name)  ||
 Globals.SSL_SESSION_ID_ATTR.equals(name) ||
+Globals.SSL_SESSION_ID_TOMCAT_ATTR.equals(name) ||
 Globals.SSL_SESSION_MGR_ATTR.equals(name);
 }
 
@@ -1003,6 +1005,8 @@ public class Request
  * li{@link Globals#CIPHER_SUITE_ATTR} (SSL connections only)/li
  * li{@link Globals#KEY_SIZE_ATTR} (SSL connections only)/li
  * li{@link Globals#SSL_SESSION_ID_ATTR} (SSL connections only)/li
+ * li{@link Globals#SSL_SESSION_ID_TOMCAT_ATTR} (SSL connections only)
+ * /li
  * li{@link Globals#SSL_SESSION_MGR_ATTR} (SSL connections only)/li
  * /ul
  * The underlying connector may also expose request attributes. These all

Modified: tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=1166686r1=1166685r2=1166686view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java Thu Sep  8 
13:43:02 2011
@@ -125,6 +125,7 @@ public class SSLValve extends ValveBase 
 strcert0 = mygetHeader(request, ssl_session_id);
 if (strcert0 != null) {
 request.setAttribute(Globals.SSL_SESSION_ID_ATTR, strcert0);
+request.setAttribute(Globals.SSL_SESSION_ID_TOMCAT_ATTR, strcert0);
 }
 strcert0 = mygetHeader(request, ssl_cipher_usekeysize);
 if (strcert0 != null) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java?rev=1166686r1=1166685r2=1166686view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java Thu Sep  8 
13:43:02 2011
@@ -45,7 +45,7 @@ public interface SSLSupport {
  * This one is a Tomcat extension to the Servlet spec.
  */
 public static final String SESSION_ID_KEY =
-javax.servlet.request.ssl_session;
+javax.servlet.request.ssl_session_id;
 
 /**
  * The request attribute key for the session manager.

Modified: tomcat/trunk/webapps/docs/ssl-howto.xml

svn commit: r1166689 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/valves/ java/org/apache/tomcat/util/net/ webapps/docs/

Author: markt
Date: Thu Sep  8 13:49:50 2011
New Revision: 1166689

URL: http://svn.apache.org/viewvc?rev=1166689view=rev
Log:
Tomcat 6 introduced a custom attribute for SSL session ID.
Servlet 3 introduced a standard attribute for this.
Support both, deprecating the custom attribute.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep  8 13:49:50 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1166689r1=1166688r2=1166689view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java Thu Sep  8 
13:49:50 2011
@@ -98,9 +98,15 @@ public final class Globals {
  * for this SSL connection (as an object of type java.lang.String).
  */
 public static final String SSL_SESSION_ID_ATTR =
+javax.servlet.request.ssl_session_id;
+/**
+ * Tomcat specific attribute as used in Tomcat 6.
+ * @deprecated
+ */
+@Deprecated
+public static final String SSL_SESSION_ID_TOMCAT_ATTR =
 javax.servlet.request.ssl_session;
 
-
 /**
  * The request attribute key for the session manager.
  * This one is a Tomcat extension to the Servlet spec.

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1166689r1=1166688r2=1166689view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Thu 
Sep  8 13:49:50 2011
@@ -965,6 +965,7 @@ public class Request
 attr = coyoteRequest.getAttribute(Globals.SSL_SESSION_ID_ATTR);
 if(attr != null) {
 attributes.put(Globals.SSL_SESSION_ID_ATTR, attr);
+attributes.put(Globals.SSL_SESSION_ID_TOMCAT_ATTR, attr);
 }
 attr = coyoteRequest.getAttribute(Globals.SSL_SESSION_MGR_ATTR);
 if(attr != null) {
@@ -985,6 +986,7 @@ public class Request
 Globals.CIPHER_SUITE_ATTR.equals(name) ||
 Globals.KEY_SIZE_ATTR.equals(name)  ||
 Globals.SSL_SESSION_ID_ATTR.equals(name) ||
+Globals.SSL_SESSION_ID_TOMCAT_ATTR.equals(name) ||
 Globals.SSL_SESSION_MGR_ATTR.equals(name);
 }
 
@@ -1003,6 +1005,8 @@ public class Request
  * li{@link Globals#CIPHER_SUITE_ATTR} (SSL connections only)/li
  * li{@link Globals#KEY_SIZE_ATTR} (SSL connections only)/li
  * li{@link Globals#SSL_SESSION_ID_ATTR} (SSL connections only)/li
+ * li{@link

svn commit: r1166690 - in /tomcat/trunk/java/org/apache/catalina: Globals.java connector/Request.java valves/SSLValve.java

Author: markt
Date: Thu Sep  8 13:53:02 2011
New Revision: 1166690

URL: http://svn.apache.org/viewvc?rev=1166690view=rev
Log:
Remove deprecated code

Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java

Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1166690r1=1166689r2=1166690view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Thu Sep  8 13:53:02 2011
@@ -99,13 +99,7 @@ public final class Globals {
  */
 public static final String SSL_SESSION_ID_ATTR =
 javax.servlet.request.ssl_session_id;
-/**
- * Tomcat specific attribute as used in Tomcat 6.
- * @deprecated
- */
-@Deprecated
-public static final String SSL_SESSION_ID_TOMCAT_ATTR =
-javax.servlet.request.ssl_session;
+
 
 /**
  * The request attribute key for the session manager.

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1166690r1=1166689r2=1166690view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Sep  8 
13:53:02 2011
@@ -965,7 +965,6 @@ public class Request
 attr = coyoteRequest.getAttribute(Globals.SSL_SESSION_ID_ATTR);
 if(attr != null) {
 attributes.put(Globals.SSL_SESSION_ID_ATTR, attr);
-attributes.put(Globals.SSL_SESSION_ID_TOMCAT_ATTR, attr);
 }
 attr = coyoteRequest.getAttribute(Globals.SSL_SESSION_MGR_ATTR);
 if(attr != null) {
@@ -986,7 +985,6 @@ public class Request
 Globals.CIPHER_SUITE_ATTR.equals(name) ||
 Globals.KEY_SIZE_ATTR.equals(name)  ||
 Globals.SSL_SESSION_ID_ATTR.equals(name) ||
-Globals.SSL_SESSION_ID_TOMCAT_ATTR.equals(name) ||
 Globals.SSL_SESSION_MGR_ATTR.equals(name);
 }
 
@@ -1005,8 +1003,6 @@ public class Request
  * li{@link Globals#CIPHER_SUITE_ATTR} (SSL connections only)/li
  * li{@link Globals#KEY_SIZE_ATTR} (SSL connections only)/li
  * li{@link Globals#SSL_SESSION_ID_ATTR} (SSL connections only)/li
- * li{@link Globals#SSL_SESSION_ID_TOMCAT_ATTR} (SSL connections only)
- * /li
  * li{@link Globals#SSL_SESSION_MGR_ATTR} (SSL connections only)/li
  * /ul
  * The underlying connector may also expose request attributes. These all

Modified: tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=1166690r1=1166689r2=1166690view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java Thu Sep  8 
13:53:02 2011
@@ -125,7 +125,6 @@ public class SSLValve extends ValveBase 
 strcert0 = mygetHeader(request, ssl_session_id);
 if (strcert0 != null) {
 request.setAttribute(Globals.SSL_SESSION_ID_ATTR, strcert0);
-request.setAttribute(Globals.SSL_SESSION_ID_TOMCAT_ATTR, strcert0);
 }
 strcert0 = mygetHeader(request, ssl_cipher_usekeysize);
 if (strcert0 != null) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166691 - /tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java

Author: markt
Date: Thu Sep  8 13:54:27 2011
New Revision: 1166691

URL: http://svn.apache.org/viewvc?rev=1166691view=rev
Log:
Remove unused import

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java?rev=1166691r1=1166690r2=1166691view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
 Thu Sep  8 13:54:27 2011
@@ -20,7 +20,6 @@ package org.apache.tomcat.jdbc.test;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Random;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166693 - /tomcat/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java

Author: markt
Date: Thu Sep  8 13:58:53 2011
New Revision: 1166693

URL: http://svn.apache.org/viewvc?rev=1166693view=rev
Log:
Remove unused code

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java?rev=1166693r1=1166692r2=1166693view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java 
Thu Sep  8 13:58:53 2011
@@ -31,10 +31,11 @@ import java.net.Socket;
  */
 public class DefaultServerSocketFactory implements ServerSocketFactory {
 
-private AbstractEndpoint endpoint;
-
+/**
+ * 
+ * @param endpoint  Unused in this implementation.
+ */
 public DefaultServerSocketFactory(AbstractEndpoint endpoint) {
-this.endpoint = endpoint;
 }
 
 @Override



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166697 - in /tomcat/site/trunk: docs/migration.html xdocs/migration.xml

Author: markt
Date: Thu Sep  8 14:06:17 2011
New Revision: 1166697

URL: http://svn.apache.org/viewvc?rev=1166697view=rev
Log:
Add information on changes to request attributes

Modified:
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/xdocs/migration.xml

Modified: tomcat/site/trunk/docs/migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1166697r1=1166696r2=1166697view=diff
==
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Thu Sep  8 14:06:17 2011
@@ -293,6 +293,9 @@
 a href=#CookiesCookies/a
 /li
 li
+a href=#Request_attributesRequest attributes/a
+/li
+li
 a href=#CometComet/a
 /li
 li
@@ -1350,6 +1353,39 @@ accordingly./p
 tr
 td bgcolor=#828DA6
 font color=#ff face=arial,helvetica,sanserif
+a name=Request attributes
+!--()--
+/a
+a name=Request_attributes
+strongRequest attributes/strong
+/a
+/font
+/td
+/tr
+tr
+td
+blockquote
+
+pThe custom request attribute
+codejavax.servlet.request.ssl_session/code provided to access the SSL
+session ID has been deprecated in favour of the new, specification defined
+request attribute codejavax.servlet.request.ssl_session_id/code. 
Support
+for the custom attribute will be removed in Tomcat 8./p
+
+  /blockquote
+/td
+/tr
+tr
+td
+br/
+/td
+/tr
+/table
+
+  table border=0 cellspacing=0 cellpadding=2 width=100%
+tr
+td bgcolor=#828DA6
+font color=#ff face=arial,helvetica,sanserif
 a name=Comet
 strongComet/strong
 /a

Modified: tomcat/site/trunk/xdocs/migration.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=1166697r1=1166696r2=1166697view=diff
==
--- tomcat/site/trunk/xdocs/migration.xml (original)
+++ tomcat/site/trunk/xdocs/migration.xml Thu Sep  8 14:06:17 2011
@@ -485,6 +485,16 @@ accordingly./p
   
   /subsection
 
+  subsection name=Request attributes
+
+pThe custom request attribute
+codejavax.servlet.request.ssl_session/code provided to access the SSL
+session ID has been deprecated in favour of the new, specification defined
+request attribute codejavax.servlet.request.ssl_session_id/code. 
Support
+for the custom attribute will be removed in Tomcat 8./p
+
+  /subsection
+
   subsection name=Comet
 
 pTo enabled Comet to work correctly when running under a security 
manager,



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166699 - in /tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt: examples/add-system-properties.apt.vm examples/adjust-embedded-tomcat-version.apt.vm examples/deployment-tomcat7.

Author: olamy
Date: Thu Sep  8 14:10:39 2011
New Revision: 1166699

URL: http://svn.apache.org/viewvc?rev=1166699view=rev
Log:
fix groupId for pom samples

Modified:

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/deployment.apt.vm
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/usage.apt.vm

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm?rev=1166699r1=1166698r2=1166699view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/add-system-properties.apt.vm
 Thu Sep  8 14:10:39 2011
@@ -39,7 +39,7 @@ Adding System Properties
 plugins
   ...
   plugin
-groupIdorg.codehaus.mojo/groupId
+groupIdorg.apache.tomcat.maven/groupId
 artifactIdtomcat-maven-plugin/artifactId
 version${project.version}/version
 configuration

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm?rev=1166699r1=1166698r2=1166699view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/adjust-embedded-tomcat-version.apt.vm
 Thu Sep  8 14:10:39 2011
@@ -43,7 +43,7 @@ Adjust Tomcat Version
 pluginManagement
   plugins
 plugin
-  groupIdorg.codehaus.mojo/groupId
+  groupIdorg.apache.tomcat.maven/groupId
   artifactIdtomcat-maven-plugin/artifactId
   version${project.version}/version
   dependencies

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm?rev=1166699r1=1166698r2=1166699view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/deployment-tomcat7.apt.vm
 Thu Sep  8 14:10:39 2011
@@ -53,7 +53,7 @@ Tomcat 7 and Maven 2 plugin
 
 +--+
   plugin
-groupIdorg.codehaus.mojo/groupId
+groupIdorg.apache.tomcat.maven/groupId
 artifactIdtomcat-maven-plugin/artifactId
 version${project.version}/version
   /plugin
@@ -111,7 +111,7 @@ Tomcat 7 and Maven 2 plugin
 
 +--+
 plugin
-  groupIdorg.codehaus.mojo/groupId
+  groupIdorg.apache.tomcat.maven/groupId
   artifactIdtomcat-maven-plugin/artifactId
   version${project.version}/version
   configuration

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/deployment.apt.vm
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/deployment.apt.vm?rev=1166699r1=1166698r2=1166699view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/deployment.apt.vm
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/site/apt/examples/deployment.apt.vm
 Thu Sep  8 14:10:39 2011
@@ -71,7 +71,7 @@ mvn tomcat:deploy
 plugins
   ...
   plugin
-groupIdorg.codehaus.mojo/groupId
+groupIdorg.apache.tomcat.maven/groupId
 artifactIdtomcat-maven-plugin/artifactId
 version${project.version}/version
 configuration
@@ -125,7 +125,7 @@ mvn war:exploded tomcat:exploded
 plugins
   ...
   plugin
-groupIdorg.codehaus.mojo/groupId
+groupIdorg.apache.tomcat.maven/groupId
 artifactIdtomcat-maven-plugin/artifactId
 version${project.version}/version
 configuration
@@ -156,7 +156,7 @@ mvn war:exploded tomcat:exploded
 plugins
   ...
   plugin
-groupIdorg.codehaus.mojo/groupId
+groupIdorg.apache.tomcat.maven/groupId

svn commit: r1166709 - in /tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver: Connection.java Driver.java ResultSet.java

Author: markt
Date: Thu Sep  8 14:28:22 2011
New Revision: 1166709

URL: http://svn.apache.org/viewvc?rev=1166709view=rev
Log:
Fix Eclipse warnings

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java?rev=1166709r1=1166708r2=1166709view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
 Thu Sep  8 14:28:22 2011
@@ -50,187 +50,236 @@ public class Connection implements java.
 return info.getProperty(PooledConnection.PROP_PASSWORD);
 }
 
+@Override
 public void clearWarnings() throws SQLException {
 }
 
+@Override
 public void close() throws SQLException {
 Driver.disconnectCount.incrementAndGet();
 }
 
+@Override
 public void commit() throws SQLException {
 }
 
+@Override
 public Array createArrayOf(String typeName, Object[] elements) throws 
SQLException {
 return null;
 }
 
+@Override
 public Blob createBlob() throws SQLException {
 return null;
 }
 
+@Override
 public Clob createClob() throws SQLException {
 return null;
 }
 
+@Override
 public NClob createNClob() throws SQLException {
 return null;
 }
 
+@Override
 public SQLXML createSQLXML() throws SQLException {
 return null;
 }
 
+@Override
 public Statement createStatement() throws SQLException {
 return new org.apache.tomcat.jdbc.test.driver.Statement();
 }
 
+@Override
 public Statement createStatement(int resultSetType, int 
resultSetConcurrency) throws SQLException {
 return new org.apache.tomcat.jdbc.test.driver.Statement();
 }
 
+@Override
 public Statement createStatement(int resultSetType, int 
resultSetConcurrency, int resultSetHoldability) throws SQLException {
 return new org.apache.tomcat.jdbc.test.driver.Statement();
 }
 
+@Override
 public Struct createStruct(String typeName, Object[] attributes) throws 
SQLException {
 return null;
 }
 
+@Override
 public boolean getAutoCommit() throws SQLException {
 return false;
 }
 
+@Override
 public String getCatalog() throws SQLException {
 return null;
 }
 
+@Override
 public Properties getClientInfo() throws SQLException {
 return null;
 }
 
+@Override
 public String getClientInfo(String name) throws SQLException {
 return null;
 }
 
+@Override
 public int getHoldability() throws SQLException {
 return 0;
 }
 
+@Override
 public DatabaseMetaData getMetaData() throws SQLException {
 return null;
 }
 
+@Override
 public int getTransactionIsolation() throws SQLException {
 return 0;
 }
 
+@Override
 public MapString, Class? getTypeMap() throws SQLException {
 return null;
 }
 
+@Override
 public SQLWarning getWarnings() throws SQLException {
 return null;
 }
 
+@Override
 public boolean isClosed() throws SQLException {
 return false;
 }
 
+@Override
 public boolean isReadOnly() throws SQLException {
 return false;
 }
 
+@Override
 public boolean isValid(int timeout) throws SQLException {
 return false;
 }
 
+@Override
 public String nativeSQL(String sql) throws SQLException {
 return null;
 }
 
+@Override
 public CallableStatement prepareCall(String sql) throws SQLException {
 return new org.apache.tomcat.jdbc.test.driver.Statement();
 }
 
+@Override
 public CallableStatement prepareCall(String sql, int resultSetType, int 
resultSetConcurrency) throws SQLException {
 return new org.apache.tomcat.jdbc.test.driver.Statement();
 }
 
+@Override
 public CallableStatement prepareCall(String sql, int resultSetType, int 
resultSetConcurrency, int resultSetHoldability) throws SQLException {
 return new org.apache.tomcat.jdbc.test.driver.Statement();
 }
 
+@Override
 public PreparedStatement prepareStatement(String sql) throws SQLException {
 return new org.apache.tomcat.jdbc.test.driver.Statement();
 }
 
+@Override
 public PreparedStatement prepareStatement(String sql, int 
autoGeneratedKeys)

svn commit: r1166712 - in /tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test: AbandonPercentageTest.java AlternateUsernameTest.java Async0IdleTestBug50477.java BorrowWaitTest.ja

Author: markt
Date: Thu Sep  8 14:32:08 2011
New Revision: 1166712

URL: http://svn.apache.org/viewvc?rev=1166712view=rev
Log:
Fix Eclipse warnings

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java?rev=1166712r1=1166711r2=1166712view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
 Thu Sep  8 14:32:08 2011
@@ -108,7 +108,7 @@ public class AbandonPercentageTest exten
 assertEquals(Number of connections active/busy should be 
+con.length,con.length,datasource.getPool().getActive());
 this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
 Thread.sleep(2500);
-this.assertTrue(Number of connections should be less than 50., 
(datasource.getPool().getActive()50));
+assertTrue(Number of connections should be less than 50., 
(datasource.getPool().getActive()50));
 this.datasource.getPoolProperties().setAbandonWhenPercentageFull(0);
 Thread.sleep(2500);
 assertEquals(Number of connections active/busy should be 
+0,0,datasource.getPool().getActive());

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java?rev=1166712r1=1166711r2=1166712view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
 Thu Sep  8 14:32:08 2011
@@ -106,6 +106,7 @@ public class AlternateUsernameTest exten
 useuser = user!=null;
 }
 
+@Override
 public TestResult call() {
 TestResult test = new TestResult();
 PooledConnection pcon = null;

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java?rev=1166712r1=1166711r2=1166712view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
 Thu Sep  8 14:32:08 2011
@@ -40,7 +40,7 @@ public class Async0IdleTestBug50477 exte
 this.datasource.getPoolProperties().setInitialSize(0);
 try {
 FutureConnection cf = 
((DataSourceProxy)datasource).getConnectionAsync();
-Connection con  = cf.get(5, TimeUnit.SECONDS);
+cf.get(5, TimeUnit.SECONDS);
 }finally {
 tearDown();
 }

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java?rev=1166712r1=1166711r2=1166712view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
 Thu Sep  8 14:32:08 2011
@@ -49,6 +49,7 @@ public class BorrowWaitTest extends Defa
 System.err.println(testWaitTimeInfinite() test is disabled.);
 return;//this would lock up the test suite
 }
+/*
 int wait = -1;
 this.init();
 this.datasource.setMaxActive(1);
@@ -64,6 +65,7 @@ public class BorrowWaitTest extends Defa
 assertTrue(Connection should have been acquired within +/- 1 
second.,true);
 }
 con.close();
+*/
 }
 
 



-
To unsubscribe, e-mail:

svn commit: r1166713 - /tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java

Author: markt
Date: Thu Sep  8 14:32:51 2011
New Revision: 1166713

URL: http://svn.apache.org/viewvc?rev=1166713view=rev
Log:
Test inrange rather than ignoring the value

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java?rev=1166713r1=1166712r2=1166713view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
 Thu Sep  8 14:32:51 2011
@@ -39,7 +39,9 @@ public class BorrowWaitTest extends Defa
 }catch (SQLException x) {
 long delta = System.currentTimeMillis();
 boolean inrange = Math.abs(wait-delta)  1000;
-assertTrue(Connection should have been acquired within +/- 1 
second.,true);
+assertTrue(
+Connection should have been acquired within +/- 1 
second.,
+inrange);
 }
 con.close();
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166717 - /tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java

Author: markt
Date: Thu Sep  8 14:37:44 2011
New Revision: 1166717

URL: http://svn.apache.org/viewvc?rev=1166717view=rev
Log:
Remove unnecessary casts

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java?rev=1166717r1=1166716r2=1166717view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java
 Thu Sep  8 14:37:44 2011
@@ -78,11 +78,11 @@ public class ConnectCountTest extends De
 minfetch = Math.min(minfetch, t.nroffetch);
 maxfetch = Math.max(maxfetch, t.nroffetch);
 if (ConnectCountTest.this.printthread)
-System.out.println(t.getName()+ : Nr-of-fetch:+t.nroffetch+ 
 Max fetch Time:+(((float)t.maxwait)/100f)+ms. :Max close 
time:+(((float)t.cmax)/100f)+ms.);
+System.out.println(t.getName()+ : Nr-of-fetch:+t.nroffetch+ 
 Max fetch Time:+t.maxwait/100f+ms. :Max close 
time:+t.cmax/100f+ms.);
 }
 System.out.println([+name+] Max fetch:+(maxfetch)+ Min 
fetch:+(minfetch)+ Average fetch:+
(((float)totalfetch))/(float)threads.length);
-System.out.println([+name+] Max 
wait:+(((float)maxwait)/100f)+ms. Min 
wait:+(((float)minwait)/100f)+ms. Average 
wait:+(float)totalwait))/(float)totalfetch)/100f)+ ms.);
+System.out.println([+name+] Max wait:+maxwait/100f+ms. Min 
wait:+minwait/100f+ms. Average 
wait:+(float)totalwait))/(float)totalfetch)/100f)+ ms.);
 System.out.println([+name+] Max active:+active+ Expected 
Active:+expected);
 
 
@@ -286,13 +286,13 @@ public class ConnectCountTest extends De
 }
 if (System.getProperty(print-thread-stats)!=null) {
 System.out.println([+getName()+] +
-\n\tMax time to retrieve 
connection:+(((float)maxwait)/1000f/1000f)+ ms.+
-\n\tTotal time to retrieve 
connection:+(((float)totalwait)/1000f/1000f)+ ms.+
-\n\tAverage time to retrieve 
connection:+(((float)totalwait)/1000f/1000f)/(float)nroffetch+ ms.+
-\n\tMax time to close 
connection:+(((float)cmax)/1000f/1000f)+ ms.+
-\n\tTotal time to close 
connection:+(((float)totalcmax)/1000f/1000f)+ ms.+
-\n\tAverage time to close 
connection:+(((float)totalcmax)/1000f/1000f)/(float)nroffetch+ ms.+
-\n\tRun time:+(((float)totalruntime)/1000f/1000f)+ ms.+
+\n\tMax time to retrieve connection:+maxwait/100f+ 
ms.+
+\n\tTotal time to retrieve 
connection:+totalwait/100f+ ms.+
+\n\tAverage time to retrieve 
connection:+totalwait/100f/nroffetch+ ms.+
+\n\tMax time to close connection:+cmax/100f+ ms.+
+\n\tTotal time to close connection:+totalcmax/100f+ 
ms.+
+\n\tAverage time to close 
connection:+totalcmax/100f/nroffetch+ ms.+
+\n\tRun time:+totalruntime/100f+ ms.+
 \n\tNr of fetch:+nroffetch);
 }
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166721 - /tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java

Author: markt
Date: Thu Sep  8 14:54:52 2011
New Revision: 1166721

URL: http://svn.apache.org/viewvc?rev=1166721view=rev
Log:
Fix Eclipse warnings

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java?rev=1166721r1=1166720r2=1166721view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java
 Thu Sep  8 14:54:52 2011
@@ -38,8 +38,8 @@ public class ConnectCountTest extends De
 }
 
 protected boolean run = true;
-protected long sleep = Long.getLong(sleep, 10);
-protected long complete = Long.getLong(complete,2);
+protected long sleep = Long.getLong(sleep, 10).longValue();
+protected long complete = Long.getLong(complete,2).longValue();
 protected boolean printthread = Boolean.getBoolean(printthread);
 CountDownLatch latch = null;
 
@@ -67,8 +67,7 @@ public class ConnectCountTest extends De
 
 protected void printThreadResults(TestThread[] threads, String name, int 
active, int expected) {
 long minfetch = Long.MAX_VALUE, maxfetch = Long.MIN_VALUE, totalfetch 
= 0;
-long maxwait = 0, minwait = Long.MAX_VALUE, averagewait = 0, totalwait 
= 0;
-float avgfetch = 0;
+long maxwait = 0, minwait = Long.MAX_VALUE, totalwait = 0;
 for (int i=0; ithreads.length; i++) {
 TestThread t = threads[i];
 totalfetch += t.nroffetch;
@@ -112,6 +111,7 @@ public class ConnectCountTest extends De
 this.run = false;
 long delta = System.currentTimeMillis() - start;
 
printThreadResults(threads,testDBCPThreads20Connections10,Driver.connectCount.get(),10);
+System.out.println(Test completed in:  + delta + ms.);
 tearDown();
 }
 
@@ -139,6 +139,7 @@ public class ConnectCountTest extends De
 this.run = false;
 long delta = System.currentTimeMillis() - start;
 
printThreadResults(threads,testPoolThreads20Connections10,Driver.connectCount.get(),10);
+System.out.println(Test completed in:  + delta + ms.);
 tearDown();
 
 }
@@ -168,6 +169,7 @@ public class ConnectCountTest extends De
 this.run = false;
 long delta = System.currentTimeMillis() - start;
 
printThreadResults(threads,testPoolThreads20Connections10Fair,Driver.connectCount.get(),10);
+System.out.println(Test completed in:  + delta + ms.);
 tearDown();
 }
  
@@ -198,6 +200,7 @@ public class ConnectCountTest extends De
 this.run = false;
 long delta = System.currentTimeMillis() - start;
 
printThreadResults(threads,testPoolThreads20Connections10FairAsync,Driver.connectCount.get(),10);
+System.out.println(Test completed in:  + delta + ms.);
 tearDown();
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Maven Artifacts Deployment

2011-09-08 Thread Olivier Lamy

Hello,
For the maven plugin, I have asked some configuration to be able to
deploy in repository.apache.org (see [1] ).
It looks to not be possible to deploy to p.a.o and to r.a.o.
I wonder how do you deploy artifacts to p.a.o ?
Could it be possible to deploy those to r.a.o ? (BTW I can help here
on writing scripts)

Thanks,
-- 
Olivier Lamy
Talend : http://talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

[1] https://issues.apache.org/jira/browse/INFRA-3906

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Mitigating AJP CPing/Forward-Request packet forgery before next releases

2011-09-08 Thread Christopher Schultz

All,
https://issues.apache.org/bugzilla/show_bug.cgi?id=51698

Mark's official report to the users' list indicates that setting a
secret for the AJP connection does the trick. (I tried this myself
before digging-up his message and can confirm that the sample code fails
when a secret is set).

Should we mention this on the Security page directly for those who
didn't read the announcement on the users' list?

Thanks,
-chris



signature.asc
Description: OpenPGP digital signature

svn commit: r1166735 - /tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/

Author: markt
Date: Thu Sep  8 15:14:43 2011
New Revision: 1166735

URL: http://svn.apache.org/viewvc?rev=1166735view=rev
Log:
Fix remaining Eclipse warnings in jdbc-pool unit tests

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultProperties.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConcurrency.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSizePreservation.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultProperties.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultProperties.java?rev=1166735r1=1166734r2=1166735view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultProperties.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultProperties.java
 Thu Sep  8 15:14:43 2011
@@ -45,8 +45,8 @@ public class DefaultProperties extends P
 username = System.getProperty(username,root);
 
 validationQuery = System.getProperty(validationQuery,SELECT 1);
-defaultAutoCommit = true;
-defaultReadOnly = false;
+defaultAutoCommit = Boolean.TRUE;
+defaultReadOnly = Boolean.FALSE;
 defaultTransactionIsolation = 
DataSourceFactory.UNKNOWN_TRANSACTIONISOLATION;
 connectionProperties = null;
 defaultCatalog = null;
@@ -67,7 +67,7 @@ public class DefaultProperties extends P
 logAbandoned = true;
 validationInterval = 0; //always validate
 initSQL = null;
-testOnConnect = false;;
+testOnConnect = false;
 dbProperties.setProperty(user,username);
 dbProperties.setProperty(password,password);
 }

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java?rev=1166735r1=1166734r2=1166735view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
 Thu Sep  8 15:14:43 2011
@@ -236,6 +236,8 @@ public class DefaultTestCase extends Tes
 PROP_REMOVEABANDONED,
 PROP_REMOVEABANDONEDTIMEOUT,
 PROP_LOGABANDONED,
+PROP_POOLPREPAREDSTATEMENTS,
+PROP_MAXOPENPREPAREDSTATEMENTS,
 PROP_CONNECTIONPROPERTIES
 };
 

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java?rev=1166735r1=1166734r2=1166735view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java
 Thu Sep  8 15:14:43 2011
@@ -37,14 +37,13 @@ public class FairnessTest extends Defaul
 }
 
 protected boolean run = true;
-protected long sleep = Long.getLong(sleep, 10);
-protected long complete = Long.getLong(complete,2);
+protected long sleep = Long.getLong(sleep, 10).longValue();
+protected long complete = Long.getLong(complete,2).longValue();
 protected boolean printthread = Boolean.getBoolean(printthread);
 CountDownLatch latch = null;
 protected void printThreadResults(TestThread[] threads, String name, int 
active, int expected) {
 long minfetch = Long.MAX_VALUE, maxfetch = Long.MIN_VALUE, totalfetch 
= 0;
-long maxwait = 0, minwait = Long.MAX_VALUE, averagewait = 0, totalwait 
= 0;
-float avgfetch = 0;
+long maxwait = 0, minwait = Long.MAX_VALUE, totalwait = 0;
 for (int i=0; ithreads.length; i++) {
 TestThread t = threads[i];
 totalfetch += t.nroffetch;
@@ -54,11 +53,11 @@ public class FairnessTest extends Defaul
 minfetch = Math.min(minfetch, t.nroffetch);
 maxfetch = Math.max(maxfetch, t.nroffetch);
 if (FairnessTest.this.printthread)
-

svn commit: r1166752 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

Author: markt
Date: Thu Sep  8 15:37:06 2011
New Revision: 1166752

URL: http://svn.apache.org/viewvc?rev=1166752view=rev
Log:
Fix possible NPE if instances aren't created through the DefaultInstanceManager 
but are destroyed through it.

Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1166752r1=1166751r2=1166752view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Thu 
Sep  8 15:37:06 2011
@@ -205,6 +205,10 @@ public class DefaultInstanceManager impl
 // At the end the postconstruct annotated
 // method is invoked
 ListAnnotationCacheEntry annotations = annotationCache.get(clazz);
+if (annotations == null) {
+// instance not created through the instance manager
+return;
+}
 for (AnnotationCacheEntry entry : annotations) {
 if (entry.getType() == AnnotationCacheEntryType.PRE_DESTROY) {
 Method preDestroy = (Method) entry.getAccessibleObject();



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166757 - in /tomcat/trunk/test/org/apache/catalina: comet/TestCometProcessor.java connector/TestMaxConnections.java session/Benchmarks.java

Author: markt
Date: Thu Sep  8 15:39:11 2011
New Revision: 1166757

URL: http://svn.apache.org/viewvc?rev=1166757view=rev
Log:
Fix Eclipse warnings in unit tests

Modified:
tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java

Modified: tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1166757r1=1166756r2=1166757view=diff
==
--- tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Thu Sep 
 8 15:39:11 2011
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpSession;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
@@ -160,6 +161,7 @@ public class TestCometProcessor extends 
 // Write should trigger an exception once the connector stops since the
 // socket should be closed
 assertNotNull(writeThread.getException());
+assertNull(readThread.getException());
 }
 
 private boolean isCometSupported() {

Modified: 
tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java?rev=1166757r1=1166756r2=1166757view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java Thu 
Sep  8 15:39:11 2011
@@ -60,7 +60,7 @@ public class TestMaxConnections extends 
 }
 
 assertTrue(The number of successful requests should have been 4-5, 
actual +passcount,4==passcount || 5==passcount);
-
+System.out.println(There were [ + connectfail + ] connection 
failures);
 }
 
 private static class ConnectThread extends Thread {

Modified: tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java?rev=1166757r1=1166756r2=1166757view=diff
==
--- tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java (original)
+++ tomcat/trunk/test/org/apache/catalina/session/Benchmarks.java Thu Sep  8 
15:39:11 2011
@@ -152,7 +152,7 @@ public class Benchmarks {
  * 16 threads - ~45,600ms
  */
 @Test
-public void testManagerBaseCreateSession() throws LifecycleException {
+public void testManagerBaseCreateSession() {
 doTestManagerBaseCreateSession(1, 100);
 doTestManagerBaseCreateSession(2, 100);
 doTestManagerBaseCreateSession(4, 100);
@@ -163,8 +163,8 @@ public class Benchmarks {
 }
 
 
-private void doTestManagerBaseCreateSession(int threadCount, int iterCount)
-throws LifecycleException {
+private void doTestManagerBaseCreateSession(int threadCount,
+int iterCount) {
 
 // Create a default session manager
 StandardManager mgr = new StandardManager();



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Maven Artifacts Deployment

On 08/09/2011 16:09, Olivier Lamy wrote:
 Hello,
 For the maven plugin, I have asked some configuration to be able to
 deploy in repository.apache.org (see [1] ).
 It looks to not be possible to deploy to p.a.o and to r.a.o.
 I wonder how do you deploy artifacts to p.a.o ?

http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?view=log

deploy-release gets used for every 7.0.x release
deploy-staging is rarely (never?) used
deploy-snapshot was used a lot before the first 7.0.x release, much less
since

Other versions have similar scripts although I am less familiar with them.

 Could it be possible to deploy those to r.a.o ? (BTW I can help here
 on writing scripts)

As long as the maven publishing process is nothing more than a one liner
that I can run on the command line and just leave to do its stuff and
the end result is that the JARs end up in Maven central then I have no
preference for how the magic happens.

At the moment, all I need to do once the release has been approved is:
ant -f mvn-pub.xml deploy-release

I would be very much against any process that requires more than the above.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Mitigating AJP CPing/Forward-Request packet forgery before next releases

On 08/09/2011 16:13, Christopher Schultz wrote:
 All, https://issues.apache.org/bugzilla/show_bug.cgi?id=51698
 
 Mark's official report to the users' list indicates that setting a 
 secret for the AJP connection does the trick. (I tried this
 myself before digging-up his message and can confirm that the
 sample code fails when a secret is set).
 
 Should we mention this on the Security page directly for those who 
 didn't read the announcement on the users' list?

No reason why not. Go for it.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166765 - /tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java

Author: olamy
Date: Thu Sep  8 15:50:35 2011
New Revision: 1166765

URL: http://svn.apache.org/viewvc?rev=1166765view=rev
Log:
fix name used ASF branding

Modified:

tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java

Modified: 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java?rev=1166765r1=1166764r2=1166765view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java
 Thu Sep  8 15:50:35 2011
@@ -45,7 +45,7 @@ public abstract class AbstractCatalinaMo
 /**
  * The name of this Maven plugin. Used to produce the user agent when 
communicating with Tomcat manager.
  */
-private String name = Tomcat Maven Plugin;
+private String name = Apache Tomcat Maven Plugin;
 
 /**
  * The default username to use when authenticating with Tomcat manager.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166769 - in /tomcat/site/trunk: docs/maven-plugin.html xdocs/maven-plugin.xml

Author: olamy
Date: Thu Sep  8 15:55:32 2011
New Revision: 1166769

URL: http://svn.apache.org/viewvc?rev=1166769view=rev
Log:
fix typo

Modified:
tomcat/site/trunk/docs/maven-plugin.html
tomcat/site/trunk/xdocs/maven-plugin.xml

Modified: tomcat/site/trunk/docs/maven-plugin.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1166769r1=1166768r2=1166769view=diff
==
--- tomcat/site/trunk/docs/maven-plugin.html (original)
+++ tomcat/site/trunk/docs/maven-plugin.html Thu Sep  8 15:55:32 2011
@@ -217,7 +217,7 @@
   p
 The Tomcat Maven Plugin provides goals to manipulate WAR projects 
within the Apache Tomcat servlet container.
 br/
-You can run your War Apache Maven project trough Maven without to 
deploy your war file in a Apache Tomcat instance.
+You can run your War Apache Maven project through Maven without 
deploying your war file to an Apache Tomcat instance.
 br/
 More details are available in the Maven generated site :
 ul

Modified: tomcat/site/trunk/xdocs/maven-plugin.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/maven-plugin.xml?rev=1166769r1=1166768r2=1166769view=diff
==
--- tomcat/site/trunk/xdocs/maven-plugin.xml (original)
+++ tomcat/site/trunk/xdocs/maven-plugin.xml Thu Sep  8 15:55:32 2011
@@ -13,7 +13,7 @@
   p
 The Tomcat Maven Plugin provides goals to manipulate WAR projects 
within the Apache Tomcat servlet container.
 br/
-You can run your War Apache Maven project trough Maven without to 
deploy your war file in a Apache Tomcat instance.
+You can run your War Apache Maven project through Maven without 
deploying your war file to an Apache Tomcat instance.
 br/
 More details are available in the Maven generated site :
 ul



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166775 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java

Author: markt
Date: Thu Sep  8 16:06:57 2011
New Revision: 1166775

URL: http://svn.apache.org/viewvc?rev=1166775view=rev
Log:
Fix possible NPE if instances aren't created through the DefaultInstanceManager 
but are destroyed through it.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep  8 16:06:57 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1166775r1=1166774r2=1166775view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
Thu Sep  8 16:06:57 2011
@@ -205,6 +205,10 @@ public class DefaultInstanceManager impl
 // At the end the postconstruct annotated
 // method is invoked
 ListAnnotationCacheEntry annotations = annotationCache.get(clazz);
+if (annotations == null) {
+// instance not created through the instance manager
+return;
+}
 for (AnnotationCacheEntry entry : annotations) {
 if (entry.getType() == AnnotationCacheEntryType.PRE_DESTROY) {
 Method preDestroy = (Method) entry.getAccessibleObject();



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Tomcat 6.0.34

2011-09-08 Thread Filip Hanik - Dev Lists


On 9/7/2011 11:48 AM, Anand, Amit (Contractor) wrote:

All,

Kinda new to tomcat but have a couple quick questions which came up regarding 
CVE-2011-3109 (Bug 51698).

Questions:

Any timeline to when stable release of 6.0.34 is supposed to be released?


Just follow this list. That's the best way to track it.


Also what does in trunk specifically mean? Does that mean if I download say 
version 6.0.29 as of now, it will have the fix?

trunk is a development source code branch, there is also one for 7.0.x and 
6.0.x tomcat versions


I do not know if this is the appropriate place to ask but would appreciate any 
help or guidance. Thank you

Amit Anand
Federal Trade Commission
Sr. Unix Engineer (Contractor)
202-326-2394





-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Mitigating AJP CPing/Forward-Request packet forgery before next releases

2011-09-08 Thread Christopher Schultz

Mark,

On 9/8/2011 11:47 AM, Mark Thomas wrote:
 On 08/09/2011 16:13, Christopher Schultz wrote:
 All, https://issues.apache.org/bugzilla/show_bug.cgi?id=51698

 Mark's official report to the users' list indicates that setting a 
 secret for the AJP connection does the trick. (I tried this
 myself before digging-up his message and can confirm that the
 sample code fails when a secret is set).

 Should we mention this on the Security page directly for those who 
 didn't read the announcement on the users' list?
 
 No reason why not. Go for it.

Okay. Any idea if mod_proxy_ajp supports the shared secret? The
documentation is so light on actually using mod_proxy_ajp that it might
be supported (ProxyPass /foo ajp://bar secret=changeit?) but
completely undocumented in the httpd documentation.

This is all I could find:

http://www.google.com/url?sa=tsource=webcd=1ved=0CBcQFjAAurl=http%3A%2F%2Fwww.gossamer-threads.com%2Flists%2Fapache%2Fdev%2F332363rct=jq=mod_proxy_ajp%20secretei=fCFpTtWRAuPL0QGUo-CDDAusg=AFQjCNHOT2d5i5zlmL06G4eoMG5skYTkVwcad=rja

Thanks,
-chris



signature.asc
Description: OpenPGP digital signature

Re: Mitigating AJP CPing/Forward-Request packet forgery before next releases

2011-09-08 Thread Christopher Schultz

Mark,

On 9/8/2011 11:47 AM, Mark Thomas wrote:
 On 08/09/2011 16:13, Christopher Schultz wrote:
 Should we mention this on the Security page directly for those who 
 didn't read the announcement on the users' list?
 
 No reason why not. Go for it.

Also, security-5.html says that Tomcat 5.0.0 - 5.0.33 are affected. It
should probably be 5.5.0-5.5.30, right?

-chris



signature.asc
Description: OpenPGP digital signature

Re: Mitigating AJP CPing/Forward-Request packet forgery before next releases

On 08/09/2011 21:13, Christopher Schultz wrote:
Mark,

On 9/8/2011 11:47 AM, Mark Thomas wrote:
On 08/09/2011 16:13, Christopher Schultz wrote:
All, https://issues.apache.org/bugzilla/show_bug.cgi?id=51698

Mark's official report to the users' list indicates that
setting a secret for the AJP connection does the trick. (I
tried this myself before digging-up his message and can confirm
that the sample code fails when a secret is set).

Should we mention this on the Security page directly for those
who didn't read the announcement on the users' list?

No reason why not. Go for it.

Okay. Any idea if mod_proxy_ajp supports the shared secret?

No idea at all off the top of my head. I'd be surprised if it didn't
since the mod_proxy_ajp code started with the mod_jk code.

The documentation is so light on actually using mod_proxy_ajp that
it might be supported (ProxyPass /foo ajp://bar secret=changeit?)
but completely undocumented in the httpd documentation.

This is all I could find:

http://www.google.com/url?sa=tsource=webcd=1ved=0CBcQFjAAurl=http%3A%2F%2Fwww.gossamer-threads.com%2Flists%2Fapache%2Fdev%2F332363rct=jq=mod_proxy_ajp%20secretei=fCFpTtWRAuPL0QGUo-CDDAusg=AFQjCNHOT2d5i5zlmL06G4eoMG5skYTkVwcad=rja

What

is wrong with looking at the source code? I'm no c programmer but
it looks like the necessary code is in place. Probably quicker to just
try it to confirm it.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Mitigating AJP CPing/Forward-Request packet forgery before next releases

On 08/09/2011 21:22, Christopher Schultz wrote:
 Mark,
 
 On 9/8/2011 11:47 AM, Mark Thomas wrote:
 On 08/09/2011 16:13, Christopher Schultz wrote:
 Should we mention this on the Security page directly for those
 who didn't read the announcement on the users' list?
 
 No reason why not. Go for it.
 
 Also, security-5.html says that Tomcat 5.0.0 - 5.0.33 are affected.
 It should probably be 5.5.0-5.5.30, right?

It should say all 5.5.x versions up to the latest - 5.5.33 - are
affected. 5.0.x is almost certainly affected but since we stopped
supporting that we no longer check if it is vulnerable nor report on it.

I'll fix that in a tick.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1166917 - in /tomcat/site/trunk: docs/security-5.html xdocs/security-5.xml