Bug report for Watchdog [2006/10/29]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | 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 3 [2006/10/29]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt| | 5331|Ass|Nor|2001-12-09|getPathInfo vs URL normalization | | 6027|Inf|Maj|2002-01-25|Tomcat Automatically shuts down as service | | 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c| | 7785|Inf|Blk|2002-04-06|tomcat bug in context reloading | | 7863|Inf|Maj|2002-04-09|I have a problem when running Tomcat with IIS | | 8187|Inf|Cri|2002-04-17|Errors when Tomcat used with MS Access database | | 9737|Ver|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p| |10047|Ass|Cri|2002-06-20|IllegalStateException | |10406|Ass|Cri|2002-07-02|IllegalStateException | |11087|Inf|Blk|2002-07-23|IllegalStateException | |12156|Inf|Cri|2002-08-29|Apache and Tomcat 3.3.1 Interworking problem | |16363|Ass|Cri|2003-01-23|Stack Overflow accessing compiled JSP - Tomcat 3.2| |39250|Inf|Cri|2006-04-07|Tomcat 3.2.1 + JDK 1.4| +-+---+---+--+--+ | Total 14 bugs | +---+ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Tomcat 4 [2006/10/29]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | 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| |11069|Opn|Enh|2002-07-23|Tomcat not flag error if tld is outside of /WEB-IN| |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| |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
Bug report for Tomcat 5 [2006/10/29]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |22679|Ver|Enh|2003-08-24|how to access ssl session ID out of tomcat to prev| |28039|New|Enh|2004-03-30|Cluster Support for SingleSignOn | |28634|Ass|Enh|2004-04-27|Extend StandardManager/StandardSession for DeltaMa| |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| |30241|Ver|Enh|2004-07-21|Enhance build script to use branch argument when c| |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| |34319|New|Enh|2005-04-06|StoreBase.processExpires() is very inefficient| |34643|New|Enh|2005-04-27|document how to use certificate-based "clientAuth"| |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|New|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| |35079|Inf|Enh|2005-05-26|Should be able to specify DNS lookup timeout | |35229|Opn|Enh|2005-06-05|alert user about expired certificates in client ce| |35552|Inf|Enh|2005-06-29|JMS destination under| |35746|Inf|Enh|2005-07-14|session manager should be immune to system clock t| |35765|New|Enh|2005-07-16|make the SSL cipher config in server.xml fail safe| |35869|New|Enh|2005-07-26|Can't run as a service on Windows Server 2003 64-B| |36121|New|Maj|2005-08-10|Including JSP's changes working directory | |36133|Inf|Enh|2005-08-10|Support JSS SSL implementation| |36169|New|Enh|2005-08-12|[PATCH] Enable chunked encoding for IIS JK connect| |36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi| |36365|New|Blk|2005-08-26|IIS5.1-isapi_redirector.dll (1.2.14) plugin issue | |36540|Inf|Enh|2005-09-07|pooled cluster replication does not seem ensure sy| |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|Inf|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token| |37072|New|Nor|2005-10-13|Encoding mismatch in error condition | |37138|New|Enh|2005-10-18|Allow to specify a security provider (priority lis| |37326|Ass|Nor|2005-11-01|No error reported when has non-exist| |37334|New|Enh|2005-11-02|Realm digest property not aligned with the adminis| |37356|Opn|Nor|2005-11-04|Tomcat does not invalidate sessions after session-| |37449|Opn|Enh|2005-11-10|Two UserDatabaseRealm break manager user | |37458|Inf|Nor|2005-11-10|Datarace on org.apache.catalina.loader.WebappClass| |37480|New|Min|2005-11-12|Log forging possible | |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| |37509|Opn|Nor|2005-11-15|ClassLoaderLogManager remove '\n' at the end of lo| |37515|Inf|Nor|2005-11-15|smap not generated by JspC when used from Ant for | |37588|Inf|Maj|2005-11-22|Creating JNDIRealm through JMX is not correct.| |37627|Opn|Nor|2005-11-24|Slow and incomplete dynamic content generation aft| |37674|New|Nor|2005-11-29|Windows EXE fails to pass spaces in JVMTI -javaage| |37785|New|Nor|2005-12-05|Changing startup type via Tomcat Monitor does not | |37793|Opn|Nor|2005-12-05|org.apache.jasper.runtime.BodyContentImpl doesn't | |37797|New|Maj|2005-12-05|Configure Tomcat utility truncates classpath to 96| |37822|Opn|Nor|2005-12-07|Web
missing unregisterWrapper in MapperListener.java
Hi, I am currently working on implementing an OSGi Http service based on the full-fledged Tomcat running inside the OSGi environment as an OSGi bundle. To implement Http service, the major functionality I require from Tomcat is that it should allow for dynamic adding/removing servlet and servlet-mapping without having to restart context for many reasons such as performace consideration, etc. After having worked with Tomcat for some time, I found the goal is hard to achieve without modification to the current code of Tomcat (I am using 5.5.17), the following is my understanding of the reason why: The mapping info are mostly maintained at two places: StandardContext and Connector, each StandardContext only contains servlet-mappings pertaining to itself, but a Connector includes not only all servlet-mappings from all StandardContext instances but also the virtual host, context mappings for the servlet container. The mapping info at these places must be consistent, otherwise, Http request dispatch may run into prolems. The current mechanism used to synchronize them is through JMX Mbean registration/unregistration events: StandardContext creates/destroys servlet wrapper mbeans for the servlets being added/removed to/from the context, and the Connector (actually a MapperListener owned by it) listens to the events and updates its mapping info accordingly. But I found only registerWrapper is provided in MapperListener.java at the moment, no associated unregisterWrapper is there. This prevents previously registered servlet mapping info from being able to be removed from the Connector even if the servlet and its mapping info has been removed from its containing context, and subsequently prevents other servlet from being registered under the same servlet path with Connector. For instance, I first add a servlet X to the root context at path "/test-servlet" and then remove the servlet and its mapping info from the context by invoking removeServletMapping and removeChild on the context, but due to the reason aforementioned, the mapping "/test-servlet" to the servlet will still be kept in Connector. So later, when I try to add a servlet Y to the root context at the same path "/test-servlet" again, the old mapping at path "/test-servlet" kept in Connector will prevent the mapping info from being updated due to the rule that only distinct servlet path is allowed to be registered. This makes the Http requests to the servlet Y mistakenly dispatched by Connector to servlet X and eventually leads to failures. The fix I have tried is that we can add the unregisterWrapper method and corresponding mbean unregistration event handling to the MapperListener.java so that the MapperListener can always keep the mapping info maintained in StandardContext and Connector consistent. Any thoughts? Thanks, Eric - 抢注雅虎免费邮箱-3.5G容量，20M附件！
svn commit: r469057 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml config/engine.xml
Author: markt Date: Sun Oct 29 19:59:00 2006 New Revision: 469057 URL: http://svn.apache.org/viewvc?view=rev&rev=469057 Log: Fix bug 37439. Update engine docs with name uniqueness requirement. Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/config/engine.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=469057&r1=469056&r2=469057 == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Oct 29 19:59:00 2006 @@ -34,6 +34,10 @@ (markt) +37439: Update documentation for Engine component to add +the requirement that the name must be unique. (markt) + + 39436: Correct MIME type for SVG. (markt) @@ -69,7 +73,7 @@ Daniel Santos. (pero) -40817: Correct problem where scripts in the root of the +40817: Correct problem where CGI scripts in the root of the ROOT context threw a StringIndexOutOfBoundsException. (markt) Modified: tomcat/container/tc5.5.x/webapps/docs/config/engine.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/engine.xml?view=diff&rev=469057&r1=469056&r2=469057 == --- tomcat/container/tc5.5.x/webapps/docs/config/engine.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/engine.xml Sun Oct 29 19:59:00 2006 @@ -77,7 +77,10 @@ -Logical name of this Engine, used in log and error messages. +Logical name of this Engine, used in log and error messages. When +using muliple Service elements in the same +Server, each Engine MUST be assigned a unique +name. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Testing Tomcat 6.0.0 alpha
On 10/26/06, Remy Maucherat <[EMAIL PROTECTED]> wrote: It would be good to test the build, and I'll post a stability vote for it next week (capped at beta, since some - very minor - test failures would need to be addressed first). ... The build itself has been mirrored correctly. So it has, but as far as I can tell, this is not yet a sanctioned release and should not be on the mirrors. The only vote I see was on the 6.0.0 release plan, not on the actual proposed distribution. There was a thread [1] about Tomcat's release process back in April that has all the details. [1] http://www.nabble.com/-ANN--Apache-Tomcat-v5.5.17-beta-Now-Available-t1454722.html -- Wendy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Testing Tomcat 6.0.0 alpha
On 10/27/06, Yoav Shapira <[EMAIL PROTECTED]> wrote: I thought our internal repos weren't auto-sync'ed to ibiblio, which is why people at infra and [EMAIL PROTECTED] are having a discussion about Apache repo mirroring right now? Maybe I misunderstood. Under http://people.apache.org/repo/ we have m1-ibiblio-rsync-repository m1-incubating-repository m1-snapshot-repository m2-ibiblio-rsync-repository m2-incubating-repository m2-snapshot-repository The snapshot and incubating repositories are currently not mirrored, that's what is under discussion. I'd rather start off right and do it in the Maven 2, not Maven 1, structure. The scripts I've seen are about equally easy... But let us know what you think after you double check, please. I was thinking easier in terms of 'drop the jars and poms here' which you can do with the m1 repo structure, but not with m2 since it needs a bunch of xml metadata along with the artifacts. However, I completely forgot about the Ant tasks that are now available. BTW, it doesn't matter which Apache repo (m1- or m2-) you put them in, they'll end up in the same place on ibiblio. (There is really only one central repo, the m2 structure. The m1 version is done with rewrite rules.) It would be a good idea to ask some Maven users to review the poms you intend to upload to the repository. Getting the dependencies correct is important, and making changes after the fact isn't usually allowed. -- Wendy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r469025 - in /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm: JAASRealm.java MemoryRealm.java
Author: markt
Date: Sun Oct 29 15:53:00 2006
New Revision: 469025
URL: http://svn.apache.org/viewvc?view=rev&rev=469025
Log:
Code clean-up whilst I was in the area.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java?view=diff&rev=469025&r1=469024&r2=469025
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
Sun Oct 29 15:53:00 2006
@@ -461,7 +461,6 @@
*/
protected Principal createPrincipal(String username, Subject subject) {
// Prepare to scan the Principals for this Subject
-String password = null; // Will not be carried forward
List roles = new ArrayList();
Principal userPrincipal = null;
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java?view=diff&rev=469025&r1=469024&r2=469025
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java
Sun Oct 29 15:53:00 2006
@@ -24,7 +24,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import org.apache.catalina.Container;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.util.StringManager;
import org.apache.commons.logging.Log;
@@ -54,12 +53,6 @@
/**
- * The Container with which this Realm is associated.
- */
-private Container container = null;
-
-
-/**
* The Digester we will use to process in-memory database files.
*/
private static Digester digester = null;
@@ -97,12 +90,6 @@
*/
private static StringManager sm =
StringManager.getManager(Constants.Package);
-
-
-/**
- * Has this component been started?
- */
-private boolean started = false;
// - Properties
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r469024 - in /tomcat/container/tc5.5.x/webapps/docs: config/realm.xml realm-howto.xml
Author: markt Date: Sun Oct 29 15:45:16 2006 New Revision: 469024 URL: http://svn.apache.org/viewvc?view=rev&rev=469024 Log: Put the realm attributes in a single place. Duplicating the attributes meant the neither location was correct. Having a single location should prevent a similar divergence in future. Add the UserDatabaseRealm. Modified: tomcat/container/tc5.5.x/webapps/docs/config/realm.xml tomcat/container/tc5.5.x/webapps/docs/realm-howto.xml Modified: tomcat/container/tc5.5.x/webapps/docs/config/realm.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/realm.xml?view=diff&rev=469024&r1=469023&r2=469024 == --- tomcat/container/tc5.5.x/webapps/docs/config/realm.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/realm.xml Sun Oct 29 15:45:16 2006 @@ -63,6 +63,20 @@ implement the org.apache.catalina.Realm interface. + +The digest algorithm used to store passwords in non-plaintext +formats. Valid values are those accepted for the algorithm name by the +java.security.MessageDigest class. See +Digested Passwords +for more information. If not specified, passwords are stored in clear +text. + + + +The charset for encoding digests. If not specified, the platform +default will be used. + + @@ -105,20 +119,10 @@ establishing a database connection. - -The name of the MessageDigest algorithm used -to encode user passwords stored in the database. If not specified, -user passwords are assumed to be stored in clear-text. - - - -The charset for encoding digests. If not specified, the platform -default will be used. - - -Fully qualified Java class name of the JDBC driver to be -used to connect to the authentication database. +Fully qualified Java class name of the JDBC driver to be used to +connect to the authentication database. Consult the documentation for +your JDBC driver for the appropriate value. @@ -127,12 +131,11 @@ -Name of the column, in the "users" table, which contains -the user's credentials (i.e. password(. If a value for the -digest attribute is specified, this component -will assume that the passwords have been encoded with the -specified algorithm. Otherwise, they will be assumed to be -in clear text. +Name of the column, in the "users" table, which contains the user's +credentials (i.e. password). If a value for the digest +attribute is specified, this component will assume that the passwords +have been encoded with the specified algorithm. Otherwise, they will be +assumed to be in clear text. @@ -141,15 +144,17 @@ -Name of the "user roles" table, which must contain columns -named by the userNameCol and roleNameCol -attributes. +The name of the table that contains one row for each role +assigned to a particular username. This table must include at +least the columns named by the userNameCol and +roleNameCol attributes. -Name of the "users" table, which must contain columns named -by the userNameCol and userCredCol -attributes. +The name of the table that contains one row for each +username to be recognized by Tomcat. This table must include +at least the columns named by the userNameCol and +userCredCol attributes. @@ -186,27 +191,35 @@ -The name of the JNDI JDBC DataSource for this Realm. +The JNDI named JDBC DataSource for your database. If the DataSource +is local to the context, the name is relative to +java:/comp/env, and otherwise the name should match the +name used to define the global DataSource. - -The name of the MessageDigest algorithm used -to encode user passwords stored in the database. If not specified, -user passwords are assumed to be stored in clear-text. - + + + When the realm is nested inside a Context element, this allows the + + realm to use a DataSource defined for the Context rather than a global + +DataSource. If not specified, the default is false: use a +global DataSource. + + + Name of the column, in the "user roles" table, which contains a role name assigned to the corresponding user. -Name of the column, in the "users" table, which contains -the user's credentials (i.e. password(. If a value for the -digest attribute is specified, this component -wi
svn commit: r468957 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
Author: funkman Date: Sun Oct 29 11:28:37 2006 New Revision: 468957 URL: http://svn.apache.org/viewvc?view=rev&rev=468957 Log: There is no org.apache.catalina.Logger or setLogger anymore Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?view=diff&rev=468957&r1=468956&r2=468957 == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Sun Oct 29 11:28:37 2006 @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -120,13 +120,6 @@ "addLifecycleListener", "org.apache.catalina.LifecycleListener"); -digester.addObjectCreate(prefix + "Engine/Logger", - null, // MUST be specified in the element - "className"); -digester.addSetProperties(prefix + "Engine/Logger"); -digester.addSetNext(prefix + "Engine/Logger", -"setLogger", -"org.apache.catalina.Logger"); digester.addObjectCreate(prefix + "Engine/Realm", null, // MUST be specified in the element - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r468939 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c native/common/jk_ajp_common.c native/common/jk_global.h native/common/jk_service.h xdocs/cha
Author: mturk
Date: Sun Oct 29 08:59:04 2006
New Revision: 468939
URL: http://svn.apache.org/viewvc?view=rev&rev=468939
Log:
When Tomcat sends AJP body message of size 0,
this means that Servlet has asked for explicit
flush.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_global.h
tomcat/connectors/trunk/jk/native/common/jk_service.h
tomcat/connectors/trunk/jk/xdocs/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=468939&r1=468938&r2=468939
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Oct 29 08:59:04
2006
@@ -515,6 +515,10 @@
s->flush_packets = 1;
else
s->flush_packets = 0;
+if (conf->options & JK_OPT_FLUSHEADER)
+s->flush_header = 1;
+else
+s->flush_header = 0;
if (conf->options & JK_OPT_DISABLEREUSE)
s->disable_reuse = 1;
@@ -1583,6 +1587,9 @@
}
else if (!strcasecmp(w, "FlushPackets")) {
opt = JK_OPT_FLUSHPACKETS;
+}
+else if (!strcasecmp(w, "FlushHeader")) {
+opt = JK_OPT_FLUSHEADER;
}
else if (!strcasecmp(w, "DisableReuse")) {
opt = JK_OPT_DISABLEREUSE;
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=468939&r1=468938&r2=468939
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Oct 29 08:59:04
2006
@@ -533,6 +533,10 @@
s->flush_packets = 1;
else
s->flush_packets = 0;
+if (conf->options & JK_OPT_FLUSHEADER)
+s->flush_header = 1;
+else
+s->flush_header = 0;
if (conf->options & JK_OPT_DISABLEREUSE)
s->disable_reuse = 1;
@@ -1609,6 +1613,9 @@
}
else if (!strcasecmp(w, "FlushPackets")) {
opt = JK_OPT_FLUSHPACKETS;
+}
+else if (!strcasecmp(w, "FlushHeader")) {
+opt = JK_OPT_FLUSHEADER;
}
else if (!strcasecmp(w, "DisableReuse")) {
opt = JK_OPT_DISABLEREUSE;
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?view=diff&rev=468939&r1=468938&r2=468939
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sun Oct 29
08:59:04 2006
@@ -1407,14 +1407,23 @@
JK_TRACE_EXIT(l);
return JK_INTERNAL_ERROR;
}
-if (!r->write(r, msg->buf + msg->pos, len)) {
-jk_log(l, JK_LOG_INFO,
- "Writing to client aborted or client network problems");
-JK_TRACE_EXIT(l);
-return JK_CLIENT_WR_ERROR;
+if (len == 0) {
+/* AJP13_SEND_BODY_CHUNK with length 0 is
+ * explicit flush packet message.
+ */
+if (r->flush)
+r->flush(r);
+}
+else {
+if (!r->write(r, msg->buf + msg->pos, len)) {
+jk_log(l, JK_LOG_INFO,
+ "Writing to client aborted or client network
problems");
+JK_TRACE_EXIT(l);
+return JK_CLIENT_WR_ERROR;
+}
+if (r->flush && r->flush_packets)
+r->flush(r);
}
-if (r->flush && r->flush_packets)
-r->flush(r);
}
break;
Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?view=diff&rev=468939&r1=468938&r2=468939
==
--- tomcat/connectors/trunk/jk/native/common/jk_global.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_global.h Sun Oct 29 08:59:04
2006
@@ -241,7 +241,8 @@
/* Forward local instead remote address */
#define JK_OPT_FWDLOCAL 0x0010
#define JK_OPT_FLUSHPACKETS 0x0020
-#define JK_OPT_DISABLEREUSE 0x0040
+#define JK_OPT_FLUSHEADER 0x0040
+#define JK_OPT_DISABLEREUSE 0x0080
/* Check for EBCDIC systems */
M
svn commit: r468937 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java AjpProcessor.java Constants.java
Author: mturk
Date: Sun Oct 29 08:50:56 2006
New Revision: 468937
URL: http://svn.apache.org/viewvc?view=rev&rev=468937
Log:
On explicit flush, create an empty (8 bytes)
SEND_BODY_CHUNK message, that can be used by
web server to flush the packet.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?view=diff&rev=468937&r1=468936&r2=468937
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sun
Oct 29 08:50:56 2006
@@ -265,6 +265,11 @@
*/
protected static final byte[] endMessageArray;
+/**
+ * Direct buffer used for sending explicit flush message.
+ */
+protected static final ByteBuffer flushMessageBuffer;
+
// - Static Initializer
@@ -272,7 +277,7 @@
static {
// Set the get body message buffer
-AjpMessage getBodyMessage = new AjpMessage(128);
+AjpMessage getBodyMessage = new AjpMessage(16);
getBodyMessage.reset();
getBodyMessage.appendByte(Constants.JK_AJP13_GET_BODY_CHUNK);
getBodyMessage.appendInt(Constants.MAX_READ_SIZE);
@@ -283,7 +288,7 @@
getBodyMessage.getLen());
// Set the read body message buffer
-AjpMessage pongMessage = new AjpMessage(128);
+AjpMessage pongMessage = new AjpMessage(16);
pongMessage.reset();
pongMessage.appendByte(Constants.JK_AJP13_CPONG_REPLY);
pongMessage.end();
@@ -292,7 +297,7 @@
pongMessage.getLen());
// Allocate the end message array
-AjpMessage endMessage = new AjpMessage(128);
+AjpMessage endMessage = new AjpMessage(16);
endMessage.reset();
endMessage.appendByte(Constants.JK_AJP13_END_RESPONSE);
endMessage.appendByte(1);
@@ -301,6 +306,18 @@
System.arraycopy(endMessage.getBuffer(), 0, endMessageArray, 0,
endMessage.getLen());
+// Set the flush message buffer
+AjpMessage flushMessage = new AjpMessage(16);
+flushMessage.reset();
+flushMessage.appendByte(Constants.JK_AJP13_SEND_BODY_CHUNK);
+flushMessage.appendInt(0);
+flushMessage.appendByte(0);
+flushMessage.end();
+flushMessageBuffer =
+ByteBuffer.allocateDirect(flushMessage.getLen());
+flushMessageBuffer.put(flushMessage.getBuffer(), 0,
+flushMessage.getLen());
+
}
@@ -504,6 +521,11 @@
try {
flush();
+// Send explicit flush message
+if (Socket.sendb(socket, flushMessageBuffer, 0,
+ flushMessageBuffer.position()) < 0) {
+error = true;
+}
} catch (IOException e) {
// Set error flag
error = true;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?view=diff&rev=468937&r1=468936&r2=468937
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Sun Oct
29 08:50:56 2006
@@ -254,6 +254,11 @@
*/
protected static final byte[] endMessageArray;
+/**
+ * Flush message array.
+ */
+protected static final byte[] flushMessageArray;
+
// - Static Initializer
@@ -261,7 +266,8 @@
static {
// Set the get body message buffer
-AjpMessage getBodyMessage = new AjpMessage(128);
+
+AjpMessage getBodyMessage = new AjpMessage(16);
getBodyMessage.reset();
getBodyMessage.appendByte(Constants.JK_AJP13_GET_BODY_CHUNK);
getBodyMessage.appendInt(Constants.MAX_READ_SIZE);
@@ -271,7 +277,7 @@
0, getBodyMessage.getLen());
// Set the read body message buffer
-AjpMessage pongMessage = new AjpMessage(128);
+AjpMessage pongMessage = new AjpMessage(16);
pongMessage.reset();
pongMessage.appendByte(Constants.JK_AJP13_CPONG_REPLY);
pongMessage.end();
@@ -280,7 +286,7 @@
0, pongMessage.getLen());
// Allocate the end message array
-AjpMessage endMessage = new AjpMessage(128);
svn commit: r468936 - /tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Author: mturk
Date: Sun Oct 29 08:50:07 2006
New Revision: 468936
URL: http://svn.apache.org/viewvc?view=rev&rev=468936
Log:
On explicit flush, create an empty (8 bytes)
SEND_BODY_CHUNK message, that can be used by
web server to flush the packet.
Modified:
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Modified:
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java?view=diff&rev=468936&r1=468935&r2=468936
==
--- tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Sun Oct 29 08:50:07 2006
@@ -262,6 +262,10 @@
*/
protected static final byte[] endMessageArray;
+/**
+ * Direct buffer used for sending explicit flush message.
+ */
+protected static final ByteBuffer flushMessageBuffer;
// - Static Initializer
@@ -298,6 +302,18 @@
System.arraycopy(endMessage.getBuffer(), 0, endMessageArray, 0,
endMessage.getLen());
+// Set the flush message buffer
+AjpMessage flushMessage = new AjpMessage();
+flushMessage.reset();
+flushMessage.appendByte(Constants.JK_AJP13_SEND_BODY_CHUNK);
+flushMessage.appendInt(0);
+flushMessage.appendByte(0);
+flushMessage.end();
+flushMessageBuffer =
+ByteBuffer.allocateDirect(flushMessage.getLen());
+flushMessageBuffer.put(flushMessage.getBuffer(), 0,
+flushMessage.getLen());
+
}
@@ -510,6 +526,11 @@
try {
flush();
+// Send explicit flush message
+if (Socket.sendb(socket, flushMessageBuffer, 0,
+ flushMessageBuffer.position()) < 0) {
+error = true;
+}
} catch (IOException e) {
// Set error flag
error = true;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
