Re: mirror-enable tomcat-connector downloads
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-). The ultimate goal should be that jakarta/builds is empty (nightlies are supposed to be on cvs.apache.org for some reason). Nightlies were moved to cvs.apache.org a while ago when daedalus was running out of disk space. Great. Betas/Alphas should be on cvs instead of jakarta as well. Now that jakarta.apache.org and cvs.apache.org are on the same server it doesn't matter. Yes and no. It would matter for anybody trying to mirror jakarta.apache.org, not sure whether that happens, though. Thanks again Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PROPOSAL] archive old unmirrored tomcat releases
On Wed, 3 Sep 2003, robert burrell donkin [EMAIL PROTECTED] wrote: the download statistics (supply by infrastructure) [1] show that unmirrored tomcat downloads from these directories are still proving far too popular. 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). 1. all available distributables for the latest tomcat 3, tomcat 4 and tomcat 5 releases be added to the appropriate mirrored directories and linked to jakarta download pages. Only the latest stable releases, I'd say. Please also note the conversation between myself and Glenn in another thread about the connector releases. 2. the older releases for tomcat 3, tomcat 4 and tomcat 5 be moved into the ASF archives this shouldn't include betas/alphas/milestones either IMHO. 3. move betas/alphas/milestones to http://cvs.apache.org/dist/jakarta/. I'm not sure whether there is any point in keeping unstable releases that have been superseded by newer releases around at all. Just MHO. (unless someone else steps forward) i'll volunteer to carry out this work. Thanks Stefan Footnotes: [1] http://www.apache.org/~slive/bandwidth-hogs.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
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. Should we also fix this case ? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: in_addr_t and Linux 2.2
- 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]
Re: in_addr_t and Linux 2.2
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]
[GUMP] Build Failure - jakarta-tomcat-4.0
This email is autogenerated from the output from:
http://cvs.apache.org/builds/gump/2003-09-04/jakarta-tomcat-4.0.html
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] style task available (required)=true
[echo] --- JDK ---
[echo] jdk.1.2.present=true
[echo] jdk.1.3.present=true
[echo] jdk.1.4.present=true
[echo] --- Source Dependencies ---
[echo] jtc.home.present=true
[echo] --- Required Libraries ---
[echo] beanutils.present=true
[echo] collections.present=true
[echo] digester.present=true
[echo] jaxp.present=true
[echo] jndi.present=true
[echo] logging.present=true
[echo] regexp.present=true
[echo] servlet.present=true
[echo] --- Optional Libraries ---
[echo] daemon.present=${daemon.present}
[echo] dbcp.present=true
[echo] fileupload.present=${fileupload.present}
[echo] jaas.present=true
[echo] javamail.present=true
[echo] jmx.present=true
[echo] jsse.present=true
[echo] jta.present=true
[echo] junit.present=true
[echo] ldap.present=true
[echo] modeler.present=true
[echo] pool.present=true
[echo] tyrex.present=${tyrex.present}
[echo] --- Required JARs ---
[echo] jndi.jar.present(except JDK 1.3+)=true
[echo] regexp.jar.present=true
[echo] servlet.jar.present=true
[echo] xerces.jar.present(except JDK 1.4+ or xerces2)=true
[echo] xerces2.jars.present(except JDK 1.4+ or xerces1)=${xerces2.jars.present}
[echo] --- Optional JARs ---
[echo] daemon.jar.present=${daemon.jar.present}
[echo] dbcp.jar.present=true
[echo] fileupload.jar.present=${fileupload.jar.present}
[echo] jaas.jar.present=true
[echo] javamail.jar.present=true
[echo] jdbc20ext.jar.present=true
[echo] jmx.jar.present=true
[echo] jta.jar.present=true
[echo] junit.jar.present=${junit.jar.present}
[echo] ldap.jar.present=true
[echo] modeler.jar.present=true
[echo] pool.jar.present=true
[echo] tyrex.jar.present=${tyrex.jar.present}
[echo] --- Conditional compilation flags ---
[echo] compile.daemon=${compile.daemon}
[echo] compile.dbcp=true
[echo] compile.jaas=true
[echo] compile.javamail=true
[echo] compile.jmx=true
[echo] compile.jndi=true
[echo] compile.jsse=true
[echo] compile.jta=true
[echo] compile.junit=true
[echo] compile.ldap=true
[echo] compile.ssi=true
[echo] compile.tyrex=${compile.tyrex}
[echo] --- Distribution flags ---
[echo] copy.daemon.jar=${copy.daemon.jar}
[echo] copy.dbcp.jar=true
[echo] copy.jaas.jar=${copy.jaas.jar}
[echo] copy.jdbc20ext.jar=${copy.jdbc20ext.jar}
[echo] copy.javamail.jar=true
[echo] copy.jmx.jar=true
[echo] copy.jndi.jar=${copy.jndi.jar}
[echo] copy.jta.jar=true
[echo] copy.ldap.jar=${copy.ldap.jar}
[echo] copy.logging.jar=true
[echo] copy.modeler.jar=true
[echo] copy.pool.jar=true
[echo] copy.tyrex.jar=${copy.tyrex.jar}
[echo] copy.xerces.jar=${copy.xerces.jar}
[echo] copy.xerces2.jars=${copy.xerces2.jars}
build-prepare:
copy-activation.jar:
[copy] Copying 1 file to
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/common/lib
[copy] Copying 1 file to
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/common/lib
copy-daemon.jar:
copy-dbcp.jar:
[copy] Copying 1 file to
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/common/lib
copy-fileupload.jar:
copy-jaas.jar:
copy-jdbc20ext.jar:
copy-jmx.jar:
[copy] Copying 1 file to
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/server/lib
[copy] Copying 1 file to
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/server/lib
copy-jndi.jar:
copy-jsse.jar:
copy-jta.jar:
[copy] Copying 1 file to
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/common/lib
copy-ldap.jar:
copy-modeler.jar:
[copy] Copying 1 file to
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/server/lib
copy-pool.jar:
[copy] Copying 1 file to
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/common/lib
copy-tyrex.jar:
copy-xerces.jar:
copy-xerces2.jars:
build-static:
build-tomcat-util:
detect:
build-prepare:
build-main:
[echo] - Java-utils -
[echo] -- puretls.present = ${puretls.present}
[echo]
DO NOT REPLY [Bug 22852] - JDK1.4 logging formatter class not being found
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22852. 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]
Re: mirror-enable tomcat-connector downloads
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]
Re: in_addr_t and Linux 2.2
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: in_addr_t and Linux 2.2
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: [PROPOSAL] archive old unmirrored tomcat releases
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: [PROPOSAL] archive old unmirrored tomcat releases
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 http://www.apache.org/~slive/bandwidth-hogs.txt, 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: in_addr_t and Linux 2.2
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]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java Constants.java StatusManagerServlet.java
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 @@
/body\n +
/html;
+ public static final String XML_DECLARATION =
+ ?xml version=\1.0\?;
+
+ public static final String XML_STYLE =
+ ?xml-stylesheet type=\text/xsl\ href=\xform.xsl\ ?;
+
}
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);
-
[5.0.10] Tag tomorrow
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 Constants.java
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 @@ /body\n + /html; - public static final String XML_DECLARATION = - ?xml version=\1.0\?; +public static final String XML_DECLARATION = +?xml version=\1.0\?; - public static final String XML_STYLE = - ?xml-stylesheet type=\text/xsl\ href=\xform.xsl\ ?; +public static final String XML_STYLE = +?xml-stylesheet type=\text/xsl\ href=\xform.xsl\ ?; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Problem with redirect
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/catalina/src/share/org/apache/catalina/core ApplicationContext.java
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]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusTransformer.java
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 @@
xsl:template match=worker
tr
-tdxsl:apply-templates select=stage//td
-tdxsl:apply-templates select=requestProcessingTime//td
-tdxsl:apply-templates select=requestBytesSent//td
-tdxsl:apply-templates select=requestBytesReceived//td
-tdxsl:apply-templates select=remoteAddr//td
-tdxsl:apply-templates select=virtualHost//td
-tdxsl:apply-templates select=method/ xsl:apply-templates
select=currentUri/?xsl:apply-templates select=currentQueryString//td
+tdxsl:value-of select=@stage//td
+tdxsl:value-of select=@requestProcessingTime//td
+tdxsl:value-of select=@requestBytesSent//td
+tdxsl:value-of select=@requestBytesReceived//td
+tdxsl:value-of select=@remoteAddr//td
+tdxsl:value-of select=@virtualHost//td
+tdxsl:value-of select=@method/ xsl:value-of
select=@currentUri/?xsl:value-of select=@currentQueryString/ xsl:value-of
select=@protocol//td
/tr
/xsl:template
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(worker);
writeProcessorState(writer, objectName, mBeanServer, mode);
-writer.write(/worker);
}
}
writer.write(/workers);
@@ -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(tdstrong);
-
-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
[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.
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(user username=\);
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.java10 Feb 2002
08:06:20 - 1.5
+++ catalina/src/share/org/apache/catalina/users/MemoryUser.java3 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(user username=\);
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]
Re: in_addr_t and Linux 2.2
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]
cvs commit: jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm - New directory
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]
cvs commit: jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm JNDIRealmTestCase.java
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-devm=106254937722504w=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 @@
!-- TEST: Execute Unit Tests == --
target name=test if=junit.present
description=Run all unit test cases
- depends=build-tests,test-dir-context,test-util
+ depends=build-tests,test-dir-context,test-realm,test-util
/target
target name=test-dir-context if=junit.present
@@ -1004,6 +1004,16 @@
/java
delete file=${test.webapp.war}/
+ /target
+
+ target name=test-realm if=junit.present
+
+echo message=Running Realm tests/
+java classname=${test.runner} fork=yes
+failonerror=${test.failonerror}
+ arg value=org.apache.catalina.realm.JNDIRealmTestCase/
+ classpath refid=test.classpath/
+/java
/target
target name=test-util if=junit.present
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 @@
liPassword to be recognized by Tomcat when the user logs in.
This value may in cleartext or digested - see below for more
information./li
-/ul/li
+/ul/li
liThere must be a table, referenced below as the emuser roles/em 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 @@
liUsername to be recognized by Tomcat (same value as is specified
in the emusers/em table)./li
liRole name of a valid role associated with this user./li
-/ul/li
+/ul/li
/ul
h3Quick Start/h3
-
+
pTo set up Tomcat to use DataSourceRealm, you will need to follow these steps:/p
-ol
+ol
liIf you have not yet done so, create tables and columns in your database
that conform to the requirements described above./li
liConfigure 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)./p
/attribute
-
+
attribute name=digest required=false
pThe 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 @@
a href=#Digested PasswordsDigested Passwords/a for more
information. If not specified, passwords are stored in clear text./p
/attribute
-
+
attribute name=roleNameCol required=true
pThe name of the column, in the emuser roles/em table, that
contains the name of a role assigned to this user./p
/attribute
-
+
attribute name=userCredCol required=true
pThe name of the column, in the emusers/em table, that contains
the password for this user (either in clear text, or digested if the
codedigest/code attribute is set)./p
/attribute
-
+
attribute name=userNameCol required=true
pThe name of the column, in the emusers/em and emuser roles/em
tables, that contains the username of this user./p
@@ -559,11 +559,19 @@
attribute containing the username that is presented for
authentication./p
-pOften 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 stronguserPattern/strong attribute may
-be used to specify the DN, with {0} marking where
-the username should be substituted./p
+pThere are multiple options for specifying where to look for users.
+One is through the use of
Re: [PATCH] Bug 22715
- 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 quot; 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(user username=\);
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(user username=\);
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]
DO NOT REPLY [Bug 22913] - Using jndi to get a DBCP BasicDataSource gives a ClassCastException
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22913. 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]
DO NOT REPLY [Bug 22426] - cannot resolve getContextPath on ServletRequest
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22426. 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]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java
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]
[PATCH] Bug 22715
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(user username=\);
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.java10 Feb 2002
08:06:20 - 1.5
+++ catalina/src/share/org/apache/catalina/users/MemoryUser.java3 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(user username=\);
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]
Re: [5.0.10] Tag tomorrow
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]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users MemoryUser.java
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;
/**
* pConcrete implementation of [EMAIL PROTECTED] User} for the
@@ -294,13 +294,13 @@
public String toString() {
StringBuffer sb = new StringBuffer(user username=\);
-sb.append(username);
+sb.append(RequestUtil.filter(username));
sb.append(\ password=\);
-sb.append(password);
+sb.append(RequestUtil.filter(password));
sb.append(\);
if (fullName != null) {
sb.append( fullName=\);
-sb.append(fullName);
+sb.append(RequestUtil.filter(fullName));
sb.append(\);
}
synchronized (groups) {
@@ -313,7 +313,7 @@
sb.append(',');
}
n++;
-sb.append(((Group) values.next()).getGroupname());
+sb.append(RequestUtil.filter(((Group)
values.next()).getGroupname()));
}
sb.append(\);
}
@@ -328,7 +328,7 @@
sb.append(',');
}
n++;
-sb.append(((Role) values.next()).getRolename());
+sb.append(RequestUtil.filter(((Role)
values.next()).getRolename()));
}
sb.append(\);
}
-
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
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;
/**
* pConcrete implementation of [EMAIL PROTECTED] User} for the
@@ -294,13 +294,13 @@
public String toString() {
StringBuffer sb = new StringBuffer(user username=\);
-sb.append(username);
+sb.append(RequestUtil.filter(username));
sb.append(\ password=\);
-sb.append(password);
+sb.append(RequestUtil.filter(password));
sb.append(\);
if (fullName != null) {
sb.append( fullName=\);
-sb.append(fullName);
+sb.append(RequestUtil.filter(fullName));
sb.append(\);
}
synchronized (groups) {
@@ -313,7 +313,7 @@
sb.append(',');
}
n++;
-sb.append(((Group) values.next()).getGroupname());
+sb.append(RequestUtil.filter(((Group)
values.next()).getGroupname()));
}
sb.append(\);
}
@@ -328,7 +328,7 @@
sb.append(',');
}
n++;
-sb.append(((Role) values.next()).getRolename());
+sb.append(RequestUtil.filter(((Role)
values.next()).getRolename()));
}
sb.append(\);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
