svn commit: r676383 - in /tomcat/tc6.0.x/trunk: STATUS.txt res/confinstall/tomcat-users_1.xml res/tomcat.nsi webapps/docs/changelog.xml
Author: markt Date: Sun Jul 13 11:03:07 2008 New Revision: 676383 URL: http://svn.apache.org/viewvc?rev=676383&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45332 Use correct encoding (current windows code page) when creating tomcat-users.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml tomcat/tc6.0.x/trunk/res/tomcat.nsi 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=676383&r1=676382&r2=676383&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jul 13 11:03:07 2008 @@ -48,13 +48,6 @@ +1: fhanik -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45332 - Don't assume UTF-8 and use the correct encoding when generating - tomcat-users.xml from the Windows installer. - http://svn.apache.org/viewvc?rev=674335&view=rev - +1: markt, fhanik, jfclere, remm - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45285 Need to look for annotations in class hierarchy http://people.apache.org/~markt/patches/2008-07-09-bug45285.patch Modified: tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml?rev=676383&r1=676382&r2=676383&view=diff == --- tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml (original) +++ tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml Sun Jul 13 11:03:07 2008 @@ -1,4 +1,3 @@ -
DO NOT REPLY [Bug 45332] Encoding issue - Admin password created by Windows installer
https://issues.apache.org/bugzilla/show_bug.cgi?id=45332 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-07-13 11:04:07 PST --- This has been fixed in 6.0.x and will be included in 6.0.18 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r676391 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/util/DefaultAnnotationProcessor.java webapps/docs/changelog.xml
Author: markt
Date: Sun Jul 13 11:20:40 2008
New Revision: 676391
URL: http://svn.apache.org/viewvc?rev=676391&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45285
Need to look for annotations in class hierarchy
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/DefaultAnnotationProcessor.java
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=676391&r1=676390&r2=676391&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jul 13 11:20:40 2008
@@ -48,12 +48,6 @@
+1: fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45285
- Need to look for annotations in class hierarchy
- http://people.apache.org/~markt/patches/2008-07-09-bug45285.patch
- +1: markt, jfclere, remm
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42678
Only ignore docBase it it really is a subdir of appBase
Patch provided by juergen
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/DefaultAnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/DefaultAnnotationProcessor.java?rev=676391&r1=676390&r2=676391&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/DefaultAnnotationProcessor.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/DefaultAnnotationProcessor.java
Sun Jul 13 11:20:40 2008
@@ -127,62 +127,67 @@
return;
}
-// Initialize fields annotations
-Field[] fields = instance.getClass().getDeclaredFields();
-for (int i = 0; i < fields.length; i++) {
-if (fields[i].isAnnotationPresent(Resource.class)) {
-Resource annotation = (Resource)
fields[i].getAnnotation(Resource.class);
-lookupFieldResource(context, instance, fields[i],
annotation.name());
-}
-if (fields[i].isAnnotationPresent(EJB.class)) {
-EJB annotation = (EJB) fields[i].getAnnotation(EJB.class);
-lookupFieldResource(context, instance, fields[i],
annotation.name());
-}
-if (fields[i].isAnnotationPresent(WebServiceRef.class)) {
-WebServiceRef annotation =
-(WebServiceRef)
fields[i].getAnnotation(WebServiceRef.class);
-lookupFieldResource(context, instance, fields[i],
annotation.name());
-}
-if (fields[i].isAnnotationPresent(PersistenceContext.class)) {
-PersistenceContext annotation =
-(PersistenceContext)
fields[i].getAnnotation(PersistenceContext.class);
-lookupFieldResource(context, instance, fields[i],
annotation.name());
-}
-if (fields[i].isAnnotationPresent(PersistenceUnit.class)) {
-PersistenceUnit annotation =
-(PersistenceUnit)
fields[i].getAnnotation(PersistenceUnit.class);
-lookupFieldResource(context, instance, fields[i],
annotation.name());
-}
-}
+Class clazz = instance.getClass();
-// Initialize methods annotations
-Method[] methods = instance.getClass().getDeclaredMethods();
-for (int i = 0; i < methods.length; i++) {
-if (methods[i].isAnnotationPresent(Resource.class)) {
-Resource annotation = (Resource)
methods[i].getAnnotation(Resource.class);
-lookupMethodResource(context, instance, methods[i],
annotation.name());
-}
-if (methods[i].isAnnotationPresent(EJB.class)) {
-EJB annotation = (EJB) methods[i].getAnnotation(EJB.class);
-lookupMethodResource(context, instance, methods[i],
annotation.name());
-}
-if (methods[i].isAnnotationPresent(WebServiceRef.class)) {
-WebServiceRef annotation =
-(WebServiceRef)
methods[i].getAnnotation(WebServiceRef.class);
-lookupMethodResource(context, instance, methods[i],
annotation.name());
-}
-if (methods[i].isAnnotationPresent(PersistenceContext.class)) {
-PersistenceContext annotation =
-(PersistenceContext)
methods[i].getAnnotation(PersistenceContext.class);
-lookupMethodResource(context, instance, methods[i],
annotation.name());
-}
-if (methods[i].isAnnotationPresent(PersistenceUnit.class)) {
-PersistenceUnit annotation =
-(PersistenceUnit)
methods[i].getAnnotation(PersistenceUnit.class);
-lookupMethodR
DO NOT REPLY [Bug 45285] RESOURCES DECLARED IN PARENT CLASSES ARE NOT INJECTED
https://issues.apache.org/bugzilla/show_bug.cgi?id=45285 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-07-13 11:20:51 PST --- This has been fixed in 6.0.x and will be included in 6.0.18 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r676395 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Author: markt Date: Sun Jul 13 11:30:19 2008 New Revision: 676395 URL: http://svn.apache.org/viewvc?rev=676395&view=rev Log: Previous patch didn't go far enough. No need to pre-load StandardWrapper. Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=676395&r1=676394&r2=676395&view=diff == --- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java (original) +++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Sun Jul 13 11:30:19 2008 @@ -63,9 +63,6 @@ (basePackage + "core.ContainerBase$PrivilegedAddChild"); loader.loadClass -(basePackage + - "core.StandardWrapper"); -loader.loadClass (basePackage + "core.ApplicationHttpRequest$AttributeNamesEnumerator"); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r676401 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt
Date: Sun Jul 13 11:40:02 2008
New Revision: 676401
URL: http://svn.apache.org/viewvc?rev=676401&view=rev
Log:
Remy is right. StandardWrapper is not required.
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=676401&r1=676400&r2=676401&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jul 13 11:40:02 2008
@@ -72,7 +72,6 @@
this should be in the finally with the usual try { if(!null) }
catch (IOE)
* Fix startup failure when security is enabled
- http://svn.apache.org/viewvc?rev=675796&view=rev
+ http://people.apache.org/~markt/patches/2008-07-13-security-manager.patch
+1: markt
-1:
- -0: remm: Does StandardWrapper need to be preloaded now ?
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Release build 6.0.17
Remy Maucherat wrote: The candidates binaries are available here: http://people.apache.org/~remm/tomcat-6/v6.0.17/ According to the release process, the 6.0.17 tag is: [ ] Broken [ ] Alpha [X] Beta [ ] Stable I see consistent failures to start (CNFE) with the -security option on win32. I haven't tested on Linux and I couldn't see a configuration solution to the CNFE. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Tomcat 3 [2008/07/13]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt| | 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c| | 9737|Ver|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p| |44911|Ass|Nor|2008-04-30|Test again from Chirag| +-+---+---+--+--+ | Total4 bugs | +---+ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Tomcat 5 [2008/07/13]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat| |28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn | |29160|Ver|Enh|2004-05-23|precompile problem: _jspx_meth_* (javax.servlet.js| |29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi| |29936|Opn|Blk|2004-07-06|XML parser loading problems by container | |30241|Ver|Enh|2004-07-21|Enhance build script to use branch argument when c| |31257|Opn|Cri|2004-09-16|java.endorsed.dirs is not used when JSP compilatio| |33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis| |33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps| |33650|Inf|Enh|2005-02-19|Jasper performance for multiple files processing | |33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na| |34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo| |34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a| |34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern| |34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that| |35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc| |35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName| |36133|Inf|Enh|2005-08-10|Support JSS SSL implementation| |36169|New|Enh|2005-08-12|[PATCH] Enable chunked encoding for requests in II| |36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi| |36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's | |36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re| |36922|Inf|Enh|2005-10-04|setup.sh file mis-advertised and missing | |36923|New|Nor|2005-10-05|Deactivated EL expressions are not parsed for jsp | |37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token| |37084|Opn|Reg|2005-10-14|JspC from ant fails on JSPs that use custom taglib| |37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis| |37449|Opn|Enh|2005-11-10|Two UserDatabaseRealm break manager user | |37458|Opn|Nor|2005-11-10|Datarace on org.apache.catalina.loader.WebappClass| |37485|Inf|Enh|2005-11-14|I'd like to run init SQL after JDBC Connection cre| |37498|Inf|Nor|2005-11-14|[PATCH] NPE in org.apache.catalina.core.ContainerB| |37515|Inf|Nor|2005-11-15|smap not generated by JspC when used from Ant for | |37627|Opn|Nor|2005-11-24|Slow and incomplete dynamic content generation aft| |37785|Inf|Nor|2005-12-05|Changing startup type via Tomcat Monitor does not | |37794|Opn|Nor|2005-12-05|getParameter() fails on POST with transfer-encodin| |37797|Inf|Maj|2005-12-05|Configure Tomcat utility truncates classpath to 96| |37847|Ass|Enh|2005-12-09|Allow User To Optionally Specify Catalina Output F| |37869|Opn|Nor|2005-12-12|Cannot obtain client certificate with SSL / client| |37918|Inf|Nor|2005-12-15|EL cannot find valid getter from object when using| |37984|New|Nor|2005-12-21|JNDIRealm.java not able to handle MD5 password| |38046|Ass|Reg|2005-12-27|apache-tomcat-5.5.14-deployer doesn't work (Illega| |38197|Opn|Maj|2006-01-09|taglib pool bug when tag is used with jsp:attribut| |38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations | |38217|Ver|Enh|2006-01-10|mention that private key password and keystore pas| |38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti| |38352|Inf|Nor|2006-01-22|Additional Entries for Default catalina.policy fil| |38360|Inf|Enh|2006-01-24|Domain for session cookies| |38367|Inf|Nor|2006-01-24|Executing any Catalina Ant task results in an exce| |38372|Inf|Cri|2006-01-25|tcnative-1.dll response overflow corruption, parti| |38427|Inf|Nor|2006-01-27|ServletContextListener Notified Multiple Times Whe| |38483|New|Nor|2006-02-01|access log valve uses simpledateformat in tread-un| |38484|
Bug report for Watchdog [2008/07/13]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 278|Unc|Nor|2000-12-04|Bug in GetParameterValuesTestServlet.java file Bug| | 279|Unc|Nor|2000-12-04|Logical Error in GetParameterValuesTestServlet Bug| | 469|Unc|Nor|2001-01-17|in example-taglib.tld "urn" should be "uri" BugRat| | 470|Unc|Nor|2001-01-17|FAIL positiveForward.jsp and positiveInclude.jsp B| | 9634|New|Enh|2002-06-05|No tests exist for ServletContext.getResourcePaths| |10703|New|Enh|2002-07-11|Need to test getRequestURI after RequestDispatcher| |11336|New|Enh|2002-07-31|Test wrapped path methods with RD.foward()| |11663|New|Maj|2002-08-13|JSP precompile tests rely on Jasper specific behav| |11664|New|Maj|2002-08-13|A sweep is needed of all Watchdog 4.0 tag librarie| |11665|New|Maj|2002-08-13|ServletToJSPErrorPageTest and ServletToServletErro| |11666|New|Maj|2002-08-13|SetBufferSize_1TestServlet is invalid.| |14004|New|Maj|2002-10-28|Incorrent behaviour of all attribute-related lifec| |15504|New|Nor|2002-12-18|JSP positiveGetValues test relies on order preserv| |24649|New|Nor|2003-11-12|getRemoteHost fails when agent has uppercase chara| |29398|New|Nor|2004-06-04|Update site and note current status | +-+---+---+--+--+ | Total 15 bugs | +---+ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Tomcat 4 [2008/07/13]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 3839|Opn|Enh|2001-09-26|Problem bookmarking login page| | 4227|Opn|Enh|2001-10-17|Invalid CGI path | | 5329|New|Enh|2001-12-08|NT Service exits startup before Tomcat is finished| | 5795|New|Enh|2002-01-10|Catalina Shutdown relies on localhost causing prob| | 5829|New|Enh|2002-01-13|StandardManager needs to cope with sessions throwi| | 5985|New|Enh|2002-01-23|Tomcat should perform a more restrictive validatio| | 6600|Opn|Enh|2002-02-20|enodeURL adds 'jsession' when 'isRequestedSessionI| | 6614|New|Enh|2002-02-21|Have Bootstrap and StandardClassLoader use the sam| | 6671|New|Enh|2002-02-25|Simple custom tag example uses old declaration sty| | 7043|New|Enh|2002-03-12|database user and password for JDBC Based Store | | 7374|New|Enh|2002-03-22|Apache Tomcat/4.0.1 message on standard output| | 7676|New|Enh|2002-04-02|Allow name property to use match experssions in without className in server.xml produces N| |11129|New|Enh|2002-07-24|New valve for putting the sessionIDs in the reques| |11248|New|Enh|2002-07-29|DefaultServlet doesn't send expires header| |11754|Opn|Enh|2002-08-15|Synchronous shutdown script - shutdown.sh should w| |12069|New|Enh|2002-08-27|Creation of more HttpSession objects for one previ| |12428|Opn|Enh|2002-09-09|request.getUserPrincipal(): Misinterpretation of s| |12658|New|Enh|2002-09-15|a proxy host and port at the element level | |12766|New|Enh|2002-09-18|Tomcat should use tld files in /WEB-INF/ over vers| |13309|Opn|Enh|2002-10-04|Catalina calls System.exit() | |13634|New|Enh|2002-10-15|Allowing system properties to be substituted in co| |13689|Opn|Enh|2002-10-16|Classloader paths for 'Common' classes and librari| |13731|New|Enh|2002-10-17|Final request, response, session and other variabl| |13941|New|Enh|2002-10-24|reload is VERY slow | |13965|New|Enh|2002-10-25|Catalina.sh correction request for Tru64 Unix | |14097|New|Enh|2002-10-30|hardcoded registry value for vm lets tomcat servic| |14416|New|Enh|2002-11-10|blank tag name in TLD cause NullPointerException | |14635|New|Enh|2002-11-18|Should be possible not to have -MM-DD in log f| |14766|New|Enh|2002-11-22|Redirect Vavle| |14993|New|Enh|2002-12-02|Possible obselete synchronized declaration| |15115|New|Enh|2002-12-05|correct docs... XML parser *cannot* be overridden | |15417|Opn|Enh|2002-12-16|Add port for forced compilation of JSP pages | |15688|New|Enh|2002-12-27|full-qualified names instead of imports | |15941|New|Enh|2003-01-10|Expose rootCause exceptions at deeper levels | |16294|New|Enh|2003-01-21|Configurable URL Decoding.| |16357|New|Enh|2003-01-23|"connection timeout reached" | |16531|New|Enh|2003-01-29|Updating already deployed ".war" files in a single| |16579|New|Enh|2003-01-30|documentation page layout/style breaks wrapping to| |16596|New|Enh|2003-01-30|option for disabling log rotation | |17070|New|Enh|2003-02-14|The Catalina Ant tasks do not allow for 'reusable'| |17146|New|Enh|2003-02-18|Simplify build.xml using
