cvs commit: jakarta-tomcat-5 build.properties.default build.xml

[remm]

remm2003/09/04 23:46:01

  Modified:.build.properties.default build.xml
  Log:
  - Daemon moved to commons proper.
  
  Revision  ChangesPath
  1.104 +3 -3  jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- build.properties.default  26 Aug 2003 08:42:38 -  1.103
  +++ build.properties.default  5 Sep 2003 06:46:01 -   1.104
  @@ -71,8 +71,8 @@
   commons-daemon.home=${base.path}/commons-daemon
   commons-daemon.lib=${commons-daemon.home}
   commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
  -commons-daemon.loc=jakarta-commons-sandbox/daemon
  -commons-daemon.cvs.loc=jakarta-commons-sandbox/daemon
  +commons-daemon.loc=jakarta-commons/daemon
  +commons-daemon.cvs.loc=jakarta-commons/daemon
   commons-daemon.procrun.home=${commons-daemon.lib}/bin
   commons-daemon.procrun.exe=${commons-daemon.procrun.home}/tomcat.exe
   commons-daemon.procrunw.exe=${commons-daemon.procrun.home}/tomcatw.exe
  
  
  
  1.156 +2 -2  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.155
  retrieving revision 1.156
  diff -u -r1.155 -r1.156
  --- build.xml 31 Aug 2003 16:52:05 -  1.155
  +++ build.xml 5 Sep 2003 06:46:01 -   1.156
  @@ -119,7 +119,7 @@
   
   
  -  
  +  
   
 
   
  @@ -479,7 +479,7 @@
 
   == Building: commons-daemon 
   
  -
  +
   
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/users MemoryUser.java

[billbarker]

