Re: svn commit: r1237428 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

[Mark Thomas]

On 29/01/2012 20:53, Konstantin Kolinko wrote:
> 2012/1/29  :
>> Author: markt
>> Date: Sun Jan 29 19:31:42 2012
>> New Revision: 1237428
>>
>> URL: http://svn.apache.org/viewvc?rev=1237428&view=rev
>> Log:
>> Remove deprecated code
>>
>> Modified:
>>tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
>>
> 
> 1. The mbeans-descriptors.xml file there still lists the
> "defaultContextXml" property that you removed. [1]

Thanks, I'll fix that.

> 2. Overall this feels like removing a feature.
> I woudn't veto as I never used it and I do not have strong evidence,
> but I am -0.

There isn't going to be a 8.0.x release for a while. Anyone affected by
this will see the deprecation markers and complain if it is a problem.
If that happens, I'll be happy to restore the code.

Mark

> 
> I think it might have the same use as ContextConfig#defaultWebXml
> (used by tests and by embedding code). Something like specifying
> different defaults file for embedded use.
> 
> Neither "defaultContextXml" nor "defaultWebXml" are documented in
> config/context.html.
> 
> 
> [1] 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/mbeans-descriptors.xml?view=markup
> 
> 
> Best regards,
> Konstantin Kolinko
> 
> 
> 
> 
>>
>> 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=1237428&r1=1237427&r2=1237428&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java 
>> (original)
>> +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Sun Jan 
>> 29 19:31:42 2012
>> @@ -162,14 +162,6 @@ public class ContextConfig implements Li
>>
>>
>> /**
>> - * The default web application's context file location.
>> - * @deprecated Unnecessary
>> - */
>> -@Deprecated
>> -protected String defaultContextXml = null;
>> -
>> -
>> -/**
>>  * The default web application's deployment descriptor location.
>>  */
>> protected String defaultWebXml = null;
>> @@ -486,12 +478,14 @@ public class ContextConfig implements Li
>>  */
>> protected void contextConfig(Digester digester) {
>>
>> +String defaultContextXml = null;
>> +
>> // Open the default context.xml file, if it exists
>> -if( defaultContextXml==null && context instanceof StandardContext ) 
>> {
>> +if (context instanceof StandardContext) {
>> defaultContextXml = 
>> ((StandardContext)context).getDefaultContextXml();
>> }
>> // set the default if we don't have any overrides
>> -if( defaultContextXml==null ) {
>> +if (defaultContextXml == null) {
>> defaultContextXml = Constants.DefaultContextXml;
>> }
>>
>>
>>
>>
>> -
>> 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
> 


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

DO NOT REPLY [Bug 52557] New: DIGEST AUTH is broken

[bugzilla]

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

 Bug #: 52557
   Summary: DIGEST AUTH is broken
   Product: Tomcat 6
   Version: 6.0.33
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: regression
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: sa...@schuldeigen.de
Classification: Unclassified


Hi,

we have some weird issues since we tried to switch from tomcat 6.0.32 to
6.0.35.
We're using authentication with DIGEST and we saw a big rewrite in 6.0.33 and
the
rewrite was necessary (like said in the changelog) because of the DIGEST didn't
really worked.

When we're trying to enable 6.0.35 there are some clients haven't any problem
and
some clients have periodical issues (20 to 80% fails, depending on client or
location, so locally accessed or via the network). "curl" is one of them and so
maybe most
of the clients using libcurl or whatever.

Because of the fact that as quicker the requests will be send (while loop) the
more errors
occur so maybe a time issue (timestamp in the nonce maybe?).


System in use:

  production systems:
Server side:
 - JAVA:
java -version
java version "1.6.0_24"
Java(TM) SE Runtime Environment (build 1.6.0_24-b07)
Java HotSpot(TM) Server VM (build 19.1-b02, mixed mode)
 - Kernel:
2.6.35 (self compiled)

Client side (for curl tests):
 - same like on server (test worked also on server side with using
localhost)

  local system for testing with vanilla stuff:
 - JAVA:
java -version
java version "1.6.0_26"
Java(TM) SE Runtime Environment (build 1.6.0_26-b03)
Java HotSpot(TM) 64-Bit Server VM (build 20.1-b02, mixed mode)
 - Kernel:
3.1.0-1-amd64 (Debian Testing)



What we see:

  curl to an DIGEST authentication secured page gives normal 401 response with
  WWW-Authenticate in it and the second request gives a 200 OK. But the
directly
  next request fails with a 401 also on the second response.

How to reproduce:

  Download the tomcat 6.0.35 package from
 
http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/src/apache-tomcat-6.0.35-src.tar.gz
  and extract it to somewhere.
  Use the patches below to enable DIGEST for the
http://localhost:8080/manager/html site
  and execute multiple times (in a while loop maybe with a sleep of 0.2):

  curl localhost:8080/manager/html -v --digest -u test:test 2>&1 > /dev/null

  When i test it with:

  while :; do echo "c"; curl localhost:8080/manager/html -v --digest -u
test:test 2>&1 > /dev/null  |egrep "(HTTP|Auth)"| grep 200; sleep 1; done

  there are no errors but with

  while :; do echo "c"; curl localhost:8080/manager/html -v --digest -u
test:test 2>&1 > /dev/null  |egrep "(HTTP|Auth)"| grep 200; sleep 0.5; done

  there are sometimes errors and with a sleep of 0.1 there are many many
errors.

 PATCHES ##

=
seffenberg@siteop-25:~/tomcat/apache-tomcat-6.0.35-src$ diff -u conf/server.xml
output/build/conf/server.xml
--- conf/server.xml 2011-11-28 11:22:44.0 +0100
+++ output/build/conf/server.xml2012-01-26 14:05:25.0 +0100
@@ -120,7 +120,8 @@
that are performed against this UserDatabase are immediately
available for use by the Realm.  -->
   
+ resourceName="UserDatabase"
+ digest="MD5" />

   
+  
+  
 
   
-BASIC
-Tomcat Manager Application
+DIGEST
+Tomcat Manager Application TEST
   

   
@@ -284,6 +284,7 @@
 manager
   

+
 
=

 HOW THE PASSWORD STUFF WAS GENERATED
##

$ ./bin/digest.sh -a MD5 "test:Tomcat Manager Application TEST:test"
test:Tomcat Manager Application TEST:test:8d6db5856fdcd4d166914bfda9ffda86


 EXAMPLE OUTPUT
##

# First run ###
seffenberg@siteop-25:~/tomcat/apache-tomcat-6.0.35-src$ curl
localhost:8080/manager/html -v --digest -u test:test 2>&1 > /dev/null
* About to connect() to localhost port 8080 (#0)
*   Trying ::1...   % Total% Received % Xferd  Average Speed   TimeTime
Time  Current
 Dload  Upload   Total   SpentLeft  Speed
  0 00 00 0  0  0 --:--:-- --:--:-- --:--:--
0connected
* Server auth using Digest with user 'test'
> GET /manager/html HTTP/1.1
> User-Agent: curl/7.23.1 (x86_64-pc-linux-gnu) libcurl/7.23.1 OpenSSL/1.0.0g 
> zlib/1.2.3.4 libidn/1.23 libssh2/1.2.8 librtmp/2.3
> Host: localhost:8080
> Accept: */*
>
* additional stuff not fine transfer.c:1036: 0 0
* HTTP 1.1 or later with persistent connection, pipelining supported
< HTTP/1.1 401 Unauthorized
< Se

DO NOT REPLY [Bug 52557] DIGEST AUTH is broken

[bugzilla]

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

sa...@schuldeigen.de changed:

   What|Removed |Added

 CC||sa...@schuldeigen.de

-- 
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 52557] DIGEST AUTH is broken

[bugzilla]

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

--- Comment #1 from sa...@schuldeigen.de 2012-01-30 09:55:24 UTC ---
Created attachment 28224
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28224
patch for tomcat-users

to test the issue this is one of three patches

-- 
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 52557] DIGEST AUTH is broken

[bugzilla]

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

--- Comment #2 from sa...@schuldeigen.de 2012-01-30 09:55:46 UTC ---
Created attachment 28225
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28225
patch for server.xml

to test the issue this is one of three patches

-- 
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 52557] DIGEST AUTH is broken

[bugzilla]

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

--- Comment #3 from sa...@schuldeigen.de 2012-01-30 09:56:12 UTC ---
Created attachment 28226
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28226
patch for web.xml

to test the issue this is one of three patches

-- 
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 52557] DIGEST AUTH is broken

[bugzilla]

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

--- Comment #4 from sa...@schuldeigen.de 2012-01-30 09:56:48 UTC ---
Added the patches for testing as attachments to prevent line wrapping..

-- 
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 52557] DIGEST AUTH is broken

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #5 from Mark Thomas  2012-01-30 10:29:17 UTC ---
curl is re-using cnonce values without incrementing the nonce-count as required
by RFC2617. You can see this with the following access log configuration:



Since this appears to be a replay attack, Tomcat correctly rejects the
requests.

It looks like curl changes the cnonce every second but never changes the nonce
count which is why you only see failures when the delay is less than one second
and also why the percentage of failures increases as the loop gets tighter.

There is a bug here but it is in curl, not Tomcat.

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

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

DO NOT REPLY [Bug 52558] New: CometConnectionManagerValve is adding non-serializable Request[] to Session

[bugzilla]

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

 Bug #: 52558
   Summary: CometConnectionManagerValve is adding non-serializable
Request[] to Session
   Product: Tomcat 7
   Version: 7.0.22
  Platform: Macintosh
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: adam.hawk...@gmail.com
Classification: Unclassified


CometConnectionManagerValve is adding HttpServletRequest[] to HttpSession which
is preventing the Session being serialized in a Clustered setup.

We're resolving this locally using a serializable ConnectionList class with a
transient Request[]

i.e.

public class ConnectionList implements Serializable {

transient Request[] connectionList = null;

ConnectionList(Request[] connectionList){
this.connectionList = connectionList;
}

public Request[] get(){
return connectionList;
}
}

-- 
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 52558] CometConnectionManagerValve is adding non-serializable Request[] to Session

[bugzilla]

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

Rainer Jung  changed:

   What|Removed |Added

 OS/Version||All

--- Comment #1 from Rainer Jung  2012-01-30 10:59:05 
UTC ---
Note that there is an attribute "sessionAttributeFilter" in the cluster manager
configuration, that allows to decide which session attributes you want to be
replicated. It was introduced in Tomcat 7.0.22.

See:

http://tomcat.apache.org/tomcat-7.0-doc/config/cluster-manager.html

It is not a direct answer to your observation, but might be enough for a
workaround. Therefore I keep this issue in status "New".

Regards,

Rainer

-- 
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: r1237604 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java java/org/apache/tomcat/util/bcel/classfile/JavaClass.java test/org/apache/catalina/startup/TestContextConfi

[markt]

Author: markt
Date: Mon Jan 30 11:14:06 2012
New Revision: 1237604

URL: http://svn.apache.org/viewvc?rev=1237604&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52444
Remove need to load classes unless they actually match an HandlesTypes
entry

Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java

tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java

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=1237604&r1=1237603&r2=1237604&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Jan 30 
11:14:06 2012
@@ -30,6 +30,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -183,14 +184,34 @@ public class ContextConfig implements Li
  * Map of ServletContainerInitializer to classes they expressed interest 
in.
  */
 protected final Map>> 
initializerClassMap =
-new LinkedHashMap>>();
+new LinkedHashMap>>();
 
 /**
  * Map of Types to ServletContainerInitializer that are interested in those
  * types.
  */
 protected final Map, Set> 
typeInitializerMap =
-new HashMap, Set>();
+new HashMap, Set>();
+
+/**
+ * Cache of JavaClass objects (byte code) by fully qualified class name.
+ * Only populated if it is necessary to scan the super types and interfaces
+ * as part of the processing for {@link HandlesTypes}.
+ */
+protected final Map javaClassCache =
+new HashMap();
+
+/**
+ * Flag that indicates if at least one {@link HandlesTypes} entry is 
present
+ * that represents an annotation.
+ */
+protected boolean handlesTypesAnnotations = false;
+
+/**
+ * Flag that indicates if at least one {@link HandlesTypes} entry is 
present
+ * that represents a non-annotation.
+ */
+protected boolean handlesTypesNonAnnotations = false;
 
 /**
  * The Digester we will use to process web application
@@ -1196,6 +1217,9 @@ public class ContextConfig implements Li
 processAnnotations(orderedFragments);
 }
 
+// Cache, if used, is no longer required so clear it
+javaClassCache.clear();
+
 // Step 6. Merge web-fragment.xml files into the main web.xml
 // file.
 if (ok) {
@@ -1473,6 +1497,11 @@ public class ContextConfig implements Li
 Class[] types = ht.value();
 if (types != null) {
 for (Class type : types) {
+if (type.isAnnotation()) {
+handlesTypesAnnotations = true;
+} else {
+handlesTypesNonAnnotations = true;
+}
 Set scis =
 typeInitializerMap.get(type);
 if (scis == null) {
@@ -1993,59 +2022,180 @@ public class ContextConfig implements Li
 return;
 }
 
-// No choice but to load the class
 String className = javaClass.getClassName();
 
 Class clazz = null;
+if (handlesTypesNonAnnotations) {
+// This *might* be match for a HandlesType.
+populateJavaClassCache(className, javaClass);
+JavaClassCacheEntry entry = javaClassCache.get(className);
+if (entry.getSciSet() == null) {
+populateSCIsForCacheEntry(entry);
+}
+if (entry.getSciSet().size() > 0) {
+// Need to try and load the class
+clazz = loadClass(className);
+if (clazz == null) {
+// Can't load the class so no point continuing
+return;
+}
+
+for (ServletContainerInitializer sci :
+entry.getSciSet()) {
+Set> classes = initializerClassMap.get(sci);
+if (classes == null) {
+classes = new HashSet>();
+initializerClassMap.put(sci, classes);
+}
+classes.add(clazz);
+}
+}
+}
+
+if (handlesTypesAnnotations) {
+for (Map.Entry, Set> entry :
+typeInitializerMap.entrySet()) {
+if (entry.getKey().isAnnotation()) {
+  

svn commit: r1237607 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/tomcat/util/bcel/classfile/JavaClass.java test/org/apache/catalina/startup/TestC

[markt]

Author: markt
Date: Mon Jan 30 11:34:30 2012
New Revision: 1237607

URL: http://svn.apache.org/viewvc?rev=1237607&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52444
Remove need to load classes unless they actually match an HandlesTypes entry

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 30 11:34:30 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,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,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232

DO NOT REPLY [Bug 52444] Classloading-based ServletContainerInitializer @HandlesTypes processing can result in long startup times

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #8 from Mark Thomas  2012-01-30 11:34:58 UTC ---
Unit tests and Servlet TCK pass so the fix has been committed to trunk and
7.0.x. It will be in 7.0.26 onwards.

-- 
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 52444] Classloading-based ServletContainerInitializer @HandlesTypes processing can result in long startup times

[bugzilla]

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

--- Comment #9 from Chris Beams  2012-01-30 11:46:54 UTC ---
Thanks, Mark.  I've updated https://jira.springsource.org/browse/SPR-8894 and
https://jira.springsource.org/browse/SPR-8945 to let affected users know that
7.0.26 should take care of this issue.

-- 
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 52557] DIGEST AUTH is broken

[bugzilla]

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

--- Comment #6 from sa...@schuldeigen.de 2012-01-30 16:09:46 UTC ---
Many thanks for the explanation. Ok it is not a curl bug also because in a
while loop the curl never knows anything about the previous request but when i
do something like this:


curl -v --digest -u test:test localhost:8080/manager/html
localhost:8080/manager/html localhost:8080/manager/html
localhost:8080/manager/html localhost:8080/manager/html
localhost:8080/manager/html localhost:8080/manager/html
localhost:8080/manager/html localhost:8080/manager/html
localhost:8080/manager/html localhost:8080/manager/html
localhost:8080/manager/html localhost:8080/manager/html
localhost:8080/manager/html localhost:8080/manager/html
localhost:8080/manager/html 2>&1 > /dev/null

then it works with an growing nc= value.. so i know where to search next!

-- 
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 52500] Improve client certificate authentication

[bugzilla]

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

--- Comment #13 from Michael  2012-01-30 20:27:30 
UTC ---
Dear Mark,
I still need your inputs on my suggestions.
1)I do not understand if you want to use SubjectAlternativeNameRetriever
OOTB
2)I do not understand if you want support user transforms by full class
name.
3)I do not know the best way to call to createUserNameRetriever method

Please find attached patch with the following modifications:
1)UserIdentifier was replaced by UserName in all places
2)DefaultSubjectDnRetriever was removed since SubjectDnRetriever with the
default constructor performs the same job.
Once again: 
1)SubjectAlternativeNameRetriever and SubjectDnRetriever provide all
required information from x509 certificate.
2)Classes work already in production
3)It works for the following browsers: IE, FF and Chrome

I will more than happy for your comments.
Best regards,
   Michael

-- 
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 52500] Improve client certificate authentication

[bugzilla]

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

Michael  changed:

   What|Removed |Added

  Attachment #28200|0   |1
is obsolete||

--- Comment #14 from Michael  2012-01-30 20:28:45 
UTC ---
Created attachment 28237
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28237
x509 java code

Please find attached patch with the following modifications:
1)UserIdentifier was replaced by UserName in all places
2)DefaultSubjectDnRetriever was removed since SubjectDnRetriever with the
default constructor performs the same job.

-- 
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 52500] Improve client certificate authentication

[bugzilla]

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

Michael  changed:

   What|Removed |Added

  Attachment #28199|0   |1
is obsolete||

--- Comment #15 from Michael  2012-01-30 20:29:50 
UTC ---
Created attachment 28238
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28238
The document that describe client certificate and its configuration

UserIdentifier was replaced by UserName in all places

-- 
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: r1237975 - /tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java

[markt]

Author: markt
Date: Mon Jan 30 20:38:00 2012
New Revision: 1237975

URL: http://svn.apache.org/viewvc?rev=1237975&view=rev
Log:
Deprecate

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=1237975&r1=1237974&r2=1237975&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java Mon Jan 30 
20:38:00 2012
@@ -346,6 +346,10 @@ public class AntCompiler extends Compile
 // - Public 
Methods
 
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x.
+ */
+@Deprecated
 public PrintStream getWrapped() {
   return wrapped;
 }



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

svn commit: r1237978 - /tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java

[markt]

Author: markt
Date: Mon Jan 30 20:38:45 2012
New Revision: 1237978

URL: http://svn.apache.org/viewvc?rev=1237978&view=rev
Log:
Removed unused code.
Add final where appropriate.

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=1237978&r1=1237977&r2=1237978&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java Mon Jan 30 
20:38:45 2012
@@ -90,7 +90,7 @@ public class AntCompiler extends Compile
 
 public static class JasperAntLogger extends DefaultLogger {
 
-protected StringBuilder reportBuf = new StringBuilder();
+protected final StringBuilder reportBuf = new StringBuilder();
 
 @Override
 protected void printMessage(final String message,
@@ -326,34 +326,25 @@ public class AntCompiler extends Compile
 /**
  * Wrapped PrintStream.
  */
-protected PrintStream wrapped = null;
+protected final PrintStream wrapped;
 
 
 /**
  * Thread <-> PrintStream associations.
  */
-protected static ThreadLocal streams =
+protected static final ThreadLocal streams =
 new ThreadLocal();
 
 
 /**
  * Thread <-> ByteArrayOutputStream associations.
  */
-protected static ThreadLocal data =
+protected static final ThreadLocal data =
 new ThreadLocal();
 
 
 // - Public 
Methods
 
-
-/**
- * @deprecated Unused. Will be removed in Tomcat 8.0.x.
- */
-@Deprecated
-public PrintStream getWrapped() {
-  return wrapped;
-}
-
 /**
  * Start capturing thread's output.
  */



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

svn commit: r1237981 - /tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java

[markt]

Author: markt
Date: Mon Jan 30 20:39:21 2012
New Revision: 1237981

URL: http://svn.apache.org/viewvc?rev=1237981&view=rev
Log:
Deprecate

Modified:
tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java

Modified: tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java?rev=1237981&r1=1237980&r2=1237981&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java Mon Jan 30 
20:39:21 2012
@@ -40,6 +40,10 @@ public class CatalinaFactory {
 // Hide the default constructor
 }
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x.
+ */
+@Deprecated
 public String getDefaultPipelineClassName() {
 return StandardPipeline.class.getName();
 }



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

svn commit: r1237982 - /tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java

[markt]

Author: markt
Date: Mon Jan 30 20:39:55 2012
New Revision: 1237982

URL: http://svn.apache.org/viewvc?rev=1237982&view=rev
Log:
Remove unused code.
Use final where appropriate.

Modified:
tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java

Modified: tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java?rev=1237982&r1=1237981&r2=1237982&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/CatalinaFactory.java Mon Jan 30 
20:39:55 2012
@@ -30,7 +30,7 @@ import org.apache.catalina.core.Standard
  */
 public class CatalinaFactory {
 
-private static CatalinaFactory factory = new CatalinaFactory();
+private static final CatalinaFactory factory = new CatalinaFactory();
 
 public static CatalinaFactory getFactory() {
 return factory;
@@ -40,14 +40,6 @@ public class CatalinaFactory {
 // Hide the default constructor
 }
 
-/**
- * @deprecated Unused. Will be removed in Tomcat 8.0.x.
- */
-@Deprecated
-public String getDefaultPipelineClassName() {
-return StandardPipeline.class.getName();
-}
-
 public Pipeline createPipeline(Container container) {
 Pipeline pipeline = new StandardPipeline();
 pipeline.setContainer(container);



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

svn commit: r1237984 - in /tomcat/trunk/java/org/apache/catalina: Cluster.java ha/tcp/SimpleTcpCluster.java

[markt]

Author: markt
Date: Mon Jan 30 20:40:37 2012
New Revision: 1237984

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

Modified:
tomcat/trunk/java/org/apache/catalina/Cluster.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java

Modified: tomcat/trunk/java/org/apache/catalina/Cluster.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Cluster.java?rev=1237984&r1=1237983&r2=1237984&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Cluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Cluster.java Mon Jan 30 20:40:37 2012
@@ -66,23 +66,6 @@ public interface Cluster {
  */
 public Container getContainer();
 
-/**
- * Set the protocol parameters.
- *
- * @param protocol The protocol used by the cluster
- * @deprecated
- */
-@Deprecated
-public void setProtocol(String protocol);
-
-/**
- * Get the protocol used by the cluster.
- *
- * @return The protocol
- * @deprecated
- */
-@Deprecated
-public String getProtocol();
 
 // - Public Methods
 

Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1237984&r1=1237983&r2=1237984&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Mon Jan 
30 20:40:37 2012
@@ -904,26 +904,6 @@ public class SimpleTcpCluster extends Li
 return log;
 }
 
-
-// - deprecated
-
-/**
- *
- * @see org.apache.catalina.Cluster#setProtocol(java.lang.String)
- */
-@Override
-public void setProtocol(String protocol) {
-// NO-OP
-}
-
-/**
- * @see org.apache.catalina.Cluster#getProtocol()
- */
-@Override
-public String getProtocol() {
-return null;
-}
-
 public int getChannelStartOptions() {
 return channelStartOptions;
 }



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

svn commit: r1237985 - /tomcat/trunk/java/org/apache/catalina/Container.java

[markt]

Author: markt
Date: Mon Jan 30 20:41:15 2012
New Revision: 1237985

URL: http://svn.apache.org/viewvc?rev=1237985&view=rev
Log:
Deprecate unused code

Modified:
tomcat/trunk/java/org/apache/catalina/Container.java

Modified: tomcat/trunk/java/org/apache/catalina/Container.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Container.java?rev=1237985&r1=1237984&r2=1237985&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Container.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Container.java Mon Jan 30 20:41:15 
2012
@@ -99,7 +99,9 @@ public interface Container extends Lifec
 /**
  * The ContainerEvent event type sent when a Mapper is added
  * by addMapper().
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x.
  */
+@Deprecated
 public static final String ADD_MAPPER_EVENT = "addMapper";
 
 
@@ -120,7 +122,9 @@ public interface Container extends Lifec
 /**
  * The ContainerEvent event type sent when a Mapper is removed
  * by removeMapper().
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x.
  */
+@Deprecated
 public static final String REMOVE_MAPPER_EVENT = "removeMapper";
 
 
@@ -399,7 +403,10 @@ public interface Container extends Lifec
  *  processing
  * @exception ServletException if a ServletException was thrown
  *  while processing this request
+ *
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x.
  */
+@Deprecated
 public void invoke(Request request, Response response)
 throws IOException, ServletException;
 



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

svn commit: r1237986 - in /tomcat/trunk/java/org/apache/catalina: Container.java core/ContainerBase.java startup/FailedContext.java

[markt]

Author: markt
Date: Mon Jan 30 20:41:59 2012
New Revision: 1237986

URL: http://svn.apache.org/viewvc?rev=1237986&view=rev
Log:
Removed unused code

Modified:
tomcat/trunk/java/org/apache/catalina/Container.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java

Modified: tomcat/trunk/java/org/apache/catalina/Container.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Container.java?rev=1237986&r1=1237985&r2=1237986&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Container.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Container.java Mon Jan 30 20:41:59 
2012
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina;
 
 
 import java.beans.PropertyChangeListener;
-import java.io.IOException;
 
 import javax.management.ObjectName;
 import javax.naming.directory.DirContext;
-import javax.servlet.ServletException;
 
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
@@ -82,7 +78,6 @@ import org.apache.juli.logging.Log;
  * @author Remy Maucherat
  * @version $Id$
  */
-
 public interface Container extends Lifecycle {
 
 
@@ -97,15 +92,6 @@ public interface Container extends Lifec
 
 
 /**
- * The ContainerEvent event type sent when a Mapper is added
- * by addMapper().
- * @deprecated Unused. Will be removed in Tomcat 8.0.x.
- */
-@Deprecated
-public static final String ADD_MAPPER_EVENT = "addMapper";
-
-
-/**
  * The ContainerEvent event type sent when a valve is added
  * by addValve(), if this Container supports pipelines.
  */
@@ -120,15 +106,6 @@ public interface Container extends Lifec
 
 
 /**
- * The ContainerEvent event type sent when a Mapper is removed
- * by removeMapper().
- * @deprecated Unused. Will be removed in Tomcat 8.0.x.
- */
-@Deprecated
-public static final String REMOVE_MAPPER_EVENT = "removeMapper";
-
-
-/**
  * The ContainerEvent event type sent when a valve is removed
  * by removeValve(), if this Container supports pipelines.
  */
@@ -393,25 +370,6 @@ public interface Container extends Lifec
 
 
 /**
- * Process the specified Request, and generate the corresponding Response,
- * according to the design of this particular Container.
- *
- * @param request Request to be processed
- * @param response Response to be produced
- *
- * @exception IOException if an input/output error occurred while
- *  processing
- * @exception ServletException if a ServletException was thrown
- *  while processing this request
- *
- * @deprecated Unused. Will be removed in Tomcat 8.0.x.
- */
-@Deprecated
-public void invoke(Request request, Response response)
-throws IOException, ServletException;
-
-
-/**
  * Remove an existing child Container from association with this parent
  * Container.
  *

Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1237986&r1=1237985&r2=1237986&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Mon Jan 30 
20:41:59 2012
@@ -19,7 +19,6 @@ package org.apache.catalina.core;
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
-import java.io.IOException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
@@ -39,7 +38,6 @@ import java.util.concurrent.locks.Reentr
 
 import javax.management.ObjectName;
 import javax.naming.directory.DirContext;
-import javax.servlet.ServletException;
 
 import org.apache.catalina.AccessLog;
 import org.apache.catalina.CatalinaFactory;
@@ -963,30 +961,6 @@ public abstract class ContainerBase exte
 
 
 /**
- * Process the specified Request, to produce the corresponding Response,
- * by invoking the first Valve in our pipeline (if any), or the basic
- * Valve otherwise.
- *
- * @param request Request to be processed
- * @param response Response to be produced
- *
- * @exception IllegalStateException if neither a pipeline or a basic
- *  Valve have been configured for this Container
- * @exception IOException if an input/output error occurred while
- *  processing
- * @exception ServletException if a ServletException was thrown
- *  while processing this request
- */
-@Override
-public void invoke(Request request, Response response)
-throws IOException, Serv

svn commit: r1237987 - /tomcat/trunk/java/org/apache/catalina/ContainerEvent.java

[markt]

Author: markt
Date: Mon Jan 30 20:42:35 2012
New Revision: 1237987

URL: http://svn.apache.org/viewvc?rev=1237987&view=rev
Log:
Remove excessive whitespace

Modified:
tomcat/trunk/java/org/apache/catalina/ContainerEvent.java

Modified: tomcat/trunk/java/org/apache/catalina/ContainerEvent.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ContainerEvent.java?rev=1237987&r1=1237986&r2=1237987&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ContainerEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ContainerEvent.java Mon Jan 30 
20:42:35 2012
@@ -14,21 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina;
 
 
 import java.util.EventObject;
 
-
 /**
  * General event for notifying listeners of significant changes on a Container.
  *
  * @author Craig R. McClanahan
  * @version $Id$
  */
-
 public final class ContainerEvent extends EventObject {
 
 private static final long serialVersionUID = 1L;
@@ -53,11 +49,9 @@ public final class ContainerEvent extend
  * @param data Event data
  */
 public ContainerEvent(Container container, String type, Object data) {
-
 super(container);
 this.type = type;
 this.data = data;
-
 }
 
 
@@ -65,9 +59,7 @@ public final class ContainerEvent extend
  * Return the event data of this event.
  */
 public Object getData() {
-
 return (this.data);
-
 }
 
 
@@ -75,9 +67,7 @@ public final class ContainerEvent extend
  * Return the Container on which this event occurred.
  */
 public Container getContainer() {
-
 return (Container) getSource();
-
 }
 
 
@@ -85,9 +75,7 @@ public final class ContainerEvent extend
  * Return the event type of this event.
  */
 public String getType() {
-
 return (this.type);
-
 }
 
 
@@ -96,11 +84,7 @@ public final class ContainerEvent extend
  */
 @Override
 public String toString() {
-
 return ("ContainerEvent['" + getContainer() + "','" +
 getType() + "','" + getData() + "']");
-
 }
-
-
 }



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

svn commit: r1237988 - /tomcat/trunk/java/org/apache/catalina/ContainerEvent.java

[markt]

Author: markt
Date: Mon Jan 30 20:43:09 2012
New Revision: 1237988

URL: http://svn.apache.org/viewvc?rev=1237988&view=rev
Log:
Use final where appropriate

Modified:
tomcat/trunk/java/org/apache/catalina/ContainerEvent.java

Modified: tomcat/trunk/java/org/apache/catalina/ContainerEvent.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ContainerEvent.java?rev=1237988&r1=1237987&r2=1237988&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ContainerEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ContainerEvent.java Mon Jan 30 
20:43:09 2012
@@ -32,13 +32,13 @@ public final class ContainerEvent extend
 /**
  * The event data associated with this event.
  */
-private Object data = null;
+private final Object data;
 
 
 /**
  * The event type this instance represents.
  */
-private String type = null;
+private final String type;
 
 
 /**



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

svn commit: r1237989 - /tomcat/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java

[markt]

Author: markt
Date: Mon Jan 30 20:43:46 2012
New Revision: 1237989

URL: http://svn.apache.org/viewvc?rev=1237989&view=rev
Log:
Use final

Modified:
tomcat/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java

Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java?rev=1237989&r1=1237988&r2=1237989&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java Mon Jan 30 
20:43:46 2012
@@ -50,7 +50,7 @@ public class Txt2Html
 private File todir;
 
 /** The file to be converted into HTML */
-private List filesets = new LinkedList();
+private final List filesets = new LinkedList();
 
 /**
  * Sets the directory to contain the resulting files



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

svn commit: r1237990 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java

[markt]

Author: markt
Date: Mon Jan 30 20:44:27 2012
New Revision: 1237990

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

Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1237990&r1=1237989&r2=1237990&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Mon Jan 30 
20:44:27 2012
@@ -285,9 +285,6 @@ public interface Constants {
   public static final byte T_INT = 10;
 
 
-  /** Unknown data type. */
-  public static final byte T_UNKNOWN   = 15;
-
   /** The primitive type names corresponding to the T_XX constants,
* e.g., TYPE_NAMES[T_INT] = "int"
*/



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

svn commit: r1237991 - in /tomcat/trunk/java/org/apache/tomcat/util/http/mapper: Mapper.java MappingData.java

[markt]

Author: markt
Date: Mon Jan 30 20:45:11 2012
New Revision: 1237991

URL: http://svn.apache.org/viewvc?rev=1237991&view=rev
Log:
Use final

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=1237991&r1=1237990&r2=1237991&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java Mon Jan 30 
20:45:11 2012
@@ -57,7 +57,7 @@ public final class Mapper {
 /**
  * Context associated with this wrapper, used for wrapper mapping.
  */
-protected ContextVersion context = new ContextVersion();
+protected final ContextVersion context = new ContextVersion();
 
 
 // - Public Methods

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java?rev=1237991&r1=1237990&r2=1237991&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java Mon 
Jan 30 20:45:11 2012
@@ -32,12 +32,12 @@ public class MappingData {
 public Object wrapper = null;
 public boolean jspWildCard = false;
 
-public MessageBytes contextPath = MessageBytes.newInstance();
-public MessageBytes requestPath = MessageBytes.newInstance();
-public MessageBytes wrapperPath = MessageBytes.newInstance();
-public MessageBytes pathInfo = MessageBytes.newInstance();
+public final MessageBytes contextPath = MessageBytes.newInstance();
+public final MessageBytes requestPath = MessageBytes.newInstance();
+public final MessageBytes wrapperPath = MessageBytes.newInstance();
+public final MessageBytes pathInfo = MessageBytes.newInstance();
 
-public MessageBytes redirectPath = MessageBytes.newInstance();
+public final MessageBytes redirectPath = MessageBytes.newInstance();
 
 public void recycle() {
 host = null;



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

svn commit: r1237995 - in /tomcat/trunk/java/org/apache: coyote/ajp/ coyote/http11/ tomcat/util/ tomcat/util/net/

[markt]

Author: markt
Date: Mon Jan 30 20:46:11 2012
New Revision: 1237995

URL: http://svn.apache.org/viewvc?rev=1237995&view=rev
Log:
Remove MutableInteger that was unused since r1086203 removed the once
place where it was read.

Removed:
tomcat/trunk/java/org/apache/tomcat/util/MutableInteger.java
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioChannel.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1237995&r1=1237994&r2=1237995&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Mon Jan 30 
20:46:11 2012
@@ -292,8 +292,7 @@ public class AjpNioProcessor extends Abs
 //ignore
 }
 try {
-pool.write(writeBuffer, socket, selector, writeTimeout, true,
-null);
+pool.write(writeBuffer, socket, selector, writeTimeout, true);
 }finally {
 if ( selector != null ) pool.put(selector);
 }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1237995&r1=1237994&r2=1237995&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Mon 
Jan 30 20:46:11 2012
@@ -24,7 +24,6 @@ import java.nio.channels.Selector;
 
 import org.apache.coyote.OutputBuffer;
 import org.apache.coyote.Response;
-import org.apache.tomcat.util.MutableInteger;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.http.HttpMessages;
 import org.apache.tomcat.util.net.AbstractEndpoint;
@@ -68,11 +67,6 @@ public class InternalNioOutputBuffer ext
 
 
 /**
- * Number of bytes last written
- */
-private MutableInteger lastWrite = new MutableInteger(1);
-
-/**
  * Underlying socket.
  */
 private NioChannel socket;
@@ -113,7 +107,6 @@ public class InternalNioOutputBuffer ext
 socket.getBufHandler().getWriteBuffer().clear();
 socket = null;
 }
-lastWrite.set(1);
 }
 
 
@@ -167,10 +160,10 @@ public class InternalNioOutputBuffer ext
 //ignore
 }
 try {
-written = pool.write(bytebuffer, socket, selector, writeTimeout, 
block,lastWrite);
+written = pool.write(bytebuffer, socket, selector, writeTimeout, 
block);
 //make sure we are flushed
 do {
-if (socket.flush(true,selector,writeTimeout,lastWrite)) break;
+if (socket.flush(true,selector,writeTimeout)) break;
 }while ( true );
 }finally {
 if ( selector != null ) pool.put(selector);

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=1237995&r1=1237994&r2=1237995&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Mon 
Jan 30 20:46:11 2012
@@ -34,7 +34,6 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.ExceptionUtils;
-import org.apache.tomcat.util.MutableInteger;
 import org.apache.tomcat.util.net.NioEndpoint.KeyAttachment;
 
 public class NioBlockingSelector {
@@ -79,7 +78,8 @@ public class NioBlockingSelector {
  * @throws SocketTimeoutException if the write times out
  * @throws IOException if an IO Exception occurs in the underlying socket 
logic
  */
-public int write(ByteBuffer buf, NioChannel socket, long 
writeTimeout,MutableInteger lastWrite) throws IOException {
+public int write(ByteBuffer buf, NioChannel socket, long writeTimeout)
+throws IOException {
 SelectionKey key = 
socket.getIOChannel().keyFor(socket.getPoller().getSelector());
 if ( key == null ) throw new IOException("Key no longer registered");
 KeyReference reference = new KeyReference();
@@ -92,7 +92,6 @@ public class NioBl

svn commit: r1238006 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/CatalinaFactory.java java/org/apache/catalina/Container.java java/org/apache/jasper/compiler/AntCompiler.java

[markt]

Author: markt
Date: Mon Jan 30 20:57:00 2012
New Revision: 1238006

URL: http://svn.apache.org/viewvc?rev=1238006&view=rev
Log:
Deprecate unused code.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Container.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 30 20:57:00 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,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,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604
+/tomcat/trunk

svn commit: r1238070 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

[markt]

Author: markt
Date: Mon Jan 30 23:07:45 2012
New Revision: 1238070

URL: http://svn.apache.org/viewvc?rev=1238070&view=rev
Log:
Mark deprecated method as deprecated

Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1238070&r1=1238069&r2=1238070&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Mon Jan 30 
23:07:45 2012
@@ -762,6 +762,10 @@ public class Registry implements Registr
 // May still be used in tomcat
 // Never part of an official release
 
+/**
+ * @deprecated
+ */
+@Deprecated
 public ManagedBean findManagedBean(Class beanClass, String type)
 throws Exception
 {



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

svn commit: r1238072 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

[markt]

Author: markt
Date: Mon Jan 30 23:08:28 2012
New Revision: 1238072

URL: http://svn.apache.org/viewvc?rev=1238072&view=rev
Log:
Remove deprecated method

Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1238072&r1=1238071&r2=1238072&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Mon Jan 30 
23:08:28 2012
@@ -635,7 +635,7 @@ public class Registry implements Registr
 type=bean.getClass().getName();
 }
 
-ManagedBean managed = findManagedBean(bean.getClass(), type);
+ManagedBean managed = findManagedBean(null, bean.getClass(), type);
 
 // The real mbean is created and registered
 DynamicMBean mbean = managed.createMBean(bean);
@@ -756,19 +756,4 @@ public class Registry implements Registr
 @Override
 public void postDeregister() {
 }
-
-
-//  DEPRECATED METHODS  
-// May still be used in tomcat
-// Never part of an official release
-
-/**
- * @deprecated
- */
-@Deprecated
-public ManagedBean findManagedBean(Class beanClass, String type)
-throws Exception
-{
-return findManagedBean(null, beanClass, type);
-}
 }



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

svn commit: r1238073 - in /tomcat/trunk/java/org/apache/tomcat/util/modeler/modules: MbeansSource.java MbeansSourceMBean.java

[markt]

Author: markt
Date: Mon Jan 30 23:09:12 2012
New Revision: 1238073

URL: http://svn.apache.org/viewvc?rev=1238073&view=rev
Log:
Deprecated unused classes

Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java?rev=1238073&r1=1238072&r2=1238073&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java 
Mon Jan 30 23:09:12 2012
@@ -50,7 +50,10 @@ import org.w3c.dom.Node;
  *
  * XXX add a special attribute to reference the loader mbean,
  * XXX figure out how to deal with private loaders
+ *
+ * @deprecated Unused: Will be removed in Tomcat 8.0.x
  */
+@Deprecated
 public class MbeansSource extends ModelerSource implements MbeansSourceMBean
 {
 private static final Log log = LogFactory.getLog(MbeansSource.class);

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java?rev=1238073&r1=1238072&r2=1238073&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java 
Mon Jan 30 23:09:12 2012
@@ -25,7 +25,9 @@ import javax.management.ObjectName;
  * This mbean will load an extended mlet file ( similar in syntax with jboss ).
  * It'll keep track of all attribute changes and update the file when 
attributes
  * change.
+ * @deprecated Unused: Will be removed in Tomcat 8.0.x
  */
+@Deprecated
 public interface MbeansSourceMBean
 {
 /** Set the source to be used to load the mbeans



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

svn commit: r1238075 - in /tomcat/trunk/java/org/apache/tomcat/util/modeler/modules: MbeansSource.java MbeansSourceMBean.java

[markt]

Author: markt
Date: Mon Jan 30 23:09:52 2012
New Revision: 1238075

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

Removed:
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java

tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java


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

svn commit: r1238076 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

[markt]

Author: markt
Date: Mon Jan 30 23:10:32 2012
New Revision: 1238076

URL: http://svn.apache.org/viewvc?rev=1238076&view=rev
Log:
Remove references to MbeansDescriptorsDynamicMBeanSource that was
removed in r415811

Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1238076&r1=1238075&r2=1238076&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Mon Jan 30 
23:10:32 2012
@@ -477,16 +477,6 @@ public class Registry implements Registr
 managed=findManagedBean(type);
 }
 
-if( bean instanceof DynamicMBean ) {
-if( log.isDebugEnabled() ) {
-log.debug( "Dynamic mbean support ");
-}
-// Dynamic mbean
-load("MbeansDescriptorsDynamicMBeanSource", bean, type);
-
-managed=findManagedBean(type);
-}
-
 // Still not found - use introspection
 if( managed==null ) {
 if( log.isDebugEnabled() ) {
@@ -560,10 +550,7 @@ public class Registry implements Registr
 String type=null;
 Object inputsource=null;
 
-if( source instanceof DynamicMBean ) {
-sourceType="MbeansDescriptorsDynamicMBeanSource";
-inputsource=source;
-} else if( source instanceof URL ) {
+if( source instanceof URL ) {
 URL url=(URL)source;
 location=url.toString();
 type=param;



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

svn commit: r1238077 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/modeler/Registry.java java/org/apache/tomcat/util/modeler/modules/MbeansSource.java java/org/apache/tomcat/util/modeler/

[markt]

Author: markt
Date: Mon Jan 30 23:13:26 2012
New Revision: 1238077

URL: http://svn.apache.org/viewvc?rev=1238077&view=rev
Log:
Deprecate unused code

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 30 23:13:26 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,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,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1

svn commit: r1238078 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java

[markt]

Author: markt
Date: Mon Jan 30 23:14:59 2012
New Revision: 1238078

URL: http://svn.apache.org/viewvc?rev=1238078&view=rev
Log:
Remove references to MbeansDescriptorsDynamicMBeanSource that was
removed in r415811

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1238078&r1=1238077&r2=1238078&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Mon 
Jan 30 23:14:59 2012
@@ -581,17 +581,6 @@ public class Registry implements Registr
 managed=findManagedBean(type);
 }
 
-if( bean instanceof DynamicMBean ) {
-if( log.isDebugEnabled() ) {
-log.debug( "Dynamic mbean support ");
-}
-// Dynamic mbean
-loadDescriptors("MbeansDescriptorsDynamicMBeanSource",
-bean, type);
-
-managed=findManagedBean(type);
-}
-
 // Still not found - use introspection
 if( managed==null ) {
 if( log.isDebugEnabled() ) {
@@ -666,10 +655,7 @@ public class Registry implements Registr
 String type=null;
 Object inputsource=null;
 
-if( source instanceof DynamicMBean ) {
-sourceType="MbeansDescriptorsDynamicMBeanSource";
-inputsource=source;
-} else if( source instanceof URL ) {
+if( source instanceof URL ) {
 URL url=(URL)source;
 location=url.toString();
 type=param;



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

DO NOT REPLY [Bug 52563] New: Incorrect behavior while checking the thread binding in DirContextURLStreamHandler

[bugzilla]

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

 Bug #: 52563
   Summary: Incorrect behavior while checking the thread binding
in DirContextURLStreamHandler
   Product: Tomcat 7
   Version: trunk
  Platform: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: xhh...@gmail.com
Classification: Unclassified


In the get method of DirContextURLStreamHandler class, it seems that binding
value with thread are not processed correctly. Now its value will be only
returned if no binding value on the current thread context classloader and it
has no parent classloader, think that the value will not be returned in most
scenarios.
Think that the code logic should be something like :
a. Check whether a value is binding on the current thread context classloader,
if does then return.
b. Check whether a value is binding with the current thread, if does then
return.
c. Check the classloader hierarchy to find a binding value.


public static DirContext get() { 

DirContext result = null; 

Thread currentThread = Thread.currentThread(); 
ClassLoader currentCL = currentThread.getContextClassLoader(); 

// Checking CL binding 
result = clBindings.get(currentCL); 
if (result != null) 
return result; 

// Checking thread biding 
result = threadBindings.get(currentThread);

// Checking parent CL binding 
currentCL = currentCL.getParent(); 
while (currentCL != null) { 
result = clBindings.get(currentCL); 
if (result != null) 
return result; 
currentCL = currentCL.getParent(); 
} 

if (result == null) 
throw new IllegalStateException("Illegal class loader binding"); 

return result; 

}

-- 
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 52563] Incorrect behavior while checking the thread binding in DirContextURLStreamHandler

[bugzilla]

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

Ivan  changed:

   What|Removed |Added

 OS/Version||All

--- Comment #1 from Ivan  2012-01-31 03:03:21 UTC ---
Had posted a message in the user list,
http://tomcat.10.n6.nabble.com/Correct-behavior-while-checking-the-thread-binding-in-DirContextURLStreamHandler-td4345124.html

-- 
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

[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-test has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test :  Tomcat 7.x, a web server implementing Java Servlet 
3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 mins 32 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-31012012.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-31012012-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-31012012-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-31012012.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/
 srv/gump/public/workspace/commons-dbcp-1.x 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-31012012.jar
 test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp
 
ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.
 
0.x/tomcat-deps/tomcat-dbcp-31012012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-31012012.jar:/srv/gump/public/workspace/junit/dist/

DO NOT REPLY [Bug 52564] New: Fail to build with security hardening cflags

[bugzilla]

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

 Bug #: 52564
   Summary: Fail to build with security hardening cflags
   Product: Tomcat Connectors
   Version: 1.2.32
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: minor
  Priority: P2
 Component: mod_jk
AssignedTo: dev@tomcat.apache.org
ReportedBy: draz...@drazzib.com
Classification: Unclassified


Hi,

Apache Mod_Jk fails to build with security hardening cflags [1]. As part as an
ongoing effort in Debian, we are trying to build as much as possible "network"
package with hardening features enabled [2].

Current failure is :
/usr/share/apr-1.0/build/libtool --silent --mode=compile x86_64-linux-gnu-gcc
-I/usr/include/apache2 -g -O2 -fstack-protector --param=ssp-buffer-size=4
-Wformat -Wformat-security -Werror=format-security -DHAVE_CONFIG_H
-DUSE_APACHE_MD5 -I ../common -I /include -I /include/unix  -DLINUX=2
-D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_REENTRANT -I/usr/include/apr-1.0
-I/usr/include/openssl -I/usr/include/xmltok -pthread   -DHAVE_APR 
-I/usr/include/apr-1.0 -I/usr/include/apr-1.0 -g -O2 -fstack-protector
--param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security
-DHAVE_CONFIG_H   -c mod_jk.c -o mod_jk.lo
mod_jk.c: In function 'jk_error_exit':
mod_jk.c:678:5: error: format not a string literal and no format arguments
[-Werror=format-security]
mod_jk.c:684:9: error: format not a string literal and no format arguments
[-Werror=format-security]
cc1: some warnings being treated as errors

[1] "-Wformat -Wformat-security -Werror=format-security"
[2] http://wiki.debian.org/Hardening

Regards,

-- 
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