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

2012-06-02 Thread 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,
 and has been outstanding for 5 runs.
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: 22 mins 7 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-02062012.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-02062012-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-02062012-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-02062012.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-02062012.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/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-02062012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-02062012.jar:/srv/gump/
 public/workspace/junit/dist/junit-02062012.jar
-
[junit] at 
org.junit.in

[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed

2012-06-02 Thread 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-trunk-test has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 10 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test :  Tomcat 8.x, a web server implementing Java Servlet 
3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-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-trunk-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-trunk-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-trunk/output/build/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html
Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 22 mins 27 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-02062012.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-02062012-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-02062012-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/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-02062012.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/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-trunk/tomcat-deps/tomcat-dbcp-02062012.jar
 test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp
 
ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/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-trunk/tomcat-deps/tomcat-dbcp-02062012.jar:/srv/gump/public/workspac

[Tomcat Wiki] Update of "AccessLogValve" by ChristopherSchultz

2012-06-02 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "AccessLogValve" page has been changed by ChristopherSchultz:
http://wiki.apache.org/tomcat/AccessLogValve?action=diff&rev1=6&rev2=7

Comment:
Slight clarifications.

  First read the 
[[http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html|Valve chapter]] in 
''Configuration Reference Guide''. There is also 
[[http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/valves/AccessLogValve.html|javadoc]]
 for the class.
  
- The following is an example of AccessLogValve configuration. If you want it 
to log requests processed by your web application, add it to the 
[[http://tomcat.apache.org/tomcat-7.0-doc/config/context.html|context file]] of 
your application (`META-INF/context.xml`). If you want it to log all requests, 
add it to the '''Host''' element in {{{conf/server.xml}}} file.
+ The following is an example of AccessLogValve configuration. If you want it 
to log requests processed by your web application, add it to the 
[[http://tomcat.apache.org/tomcat-7.0-doc/config/context.html|context file]] of 
your application (`META-INF/context.xml`). If you want it to log all requests 
for a particular host, add it to the '''Host''' element in 
{{{conf/server.xml}}} file.
  
- Starting with Tomcat 7 an AccessLogValve is already configured in the default 
conf/server.xml file that is shipped with Tomcat.
+ Starting with Tomcat 7, an AccessLogValve is already configured for the 
default host in conf/server.xml file that is shipped with Tomcat.
  
  {{{
  
  }}}
  
+ See the 
[[http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html#Access_Log_Valve|documentation
 for AccessLogValve]] for a description of what all the options above do.
+ 
  
  [[CategoryFAQ]]
  

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



[ANN] Apache Tomcat Connectors 1.2.37 released

2012-06-02 Thread Mladen Turk

The Apache Tomcat Project is proud to announce the release of version 1.2.37
of Apache Tomcat Connectors.
This version fixes few bugs found in 1.2.36 release.

Full details of these changes and new features,
are available in the Apache Tomcat Connectors changelog:
http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html

Downloads:
http://tomcat.apache.org/download-connectors.cgi

Thank you,
--
The Apache Tomcat Team

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



svn commit: r1345543 - in /tomcat/site/trunk/docs/connectors-doc/miscellaneous: changelog.html printer/changelog.html

2012-06-02 Thread mturk
Author: mturk
Date: Sat Jun  2 18:27:36 2012
New Revision: 1345543

URL: http://svn.apache.org/viewvc?rev=1345543&view=rev
Log:
Update JK docs

Modified:
tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html

Modified: tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html?rev=1345543&r1=1345542&r2=1345543&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html Sat Jun  
2 18:27:36 2012
@@ -12,10 +12,10 @@
 
   
 Fix regression which can crash webserver in case worker is
-defined both as member of load balancer and as standlaone worker. 
(mturk)
+defined both as member of load balancer and as standalone worker. 
(mturk)
   
   
-Fix core if debug log level is specifed and there is no
+Fix core if debug log level is specified and there is no
 session identifier present. (mturk)
   
 
@@ -26,7 +26,7 @@
 
   
 Use named shared memory objects so that we preserve runtime configured
-   data instead reseting on each child ceation. (mturk)
+data instead of resetting on each child creation. (mturk)
   
   
 Fix dead-lock caused by not releasing mutex on close. (mturk)

Modified: 
tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html?rev=1345543&r1=1345542&r2=1345543&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html 
Sat Jun  2 18:27:36 2012
@@ -11,10 +11,10 @@
 
   
 Fix regression which can crash webserver in case worker is
-defined both as member of load balancer and as standlaone worker. 
(mturk)
+defined both as member of load balancer and as standalone worker. 
(mturk)
   
   
-Fix core if debug log level is specifed and there is no
+Fix core if debug log level is specified and there is no
 session identifier present. (mturk)
   
 
@@ -25,7 +25,7 @@
 
   
 Use named shared memory objects so that we preserve runtime configured
-   data instead reseting on each child ceation. (mturk)
+data instead of resetting on each child creation. (mturk)
   
   
 Fix dead-lock caused by not releasing mutex on close. (mturk)



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



svn commit: r1345556 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default build.xml dist.xml webapps/docs/changelog.xml

2012-06-02 Thread kkolinko
Author: kkolinko
Date: Sat Jun  2 19:02:56 2012
New Revision: 1345556

URL: http://svn.apache.org/viewvc?rev=1345556&view=rev
Log:
Update Apache Commons Daemon to 1.0.10.
Update the native component of the Tomcat APR/native connector to
1.1.23 and take advantage of the simplified distribution.
It is backport of the following revs of Tomcat 7: r1300557 r1301269 r1305197

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1345556&r1=134&r2=1345556&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun  2 19:02:56 2012
@@ -139,15 +139,6 @@ PATCHES PROPOSED TO BACKPORT:
   Add WebSocket support to Tomcat 6
   +1: fhanik
 
-* Update Apache Commons Daemon to 1.0.10.
-  Update the native component of the Tomcat APR/native connector to
-  1.1.23 and take advantage of the simplified distribution.
-  It is backport of the following revs of 7.0.x:
-  r1300557 r1301269 r1305197
-  http://people.apache.org/~kkolinko/patches/2012-03-26_tc6_update_deps.patch
-  +1: kkolinko, rjung, markt
-  -1:
-
 * Backport UserDataHelper class (issue 52184)
   Provide greater control over the logging of errors triggered by invalid
   input data (i.e. data over which Tomcat has no control).

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1345556&r1=134&r2=1345556&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Sat Jun  2 19:02:56 2012
@@ -117,16 +117,13 @@ jdt.loc.1=http://archive.eclipse.org/ecl
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.1.22
+tomcat-native.version=1.1.23
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
 
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.dll.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries
-tomcat-native.dll.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries
-tomcat-native.dll.win32=${tomcat-native.home}/tcnative-1.dll.x86
-tomcat-native.dll.x64=${tomcat-native.home}/tcnative-1.dll.x64
-tomcat-native.dll.i64=${tomcat-native.home}/tcnative-1.dll.i64
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
 
 # - Commons DBCP, version 1.1 or later -
 commons-dbcp.version=1.3
@@ -149,7 +146,7 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
 nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
 
 # - Commons Daemon, version 1.0-Alpha or later -
-commons-daemon.version=1.0.9
+commons-daemon.version=1.0.10
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
 commons-daemon.native.win.home=${commons-daemon.home}/windows

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1345556&r1=134&r2=1345556&view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Sat Jun  2 19:02:56 2012
@@ -784,24 +784,10 @@
   
 
 
-
-  
-  
-  
-  
-
-
-
-  
-  
-  
-  
-
-
-
-  
-  
-  
+
+  
+  
+  
   
 
 

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1345556&r1=134&r2=1345556&view=diff
==
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Sat Jun  2 19:02:56 2012
@@ -209,14 +209,12 @@
 
 
-
-
-
-
-
+
+  
+
+
+  
+
 
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.

svn commit: r1345575 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/realm/ webapps/docs/ webapps/docs/config/

2012-06-02 Thread kkolinko
Author: kkolinko
Date: Sat Jun  2 21:06:49 2012
New Revision: 1345575

URL: http://svn.apache.org/viewvc?rev=1345575&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52500
Add configurable mechanism to retrieve user names from X509 client certificates.
It is backport of r1298476 with clean-ups (r1298542, r1298577, r1298590, 
r1298592).

Note (a small difference wrt 7.0):
RealmBase.init() cannot throw a LifecycleException, so I am just logging an 
error
when there is configuration error with X509UsernameRetrieverClassName property.

Added:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java
  - copied, changed from r1345563, 
tomcat/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java
  - copied unchanged from r1345563, 
tomcat/trunk/java/org/apache/catalina/realm/X509UsernameRetriever.java
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1345575&r1=1345574&r2=1345575&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun  2 21:06:49 2012
@@ -79,19 +79,6 @@ PATCHES PROPOSED TO BACKPORT:
   -0: markt - https://issues.apache.org/bugzilla/show_bug.cgi?id=52579#c8
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52500
-  Add configurable mechanism to retrieve user names from X509 client 
certificates.
-  trunk patch: http://svn.apache.org/viewvc?view=revision&revision=r1298476
-  additional clean-up patches (good for markt?):
- http://svn.apache.org/viewvc?view=revision&revision=r1298542
- http://svn.apache.org/viewvc?view=revision&revision=r1298577
- http://svn.apache.org/viewvc?view=revision&revision=r1298590
- http://svn.apache.org/viewvc?view=revision&revision=r1298592
-  +1: schultz, fhanik
-  +1: markt if clean-up is also applied
-  +1: kkolinko: with clean-ups (r1298542, r1298577, r1298590, r1298592)
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52723
   Correct theoretical resource leak in StandardManager
   http://svn.apache.org/viewvc?rev=1299036&view=rev

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=1345575&r1=1345574&r2=1345575&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties 
Sat Jun  2 21:06:49 2012
@@ -75,6 +75,11 @@ realmBase.notAuthenticated=Configuration
 realmBase.notStarted=This Realm has not yet been started
 realmBase.authenticateFailure=Username {0} NOT successfully authenticated
 realmBase.authenticateSuccess=Username {0} successfully authenticated
+realmBase.gotX509Username=Got user name from X509 certificate: {0}
+realmBase.createUsernameRetriever.ClassCastException=Class {0} is not an 
X509UsernameRetriever.
+realmBase.createUsernameRetriever.ClassNotFoundException=Cannot find class {0}.
+realmBase.createUsernameRetriever.InstantiationException=Cannot create object 
of type {0}.
+realmBase.createUsernameRetriever.IllegalAccessException=Cannot create object 
of type {0}.
 userDatabaseRealm.authenticateError=Login configuration error authenticating 
username {0}
 userDatabaseRealm.lookup=Exception looking up UserDatabase under key {0}
 userDatabaseRealm.noDatabase=No UserDatabase component found under key {0}

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1345575&r1=1345574&r2=1345575&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Sat Jun  
2 21:06:49 2012
@@ -154,7 +154,17 @@ public abstract class RealmBase
  */
 protected boolean validate = true;
 
-
+/**
+ * The name of the class to use for retrieving user names from X509
+ * certificates.
+ */
+protected String x509UsernameRetrieverClassName;
+
+/**
+ * The object that will extract user names from X509 client certificates.
+ */
+protected X509UsernameRetriever x509UsernameRetriever;
+
 /**
  * Th

[Bug 52500] Improve client certificate authentication

2012-06-02 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52500

--- Comment #38 from Konstantin Kolinko  ---
Ported to 6.0 in r1345575 and will be in 6.0.36

-- 
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: r1345579 - /tomcat/trunk/webapps/docs/config/valve.xml

2012-06-02 Thread kkolinko
Author: kkolinko
Date: Sat Jun  2 21:16:27 2012
New Revision: 1345579

URL: http://svn.apache.org/viewvc?rev=1345579&view=rev
Log:
Correct a typo

Modified:
tomcat/trunk/webapps/docs/config/valve.xml

Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1345579&r1=1345578&r2=1345579&view=diff
==
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Sat Jun  2 21:16:27 2012
@@ -1443,7 +1443,7 @@
 This valve allows to detect requests that take a long time to process, 
which might
 indicate that the thread that is processing it is stuck.
 When such a request is detected, the current stack trace of its thread 
is written
-to tomcat log with a WARN level.
+to Tomcat log with a WARN level.
 The IDs of the stuck threads are available through JMX in the
 stuckThreadIds attribute. The JVM Thread MBean can then be 
used to
 retrieve other information about each stuck thread (name, stack 
trace...).



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



svn commit: r1345580 - in /tomcat/trunk/java/org/apache/catalina/deploy: LocalStrings.properties NamingResources.java

2012-06-02 Thread markt
Author: markt
Date: Sat Jun  2 21:18:53 2012
New Revision: 1345580

URL: http://svn.apache.org/viewvc?rev=1345580&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=5
Validate JNDI resource types against injection target types and use target 
types when no type is specified for the resource.
Based on a patch by Violeta Georgieva.

Modified:
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java

Modified: tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?rev=1345580&r1=1345579&r2=1345580&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties Sat 
Jun  2 21:18:53 2012
@@ -49,3 +49,4 @@ namingResources.cleanupNoContext=Failed 
 namingResources.cleanupNoResource=Failed to retrieve JNDI resource [{0}] for 
container [{1}] so no cleanup was performed for that resource
 namingResources.mbeanCreateFail=Failed to create MBean for naming resource 
[{0}]
 namingResources.mbeanDestroyFail=Failed to destroy MBean for naming resource 
[{0}]
+namingResources.resourceTypeFail=The JNDI resource named [{0}] is of type 
[{1}] but the type is inconsistent with the type(s) of the injection target(s) 
configured for that resource
\ No newline at end of file

Modified: tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java?rev=1345580&r1=1345579&r2=1345580&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java Sat Jun  
2 21:18:53 2012
@@ -19,6 +19,7 @@ package org.apache.catalina.deploy;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.Serializable;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
@@ -35,6 +36,7 @@ import org.apache.catalina.LifecycleExce
 import org.apache.catalina.LifecycleState;
 import org.apache.catalina.Server;
 import org.apache.catalina.mbeans.MBeanUtils;
+import org.apache.catalina.util.Introspection;
 import org.apache.catalina.util.LifecycleMBeanBase;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -248,6 +250,12 @@ public class NamingResources extends Lif
 }
 }
 
+if (!checkResourceType(environment)) {
+throw new IllegalArgumentException(sm.getString(
+"namingResources.resourceTypeFail", environment.getName(),
+environment.getType()));
+}
+
 entries.add(environment.getName());
 
 synchronized (envs) {
@@ -314,6 +322,11 @@ public class NamingResources extends Lif
 if (entries.contains(mdr.getName())) {
 return;
 } else {
+if (!checkResourceType(mdr)) {
+throw new IllegalArgumentException(sm.getString(
+"namingResources.resourceTypeFail", mdr.getName(),
+mdr.getType()));
+}
 entries.add(mdr.getName());
 }
 
@@ -348,6 +361,11 @@ public class NamingResources extends Lif
 if (entries.contains(resource.getName())) {
 return;
 } else {
+if (!checkResourceType(resource)) {
+throw new IllegalArgumentException(sm.getString(
+"namingResources.resourceTypeFail", resource.getName(),
+resource.getType()));
+}
 entries.add(resource.getName());
 }
 
@@ -379,7 +397,11 @@ public class NamingResources extends Lif
 if (entries.contains(resource.getName())) {
 return;
 } else {
-entries.add(resource.getName());
+if (!checkResourceType(resource)) {
+throw new IllegalArgumentException(sm.getString(
+"namingResources.resourceTypeFail", resource.getName(),
+resource.getType()));
+}entries.add(resource.getName());
 }
 
 synchronized (resourceEnvRefs) {
@@ -1082,4 +1104,147 @@ public class NamingResources extends Lif
 // Server or just unknown
 return "type=NamingResources";
 }
+
+/**
+ * Checks that the configuration of the type for the specified resource is
+ * consistent with any injection targets and if the type is not specified,
+ * tries to configure the type based on the

svn commit: r1345581 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/valve.xml

2012-06-02 Thread kkolinko
Author: kkolinko
Date: Sat Jun  2 21:19:12 2012
New Revision: 1345581

URL: http://svn.apache.org/viewvc?rev=1345581&view=rev
Log:
Correct typos

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1345579

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=1345581&r1=1345580&r2=1345581&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Jun  2 21:19:12 2012
@@ -333,11 +333,11 @@
 the value of true. If it is really needed, it should be
 set explicitly. (kkolinko)
   
-  
+  
 52500: Added configurable mechanism to retrieve user names
 from X509 client certificates. Based on a patch provided by
 Michael Furman. (schultz)
-  
+  
   
 52719: Fix a theoretical resource leak in the JAR validation
 that checks for non-permitted classes in web application JARs. (markt)

Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml?rev=1345581&r1=1345580&r2=1345581&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Sat Jun  2 21:19:12 2012
@@ -1443,7 +1443,7 @@
 This valve allows to detect requests that take a long time to process, 
which might
 indicate that the thread that is processing it is stuck.
 When such a request is detected, the current stack trace of its thread 
is written
-to tomcat log with a WARN level.
+to Tomcat log with a WARN level.
 The IDs of the stuck threads are available through JMX in the
 stuckThreadIds attribute. The JVM Thread MBean can then be 
used to
 retrieve other information about each stuck thread (name, stack 
trace...).



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



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

2012-06-02 Thread markt
Author: markt
Date: Sat Jun  2 21:20:25 2012
New Revision: 1345582

URL: http://svn.apache.org/viewvc?rev=1345582&view=rev
Log:
Opps. Undo rename used to check all calls to method had been removed.

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=1345582&r1=1345581&r2=1345582&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Sat 
Jun  2 21:20:25 2012
@@ -637,7 +637,7 @@ public class DefaultInstanceManager impl
 }
 
 @Deprecated
-public static String XXXgetName(Method setter) {
+public static String getName(Method setter) {
 // Note: method signature has already been checked for correctness.
 // The method name always starts with "set".
 return Introspector.decapitalize(setter.getName().substring(3));



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



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

2012-06-02 Thread markt
Author: markt
Date: Sat Jun  2 21:20:52 2012
New Revision: 1345583

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

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=1345583&r1=1345582&r2=1345583&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Sat 
Jun  2 21:20:52 2012
@@ -16,7 +16,6 @@
  */
 package org.apache.catalina.core;
 
-import java.beans.Introspector;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
@@ -636,13 +635,6 @@ public class DefaultInstanceManager impl
 }
 }
 
-@Deprecated
-public static String getName(Method setter) {
-// Note: method signature has already been checked for correctness.
-// The method name always starts with "set".
-return Introspector.decapitalize(setter.getName().substring(3));
-}
-
 private static String normalize(String jndiName){
 if(jndiName != null && jndiName.startsWith("java:comp/env/")){
 return jndiName.substring(14);



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



svn commit: r1345586 - /tomcat/tc6.0.x/trunk/STATUS.txt

2012-06-02 Thread kkolinko
Author: kkolinko
Date: Sat Jun  2 21:27:46 2012
New Revision: 1345586

URL: http://svn.apache.org/viewvc?rev=1345586&view=rev
Log:
update votes

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1345586&r1=1345585&r2=1345586&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun  2 21:27:46 2012
@@ -43,12 +43,10 @@ PATCHES PROPOSED TO BACKPORT:
 - In mbeans-descriptors.xml:
   - There are no properties "asyncSupported", "stateName" in TC6 version 
of this valve.
 - In valve.xml:
-  - s/tomcat log/Tomcat log/ (or Apache Tomcat log)
+  - s/tomcat log/Tomcat log/ (r1345579)
 - In StuckThreadDetectionValve.java:
   - private classes CompletedStuckThread, MonitoredThread: make them 
static (r1175897)
   - Use Long.valueOf() and explicit boxing/unboxing (r1138132, r1175897)
-  - getStuckThreadIds() returns a list of ids. It might be useful to
-have a similar method that returns Thread.getName() names.
 
 * Fix autodeployment of applications that have configuration errors.
   If autodeployment fails, create DeployedApplication object and register
@@ -82,9 +80,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52723
   Correct theoretical resource leak in StandardManager
   http://svn.apache.org/viewvc?rev=1299036&view=rev
-  +1: markt, fhanik
-  +0: kkolinko: no native resources are leaked actually, so I see no need
-   to do some work that garbage collector can do as well
+  +1: markt, fhanik, kkolinko
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52830
@@ -134,9 +130,10 @@ PATCHES PROPOSED TO BACKPORT:
   addressed in Tomcat 6, because all logging in that class here is done at
   debug level.
 
-  svn cp 
../../trunk/java/org/apache/tomcat/util/log/UserDataHelper.java@1242371 
java/org/apache/tomcat/util/log/UserDataHelper.java
-  Patch:
   
http://people.apache.org/~kkolinko/patches/2012-03-26_tc6_UserDataHelper.patch
+  (includes a new file, copied from trunk:
+  svn cp 
../../trunk/java/org/apache/tomcat/util/log/UserDataHelper.java@1242371 
java/org/apache/tomcat/util/log/UserDataHelper.java
+  )
   +1: kkolinko
   -1:
 



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



svn commit: r1345588 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/startup/ java/org/apache/catalina/util/ webapps/docs/

2012-06-02 Thread markt
Author: markt
Date: Sat Jun  2 21:29:30 2012
New Revision: 1345588

URL: http://svn.apache.org/viewvc?rev=1345588&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=5
Validate JNDI resource types against injection target types and use target 
types when no type is specified for the resource.
Based on a patch by Violeta Georgieva.

Added:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Introspection.java
  - copied unchanged from r1345367, 
tomcat/trunk/java/org/apache/catalina/util/Introspection.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1345325,1345367,1345580,1345582

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=1345588&r1=1345587&r2=1345588&view=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 
Sat Jun  2 21:29:30 2012
@@ -14,11 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.core;
 
-
 import java.beans.Introspector;
 import java.io.IOException;
 import java.io.InputStream;
@@ -52,6 +49,7 @@ import javax.xml.ws.WebServiceRef;
 import org.apache.catalina.ContainerServlet;
 import org.apache.catalina.Globals;
 import org.apache.catalina.security.SecurityUtil;
+import org.apache.catalina.util.Introspection;
 import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.res.StringManager;
@@ -61,6 +59,16 @@ import org.apache.tomcat.util.res.String
  */
 public class DefaultInstanceManager implements InstanceManager {
 
+// Used when there are no annotations in a class
+private static final AnnotationCacheEntry[] ANNOTATIONS_EMPTY
+= new AnnotationCacheEntry[0];
+
+/**
+ * The string manager for this package.
+ */
+protected static final StringManager sm =
+StringManager.getManager(Constants.Package);
+
 private final Context context;
 private final Map> injectionMap;
 protected final ClassLoader classLoader;
@@ -73,10 +81,6 @@ public class DefaultInstanceManager impl
 private final Map, AnnotationCacheEntry[]> annotationCache =
 new WeakHashMap, AnnotationCacheEntry[]>();
 
-// Used when there are no annotations in a class
-private static final AnnotationCacheEntry[] ANNOTATIONS_EMPTY
-= new AnnotationCacheEntry[0];
-
 public DefaultInstanceManager(Context context, Map> injectionMap, org.apache.catalina.Context catalinaContext, ClassLoader 
containerClassLoader) {
 classLoader = catalinaContext.getLoader().getClassLoader();
 privileged = catalinaContext.getPrivileged();
@@ -286,19 +290,7 @@ public class DefaultInstanceManager impl
 if (context != null) {
 // Initialize fields annotations for resource injection if
 // JNDI is enabled
-Field[] fields = null;
-if (Globals.IS_SECURITY_ENABLED) {
-final Class clazz2 = clazz;
-fields = AccessController.doPrivileged(
-new PrivilegedAction(){
-@Override
-public Field[] run(){
-return clazz2.getDeclaredFields();
-}
-});
-} else {
-fields = clazz.getDeclaredFields();
-}
+Field[] fields = Introspection.getDeclaredFields(clazz);
 for (Field field : fields) {
 if (injections != null && 
injections.containsKey(field.getName())) {
 annotations.add(new AnnotationCacheEntry(
@@ -338,30 +330,15 @@ public class DefaultI

[Bug 53333] NPE is thrown for env-entry without env-entry-type but with injection-target specified

2012-06-02 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=5

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #3 from Mark Thomas  ---
Thanks for the suggested patch. I used it as a basis for the committed solution
although I tweaked the code a little and made it more relaxed regarding inputs.
Generally, as long as the types are compatible - it will work.

The change has been applied to trunk and 7.0.x and will be included in 7.0.28
onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Tomcat Wiki] Update of "LocalBadContent" by ChuckCaldarale

2012-06-02 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "LocalBadContent" page has been changed by ChuckCaldarale:
http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=49&rev2=50

  homepage\.mac\.com
  honey99\.cn
  honey99\.com
+ hungadir\.tigblog\.org
  ibnsites\.com
  ihotmusic
  isas\.com\.cn
@@ -90, +91 @@

  mystreyguy
  nekoo\.cn
  nofaxpayday
+ nordenpark.\com
  novolinespielen\.org
  oa8000\.com\.cn
  oro-compro\.com

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



[Tomcat Wiki] Trivial Update of "LocalBadContent" by KonstantinKolinko

2012-06-02 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "LocalBadContent" page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=50&rev2=51

Comment:
Correct typo in regexp

  mystreyguy
  nekoo\.cn
  nofaxpayday
- nordenpark.\com
+ nordenpark\.com
  novolinespielen\.org
  oa8000\.com\.cn
  oro-compro\.com

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