billbarker2003/09/04 21:24:47

  Modified:catalina/src/share/org/apache/catalina/users MemoryUser.java
  Log:
  XML-escape the values when writing out the tomcat-users.xml file.
  
  Expanded on a patch
  Submitted By: Mark Thomas [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.6   +10 -10
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/users/MemoryUser.java
  
  Index: MemoryUser.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/users/MemoryUser.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MemoryUser.java   10 Feb 2002 08:06:20 -  1.5
  +++ MemoryUser.java   5 Sep 2003 04:24:47 -   1.6
  @@ -70,7 +70,7 @@
   import org.apache.catalina.Role;
   import org.apache.catalina.User;
   import org.apache.catalina.UserDatabase;
  -
  +import org.apache.catalina.util.RequestUtil;
   
   /**
* Concrete implementation of [EMAIL PROTECTED] User} for the
  @@ -294,13 +294,13 @@
   public String toString() {
   
   StringBuffer sb = new StringBuffer("

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users MemoryUser.java

[billbarker]

billbarker2003/09/04 21:20:49

  Modified:catalina/src/share/org/apache/catalina/users MemoryUser.java
  Log:
  XML-escape the values when writing out the tomcat-users.xml file.
  
  Expanded on a patch
  Submitted By: Mark Thomas [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.3   +10 -10
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUser.java
  
  Index: MemoryUser.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MemoryUser.java   2 Sep 2003 21:22:03 -   1.2
  +++ MemoryUser.java   5 Sep 2003 04:20:49 -   1.3
  @@ -70,7 +70,7 @@
   import org.apache.catalina.Group;
   import org.apache.catalina.Role;
   import org.apache.catalina.UserDatabase;
  -
  +import org.apache.catalina.util.RequestUtil;
   
   /**
* Concrete implementation of [EMAIL PROTECTED] User} for the
  @@ -294,13 +294,13 @@
   public String toString() {
   
   StringBuffer sb = new StringBuffer("

Re: [5.0.10] Tag tomorrow

[Bill Barker]

I can post new binaries for procrun tomorrow (PST) to BZ (now that Daemon is
in commons-proper, I can't check-in directly :-().  This includes a patch
from JFC for W9x (that I missed in the last build), and a patch from Mladin
to limit memory usage in the console.  Neither is particularly critical, so
if you want to tag and leave these for 5.0.11, I've got no objections.

"Remy Maucherat" <[EMAIL PROTECTED]> wrote in message
news:[EMAIL PROTECTED]
> I'll tag and release a new build tomorrow. So far, I think this is going
>   to be a high quality build.
>
> Any objections ?
>
> Remy




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] Bug 22715

[Mark Thomas]

The patches below (TC5 and TC4) fix bug 22715 in that they ensure that xml 
entities are correctly written back out to the password field of 
tomcat-users.xml

I did consider a more general patch to allow xml entities in user names, group 
names and role names but wasn't sure of the potential side effects. I also 
think that users are far more likely to want to use these characters in 
passwords than in user names, group names or role names. Thoughts? If the 
general consensus is that a more general patch is required, I am happy to 
produce one.

Mark


Index: catalina/src/share/org/apache/catalina/users/MemoryUser.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catali  
na/users/MemoryUser.java,v
retrieving revision 1.2
diff -u -r1.2 MemoryUser.java
--- catalina/src/share/org/apache/catalina/users/MemoryUser.java2 Sep 2003 
21:22:03 -  1.2
+++ catalina/src/share/org/apache/catalina/users/MemoryUser.java3 Sep 2003 
23:01:54 -
@@ -70,6 +70,7 @@
 import org.apache.catalina.Group;
 import org.apache.catalina.Role;
 import org.apache.catalina.UserDatabase;
+import org.apache.catalina.util.RequestUtil;


 /**
@@ -296,7 +297,7 @@
 StringBuffer sb = new StringBuffer("

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java

[kinman]

kinman  2003/09/04 15:30:06

  Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
  Log:
  - Fix a careless mistake.
  
  Revision  ChangesPath
  1.204 +4 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
  
  Index: Generator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
  retrieving revision 1.203
  retrieving revision 1.204
  diff -u -r1.203 -r1.204
  --- Generator.java3 Sep 2003 21:20:28 -   1.203
  +++ Generator.java4 Sep 2003 22:30:06 -   1.204
  @@ -3466,7 +3466,7 @@
*/
   public void generateSetDynamicAttribute() {
   out.printil(
  -"public void setDynamicAttribute(String uri, String localName, Object 
value) throws jsp.JspException {");
  +"public void setDynamicAttribute(String uri, String localName, Object 
value) throws JspException {");
   out.pushIndent();
   /* 
* According to the spec, only dynamic attributes with no uri are to
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 22426] - cannot resolve getContextPath on ServletRequest

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22426

cannot resolve getContextPath on ServletRequest





--- Additional Comments From [EMAIL PROTECTED]  2003-09-04 21:31 ---
You da Kin-Man!

...

Sorry.  Couldn't resist.  FWIW, that's what I was thinking but I didn't want to
say anything b/c I'm not privvy to the political inner-workings of the dev group
and how things like this are handled.

Anyway, excellent work!  (regardless of the fix)

Does the resolution need to change on this to reflect the now added change?  You
know, for posterity and all.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 22913] - Using jndi to get a DBCP BasicDataSource gives a ClassCastException

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22913

Using jndi to get a DBCP   BasicDataSource gives a  ClassCastException





--- Additional Comments From [EMAIL PROTECTED]  2003-09-04 19:37 ---
I forgot to mention that I use these three lines to get the datasource:
initContext = new InitialContext();
javax.naming.Context envContext =  
(javax.naming.Context)initContext.lookup("java:/comp/env");
DataSource ds = (DataSource)envContext.lookupLink("jdbc/SessionDB");

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [PATCH] Bug 22715

[Bill Barker]

- Original Message -
From: "Mark Thomas" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Thursday, September 04, 2003 11:46 AM
Subject: [PATCH] Bug 22715


> Resending. I seem to be having e-mail problems...
>
> The patches below (TC5 and TC4) fix bug 22715 in that they ensure that xml
> entities are correctly written back out to the password field of
> tomcat-users.xml
>
> I did consider a more general patch to allow xml entities in user names,
group
> names and role names but wasn't sure of the potential side effects. I also
> think that users are far more likely to want to use these characters in
> passwords than in user names, group names or role names. Thoughts? If the
> general consensus is that a more general patch is required, I am happy to
> produce one.
>

Depending on how/if UDBR wants to support CLIENT-CERT auth, you'll likely
need to escape the user name as well (the full X509 Subject may contain
embedded " characters in it).

> Mark
>
>
> Index: catalina/src/share/org/apache/catalina/users/MemoryUser.java
> ===
> RCS file:
>
/home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catali
> na/users/MemoryUser.java,v
> retrieving revision 1.2
> diff -u -r1.2 MemoryUser.java
> --- catalina/src/share/org/apache/catalina/users/MemoryUser.java 2 Sep
2003
> 21:22:03 - 1.2
> +++ catalina/src/share/org/apache/catalina/users/MemoryUser.java 3 Sep
2003
> 23:01:54 -
> @@ -70,6 +70,7 @@
>  import org.apache.catalina.Group;
>  import org.apache.catalina.Role;
>  import org.apache.catalina.UserDatabase;
> +import org.apache.catalina.util.RequestUtil;
>
>
>  /**
> @@ -296,7 +297,7 @@
>  StringBuffer sb = new StringBuffer("  sb.append(username);
>  sb.append("\" password=\"");
> -sb.append(password);
> +sb.append(RequestUtil.filter(password));
>  sb.append("\"");
>  if (fullName != null) {
>  sb.append(" fullName=\"");
>
>
>
> Index: catalina/src/share/org/apache/catalina/users/MemoryUser.java
> ===
> RCS file:
>
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/us
> ers/MemoryUser.java,v
> retrieving revision 1.5
> diff -u -r1.5 MemoryUser.java
> --- catalina/src/share/org/apache/catalina/users/MemoryUser.java 10 Feb
2002
> 08:06:20 - 1.5
> +++ catalina/src/share/org/apache/catalina/users/MemoryUser.java 3 Sep
2003
> 22:45:49 -
> @@ -68,8 +68,8 @@
>  import java.util.Iterator;
>  import org.apache.catalina.Group;
>  import org.apache.catalina.Role;
> -import org.apache.catalina.User;
>  import org.apache.catalina.UserDatabase;
> +import org.apache.catalina.util.RequestUtil;
>
>
>  /**
> @@ -296,7 +296,7 @@
>  StringBuffer sb = new StringBuffer("  sb.append(username);
>  sb.append("\" password=\"");
> -sb.append(password);
> +sb.append(RequestUtil.filter(password));
>  sb.append("\"");
>  if (fullName != null) {
>  sb.append(" fullName=\"");
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>

This message is intended only for the use of the person(s) listed above as the 
intended recipient(s), and may contain information that is PRIVILEGED and 
CONFIDENTIAL.  If you are not an intended recipient, you may not read, copy, or 
distribute this message or any attachment. If you received this communication in 
error, please notify us immediately by e-mail and then delete all copies of this 
message and any attachments.

In addition you should be aware that ordinary (unencrypted) e-mail sent through the 
Internet is not secure. Do not send confidential or sensitive information, such as 
social security numbers, account numbers, personal identification numbers and 
passwords, to us via ordinary (unencrypted) e-mail.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm JNDIRealmTestCase.java

[funkman]

funkman 2003/09/04 12:59:47

  Modified:catalina build.xml
   webapps/tomcat-docs realm-howto.xml
   catalina/src/share/org/apache/catalina/realm JNDIRealm.java
  Added:   catalina/src/test/org/apache/catalina/realm
JNDIRealmTestCase.java
  Log:
  Per http://marc.theaimsgroup.com/?l=tomcat-dev&m=106254937722504&w=2
  
  Allow Multiple user patterns in JNDIRealm and doc patch.
  
  Patch provided by Jeff Tulley  (jtulley at novell.com)
  
  Revision  ChangesPath
  1.133 +11 -1 jakarta-tomcat-4.0/catalina/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
  retrieving revision 1.132
  retrieving revision 1.133
  diff -u -r1.132 -r1.133
  --- build.xml 12 Mar 2003 21:38:05 -  1.132
  +++ build.xml 4 Sep 2003 19:59:46 -   1.133
  @@ -979,7 +979,7 @@
 
 
  +   depends="build-tests,test-dir-context,test-realm,test-util">
 
   
 
  @@ -1004,6 +1004,16 @@
   
   
   
  +  
  +
  +  
  +
  +
  +
  +  
  +  
  +
 
   
 
  
  
  
  1.13  +56 -14jakarta-tomcat-4.0/webapps/tomcat-docs/realm-howto.xml
  
  Index: realm-howto.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/realm-howto.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- realm-howto.xml   7 May 2003 15:56:00 -   1.12
  +++ realm-howto.xml   4 Sep 2003 19:59:47 -   1.13
  @@ -362,7 +362,7 @@
   Password to be recognized by Tomcat when the user logs in.
   This value may in cleartext or digested - see below for more
   information.
  -
  +
   There must be a table, referenced below as the user roles table,
   that contains one row for every valid role that is assigned to a
   particular user.  It is legal for a user to have zero, one, or more than
  @@ -373,13 +373,13 @@
   Username to be recognized by Tomcat (same value as is specified
   in the users table).
   Role name of a valid role associated with this user.
  -
  +
   
   
   Quick Start
  -  
  +
   To set up Tomcat to use DataSourceRealm, you will need to follow these steps:
  -  
  +
   If you have not yet done so, create tables and columns in your database
   that conform to the requirements described above.
   Configure a database username and password for use by Tomcat, that has
  @@ -418,7 +418,7 @@
   generate more detailed output.  If not specified, the default
   debugging detail level is zero (0).
 
  -
  +
 
   The digest algorithm used to store passwords in non-plaintext formats.
   Valid values are those accepted for the algorithm name by the
  @@ -426,18 +426,18 @@
   Digested Passwords for more
   information.  If not specified, passwords are stored in clear text.
 
  -
  +
 
   The name of the column, in the user roles table, that
   contains the name of a role assigned to this user.
 
  -
  +
 
   The name of the column, in the users table, that contains
   the password for this user (either in clear text, or digested if the
   digest attribute is set).
 
  -
  +
 
   The name of the column, in the users and user roles
   tables, that contains the username of this user.
  @@ -559,11 +559,19 @@
   attribute containing the username that is presented for
   authentication.
   
  -Often the distinguished name of the user's entry contains the
  -username presented for authentication but is otherwise the same for
  -all users. In this case the userPattern attribute may
  -be used to specify the DN, with "{0}" marking where
  -the username should be substituted.
  +There are multiple options for specifying where to look for users.
  +One is through the use of userPattern.  This is set
  +to the distinguished name of the user entry, but with "{0}" marking
  +where the username should be substituted.  If you want Tomcat to
  +search for the username in multiple places, you can supply multiple
  +locations in the userPattern.  This is done by
  +surrounding each separate location with parentheses.  For example,
  +"(cn={0},ou=users1,o=myorg)(cn={0},ou=users2,o=myorg)" will result in
  +Tomcat looking in ou=users1,o=myorg, and then ou=users2,o=myorg for the
  +username passed in from the authentication process.  You can also use
  +the standard LDAP "OR" search format, for instance
  +"(|(cn={0},o=myorg)({0}))".  Note that, as in this example, you can
  +do both context-less and fully-typed logins using this technique.
   
   Otherwise the realm must search the directory to find a unique entry
   containing the username. The following attributes configure this
  @@ -831,7 +839,8 @@
   directory 

cvs commit: jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm - New directory

[funkman]

funkman 2003/09/04 12:58:03

  jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm - New directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: in_addr_t and Linux 2.2

[Glenn Nielsen]

Henri Gomez wrote:
Glenn Nielsen a écrit :

FYI, I have put building a test mod_jk 1.2.5 source distribution on hold
pending Henri's work on IPV6.  Henri, please let me know when you think
we are ready for another test source dist.


We may add the configure stuff to determine if in_addr_t is available.
I'll take a look at it right now.
BTW, IPV6 will be added in 1.2.6 (or later), so don't delay release for it



OK, so are we ready for a test source release?

Glenn

--
Glenn Nielsen [EMAIL PROTECTED] | /* Spelin donut madder|
MOREnet System Programming   |  * if iz ina coment.  |
Missouri Research and Education Network  |  */   |
--
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[PATCH] Bug 22715

[Mark Thomas]

Resending. I seem to be having e-mail problems...

The patches below (TC5 and TC4) fix bug 22715 in that they ensure that xml 
entities are correctly written back out to the password field of 
tomcat-users.xml

I did consider a more general patch to allow xml entities in user names, group 
names and role names but wasn't sure of the potential side effects. I also 
think that users are far more likely to want to use these characters in 
passwords than in user names, group names or role names. Thoughts? If the 
general consensus is that a more general patch is required, I am happy to 
produce one.

Mark


Index: catalina/src/share/org/apache/catalina/users/MemoryUser.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catali  
na/users/MemoryUser.java,v
retrieving revision 1.2
diff -u -r1.2 MemoryUser.java
--- catalina/src/share/org/apache/catalina/users/MemoryUser.java2 Sep 2003   
21:22:03 -  1.2
+++ catalina/src/share/org/apache/catalina/users/MemoryUser.java3 Sep 2003 
23:01:54 -
@@ -70,6 +70,7 @@
 import org.apache.catalina.Group;
 import org.apache.catalina.Role;
 import org.apache.catalina.UserDatabase;
+import org.apache.catalina.util.RequestUtil;


 /**
@@ -296,7 +297,7 @@
 StringBuffer sb = new StringBuffer("

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java

[remm]

remm2003/09/04 10:59:39

  Modified:webapps/manager xform.xsl
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Implement the XML processor state.
  
  Revision  ChangesPath
  1.3   +7 -7  jakarta-tomcat-catalina/webapps/manager/xform.xsl
  
  Index: xform.xsl
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/xform.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xform.xsl 25 Mar 2003 15:40:26 -  1.2
  +++ xform.xsl 4 Sep 2003 17:59:39 -   1.3
  @@ -83,13 +83,13 @@
   
 
  
  -
  -
  -
  -
  -
  -
  - ?
  +
  +
  +
  +
  +
  +
  + ? 
  
 
   
  
  
  
  1.2   +118 -52   
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
  
  Index: StatusTransformer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StatusTransformer.java4 Sep 2003 14:22:18 -   1.1
  +++ StatusTransformer.java4 Sep 2003 17:59:39 -   1.2
  @@ -338,9 +338,7 @@
   while (enum.hasMoreElements()) {
   ObjectName objectName = (ObjectName) enum.nextElement();
   if (name.equals(objectName.getKeyProperty("worker"))) {
  -writer.write("");
   writeProcessorState(writer, objectName, mBeanServer, mode);
  -writer.write("");
   }
   }
   writer.write("");
  @@ -361,53 +359,55 @@
 int mode)
   throws Exception {
   
  -if (mode == 0) {
  -Integer stageValue = 
  -(Integer) mBeanServer.getAttribute(pName, "stage");
  -int stage = stageValue.intValue();
  -boolean fullStatus = true;
  -boolean showRequest = true;
  -
  -writer.write("");
  -
  -switch (stage) {
  +Integer stageValue = 
  +(Integer) mBeanServer.getAttribute(pName, "stage");
  +int stage = stageValue.intValue();
  +boolean fullStatus = true;
  +boolean showRequest = true;
  +String stageStr = null;
  +
  +switch (stage) {
  +
  +case (1/*org.apache.coyote.Constants.STAGE_PARSE*/):
  +stageStr = "P";
  +fullStatus = false;
  +break;
  +case (2/*org.apache.coyote.Constants.STAGE_PREPARE*/):
  +stageStr = "P";
  +fullStatus = false;
  +break;
  +case (3/*org.apache.coyote.Constants.STAGE_SERVICE*/):
  +stageStr = "S";
  +break;
  +case (4/*org.apache.coyote.Constants.STAGE_ENDINPUT*/):
  +stageStr = "F";
  +break;
  +case (5/*org.apache.coyote.Constants.STAGE_ENDOUTPUT*/):
  +stageStr = "F";
  +break;
  +case (7/*org.apache.coyote.Constants.STAGE_ENDED*/):
  +stageStr = "R";
  +fullStatus = false;
  +break;
  +case (6/*org.apache.coyote.Constants.STAGE_KEEPALIVE*/):
  +stageStr = "K";
  +fullStatus = true;
  +showRequest = false;
  +break;
  +case (0/*org.apache.coyote.Constants.STAGE_NEW*/):
  +stageStr = "R";
  +fullStatus = false;
  +break;
  +default:
  +// Unknown stage
  +stageStr = "?";
  +fullStatus = false;
   
  -case (1/*org.apache.coyote.Constants.STAGE_PARSE*/):
  -writer.write("P");
  -fullStatus = false;
  -break;
  -case (2/*org.apache.coyote.Constants.STAGE_PREPARE*/):
  -writer.write("P");
  -fullStatus = false;
  -break;
  -case (3/*org.apache.coyote.Constants.STAGE_SERVICE*/):
  -writer.write("S");
  -break;
  -case (4/*org.apache.coyote.Constants.STAGE_ENDINPUT*/):
  -writer.write("F");
  -break;
  -case (5/*org.apache.coyote.Constants.STAGE_ENDOUTPUT*/):
  -writer.write("F");
  -break;
  -case (7/*org.apache.coyote.Constants.STAGE_ENDED*/):
  -writer.write("R");
  -fullStatus = false;
  -break;
  -case (6/*org.apache.coyote.Constants.STAGE_KEEPALIVE*/):
  -writer.wr

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationContext.java

[luehe]

luehe   2003/09/04 10:45:40

  Modified:catalina/src/share/org/apache/catalina/core
ApplicationContext.java
  Log:
  Get the absolute path to the work dir, so that JARs in /WEB-INF/lib can be found
  
  Revision  ChangesPath
  1.20  +5 -5  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
  
  Index: ApplicationContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ApplicationContext.java   2 Sep 2003 21:22:04 -   1.19
  +++ ApplicationContext.java   4 Sep 2003 17:45:40 -   1.20
  @@ -511,7 +511,7 @@
   if (context.isFilesystemBased()) {
   jarFile = new File(basePath, path);
   } else {
  -jarFile = new File(context.getWorkDir(), path);
  +jarFile = new File(context.getWorkPath(), path);
   }
   if (jarFile.exists()) {
   return jarFile.toURL();
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Problem with redirect

[Norris Shelton]

We are using 4.1.12 on Linux behind BigIP.  We have a page
/search.jsp that has not changed.  For some reason, when we
access it, we get the following in the access log:
10.11.6.118 - - [04/Sep/2003:12:19:19 -0500] "GET /search.jsp
HTTP/1.1" 302 -
10.11.6.118 - - [04/Sep/2003:12:19:19 -0500] "GET
/dis_timeout.jsp HTTP/1.1" 404 -


We have looked at the whole project and cannot find any
reference to /dis_timeout.jsp.  No page, no reference to the
text.  We have deleted the work files and reset the context.,
but have the same result.

I even copied the contents of index.jsp into search.jsp and
deleted the work files.  After I attempted to access the file,
the contents of the new search_jsp.java have the same contents
as the index_jsp.java.  It still does not work??

Any ideas?

=

Norris Shelton
Software Engineer
Sun Certified Java 1.1 Programmer
Appriss, Inc.
ICQ# 26487421
AIM NorrisEShelton
YIM norrisshelton


__
Do you Yahoo!?
Yahoo! SiteBuilder - Free, easy-to-use web site design software
http://sitebuilder.yahoo.com

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager Constants.java

[remm]

remm2003/09/04 07:39:21

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
Constants.java
  Log:
  - Forgot to hit save to remove the tabs.
  
  Revision  ChangesPath
  1.7   +4 -4  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java
  
  Index: Constants.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Constants.java4 Sep 2003 14:22:18 -   1.6
  +++ Constants.java4 Sep 2003 14:39:21 -   1.7
  @@ -238,11 +238,11 @@
   "\n" +
   "";
   
  - public static final String XML_DECLARATION =
  - "";
  +public static final String XML_DECLARATION =
  +"";

  - public static final String XML_STYLE =
  - "";
  +public static final String XML_STYLE =
  +"";
   
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[5.0.10] Tag tomorrow

[Remy Maucherat]

I'll tag and release a new build tomorrow. So far, I think this is going 
 to be a high quality build.

Any objections ?

Remy



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java Constants.java StatusManagerServlet.java

[remm]

remm2003/09/04 07:22:18

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
Constants.java StatusManagerServlet.java
  Added:   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusTransformer.java
  Log:
  - Refactor the status servlet, allowing for XML output in addition to the user
friendly HTML.
  - Submitted by Peter Lin, inspired by the code from John Turner which was
originally rejected.
  
  Revision  ChangesPath
  1.6   +9 -3  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java
  
  Index: Constants.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Constants.java30 Jul 2003 18:43:01 -  1.5
  +++ Constants.java4 Sep 2003 14:22:18 -   1.6
  @@ -238,5 +238,11 @@
   "\n" +
   "";
   
  + public static final String XML_DECLARATION =
  + "";
  + 
  + public static final String XML_STYLE =
  + "";
  +
   }
   
  
  
  
  1.11  +33 -446   
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
  
  Index: StatusManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- StatusManagerServlet.java 17 Aug 2003 14:50:24 -  1.10
  +++ StatusManagerServlet.java 4 Sep 2003 14:22:18 -   1.11
  @@ -67,7 +67,6 @@
   
   import java.io.IOException;
   import java.io.PrintWriter;
  -import java.text.MessageFormat;
   import java.util.Enumeration;
   import java.util.Iterator;
   import java.util.Set;
  @@ -81,15 +80,12 @@
   import javax.management.ObjectName;
   
   import javax.servlet.ServletException;
  -import javax.servlet.UnavailableException;
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   
   import org.apache.commons.modeler.Registry;
   
  -import org.apache.tomcat.util.compat.JdkCompat;
  -
   import org.apache.catalina.util.ServerInfo;
   import org.apache.catalina.util.StringManager;
   
  @@ -247,7 +243,14 @@
 HttpServletResponse response)
   throws IOException, ServletException {
   
  -response.setContentType("text/html");
  +// mode is flag for HTML or XML output
  +int mode = 0;
  +// if ?XML=true, set the mode to XML
  +if (request.getParameter("XML") != null 
  +&& request.getParameter("XML").equals("true")) {
  +mode = 1;
  +}
  +StatusTransformer.setContentType(response, mode);
   
   PrintWriter writer = response.getWriter();
   
  @@ -256,9 +259,8 @@
   && (request.getPathInfo().equals("/all"))) {
   completeStatus = true;
   }
  -
  -// HTML Header Section
  -writer.print(Constants.HTML_HEADER_SECTION);
  + // use StatusTransformer to output status
  +StatusTransformer.writeHeader(writer,mode);
   
   // Body Header Section
   Object[] args = new Object[2];
  @@ -268,8 +270,8 @@
   } else {
   args[1] = sm.getString("statusServlet.title");
   }
  -writer.print(MessageFormat.format
  - (Constants.BODY_HEADER_SECTION, args));
  + // use StatusTransformer to output status
  +StatusTransformer.writeBody(writer,args,mode);
   
   // Manager Section
   args = new Object[9];
  @@ -293,10 +295,11 @@
   (request.getContextPath() + "/status/all");
   args[8] = sm.getString("statusServlet.complete");
   }
  -writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
  + // use StatusTransformer to output status
  +StatusTransformer.writeManager(writer,args,mode);
   
   // Server Header Section
  -args = new Object[7];
  + args = new Object[7];
   args[0] = sm.getString("htmlManagerServlet.serverTitle");
   args[1] = sm.getString("htmlManagerServlet.serverVersion");
   args[2] = sm.getString("htmlManagerServlet.serverJVMVersion");
  @@ -304,8 +307,8 @@
   args[4] = sm.getString("htmlManagerServlet.serverOSName");
   args[5] = sm.getString("htmlManagerServlet.serverOSVersion");
   args[6] = sm.getString("htmlManagerServlet.serverOSArch");
  -writer.print(MessageFormat.format
  

Re: in_addr_t and Linux 2.2

[Henri Gomez]

Henri Gomez a écrit :

Glenn Nielsen a écrit :

FYI, I have put building a test mod_jk 1.2.5 source distribution on hold
pending Henri's work on IPV6.  Henri, please let me know when you think
we are ready for another test source dist.


We may add the configure stuff to determine if in_addr_t is available.
I'll take a look at it right now.
BTW, IPV6 will be added in 1.2.6 (or later), so don't delay release for it
I take a look at configure.in and if I know how to see if inet_pton 
exist via AC_CHECK_FUNCS, I don't know how to determine for in_addr_t.

Jean-Frederic may help us here since it's our resident configure guru

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [PROPOSAL] archive old unmirrored tomcat releases

[Stefan Bodewig]

On Thu, 04 Sep 2003, Remy Maucherat <[EMAIL PROTECTED]> wrote:

> I used Freshmeat for some time, and concluded it is useless

Sure, but users go there and follow the links.

> (not user friendly, their admins are not very nice and few people in
> the Java community use it).

Take a look at ,
Tomcat 4.1.24 from the unmirrored directory comes far far in front of
the mirrored 4.1.27 (downloaded more than twice as often).

I cannot find any other link pointing to the 4.1.24 release, so it
seems that quite a few people use Sourceforge.

IMHO it would be better to either drop the freshmeat listing
completely or adjust the download URLs to point to the bin/sourceindex
pages (that would be correct for future releases as well).

Stefan

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [PROPOSAL] archive old unmirrored tomcat releases

[Remy Maucherat]

Stefan Bodewig wrote:
On Wed, 3 Sep 2003, robert burrell donkin <[EMAIL PROTECTED]> wrote:
In particular it seems that people are downloading 4.1.24 instead of
the latest release.  After looking around a bit, I think they are
getting there via freshmeat.net.
Remy, could you please announce the 4.1.27 release at freshmeat and
use http://jakarta.apache.org/site/binindex.cgi as URL for all
download types (sourceindex.cgi for the sources, of course).
I used Freshmeat for some time, and concluded it is useless (not user 
friendly, their admins are not very nice and few people in the Java 
community use it).

Remy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: in_addr_t and Linux 2.2

[Henri Gomez]

Glenn Nielsen a écrit :

FYI, I have put building a test mod_jk 1.2.5 source distribution on hold
pending Henri's work on IPV6.  Henri, please let me know when you think
we are ready for another test source dist.
We may add the configure stuff to determine if in_addr_t is available.
I'll take a look at it right now.
BTW, IPV6 will be added in 1.2.6 (or later), so don't delay release for it

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: in_addr_t and Linux 2.2

[Glenn Nielsen]

FYI, I have put building a test mod_jk 1.2.5 source distribution on hold
pending Henri's work on IPV6.  Henri, please let me know when you think
we are ready for another test source dist.
Thanks,

Glenn

Henri Gomez wrote:
FYI, in_addr_t is not defined on Redhat 6.2 which use kernel 2.2
and glibc 2.1.
Should we also fix this case ?

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: mirror-enable tomcat-connector downloads

[Glenn Nielsen]

Stefan Bodewig wrote:
On Wed, 03 Sep 2003, Glenn Nielsen <[EMAIL PROTECTED]> wrote:

Stefan Bodewig wrote:

On Wed, 03 Sep 2003, Glenn Nielsen <[EMAIL PROTECTED]> wrote:


We have a release pending for mod_jk 1.2.5,
Does that affect JK2 and JNI and what not as well?
No. Just the mod_jk 1.2 connector source and binary distributions.


Do you want to move the other distributions to the mirrors then as
well or would you prefer somebody else to do it (I'd still volunteer 8-).
Nah, just as easy to move those at the same time mod_jk 1.2 is moved.

Glenn

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 22852] - JDK1.4 logging formatter class not being found

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22852

JDK1.4 logging formatter class not being found





--- Additional Comments From [EMAIL PROTECTED]  2003-09-04 11:03 ---
Created an attachment (id=8061)
simplest java code to implement JDK1.4 logging

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[GUMP] Build Failure - jakarta-tomcat-4.0

[Craig McClanahan]

This email is autogenerated from the output from:



Buildfile: build.xml

deploy-prepare:

deploy-static:

deploy:
 [echo] Target: Catalina - Deploy ...

flags:

flags.display:
 [echo] --- Build environment for Catalina ---
 [echo] If ${property_name} is displayed, then the property is not set)
 [echo] --- Build options ---
 [echo] full.dist=${full.dist}
 [echo] build.sysclasspath=only
 [echo] compile.debug=${compile.debug}
 [echo] compile.deprecation=${compile.deprecation}
 [echo] compile.optimize=${compile.optimize}
 [echo] --- Ant Flags ---
 [echo] 

