cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/07/29 09:05:02 Modified:webapps/docs changelog.xml Log: Addressed Bugzila 29869, better JSR77 support for StandardContext and StandardWrapper. Revision ChangesPath 1.85 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- changelog.xml 29 Jul 2004 00:53:45 - 1.84 +++ changelog.xml 29 Jul 2004 16:05:02 - 1.85 @@ -55,6 +55,9 @@ fix If ServletResponse.getWriter() is called and no char encoding has been specified, set response char encoding to default (ISO-8859-1) so that it is reflected in getContentType() and Content-Type header, as required by the Servlet Spec (Bugtraq 6152759) (luehe) /fix + fix +bug29869/bug: Better JMX/JSR77 support in StandardContext and StandardWrapper. (remm) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml manager-howto.xml
yoavs 2004/07/28 07:49:51
Modified:webapps/docs changelog.xml manager-howto.xml
Log:
Addressed Bugzilla 30354.
Revision ChangesPath
1.79 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- changelog.xml 26 Jul 2004 17:04:04 - 1.78
+++ changelog.xml 28 Jul 2004 14:49:50 - 1.79
@@ -57,6 +57,9 @@
fix
bug29779/bug: Admin/Examples SetCharacterEncodingFilter wrong package.
(yoavs)
/fix
+ fix
+bug30354/bug: manager-howto.xml used wrong Ant task. (yoavs)
+ /fix
/changelog
/subsection
/section
1.13 +1 -1 jakarta-tomcat-catalina/webapps/docs/manager-howto.xml
Index: manager-howto.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/manager-howto.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- manager-howto.xml 19 Dec 2003 18:59:44 - 1.12
+++ manager-howto.xml 28 Jul 2004 14:49:50 - 1.13
@@ -981,7 +981,7 @@
lt;/targetgt;
lt;target name=undeploy description=Remove web applicationgt;
-lt;remove url=${url} username=${username} password=${password}
+lt;undeploy url=${url} username=${username} password=${password}
path=${path}/gt;
lt;/targetgt;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/07/28 08:00:32
Modified:catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java
webapps/docs changelog.xml
Log:
Addressed Bugzilla 28875, ErrorReportValve default encoding to UTF-8.
Revision ChangesPath
1.22 +17 -15
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Index: ErrorReportValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ErrorReportValve.java 27 Jun 2004 23:56:23 - 1.21
+++ ErrorReportValve.java 28 Jul 2004 15:00:32 - 1.22
@@ -48,6 +48,7 @@
* @author Craig R. McClanahan
* @author a href=mailto:[EMAIL PROTECTED]Nicola Ken Barozzi/a Aisa
* @author a href=mailto:[EMAIL PROTECTED]Stefano Mazzocchi/a
+ * @author Yoav Shapira
* @version $Revision$ $Date$
*/
@@ -284,28 +285,29 @@
try {
-Writer writer = response.getReporter();
+ try {
-if (writer != null) {
+response.setContentType(text/html);
+response.setCharacterEncoding(utf-8);
-Locale locale = Locale.getDefault();
+ } catch (Throwable t) {
-try {
- response.setContentType(text/html);
- response.setLocale(locale);
-} catch (Throwable t) {
-if (container.getLogger().isDebugEnabled())
-container.getLogger().debug(status.setContentType, t);
-}
+ if (container.getLogger().isDebugEnabled())
+ container.getLogger().debug(status.setContentType, t);
-// If writer is null, it's an indication that the response has
-// been hard committed already, which should never happen
-writer.write(sb.toString());
+ }
-}
+ Writer writer = response.getReporter();
+
+ if (writer != null) {
+// If writer is null, it's an indication that the response has
+// been hard committed already, which should never happen
+writer.write(sb.toString());
+ }
} catch (IOException e) {
;
+
} catch (IllegalStateException e) {
;
}
1.80 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- changelog.xml 28 Jul 2004 14:49:50 - 1.79
+++ changelog.xml 28 Jul 2004 15:00:32 - 1.80
@@ -40,6 +40,9 @@
fix
bug29831/bug: Added support for Boolean property to BeanFactory. (yoavs)
/fix
+ fix
+bug28875/bug: Made ErrorReportValve use UTF-8 encoding by default.
(yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/07/28 08:49:19 Modified:catalina/src/bin catalina.sh webapps/docs changelog.xml Log: Addressed Bugzilla 30325, only set CATALINA_HOME if not already set. Revision ChangesPath 1.16 +5 -2 jakarta-tomcat-catalina/catalina/src/bin/catalina.sh Index: catalina.sh === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- catalina.sh 28 Jul 2004 00:47:47 - 1.15 +++ catalina.sh 28 Jul 2004 15:49:19 - 1.16 @@ -61,7 +61,10 @@ # Get standard environment variables PRGDIR=`dirname $PRG` -CATALINA_HOME=`cd $PRGDIR/.. ; pwd` + +# Only set CATALINA_HOME if not already set +[ -z $CATALINA_HOME ] CATALINA_HOME=`cd $PRGDIR/.. ; pwd` + if [ -r $CATALINA_HOME/bin/setenv.sh ]; then . $CATALINA_HOME/bin/setenv.sh fi 1.81 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- changelog.xml 28 Jul 2004 15:00:32 - 1.80 +++ changelog.xml 28 Jul 2004 15:49:19 - 1.81 @@ -43,6 +43,9 @@ fix bug28875/bug: Made ErrorReportValve use UTF-8 encoding by default. (yoavs) /fix + fix +bug30325/bug: Only set CATALINA_HOME if not already set (in bin/catalina.sh). (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/07/28 10:26:03
Modified:catalina/src/share/org/apache/catalina/ssi SSIServlet.java
webapps/docs changelog.xml
Log:
Addressed Bugzilla 30144, SSIServlet MIME type.
Revision ChangesPath
1.7 +6 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java
Index: SSIServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SSIServlet.java 27 Feb 2004 14:58:47 - 1.6
+++ SSIServlet.java 28 Jul 2004 17:26:03 - 1.7
@@ -164,7 +164,11 @@
return;
}
-res.setContentType(text/html;charset=UTF-8);
+String resourceMimeType = servletContext.getMimeType(path);
+if(resourceMimeType == null) {
+ resourceMimeType = text/html;charset=UTF-8;
+}
+res.setContentType(resourceMimeType);
if (expires != null) {
res.setDateHeader(Expires, (
1.82 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- changelog.xml 28 Jul 2004 15:49:19 - 1.81
+++ changelog.xml 28 Jul 2004 17:26:03 - 1.82
@@ -46,6 +46,9 @@
fix
bug30325/bug: Only set CATALINA_HOME if not already set (in
bin/catalina.sh). (yoavs)
/fix
+ fix
+bug30144/bug: Made SSIServlet check resource MimeType before using
text/html and UTF-8 default. (yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/07/28 14:31:16
Modified:catalina/src/share/org/apache/catalina/realm JAASRealm.java
webapps/docs changelog.xml
Log:
Addressed Bugzilla 29406, JAASRealm using context ClassLoader.
Revision ChangesPath
1.7 +40 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
Index: JAASRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JAASRealm.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JAASRealm.java27 Feb 2004 14:58:45 - 1.6
+++ JAASRealm.java28 Jul 2004 21:31:16 - 1.7
@@ -90,6 +90,7 @@
* /ul
*
* @author Craig R. McClanahan
+ * @author Yoav Shapira
* @version $Revision$ $Date$
*/
@@ -139,6 +140,13 @@
*/
protected ArrayList userClasses = new ArrayList();
+/**
+ * Whether to use context ClassLoader or default ClassLoader.
+ * True means use context ClassLoader, and True is the default
+ * value.
+ */
+ protected boolean useContextClassLoader = true;
+
// - Properties
@@ -158,6 +166,27 @@
return appName;
}
+/**
+ * Sets whether to use the context or default ClassLoader.
+ * True means use context ClassLoader.
+ *
+ * @param useContext True means use context ClassLoader
+ */
+public void setUseContextClassLoader(boolean useContext) {
+ useContextClassLoader = useContext;
+ log.info(Setting useContextClassLoader = + useContext);
+}
+
+/**
+ * Returns whether to use the context or default ClassLoader.
+ * True means to use the context ClassLoader.
+ *
+ * @return The value of useContextClassLoader
+ */
+public boolean isUseContextClassLoader() {
+ return useContextClassLoader;
+}
+
public void setContainer(Container container) {
super.setContainer(container);
String name=container.getName();
@@ -258,9 +287,13 @@
log.debug(Authenticating + appName + + username);
// What if the LoginModule is in the container class loader ?
-//
-ClassLoader ocl=Thread.currentThread().getContextClassLoader();
-
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+ClassLoader ocl = null;
+
+if (isUseContextClassLoader()) {
+ ocl=Thread.currentThread().getContextClassLoader();
+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+}
+
try {
loginContext = new LoginContext
(appName, new JAASCallbackHandler(this, username,
@@ -269,7 +302,9 @@
log.error(sm.getString(jaasRealm.unexpectedError), e);
return (null);
} finally {
-Thread.currentThread().setContextClassLoader(ocl);
+if( isUseContextClassLoader()) {
+ Thread.currentThread().setContextClassLoader(ocl);
+}
}
if( log.isDebugEnabled())
1.83 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- changelog.xml 28 Jul 2004 17:26:03 - 1.82
+++ changelog.xml 28 Jul 2004 21:31:16 - 1.83
@@ -49,6 +49,9 @@
fix
bug30144/bug: Made SSIServlet check resource MimeType before using
text/html and UTF-8 default. (yoavs)
/fix
+ fix
+bug29406/bug: Made JAASRealm configurable as to whether it should use
the context ClassLoader or the default ClassLoader by adding a useContextClassLoader
boolean attribute. (yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/07/26 08:39:13
Modified:catalina/src/share/org/apache/naming/factory
BeanFactory.java
webapps/docs changelog.xml
Log:
Addressed Bugzilla 29831.
Revision ChangesPath
1.3 +3 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/BeanFactory.java
Index: BeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/BeanFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeanFactory.java 27 Feb 2004 14:58:54 - 1.2
+++ BeanFactory.java 26 Jul 2004 15:39:13 - 1.3
@@ -186,6 +186,9 @@
} else if (propType.equals(Double.class)
|| propType.equals(double.class)) {
valueArray[0] = new Double(value);
+} else if (propType.equals(Boolean.class)
+ || propType.equals(boolean.class)) {
+valueArray[0] = new Boolean(value);
} else {
throw new NamingException
(String conversion for property type '
1.77 +5 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- changelog.xml 26 Jul 2004 15:34:31 - 1.76
+++ changelog.xml 26 Jul 2004 15:39:13 - 1.77
@@ -36,6 +36,11 @@
/subsection
subsection name=Catalina
+changelog
+ fix
+bug29831/bug: Added support for Boolean property to BeanFactory. (yoavs)
+ /fix
+/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/07/23 07:02:17 Modified:webapps/admin/WEB-INF web.xml webapps/admin/WEB-INF/classes/org/apache/webapp/admin/filters SetCharacterEncodingFilter.java webapps/docs changelog.xml Log: Addressed Bugzilla 29779, wrong package for SetCharacterEncodingFilter. Revision ChangesPath 1.10 +1 -1 jakarta-tomcat-catalina/webapps/admin/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/web.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- web.xml 10 Jul 2004 06:56:14 - 1.9 +++ web.xml 23 Jul 2004 14:02:17 - 1.10 @@ -18,7 +18,7 @@ !-- filter filter-nameSet Character Encoding/filter-name -filter-classfilters.SetCharacterEncodingFilter/filter-class + filter-classorg.apache.webapp.admin.filters.SetCharacterEncodingFilter/filter-class init-param param-nameencoding/param-name param-valueUTF8/param-value 1.3 +2 -2 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/filters/SetCharacterEncodingFilter.java Index: SetCharacterEncodingFilter.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/filters/SetCharacterEncodingFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SetCharacterEncodingFilter.java 27 Feb 2004 14:59:03 - 1.2 +++ SetCharacterEncodingFilter.java 23 Jul 2004 14:02:17 - 1.3 @@ -15,7 +15,7 @@ */ -package filters; +package org.apache.webapp.admin.filters; import java.io.IOException; 1.74 +5 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- changelog.xml 21 Jul 2004 19:24:00 - 1.73 +++ changelog.xml 23 Jul 2004 14:02:17 - 1.74 @@ -42,6 +42,11 @@ /subsection subsection name=Webapps +changelog + fix +bug29779/bug: Admin/Examples SetCharacterEncodingFilter wrong package. (yoavs) + /fix +/changelog /subsection /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml http.xml
yoavs 2004/07/23 07:13:41 Modified:webapps/docs changelog.xml webapps/docs/config ajp.xml http.xml Log: Addressed Bugzilla 30245, Connector documentation. Revision ChangesPath 1.75 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- changelog.xml 23 Jul 2004 14:02:17 - 1.74 +++ changelog.xml 23 Jul 2004 14:13:41 - 1.75 @@ -26,6 +26,9 @@ fix bug29584/bug: Enhanced and clarified JNDI documentation. (yoavs) /fix + fix +bug30245/bug: Corrected Connector documentation to list address as a common attribute. (yoavs) + /fix /changelog /subsection 1.5 +8 -0 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml Index: ajp.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ajp.xml 11 Jan 2004 09:20:22 - 1.4 +++ ajp.xml 23 Jul 2004 14:13:41 - 1.5 @@ -8,6 +8,7 @@ properties author email=[EMAIL PROTECTED]Remy Maucherat/author +author email=[EMAIL PROTECTED]Yoav Shapira/author titleThe AJP Connector/title /properties @@ -39,6 +40,13 @@ support the following attributes:/p attributes + +attribute name=address required=false + pFor servers with more than one IP address, this attribute + specifies which address will be used for listening on the specified + port. By default, this port will be used on all IP addresses + associated with the server./p +/attribute attribute name=allowTrace required=false pA boolean value which can be used to enable or disable the TRACE 1.11 +7 -7 jakarta-tomcat-catalina/webapps/docs/config/http.xml Index: http.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- http.xml 27 May 2004 16:08:51 - 1.10 +++ http.xml 23 Jul 2004 14:13:41 - 1.11 @@ -57,6 +57,13 @@ attributes +attribute name=address required=false + pFor servers with more than one IP address, this attribute + specifies which address will be used for listening on the specified + port. By default, this port will be used on all IP addresses + associated with the server./p +/attribute + attribute name=allowTrace required=false pA boolean value which can be used to enable or disable the TRACE HTTP method. If not specified, this attribute is set to false./p @@ -136,13 +143,6 @@ all possible request processing threads are in use. Any requests received when the queue is full will be refused. The default value is 10./p -/attribute - -attribute name=address required=false - pFor servers with more than one IP address, this attribute - specifies which address will be used for listening on the specified - port. By default, this port will be used on all IP addresses - associated with the server./p /attribute attribute name=bufferSize required=false - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs index.xml
yoavs 2004/07/22 06:47:15 Modified:docs index.html xdocsindex.xml Log: Updated latest stable version from 5.0.25 to 5.0.27. Revision ChangesPath 1.62 +5 -3 jakarta-tomcat-site/docs/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- index.html26 May 2004 14:59:31 - 1.61 +++ index.html22 Jul 2004 13:47:15 - 1.62 @@ -30,11 +30,13 @@ meta name=author value=Marc A. Saegesser meta name=email value=[EMAIL PROTECTED] +meta name=author value=Yoav Shapira +meta name=email value=[EMAIL PROTECTED] -titleThe Jakarta Site - Apache Tomcat/title +titleThe Jakarta Site - Apache Jakarta Tomcat/title /head body bgcolor=#ff text=#00 link=#525D76 @@ -136,7 +138,7 @@ table border=0 cellspacing=0 cellpadding=2 width=100% trtd bgcolor=#525D76 font color=#ff face=arial,helvetica,sanserif - a name=Apache TomcatstrongApache Tomcat/strong/a + a name=Apache Jakarta TomcatstrongApache Jakarta Tomcat/strong/a /font /td/tr trtd @@ -189,7 +191,7 @@ /td td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left font color=#00 size=-1 face=arial,helvetica,sanserif -5.0.25 +5.0.27 /font /td /tr 1.51 +4 -3 jakarta-tomcat-site/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs/index.xml,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- index.xml 26 May 2004 14:59:31 - 1.50 +++ index.xml 22 Jul 2004 13:47:15 - 1.51 @@ -3,12 +3,13 @@ properties author email=[EMAIL PROTECTED]Marc A. Saegesser/author -titleApache Tomcat/title +author email=[EMAIL PROTECTED]Yoav Shapira/author +titleApache Jakarta Tomcat/title /properties body -section name=Apache Tomcat +section name=Apache Jakarta Tomcat pTomcat is the servlet container that is used in the official Reference Implementation for the @@ -40,7 +41,7 @@ tr td2.4/2.0/td - td5.0.25/td + td5.0.27/td /tr tr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk iishowto.xml
yoavs 2004/07/21 11:06:13 Modified:webapps/docs changelog.xml jk/xdocs/jk iishowto.xml Log: Addressed Bugzilla 30239, out-of-date docs for IIS how-to. Revision ChangesPath 1.71 +26 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- changelog.xml 17 Jun 2004 01:26:20 - 1.70 +++ changelog.xml 21 Jul 2004 18:06:13 - 1.71 @@ -14,13 +14,38 @@ body +section name=Tomcat 5.0.28 (yoavs) + subsection name=General +changelog + fix +bug30239/bug: Updated IIS how-to to link to Wiki page with instrutions for IIS 5 and IIS 6 configurations. (yoavs) + /fix +/changelog + /subsection + + subsection name=Catalina + /subsection + + subsection name=Coyote + /subsection + + subsection name=Jasper + /subsection + + subsection name=Cluster + /subsection + + subsection name=Webapps + /subsection +/section + section name=Tomcat 5.0.27 (yoavs) subsection name=General changelog updateUpdated dependencies on commons-dbcp (to 1.2.1), commons-pool (to 1.2), and commons-logging (to 1.0.4). (yoavs) /update fix -bug29368/bug: Replaced references to xmlParserAPIs.jar with xml-apis.jar, as the former is now deprecated in Xerces. Users wishing to use old versions of Xerces that don't have xml-apis.jar can still do so without a problem. Users wishing to build tomcat using xmlParserAPIs.jar instead of xml-apis.jar can also do so with a trivial edit in the build.xml file. +bug29368/bug: Replaced references to xmlParserAPIs.jar with xml-apis.jar, as the former is now deprecated in Xerces. Users wishing to use old versions of Xerces that don't have xml-apis.jar can still do so without a problem. Users wishing to build tomcat using xmlParserAPIs.jar instead of xml-apis.jar can also do so with a trivial edit in the build.xml file. (yoavs) /fix /changelog /subsection 1.7 +11 -3 jakarta-tomcat-connectors/jk/xdocs/jk/iishowto.xml Index: iishowto.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/iishowto.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- iishowto.xml 4 Mar 2004 04:46:34 - 1.6 +++ iishowto.xml 21 Jul 2004 18:06:13 - 1.7 @@ -19,6 +19,7 @@ titleIIS HowTo/title author email=[EMAIL PROTECTED]Henri Gomez/author author email=[EMAIL PROTECTED]Gal Shachor/author +author email=[EMAIL PROTECTED]Yoav Shapira/author date$Date$/date /properties @@ -71,10 +72,10 @@ WinNT4.0-i386 SP4/SP5/SP6a (should be able to work with other service packs), Win2K and WinXP and Win98 /li li -IIS4.0 and PWS4.0 +IIS4.0 and PWS4.0 (numerous people have working IIS 5 and IIS 6 configurations) /li li -Tomcat 3.2.x, Tomcat 3.3.x, Tomcat 4.0.x, Tomcat 4.1.x and Tomcat 5 +Tomcat 3.2 and later, Tomcat 4.x and Tomcat 5 /li /ul /p @@ -85,6 +86,13 @@ /p /subsection +subsection name=IIS 5 and 6 Notes +p +There are extra steps you need to take for configuring Tomcat with IIS 5 and 6. Please see the appropriate links from +a href=http://wiki.apache.org/jakarta-tomcat/Tomcat_2fLinks;Tomcat Useful Links/a. +/p +/subsection + subsection name=Who support ajp protocols ? p The ajp12 protocol is only available in Tomcat 3.2.x and 3.3.x. @@ -92,7 +100,7 @@ p The bajp12/b has been bdeprecated/b with Tomcat 3.3.x and you should use instead -bajp13/b which is the only ajp protocol known by Tomcat 4.0.x, 4.1.x and 5. +bajp13/b which is the only ajp protocol known by Tomcat 4.x and 5. /p p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/iis isapi_install.vbs
yoavs 2004/07/21 11:11:05 Modified:webapps/docs changelog.xml jk/native/iis isapi_install.vbs Log: Addressed Bugzilla 30238. Revision ChangesPath 1.72 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- changelog.xml 21 Jul 2004 18:06:13 - 1.71 +++ changelog.xml 21 Jul 2004 18:11:05 - 1.72 @@ -20,6 +20,9 @@ fix bug30239/bug: Updated IIS how-to to link to Wiki page with instrutions for IIS 5 and IIS 6 configurations. (yoavs) /fix + fix +bug30238/bug: Replaced isapi_redirector.dll isapi_redirect.dll in installation script for consistency. (yoavs) + /fix /changelog /subsection 1.5 +3 -3 jakarta-tomcat-connectors/jk/native/iis/isapi_install.vbs Index: isapi_install.vbs === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/isapi_install.vbs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- isapi_install.vbs 27 Feb 2004 16:07:39 - 1.4 +++ isapi_install.vbs 21 Jul 2004 18:11:05 - 1.5 @@ -47,7 +47,7 @@ serverName = args(0) filterDir = args(1) filterName = jakarta -filterLib = \isapi_redirector.dll +filterLib = \isapi_redirect.dll workerFile = args(2) mountFile = args(3) logFile = args(4) @@ -161,7 +161,7 @@ on error goto 0 info Updating Registry -shell.RegWrite regRoot + extension_uri, /jakarta/isapi_redirector.dll +shell.RegWrite regRoot + extension_uri, /jakarta/isapi_redirect.dll shell.RegWrite regRoot + log_file, logFile shell.RegWrite regRoot + log_level, logLevel shell.RegWrite regRoot + worker_file, workerFile - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config globalresources.xml
yoavs 2004/07/21 12:24:00 Modified:webapps/docs changelog.xml jndi-resources-howto.xml webapps/docs/config globalresources.xml Log: Addressed Bugzilla 29584, cleaning up JNDI documentation. Revision ChangesPath 1.73 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- changelog.xml 21 Jul 2004 18:11:05 - 1.72 +++ changelog.xml 21 Jul 2004 19:24:00 - 1.73 @@ -23,6 +23,9 @@ fix bug30238/bug: Replaced isapi_redirector.dll isapi_redirect.dll in installation script for consistency. (yoavs) /fix + fix +bug29584/bug: Enhanced and clarified JNDI documentation. (yoavs) + /fix /changelog /subsection 1.6 +57 -12jakarta-tomcat-catalina/webapps/docs/jndi-resources-howto.xml Index: jndi-resources-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-resources-howto.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jndi-resources-howto.xml 9 Aug 2003 18:59:22 - 1.5 +++ jndi-resources-howto.xml 21 Jul 2004 19:24:00 - 1.6 @@ -7,8 +7,9 @@ project; properties -author email=[EMAIL PROTECTED]Craig R. McClanahan/author -titleJNDI Resources HOW-TO/title + author email=[EMAIL PROTECTED]Craig R. McClanahan/author + author email=[EMAIL PROTECTED]Yoav Shapira/author + titleJNDI Resources HOW-TO/title /properties body @@ -17,10 +18,42 @@ section name=Introduction pTomcat 5 provides a JNDI strongInitialContext/strong implementation -instance to web applications running under it, in a manner that is compatible -with those provided by a a href=http://java.sun.com/j2ee;Java2 Enterprise -Edition/a application server. Entries in this codeInitialContext/code -are configured in the code$CATALINA_HOME/conf/server.xml/code file, and +instance for each web application running under it, in a manner that is +compatible with those provided by a +a href=http://java.sun.com/j2ee;Java2 Enterprise Edition/a application +server. + +The J2EE standard provides a standard set of elements in +the code/WEB-INF/web.xml/code file to reference resources; resources +referenced in these elements must be defined in an application-server-specific configuration. +/p + +pFor Tomcat 5, these entries in per-web-application +codeInitialContext/code are configured in the +codestronglt;Contextgt;/strong/code or +codestronglt;DefaultContextgt;/strong/code +elements of the +a href=config/server.htmlcodestronglt;Servergt;/strong/code/a +element. + +The codestronglt;Contextgt;/strong/code element can be specified +in either code$CATALINA_HOME/conf/server.xml/code or, preferably, +the per-web-application context XML file. + +codestronglt;DefaultContextgt;/strong/code must be specified in +code$CATALINA_HOME/conf/server.xml/code. +/p + +pTomcat 5 maintains a separate namespace of global resources for the +entire server. These are configured in the +a href=config/globalresources.html +codestronglt;GlobalNameingResourcesgt;/strong/code/a element of +code$CATALINA_HOME/conf/server.xml/code. You may expose these resources to +web applications by using +codestronglt;ResourceLinkgt;/strong/code elements. +/p + +pThe resources defined in these elements may be referenced by the following elements in the web application deployment descriptor (code/WEB-INF/web.xml/code) of your web application:/p ul @@ -39,10 +72,11 @@ pThe codeInitialContext/code is configured as a web application is initially deployed, and is made available to web application components (for -read-only access). All configured entries and resources will be placed in +read-only access). All configured entries and resources are placed in the codejava:comp/env/code portion of the JNDI namespace, so a typical access to a resource - in this case, to a JDBC codeDataSource/code - would look something like this:/p + source // Obtain our environment naming context Context initCtx = new InitialContext(); @@ -75,8 +109,9 @@ section name=Configuring JNDI Resources pEach available JNDI Resource is configured based on inclusion of the -following elements in the code$CATALINA_HOME/conf/server.xml/code -file:/p +following elements in the codestronglt;Contextgt;/strong/code or +codestronglt;DefaultContextgt;/strong/code elements:/p + ul lia href=config/context.html#Environment Entrieslt
cvs commit: jakarta-tomcat-5 build.properties.default
yoavs 2004/06/16 06:13:53
Modified:.build.properties.default
Log:
Updated commons-logging dependency to 1.0.4
Revision ChangesPath
1.128 +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.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- build.properties.default 15 Jun 2004 18:42:06 - 1.127
+++ build.properties.default 16 Jun 2004 13:13:53 - 1.128
@@ -99,11 +99,11 @@
# - Commons Logging, version 1.0.1 or later -
-commons-logging.home=${base.path}/commons-logging-1.0.3
+commons-logging.home=${base.path}/commons-logging-1.0.4
commons-logging.lib=${commons-logging.home}
commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
commons-logging.jar=${commons-logging.lib}/commons-logging.jar
-commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.0.3.tar.gz
+commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.0.4.tar.gz
# - Commons Modeler, version 1.1 or later -
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/06/16 06:15:30 Modified:webapps/docs changelog.xml Log: Stuff ;) Revision ChangesPath 1.66 +4 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- changelog.xml 15 Jun 2004 21:31:07 - 1.65 +++ changelog.xml 16 Jun 2004 13:15:30 - 1.66 @@ -17,7 +17,7 @@ section name=Tomcat 5.0.27 (yoavs) subsection name=General changelog - updateUpdated dependencies on commons-dbcp (to 1.2.1) and commons-pool (to 1.2). (yoavs) + updateUpdated dependencies on commons-dbcp (to 1.2.1), commons-pool (to 1.2), and commons-logging (to 1.0.4). (yoavs) /update /changelog /subsection @@ -54,6 +54,9 @@ subsection name=Webapps changelog + fix +Fix CGI servlet so it correctly handles binary responses (eg images) - Ported from TC4. (markt) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/06/16 07:20:10 Modified:webapps/docs changelog.xml Log: Bugzilla 29597 done. Revision ChangesPath 1.67 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- changelog.xml 16 Jun 2004 13:15:30 - 1.66 +++ changelog.xml 16 Jun 2004 14:20:10 - 1.67 @@ -43,6 +43,9 @@ subsection name=Jasper changelog + fix +bug29597/bug: Added -javaEncoding attribute support to JspC command-line. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper JspC.java
yoavs 2004/06/16 07:20:20
Modified:jasper2/src/share/org/apache/jasper JspC.java
Log:
Bugzilla 29597 done.
Revision ChangesPath
1.80 +3 -0
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- JspC.java 18 May 2004 21:16:46 - 1.79
+++ JspC.java 16 Jun 2004 14:20:17 - 1.80
@@ -109,6 +109,7 @@
private static final String SWITCH_CLASSPATH = -classpath;
private static final String SWITCH_DIE = -die;
private static final String SWITCH_POOLING = -poolingEnabled;
+private static final String SWITCH_ENCODING = -javaEncoding;
private static final String SHOW_SUCCESS =-s;
private static final String LIST_ERRORS = -l;
private static final int NO_WEBXML = 0;
@@ -270,6 +271,8 @@
} else {
poolingEnabled = true;
}
+} else if (tok.equals(SWITCH_ENCODING)) {
+setJavaEncoding(nextArg());
} else {
if (tok.startsWith(-)) {
throw new JasperException(Unrecognized option: + tok +
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_file.c
yoavs 2004/06/16 07:34:07
Modified:jk/native2/common jk_logger_file.c
Log:
Bugzilla 28469 done.
Revision ChangesPath
1.45 +14 -3 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- jk_logger_file.c 21 Mar 2004 09:43:09 - 1.44
+++ jk_logger_file.c 16 Jun 2004 14:34:07 - 1.45
@@ -103,8 +103,17 @@
apr_status_t rv;
apr_file_t *oldF = (apr_file_t *) _this-logger_private;
+int closeOld;
apr_file_t *f = NULL;
jk_workerEnv_t *workerEnv = env-getByName(env, workerEnv);
+
+/* workaround for APR insanity - APR closes the global system
+ stderr handle and invalidates all references to stderr if you
+ call apr_file_close on any stderr reference. Just don't close
+ stderr references. */
+closeOld = oldF != NULL _this-name != NULL
+strcmp(stderr, _this-name) != 0;
+
if (!_this-name) {
_this-name = ${serverRoot}/logs/jk2.log;
}
@@ -133,9 +142,11 @@
}
_this-jkLog(env, _this, JK_LOG_INFO,
Initializing log file %s\n, _this-name);
-if (oldF) {
-apr_file_close(oldF);
+
+if (closeOld) {
+ apr_file_close(oldF);
}
+
return JK_OK;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
yoavs 2004/06/16 07:38:56
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Bugzilla 26231 done.
Revision ChangesPath
1.83 +20 -5 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- mod_jk2.c 31 Mar 2004 14:22:04 - 1.82
+++ mod_jk2.c 16 Jun 2004 14:38:56 - 1.83
@@ -628,10 +628,25 @@
proc.pid);
}
else {
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
- jk2_init() Can't find child %d in none of the %d
scoreboard slots\n,
- proc.pid, workerEnv-maxDaemons);
-workerEnv-childId = -2;
+ /*
+ * try again several times, there's a
+ * race condition here where jk2_child_init gets
+ * called before make_child completes.
+ */
+ int counter = 0;
+ while (counter++ 50 workerEnv-childId == -1) {
+ env-l-jkLog(env, env-l, JK_LOG_INFO,
+ jk2_child_init() child %d not in scoreboard yet, spin %d\n,
+ proc.pid, counter);
+ usleep(10);
+ workerEnv-childId = find_child_by_pid(proc);
+ }
+ if (workerEnv-childId == -1) {
+ env-l-jkLog(env, env-l, JK_LOG_ERROR,
+jk2_init() Can't find child %d in any of the %d scoreboard
slots\n,
+ proc.pid, max_daemons_limit);
+ workerEnv-childId = -2;
+ }
}
}
else {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/conf workers2.properties
yoavs 2004/06/16 07:45:11 Modified:jk/conf workers2.properties Log: Bugzilla 28654 done. Revision ChangesPath 1.20 +4 -2 jakarta-tomcat-connectors/jk/conf/workers2.properties Index: workers2.properties === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/workers2.properties,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- workers2.properties 22 Nov 2002 18:56:45 - 1.19 +++ workers2.properties 16 Jun 2004 14:45:11 - 1.20 @@ -49,8 +49,10 @@ debug=0 tomcatId=localhost:8019 lb_factor=1 -group=lb -group=lb_1 +#group=lb +group:lb:lb +#group=lb_1 +group:lb:lb_1 disabled=0 [channel.un:/opt/33/work/jk2.socket] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/06/16 08:13:58 Modified:webapps/docs changelog.xml Log: Bugzilla 28654 done. Revision ChangesPath 1.68 +1 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- changelog.xml 16 Jun 2004 14:20:10 - 1.67 +++ changelog.xml 16 Jun 2004 15:13:58 - 1.68 @@ -45,6 +45,7 @@ changelog fix bug29597/bug: Added -javaEncoding attribute support to JspC command-line. (yoavs) +bug29418/bug: Same thing, -javaEncoding added to help with this umlauts bug. (yoavs) /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
yoavs 2004/06/16 08:37:08
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Bugzilla 26832 done.
Revision ChangesPath
1.64 +3 -3
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- jk_isapi_plugin.c 21 Mar 2004 09:45:16 - 1.63
+++ jk_isapi_plugin.c 16 Jun 2004 15:37:08 - 1.64
@@ -355,8 +355,8 @@
forwardURI = uri;
}
else if (workerEnv-options == JK_OPT_FWDURIESCAPED) {
-if (!jk_requtil_escapeUrl
-(uri, snuri, INTERNET_MAX_URL_LENGTH)) {
+if (jk_requtil_escapeUrl
+ (uri,snuri,INTERNET_MAX_URL_LENGTH) != JK_OK) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
HttpFilterProc [%s] re-encoding request
exceeds maximum buffer size.\n,
uri);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs class-loader-howto.xml
yoavs 2004/06/16 08:50:30 Modified:webapps/docs class-loader-howto.xml Log: Added clarifications per Bugzilla 29389. Revision ChangesPath 1.10 +5 -2 jakarta-tomcat-catalina/webapps/docs/class-loader-howto.xml Index: class-loader-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/class-loader-howto.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- class-loader-howto.xml2 Feb 2004 21:39:28 - 1.9 +++ class-loader-howto.xml16 Jun 2004 15:50:30 - 1.10 @@ -8,6 +8,7 @@ properties author email=[EMAIL PROTECTED]Craig R. McClanahan/author +author email=[EMAIL PROTECTED]Yoav Shapira/author titleClass Loader HOW-TO/title /properties @@ -103,6 +104,7 @@ logging API./li liem$CATALINA_HOME/bin/commons-daemon.jar/em - Jakarta commons daemon API./li +liemjmx.jar/em - The JMX 1.2 implementation./li /ul/li listrongCommon/strong - This class loader contains additional classes that are made visible to both Tomcat internal classes and to all web @@ -124,7 +126,6 @@ liemcommons-pool.jar/em - Jakarta commons pool./li liemjasper-compiler.jar/em - The JSP 2.0 compiler./li liemjasper-runtime.jar/em - The JSP 2.0 runtime./li -liemjmx.jar/em - The JMX 1.2 implementation./li liemjsp-api.jar/em - The JSP 2.0 API./li liemnaming-common.jar/em - The JNDI implementation used by Tomcat 5 to represent in-memory naming contexts./li @@ -189,7 +190,8 @@ pAs mentioned above, the web application class loader diverges from the default Java 2 delegation model (in accordance with the recommendations in the -Servlet Specification, version 2.3, section 9.6). When a request to load a +Servlet Specification, version 2.3, section 9.7.2 Web Application Classloader). +When a request to load a class from the web application's emWebappX/em class loader is processed, this class loader will look in the local repositories strongfirst/strong, instead of delegating before looking. There are exceptions. Classes which are @@ -205,6 +207,7 @@ liemorg.w3c.dom.*/em/li liemorg.apache.xerces.*/em/li liemorg.apache.xalan.*/em/li +liem /ul Last, any JAR containing servlet API classes will be ignored by the classloader. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml class-loader-howto.xml
yoavs 2004/06/16 11:04:39
Modified:catalina build.xml
catalina/src/bin launcher.properties
catalina/src/share/org/apache/catalina/startup
TldConfig.java
tester build.xml
webapps/docs changelog.xml class-loader-howto.xml
Log:
Bugzilla 29368 done: replaced references to xmlParserAPIs.jar with xmls-apis.jar.
Revision ChangesPath
1.61 +7 -7 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- build.xml 27 Apr 2004 05:51:20 - 1.60
+++ build.xml 16 Jun 2004 18:04:38 - 1.61
@@ -72,7 +72,7 @@
pathelement location=${regexp.jar}/
pathelement location=${servlet-api.jar}/
pathelement location=${xercesImpl.jar}/
-pathelement location=${xmlParserAPIs.jar}/
+pathelement location=${xml-apis.jar}/
pathelement location=${classes.dir}/
/path
@@ -103,7 +103,7 @@
pathelement location=${regexp.jar}/
pathelement location=${servlet-api.jar}/
pathelement location=${xercesImpl.jar}/
-pathelement location=${xmlParserAPIs.jar}/
+pathelement location=${xml-apis.jar}/
pathelement location=${classes.dir}/
pathelement location=${catalina.build}/tests/
/path
@@ -167,9 +167,9 @@
condition property=jaxp.present
and
available classname=javax.xml.parsers.SAXParser
- classpath=${xmlParserAPIs.jar} /
+ classpath=${xml-apis.jar} /
available classname=org.xml.sax.ContentHandler
- classpath=${xmlParserAPIs.jar} /
+ classpath=${xml-apis.jar} /
/and
/condition
condition property=javamail.present
@@ -252,11 +252,11 @@
available property=servlet-api.jar.present file=${servlet-api.jar} /
available property=tomcat-util.jar.present file=${tomcat-util.jar} /
available property=xercesImpl.jar.present file=${xercesImpl.jar}/
-available property=xmlParserAPIs.jar.present file=${xmlParserAPIs.jar}/
+available property=xml-apis.jar.present file=${xml-apis.jar}/
condition property=xerces2.jars.present
and
equals arg1=${xercesImpl.jar.present} arg2=true/
-equals arg1=${xmlParserAPIs.jar.present} arg2=true/
+equals arg1=${xml-apis.jar.present} arg2=true/
/and
/condition
@@ -523,7 +523,7 @@
/target
target name=copy-xerces2.jars
copy todir=${catalina.build}/common/endorsed file=${xercesImpl.jar}/
-copy todir=${catalina.build}/common/endorsed file=${xmlParserAPIs.jar}/
+copy todir=${catalina.build}/common/endorsed file=${xml-apis.jar}/
/target
1.3 +1 -1 jakarta-tomcat-catalina/catalina/src/bin/launcher.properties
Index: launcher.properties
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/launcher.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- launcher.properties 26 May 2004 20:15:17 - 1.2
+++ launcher.properties 16 Jun 2004 18:04:38 - 1.3
@@ -20,4 +20,4 @@
# LauncherBootstrap class can properly resolve the files without regard to
# the current working directory.
#
-ant.class.path=../common/lib/ant.jar:../common/lib/ant-launcher.jar:../common/endorsed/xercesImpl.jar:../common/endorsed/xmlParserAPIs.jar
+ant.class.path=../common/lib/ant.jar:../common/lib/ant-launcher.jar:../common/endorsed/xercesImpl.jar:../common/endorsed/xml-apis.jar
1.39 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
Index: TldConfig.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- TldConfig.java26 May 2004 16:16:56 - 1.38
+++ TldConfig.java16 Jun 2004 18:04:38 - 1.39
@@ -118,6 +118,7 @@
noTldJars.add(tomcat-coyote.jar);
noTldJars.add(xercesImpl.jar);
noTldJars.add(xmlParserAPIs.jar);
+noTldJars.add(xml-apis.jar);
// JARs from J2SE runtime
noTldJars.add(sunjce_provider.jar);
noTldJars.add(ldapsec.jar);
1.5 +1 -1 jakarta-tomcat-catalina/tester/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
cvs commit: jakarta-tomcat-5 build.properties.default build.xml
yoavs 2004/06/16 11:04:47
Modified:.build.properties.default build.xml
Log:
Bugzilla 29368 done: replaced references to xmlParserAPIs.jar with xmls-apis.jar.
Revision ChangesPath
1.129 +2 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- build.properties.default 16 Jun 2004 13:13:53 - 1.128
+++ build.properties.default 16 Jun 2004 18:04:47 - 1.129
@@ -134,7 +134,7 @@
xerces.home=${base.path}/xerces-2_6_2
xerces.lib=${xerces.home}
xercesImpl.jar=${xerces.lib}/xercesImpl.jar
-xmlParserAPIs.jar=${xerces.lib}/xmlParserAPIs.jar
+xml-apis.jar=${xerces.lib}/xml-apis.jar
xerces.loc=${base-xml.loc}/xerces-j/binaries/Xerces-J-bin.2.6.2.tar.gz
1.188 +3 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- build.xml 27 May 2004 14:10:44 - 1.187
+++ build.xml 16 Jun 2004 18:04:47 - 1.188
@@ -777,7 +777,7 @@
/jar
copy todir=${tomcat.deployer}/lib file=${xercesImpl.jar}/
-copy todir=${tomcat.deployer}/lib file=${xmlParserAPIs.jar}/
+copy todir=${tomcat.deployer}/lib file=${xml-apis.jar}/
copy todir=${tomcat.deployer}
fileset dir=${basedir}/resources/deployer /
@@ -800,7 +800,7 @@
target name=compat description=Create compatibility binaries for JREs before
1.4
copy todir=${tomcat.compat}/common/endorsed file=${xercesImpl.jar}/
-copy todir=${tomcat.compat}/common/endorsed file=${xmlParserAPIs.jar}/
+copy todir=${tomcat.compat}/common/endorsed file=${xml-apis.jar}/
/target
@@ -1595,7 +1595,7 @@
antcall target=downloadgz
!-- xerces2 brings 2 files, test for one of them --
param name=sourcefile value=${xerces.loc}/
- param name=destfile value=${xmlParserAPIs.jar}/
+ param name=destfile value=${xml-apis.jar}/
/antcall
antcall target=downloadgz
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk build.xml
yoavs 2004/06/16 11:05:05
Modified:.build.properties.default
jk build.xml
Log:
Bugzilla 29368 done: replaced references to xmlParserAPIs.jar with xmls-apis.jar.
Revision ChangesPath
1.6 +2 -2 jakarta-tomcat-connectors/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-connectors/build.properties.default,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties.default 3 Jun 2004 00:17:48 - 1.5
+++ build.properties.default 16 Jun 2004 18:05:05 - 1.6
@@ -128,7 +128,7 @@
xerces.lib=${xerces.home}
xerces.loc=http://xml.apache.org/dist/xerces-j/old_xerces2/Xerces-J-bin.2.3.0.tar.gz
xercesImpl.jar=${xerces.lib}/xercesImpl.jar
-xmlParserAPIs.jar=${xerces.lib}/xmlParserAPIs.jar
+xml-apis.jar=${xerces.lib}/xml-apis.jar
# --
1.75 +2 -2 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- build.xml 3 Jun 2004 22:38:02 - 1.74
+++ build.xml 16 Jun 2004 18:05:05 - 1.75
@@ -45,7 +45,7 @@
path id=xml-apis.classpath
pathelement path=${jaxp.home}/jaxp.jar/
pathelement path=${jaxp.home}/crimson.jar/
-pathelement path=${xerces2.home}/xmlParserAPIs.jar/
+pathelement path=${xerces2.home}/xml-apis.jar/
pathelement path=${xml-parser-apis.jar}/
/path
@@ -147,7 +147,7 @@
path id=xml-apis.classpath
pathelement path=${jaxp.home}/jaxp.jar/
pathelement path=${jaxp.home}/crimson.jar/
- pathelement path=${xerces2.home}/xmlParserAPIs.jar/
+ pathelement path=${xerces2.home}/xml-apis.jar/
pathelement path=${xml-parser-apis.jar}/
/path
-
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 TldLocationsCache.java
yoavs 2004/06/16 11:05:12
Modified:jasper2 build.xml
jasper2/src/share/org/apache/jasper/compiler
TldLocationsCache.java
Log:
Bugzilla 29368 done: replaced references to xmlParserAPIs.jar with xmls-apis.jar.
Revision ChangesPath
1.26 +2 -2 jakarta-tomcat-jasper/jasper2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.xml 21 Jul 2003 21:14:06 - 1.25
+++ build.xml 16 Jun 2004 18:05:12 - 1.26
@@ -31,7 +31,7 @@
pathelement location=${tools.jar}/
pathelement location=${xerces.jar}/
pathelement location=${xercesImpl.jar}/
-pathelement location=${xmlParserAPIs.jar}/
+pathelement location=${xml-apis.jar}/
pathelement location=${commons-el.jar}/
pathelement location=${commons-collections.jar}/
pathelement location=${commons-logging.jar}/
@@ -48,7 +48,7 @@
pathelement location=${tools.jar}/
pathelement location=${xerces.jar}/
pathelement location=${xercesImpl.jar}/
-pathelement location=${xmlParserAPIs.jar}/
+pathelement location=${xml-apis.jar}/
pathelement location=${commons-collections.jar}/
pathelement location=${commons-launcher.jar}/
pathelement location=${jasper.build}/shared/classes/
1.27 +1 -0
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java
Index: TldLocationsCache.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- TldLocationsCache.java17 Mar 2004 19:23:03 - 1.26
+++ TldLocationsCache.java16 Jun 2004 18:05:12 - 1.27
@@ -154,6 +154,7 @@
noTldJars.add(tomcat-coyote.jar);
noTldJars.add(xercesImpl.jar);
noTldJars.add(xmlParserAPIs.jar);
+noTldJars.add(xml-apis.jar);
// JARs from J2SE runtime
noTldJars.add(sunjce_provider.jar);
noTldJars.add(ldapsec.jar);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/06/15 11:14:27 Modified:webapps/docs changelog.xml Log: Added note about updated dependencies. Revision ChangesPath 1.63 +2 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- changelog.xml 4 Jun 2004 13:50:17 - 1.62 +++ changelog.xml 15 Jun 2004 18:14:27 - 1.63 @@ -17,6 +17,8 @@ section name=Tomcat 5.0.27 (yoavs) subsection name=General changelog + updateUpdated dependencies on commons-dbcp (to 1.2.1) and commons-pool (to 1.2). (yoavs) + /update /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default
yoavs 2004/06/15 11:14:39
Modified:.build.properties.default
Log:
Updated DBCP dependency default to 1.2.1
Revision ChangesPath
1.126 +4 -4 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- build.properties.default 8 Jun 2004 20:23:12 - 1.125
+++ build.properties.default 15 Jun 2004 18:14:39 - 1.126
@@ -151,10 +151,10 @@
# - Commons DBCP, version 1.1 or later -
-commons-dbcp.home=${base.path}/commons-dbcp-1.2
+commons-dbcp.home=${base.path}/commons-dbcp-1.2.1
commons-dbcp.lib=${commons-dbcp.home}
-commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp-1.2.jar
-commons-dbcp.loc=${base-jakarta.loc}/commons/dbcp/binaries/commons-dbcp-1.2.tar.gz
+commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp-1.2.1.jar
+commons-dbcp.loc=${base-jakarta.loc}/commons/dbcp/binaries/commons-dbcp-1.2.1.tar.gz
# - Commons HttpClient, version 2.0 or later -
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 RELEASE-NOTES build.properties.default
yoavs 2004/06/15 11:42:06
Modified:.RELEASE-NOTES build.properties.default
Log:
Updated commons-collections dependency to 2.1.1, updated release notes to more
accurately describe common library versions.
Revision ChangesPath
1.18 +6 -6 jakarta-tomcat-5/RELEASE-NOTES
Index: RELEASE-NOTES
===
RCS file: /home/cvs/jakarta-tomcat-5/RELEASE-NOTES,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RELEASE-NOTES 28 May 2004 15:57:44 - 1.17
+++ RELEASE-NOTES 15 Jun 2004 18:42:06 - 1.18
@@ -53,12 +53,12 @@
A standard installation of Tomcat 5 makes all of the following APIs available
for use by web applications (by placing them in common/lib or shared/lib):
-* ant.jar (Apache Ant 1.6)
-* commons-collections.jar (Commons Collections 2.1)
-* commons-dbcp.jar (Commons DBCP 1.1)
+* ant.jar (Apache Ant 1.6 or later)
+* commons-collections*.jar (Commons Collections 2.1 or later)
+* commons-dbcp.jar (Commons DBCP 1.1 or later)
* commons-el.jar (Commons Expression Language 1.0)
-* commons-logging-api.jar (Commons Logging API 1.0.3)
-* commons-pool.jar (Commons Pool 1.1)
+* commons-logging-api.jar (Commons Logging API 1.0.3 or later)
+* commons-pool.jar (Commons Pool 1.1 or later)
* jasper-compiler.jar (Jasper 2 Compiler)
* jasper-runtime.jar (Jasper 2 Runtime)
* jsp-api.jar (JSP 2.0 API)
1.127 +4 -4 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- build.properties.default 15 Jun 2004 18:14:39 - 1.126
+++ build.properties.default 15 Jun 2004 18:42:06 - 1.127
@@ -61,10 +61,10 @@
# - Commons Collections, version 2.0 or later -
-commons-collections.home=${base.path}/commons-collections-2.1
+commons-collections.home=${base.path}/commons-collections-2.1.1
commons-collections.lib=${commons-collections.home}
-commons-collections.jar=${commons-collections.lib}/commons-collections.jar
-commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/collections-2.1.tar.gz
+commons-collections.jar=${commons-collections.lib}/commons-collections-2.1.1.jar
+commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-2.1.1.tar.gz
# - Commons Launcher, version 0.9 or later -
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs index.xml project.xml
yoavs 2004/06/10 13:34:41 Modified:webapps/docs index.xml project.xml Log: Modified project.xml and index.xml to reflect new URL for connector documentation. Revision ChangesPath 1.15 +1 -1 jakarta-tomcat-catalina/webapps/docs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/index.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- index.xml 1 Mar 2004 15:35:03 - 1.14 +++ index.xml 10 Jun 2004 20:34:41 - 1.15 @@ -113,7 +113,7 @@ - Reference manual that documents all available elements and attributes that may be placed into a Tomcat 5 codeconf/server.xml/code file. /li -lia href=http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/index.html;strongJK Documenation/strong/a +lia href=http://jakarta.apache.org/tomcat/connectors-doc/jk2/index.html;strongJK Documenation/strong/a - Complete documentation and HOWTOs on the JK native webserver connector, used to interface Tomcat with servers like Apache HTTPd, IIS and others./li 1.21 +2 -2 jakarta-tomcat-catalina/webapps/docs/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/project.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- project.xml 5 Feb 2004 16:05:31 - 1.20 +++ project.xml 10 Jun 2004 20:34:41 - 1.21 @@ -18,7 +18,7 @@ menu name=User Guide item name=1) Introductionhref=introduction.html/ item name=2) Setup href=setup.html/ -item name=3) First webapp href=appdev/index.html/ +item name=3) First webapphref=appdev/index.html/ item name=4) Deployerhref=deployer-howto.html/ item name=5) Manager href=manager-howto.html/ item name=6) Realms and AAA href=realm-howto.html/ @@ -44,7 +44,7 @@ item name=Release Notes href=RELEASE-NOTES.txt/ item name=Tomcat Configuration href=config/index.html/ item name=JK Documentation - href=http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/index.html/ + href=http://jakarta.apache.org/tomcat/connectors-doc/jk2/index.html/ item name=Servlet API Javadocs href=servletapi/index.html/ item name=JSP API Javadocs href=jspapi/index.html/ /menu - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans GlobalResourcesLifecycleListener.java
yoavs 2004/06/09 13:38:16
Modified:catalina/src/share/org/apache/catalina/mbeans
GlobalResourcesLifecycleListener.java
Log:
Fix for bug 29470.
Revision ChangesPath
1.5 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
Index: GlobalResourcesLifecycleListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GlobalResourcesLifecycleListener.java 27 Feb 2004 14:58:45 - 1.4
+++ GlobalResourcesLifecycleListener.java 9 Jun 2004 20:38:16 - 1.5
@@ -202,7 +202,7 @@
while (roles.hasNext()) {
Role role = (Role) roles.next();
if (debug = 3) {
-log.error( Creating Role MBean for role + role);
+log.debug( Creating Role MBean for role + role);
}
if (MBeanUtils.createMBean(role) == null) {
throw new IllegalArgumentException
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs developers.xml
yoavs 2004/06/09 18:04:06 Modified:webapps/docs developers.xml Log: Updated my role ;) Revision ChangesPath 1.5 +2 -1 jakarta-tomcat-catalina/webapps/docs/developers.xml Index: developers.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/developers.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- developers.xml25 Nov 2003 18:24:51 - 1.4 +++ developers.xml10 Jun 2004 01:04:06 - 1.5 @@ -8,6 +8,7 @@ properties author email=[EMAIL PROTECTED]Remy Maucherat/author +author email=[EMAIL PROTECTED]Yoav Shapira/author titleTomcat Developers/title /properties @@ -42,7 +43,7 @@ liRemy Maucherat (remm): Catalina, Connectors, Docs, Release Manager/li liTim Funk (funkman): Catalina, Docs/li - liYoav Shapira (yoavs): Docs, JMX, Catalina, balancer/li + liYoav Shapira (yoavs): Docs, JMX, Catalina, balancer, Release Manager/li /ul /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-watchdog-4.0 BUILDING.txt
yoavs 2004/06/07 06:21:17
Modified:.BUILDING.txt
Log:
Added ant-launcher.jar copy in order to make build work with Ant 1.6,
in order to fix Bugzilla http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29226.
Also updated BUILDING.txt to have directions for Ant 1.6 and later.
Revision ChangesPath
1.6 +5 -18 jakarta-watchdog-4.0/BUILDING.txt
Index: BUILDING.txt
===
RCS file: /home/cvs/jakarta-watchdog-4.0/BUILDING.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BUILDING.txt 5 Aug 2002 01:21:48 - 1.5
+++ BUILDING.txt 7 Jun 2004 13:21:17 - 1.6
@@ -23,30 +23,17 @@
(1) Download and Install the Ant Binary Distribution
-NOTE: These instructions assume that you are using the Ant 1.4 or above.
+NOTE: These instructions assume that you are using the Ant 1.6 or above.
-* Download a binary distribution of Ant 1.4 from:
+* Download a binary distribution of Ant 1.6 from:
-http://jakarta.apache.org/builds/jakarta-ant/release/v1.4/bin/
-
- On a Windows platform, you will need:
-jakarta-ant-1.4-bin.zip
-jakarta-ant-1.4-optional.jar
-
- On a Unix platform, you will need:
-jakarta-ant-1.4-bin.tar.gz
-jakarta-ant-1.4-optional.jar
+http://ant.apache.org
* Unpack the binary distribution into a convenient location so that the
Ant release resides in its own directory (conventionally named
- jakarta-ant-1.4). For the purposes of the remainder of this document,
+ apache-ant-1.6). For the purposes of the remainder of this document,
the symbolic name ${ant.home} is used to refer to the full pathname of
the release directory.
-
-* Copy the file jakarta-ant-1.4-optional.jar, downloaded above, into
- the directory ${ant.home}/lib. This makes available several Ant
- extension commands that are commonly required when building Jakarta
- based projects.
* Modify the PATH environment variable to include directory
${ant.home}/bin in its list. This makes the ant command line script
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-watchdog-4.0 build.xml
yoavs 2004/06/07 06:21:12
Modified:.build.xml
Log:
Added ant-launcher.jar copy in order to make build work with Ant 1.6,
in order to fix Bugzilla http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29226.
Also updated BUILDING.txt to have directions for Ant 1.6 and later.
Revision ChangesPath
1.25 +4 -4 jakarta-watchdog-4.0/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-watchdog-4.0/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.xml 5 Aug 2002 12:59:18 - 1.24
+++ build.xml 7 Jun 2004 13:21:11 - 1.25
@@ -103,10 +103,10 @@
!-- Library files --
copytodir=${watchdog.build}/lib
- fileset dir=${ant.home}/lib includes=ant.jar/
- fileset dir=${ant.home}/lib includes=crimson.jar/
- fileset dir=${ant.home}/lib includes=jaxp.jar/
- fileset dir=${ant.home}/lib includes=parser.jar/
+ fileset dir=${ant.home}/lib
+include name=ant.jar/
+include name=ant-launcher.jar /
+ /fileset
/copy
copy tofile=${watchdog.build}/lib/servlet.jar
file=${servlet23.jar} /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-watchdog-4.0/site - New directory
yoavs 2004/06/07 07:10:23 jakarta-watchdog-4.0/site - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-watchdog-4.0/site index.html
yoavs 2004/06/07 07:10:53 Added: site index.html Log: I figured the web site should be backed up in CVS ;) Revision ChangesPath 1.1 jakarta-watchdog-4.0/site/index.html Index: index.html === html head titleThe Watchdog Validation Test Suite/title meta http-equiv=Content-Type content=text/html; charset=iso-8859-1 /head body bgcolor=#FF text=#00 link=#525D76 !-- Banner element, all hail the Project! -- table width=100% border=0 cellspacing=4 tr td colspan=2 a href=/index.htmlimg src=/images/jakarta-logo.gif alt=The Jakarta Project border=0/a /td /tr trtd colspan=2 hr noshade= size=1/ /td/tr tr !-- LEFT SIDE NAVIGATION -- td valign=top nowrap=true strongEssentials/strong ul lia href=/index.htmlFront Page/a/li lia href=/site/news.htmlNews Status/a/li lia href=/site/mission.htmlMission/a/li lia href=/site/guidelines.htmlGuidelines Notes/a/li lia href=/site/faqs.htmlFAQs/a/li /ul strongDownload/strong ul lia href=/site/binindex.htmlBinaries/a/li lia href=/site/sourceindex.htmlSource Code/a/li /ul strongGet Involved/strong ul lia href=/site/getinvolved.htmlOverview/a/li lia href=/site/cvsindex.htmlCVS Repositories/a/li lia href=/site/mail.htmlMailing Lists/a/li lia href=/site/library.htmlReference Library/a/li lia href=/site/bugs.htmlBug Database/a/li /ul strongSubProjects/strong ul lia href=/ant/index.htmlAnt/a/li lia href=/avalon/index.htmlAvalon/a/li lia href=/ecs/index.htmlECS/a/li lia href=/james/index.htmlJames/a/li lia href=/jetspeed/index.htmlJetspeed/a/li lia href=/jmeter/index.htmlJMeter/a/li lia href=/log4j/index.htmlLog4J/a/li lia href=/oro/index.htmlORO/a/li lia href=/regexp/index.htmlRegexp/a/li lia href=/slide/index.htmlSlide/a/li lia href=/struts/index.htmlStruts/a/li lia href=/taglibs/index.htmlTaglibs/a/li lia href=/tomcat/index.htmlTomcat/a/li lia href=/turbine/index.htmlTurbine/a/li lia href=/velocity/index.htmlVelocity/a/li lia href=/watchdog/index.htmlWatchdog/a/li /ul strongMisc/strong ul lia href=/site/whoweare.htmlWho We Are/a/li lia href=/site/acknowledgements.htmlAcknowledgements/a/li lia href=/site/contact.htmlContact/a/li lia href=/site/legal.htmlLegal/a/li /ul /td td align=left valign=top h1Watchdog/h1 p font color=redPlease note/font that the Watchdog project is ibdormant/b/i. There has been no development activity on this project for a while, since late 2002. The last version released, 4.0, tests the Servlet Specification version 2.3 and the JSP Specification v 1.2: both of these specifications now have newer versions (Servlet 2.4 and JSP 2.0), and there is no Watchdog release to test conformance with these specifications. The main reason for this status is that Sun has made the official Servlet/JSP TCK (Technology Comptability Kit, the official spec conformance test suite) more easily available to us. /p p Given the above, we will continue to make the Watchdog project available for download, and the source code available for your use. If you would like to revive and/or participate in the project, please subscribe to the user list and send a note indicating your interest. The ASF continues to encourage all contributions to this and other projects: the project may be revived at any time if interest if shown. It'd be great to have a true open-source TCK for these specifications. /p pstrongWatchdog/strong is a set of validation tests that can be run against a Servlet 2.3 / JSP 1.2 container (such as Tomcat 4.x) to identify potential problems with conformance to the corresponding specifications. While it is not the official TCK for the Servlet or JSP specifications, the tests it performs are similar./p /td /tr !-- FOOTER -- trtd colspan=2 hr noshade= size=1/ /td/tr trtd colspan=2 div align=centerfont color=#525D76 size=-1em Copyright #169; 1999-2004, Apache Software Foundation /em/font/div /td/tr /table /body /html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/06/04 06:50:17
Modified:catalina/src/share/org/apache/catalina/realm
DataSourceRealm.java
webapps/docs changelog.xml
Log:
Made DataSourceRealm easier to extend:
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29048
Revision ChangesPath
1.8 +4 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
Index: DataSourceRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DataSourceRealm.java 27 Feb 2004 14:58:45 - 1.7
+++ DataSourceRealm.java 4 Jun 2004 13:50:17 - 1.8
@@ -329,7 +329,7 @@
*
* @exception SQLException if a database error occurs
*/
-private Principal authenticate(Connection dbConnection,
+protected Principal authenticate(Connection dbConnection,
String username,
String credentials)
throws SQLException {
@@ -401,7 +401,7 @@
*
* @param dbConnection The connection to be closed
*/
-private void close(Connection dbConnection) {
+protected void close(Connection dbConnection) {
// Do nothing if the database connection is already closed
if (dbConnection == null)
@@ -422,7 +422,7 @@
*
* @return Connection to the database
*/
-private Connection open() {
+protected Connection open() {
try {
Context context = null;
1.62 +37 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- changelog.xml 1 Jun 2004 19:22:20 - 1.61
+++ changelog.xml 4 Jun 2004 13:50:17 - 1.62
@@ -14,6 +14,43 @@
body
+section name=Tomcat 5.0.27 (yoavs)
+ subsection name=General
+changelog
+/changelog
+ /subsection
+
+ subsection name=Catalina
+changelog
+ fix
+bug29048/bug: Made DataSourceRealm easier to extend. (yoavs)
+ /fix
+/changelog
+ /subsection
+
+ subsection name=Coyote
+changelog
+/changelog
+ /subsection
+
+ subsection name=Jasper
+changelog
+/changelog
+ /subsection
+
+ subsection name=Cluster
+changelog
+/changelog
+ /subsection
+
+
+ subsection name=Webapps
+changelog
+/changelog
+ /subsection
+
+/section
+
section name=Tomcat 5.0.26 (yoavs)
subsection name=General
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config context.xml
yoavs 2004/06/02 05:43:34 Modified:webapps/docs/config context.xml Log: Added default info for reloadable attribute. Revision ChangesPath 1.10 +2 -1 jakarta-tomcat-catalina/webapps/docs/config/context.xml Index: context.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/context.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- context.xml 6 Feb 2004 14:26:10 - 1.9 +++ context.xml 2 Jun 2004 12:43:34 - 1.10 @@ -165,7 +165,8 @@ changes, and automatically reload the web application if a change is detected. This feature is very useful during application development, but it requires significant runtime overhead and is -not recommended for use on deployed production applications. You +not recommended for use on deployed production applications. That's +why the default setting for this attribute is ifalse/i. You can use the a href=../manager-howto.htmlManager/a web application, however, to trigger reloads of deployed applications on demand./p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs-faq misc.xml
yoavs 2004/06/01 06:13:19 Modified:docs/faq misc.html docs/faq/printer misc.html xdocs-faq misc.xml Log: Added logging configuration link. Revision ChangesPath 1.24 +1 -1 jakarta-tomcat-site/docs/faq/misc.html Index: misc.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/misc.html,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- misc.html 30 Apr 2004 17:37:23 - 1.23 +++ misc.html 1 Jun 2004 13:13:18 - 1.24 @@ -768,7 +768,7 @@ /a /b div style=padding-left : 20px; -See this mailing list a href=http://marc.theaimsgroup.com/?l=tomcat-userm=108330970225012w=2;message./a +See this mailing list a href=http://marc.theaimsgroup.com/?l=tomcat-userm=108330970225012w=2;message./a For an example with log4j and tomcat running with JSVC (port 80), see a href=http://marc.theaimsgroup.com/?l=tomcat-userm=108578233003073w=2;this thread./a /divbr /blockquote/td/tr/table/td/tr!--FOOTER SEPARATOR--trtd colspan=2hr size=1 noshade=/td/tr!--PAGE FOOTER--trtd colspan=2div align=centerfont size=-1 color=#525D76em Copyright copy; 1999-2003, Apache Software Foundation 1.21 +1 -1 jakarta-tomcat-site/docs/faq/printer/misc.html Index: misc.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/printer/misc.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- misc.html 30 Apr 2004 17:37:23 - 1.20 +++ misc.html 1 Jun 2004 13:13:18 - 1.21 @@ -767,7 +767,7 @@ /a /b div style=padding-left : 20px; -See this mailing list a href=http://marc.theaimsgroup.com/?l=tomcat-userm=108330970225012w=2;message./a +See this mailing list a href=http://marc.theaimsgroup.com/?l=tomcat-userm=108330970225012w=2;message./a For an example with log4j and tomcat running with JSVC (port 80), see a href=http://marc.theaimsgroup.com/?l=tomcat-userm=108578233003073w=2;this thread./a /divbr /blockquote/td/tr/table/td/tr!--FOOTER SEPARATOR--trtd colspan=2hr size=1 noshade=/td/tr!--PAGE FOOTER--trtd colspan=2div align=centerfont size=-1 color=#525D76em Copyright copy; 1999-2003, Apache Software Foundation 1.20 +1 -1 jakarta-tomcat-site/xdocs-faq/misc.xml Index: misc.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/misc.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- misc.xml 30 Apr 2004 17:37:23 - 1.19 +++ misc.xml 1 Jun 2004 13:13:18 - 1.20 @@ -784,7 +784,7 @@ /a /question answer -See this mailing list a href=http://marc.theaimsgroup.com/?l=tomcat-useramp;m=108330970225012amp;w=2;message./a +See this mailing list a href=http://marc.theaimsgroup.com/?l=tomcat-useramp;m=108330970225012amp;w=2;message./a For an example with log4j and tomcat running with JSVC (port 80), see a href=http://marc.theaimsgroup.com/?l=tomcat-useramp;m=108578233003073amp;w=2;this thread./a /answer /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5/resources/deployer build.xml
yoavs 2004/06/01 12:22:09
Modified:resources/deployer build.xml
Log:
Added UTF-8 encoding to deployer build:
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28940
Revision ChangesPath
1.5 +2 -1 jakarta-tomcat-5/resources/deployer/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/resources/deployer/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 10 Apr 2004 15:33:16 - 1.4
+++ build.xml 1 Jun 2004 19:22:09 - 1.5
@@ -52,7 +52,8 @@
javac destdir=${webapp.path}/WEB-INF/classes
optimize=off
debug=on failonerror=false
- srcdir=${webapp.path}/WEB-INF/classes
+ srcdir=${webapp.path}/WEB-INF/classes
+ encoding=UTF-8
excludes=**/*.smap
classpath
fileset dir=${webapp.path}/WEB-INF/lib
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/06/01 12:22:20 Modified:webapps/docs changelog.xml Log: Added UTF-8 encoding to deployer build: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28940 Revision ChangesPath 1.61 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- changelog.xml 1 Jun 2004 15:00:10 - 1.60 +++ changelog.xml 1 Jun 2004 19:22:20 - 1.61 @@ -56,6 +56,9 @@ fix bug28533/bug: Fixed without-jni check in jk_java.m4. (yoavs) /fix + fix +bug28940/bug: Added UTF-8 encoding directive to Deployer build. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/05/28 08:57:33 Modified:webapps/docs changelog.xml Log: Added release notes note about jmx.jar in bootstrap classpath. Revision ChangesPath 1.59 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- changelog.xml 28 May 2004 00:04:31 - 1.58 +++ changelog.xml 28 May 2004 15:57:33 - 1.59 @@ -33,6 +33,9 @@ fix bug24723/bug: Corrected JNDI DataSources documentation and added explicit notes about a couple of common problems. (yoavs) /fix + fix +bug29258/bug: Added explanation about jmx.jar bootstrap classpath setup to release notes. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 RELEASE-NOTES
yoavs 2004/05/28 08:57:44 Modified:.RELEASE-NOTES Log: Added release notes note about jmx.jar in bootstrap classpath. Revision ChangesPath 1.17 +6 -1 jakarta-tomcat-5/RELEASE-NOTES Index: RELEASE-NOTES === RCS file: /home/cvs/jakarta-tomcat-5/RELEASE-NOTES,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- RELEASE-NOTES 26 May 2004 13:02:44 - 1.16 +++ RELEASE-NOTES 28 May 2004 15:57:44 - 1.17 @@ -75,6 +75,11 @@ Tomcat 5.0 also makes Xerces 2 and the Commons Logging API (release 1.0.3) available to web applications. +Please note that the JMX API is available to applications as well. The jmx.jar +file used to be located in the common/lib directory, but was moved to the bin +directory as part of the Tomcat 5.0.20 release. The jmx.jar is in Tomcat's +bootstrap classpath (included via the Class Path line in bootstrap.jar's manifest). + -- Tomcat 5.0 and XML Parsers: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs-faq security.xml
yoavs 2004/05/27 06:17:44
Modified:docs/faq security.html
docs/faq/printer security.html
xdocs-faq security.xml
Log:
Added JSVC example to security page.
Revision ChangesPath
1.10 +35 -12jakarta-tomcat-site/docs/faq/security.html
Index: security.html
===
RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/security.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- security.html 16 Oct 2003 07:46:16 - 1.9
+++ security.html 27 May 2004 13:17:44 - 1.10
@@ -1,23 +1,20 @@
-htmlheadMETA http-equiv=Content-Type content=text/html;
charset=iso-8859-1titleTomcat FAQ - Security/titlemeta value=Tim Funk
name=authormeta value=[EMAIL PROTECTED] name=emailstyle
+htmlheadMETA http-equiv=Content-Type content=text/html;
charset=iso-8859-1titleTomcat FAQ - Security/titlemeta value=Tim Funk
name=authormeta value=[EMAIL PROTECTED] name=emailmeta value=Yoav Shapira
name=authormeta value=[EMAIL PROTECTED] name=emailstyle
dt { font-size : larger; font-weight : bold }
dd {padding-bottom : 10px;}
/style/headbody vlink=#525D76 alink=#525D76 link=#525D76
text=#00 bgcolor=#fftable cellspacing=4 width=100%
border=0!--PAGE HEADER--trtd colspan=2!--JAKARTA LOGO--a
href=http://jakarta.apache.org/;img border=0 alt=The Jakarta Project
align=left src=http://jakarta.apache.org//images/jakarta-logo.gif;/a!--PROJECT
LOGO--a href=http://jakarta.apache.org/tomcat/;img border=0 alt=
Tomcat FAQ
- align=right src=../images/tomcat.gif/a/td/tr!--HEADER
SEPARATOR--trtd colspan=2hr size=1 noshade=/td/trtr!--LEFT SIDE
NAVIGATION--td nowrap=true valign=top
width=20%pstrongLinks/strong/pullia href=..Tomcat
Home/a/lilia href=index.htmlFAQ
Home/a/li/ulpstrongContents/strong/pullia
href=bugs.htmlBugs/a/lilia href=classnotfound.htmlClass Not
Found/a/lilia href=connectors.htmlConnectors/a/lilia
href=database.htmlDatabase/a/lilia
href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat/Howto;How do
I/a/lilia href=unix.htmlLinux / Unix/a/lilia
href=memory.htmlMemory/a/lilia href=meta.htmlMeta/a/lilia
href=misc.htmlMiscellaneous/a/lilia href=performance.htmlMonitoring /
Performance/a/lilia
href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat/Links;Other
Resources/a/lilia href=security.htmlSecurity/a/lilia
href=version.htmlWhich Version/a/lilia href=tomcatuser.htmlTomcat User
List/a/lilia href=windows.htmlWindows/a/li/ul/td!--RIGHT SIDE MAIN
BODY--td align=left valign=top width=80%table cellspacing=4 width=100%
border=0trtd nowrap=true valign=top align=lefth1Tomcat
FAQ/h1h2Security/h2/tdtd nowrap=true valign=top align=rightsmalla
href=printer/security.htmlimg alt=Printer Friendly Version border=0
src=../images/printer.gifbrprint-friendlybrversion
+ align=right src=../images/tomcat.gif/a/td/tr!--HEADER
SEPARATOR--trtd colspan=2hr size=1 noshade=/td/trtr!--LEFT SIDE
NAVIGATION--td nowrap=true valign=top
width=20%pstrongLinks/strong/pullia href=..Tomcat
Home/a/lilia href=index.htmlFAQ
Home/a/li/ulpstrongContents/strong/pullia
href=bugs.htmlBugs/a/lilia href=classnotfound.htmlClass Not
Found/a/lilia href=connectors.htmlConnectors/a/lilia
href=database.htmlDatabase/a/lilia
href=deployment.htmlDeployment/a/lilia
href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat/Howto;How do
I/a/lilia href=unix.htmlLinux / Unix/a/lilia
href=memory.htmlMemory/a/lilia href=meta.htmlMeta/a/lilia
href=misc.htmlMiscellaneous/a/lilia href=performance.htmlMonitoring /
Performance/a/lilia
href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat/Links;Other
Resources/a/lilia href=security.htmlSecurity/a/lilia
href=version.htmlWhich Version/a/lilia href=tomcatuser.htmlTomcat User
List/a/lilia href=windows.htmlWindows/a/li/ul/td!--RIGHT SIDE MAIN
BODY--td align=left valign=top width=80%table cellspacing=4 width=100%
border=0trtd nowrap=true valign=top align=lefth1Tomcat
FAQ/h1h2Security/h2/tdtd nowrap=true valign=top align=rightsmalla
href=printer/security.htmlimg alt=Printer Friendly Version border=0
src=../images/printer.gifbrprint-friendlybrversion
/a/small/td/tr/tabletable cellpadding=2
cellspacing=0 border=0trtd bgcolor=#525D76font
face=arial,helvetica.sanserif color=#ffa
name=PrefacestrongPreface/strong/a/font/td/trtrtdblockquote
p
-Security issues. But first a helpful link or two ...
-ul
- li
-a href=http://marc.theaimsgroup.com/?l=tomcat-userm=106293430225790w=2;
-Using OpenSSL to set up your own CA
-/a
- /li
-/ul
-
+This FAQ section provides help with some security-related issues.
/p
/blockquote/td/tr/tabletable cellpadding=2 cellspacing=0
border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif
color=#ffa
name=QuestionsstrongQuestions/strong
cvs commit: jakarta-tomcat-site/xdocs-faq security.xml
yoavs 2004/05/27 06:18:54 Modified:docs/faq security.html docs/faq/printer security.html xdocs-faq security.xml Log: Fixed link typos. Revision ChangesPath 1.11 +2 -2 jakarta-tomcat-site/docs/faq/security.html Index: security.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/security.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- security.html 27 May 2004 13:17:44 - 1.10 +++ security.html 27 May 2004 13:18:54 - 1.11 @@ -57,7 +57,7 @@ /blockquote/td/tr/tabletable cellpadding=2 cellspacing=0 border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif color=#ffa name=AnswersstrongAnswers/strong/a/font/td/trtrtdblockquote b style=font-size: larger -a href=openSSL +a name=openSSL How do I use OpenSSL to set up my own Certificate Authority (CA)? /a /b @@ -147,7 +147,7 @@ /divbr b style=font-size: larger -a href=jsvcExample +a name=jsvcExample How do I use jsvc/procrun to run Tomcat on port 80 securely? /a /b 1.8 +2 -2 jakarta-tomcat-site/docs/faq/printer/security.html Index: security.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/printer/security.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- security.html 27 May 2004 13:17:44 - 1.7 +++ security.html 27 May 2004 13:18:54 - 1.8 @@ -56,7 +56,7 @@ /blockquote/td/tr/tabletable cellpadding=2 cellspacing=0 border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif color=#ffa name=AnswersstrongAnswers/strong/a/font/td/trtrtdblockquote b style=font-size: larger -a href=openSSL +a name=openSSL How do I use OpenSSL to set up my own Certificate Authority (CA)? /a /b @@ -146,7 +146,7 @@ /divbr b style=font-size: larger -a href=jsvcExample +a name=jsvcExample How do I use jsvc/procrun to run Tomcat on port 80 securely? /a /b 1.7 +2 -2 jakarta-tomcat-site/xdocs-faq/security.xml Index: security.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/security.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- security.xml 27 May 2004 13:17:44 - 1.6 +++ security.xml 27 May 2004 13:18:54 - 1.7 @@ -74,7 +74,7 @@ section name=Answers question -a href=openSSL +a name=openSSL How do I use OpenSSL to set up my own Certificate Authority (CA)? /a /question @@ -164,7 +164,7 @@ /answer question -a href=jsvcExample +a name=jsvcExample How do I use jsvc/procrun to run Tomcat on port 80 securely? /a /question - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/ROOT index.jsp
yoavs 2004/05/27 06:23:14 Modified:webapps/ROOT index.jsp Log: - Added changelog link - Updated copyright to 2004 Revision ChangesPath 1.15 +2 -1 jakarta-tomcat-catalina/webapps/ROOT/index.jsp Index: index.jsp === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/ROOT/index.jsp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- index.jsp 1 Feb 2004 18:25:27 - 1.14 +++ index.jsp 27 May 2004 13:23:14 - 1.15 @@ -83,6 +83,7 @@ tr td bgcolor=#FFDC75 bordercolor=#00 nowrap a href=RELEASE-NOTES.txtRelease Notes/abr +a href=tomcat-docs/changelog.htmlChange Log/abr a href=tomcat-docsTomcat Documentation/abr nbsp; /td @@ -172,7 +173,7 @@ p align=rightfont size=-1img src=tomcat-power.gif width=77 height=80/fontbr nbsp; -font size=-1Copyright copy; 1999-2003 Apache Software Foundation/fontbr +font size=-1Copyright copy; 1999-2004 Apache Software Foundation/fontbr font size=-1All Rights Reserved/font br nbsp;/p p align=rightnbsp;/p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
yoavs 2004/05/27 07:10:47
Modified:.build.xml
Log:
Fixed missing on line 28
Revision ChangesPath
1.187 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- build.xml 26 May 2004 20:14:27 - 1.186
+++ build.xml 27 May 2004 14:10:44 - 1.187
@@ -25,7 +25,7 @@
property name=jtc.project value=jakarta-tomcat-connectors /
property name=jasper.projectvalue=jakarta-tomcat-jasper /
property name=ant.jar value=${ant.home}/lib/ant.jar/
- property name=ant-launcher.jar value=${ant.home}/lib/ant-launcher.jar/
+ property name=ant-launcher.jar value=${ant.home}/lib/ant-launcher.jar/
property name=cvstagvalue= /
property name=cvs.base
value=${basedir}/../
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup DigesterFactory.java
yoavs 2004/05/27 07:51:00
Modified:catalina/src/share/org/apache/catalina/startup
DigesterFactory.java
Log:
Fixed weird character at beginning of file?
Revision ChangesPath
1.6 +2 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/DigesterFactory.java
Index: DigesterFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/DigesterFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DigesterFactory.java 26 May 2004 16:16:37 - 1.5
+++ DigesterFactory.java 27 May 2004 14:51:00 - 1.6
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 1999-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
@@ -31,8 +31,7 @@
*
* @author Jean-Francois Arcand
*/
-
-public class DigesterFactory{
+public class DigesterFactory {
/**
* The XML entiry resolver used by the Digester.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/bin shutdown.bat
yoavs 2004/05/27 08:05:01 Modified:catalina/src/bin shutdown.bat Log: Fixed % around CURRENT_DIR. Revision ChangesPath 1.5 +2 -2 jakarta-tomcat-catalina/catalina/src/bin/shutdown.bat Index: shutdown.bat === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/shutdown.bat,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- shutdown.bat 28 Mar 2004 06:40:44 - 1.4 +++ shutdown.bat 27 May 2004 15:05:01 - 1.5 @@ -13,7 +13,7 @@ if exist %CATALINA_HOME%\bin\catalina.bat goto okHome cd .. set CATALINA_HOME=%cd% -cd CURRENT_DIR +cd %CURRENT_DIR% :gotHome if exist %CATALINA_HOME%\bin\catalina.bat goto okHome echo The CATALINA_HOME environment variable is not defined correctly - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config http.xml
yoavs 2004/05/27 09:08:51 Modified:webapps/docs/config http.xml Log: Added doc for threadPriority attribute (http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914). Revision ChangesPath 1.10 +9 -0 jakarta-tomcat-catalina/webapps/docs/config/http.xml Index: http.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- http.xml 19 Feb 2004 21:22:00 - 1.9 +++ http.xml 27 May 2004 16:08:51 - 1.10 @@ -8,6 +8,7 @@ properties author email=[EMAIL PROTECTED]Craig R. McClanahan/author +author email=[EMAIL PROTECTED]Yoav Shapira/author titleThe HTTP Connector/title /properties @@ -284,6 +285,14 @@ pIf set to codetrue/code, the TCP_NO_DELAY option will be set on the server socket, which improves performance under most circumstances. This is set to codetrue/code by default./p +/attribute + +attribute name=threadPriority required=false + pThe priority of the request processing threads within the JVM. + The default value is codejava.lang.Thread#NORM_PRIORITY/code. + See the JavaDoc for the java.lang.Thread class for more details on + what this priority means. + /p /attribute /attributes - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ConnectorMBean.java
yoavs 2004/05/27 09:09:28
Modified:catalina/src/share/org/apache/catalina/mbeans
ConnectorMBean.java
Log:
Added support for threadPriority attribute
(http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914).
Revision ChangesPath
1.5 +4 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java
Index: ConnectorMBean.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConnectorMBean.java 27 Feb 2004 14:58:44 - 1.4
+++ ConnectorMBean.java 27 May 2004 16:09:28 - 1.5
@@ -97,7 +97,7 @@
if ((algorithm).equals(name) || (keystoreType).equals(name) ||
(maxThreads).equals(name) || (maxSpareThreads).equals(name) ||
-(minSpareThreads).equals(name)) {
+(minSpareThreads).equals(name) || (threadPriority).equals(name)) {
if ((keystoreType).equals(name)) {
name = keyType;
@@ -114,9 +114,6 @@
} catch (Exception e) {
throw new MBeanException(e);
}
-//if( attribute == null ) {
-//attribute = connector.getProperty(name);
-//}
} else {
attribute = super.getAttribute(name);
}
@@ -166,8 +163,8 @@
if ((algorithm).equals(name) || (keystoreType).equals(name) ||
(maxThreads).equals(name) || (maxSpareThreads).equals(name) ||
-(minSpareThreads).equals(name)) {
-
+(minSpareThreads).equals(name) || (threadPriority).equals(name)) {
+
if ((keystoreType).equals(name)) {
name = keyType;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteConnector.java
yoavs 2004/05/27 09:09:48
Modified:catalina/src/share/org/apache/coyote/tomcat5
CoyoteConnector.java
Log:
Added support for threadPriority attribute
(http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914).
Revision ChangesPath
1.43 +28 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java
Index: CoyoteConnector.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- CoyoteConnector.java 24 Apr 2004 14:52:09 - 1.42
+++ CoyoteConnector.java 27 May 2004 16:09:48 - 1.43
@@ -164,6 +164,12 @@
/**
+ * The thread priority for processors.
+ */
+private int threadPriority = Thread.NORM_PRIORITY;
+
+
+/**
* Linger value on the incoming connection.
* Note : a value inferior to 0 means no linger.
*/
@@ -772,6 +778,27 @@
setProperty(maxThreads, String.valueOf(maxProcessors));
}
+
+/**
+ * Return the processor thread priority.
+ *
+ * @return int
+ */
+public int getThreadPriority() {
+ return threadPriority;
+}
+
+
+/**
+ * Sets the processor thread priority.
+ *
+ * @param threadPriority The new priority level
+ */
+public void setThreadPriority(int threadPriority) {
+ this.threadPriority = threadPriority;
+ setProperty(threadPriority, String.valueOf(threadPriority));
+}
+
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/connector connector.jsp
yoavs 2004/05/27 09:10:18 Modified:webapps/admin/connector connector.jsp Log: Added support for threadPriority attribute (http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914). Revision ChangesPath 1.9 +8 -1 jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp Index: connector.jsp === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- connector.jsp 25 Jan 2004 01:54:16 - 1.8 +++ connector.jsp 27 May 2004 16:10:18 - 1.9 @@ -265,7 +265,7 @@ /controls:data /controls:row -controls:row labelStyle=table-label-text dataStyle=table-normal-text styleId=maxkthreads +controls:row labelStyle=table-label-text dataStyle=table-normal-text styleId=maxthreads controls:labelbean:message key=connector.maxthreads/:/controls:label controls:data html:text property=maxThreads size=5 maxlength=5 styleId=maxthreads/ @@ -276,6 +276,13 @@ controls:labelbean:message key=connector.minspare/:/controls:label controls:data html:text property=minSpare size=5 maxlength=5 styleId=minspare/ +/controls:data +/controls:row + +controls:row labelStyle=table-label-text dataStyle=table-normal-text styleId=threadpriority +controls:labelbean:message key=connector.threadpriority/:/controls:label +controls:data + html:text property=threadPriority size=5 maxlength=5 styleId=threadpriority/ /controls:data /controls:row - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources.properties
yoavs 2004/05/27 09:10:35 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources.properties Log: Added support for threadPriority attribute (http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914). Revision ChangesPath 1.4 +1 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources.properties Index: ApplicationResources.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ApplicationResources.properties 17 Apr 2004 02:50:41 - 1.3 +++ ApplicationResources.properties 27 May 2004 16:10:35 - 1.4 @@ -133,6 +133,7 @@ connector.maxspare=Max Spare Threads connector.maxthreads=Max Threads connector.minspare=Min Spare Threads +connector.threadpriority=Processor Thread Priority connector.proxy.name=Proxy Name connector.proxy.portnumber=Proxy Port Number connector.algorithm=Algorithm - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_es.properties
yoavs 2004/05/27 09:10:41 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_es.properties Log: Added support for threadPriority attribute (http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914). Revision ChangesPath 1.20 +1 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties Index: ApplicationResources_es.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ApplicationResources_es.properties4 Mar 2004 18:44:49 - 1.19 +++ ApplicationResources_es.properties27 May 2004 16:10:41 - 1.20 @@ -133,6 +133,7 @@ connector.maxspare=Máx. Hilos de Repuesto connector.maxthreads=Máx. Hilos connector.minspare=MÃn. Hilos de Repuesto +connector.threadpriority=Processor Thread Priority connector.proxy.name=Nombre del Apoderado (Proxy) connector.proxy.portnumber=Número de Puerto del Apoderado (Proxy) connector.algorithm=Algoritmo - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_ja.properties
yoavs 2004/05/27 09:10:46 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_ja.properties Log: Added support for threadPriority attribute (http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914). Revision ChangesPath 1.9 +1 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_ja.properties Index: ApplicationResources_ja.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_ja.properties,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ApplicationResources_ja.properties4 Mar 2004 18:44:49 - 1.8 +++ ApplicationResources_ja.properties27 May 2004 16:10:46 - 1.9 @@ -133,6 +133,7 @@ connector.maxspare=\u4e88\u5099\u30b9\u30ec\u30c3\u30c9\u6700\u5927\u6570 connector.maxthreads=\u30b9\u30ec\u30c3\u30c9\u6700\u5927\u6570 connector.minspare=\u4e88\u5099\u30b9\u30ec\u30c3\u30c9\u6700\u5c0f\u6570 +connector.threadpriority=Processor Thread Priority connector.proxy.name=\u30d7\u30ed\u30ad\u30b7\u540d connector.proxy.portnumber=\u30d7\u30ed\u30ad\u30b7\u30dd\u30fc\u30c8\u756a\u53f7 connector.algorithm=\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector AddConnectorAction.java
yoavs 2004/05/27 09:10:54 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector AddConnectorAction.java Log: Added support for threadPriority attribute (http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914). Revision ChangesPath 1.8 +2 -1 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java Index: AddConnectorAction.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- AddConnectorAction.java 27 Feb 2004 14:59:02 - 1.7 +++ AddConnectorAction.java 27 May 2004 16:10:53 - 1.8 @@ -116,6 +116,7 @@ connectorFm.setMaxSpare(50); connectorFm.setMaxThreads(200); connectorFm.setMinSpare(4); +connectorFm.setThreadPriority(String.valueOf(Thread.NORM_PRIORITY)); connectorFm.setSecure(false); connectorFm.setTcpNoDelay(true); connectorFm.setXpoweredBy(false); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector ConnectorForm.java
yoavs 2004/05/27 09:10:59
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
ConnectorForm.java
Log:
Added support for threadPriority attribute
(http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914).
Revision ChangesPath
1.10 +27 -2
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
Index: ConnectorForm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConnectorForm.java27 Feb 2004 14:59:02 - 1.9
+++ ConnectorForm.java27 May 2004 16:10:59 - 1.10
@@ -156,6 +156,11 @@
* The text for the minSpare.
*/
private String minSpare = null;
+
+/**
+ * The text for the threadPriority.
+ */
+private String threadPriority = null;
/**
* The text for the URIEncoding.
@@ -892,7 +897,26 @@
this.minSpare = minSpare;
-}
+}
+
+/**
+ * Return the threadPriority.
+ */
+public String getThreadPriority() {
+
+ return this.threadPriority;
+
+}
+
+/**
+ * Set the threadPriority.
+ */
+
+public void setThreadPriority(String threadPriority) {
+
+ this.threadPriority = threadPriority;
+
+}
/**
* Return the URIEncoding text.
@@ -1102,6 +1126,7 @@
this.maxSpare = null;
this.maxThreads = null;
this.minSpare = null;
+this.threadPriority = null;
this.uriEncodingText = null;
this.useBodyEncodingForURI = false;
this.allowTrace = false;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector EditConnectorAction.java
yoavs 2004/05/27 09:11:03 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector EditConnectorAction.java Log: Added support for threadPriority attribute (http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914). Revision ChangesPath 1.9 +4 -1 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java Index: EditConnectorAction.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- EditConnectorAction.java 4 Mar 2004 18:44:50 - 1.8 +++ EditConnectorAction.java 27 May 2004 16:11:03 - 1.9 @@ -196,6 +196,9 @@ attribute = minSpareThreads; connectorFm.setMinSpare ((String) mBServer.getAttribute(cname, attribute)); +attribute = threadPriority; +connectorFm.setThreadPriority +((String) mBServer.getAttribute(cname, attribute)); attribute = secure; connectorFm.setSecure (((Boolean) mBServer.getAttribute(cname, attribute)).toString());; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector SaveConnectorAction.java
yoavs 2004/05/27 09:11:09
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
SaveConnectorAction.java
Log:
Added support for threadPriority attribute
(http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914).
Revision ChangesPath
1.15 +11 -1
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Index: SaveConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SaveConnectorAction.java 4 Mar 2004 18:44:50 - 1.14
+++ SaveConnectorAction.java 27 May 2004 16:11:08 - 1.15
@@ -369,6 +369,16 @@
}
mBServer.setAttribute(coname,
new Attribute(attribute, (new
Integer(minSpare)).toString()));
+
+attribute = threadPriority;
+int threadPriority = Thread.NORM_PRIORITY;
+try {
+threadPriority = Integer.parseInt(cform.getThreadPriority());
+} catch (Throwable t) {
+threadPriority = Thread.NORM_PRIORITY;
+}
+mBServer.setAttribute(coname,
+ new Attribute(attribute, (new
Integer(threadPriority)).toString()));
attribute = secure;
mBServer.setAttribute(coname,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Protocol.java
yoavs 2004/05/27 09:12:09
Modified:http11/src/java/org/apache/coyote/http11 Http11Protocol.java
Log:
Added support for threadPriority attribute
(http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914).
Revision ChangesPath
1.54 +13 -7
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java
Index: Http11Protocol.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Http11Protocol.java 2 Mar 2004 01:17:39 - 1.53
+++ Http11Protocol.java 27 May 2004 16:12:09 - 1.54
@@ -76,14 +76,11 @@
public void setAttribute( String name, Object value ) {
if( log.isTraceEnabled())
log.trace(sm.getString(http11protocol.setattribute, name, value));
+
+System.out.println(getClass().getName() +
+ : setAttribute( + name + , + value + ): here.);
+
attributes.put(name, value);
-/*
-if (maxKeepAliveRequests.equals(name)) {
-maxKeepAliveRequests = Integer.parseInt((String) value.toString());
-} else if (port.equals(name)) {
-setPort(Integer.parseInt((String) value.toString()));
-}
-*/
}
public Object getAttribute( String key ) {
@@ -279,6 +276,15 @@
public void setMinSpareThreads( int minSpareThreads ) {
ep.setMinSpareThreads(minSpareThreads);
setAttribute(minSpareThreads, + minSpareThreads);
+}
+
+public void setThreadPriority(int threadPriority) {
+ ep.setThreadPriority(threadPriority);
+ setAttribute(threadPriority, + threadPriority);
+}
+
+public int getThreadPriority() {
+ return ep.getThreadPriority();
}
// Tcp setup
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
yoavs 2004/05/27 09:12:46
Modified:util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
Log:
Added support for threadPriority attribute
(http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914).
Revision ChangesPath
1.37 +9 -3
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- PoolTcpEndpoint.java 24 Feb 2004 08:50:05 - 1.36
+++ PoolTcpEndpoint.java 27 May 2004 16:12:46 - 1.37
@@ -52,6 +52,7 @@
* @author James Todd [EMAIL PROTECTED]
* @author [EMAIL PROTECTED]
* @author Gal Shachor [EMAIL PROTECTED]
+ * @author Yoav Shapira [EMAIL PROTECTED]
*/
public class PoolTcpEndpoint { // implements Endpoint {
@@ -84,8 +85,6 @@
static final int debug=0;
ThreadPool tp;
-// XXX Do we need it for backward compat ?
-//protected Log _log=Log.getLog(tc/PoolTcpEndpoint, PoolTcpEndpoint);
static Log log=LogFactory.getLog(PoolTcpEndpoint.class );
@@ -94,7 +93,6 @@
protected int socketTimeout=-1;
public PoolTcpEndpoint() {
- // super(tc_log);// initialize default logger
tp = new ThreadPool();
}
@@ -137,6 +135,14 @@
public int getMinSpareThreads() {
return tp.getMinSpareThreads();
+}
+
+public void setThreadPriority(int threadPriority) {
+ tp.setThreadPriority(threadPriority);
+}
+
+public int getThreadPriority() {
+ return tp.getThreadPriority();
}
public int getPort() {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads ThreadPool.java
yoavs 2004/05/27 09:12:54
Modified:util/java/org/apache/tomcat/util/threads ThreadPool.java
Log:
Added support for threadPriority attribute
(http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914).
Revision ChangesPath
1.25 +50 -12
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPool.java
Index: ThreadPool.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPool.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ThreadPool.java 8 Mar 2004 14:48:28 - 1.24
+++ ThreadPool.java 27 May 2004 16:12:54 - 1.25
@@ -24,7 +24,10 @@
/**
* A thread pool that is trying to copy the apache process management.
*
+ * Should we remove this in favor of Doug Lea's thread package?
+ *
* @author Gal Shachor
+ * @author Yoav Shapira [EMAIL PROTECTED]
*/
public class ThreadPool {
@@ -104,6 +107,11 @@
*/
protected int sequence = 1;
+/**
+ * Thread priority.
+ */
+protected int threadPriority = Thread.NORM_PRIORITY;
+
/**
* Constructor.
@@ -120,22 +128,11 @@
/** Create a ThreadPool instance.
*
- * @param jmx True if you want a pool with JMX support. A regular pool
- * will be returned if JMX or the modeler are not available.
- *
+ * @param jmx UNUSED
* @return ThreadPool instance. If JMX support is requested, you need to
* call register() in order to set a name.
*/
public static ThreadPool createThreadPool(boolean jmx) {
-//if( jmx ) {
-//try {
-//Class.forName( org.apache.commons.modeler.Registry);
-//Class tpc=Class.forName(
org.apache.tomcat.util.threads.ThreadPoolMX);
-//ThreadPool res=(ThreadPool)tpc.newInstance();
-//return res;
-//} catch( Exception ex ) {
-//}
-//}
return new ThreadPool();
}
@@ -157,6 +154,47 @@
public MonitorRunnable getMonitor() {
return monitor;
}
+
+/**
+ * Sets the thread priority for current
+ * and future threads in this pool.
+ *
+ * @param threadPriority The new priority
+ * @throws IllegalArgumentException If the specified
+ * priority is less than Thread.MIN_PRIORITY or
+ * more than Thread.MAX_PRIORITY
+ */
+public synchronized void setThreadPriority(int threadPriority) {
+ System.out.println(getClass().getName() +
+ : setPriority( + threadPriority + ): here.);
+
+ if (threadPriority Thread.MIN_PRIORITY) {
+throw new IllegalArgumentException(new priority MIN_PRIORITY);
+ } else if (threadPriority Thread.MAX_PRIORITY) {
+throw new IllegalArgumentException(new priority MIN_PRIORITY);
+ }
+
+ // Set for future threads
+ this.threadPriority = threadPriority;
+
+ Enumeration currentThreads = getThreads();
+ Thread t = null;
+ while(currentThreads.hasMoreElements()) {
+t = (Thread) currentThreads.nextElement();
+t.setPriority(threadPriority);
+ }
+}
+
+/**
+ * Returns the priority level of current and
+ * future threads in this pool.
+ *
+ * @return The priority
+ */
+public int getThreadPriority() {
+ return threadPriority;
+}
+
public void setMaxThreads(int maxThreads) {
this.maxThreads = maxThreads;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/05/27 09:14:16 Modified:webapps/docs changelog.xml Log: Added support for threadPriority attribute (http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28914). Revision ChangesPath 1.53 +6 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- changelog.xml 26 May 2004 20:17:15 - 1.52 +++ changelog.xml 27 May 2004 16:14:16 - 1.53 @@ -52,6 +52,9 @@ fix bug28837/bug: Added Solaris includes to JK native build script. (yoavs) /fix + fix +bug28914/bug: Added threadPriority attribute and related code. (yoavs) + /fix /changelog /subsection @@ -67,6 +70,9 @@ subsection name=Webapps changelog + fix +bug28914/bug: Added management code for threadPriority. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/architecture requestProcess.xml
yoavs 2004/05/27 09:23:49 Modified:webapps/docs/architecture requestProcess.xml Log: Fixed typo. Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-catalina/webapps/docs/architecture/requestProcess.xml Index: requestProcess.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/architecture/requestProcess.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- requestProcess.xml13 Dec 2003 17:18:57 - 1.1 +++ requestProcess.xml27 May 2004 16:23:49 - 1.2 @@ -31,7 +31,7 @@ subsection name=diagram p -A UML sequence diagram of the startup procedure is available +A UML sequence diagram of the request process is available a href=requestProcess/requestProcess.pdfhere./a /p /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/procrun README.txt
yoavs 2004/05/27 09:27:38 Modified:procrun README.txt Log: Added reference to commons-daemon site. Revision ChangesPath 1.4 +6 -0 jakarta-tomcat-connectors/procrun/README.txt Index: README.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/procrun/README.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- README.txt8 Apr 2004 07:47:10 - 1.3 +++ README.txt27 May 2004 16:27:38 - 1.4 @@ -4,3 +4,9 @@ Rename binaries to reflect default service name: prunsrv.exe - tomcat5.exe prunmgr.exe - tomcat5w.exe + +Documentation for the commons-daemon project, which is +where procrun comes from, is at +http://jakarta.apache.org/commons/daemon. That site +has links to the CVS repository and the source code for +the project. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/bin startup.bat
yoavs 2004/05/27 11:25:11 Modified:catalina/src/bin startup.bat Log: Fixed missing % in reference to CURRENT_DIR Revision ChangesPath 1.6 +2 -2 jakarta-tomcat-catalina/catalina/src/bin/startup.bat Index: startup.bat === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/startup.bat,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- startup.bat 28 Mar 2004 06:40:44 - 1.5 +++ startup.bat 27 May 2004 18:25:11 - 1.6 @@ -13,7 +13,7 @@ if exist %CATALINA_HOME%\bin\catalina.bat goto okHome cd .. set CATALINA_HOME=%cd% -cd CURRENT_DIR +cd %CURRENT_DIR% :gotHome if exist %CATALINA_HOME%\bin\catalina.bat goto okHome echo The CATALINA_HOME environment variable is not defined correctly - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Protocol.java
yoavs 2004/05/27 11:29:35 Modified:http11/src/java/org/apache/coyote/http11 Http11Protocol.java Log: Removed extraneous debugging statement. Revision ChangesPath 1.55 +0 -3 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java Index: Http11Protocol.java === RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- Http11Protocol.java 27 May 2004 16:12:09 - 1.54 +++ Http11Protocol.java 27 May 2004 18:29:35 - 1.55 @@ -77,9 +77,6 @@ if( log.isTraceEnabled()) log.trace(sm.getString(http11protocol.setattribute, name, value)); -System.out.println(getClass().getName() + - : setAttribute( + name + , + value + ): here.); - attributes.put(name, value); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs jndi-datasource-examples-howto.xml
yoavs 2004/05/27 11:33:11 Modified:webapps/docs jndi-datasource-examples-howto.xml Log: Enhanced and corrected doc to address issues raised in Bugzilla 24723: http://issues.apache.org/bugzilla/show_bug.cgi?id=24723 Revision ChangesPath 1.8 +20 -1 jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml Index: jndi-datasource-examples-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jndi-datasource-examples-howto.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jndi-datasource-examples-howto.xml29 Feb 2004 12:47:32 - 1.7 +++ jndi-datasource-examples-howto.xml27 May 2004 18:33:11 - 1.8 @@ -10,6 +10,7 @@ author email=[EMAIL PROTECTED]Les Hughes/author author email=[EMAIL PROTECTED]David Haraburda/author authorGlenn Nielsen/author +author email=[EMAIL PROTECTED]Yoav Shapira/author titleJNDI Datasource HOW-TO/title /properties @@ -473,7 +474,7 @@ source lt;resource-refgt; lt;descriptiongt;postgreSQL Datasource examplelt;/descriptiongt; - lt;res-ref-namegt;jdbc/mydblt;/res-ref-namegt; + lt;res-ref-namegt;jdbc/postgreslt;/res-ref-namegt; lt;res-typegt;javax.sql.DataSourcelt;/res-typegt; lt;res-authgt;Containerlt;/res-authgt; lt;/resource-refgt; @@ -650,6 +651,24 @@ /p /subsection + +subsection name=Context versus GlobalNamingResources +p + Please note that although the above instructions place the JNDI declarations in a Context + element, it is possible and sometimes desirable to place these declarations in the + a href=config/globalresources.htmlGlobalNamingResources/a section of the server + configuration file. A resource placed in the GlobalNamingResources section will be shared + among the Contexts of the server. +/p +/subsection + +subsection name=JNDI Resource Naming and Realm Interaction +p + In order to get Realms to work, the realm must refer to the datasource as + defined in the lt;GlobalNamingResourcesgt; or lt;Contextgt; section, not a datasource as renamed + using lt;ResourceLinkgt;. +/p +/subsection /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/05/27 11:39:46 Modified:webapps/docs changelog.xml Log: Enhanced and corrected doc to address issues raised in Bugzilla 24723: http://issues.apache.org/bugzilla/show_bug.cgi?id=24723 Revision ChangesPath 1.54 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- changelog.xml 27 May 2004 16:14:16 - 1.53 +++ changelog.xml 27 May 2004 18:39:46 - 1.54 @@ -30,6 +30,9 @@ fix bug28989/bug: Added ant-launcher.jar to launcher classpath. (yoavs) /fix + fix +bug24723/bug: Corrected JNDI DataSources documentation and added explicit notes about a couple of common problems. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.properties.default
yoavs 2004/05/27 13:01:16
Modified:.build.properties.default
Log:
Added activation.jar definition and updated javamail definition to be for 1.3.1 by
default.
Revision ChangesPath
1.124 +6 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- build.properties.default 19 May 2004 16:54:22 - 1.123
+++ build.properties.default 27 May 2004 20:01:16 - 1.124
@@ -251,10 +251,14 @@
# - Java Mail, version 1.2 or later -
-mail.home=${base.path}/javamail-1.2
+mail.home=${base.path}/javamail-1.3.1
mail.lib=${mail.home}
mail.jar=${mail.lib}/mail.jar
+# - Java Activation Framework, version 1.0.1 or later -
+activation.home=${base.path}/jaf-1.0.2
+activation.lib=${activation.home}
+activation.jar=${activation.lib}/activation.jar
# - PureTLS Extension, version 0.9 or later -
puretls.home=${base.path}/puretls-0.9b4
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/05/27 13:08:30 Modified:webapps/docs changelog.xml Log: Added entry for http://issues.apache.org/bugzilla/show_bug.cgi?id=29255 Revision ChangesPath 1.55 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- changelog.xml 27 May 2004 18:39:46 - 1.54 +++ changelog.xml 27 May 2004 20:08:30 - 1.55 @@ -44,6 +44,9 @@ fix bug28943/bug: Fixed CURRENT_DIR missing % signs in bin/startup.bat. (yoavs) /fix + fix +bug29255/bug: common/lib/naming-factory.jar missing MailSession and SendMail factories. (yoavs) + /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/05/27 16:01:02
Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java
webapps/docs changelog.xml
Log:
Fixed Bugzilla 29038: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29038
Revision ChangesPath
1.31 +5 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- HostConfig.java 10 Apr 2004 14:56:31 - 1.30
+++ HostConfig.java 27 May 2004 23:01:01 - 1.31
@@ -534,6 +534,10 @@
entry = jar.getJarEntry(META-INF/context.xml);
if (entry != null) {
istream = jar.getInputStream(entry);
+
+// Added for Bugzilla 29038
+xml.mkdirs();
+
ostream =
new BufferedOutputStream
(new FileOutputStream(xml), 1024);
1.56 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- changelog.xml 27 May 2004 20:08:30 - 1.55
+++ changelog.xml 27 May 2004 23:01:02 - 1.56
@@ -47,6 +47,9 @@
fix
bug29255/bug: common/lib/naming-factory.jar missing MailSession and
SendMail factories. (yoavs)
/fix
+ fix
+bug29038/bug: Create directories above context xml file as needed.
(yoavs)
+ /fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/05/27 17:04:31 Modified:webapps/docs changelog.xml Log: Fixed http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28533 Revision ChangesPath 1.58 +4 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- changelog.xml 27 May 2004 23:29:05 - 1.57 +++ changelog.xml 28 May 2004 00:04:31 - 1.58 @@ -19,7 +19,7 @@ subsection name=General changelog fix -bug28335/bug: Fixed JavaDocs. +bug28335/bug: Fixed JavaDocs. (yoavs) /fix update Changed build dependency on JUnit from 3.7 to 3.8.1. (yoavs) @@ -49,6 +49,9 @@ /fix fix bug29038/bug: Create directories above context xml file as needed. (yoavs) + /fix + fix +bug28533/bug: Fixed without-jni check in jk_java.m4. (yoavs) /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/support jk_java.m4
yoavs 2004/05/27 17:04:43
Modified:jk/support jk_java.m4
Log:
Fixed http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28533
Revision ChangesPath
1.9 +2 -2 jakarta-tomcat-connectors/jk/support/jk_java.m4
Index: jk_java.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_java.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_java.m410 Mar 2004 19:07:41 - 1.8
+++ jk_java.m428 May 2004 00:04:43 - 1.9
@@ -41,7 +41,7 @@
*) use_jni=true ;;
esac
- if ${TEST} ${use_jni} ; then
+ if ${TEST} ${use_jni} = true; then
HAVE_JNI=-DHAVE_JNI
JNI_BUILD=jni-build
fi
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 RELEASE-NOTES
yoavs 2004/05/26 06:02:44 Modified:.RELEASE-NOTES Log: - Updated Xerces version reference from 2.6.0 to 2.6.2 Revision ChangesPath 1.16 +2 -2 jakarta-tomcat-5/RELEASE-NOTES Index: RELEASE-NOTES === RCS file: /home/cvs/jakarta-tomcat-5/RELEASE-NOTES,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- RELEASE-NOTES 17 May 2004 23:43:33 - 1.15 +++ RELEASE-NOTES 26 May 2004 13:02:44 - 1.16 @@ -86,7 +86,7 @@ you may replace the xercesImpl.jar file in common/endorsed with another XML parser, as long as it is compatible with the JAXP 1.2 APIs. -Xerces 2.6.0 is included. +Xerces 2.6.2 is included. --- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs index.xml
yoavs 2004/05/26 07:59:31 Modified:docs index.html xdocsindex.xml Log: Updated to 5.0.25 as latest stable release. Revision ChangesPath 1.61 +1 -1 jakarta-tomcat-site/docs/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- index.html9 May 2004 14:13:14 - 1.60 +++ index.html26 May 2004 14:59:31 - 1.61 @@ -189,7 +189,7 @@ /td td bgcolor=#a0ddf0 colspan= rowspan= valign=top align=left font color=#00 size=-1 face=arial,helvetica,sanserif -5.0.24 +5.0.25 /font /td /tr 1.50 +1 -1 jakarta-tomcat-site/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs/index.xml,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- index.xml 9 May 2004 14:13:14 - 1.49 +++ index.xml 26 May 2004 14:59:31 - 1.50 @@ -40,7 +40,7 @@ tr td2.4/2.0/td - td5.0.24/td + td5.0.25/td /tr tr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina Context.java
yoavs 2004/05/26 08:25:12 Modified:catalina/src/share/org/apache/catalina Context.java Log: Minor JavaDoc fixes (Bugzilla 11212) Revision ChangesPath 1.12 +4 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Context.java Index: Context.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Context.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Context.java 24 Mar 2004 20:00:22 - 1.11 +++ Context.java 26 May 2004 15:25:12 - 1.12 @@ -545,7 +545,7 @@ /** * Add a resource link for this web application. * - * @param resource New resource link + * @param resourceLink New resource link */ public void addResourceLink(ContextResourceLink resourceLink); @@ -1167,7 +1167,7 @@ /** * Set the validation feature of the XML parser used when * parsing tlds files. - * @param tldXmlValidation true to enable xml instance validation + * @param tldValidation true to enable xml instance validation */ public void setTldValidation(boolean tldValidation); @@ -1190,7 +1190,7 @@ /** * Set the namespace aware feature of the XML parser used when * parsing xml instances. - * @param xmlNamespaceAware true to enable namespace awareness + * @param tldNamespaceAware true to enable namespace awareness */ public void setTldNamespaceAware(boolean tldNamespaceAware); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina DefaultContext.java
yoavs 2004/05/26 08:26:06 Modified:catalina/src/share/org/apache/catalina DefaultContext.java Log: Minor JavaDoc fixes (Bugzilla 11212) Revision ChangesPath 1.6 +2 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/DefaultContext.java Index: DefaultContext.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/DefaultContext.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DefaultContext.java 27 Feb 2004 14:58:38 - 1.5 +++ DefaultContext.java 26 May 2004 15:26:06 - 1.6 @@ -123,8 +123,6 @@ /** * Get the resources DirContext object with which this Container is * associated. - * - * @param resources The new associated DirContext */ public DirContext getResources(); @@ -298,7 +296,7 @@ /** * Add a resource link for this web application. * - * @param resource New resource link + * @param resourceLink New resource link */ public void addResourceLink(ContextResourceLink resourceLink); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina Manager.java
yoavs 2004/05/26 08:28:21 Modified:catalina/src/share/org/apache/catalina Manager.java Log: Minor JavaDoc fixes (Bugzilla 11212) Revision ChangesPath 1.11 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Manager.java Index: Manager.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Manager.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Manager.java 11 May 2004 00:04:09 - 1.10 +++ Manager.java 26 May 2004 15:28:21 - 1.11 @@ -130,7 +130,7 @@ * Sets the session id length (in bytes) for Sessions created by this * Manager. * - * @param sessionIdLength The session id length + * @param idLength The session id length */ public void setSessionIdLength(int idLength); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina Realm.java
yoavs 2004/05/26 08:28:28 Modified:catalina/src/share/org/apache/catalina Realm.java Log: Minor JavaDoc fixes (Bugzilla 11212) Revision ChangesPath 1.8 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Realm.java Index: Realm.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Realm.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Realm.java27 Feb 2004 14:58:38 - 1.7 +++ Realm.java26 May 2004 15:28:28 - 1.8 @@ -139,7 +139,7 @@ * @param request Request we are processing * @param response Response we are creating * @param constraint Security constraint we are enforcing - * @param The Context to which client of this class is attached. + * @param context The Context to which client of this class is attached. * * @exception IOException if an input/output error occurs */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina Server.java
yoavs 2004/05/26 08:28:34 Modified:catalina/src/share/org/apache/catalina Server.java Log: Minor JavaDoc fixes (Bugzilla 11212) Revision ChangesPath 1.3 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Server.java Index: Server.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Server.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Server.java 27 Feb 2004 14:58:39 - 1.2 +++ Server.java 26 May 2004 15:28:34 - 1.3 @@ -67,7 +67,7 @@ /** * Set the global naming resources. * - * @param namingResources The new global naming resources + * @param globalNamingResources The new global naming resources */ public void setGlobalNamingResources (NamingResources globalNamingResources); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina Wrapper.java
yoavs 2004/05/26 08:28:42 Modified:catalina/src/share/org/apache/catalina Wrapper.java Log: Minor JavaDoc fixes (Bugzilla 11212) Revision ChangesPath 1.5 +3 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Wrapper.java Index: Wrapper.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Wrapper.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Wrapper.java 27 Feb 2004 14:58:39 - 1.4 +++ Wrapper.java 26 May 2004 15:28:42 - 1.5 @@ -112,7 +112,7 @@ /** * Set the run-as identity for this servlet. * - * @param value New run-as identity value + * @param runAs New run-as identity value */ public void setRunAs(String runAs); @@ -160,7 +160,7 @@ /** * Add a mapping associated with the Wrapper. * - * @param pattern The new wrapper mapping + * @param mapping The new wrapper mapping */ public void addMapping(String mapping); @@ -171,7 +171,6 @@ * * @param name Role name used within this servlet * @param link Role name used within the web application - * @param description Description of this security role reference */ public void addSecurityReference(String name, String link); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant JMXSetTask.java
yoavs 2004/05/26 08:29:30
Modified:catalina/src/share/org/apache/catalina/ant JMXSetTask.java
Log:
Minor JavaDoc fixes (Bugzilla 11212)
Revision ChangesPath
1.4 +3 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/JMXSetTask.java
Index: JMXSetTask.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/JMXSetTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMXSetTask.java 27 Feb 2004 14:58:40 - 1.3
+++ JMXSetTask.java 26 May 2004 15:29:30 - 1.4
@@ -90,8 +90,8 @@
}
/**
- * Set method for the attribute value
- * @param attribute Attribute value
+ * Set method for the attribute value.
+ * @param value Attribute value
*/
public void setValue (String value) {
this.value = value;
-
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 ApplicationContextFacade.java
yoavs 2004/05/26 08:36:14 Modified:catalina/src/share/org/apache/catalina/core ApplicationContextFacade.java Log: Minor JavaDoc fixes (Bugzilla 11212) Revision ChangesPath 1.10 +3 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java Index: ApplicationContextFacade.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ApplicationContextFacade.java 27 Feb 2004 14:58:42 - 1.9 +++ ApplicationContextFacade.java 26 May 2004 15:36:14 - 1.10 @@ -422,9 +422,8 @@ /** * Use reflection to invoke the requested method. Cache the method object * to speed up the process - * @param appContext The AppliationContext object on which the method - * will be invoked - * @param methodName The method to call. + * @param methodName The method to invoke. + * @param clazz The class where the method is. * @param params The arguments passed to the called method. */ private Object doPrivileged(final String methodName, - 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 ApplicationFilterChain.java
yoavs 2004/05/26 08:36:20
Modified:catalina/src/share/org/apache/catalina/core
ApplicationFilterChain.java
Log:
Minor JavaDoc fixes (Bugzilla 11212)
Revision ChangesPath
1.10 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java
Index: ApplicationFilterChain.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApplicationFilterChain.java 27 Feb 2004 14:58:42 - 1.9
+++ ApplicationFilterChain.java 26 May 2004 15:36:20 - 1.10
@@ -302,7 +302,7 @@
/**
* Set the servlet that will be executed at the end of this chain.
*
- * @param wrapper The Wrapper for the servlet to be executed
+ * @param servlet The Wrapper for the servlet to be executed
*/
void setServlet(Servlet servlet) {
-
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 StandardContext.java
yoavs 2004/05/26 08:36:28
Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
Minor JavaDoc fixes (Bugzilla 11212)
Revision ChangesPath
1.129 +12 -13
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- StandardContext.java 25 Apr 2004 10:28:29 - 1.128
+++ StandardContext.java 26 May 2004 15:36:28 - 1.129
@@ -981,7 +981,7 @@
*
* XXX If a file is not found - we can attempt a getResource()
*
- * @param defaultWebXml
+ * @param defaultWebXml The default web xml
*/
public void setDefaultWebXml(String defaultWebXml) {
this.defaultWebXml = defaultWebXml;
@@ -1508,7 +1508,7 @@
* and system.err will be redirected to the logger during a servlet
* execution.
*
- * @param swallowOuptut The new value
+ * @param swallowOutput The new value
*/
public void setSwallowOutput(boolean swallowOutput) {
@@ -1634,7 +1634,7 @@
/** Get the absolute path to the work dir.
* To avoid duplication.
*
- * @return
+ * @return The work path
*/
public String getWorkPath() {
File workDir = new File(getWorkDir());
@@ -5362,12 +5362,11 @@
* 1.The context is created and registered by internal APIS
* 2. The context is created by JMX, and it'll self-register.
*
- * @param server
- * @param name
- * @return
- * @throws Exception
+ * @param server The server
+ * @param name The object name
+ * @return ObjectName The name of the object
+ * @throws Exception If an error occurs
*/
-
public ObjectName preRegister(MBeanServer server,
ObjectName name)
throws Exception
@@ -5502,7 +5501,7 @@
/**
* Set the validation feature of the XML parser used when
* parsing xml instances.
- * @param xmlValidation true to enable xml instance validation
+ * @param webXmlValidation true to enable xml instance validation
*/
public void setXmlValidation(boolean webXmlValidation){
@@ -5532,7 +5531,7 @@
/**
* Set the namespace aware feature of the XML parser used when
* parsing xml instances.
- * @param xmlNamespaceAware true to enable namespace awareness
+ * @param webXmlNamespaceAware true to enable namespace awareness
*/
public void setXmlNamespaceAware(boolean webXmlNamespaceAware){
this.webXmlNamespaceAware= webXmlNamespaceAware;
@@ -5542,7 +5541,7 @@
/**
* Set the validation feature of the XML parser used when
* parsing tlds files.
- * @param tldXmlValidation true to enable xml instance validation
+ * @param tldValidation true to enable xml instance validation
*/
public void setTldValidation(boolean tldValidation){
@@ -5572,7 +5571,7 @@
/**
* Set the namespace aware feature of the XML parser used when
* parsing xml instances.
- * @param xmlNamespaceAware true to enable namespace awareness
+ * @param tldNamespaceAware true to enable namespace awareness
*/
public void setTldNamespaceAware(boolean tldNamespaceAware){
this.tldNamespaceAware= tldNamespaceAware;
-
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 StandardDefaultContext.java
yoavs 2004/05/26 08:36:35
Modified:catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java
Log:
Minor JavaDoc fixes (Bugzilla 11212)
Revision ChangesPath
1.15 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StandardDefaultContext.java 15 Apr 2004 01:44:09 - 1.14
+++ StandardDefaultContext.java 26 May 2004 15:36:35 - 1.15
@@ -541,7 +541,7 @@
* Get the resources DirContext object with which this Container is
* associated.
*
- * @param resources The new associated DirContext
+ * @return The associated DirContext
*/
public DirContext getResources() {
@@ -821,7 +821,7 @@
/**
* Add a resource link for this web application.
*
- * @param resource New resource link
+ * @param resourceLink New resource link
*/
public void addResourceLink(ContextResourceLink resourceLink) {
@@ -1244,7 +1244,7 @@
/**
* Remove any environment entry with the specified name.
*
- * @param name Name of the environment entry to remove
+ * @param envName Name of the environment entry to remove
*/
public void removeEnvironment(String envName) {
@@ -1286,7 +1286,7 @@
/**
* Remove any resource link with the specified name.
*
- * @param resourceName Name of the resource reference to remove
+ * @param resourceLinkName Name of the resource reference to remove
*/
public void removeResourceLink(String resourceLinkName) {
-
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 StandardHost.java
yoavs 2004/05/26 08:41:07
Modified:catalina/src/share/org/apache/catalina/core
StandardHost.java
Log:
Minor JavaDoc fixes (Bugzilla 11212)
Revision ChangesPath
1.31 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- StandardHost.java 12 Apr 2004 22:05:15 - 1.30
+++ StandardHost.java 26 May 2004 15:41:07 - 1.31
@@ -328,7 +328,7 @@
/**
* Set the deploy on startup flag value for this host.
*
- * @param autoDeploy The new deploy on startup flag
+ * @param deployOnStartup The new deploy on startup flag
*/
public void setDeployOnStartup(boolean deployOnStartup) {
-
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 StandardHostValve.java
yoavs 2004/05/26 08:41:14 Modified:catalina/src/share/org/apache/catalina/core StandardHostValve.java Log: Minor JavaDoc fixes (Bugzilla 11212) Revision ChangesPath 1.19 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java Index: StandardHostValve.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- StandardHostValve.java13 Apr 2004 00:28:07 - 1.18 +++ StandardHostValve.java26 May 2004 15:41:14 - 1.19 @@ -165,7 +165,7 @@ * * @param request The request being processed * @param response The response being generated - * @param exception The exception that occurred (which possibly wraps + * @param throwable The exception that occurred (which possibly wraps * a root cause exception */ protected void throwable(Request request, Response response, - 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 StandardServer.java
yoavs 2004/05/26 08:41:22
Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java
Log:
Minor JavaDoc fixes (Bugzilla 11212)
Revision ChangesPath
1.28 +9 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- StandardServer.java 4 Mar 2004 21:47:42 - 1.27
+++ StandardServer.java 26 May 2004 15:41:22 - 1.28
@@ -363,7 +363,7 @@
/**
* Set the global naming resources.
*
- * @param namingResources The new global naming resources
+ * @param globalNamingResources The new global naming resources
*/
public void setGlobalNamingResources
(NamingResources globalNamingResources) {
@@ -691,11 +691,11 @@
* Write the configuration information for this entire codeServer/code
* out to the server.xml configuration file.
*
- * @exception InstanceNotFoundException if the managed resource object
+ * @exception javax.management.InstanceNotFoundException if the managed
resource object
* cannot be found
- * @exception MBeanException if the initializer of the object throws
+ * @exception javax.management.MBeanException if the initializer of the object
throws
* an exception, or persistence is not supported
- * @exception RuntimeOperationsException if an exception is reported
+ * @exception javax.management.RuntimeOperationsException if an exception is
reported
* by the persistence mechanism
*/
public synchronized void storeConfig() throws Exception {
@@ -794,11 +794,11 @@
* Write the configuration information for codeContext/code
* out to the specified configuration file.
*
- * @exception InstanceNotFoundException if the managed resource object
+ * @exception javax.management.InstanceNotFoundException if the managed
resource object
* cannot be found
- * @exception MBeanException if the initializer of the object throws
+ * @exception javax.management.MBeanException if the initializer of the object
throws
* an exception, or persistence is not supported
- * @exception RuntimeOperationsException if an exception is reported
+ * @exception javax.management.RuntimeOperationsException if an exception is
reported
* by the persistence mechanism
*/
public synchronized void storeContext(Context context) throws Exception {
@@ -2076,7 +2076,7 @@
*
* @param writer PrintWriter to which we are storing
* @param indent Number of spaces to indent this element
- * @param server Object to be stored
+ * @param service Object to be stored
*
* @exception Exception if an exception occurs while storing
*/
-
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 StandardWrapper.java
yoavs 2004/05/26 08:41:29
Modified:catalina/src/share/org/apache/catalina/core
StandardWrapper.java
Log:
Minor JavaDoc fixes (Bugzilla 11212)
Revision ChangesPath
1.42 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
Index: StandardWrapper.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- StandardWrapper.java 7 Apr 2004 02:31:08 - 1.41
+++ StandardWrapper.java 26 May 2004 15:41:29 - 1.42
@@ -624,7 +624,7 @@
/**
* Add a mapping associated with the Wrapper.
*
- * @param pattern The new wrapper mapping
+ * @param mapping The new wrapper mapping
*/
public void addMapping(String mapping) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
yoavs 2004/05/26 08:45:00 Modified:webapps/docs changelog.xml Log: Added section for Tomcat 5.0.26, and some items in it. Revision ChangesPath 1.47 +41 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- changelog.xml 18 May 2004 17:50:46 - 1.46 +++ changelog.xml 26 May 2004 15:45:00 - 1.47 @@ -14,6 +14,47 @@ body +section name=Tomcat 5.0.26 (yoavs) + + subsection name=General +changelog + fix +bug28335/bug: Fixed JavaDocs. + /fix + update +Changed build dependency on JUnit from 3.7 to 3.8.1. + /update +/changelog + /subsection + + subsection name=Catalina +changelog +/changelog + /subsection + + subsection name=Coyote +changelog +/changelog + /subsection + + subsection name=Jasper +changelog +/changelog + /subsection + + subsection name=Cluster +changelog +/changelog + /subsection + + subsection name=Webapps +changelog +/changelog + /subsection + +/section + + section name=Tomcat 5.0.25 (yoavs) subsection name=General - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy NamingResources.java
yoavs 2004/05/26 08:46:22
Modified:catalina/src/share/org/apache/catalina/deploy
NamingResources.java
Log:
Minor JavaDoc fixes (Bugzilla 28335)
Revision ChangesPath
1.6 +2 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/NamingResources.java
Index: NamingResources.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/NamingResources.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NamingResources.java 13 May 2004 20:40:49 - 1.5
+++ NamingResources.java 26 May 2004 15:46:22 - 1.6
@@ -306,7 +306,7 @@
/**
* Add a resource link for this web application.
*
- * @param resource New resource link
+ * @param resourceLink New resource link
*/
public void addResourceLink(ContextResourceLink resourceLink) {
@@ -540,8 +540,6 @@
/**
* Return the resource parameters with the specified name, if any;
* otherwise return codenull/code.
- *
- * @param name Name of the desired resource parameters
*/
public ResourceParams findResourceParams(String name) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader StandardClassLoader.java
yoavs 2004/05/26 08:47:34
Modified:catalina/src/share/org/apache/catalina/loader
StandardClassLoader.java
Log:
Minor JavaDoc fixes (Bugzilla 28335)
Revision ChangesPath
1.13 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
Index: StandardClassLoader.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StandardClassLoader.java 15 Apr 2004 22:13:32 - 1.12
+++ StandardClassLoader.java 26 May 2004 15:47:34 - 1.13
@@ -862,7 +862,7 @@
* add read FilePermissions for the base directory (if unpacked),
* the context URL, and jar file resources.
*
- * @param CodeSource where the code was loaded from
+ * @param codeSource where the code was loaded from
* @return PermissionCollection for CodeSource
*/
protected final PermissionCollection getPermissions(CodeSource codeSource) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader WebappClassLoader.java
yoavs 2004/05/26 08:47:41
Modified:catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java
Log:
Minor JavaDoc fixes (Bugzilla 28335)
Revision ChangesPath
1.34 +3 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Index: WebappClassLoader.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- WebappClassLoader.java15 Apr 2004 01:44:09 - 1.33
+++ WebappClassLoader.java26 May 2004 15:47:40 - 1.34
@@ -1348,7 +1348,7 @@
* directory (if unpacked),
* the context URL, and jar file resources.
*
- * @param CodeSource where the code was loaded from
+ * @param codeSource where the code was loaded from
* @return PermissionCollection for CodeSource
*/
protected PermissionCollection getPermissions(CodeSource codeSource) {
@@ -2042,7 +2042,7 @@
* Check the specified JAR file, and return codetrue/code if it does
* not contain any of the trigger classes.
*
- * @param jarFile The JAR file to be checked
+ * @param jarfile The JAR file to be checked
*
* @exception IOException if an input/output error occurs
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger LoggerBase.java
yoavs 2004/05/26 08:48:29
Modified:catalina/src/share/org/apache/catalina/logger
LoggerBase.java
Log:
Minor JavaDoc fixes (Bugzilla 28335)
Revision ChangesPath
1.9 +3 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/LoggerBase.java
Index: LoggerBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/LoggerBase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LoggerBase.java 27 Feb 2004 14:58:44 - 1.8
+++ LoggerBase.java 26 May 2004 15:48:29 - 1.9
@@ -185,7 +185,7 @@
* Set the verbosity level of this logger. Messages logged with a
* higher verbosity than this level will be silently ignored.
*
- * @param verbosityLevel The new verbosity level, as a string
+ * @param verbosity The new verbosity level, as a string
*/
public void setVerbosityLevel(String verbosity) {
@@ -223,7 +223,7 @@
* log. The name and type of the servlet log is specific to the
* servlet container. This message will be logged unconditionally.
*
- * @param message A codeString/code specifying the message to be
+ * @param msg A codeString/code specifying the message to be
* written to the log file
*/
public void log(String msg) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm JDBCRealm.java
yoavs 2004/05/26 08:51:08
Modified:catalina/src/share/org/apache/catalina/realm JDBCRealm.java
Log:
Minor JavaDoc fixes (Bugzilla 28335)
Revision ChangesPath
1.7 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java
Index: JDBCRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JDBCRealm.java27 Feb 2004 14:58:45 - 1.6
+++ JDBCRealm.java26 May 2004 15:51:08 - 1.7
@@ -606,7 +606,7 @@
/**
* Release our use of this connection so that it can be recycled.
*
- * @param dbConnnection The connection to be released
+ * @param dbConnection The connection to be released
*/
protected void release(Connection dbConnection) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm JNDIRealm.java
yoavs 2004/05/26 08:51:14
Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java
Log:
Minor JavaDoc fixes (Bugzilla 28335)
Revision ChangesPath
1.12 +3 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JNDIRealm.java27 Feb 2004 14:58:45 - 1.11
+++ JNDIRealm.java26 May 2004 15:51:14 - 1.12
@@ -1143,7 +1143,7 @@
* retrieved from the directory.
*
* @param context The directory context
- * @param user The User to be authenticated
+ * @param info The User to be authenticated
* @param credentials Authentication credentials
*
* @exception NamingException if a directory server error occurs
@@ -1640,7 +1640,7 @@
* \ - \5c
* \0 - \00
* @param inString string to escape according to RFC 2254 guidelines
- * @return
+ * @return String the escaped/encoded result
*/
protected String doRFC2254Encoding(String inString) {
StringBuffer buf = new StringBuffer(inString.length());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