DO NOT REPLY [Bug 22852] - JDK1.4 logging formatter class not being found

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22852

JDK1.4 logging formatter class not being found





--- Additional Comments From [EMAIL PROTECTED]  2003-09-04 10:58 ---
Created an attachment (id=8060)
this is that class that does the formatting

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 22852] - JDK1.4 logging formatter class not being found

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22852

JDK1.4 logging formatter class not being found





--- Additional Comments From [EMAIL PROTECTED]  2003-09-04 10:57 ---
Created an attachment (id=8059)
logging config file - line 43 declares the class to use

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: in_addr_t and Linux 2.2

[Henri Gomez]

Bill Barker a écrit :

- Original Message - 
From: "Henri Gomez" <[EMAIL PROTECTED]>
To: "Tomcat Developers List" <[EMAIL PROTECTED]>
Sent: Thursday, September 04, 2003 1:51 AM
Subject: in_addr_t and Linux 2.2



FYI, in_addr_t is not defined on Redhat 6.2 which use kernel 2.2
and glibc 2.1.


And I thought myself a caveman for using RH 7.x ;-).
Some old production systems are still in RH 6.2 ;)

And I was still using RH 7.2 on my developpment machine 5 weeks  ago

I'd prefer that this is handled by special defines in the autoconf script.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: in_addr_t and Linux 2.2

[Bill Barker]

- Original Message - 
From: "Henri Gomez" <[EMAIL PROTECTED]>
To: "Tomcat Developers List" <[EMAIL PROTECTED]>
Sent: Thursday, September 04, 2003 1:51 AM
Subject: in_addr_t and Linux 2.2


> FYI, in_addr_t is not defined on Redhat 6.2 which use kernel 2.2
> and glibc 2.1.

And I thought myself a caveman for using RH 7.x ;-).

I'd prefer that this is handled by special defines in the autoconf script.

> 
> Should we also fix this case ?
> 
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
This message is intended only for the use of the person(s) listed above as the 
intended recipient(s), and may contain information that is PRIVILEGED and 
CONFIDENTIAL.  If you are not an intended recipient, you may not read, copy, or 
distribute this message or any attachment. If you received this communication in 
error, please notify us immediately by e-mail and then delete all copies of this 
message and any attachments.

In addition you should be aware that ordinary (unencrypted) e-mail sent through the 
Internet is not secure. Do not send confidential or sensitive information, such as 
social security numbers, account numbers, personal identification numbers and 
passwords, to us via ordinary (unencrypted) e-mail.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

in_addr_t and Linux 2.2

[Henri Gomez]

FYI, in_addr_t is not defined on Redhat 6.2 which use kernel 2.2
and glibc 2.1.
Should we also fix this case ?

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]