cvs commit: jakarta-tomcat-4.0 WARNING.txt
markt 2005/09/12 15:42:00 Added: .WARNING.txt Log: As notice re CVS closure Revision ChangesPath 1.1 jakarta-tomcat-4.0/WARNING.txt Index: WARNING.txt === *** WARNING.txt *** As of 12th September 2005, the jakarta-tomcat-4 CVS repository is closed. The repository has been migrated to Subversion (http://svn.apache.org/repos/asf/tomcat). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [EMAIL PROTECTED]: Project jakarta-tomcat-4.0 (in module jakarta-tomcat-4.0) failed
NOW IAM VERY NAUGHTY RANPACEefan Bodewig [EMAIL PROTECTED] wrote:To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-4.0 has an issue affecting its community integration. This issue affects 4 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - cargo : Cargo provides a Java API to manipulate Java Containers - jakarta-cactus-sample-jetty-13 : Cactus Jetty Sample (J2EE 1.3) - jakarta-cactus-sample-servlet-13 : Cactus Servlet Sample (J2EE 1.3) - jakarta-tomcat-4.0 : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Output [naming-resources.jar] identifier set to output basename: [naming-resources] -DEBUG- Output [servlets-default.jar] identifier set to output basename: [servlets-default] -DEBUG- Output [naming-common.jar] identifier set to output basename: [naming-common] -DEBUG- Output [catalina.jar] identifier set to output basename: [catalina] -DEBUG- Output [bootstrap.jar] identifier set to output basename: [bootstrap] -DEBUG- Output [servlets-common.jar] identifier set to output basename: [servlets-common] -DEBUG- Output [servlets-invoker.jar] identifier set to output basename: [servlets-invoker] -DEBUG- Dependency on javamail exists, no need to add for property mail.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.jar. -DEBUG- Dependency on jmx exists, no need to add for property jmx.jar. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xerces.jar. -DEBUG- Dependency on jakarta-tomcat-util exists, no need to add for property tomcat-util.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on ant exists, no need to add for property ant.home. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.home. -DEBUG- Dependency on jsse exists, no need to add for property jsse.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.home. -DEBUG- Dependency on jmx exists, no need to add for property jmxtools.jar. -DEBUG- Dependency on jndi exists, no need to add for property jndi.home. -DEBUG- Dependency on javamail exists, no need to add for property mail.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.home. -INFO- Failed with reason build failed -INFO- Failed to extract fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/gump_work/build_jakarta-tomcat-4.0_jakarta-tomcat-4.0.html Work Name: build_jakarta-tomcat-4.0_jakarta-tomcat-4.0 (Type: Build) Work ended in a state of : Failed Elapsed: 16 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/serializer.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar org.apache.tools.ant.Main -Dgump.merge=/x1/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djaas.jar=/usr/local/gump/packages/jaas1_0/lib/jaas.jar -Djmx.jar=/usr/local/gump/packages/jmx-1_2_1-bin/lib/jmxri.jar -Djmx.home=/usr/local/gump/packages/jmx-1_2_1-bin -Djdbc20ext.jar=/usr/local/gump/packages/jdbc2_0/jdbc2_0-stdext.jar -Dregexp.jar=/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-30072005.jar -Dmail.home=/usr/local/gump/packages/javamail-1.3.2 -Dant.home=/usr/local/gump/public/workspace/ant/dist -Dservlet.jar=/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar -Dxerces.jar=/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar -Dcommons-collections.jar=/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-30072005.jar -Dldap.jar=/usr/local/gump/packages/ldap-1_2_4/lib/ldap.jar -Djsse.home=/usr/local/gump/packages/jsse1.0.3 -Dtomcat-coyote.jar=/usr/local/gump/public/workspace/jakarta-tomcat-connectors/coyote/build/lib/tomcat-coyote.jar -Dmail.jar=/usr/local/gump/packages/javamail-1.3.2/mail.jar -Dcommons-digester.jar=/usr/local/gump/public
[EMAIL PROTECTED]: Project jakarta-tomcat-4.0 (in module jakarta-tomcat-4.0) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-4.0 has an issue affecting its community integration. This issue affects 4 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - cargo : Cargo provides a Java API to manipulate Java Containers - jakarta-cactus-sample-jetty-13 : Cactus Jetty Sample (J2EE 1.3) - jakarta-cactus-sample-servlet-13 : Cactus Servlet Sample (J2EE 1.3) - jakarta-tomcat-4.0 : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Output [naming-resources.jar] identifier set to output basename: [naming-resources] -DEBUG- Output [servlets-default.jar] identifier set to output basename: [servlets-default] -DEBUG- Output [naming-common.jar] identifier set to output basename: [naming-common] -DEBUG- Output [catalina.jar] identifier set to output basename: [catalina] -DEBUG- Output [bootstrap.jar] identifier set to output basename: [bootstrap] -DEBUG- Output [servlets-common.jar] identifier set to output basename: [servlets-common] -DEBUG- Output [servlets-invoker.jar] identifier set to output basename: [servlets-invoker] -DEBUG- Dependency on javamail exists, no need to add for property mail.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.jar. -DEBUG- Dependency on jmx exists, no need to add for property jmx.jar. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xerces.jar. -DEBUG- Dependency on jakarta-tomcat-util exists, no need to add for property tomcat-util.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on ant exists, no need to add for property ant.home. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.home. -DEBUG- Dependency on jsse exists, no need to add for property jsse.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.home. -DEBUG- Dependency on jmx exists, no need to add for property jmxtools.jar. -DEBUG- Dependency on jndi exists, no need to add for property jndi.home. -DEBUG- Dependency on javamail exists, no need to add for property mail.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.home. -INFO- Failed with reason build failed -INFO- Failed to extract fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/gump_work/build_jakarta-tomcat-4.0_jakarta-tomcat-4.0.html Work Name: build_jakarta-tomcat-4.0_jakarta-tomcat-4.0 (Type: Build) Work ended in a state of : Failed Elapsed: 16 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/serializer.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar org.apache.tools.ant.Main -Dgump.merge=/x1/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djaas.jar=/usr/local/gump/packages/jaas1_0/lib/jaas.jar -Djmx.jar=/usr/local/gump/packages/jmx-1_2_1-bin/lib/jmxri.jar -Djmx.home=/usr/local/gump/packages/jmx-1_2_1-bin -Djdbc20ext.jar=/usr/local/gump/packages/jdbc2_0/jdbc2_0-stdext.jar -Dregexp.jar=/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-30072005.jar -Dmail.home=/usr/local/gump/packages/javamail-1.3.2 -Dant.home=/usr/local/gump/public/workspace/ant/dist -Dservlet.jar=/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar -Dxerces.jar=/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar -Dcommons-collections.jar=/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-30072005.jar -Dldap.jar=/usr/local/gump/packages/ldap-1_2_4/lib/ldap.jar -Djsse.home=/usr/local/gump/packages/jsse1.0.3 -Dtomcat-coyote.jar=/usr/local/gump/public/workspace/jakarta-tomcat-connectors/coyote/build/lib/tomcat-coyote.jar -Dmail.jar=/usr/local/gump/packages/javamail-1.3.2/mail.jar -Dcommons-digester.jar=/usr/local/gump/public/workspace/jakarta
[EMAIL PROTECTED]: Project jakarta-tomcat-4.0 (in module jakarta-tomcat-4.0) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-4.0 has an issue affecting its community integration. This issue affects 4 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - cargo : Cargo provides a Java API to manipulate Java Containers - jakarta-cactus-sample-jetty-13 : Cactus Jetty Sample (J2EE 1.3) - jakarta-cactus-sample-servlet-13 : Cactus Servlet Sample (J2EE 1.3) - jakarta-tomcat-4.0 : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Output [naming-resources.jar] identifier set to output basename: [naming-resources] -DEBUG- Output [servlets-default.jar] identifier set to output basename: [servlets-default] -DEBUG- Output [naming-common.jar] identifier set to output basename: [naming-common] -DEBUG- Output [catalina.jar] identifier set to output basename: [catalina] -DEBUG- Output [bootstrap.jar] identifier set to output basename: [bootstrap] -DEBUG- Output [servlets-common.jar] identifier set to output basename: [servlets-common] -DEBUG- Output [servlets-invoker.jar] identifier set to output basename: [servlets-invoker] -DEBUG- Dependency on javamail exists, no need to add for property mail.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.jar. -DEBUG- Dependency on jmx exists, no need to add for property jmx.jar. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xerces.jar. -DEBUG- Dependency on jakarta-tomcat-util exists, no need to add for property tomcat-util.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on ant exists, no need to add for property ant.home. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.home. -DEBUG- Dependency on jsse exists, no need to add for property jsse.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.home. -DEBUG- Dependency on jmx exists, no need to add for property jmxtools.jar. -DEBUG- Dependency on jndi exists, no need to add for property jndi.home. -DEBUG- Dependency on javamail exists, no need to add for property mail.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.home. -INFO- Failed with reason build failed -INFO- Failed to extract fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/gump_work/build_jakarta-tomcat-4.0_jakarta-tomcat-4.0.html Work Name: build_jakarta-tomcat-4.0_jakarta-tomcat-4.0 (Type: Build) Work ended in a state of : Failed Elapsed: 16 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/serializer.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar org.apache.tools.ant.Main -Dgump.merge=/x1/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djaas.jar=/usr/local/gump/packages/jaas1_0/lib/jaas.jar -Djmx.jar=/usr/local/gump/packages/jmx-1_2_1-bin/lib/jmxri.jar -Djmx.home=/usr/local/gump/packages/jmx-1_2_1-bin -Djdbc20ext.jar=/usr/local/gump/packages/jdbc2_0/jdbc2_0-stdext.jar -Dregexp.jar=/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-30072005.jar -Dmail.home=/usr/local/gump/packages/javamail-1.3.2 -Dant.home=/usr/local/gump/public/workspace/ant/dist -Dservlet.jar=/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar -Dxerces.jar=/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar -Dcommons-collections.jar=/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-30072005.jar -Dldap.jar=/usr/local/gump/packages/ldap-1_2_4/lib/ldap.jar -Djsse.home=/usr/local/gump/packages/jsse1.0.3 -Dtomcat-coyote.jar=/usr/local/gump/public/workspace/jakarta-tomcat-connectors/coyote/build/lib/tomcat-coyote.jar -Dmail.jar=/usr/local/gump/packages/javamail-1.3.2/mail.jar -Dcommons-digester.jar=/usr/local/gump/public/workspace/jakarta
cvs commit: jakarta-tomcat-4.0/catalina build.xml
markt 2005/07/30 09:30:17
Modified:catalina build.xml
Log:
Get TC4 building with connectors HEAD
Revision ChangesPath
1.138 +37 -2 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- build.xml 8 Feb 2005 23:06:30 - 1.137
+++ build.xml 30 Jul 2005 16:30:17 - 1.138
@@ -23,6 +23,7 @@
property name=tomcat-util.home value=${jtc.home}/util/
property name=tomcat-coyote.home value=${jtc.home}/coyote/
property name=tomcat-jk.home value=${jtc.home}/jk/
+ property name=tomcat-jni.homevalue=${jtc.home}/jni/
property name=tomcat-webapp.home value=${jtc.home}/webapp/
property name=tomcat-http11.home value=${jtc.home}/http11/
@@ -42,6 +43,8 @@
value=${tomcat-jk.home}/build/lib/tomcat-jni.jar/
property name=jk2.properties
value=${tomcat-jk.home}/build/conf/jk2.properties/
+ property name=tomcat-apr.jar
+ value=${tomcat-jni.home}/dist/tomcat-native-1.0.0.jar/
property name=tomcat-warp.jar
value=${tomcat-webapp.home}/build/tomcat-warp.jar/
property name=tomcat-http11.jar
@@ -791,13 +794,26 @@
/target
+ !-- === BUILD: Build tomcat-apr
--
+ target name=build-tomcat-apr
+
+ant dir=${tomcat-jni.home} target=jar inheritAll=false
+ property name=version value=1.0.0 /
+/ant
+
+ /target
+
+
!-- === BUILD: Build tomcat-util ===
--
- target name=build-tomcat-util
+ target name=build-tomcat-util depends=build-tomcat-apr
-ant dir=${tomcat-util.home} target=build-main
+ant dir=${tomcat-util.home} target=build-main inheritAll=false
property name=jmx.jar value=${jmx.jar} /
property name=puretls.jar value=${puretls.jar} /
property name=jsse.lib value=${jsse.lib} /
+ property name=commons-logging.jar value=${commons-logging.jar} /
+ property name=commons-modeler.jar value=${commons-modeler.jar} /
+ property name=skip.digester value=true /
/ant
copy todir=${catalina.build}/server/lib
@@ -886,6 +902,7 @@
property name=commons-logging.jar value=${commons-logging.jar}/
property name=jmx.jar value=${jmx.jar}/
property name=servlet-api.jar value=${servlet.jar}/
+ property name=tomcat-apr.jar value=${tomcat-apr.jar}/
/ant
copy todir=${catalina.deploy}/server/lib
@@ -917,8 +934,25 @@
!-- == BUILD: Build tomcat-coyote-http11 ===
--
target name=build-tomcat-http11
+!-- Replace 1.4 regexp with jakarta-regexp --
+replace
file=${tomcat-http11.home}/src/java/org/apache/coyote/http11/Http11Processor.java
+ replacefilter
+ token=java.util.regex.Pattern
+ value=org.apache.regexp.RE /
+ replacefilter
+ token=Pattern.compile
+ value=new RE /
+ replacefilter
+ token=Pattern
+ value=RE /
+ replacefilter
+ token=matcher(userAgentValue).matches()
+ value=match(userAgentValue) /
+/replace
+
ant dir=${tomcat-http11.home} target=compile
property name=commons-logging.jar value=${commons-logging.jar}/
+ property name=tomcat-jni.jar value=${tomcat-apr.jar}/
/ant
copy todir=${catalina.deploy}/server/lib
@@ -957,6 +991,7 @@
ant dir=${tomcat-util.home} target=clean/
ant dir=${tomcat-coyote.home} target=clean/
ant dir=${tomcat-jk.home} target=clean/
+ant dir=${tomcat-jni.home} target=clean/
ant dir=${tomcat-webapp.home} target=clean/
ant dir=${tomcat-http11.home} target=clean/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources BaseDirContext.java ProxyDirContext.java
markt 2005/07/20 14:03:18
Modified:catalina/src/share/org/apache/naming NamingContext.java
SelectorContext.java
catalina/src/share/org/apache/naming/resources
BaseDirContext.java ProxyDirContext.java
Log:
Tabs to 8 spaces.
Revision ChangesPath
1.10 +11 -11
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java
Index: NamingContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NamingContext.java26 Aug 2004 21:46:17 - 1.9
+++ NamingContext.java20 Jul 2005 21:03:18 - 1.10
@@ -236,8 +236,8 @@
throws NamingException {
checkWritable();
- while ((!name.isEmpty()) (name.get(0).length() == 0))
- name = name.getSuffix(1);
+while ((!name.isEmpty()) (name.get(0).length() == 0))
+name = name.getSuffix(1);
if (name.isEmpty())
throw new NamingException
(sm.getString(namingContext.invalidName));
@@ -445,8 +445,8 @@
checkWritable();
- while ((!name.isEmpty()) (name.get(0).length() == 0))
- name = name.getSuffix(1);
+while ((!name.isEmpty()) (name.get(0).length() == 0))
+name = name.getSuffix(1);
if (name.isEmpty())
throw new NamingException
(sm.getString(namingContext.invalidName));
@@ -581,8 +581,8 @@
public NameParser getNameParser(Name name)
throws NamingException {
- while ((!name.isEmpty()) (name.get(0).length() == 0))
- name = name.getSuffix(1);
+while ((!name.isEmpty()) (name.get(0).length() == 0))
+name = name.getSuffix(1);
if (name.isEmpty())
return nameParser;
@@ -632,8 +632,8 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
- return prefix.addAll(name);
+prefix = (Name) name.clone();
+return prefix.addAll(name);
}
@@ -822,8 +822,8 @@
checkWritable();
- while ((!name.isEmpty()) (name.get(0).length() == 0))
- name = name.getSuffix(1);
+while ((!name.isEmpty()) (name.get(0).length() == 0))
+name = name.getSuffix(1);
if (name.isEmpty())
throw new NamingException
(sm.getString(namingContext.invalidName));
1.4 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/SelectorContext.java
Index: SelectorContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/SelectorContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SelectorContext.java 26 Aug 2004 21:46:17 - 1.3
+++ SelectorContext.java 20 Jul 2005 21:03:18 - 1.4
@@ -504,8 +504,8 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
- return prefix.addAll(name);
+prefix = (Name) name.clone();
+return prefix.addAll(name);
}
@@ -651,7 +651,7 @@
protected String parseName(String name)
throws NamingException {
- if ((!initialContext) (name.startsWith(prefix))) {
+if ((!initialContext) (name.startsWith(prefix))) {
return (name.substring(prefixLength));
} else {
if (initialContext) {
@@ -675,7 +675,7 @@
protected Name parseName(Name name)
throws NamingException {
- if ((!initialContext) (!name.isEmpty())
+if ((!initialContext) (!name.isEmpty())
(name.get(0).equals(prefix))) {
return (name.getSuffix(1));
} else {
1.7 +12 -12
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java
Index: BaseDirContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseDirContext.java 4 Feb 2005 22:08:03 - 1.6
+++ BaseDirContext.java 20 Jul 2005 21:03:18 - 1.7
@@ -120,7 +120,7 @@
* Return the debugging detail level for this component.
*/
public int getDebug() {
- return (this.debug
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources BaseDirContext.java ProxyDirContext.java
markt 2005/07/20 14:09:51
Modified:catalina/src/share/org/apache/naming NamingContext.java
SelectorContext.java
catalina/src/share/org/apache/naming/resources
BaseDirContext.java ProxyDirContext.java
Log:
Fix bug 35769. composeName(Name, Name) returns wrong result.
- Patch provided by Laurent Simon
Revision ChangesPath
1.11 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java
Index: NamingContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NamingContext.java20 Jul 2005 21:03:18 - 1.10
+++ NamingContext.java20 Jul 2005 21:09:50 - 1.11
@@ -632,7 +632,7 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
-prefix = (Name) name.clone();
+prefix = (Name) prefix.clone();
return prefix.addAll(name);
}
1.5 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/SelectorContext.java
Index: SelectorContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/SelectorContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SelectorContext.java 20 Jul 2005 21:03:18 - 1.4
+++ SelectorContext.java 20 Jul 2005 21:09:50 - 1.5
@@ -504,7 +504,7 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
-prefix = (Name) name.clone();
+prefix = (Name) prefix.clone();
return prefix.addAll(name);
}
1.8 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java
Index: BaseDirContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseDirContext.java 20 Jul 2005 21:03:18 - 1.7
+++ BaseDirContext.java 20 Jul 2005 21:09:50 - 1.8
@@ -617,7 +617,7 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
-prefix = (Name) name.clone();
+prefix = (Name) prefix.clone();
return prefix.addAll(name);
}
1.19 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
Index: ProxyDirContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ProxyDirContext.java 20 Jul 2005 21:03:18 - 1.18
+++ ProxyDirContext.java 20 Jul 2005 21:09:50 - 1.19
@@ -651,7 +651,7 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
-prefix = (Name) name.clone();
+prefix = (Name) prefix.clone();
return prefix.addAll(name);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm JAASMemoryLoginModule.java JAASRealm.java LocalStrings.properties MemoryRealm.java
markt 2005/07/07 15:42:03
Modified:catalina/src/share/org/apache/catalina/realm
JAASMemoryLoginModule.java JAASRealm.java
LocalStrings.properties MemoryRealm.java
Log:
Fix bug 16274. Essentially a port from TC%, mainly of Costin's work.
The JAAS realm is still experimental but it can now be used to authenticate
against
tomcat-users.xml.
Revision ChangesPath
1.3 +12 -194
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java
Index: JAASMemoryLoginModule.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JAASMemoryLoginModule.java26 Aug 2004 21:37:21 - 1.2
+++ JAASMemoryLoginModule.java7 Jul 2005 22:42:03 - 1.3
@@ -18,14 +18,11 @@
package org.apache.catalina.realm;
-import java.beans.PropertyChangeListener;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.security.Principal;
-import java.security.cert.X509Certificate;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -35,8 +32,6 @@
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import org.apache.catalina.Container;
-import org.apache.catalina.Realm;
import org.apache.commons.digester.Digester;
@@ -69,7 +64,13 @@
* @version $Revision$ $Date$
*/
-public class JAASMemoryLoginModule implements LoginModule, Realm {
+public class JAASMemoryLoginModule extends MemoryRealm implements
LoginModule {
+
+/**
+ * Descriptive information about this Realm implementation.
+ */
+protected final String info =
+org.apache.catalina.realm.JAASMemoryLoginModule/1.0;
// - Instance
Variables
@@ -135,35 +136,6 @@
/**
- * Add a new user to the in-memory database.
- *
- * @param username User's username
- * @param password User's password (clear text)
- * @param roles Comma-delimited set of roles associated with this user
- */
-void addUser(String username, String password, String roles) {
-
-// Accumulate the list of roles for this user
-ArrayList list = new ArrayList();
-roles += ,;
-while (true) {
-int comma = roles.indexOf(',');
-if (comma 0)
-break;
-String role = roles.substring(0, comma).trim();
-list.add(role);
-roles = roles.substring(comma + 1);
-}
-
-// Construct and cache the Principal for this user
-GenericPrincipal principal =
-new GenericPrincipal(this, username, password, list);
-principals.put(username, principal);
-
-}
-
-
-/**
* Phase 2 of authenticating a codeSubject/code when Phase 1
* fails. This method is called if the codeLoginContext/code
* failed somewhere in the overall authentication chain.
@@ -283,7 +255,7 @@
}
// Validate the username and password we have received
-principal = null; // FIXME - look up and check password
+principal = super.authenticate(username, password);
// Report results based on success or failure
if (principal != null) {
@@ -316,29 +288,6 @@
// -- Realm
Methods
-
-/**
- * Return the Container with which this Realm has been associated.
- */
-public Container getContainer() {
-
-return (null);
-
-}
-
-
-/**
- * Set the Container with which this Realm has been associated.
- *
- * @param container The associated Container
- */
-public void setContainer(Container container) {
-
-;
-
-}
-
-
/**
* Return descriptive information about this Realm implementation and
* the corresponding version number, in the format
@@ -346,113 +295,7 @@
*/
public String getInfo() {
-return (null);
-
-}
-
-
-/**
- * Add a property change listener to this component.
- *
- * @param listener The listener to add
- */
-public void addPropertyChangeListener(PropertyChangeListener listener) {
-
-;
-
-}
-
-
-/**
- * Return the Principal associated
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves RequestFilterValve.java
markt 2005/07/04 13:41:03
Modified:catalina/src/share/org/apache/catalina/valves
RequestFilterValve.java
Log:
Fix bug 25835. Use a local RE object configured via shared REProgram objects
to prevent
synchronisation problems with RE objects as they are not thread safe. There
is a
very slight performance hit when not under load and an equally slight
improvement
when under load.
Revision ChangesPath
1.8 +27 -17
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/RequestFilterValve.java
Index: RequestFilterValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/RequestFilterValve.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RequestFilterValve.java 27 Mar 2005 20:18:01 - 1.7
+++ RequestFilterValve.java 4 Jul 2005 20:41:03 - 1.8
@@ -23,7 +23,9 @@
import javax.servlet.ServletException;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.regexp.RE;
+import org.apache.regexp.REProgram;
import org.apache.regexp.RESyntaxException;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
@@ -79,15 +81,17 @@
/**
- * The set of codeallow/code regular expressions we will evaluate.
+ * The set of codeallow/code pre-compiled regular expressions we will
+ * evaluate.
*/
-protected RE allows[] = new RE[0];
+protected REProgram allows[] = new REProgram[0];
/**
- * The set of codedeny/code regular expressions we will evaluate.
+ * The set of codedeny/code pre-compiled regular expressions we will
+ * evaluate.
*/
-protected RE denies[] = new RE[0];
+protected REProgram denies[] = new REProgram[0];
/**
@@ -199,32 +203,32 @@
/**
- * Return an array of regular expression objects initialized from the
- * specified argument, which must be codenull/code or a
comma-delimited
- * list of regular expression patterns.
+ * Return an array of pre-compiled regular expression objects initialized
+ * from the specified argument, which must be codenull/code or a
+ * comma-delimited list of regular expression patterns.
*
* @param list The comma-separated list of patterns
*
* @exception IllegalArgumentException if one of the patterns has
* invalid syntax
*/
-protected RE[] precalculate(String list) {
+protected REProgram[] precalculate(String list) {
if (list == null)
-return (new RE[0]);
+return (new REProgram[0]);
list = list.trim();
if (list.length() 1)
-return (new RE[0]);
+return (new REProgram[0]);
list += ,;
-ArrayList reList = new ArrayList();
+ArrayList reProgramList = new ArrayList();
while (list.length() 0) {
int comma = list.indexOf(',');
if (comma 0)
break;
String pattern = list.substring(0, comma).trim();
try {
-reList.add(new RE(pattern));
+reProgramList.add(new RE(pattern).getProgram());
} catch (RESyntaxException e) {
throw new IllegalArgumentException
(sm.getString(requestFilterValve.syntax, pattern));
@@ -232,8 +236,8 @@
list = list.substring(comma + 1);
}
-RE reArray[] = new RE[reList.size()];
-return ((RE[]) reList.toArray(reArray));
+REProgram reProgramArray[] = new REProgram[reProgramList.size()];
+return ((REProgram[]) reProgramList.toArray(reProgramArray));
}
@@ -268,9 +272,14 @@
return;
}
+
+// Create local RE since RE is not thread safe
+RE re = new RE();
+
// Check the deny patterns, if any
for (int i = 0; i denies.length; i++) {
-if (denies[i].match(property)) {
+re.setProgram(denies[i]);
+if (re.match(property)) {
ServletResponse sres = response.getResponse();
if (sres instanceof HttpServletResponse) {
HttpServletResponse hres = (HttpServletResponse) sres;
@@ -282,7 +291,8 @@
// Check the allow patterns, if any
for (int i = 0; i allows.length; i++) {
-if (allows[i].match(property)) {
+re.setProgram(allows[i]);
+if (re.match(property)) {
context.invokeNext(request, response);
return
Re: cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config coyotejk.xml
Thank-you for your e-mail. Please note that i will be away from the office starting Wednesday June 29th, returning Thursday July 7th, with no access to email. In my absence, kindly contact Cheri Dueck at [EMAIL PROTECTED] Kind Regards, Natasha Hasmani Senior Event Manager - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config coyotejk.xml
markt 2005/07/01 13:38:50 Modified:webapps/tomcat-docs/config coyotejk.xml Log: Use JK rather than JK2 to be consistent. Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-4.0/webapps/tomcat-docs/config/coyotejk.xml Index: coyotejk.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/coyotejk.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- coyotejk.xml 26 May 2005 21:12:20 - 1.1 +++ coyotejk.xml 1 Jul 2005 20:38:50 - 1.2 @@ -149,7 +149,7 @@ attribute name=protocolHandlerClassName required=false pThis attribute value must be - codeorg.apache.jk.server.JkCoyoteHandler/code to use the JK 2 + codeorg.apache.jk.server.JkCoyoteHandler/code to use the JK handler./p /attribute - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[EMAIL PROTECTED]: Project jakarta-tomcat-4.0 (in module jakarta-tomcat-4.0) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-4.0 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - jakarta-tomcat-4.0 : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Output [naming-resources.jar] identifier set to output basename: [naming-resources] -DEBUG- Output [servlets-default.jar] identifier set to output basename: [servlets-default] -DEBUG- Output [naming-common.jar] identifier set to output basename: [naming-common] -DEBUG- Output [catalina.jar] identifier set to output basename: [catalina] -DEBUG- Output [bootstrap.jar] identifier set to output basename: [bootstrap] -DEBUG- Output [servlets-common.jar] identifier set to output basename: [servlets-common] -DEBUG- Output [servlets-invoker.jar] identifier set to output basename: [servlets-invoker] -DEBUG- Dependency on javamail exists, no need to add for property mail.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.jar. -DEBUG- Dependency on jmx exists, no need to add for property jmx.jar. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xerces.jar. -DEBUG- Dependency on jakarta-tomcat-util exists, no need to add for property tomcat-util.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on ant exists, no need to add for property ant.home. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.home. -DEBUG- Dependency on jsse exists, no need to add for property jsse.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.home. -DEBUG- Dependency on jmx exists, no need to add for property jmxtools.jar. -DEBUG- Dependency on jndi exists, no need to add for property jndi.home. -DEBUG- Dependency on javamail exists, no need to add for property mail.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.home. -INFO- Failed with reason build failed -DEBUG- Extracted fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/gump_work/build_jakarta-tomcat-4.0_jakarta-tomcat-4.0.html Work Name: build_jakarta-tomcat-4.0_jakarta-tomcat-4.0 (Type: Build) Work ended in a state of : Failed Elapsed: 12 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/serializer.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar org.apache.tools.ant.Main -Dgump.merge=/x1/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djaas.jar=/usr/local/gump/packages/jaas1_0/lib/jaas.jar -Djmx.jar=/usr/local/gump/packages/jmx-1_2-ri/lib/jmxri.jar -Djmx.home=/usr/local/gump/packages/jmx-1_2-ri -Djdbc20ext.jar=/usr/local/gump/packages/jdbc2_0/jdbc2_0-stdext.jar -Dregexp.jar=/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-28062005.jar -Dmail.home=/usr/local/gump/packages/javamail-1.3.2 -Dant.home=/usr/local/gump/public/workspace/ant/dist -Dservlet.jar=/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar -Dxerces.jar=/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar -Dcommons-collections.jar=/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-28062005.jar -Dldap.jar=/usr/local/gump/packages/ldap-1_2_4/lib/ldap.jar -Djsse.home=/usr/local/gump/packages/jsse1.0.3 -Dtomcat-coyote.jar=/usr/local/gump/public/workspace/jakarta-tomcat-connectors/coyote/build/lib/tomcat-coyote.jar -Dmail.jar=/usr/local/gump/packages/javamail-1.3.2/mail.jar -Dcommons-digester.jar=/usr/local/gump/public/workspace/jakarta-commons/digester/dist/commons-digester.jar -Djndi.jar=/usr/local/gump/packages/jndi1_2_1/lib/jndi.jar -Djmxtools.jar=/usr/local/gump/packages/jmx-1_2-ri/lib/jmxtools.jar -Dactivation.home=/usr/local/gump/packages/jaf-1.0.1
[EMAIL PROTECTED]: Project jakarta-tomcat-4.0 (in module jakarta-tomcat-4.0) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-4.0 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - jakarta-tomcat-4.0 : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Output [naming-resources.jar] identifier set to output basename: [naming-resources] -DEBUG- Output [servlets-default.jar] identifier set to output basename: [servlets-default] -DEBUG- Output [naming-common.jar] identifier set to output basename: [naming-common] -DEBUG- Output [catalina.jar] identifier set to output basename: [catalina] -DEBUG- Output [bootstrap.jar] identifier set to output basename: [bootstrap] -DEBUG- Output [servlets-common.jar] identifier set to output basename: [servlets-common] -DEBUG- Output [servlets-invoker.jar] identifier set to output basename: [servlets-invoker] -DEBUG- Dependency on javamail exists, no need to add for property mail.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.jar. -DEBUG- Dependency on jmx exists, no need to add for property jmx.jar. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xerces.jar. -DEBUG- Dependency on jakarta-tomcat-util exists, no need to add for property tomcat-util.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on ant exists, no need to add for property ant.home. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.home. -DEBUG- Dependency on jsse exists, no need to add for property jsse.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.home. -DEBUG- Dependency on jmx exists, no need to add for property jmxtools.jar. -DEBUG- Dependency on jndi exists, no need to add for property jndi.home. -DEBUG- Dependency on javamail exists, no need to add for property mail.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.home. -INFO- Failed with reason build failed -DEBUG- Extracted fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/gump_work/build_jakarta-tomcat-4.0_jakarta-tomcat-4.0.html Work Name: build_jakarta-tomcat-4.0_jakarta-tomcat-4.0 (Type: Build) Work ended in a state of : Failed Elapsed: 12 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/serializer.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar org.apache.tools.ant.Main -Dgump.merge=/x1/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djaas.jar=/usr/local/gump/packages/jaas1_0/lib/jaas.jar -Djmx.jar=/usr/local/gump/packages/jmx-1_2-ri/lib/jmxri.jar -Djmx.home=/usr/local/gump/packages/jmx-1_2-ri -Djdbc20ext.jar=/usr/local/gump/packages/jdbc2_0/jdbc2_0-stdext.jar -Dregexp.jar=/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-28062005.jar -Dmail.home=/usr/local/gump/packages/javamail-1.3.2 -Dant.home=/usr/local/gump/public/workspace/ant/dist -Dservlet.jar=/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar -Dxerces.jar=/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar -Dcommons-collections.jar=/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-28062005.jar -Dldap.jar=/usr/local/gump/packages/ldap-1_2_4/lib/ldap.jar -Djsse.home=/usr/local/gump/packages/jsse1.0.3 -Dtomcat-coyote.jar=/usr/local/gump/public/workspace/jakarta-tomcat-connectors/coyote/build/lib/tomcat-coyote.jar -Dmail.jar=/usr/local/gump/packages/javamail-1.3.2/mail.jar -Dcommons-digester.jar=/usr/local/gump/public/workspace/jakarta-commons/digester/dist/commons-digester.jar -Djndi.jar=/usr/local/gump/packages/jndi1_2_1/lib/jndi.jar -Djmxtools.jar=/usr/local/gump/packages/jmx-1_2-ri/lib/jmxtools.jar -Dactivation.home=/usr/local/gump/packages/jaf-1.0.1
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources FileDirContext.java
markt 2005/06/27 14:54:55
Modified:catalina/src/share/org/apache/naming/resources
FileDirContext.java
Log:
DefaultServlet was showing symbolic links in directory listings with
- no last modified date for files or dirs
- no size for files
- files were displayed as directories.
Revision ChangesPath
1.18 +5 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java
Index: FileDirContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FileDirContext.java 4 Feb 2005 22:08:03 - 1.17
+++ FileDirContext.java 27 Jun 2005 21:54:55 - 1.18
@@ -212,6 +212,8 @@
if (file.isDirectory()) {
FileDirContext tempContext = new FileDirContext(env);
tempContext.setDocBase(file.getPath());
+tempContext.setAllowLinking(getAllowLinking());
+tempContext.setCaseSensitive(isCaseSensitive());
result = tempContext;
} else {
result = new FileResource(file);
@@ -892,6 +894,8 @@
if (currentFile.isDirectory()) {
FileDirContext tempContext = new FileDirContext(env);
tempContext.setDocBase(file.getPath());
+tempContext.setAllowLinking(getAllowLinking());
+tempContext.setCaseSensitive(isCaseSensitive());
object = tempContext;
} else {
object = new FileResource(currentFile);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpConnector.java HttpHeader.java HttpProcessor.java HttpRequestImpl.java HttpRequestLine.java HttpRequestStream.java HttpResponseImpl.java HttpResponseStream.java
markt 2005/06/12 08:21:44 Modified:catalina/src/share/org/apache/catalina/connector HttpRequestFacade.java HttpResponseBase.java HttpResponseFacade.java RequestBase.java RequestFacade.java RequestWrapper.java ResponseBase.java ResponseFacade.java ResponseWrapper.java ResponseWriter.java catalina/src/share/org/apache/catalina/connector/http10 HttpConnector.java HttpProcessor.java catalina/src/share/org/apache/catalina/connector/http HttpConnector.java HttpHeader.java HttpProcessor.java HttpRequestImpl.java HttpRequestLine.java HttpRequestStream.java HttpResponseImpl.java HttpResponseStream.java Log: Remove unused imports identified by Eclipse Revision ChangesPath 1.4 +1 -8 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestFacade.java Index: HttpRequestFacade.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestFacade.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- HttpRequestFacade.java26 Aug 2004 21:30:19 - 1.3 +++ HttpRequestFacade.java12 Jun 2005 15:21:44 - 1.4 @@ -18,14 +18,7 @@ package org.apache.catalina.connector; -import java.security.Principal; -import java.util.Locale; import java.util.Enumeration; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.Cookie; import javax.servlet.http.HttpSession; 1.56 +1 -3 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java Index: HttpResponseBase.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- HttpResponseBase.java 26 Aug 2004 21:30:19 - 1.55 +++ HttpResponseBase.java 12 Jun 2005 15:21:44 - 1.56 @@ -25,7 +25,6 @@ import java.net.MalformedURLException; // import java.net.URL; import java.security.AccessController; -import java.security.PrivilegedAction; import java.security.PrivilegedExceptionAction; import java.security.PrivilegedActionException; import java.text.SimpleDateFormat; @@ -45,7 +44,6 @@ import org.apache.catalina.Globals; import org.apache.catalina.Logger; import org.apache.catalina.util.CookieTools; -import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.URL; 1.7 +1 -3 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseFacade.java Index: HttpResponseFacade.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseFacade.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- HttpResponseFacade.java 26 Aug 2004 21:30:19 - 1.6 +++ HttpResponseFacade.java 12 Jun 2005 15:21:44 - 1.7 @@ -19,8 +19,6 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.Cookie; import org.apache.catalina.HttpResponse; 1.23 +1 -3 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java Index: RequestBase.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- RequestBase.java 26 Aug 2004 21:30:19 - 1.22 +++ RequestBase.java 12 Jun 2005 15:21:44 - 1.23 @@ -24,7 +24,6 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.Socket; -import java.security.Principal; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; @@ -33,7 +32,6 @@ import java.util.Map; import javax.servlet.RequestDispatcher; import javax.servlet.ServletContext; -import javax.servlet.ServletException; import javax.servlet.ServletInputStream; import javax.servlet.ServletRequest
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina Cluster.java ContainerListener.java Host.java LifecycleListener.java Request.java Response.java Session.java SessionListener.java
markt 2005/06/11 03:45:12 Modified:catalina/src/share/org/apache/catalina Cluster.java ContainerListener.java Host.java LifecycleListener.java Request.java Response.java Session.java SessionListener.java Log: Remove unused imports from o.a.c package Revision ChangesPath 1.7 +1 -3 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Cluster.java Index: Cluster.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Cluster.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Cluster.java 26 Aug 2004 22:05:20 - 1.6 +++ Cluster.java 11 Jun 2005 10:45:12 - 1.7 @@ -17,8 +17,6 @@ package org.apache.catalina; -import java.beans.PropertyChangeListener; -import java.util.Collection; import org.apache.catalina.cluster.ClusterMemberInfo; import org.apache.catalina.cluster.ClusterReceiver; import org.apache.catalina.cluster.ClusterSender; 1.5 +1 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ContainerListener.java Index: ContainerListener.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ContainerListener.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ContainerListener.java26 Aug 2004 22:05:20 - 1.4 +++ ContainerListener.java11 Jun 2005 10:45:12 - 1.5 @@ -18,9 +18,6 @@ package org.apache.catalina; -import java.util.EventObject; - - /** * Interface defining a listener for significant Container generated events. * Note that container start and container stop events are normally 1.11 +1 -3 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Host.java Index: Host.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Host.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Host.java 26 Aug 2004 22:05:20 - 1.10 +++ Host.java 11 Jun 2005 10:45:12 - 1.11 @@ -18,8 +18,6 @@ package org.apache.catalina; -import javax.servlet.ServletContext; - /** * A bHost/b is a Container that represents a virtual host in the * Catalina servlet engine. It is useful in the following types of scenarios: 1.5 +1 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/LifecycleListener.java Index: LifecycleListener.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/LifecycleListener.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- LifecycleListener.java26 Aug 2004 22:05:52 - 1.4 +++ LifecycleListener.java11 Jun 2005 10:45:12 - 1.5 @@ -18,9 +18,6 @@ package org.apache.catalina; -import java.util.EventObject; - - /** * Interface defining a listener for significant events (including component * start and component stop generated by a component that implements the 1.7 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Request.java Index: Request.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Request.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Request.java 26 Aug 2004 22:05:53 - 1.6 +++ Request.java 11 Jun 2005 10:45:12 - 1.7 @@ -22,7 +22,6 @@ import java.io.IOException; import java.net.Socket; import java.util.Iterator; -import javax.servlet.ServletException; import javax.servlet.ServletInputStream; import javax.servlet.ServletRequest; 1.9 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Response.java Index: Response.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Response.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Response.java 26 Aug 2004 22:05:53 - 1.8 +++ Response.java 11 Jun 2005 10:45:12 - 1.9 @@ -21,7 +21,6 @@ import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; -import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.ServletResponse; 1.7 +1 -3 jakarta-tomcat-4.0
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant DeployTask.java InstallTask.java ListTask.java ReloadTask.java RemoveTask.java ResourcesTask.java RolesTask.java StartTask.java StopTask.java UndeployTask.java
markt 2005/06/11 03:47:37 Modified:catalina/src/share/org/apache/catalina/ant DeployTask.java InstallTask.java ListTask.java ReloadTask.java RemoveTask.java ResourcesTask.java RolesTask.java StartTask.java StopTask.java UndeployTask.java Log: Remove unused imports from o.a.c.ant package Revision ChangesPath 1.4 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/DeployTask.java Index: DeployTask.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/DeployTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DeployTask.java 26 Aug 2004 21:27:10 - 1.3 +++ DeployTask.java 11 Jun 2005 10:47:37 - 1.4 @@ -24,7 +24,6 @@ import java.net.URLConnection; import java.net.URLEncoder; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; /** 1.5 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/InstallTask.java Index: InstallTask.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/InstallTask.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- InstallTask.java 26 Aug 2004 21:27:10 - 1.4 +++ InstallTask.java 11 Jun 2005 10:47:37 - 1.5 @@ -20,7 +20,6 @@ import java.net.URLEncoder; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; /** 1.4 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/ListTask.java Index: ListTask.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/ListTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ListTask.java 26 Aug 2004 21:27:10 - 1.3 +++ ListTask.java 11 Jun 2005 10:47:37 - 1.4 @@ -19,7 +19,6 @@ import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; /** 1.5 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/ReloadTask.java Index: ReloadTask.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/ReloadTask.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ReloadTask.java 26 Aug 2004 21:27:10 - 1.4 +++ ReloadTask.java 11 Jun 2005 10:47:37 - 1.5 @@ -20,7 +20,6 @@ import java.net.URLEncoder; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; /** 1.4 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/RemoveTask.java Index: RemoveTask.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/RemoveTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RemoveTask.java 26 Aug 2004 21:27:10 - 1.3 +++ RemoveTask.java 11 Jun 2005 10:47:37 - 1.4 @@ -20,7 +20,6 @@ import java.net.URLEncoder; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; /** 1.4 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/ResourcesTask.java Index: ResourcesTask.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/ResourcesTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ResourcesTask.java26 Aug 2004 21:27:10 - 1.3 +++ ResourcesTask.java11 Jun 2005 10:47:37 - 1.4 @@ -19,7 +19,6 @@ import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; /** 1.3 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/RolesTask.java Index: RolesTask.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ant/RolesTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RolesTask.java26 Aug 2004 21:27:10 - 1.2 +++ RolesTask.java11 Jun 2005 10:47:37 - 1.3 @@ -19,7 +19,6 @@ import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster MulticastReceiver.java MulticastSender.java StandardCluster.java
markt 2005/06/11 03:49:59 Modified:catalina/src/share/org/apache/catalina/cluster MulticastReceiver.java MulticastSender.java StandardCluster.java Log: Remove unused imports from o.a.c.cluster package Revision ChangesPath 1.7 +1 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/MulticastReceiver.java Index: MulticastReceiver.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/MulticastReceiver.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- MulticastReceiver.java26 Aug 2004 21:28:18 - 1.6 +++ MulticastReceiver.java11 Jun 2005 10:49:59 - 1.7 @@ -19,15 +19,9 @@ import java.net.DatagramPacket; import java.net.InetAddress; import java.net.MulticastSocket; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.ObjectStreamClass; import java.util.Vector; 1.6 +1 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/MulticastSender.java Index: MulticastSender.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/MulticastSender.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- MulticastSender.java 26 Aug 2004 21:28:18 - 1.5 +++ MulticastSender.java 11 Jun 2005 10:49:59 - 1.6 @@ -19,13 +19,10 @@ import java.net.DatagramPacket; import java.net.InetAddress; import java.net.MulticastSocket; -import java.io.InputStream; -import java.io.OutputStream; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; -import java.io.ObjectStreamClass; /** 1.8 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/StandardCluster.java Index: StandardCluster.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/StandardCluster.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- StandardCluster.java 26 Aug 2004 21:28:18 - 1.7 +++ StandardCluster.java 11 Jun 2005 10:49:59 - 1.8 @@ -25,7 +25,6 @@ import org.apache.catalina.Cluster; import org.apache.catalina.Container; import org.apache.catalina.Lifecycle; -import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleListener; import org.apache.catalina.Logger; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin AttributeTag.java
markt 2005/06/11 08:49:16
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
AttributeTag.java
Log:
Improve error message so it is clear which resource is missing an attribute.
Revision ChangesPath
1.4 +3 -2
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/AttributeTag.java
Index: AttributeTag.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/AttributeTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AttributeTag.java 26 Aug 2004 22:00:35 - 1.3
+++ AttributeTag.java 11 Jun 2005 15:49:16 - 1.4
@@ -168,7 +168,8 @@
value = mserver.getAttribute(oname, attribute);
} catch (Throwable t) {
throw new JspException(Exception retrieving attribute ' +
- attribute + ');
+ attribute + ' from mbean ' +
+ oname.toString() + ');
}
// Render this value to our current output writer
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[EMAIL PROTECTED]: Project tomcat-catalina (in module jakarta-tomcat-4.0) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project tomcat-catalina has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Configuration Failed'. For reference only, the following projects are affected by this: - tomcat-catalina : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Sole output [catalina.jar] identifier set to project name -INFO- Failed with reason configuration failed -ERROR- Circular Dependency with ant. -ERROR- Circular Dependency with xml-xerces. -ERROR- Circular Dependency with xml-apis. -ERROR- Circular Dependency with jakarta-tomcat-util. -ERROR- Circular Dependency with jakarta-servletapi-4. -ERROR- Circular Dependency with jakarta-regexp. -ERROR- Circular Dependency with commons-collections. -ERROR- Circular Dependency with commons-beanutils. -ERROR- Circular Dependency with commons-digester. -ERROR- Circular Dependency with commons-logging. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Extracted fallback artifacts from Gump Repository To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/rss.xml - Atom: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/atom.xml == Gump Tracking Only === Produced by Gump version 2.2. Gump Run 35331107062005, vmgump.apache.org:vmgump-public:35331107062005 Gump E-mail Identifier (unique within run) #83. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[EMAIL PROTECTED]: Project tomcat-catalina (in module jakarta-tomcat-4.0) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project tomcat-catalina has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Configuration Failed'. For reference only, the following projects are affected by this: - tomcat-catalina : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Sole output [catalina.jar] identifier set to project name -INFO- Failed with reason configuration failed -ERROR- Circular Dependency with ant. -ERROR- Circular Dependency with xml-xerces. -ERROR- Circular Dependency with xml-apis. -ERROR- Circular Dependency with jakarta-tomcat-util. -ERROR- Circular Dependency with jakarta-servletapi-4. -ERROR- Circular Dependency with jakarta-regexp. -ERROR- Circular Dependency with commons-collections. -ERROR- Circular Dependency with commons-beanutils. -ERROR- Circular Dependency with commons-digester. -ERROR- Circular Dependency with commons-logging. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Extracted fallback artifacts from Gump Repository To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/rss.xml - Atom: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/atom.xml == Gump Tracking Only === Produced by Gump version 2.2. Gump Run 35331107062005, vmgump.apache.org:vmgump-public:35331107062005 Gump E-mail Identifier (unique within run) #83. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[EMAIL PROTECTED]: Project jakarta-tomcat-4.0 (in module jakarta-tomcat-4.0) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-4.0 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Configuration Failed'. For reference only, the following projects are affected by this: - jakarta-tomcat-4.0 : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Output [naming-resources.jar] identifier set to output basename: [naming-resources] -DEBUG- Output [servlets-default.jar] identifier set to output basename: [servlets-default] -DEBUG- Output [naming-common.jar] identifier set to output basename: [naming-common] -DEBUG- Output [catalina.jar] identifier set to output basename: [catalina] -DEBUG- Output [bootstrap.jar] identifier set to output basename: [bootstrap] -DEBUG- Output [servlets-common.jar] identifier set to output basename: [servlets-common] -DEBUG- Output [servlets-invoker.jar] identifier set to output basename: [servlets-invoker] -INFO- Failed with reason configuration failed -ERROR- Circular Dependency with ant. -ERROR- Circular Dependency with xml-xerces. -ERROR- Circular Dependency with xml-apis. -ERROR- Circular Dependency with jaf. -ERROR- Circular Dependency with javamail. -ERROR- Circular Dependency with jmx. -ERROR- Circular Dependency with jsse. -ERROR- Circular Dependency with xalan. -ERROR- Circular Dependency with jakarta-servletapi-4. -ERROR- Circular Dependency with jakarta-regexp. -ERROR- Circular Dependency with junit. -ERROR- Circular Dependency with jdbc. -ERROR- Circular Dependency with commons-beanutils. -ERROR- Circular Dependency with commons-collections. -ERROR- Circular Dependency with commons-digester. -ERROR- Circular Dependency with commons-modeler. -ERROR- Circular Dependency with commons-pool. -ERROR- Circular Dependency with commons-logging. -DEBUG- Dependency on javamail exists, no need to add for property mail.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.jar. -DEBUG- Dependency on jmx exists, no need to add for property jmx.jar. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xerces.jar. -DEBUG- Dependency on jakarta-tomcat-util exists, no need to add for property tomcat-util.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on ant exists, no need to add for property ant.home. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.home. -DEBUG- Dependency on jsse exists, no need to add for property jsse.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.home. -DEBUG- Dependency on jmx exists, no need to add for property jmxtools.jar. -DEBUG- Dependency on jndi exists, no need to add for property jndi.home. -DEBUG- Dependency on javamail exists, no need to add for property mail.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.home. -DEBUG- Extracted fallback artifacts from Gump Repository To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/rss.xml - Atom: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/atom.xml == Gump Tracking Only === Produced by Gump version 2.2. Gump Run 35331107062005, vmgump.apache.org:vmgump-public:35331107062005 Gump E-mail Identifier (unique within run) #174. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[EMAIL PROTECTED]: Project jakarta-tomcat-4.0 (in module jakarta-tomcat-4.0) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-4.0 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Configuration Failed'. For reference only, the following projects are affected by this: - jakarta-tomcat-4.0 : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Output [naming-resources.jar] identifier set to output basename: [naming-resources] -DEBUG- Output [servlets-default.jar] identifier set to output basename: [servlets-default] -DEBUG- Output [naming-common.jar] identifier set to output basename: [naming-common] -DEBUG- Output [catalina.jar] identifier set to output basename: [catalina] -DEBUG- Output [bootstrap.jar] identifier set to output basename: [bootstrap] -DEBUG- Output [servlets-common.jar] identifier set to output basename: [servlets-common] -DEBUG- Output [servlets-invoker.jar] identifier set to output basename: [servlets-invoker] -INFO- Failed with reason configuration failed -ERROR- Circular Dependency with ant. -ERROR- Circular Dependency with xml-xerces. -ERROR- Circular Dependency with xml-apis. -ERROR- Circular Dependency with jaf. -ERROR- Circular Dependency with javamail. -ERROR- Circular Dependency with jmx. -ERROR- Circular Dependency with jsse. -ERROR- Circular Dependency with xalan. -ERROR- Circular Dependency with jakarta-servletapi-4. -ERROR- Circular Dependency with jakarta-regexp. -ERROR- Circular Dependency with junit. -ERROR- Circular Dependency with jdbc. -ERROR- Circular Dependency with commons-beanutils. -ERROR- Circular Dependency with commons-collections. -ERROR- Circular Dependency with commons-digester. -ERROR- Circular Dependency with commons-modeler. -ERROR- Circular Dependency with commons-pool. -ERROR- Circular Dependency with commons-logging. -DEBUG- Dependency on javamail exists, no need to add for property mail.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.jar. -DEBUG- Dependency on jmx exists, no need to add for property jmx.jar. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xerces.jar. -DEBUG- Dependency on jakarta-tomcat-util exists, no need to add for property tomcat-util.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on ant exists, no need to add for property ant.home. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.home. -DEBUG- Dependency on jsse exists, no need to add for property jsse.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.home. -DEBUG- Dependency on jmx exists, no need to add for property jmxtools.jar. -DEBUG- Dependency on jndi exists, no need to add for property jndi.home. -DEBUG- Dependency on javamail exists, no need to add for property mail.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.home. -DEBUG- Extracted fallback artifacts from Gump Repository To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/rss.xml - Atom: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/atom.xml == Gump Tracking Only === Produced by Gump version 2.2. Gump Run 35331107062005, vmgump.apache.org:vmgump-public:35331107062005 Gump E-mail Identifier (unique within run) #174. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs tomcat-docs.xsl
markt 2005/05/26 14:12:21 Modified:webapps/tomcat-docs/config connectors.xml coyote.xml http11.xml jk.xml jk2.xml project.xml webapp.xml webapps/tomcat-docs tomcat-docs.xsl Added: webapps/tomcat-docs/config ajp13.xml coyotejk.xml Log: Improve the TC4 connector documentation - separate web server side connectors and tomcat side connectors for JK/AJP - seperate current and deprecated connectors - fix various typos Revision ChangesPath 1.5 +36 -24 jakarta-tomcat-4.0/webapps/tomcat-docs/config/connectors.xml Index: connectors.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/connectors.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- connectors.xml14 Apr 2005 19:02:52 - 1.4 +++ connectors.xml26 May 2005 21:12:20 - 1.5 @@ -61,9 +61,10 @@ trth colspan=4HTTP Connectors for Tomcat 4.x/th/tr trthClient/ththProtocol/ththTomcat className/ththNotes/th/tr -trtdAncient browser/tdtdHTTP/1.0/td - tdorg.apache.catalina.connector.http10.HttpConnector/td - tdDeprecatedbr/See a href=http11.html HTTP/1.1/a/td +trtdModern browser/tdtdHTTP/1.1/td + tdorg.apache.coyote.tomcat4.CoyoteConnector/td + tdCurrent practicebr/See a href=coyote.html Coyote HTTP/1.1/a +/td /tr trtdModern browser/tdtdHTTP/1.1/td @@ -71,15 +72,33 @@ tdDeprecatedbr/See a href=http11.html HTTP/1.1/a/td /tr -trtdModern browser/tdtdHTTP/1.1/td - tdorg.apache.coyote.tomcat4.CoyoteConnector/td - tdCurrent practicebr/See a href=coyote.html Coyote HTTP/1.1/a -/td +trtdAncient browser/tdtdHTTP/1.0/td + tdorg.apache.catalina.connector.http10.HttpConnector/td + tdDeprecatedbr/See a href=http11.html HTTP/1.1/a/td /tr + trth colspan=4Web Server Connectors/th/tr -trthWeb Server Side/ththProtocol/ththTomcat Site/ththNotes/th/tr +trthWeb Server Side/ththProtocol/ththTomcat Side/ththNotes/th/tr + +tr + tdJK/tdtdAJP/1.3/td + tdCoyoteConnector with JkCoyoteHandler/td + tdCurrentbr/mod_jk supports load balancing. +Enabled by default in 4.1; works in 4.0. See a href=jk.htmlJK/a +and a href=coyotejk.htmlCoyote JK/a. +/td +/tr + +tr + tdmod_proxy with AJP enabled/tdtdAJP/1.3/td + tdCoyoteConnector with JkCoyoteHandler/td + tdCurrentbr/Available for Apache httpd 2.x and included by default with +2.2. See a href=http://httpd.apache.org/docs-2.1/mod/mod_proxy_ajp.html; +mod_proxy_ajp/a and a href=coyotejk.htmlCoyote JK/a +/td +/tr tr tdmod_jserv/tdtdAJP/1.2/td @@ -89,19 +108,19 @@ /tr tr - tdmod_jk/tdtdAJP/1.3/td + tdJK2/tdtdAJP/1.3/td tdCoyoteConnector with JkCoyoteHandler/td - tdCurrentbr/mod_jk supports load balancing. -Enabled by default in 4.1; works in 4.0. See a href=jk.htmlCoyote JK/a + tdDeprecatedbr/Enabled by default in 4.1. + mod_jk2 supports in-process JVM and load balancing. +See a href=jk2.htmlJK2/a /td /tr tr - tdmod_jk2/tdtdAJP/1.3/td - tdCoyoteConnector with JkCoyoteHandler/td - tdDeprecatedbr/Enabled by default in 4.1. - mod_jk2 supports in-process JVM and load balancing. -See a href=jk.htmlCoyote JK/a + tdJK or JK2/tdtdAJP/1.3/td + tdorg.apache.ajp.tomcat4.Ajp13Connector/td + tdDeprecatedbr/ +See a href=ajp13.htmlAJP/1.3/a /td /tr @@ -110,18 +129,11 @@ tdWarpConnector/td tdDeprecatedbr/Not for Win32; no in-process nor load balancing; works in 4.x. -Use a href=http://apr.apache.org/;APR/a. +Uses a href=http://apr.apache.org/;APR/a. Supported Apache-2.0 and Apache-1.3). See a href=webapp.htmlWebapp/a /td /tr -tr - tdmod_proxy with AJP enabled/tdtdAJP/1.3/td - tdCoyoteConnector with JkCoyoteHandler/td - tdCurrentbr/Available for Apache httd 2.x and included by default with -2.2. See a href=jk.htmlCoyote JK/a -/td -/tr /table /section section name=Why a Tomcat connector with a native Web Server? 1.11 +2 -2 jakarta-tomcat-4.0/webapps/tomcat-docs/config/coyote.xml Index: coyote.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/coyote.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- coyote.xml14 Apr 2005 19:02:52 - 1.10 +++ coyote.xml26 May 2005 21:12:20 - 1.11 @@ -27,8 +27,8 @@ request processing and create the response./p pIf you wish
cvs commit: jakarta-tomcat-4.0/catalina/src/conf server.xml
markt 2005/05/26 14:32:35 Modified:catalina/src/conf server.xml Log: Tweak server.xml to align it with the connector doc changes. Revision ChangesPath 1.73 +2 -2 jakarta-tomcat-4.0/catalina/src/conf/server.xml Index: server.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- server.xml21 Jan 2004 23:59:49 - 1.72 +++ server.xml26 May 2005 21:32:35 - 1.73 @@ -109,7 +109,7 @@ /Connector -- -!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -- +!-- Define a Coyote AJP/1.3 Connector on port 8009 -- Connector className=org.apache.coyote.tomcat4.CoyoteConnector port=8009 minProcessors=5 maxProcessors=75 enableLookups=true redirectPort=8443 @@ -117,7 +117,7 @@ useURIValidationHack=false protocolHandlerClassName=org.apache.jk.server.JkCoyoteHandler/ -!-- Define an AJP 1.3 Connector on port 8009 -- +!-- Define a legacy AJP 1.3 Connector on port 8009 -- !-- Connector className=org.apache.ajp.tomcat4.Ajp13Connector port=8009 minProcessors=5 maxProcessors=75 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/conf server-noexamples.xml.config
markt 2005/05/26 14:34:48 Modified:catalina/src/conf server-noexamples.xml.config Log: Tweak server-noexamples.xml to align it with the connector doc changes. Revision ChangesPath 1.10 +2 -2 jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config Index: server-noexamples.xml.config === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- server-noexamples.xml.config 8 May 2004 17:06:47 - 1.9 +++ server-noexamples.xml.config 26 May 2005 21:34:48 - 1.10 @@ -79,7 +79,7 @@ /Connector -- -!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -- +!-- Define a Coyote AJP/1.3 Connector on port 8009 -- !-- Connector className=org.apache.coyote.tomcat4.CoyoteConnector port=8009 minProcessors=5 maxProcessors=75 @@ -89,7 +89,7 @@ protocolHandlerClassName=org.apache.jk.server.JkCoyoteHandler/ -- -!-- Define an AJP 1.3 Connector on port 8009 -- +!-- Define a legacy AJP 1.3 Connector on port 8009 -- !-- Connector className=org.apache.ajp.tomcat4.Ajp13Connector port=8009 minProcessors=5 maxProcessors=75 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs cgi-howto.xml
markt 2005/05/23 15:46:57 Modified:.RUNNING.txt webapps/tomcat-docs cgi-howto.xml Log: Fix bug 13240. Add note to docs that 1.3 JDK is required to use CGI. Revision ChangesPath 1.8 +4 -1 jakarta-tomcat-4.0/RUNNING.txt Index: RUNNING.txt === RCS file: /home/cvs/jakarta-tomcat-4.0/RUNNING.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- RUNNING.txt 18 Jun 2004 23:32:27 - 1.7 +++ RUNNING.txt 23 May 2005 22:46:57 - 1.8 @@ -21,6 +21,9 @@ present in the JRE to compile JSP pages. Unless you are *very* sure of what you are doing, please use the full SDK. +NOTE: Use of the CGI Servlet requires Java 2 Standard Edition (J2SE) SDK, +release version 1.3 or later. + * Install the SDK according to the instructions included with the release. * Set an environment variable JAVA_HOME to the pathname of the directory 1.7 +2 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/cgi-howto.xml Index: cgi-howto.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/cgi-howto.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cgi-howto.xml 28 Sep 2004 21:51:50 - 1.6 +++ cgi-howto.xml 23 May 2005 22:46:57 - 1.7 @@ -29,6 +29,8 @@ this servlet is mapped to the URL pattern /cgi-bin/*./p pBy default CGI support is disabled in Tomcat./p + +pNote that the CGI Servlet requires a 1.3 or later JDK./p /section section name=Installation - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[EMAIL PROTECTED]: Project tomcat-catalina (in module jakarta-tomcat-4.0) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project tomcat-catalina has an issue affecting its community integration. This issue affects 2 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - jakarta-tomcat-coyote-tomcat4 : Connectors to various web servers - tomcat-catalina : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Sole output [catalina.jar] identifier set to project name -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -INFO- Failed with reason build failed -DEBUG- Extracted fallback artifacts from Gump Repository The following work was performed: http://brutus.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/gump_work/build_jakarta-tomcat-4.0_tomcat-catalina.html Work Name: build_jakarta-tomcat-4.0_tomcat-catalina (Type: Build) Work ended in a state of : Failed Elapsed: Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dcommons-beanutils.jar=/usr/local/gump/public/workspace/jakarta-commons/beanutils/dist/commons-beanutils-core.jar -Djtc.home=/usr/local/gump/public/workspace/jakarta-tomcat-connectors -Dversion=4.1.25-dev -Dregexp.jar=/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-07052005.jar -Dcommons-logging-api.jar=/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging-api.jar -Dservlet.jar=/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar -Dcommons-logging.jar=/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging.jar -Dcommons-collections.jar=/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-07052005.jar -Dcommons-digester.jar=/usr/local/gump/public/workspace/jakarta-commons/digester/dist/commons-digester.jar deploy-catalina [Working Directory: /usr/local/gump/public/workspace/jakarta-tomcat-4.0/catalina] CLASSPATH: /opt/jdk1.4/lib/tools.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-swing.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-trax.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-junit.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant.jar:/usr/local/gump/public/workspace/jakarta-tomcat-connectors/util/build/lib/tomcat-util.jar:/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar:/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-07052005.jar:/usr/local/gump/public/workspace/jakarta-commons/fileupload/target/commons-fileupload-07052005.jar:/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-07052005.jar:/usr/local/gump/public/workspace/jakarta-commons/beanutils/dist/commons-beanutils-core.jar:/usr/local/gump/public/workspace/jakarta-commons/digester/dist/commons-digester.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging.jar - Buildfile: build.xml BUILD FAILED java.lang.NoClassDefFoundError: org/xml/sax/ext/Attributes2 at org.apache.xerces.parsers.AbstractSAXParser.init(Unknown Source) at org.apache.xerces.parsers.SAXParser.init(Unknown Source) at org.apache.xerces.parsers.SAXParser.init(Unknown Source) at org.apache.xerces.jaxp.SAXParserImpl.init(Unknown Source) at org.apache.xerces.jaxp.SAXParserFactoryImpl.newSAXParser(Unknown Source) at org.apache.tools.ant.util.JAXPUtils.newSAXParser(JAXPUtils.java:212) at org.apache.tools.ant.util.JAXPUtils.getNamespaceXMLReader(JAXPUtils.java:169) at org.apache.tools.ant.helper.ProjectHelper2.parse(ProjectHelper2.java:187) at org.apache.tools.ant.helper.ProjectHelper2.parse(ProjectHelper2.java:140) at org.apache.tools.ant.ProjectHelper.configureProject(ProjectHelper.java:90) at org.apache.tools.ant.Main.runBuild
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator AuthenticatorBase.java NonLoginAuthenticator.java SSLAuthenticator.java SavedRequest.java
markt 2005/04/30 13:43:55
Modified:catalina/src/share/org/apache/catalina/authenticator
AuthenticatorBase.java NonLoginAuthenticator.java
SSLAuthenticator.java SavedRequest.java
Log:
Cleaning up Eclipse warnings in o.a.c.authenticator
Revision ChangesPath
1.42 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
Index: AuthenticatorBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- AuthenticatorBase.java26 Aug 2004 21:27:39 - 1.41
+++ AuthenticatorBase.java30 Apr 2005 20:43:55 - 1.42
@@ -318,7 +318,7 @@
*/
public String getInfo() {
-return (this.info);
+return (info);
}
1.6 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/NonLoginAuthenticator.java
Index: NonLoginAuthenticator.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/NonLoginAuthenticator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NonLoginAuthenticator.java26 Aug 2004 21:27:39 - 1.5
+++ NonLoginAuthenticator.java30 Apr 2005 20:43:55 - 1.6
@@ -56,7 +56,7 @@
*/
public String getInfo() {
-return (this.info);
+return (info);
}
1.16 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java
Index: SSLAuthenticator.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SSLAuthenticator.java 26 Aug 2004 21:27:39 - 1.15
+++ SSLAuthenticator.java 30 Apr 2005 20:43:55 - 1.16
@@ -58,7 +58,7 @@
*/
public String getInfo() {
-return (this.info);
+return (info);
}
1.6 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/SavedRequest.java
Index: SavedRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/SavedRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SavedRequest.java 26 Aug 2004 21:27:39 - 1.5
+++ SavedRequest.java 30 Apr 2005 20:43:55 - 1.6
@@ -23,8 +23,6 @@
import java.util.Locale;
import java.util.ArrayList;
import javax.servlet.http.Cookie;
-import org.apache.catalina.HttpRequest;
-import org.apache.catalina.Session;
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator BasicAuthenticator.java
markt 2005/04/28 11:54:54
Modified:catalina/src/share/org/apache/catalina/authenticator
BasicAuthenticator.java
Log:
Fix bug 22617. When used with an EJB container and a realm that supports the
concept
of an unauthenticated user (J2EE.3.4.3) BASIC authentication was always
authenticating users as the unauthenticated user without giving them a
chance to
supply a username and password.
Also fixed some static access warnings highlighted by Eclipse.
Revision ChangesPath
1.16 +16 -22
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java
Index: BasicAuthenticator.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/BasicAuthenticator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BasicAuthenticator.java 26 Aug 2004 21:27:39 - 1.15
+++ BasicAuthenticator.java 28 Apr 2005 18:54:54 - 1.16
@@ -46,12 +46,6 @@
/**
- * The Base64 helper object for this class.
- */
-protected static final Base64 base64Helper = new Base64();
-
-
-/**
* Descriptive information about this implementation.
*/
protected static final String info =
@@ -66,7 +60,7 @@
*/
public String getInfo() {
-return (this.info);
+return (info);
}
@@ -125,15 +119,19 @@
HttpServletResponse hres =
(HttpServletResponse) response.getResponse();
String authorization = request.getAuthorization();
-String username = parseUsername(authorization);
-String password = parsePassword(authorization);
-principal = context.getRealm().authenticate(username, password);
-if (principal != null) {
-register(request, response, principal, Constants.BASIC_METHOD,
- username, password);
-return (true);
-}
+// Only authenticate if there is an authorization header
+if (authorization != null) {
+String username = parseUsername(authorization);
+String password = parsePassword(authorization);
+principal = context.getRealm().authenticate(username, password);
+if (principal != null) {
+register(request, response, principal,
Constants.BASIC_METHOD,
+ username, password);
+return (true);
+}
+}
+
// Send an unauthorized response and an appropriate challenge
String realmName = config.getRealmName();
if (realmName == null)
@@ -160,15 +158,13 @@
*/
protected String parseUsername(String authorization) {
-if (authorization == null)
-return (null);
if (!authorization.toLowerCase().startsWith(basic ))
return (null);
authorization = authorization.substring(6).trim();
// Decode and parse the authorization credentials
String unencoded =
- new String(base64Helper.decode(authorization.getBytes()));
+ new String(Base64.decode(authorization.getBytes()));
int colon = unencoded.indexOf(':');
if (colon 0)
return (null);
@@ -187,15 +183,13 @@
*/
protected String parsePassword(String authorization) {
-if (authorization == null)
-return (null);
if (!authorization.startsWith(Basic ))
return (null);
authorization = authorization.substring(6).trim();
// Decode and parse the authorization credentials
String unencoded =
- new String(base64Helper.decode(authorization.getBytes()));
+ new String(Base64.decode(authorization.getBytes()));
int colon = unencoded.indexOf(':');
if (colon 0)
return (null);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs project.xml
markt 2005/04/14 12:02:52 Modified:webapps/tomcat-docs/config connectors.xml coyote.xml jk.xml jk2.xml project.xml webapps/tomcat-docs project.xml Log: Fix bug 33768. Connector docs for Tc 4.1.x are out of date. Revision ChangesPath 1.4 +39 -27 jakarta-tomcat-4.0/webapps/tomcat-docs/config/connectors.xml Index: connectors.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/connectors.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- connectors.xml17 Mar 2003 09:51:43 - 1.3 +++ connectors.xml14 Apr 2005 19:02:52 - 1.4 @@ -17,34 +17,39 @@ section name=Introduction p -JTC means Jakarta-Tomcat-Connectors. jakarta-tomcat-connectors is the -repository of the Tomcat connectors sources. -The connectors are released together with Tomcat. For example you can find -the connectors sources in -http://jakarta.apache.org/builds/jakarta-tomcat-4.x/release/v4.x.y/src/ -The tarball are named like: -jakarta-tomcat-connectors-4.x.y-src.tar.gz +JTC stands for Jakarta Tomcat Connectors. /p p There are two different types of connectors. Connectors that allow browsers to connect directly to the Tomcat and connectors that do it through a Web Server. /p p -The connectors allowing direct connections are in the binary of Tomcat. -They are jar files. +The connectors allowing direct connections are distributed as jar files with +the Tomcat binary releases. /p p The connectors used with a Web Server are made of 2 components. One written -in Java and the other written in C. The Java part is made of jar files are -inclosed in the Tomcat binaries. -/p -p -The binary builds of connectors are available in -http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.x.y/bin/plaform. -For example the Apache Solaris8 *.so files for SPARC will be in the -solaris8/sparc subdirectory. (Do not hesitate to ask for the binary needed for -your platform to the Tomcat mail lists, but be patient). +in Java and the other written in C. The Java part is included, as a jar file , + +with the Tomcat binary releases. The C part is released separately and may be +obtained from the +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-connectors.cgi; +Tomcat Connectors Downloads/a. +/p +p +The total number of different operating systems and web servers is sufficiently +large that it is not practical to provide binaries downloads for every +combination. Binaries are provided for most of the popular combinations and if +the one you need is not avaialble do not hesitate to ask for it on the +tomcat-user mailing list but please be patient and accept you may have to build +it yourself with the help of the mialing list. +/pp +The CVS repository for JTC is called jakarta-tomcat-connectors and source +bundles (that include both the Java and the C components) are available from +a href=http://jakarta.apache.org/site/downloads/downloads_tomcat-connectors.cgi; +Tomcat Connectors Downloads/a. /p + /section section name=Tomcat connectors @@ -58,17 +63,17 @@ trtdAncient browser/tdtdHTTP/1.0/td tdorg.apache.catalina.connector.http10.HttpConnector/td - tdDeprecated. See a href=http11.html HTTP/1.1/a/td + tdDeprecatedbr/See a href=http11.html HTTP/1.1/a/td /tr trtdModern browser/tdtdHTTP/1.1/td tdorg.apache.catalina.connector.http.HttpConnector/td - tdDeprecated. See a href=http11.html HTTP/1.1/a/td + tdDeprecatedbr/See a href=http11.html HTTP/1.1/a/td /tr trtdModern browser/tdtdHTTP/1.1/td tdorg.apache.coyote.tomcat4.CoyoteConnector/td - tdCurrent practice. See a href=coyote.html Coyote HTTP/1.1/a + tdCurrent practicebr/See a href=coyote.html Coyote HTTP/1.1/a /td /tr @@ -79,37 +84,44 @@ tr tdmod_jserv/tdtdAJP/1.2/td tdAjp11/td - tdObsolete Read more at + tdObsoletebr/Read more at a href=http://java.apache.org/jserv/index.html; JServ/a/td /tr tr tdmod_jk/tdtdAJP/1.3/td tdCoyoteConnector with JkCoyoteHandler/td - tdmod_jk supports load balancing. Enabled by default in 4.1; - works in 4.0. See a href=jk2.htmlCoyote JK 2/a + tdCurrentbr/mod_jk supports load balancing. +Enabled by default in 4.1; works in 4.0. See a href=jk.htmlCoyote JK/a /td /tr tr tdmod_jk2/tdtdAJP/1.3/td tdCoyoteConnector with JkCoyoteHandler/td - tdCurrently developed native connector. Enabled by default in 4.1. + tdDeprecatedbr/Enabled by default in 4.1. mod_jk2 supports in-process JVM and load balancing. -See a href=jk2.htmlCoyote JK 2
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs project.xml
markt 2005/04/14 12:37:59 Modified:webapps/tomcat-docs project.xml Log: Roll back previous commit. Revision ChangesPath 1.22 +1 -1 jakarta-tomcat-4.0/webapps/tomcat-docs/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/project.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- project.xml 14 Apr 2005 19:02:52 - 1.21 +++ project.xml 14 Apr 2005 19:37:59 - 1.22 @@ -31,7 +31,7 @@ item name=Class Loader HOW-TO href=class-loader-howto.html/ item name=Connectors List href=config/connectors.html/ item name=HTML Manager App HOW-TO href=html-manager-howto.html/ -item name=JK Documentation href=config/jk.html/ +item name=JK Documentation href=jk2/index.html/ item name=JNDI DataSource HOW-TO href=jndi-datasource-examples-howto.html/ item name=JNDI Resources HOW-TO href=jndi-resources-howto.html/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java ApplicationHttpRequest.java
markt 2005/04/10 11:22:56
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
ApplicationHttpRequest.java
Log:
Fix bug 22013. RequestDispatcher.forward doesn't work with a relative path on
a forwarded request
- Patch supplied by Cedric Benazech
Revision ChangesPath
1.33 +3 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Index: ApplicationDispatcher.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ApplicationDispatcher.java26 Aug 2004 21:31:21 - 1.32
+++ ApplicationDispatcher.java10 Apr 2005 18:22:56 - 1.33
@@ -861,7 +861,8 @@
if ((current instanceof ApplicationHttpRequest) ||
(current instanceof HttpRequest) ||
(current instanceof HttpServletRequest))
-wrapper = new ApplicationHttpRequest((HttpServletRequest)
current);
+wrapper = new ApplicationHttpRequest(
+(HttpServletRequest) current, context);
else
wrapper = new ApplicationRequest(current);
if (previous == null)
1.16 +51 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ApplicationHttpRequest.java 15 Jan 2005 20:27:05 - 1.15
+++ ApplicationHttpRequest.java 10 Apr 2005 18:22:56 - 1.16
@@ -23,8 +23,12 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
+import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
+
+import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.util.Enumerator;
import org.apache.catalina.util.RequestUtil;
@@ -49,7 +53,6 @@
class ApplicationHttpRequest extends HttpServletRequestWrapper {
-
// --- Static
Variables
@@ -62,24 +65,28 @@
Globals.QUERY_STRING_ATTR };
-// ---
Constructors
+// ---
Constructors
/**
- * Construct a new wrapped request around the specified servlet request.
+ * Construct a new wrapped request around the specified servlet request
in
+ * the specified context.
*
* @param request The servlet request being wrapped
+ * @param context The Context this ApplicationHttpRequest is associated
with
*/
-public ApplicationHttpRequest(HttpServletRequest request) {
-
+public ApplicationHttpRequest(HttpServletRequest request, Context
context) {
super(request);
setRequest(request);
-
+this.context = context;
}
-
// - Instance
Variables
+/**
+ * The Context this ApplicationHttpRequest is associated with.
+ */
+protected Context context;
/**
* The request attributes for this request. This is initialized from the
@@ -377,6 +384,42 @@
/**
+ * Return a RequestDispatcher that wraps the resource at the specified
+ * path, which may be interpreted as relative to the current request
path.
+ *
+ * @param path Path of the resource to be wrapped
+ */
+public RequestDispatcher getRequestDispatcher(String path) {
+
+if (context == null)
+return (null);
+
+// If the path is already context-relative, just pass it through
+if (path == null)
+return (null);
+else if (path.startsWith(/))
+return (context.getServletContext().getRequestDispatcher(path));
+
+// Convert a request-relative path to a context-relative one
+String servletPath = (String)
getAttribute(Globals.SERVLET_PATH_ATTR);
+if (servletPath == null)
+servletPath = getServletPath();
+
+int pos = servletPath.lastIndexOf('/');
+String relative = null;
+if (pos = 0) {
+relative = RequestUtil.normalize
+(servletPath.substring(0, pos + 1) + path
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs ssi-howto.xml
markt 2005/04/04 13:26:55
Modified:catalina/src/conf web.xml
catalina/src/share/org/apache/catalina/ssi SSIServlet.java
SSIServletExternalResolver.java
webapps/tomcat-docs ssi-howto.xml
Log:
Fix bug 10385. Improve support for files that use character encodings other
than
the platform default with the SSI servlet.
Revision ChangesPath
1.61 +6 -0 jakarta-tomcat-4.0/catalina/src/conf/web.xml
Index: web.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/web.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- web.xml 18 Dec 2004 11:55:37 - 1.60
+++ web.xml 4 Apr 2005 20:26:55 - 1.61
@@ -189,6 +189,12 @@
!-- relative to the context root, instead of
--
!-- the server root? (0=false, 1=true) [0]
--
!--
--
+ !-- inputEncoding The encoding to assume for SSI resources if
--
+ !-- one is not available from the resource.
--
+ !-- [Platform default]
--
+ !--
--
+ !-- outputEncoding The encoding to use for the page that results
--
+ !-- from the SSI processing. [UTF-8]
--
!--
--
!-- IMPORTANT: To use the SSI servlet, you also need to rename the
--
!--$CATALINA_HOME/server/lib/servlets-ssi.renametojar file
--
1.6 +40 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java
Index: SSIServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SSIServlet.java 3 Apr 2005 18:55:30 - 1.5
+++ SSIServlet.java 4 Apr 2005 20:26:55 - 1.6
@@ -54,6 +54,12 @@
/** virtual path can be webapp-relative */
protected boolean isVirtualWebappRelative = false;
+
+/** Input encoding. If not specified, uses platform default */
+protected String inputEncoding = null;
+
+/** Output encoding. If not specified, uses platform default */
+protected String outputEncoding = UTF-8;
//- Public methods.
@@ -92,6 +98,19 @@
} catch (Throwable t) {
;
}
+try {
+inputEncoding =
getServletConfig().getInitParameter(inputEncoding);
+} catch (Throwable t) {
+;
+}
+try {
+value = getServletConfig().getInitParameter(outputEncoding);
+if (value != null) {
+outputEncoding = value;
+}
+} catch (Throwable t) {
+;
+}
if (debug 0)
log(SSIServlet.init() SSI invoker started with 'debug'=
+ debug);
@@ -165,6 +184,12 @@
return;
}
+String resourceMimeType = servletContext.getMimeType(path);
+if (resourceMimeType == null) {
+resourceMimeType = text/html;
+}
+res.setContentType(resourceMimeType + ;charset= + outputEncoding);
+
if (expires != null) {
res.setDateHeader(Expires, (
new java.util.Date()).getTime() + expires.longValue() *
1000);
@@ -180,8 +205,7 @@
SSIExternalResolver ssiExternalResolver =
new SSIServletExternalResolver( this, req, res,
-isVirtualWebappRelative,
-debug );
+isVirtualWebappRelative, debug, inputEncoding);
SSIProcessor ssiProcessor =
new SSIProcessor( ssiExternalResolver, debug );
@@ -196,8 +220,19 @@
URLConnection resourceInfo = resource.openConnection();
InputStream resourceInputStream = resourceInfo.getInputStream();
-BufferedReader bufferedReader =
-new BufferedReader(new InputStreamReader(resourceInputStream));
+
+String encoding = resourceInfo.getContentEncoding();
+if (encoding == null) {
+encoding = inputEncoding;
+}
+InputStreamReader isr;
+if (encoding == null) {
+isr = new InputStreamReader(resourceInputStream);
+} else
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi SSIServlet.java
markt 2005/04/03 11:55:30
Modified:catalina/src/share/org/apache/catalina/ssi SSIServlet.java
Log:
Partial fix for bug 10385. Forcing content type to text/html;charset=UTF-8
broke
more things than it fixed.
Revision ChangesPath
1.5 +3 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java
Index: SSIServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SSIServlet.java 30 Mar 2005 21:53:05 - 1.4
+++ SSIServlet.java 3 Apr 2005 18:55:30 - 1.5
@@ -153,20 +153,18 @@
path.toUpperCase().startsWith(/WEB-INF) ||
path.toUpperCase().startsWith(/META-INF) ) {
-res.sendError(res.SC_NOT_FOUND, path);
+res.sendError(HttpServletResponse.SC_NOT_FOUND, path);
log( Can't serve file: + path );
return;
}
URL resource = servletContext.getResource(path);
if (resource==null) {
-res.sendError(res.SC_NOT_FOUND, path);
+res.sendError(HttpServletResponse.SC_NOT_FOUND, path);
log( Can't find file: + path );
return;
}
-res.setContentType(text/html;charset=UTF-8);
-
if (expires != null) {
res.setDateHeader(Expires, (
new java.util.Date()).getTime() + expires.longValue() *
1000);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi ByteArrayServletOutputStream.java ResponseIncludeWrapper.java SSICommand.java SSIConditional.java SSIConfig.java SSIEcho.java SSIExec.java SSIExternalResolver.java SSIFlastmod.java SSIInclude.java SSIMediator.java SSIProcessor.java SSIServlet.java SSIServletExternalResolver.java
markt 2005/03/30 13:53:05 Modified:catalina/src/share/org/apache/catalina/ssi ByteArrayServletOutputStream.java ResponseIncludeWrapper.java SSICommand.java SSIConditional.java SSIConfig.java SSIEcho.java SSIExec.java SSIExternalResolver.java SSIFlastmod.java SSIInclude.java SSIMediator.java SSIProcessor.java SSIServlet.java SSIServletExternalResolver.java Log: Remove unused imports from o.a.c.ssi package - Identified by Eclipse Revision ChangesPath 1.3 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java Index: ByteArrayServletOutputStream.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ByteArrayServletOutputStream.java 26 Aug 2004 21:39:40 - 1.2 +++ ByteArrayServletOutputStream.java 30 Mar 2005 21:53:05 - 1.3 @@ -16,7 +16,6 @@ package org.apache.catalina.ssi; -import java.io.OutputStream; import java.io.IOException; import java.io.ByteArrayOutputStream; import javax.servlet.ServletOutputStream; 1.3 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java Index: ResponseIncludeWrapper.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ResponseIncludeWrapper.java 26 Aug 2004 21:39:40 - 1.2 +++ ResponseIncludeWrapper.java 30 Mar 2005 21:53:05 - 1.3 @@ -17,7 +17,6 @@ package org.apache.catalina.ssi; import java.io.IOException; -import java.io.OutputStream; import java.io.PrintWriter; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; 1.4 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSICommand.java Index: SSICommand.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSICommand.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SSICommand.java 26 Aug 2004 21:39:40 - 1.3 +++ SSICommand.java 30 Mar 2005 21:53:05 - 1.4 @@ -15,7 +15,6 @@ */ package org.apache.catalina.ssi; -import java.io.IOException; import java.io.PrintWriter; /** 1.3 +1 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConditional.java Index: SSIConditional.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConditional.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SSIConditional.java 26 Aug 2004 21:39:40 - 1.2 +++ SSIConditional.java 30 Mar 2005 21:53:05 - 1.3 @@ -18,10 +18,6 @@ import java.io.PrintWriter; import java.text.ParseException; -import java.util.LinkedList; -import java.util.List; - -import javax.servlet.ServletOutputStream; /** * SSI command that handles all conditional directives. 1.5 +1 -3 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java Index: SSIConfig.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SSIConfig.java26 Aug 2004 21:39:40 - 1.4 +++ SSIConfig.java30 Mar 2005 21:53:05 - 1.5 @@ -16,9 +16,7 @@ package org.apache.catalina.ssi; -import java.io.IOException; import java.io.PrintWriter; -import java.util.Properties; /** * Implements the Server-side #exec command 1.4 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java Index: SSIEcho.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SSIEcho.java 26 Aug 2004 21:39:40 - 1.3 +++ SSIEcho.java 30 Mar 2005 21:53:05 - 1.4 @@ -16,7 +16,6 @@ package org.apache.catalina.ssi
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves AccessLogValve.java
markt 2005/03/28 10:53:19
Modified:catalina/src/share/org/apache/catalina/valves
AccessLogValve.java
Log:
Fix bug 20380. Timezone reported in access log should include any adjustment
necesary
for Daylight Saving Time.
Revision ChangesPath
1.20 +39 -17
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
Index: AccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AccessLogValve.java 27 Mar 2005 20:18:01 - 1.19
+++ AccessLogValve.java 28 Mar 2005 18:53:19 - 1.20
@@ -25,6 +25,7 @@
import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.text.DecimalFormat;
+import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
import javax.servlet.ServletException;
@@ -265,12 +266,22 @@
*/
private SimpleDateFormat timeFormatter = null;
-
/**
- * The time zone relative to GMT.
+ * The system timezone.
+ */
+private TimeZone timezone = null;
+
+/**
+ * The time zone offset relative to GMT in text form when daylight saving
+ * is not in operation.
*/
-private String timeZone = null;
+private String timeZoneNoDST = null;
+/**
+ * The time zone offset relative to GMT in text form when daylight saving
+ * is in operation.
+ */
+private String timeZoneDST = null;
/**
* The system time when we last updated the Date that this valve
@@ -570,15 +581,15 @@
}
result.append([);
-result.append(dayFormatter.format(date));// Day
+result.append(dayFormatter.format(date)); // Day
result.append('/');
result.append(lookup(monthFormatter.format(date))); // Month
result.append('/');
-result.append(yearFormatter.format(date));// Year
+result.append(yearFormatter.format(date)); // Year
result.append(':');
-result.append(timeFormatter.format(date));// Time
+result.append(timeFormatter.format(date)); // Time
result.append(space);
-result.append(timeZone);// Time Zone
+result.append(getTimeZone(date)); // Time Zone
result.append(] \);
result.append(hreq.getMethod());
@@ -880,7 +891,7 @@
temp.append(':');
temp.append(timeFormatter.format(date));// Time
temp.append(' ');
-temp.append(timeZone); // Timezone
+temp.append(getTimeZone(date)); // Timezone
temp.append(']');
value = temp.toString();
} else if (pattern == 'T') {
@@ -999,7 +1010,15 @@
}
-
+private String getTimeZone(Date date) {
+if (timezone.inDaylightTime(date)) {
+return timeZoneDST;
+} else {
+return timeZoneNoDST;
+}
+}
+
+
private String calculateTimeZoneOffset(long offset) {
StringBuffer tz = new StringBuffer();
if ((offset0)) {
@@ -1080,21 +1099,24 @@
started = true;
// Initialize the timeZone, Date formatters, and currentDate
-TimeZone tz = TimeZone.getDefault();
-timeZone = calculateTimeZoneOffset(tz.getRawOffset());
+timezone = TimeZone.getDefault();
+timeZoneNoDST = calculateTimeZoneOffset(timezone.getRawOffset());
+Calendar calendar = Calendar.getInstance(timezone);
+int offset = calendar.get(Calendar.DST_OFFSET);
+timeZoneDST =
calculateTimeZoneOffset(timezone.getRawOffset()+offset);
if (fileDateFormat==null || fileDateFormat.length()==0)
fileDateFormat = -MM-dd;
dateFormatter = new SimpleDateFormat(fileDateFormat);
-dateFormatter.setTimeZone(tz);
+dateFormatter.setTimeZone(timezone);
dayFormatter = new SimpleDateFormat(dd);
-dayFormatter.setTimeZone(tz);
+dayFormatter.setTimeZone(timezone);
monthFormatter = new SimpleDateFormat(MM);
-monthFormatter.setTimeZone(tz);
+monthFormatter.setTimeZone(timezone);
yearFormatter = new SimpleDateFormat();
-yearFormatter.setTimeZone(tz);
+yearFormatter.setTimeZone(timezone);
timeFormatter = new SimpleDateFormat(HH:mm:ss
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves AccessLogValve.java CertificatesValve.java ExtendedAccessLogValve.java JDBCAccessLogValve.java RequestDumperValve.java RequestFilterValve.java
markt 2005/03/27 12:18:01
Modified:catalina/src/share/org/apache/catalina/valves
AccessLogValve.java CertificatesValve.java
ExtendedAccessLogValve.java JDBCAccessLogValve.java
RequestDumperValve.java RequestFilterValve.java
Log:
Clean up Eclipse warnings for o.a.c.valves
- remove unused imports
- static access warnings
Revision ChangesPath
1.19 +2 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
Index: AccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AccessLogValve.java 26 Aug 2004 21:43:51 - 1.18
+++ AccessLogValve.java 27 Mar 2005 20:18:01 - 1.19
@@ -36,7 +36,6 @@
import javax.servlet.http.HttpSession;
import org.apache.catalina.HttpResponse;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Request;
@@ -339,7 +338,7 @@
*/
public String getInfo() {
-return (this.info);
+return (info);
}
1.12 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/CertificatesValve.java
Index: CertificatesValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/CertificatesValve.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CertificatesValve.java26 Aug 2004 21:43:51 - 1.11
+++ CertificatesValve.java27 Mar 2005 20:18:01 - 1.12
@@ -29,13 +29,11 @@
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Logger;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
-import org.apache.catalina.Valve;
import org.apache.catalina.ValveContext;
import org.apache.catalina.connector.RequestWrapper;
import org.apache.catalina.deploy.LoginConfig;
1.5 +2 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
Index: ExtendedAccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExtendedAccessLogValve.java 26 Aug 2004 21:43:51 - 1.4
+++ ExtendedAccessLogValve.java 27 Mar 2005 20:18:01 - 1.5
@@ -32,14 +32,11 @@
import java.util.TimeZone;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.catalina.HttpResponse;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Request;
@@ -349,7 +346,7 @@
*/
public String getInfo() {
-return (this.info);
+return (info);
}
1.4 +0 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java
Index: JDBCAccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JDBCAccessLogValve.java 26 Aug 2004 21:43:51 - 1.3
+++ JDBCAccessLogValve.java 27 Mar 2005 20:18:01 - 1.4
@@ -27,7 +27,6 @@
import org.apache.catalina.HttpResponse;
import org.apache.catalina.ValveContext;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.util.LifecycleSupport;
@@ -35,7 +34,6 @@
import org.apache.catalina.valves.ValveBase;
import org.apache.catalina.valves.Constants;
import java.util.Properties
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve AccessLogValveForm.java AddValveAction.java DeleteValveAction.java DeleteValvesAction.java EditValveAction.java RemoteAddrValveForm.java RemoteHostValveForm.java RequestDumperValveForm.java SaveAccessLogValveAction.java SaveRemoteAddrValveAction.java SaveRemoteHostValveAction.java SaveRequestDumperValveAction.java SaveSingleSignOnValveAction.java SingleSignOnValveForm.java ValveForm.java ValveUtil.java
SetUpRoleAction.java SetUpUserAction.java UserForm.java UsersForm.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve AccessLogValveForm.java AddValveAction.java DeleteValveAction.java DeleteValvesAction.java EditValveAction.java RemoteAddrValveForm.java RemoteHostValveForm.java RequestDumperValveForm.java SaveAccessLogValveAction.java SaveRemoteAddrValveAction.java SaveRemoteHostValveAction.java SaveRequestDumperValveAction.java SaveSingleSignOnValveAction.java SingleSignOnValveForm.java ValveForm.java ValveUtil.java Log: Remove unused imports from the admin webapp. Revision ChangesPath 1.6 +1 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java.diff?r1=1.5r2=1.6 1.7 +1 -3 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java.diff?r1=1.6r2=1.7 1.6 +1 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java.diff?r1=1.5r2=1.6 1.4 +1 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java.diff?r1=1.3r2=1.4 1.3 +1 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DataTag.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DataTag.java.diff?r1=1.2r2=1.3 1.3 +1 -4 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpRegistryAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpRegistryAction.java.diff?r1=1.2r2=1.3 1.4 +1 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpServerAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpServerAction.java.diff?r1=1.3r2=1.4 1.3 +1 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LabelTag.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LabelTag.java.diff?r1=1.2r2=1.3 1.3 +1 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LogOutAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LogOutAction.java.diff?r1=1.2r2=1.3 1.5 +1 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/RowTag.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/RowTag.java.diff?r1=1.4r2=1.5 1.3 +1 -3 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetLocaleAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetLocaleAction.java.diff?r1=1.2r2=1.3 1.8 +1 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java.diff?r1=1.7r2=1.8 1.5 +1 -3 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.java.diff?r1=1.4r2=1.5 1.41 +1 -17 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java.diff?r1=1.40r2=1.41 1.5 +1 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestAction.java.diff?r1=1.4r2=1.5
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users DeleteGroupsAction.java DeleteUsersAction.java
markt 2005/03/17 13:38:28
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users
DeleteGroupsAction.java DeleteUsersAction.java
Log:
Support managing users/groups with names containing '=' (and other odd
characters) from within
the admin webapp.
- Port of fixes for 28178 and 34033 from TC5
Revision ChangesPath
1.51 +3 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- MBeanUtils.java 26 Aug 2004 21:36:08 - 1.50
+++ MBeanUtils.java 17 Mar 2005 21:38:28 - 1.51
@@ -1173,7 +1173,7 @@
ObjectName name = null;
name = new ObjectName(domain + :type=Group,groupname= +
- group.getGroupname() + ,database= +
+ encodeStr(group.getGroupname()) + ,database=
+
group.getUserDatabase().getId());
return (name);
@@ -1559,7 +1559,7 @@
ObjectName name = null;
name = new ObjectName(domain + :type=User,username= +
- user.getUsername() + ,database= +
+ encodeStr(user.getUsername()) + ,database= +
user.getUserDatabase().getId());
return (name);
1.4 +4 -2
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java
Index: DeleteGroupsAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeleteGroupsAction.java 17 Mar 2005 20:51:03 - 1.3
+++ DeleteGroupsAction.java 17 Mar 2005 21:38:28 - 1.4
@@ -19,6 +19,7 @@
import java.io.IOException;
+import java.net.URLDecoder;
import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -126,7 +127,8 @@
for (int i = 0; i groups.length; i++) {
ObjectName oname = new ObjectName(groups[i]);
-params[0] = oname.getKeyProperty(groupname);
+params[0] =
+URLDecoder.decode(oname.getKeyProperty(groupname));
mserver.invoke(dname, removeGroup,
params, signature);
}
1.4 +3 -2
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteUsersAction.java
Index: DeleteUsersAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteUsersAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeleteUsersAction.java17 Mar 2005 20:51:03 - 1.3
+++ DeleteUsersAction.java17 Mar 2005 21:38:28 - 1.4
@@ -19,6 +19,7 @@
import java.io.IOException;
+import java.net.URLDecoder;
import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -126,7 +127,7 @@
for (int i = 0; i users.length; i++) {
ObjectName oname = new ObjectName(users[i]);
-params[0] = oname.getKeyProperty(username);
+params[0] =
URLDecoder.decode(oname.getKeyProperty(username));
mserver.invoke(dname, removeUser,
params, signature);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util CustomObjectInputStream.java
markt 2005/03/10 15:50:36
Modified:catalina/src/share/org/apache/catalina/util
CustomObjectInputStream.java
Log:
Fix bug 22041. Dynamic proxies are now supported as sesison objects.
- Implemented using the code from
org.apache.geronimo.network.ResolvingObjectInputStream
Revision ChangesPath
1.5 +21 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java
Index: CustomObjectInputStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CustomObjectInputStream.java 2 Sep 2004 18:45:17 - 1.4
+++ CustomObjectInputStream.java 10 Mar 2005 23:50:36 - 1.5
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
+import java.lang.reflect.Proxy;
/**
* Custom subclass of codeObjectInputStream/code that loads from the
@@ -70,4 +71,23 @@
return Class.forName(classDesc.getName(), false, classLoader);
}
+
+/**
+ * Return a proxy class that implements the interfaces named in a proxy
+ * class descriptor. Do this using the class loader assigned to this
+ * Context.
+ */
+protected Class resolveProxyClass(String[] interfaces)
+throws IOException, ClassNotFoundException {
+
+Class[] cinterfaces = new Class[interfaces.length];
+for (int i = 0; i interfaces.length; i++)
+cinterfaces[i] = classLoader.loadClass(interfaces[i]);
+
+try {
+return Proxy.getProxyClass(classLoader, cinterfaces);
+} catch (IllegalArgumentException e) {
+throw new ClassNotFoundException(null, e);
+}
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationHttpRequest.java
Bill Barker wrote: From: Remy Maucherat [EMAIL PROTECTED] [EMAIL PROTECTED] wrote: markt 2005/01/15 12:27:05 Modified:catalina/src/share/org/apache/catalina/core ApplicationHttpRequest.java Log: Fix bug 28222. request.getRequestURL() in forwarded jsp/servlet returns original url rather than new url as per SRV8.4. Uses same code as CoyoteRequest.getRequestURL() I think the bug report may actually be invalid, because: - getRequestURL is not a path element - the javadoc associated with the method is: Reconstructs the URL the client used to make the request. The returned URL contains a protocol, server name, port number, and server path, but it does not include query string parameters. I don't know for sure, however. Any comments on that ? I'd tend to go with Remy's interpretation, but it is a grey area in the spec. The javadocs for HttpServletRequest.getRequestURI (which is a path element) say to use the deprecated HttpUtils.getRequestURL to construct a URL, which suggests that HttpUtils.getRequestURL should use the path elements. However the javadocs for HttpUtils.getRequestURL are pretty much the same as for HttpServletRequest.getRequestURL, making the picture a bit grey. On re-reading the spec it is less clear than I first thought. Personally I favour leaving the patch as is but would be happy to revert it pending clarification from the spec team. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator FormAuthenticator.java
markt 2005/02/27 10:27:09
Modified:catalina/src/share/org/apache/catalina/authenticator
FormAuthenticator.java
Log:
Fix bug 27128. Request parameters now restored after form authentication if
cache=false
- Ported fix from TC5
Set the notes even when caching. This is harmless from a performance
standpoint,
but since the principal might not be serializable it would cause issues with
SSO and
clustering.
- Ported from TC5
Revision ChangesPath
1.25 +16 -10
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java
Index: FormAuthenticator.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- FormAuthenticator.java7 Jan 2005 09:24:19 - 1.24
+++ FormAuthenticator.java27 Feb 2005 18:27:09 - 1.25
@@ -164,10 +164,12 @@
context.getRealm().authenticate(username, password);
if (principal != null) {
session.setNote(Constants.FORM_PRINCIPAL_NOTE,
principal);
-register(request, response, principal,
- Constants.FORM_METHOD,
- username, password);
-return (true);
+if (!matchRequest(request)) {
+register(request, response, principal,
+ Constants.FORM_METHOD,
+ username, password);
+return (true);
+}
}
if (debug = 1)
log(Reauthentication failed, proceed normally);
@@ -185,6 +187,12 @@
register(request, response, principal, Constants.FORM_METHOD,
(String) session.getNote(Constants.SESS_USERNAME_NOTE),
(String) session.getNote(Constants.SESS_PASSWORD_NOTE));
+// If we're caching principals we no longer need the username
+// and password in the session, so remove them
+if (cache) {
+session.removeNote(Constants.SESS_USERNAME_NOTE);
+session.removeNote(Constants.SESS_PASSWORD_NOTE);
+}
if (restoreRequest(request, session)) {
if (debug = 1)
log(Proceed to restored request);
@@ -274,11 +282,9 @@
// Save the authenticated Principal in our session
session.setNote(Constants.FORM_PRINCIPAL_NOTE, principal);
-// If we are not caching, save the username and password as well
-if (!cache) {
-session.setNote(Constants.SESS_USERNAME_NOTE, username);
-session.setNote(Constants.SESS_PASSWORD_NOTE, password);
-}
+// Save the username and password as well
+session.setNote(Constants.SESS_USERNAME_NOTE, username);
+session.setNote(Constants.SESS_PASSWORD_NOTE, password);
// Redirect the user to the original request URI (which will cause
// the original request to be restored)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationHttpRequest.java
Mark Thomas wrote: On re-reading the spec it is less clear than I first thought. Personally I favour leaving the patch as is but would be happy to revert it pending clarification from the spec team. I'm ok with leaving the patch, as there's nothing which allows saying which behavior is the right one. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationHttpRequest.java
[EMAIL PROTECTED] wrote: markt 2005/01/15 12:27:05 Modified:catalina/src/share/org/apache/catalina/core ApplicationHttpRequest.java Log: Fix bug 28222. request.getRequestURL() in forwarded jsp/servlet returns original url rather than new url as per SRV8.4. Uses same code as CoyoteRequest.getRequestURL() I think the bug report may actually be invalid, because: - getRequestURL is not a path element - the javadoc associated with the method is: Reconstructs the URL the client used to make the request. The returned URL contains a protocol, server name, port number, and server path, but it does not include query string parameters. I don't know for sure, however. Any comments on that ? Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationHttpRequest.java
- Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: Tomcat Developers List tomcat-dev@jakarta.apache.org Sent: Thursday, February 24, 2005 9:04 AM Subject: Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationHttpRequest.java [EMAIL PROTECTED] wrote: markt 2005/01/15 12:27:05 Modified:catalina/src/share/org/apache/catalina/core ApplicationHttpRequest.java Log: Fix bug 28222. request.getRequestURL() in forwarded jsp/servlet returns original url rather than new url as per SRV8.4. Uses same code as CoyoteRequest.getRequestURL() I think the bug report may actually be invalid, because: - getRequestURL is not a path element - the javadoc associated with the method is: Reconstructs the URL the client used to make the request. The returned URL contains a protocol, server name, port number, and server path, but it does not include query string parameters. I don't know for sure, however. Any comments on that ? I'd tend to go with Remy's interpretation, but it is a grey area in the spec. The javadocs for HttpServletRequest.getRequestURI (which is a path element) say to use the deprecated HttpUtils.getRequestURL to construct a URL, which suggests that HttpUtils.getRequestURL should use the path elements. However the javadocs for HttpUtils.getRequestURL are pretty much the same as for HttpServletRequest.getRequestURL, making the picture a bit grey. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config resources.xml
markt 2005/02/21 14:53:44 Modified:webapps/tomcat-docs/config resources.xml Log: As a result of patch for 21818 these attributes are now set on the context. Revision ChangesPath 1.5 +2 -24 jakarta-tomcat-4.0/webapps/tomcat-docs/config/resources.xml Index: resources.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/resources.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- resources.xml 19 Nov 2004 20:52:02 - 1.4 +++ resources.xml 21 Feb 2005 22:53:44 - 1.5 @@ -70,30 +70,8 @@ subsection name=Standard Implementation pThe standard implementation of strongResources/strong is -strongorg.apache.naming.resources.FileDirContext/strong. -It supports the following additional attributes (in addition to the -common attributes listed above):/p - -attributes - - attribute name=cached required=false -pThis boolean flag indicates if the resources should be cached. It -defaults to codetrue/code. This flag only has an effect if the -emcachingAllowed/em attribute of the containing -a href=context.html Context/a is set to codetrue/code./p - /attribute - - attribute name=caseSensitive required=false -pThis is the functional equivalent to the emcaseSensitive/em -of a a href=context.htmlContext/a./p - /attribute - - attribute name=docBase required=false -pThis is the functional equivalent to the emDocument Base/em -of a a href=context.htmlContext/a./p - /attribute - -/attributes +strongorg.apache.naming.resources.FileDirContext/strong, and +is configured by its parent Context element./p /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config context.xml http11.xml
markt 2005/02/21 14:54:23 Modified:webapps/tomcat-docs/config context.xml http11.xml Log: Add warning to docs regarding use of deprecated connector and allowLinking=true Revision ChangesPath 1.15 +5 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/config/context.xml Index: context.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/context.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- context.xml 19 Nov 2004 20:52:02 - 1.14 +++ context.xml 21 Feb 2005 22:54:23 - 1.15 @@ -178,6 +178,11 @@ (or any other OS which does not have a case sensitive filesystem), as it will disable case sensitivity checks, allowing JSP source code disclosure, among other security problems./b/p +pbNOTE: This flag MUST NOT be set to true when using the deprecated +a href=http11.htmlHTTP 1.1/a connector as it will disable checks +that protect against mal-formed requests resulting in JSP source code +disclosure./b/p + /attribute attribute name=cacheTTL required=false 1.7 +6 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/config/http11.xml Index: http11.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/http11.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- http11.xml12 Jan 2003 17:26:48 - 1.6 +++ http11.xml21 Feb 2005 22:54:23 - 1.7 @@ -19,6 +19,12 @@ pbIMPORTANT NOTE: The HTTP/1.1 connector is now deprecated. Use the Coyote HTTP/1.1 connector instead./b/p + pbIMPORTANT NOTE: This connector MUST NOT be used in conjunction + with any a href=context.htmlContext/a element that has the + codeallowLinking/code attribute set to codetrue/code. In this + configuration it is possible for a mal-formed request to result in source + code exposure of JSPs./b/p + pThe strongHTTP/1.1 Connector/strong element represents a strongConnector/strong component that supports the HTTP/1.1 protocol. It enables Catalina to function as a stand-alone web server, in addition - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/bin setclasspath.bat setclasspath.sh
markt 2005/02/15 14:17:53 Modified:catalina/src/bin setclasspath.bat setclasspath.sh Log: Fix bug 26558. Improve error message when there is a problem with JAVA_HOME. - Based on a patch supplied by Kent Schnaith, Revision ChangesPath 1.10 +19 -7 jakarta-tomcat-4.0/catalina/src/bin/setclasspath.bat Index: setclasspath.bat === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/setclasspath.bat,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- setclasspath.bat 12 Feb 2004 21:38:12 - 1.9 +++ setclasspath.bat 15 Feb 2005 22:17:53 - 1.10 @@ -10,13 +10,25 @@ echo This environment variable is needed to run this program goto end :gotJavaHome -if not exist %JAVA_HOME%\bin\java.exe goto noJavaHome -if not exist %JAVA_HOME%\bin\javaw.exe goto noJavaHome -if not exist %JAVA_HOME%\bin\jdb.exe goto noJavaHome -if not exist %JAVA_HOME%\bin\javac.exe goto noJavaHome +if not exist %JAVA_HOME%\bin\java.exe goto noJava +if not exist %JAVA_HOME%\bin\javaw.exe goto noJavaw +if not exist %JAVA_HOME%\bin\jdb.exe goto noJdb +if not exist %JAVA_HOME%\bin\javac.exe goto noJavac goto okJavaHome -:noJavaHome -echo The JAVA_HOME environment variable is not defined correctly +:noJava +echo JAVA_HOME\bin\java.exe is missing +goto badJavaHome +:noJavaw +echo JAVA_HOME\bin\javaw.exe is missing +goto badJavaHome +:noJdb +echo JAVA_HOME\bin\jdb.exe is missing +goto badJavaHome +:noJavac +echo JAVA_HOME\bin\javac.exe is missing +goto badJavaHome +:badJavaHome +echo The JAVA_HOME environment variable may not be defined correctly echo This environment variable is needed to run this program echo NB: JAVA_HOME should point to a JDK not a JRE goto end 1.14 +21 -13jakarta-tomcat-4.0/catalina/src/bin/setclasspath.sh Index: setclasspath.sh === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/setclasspath.sh,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- setclasspath.sh 26 Jul 2004 21:29:42 - 1.13 +++ setclasspath.sh 15 Feb 2005 22:17:53 - 1.14 @@ -10,21 +10,29 @@ echo This environment variable is needed to run this program exit 1 fi -if $os400; then - if [ ! -x $JAVA_HOME/bin/java -o ! -x $JAVA_HOME/bin/javac ]; then -echo The JAVA_HOME environment variable is not defined correctly -echo This environment variable is needed to run this program -echo NB: JAVA_HOME should point to a JDK not a JRE -exit 1 - fi -else - if [ ! -x $JAVA_HOME/bin/java -o ! -x $JAVA_HOME/bin/jdb -o ! -x $JAVA_HOME/bin/javac ]; then -echo The JAVA_HOME environment variable is not defined correctly -echo This environment variable is needed to run this program -echo NB: JAVA_HOME should point to a JDK not a JRE +if [ ! -x $JAVA_HOME/bin/java ]; then + echo Error: The JAVA_HOME/bin/java directory is missing or not executable. + echo The JAVA_HOME environment variable is not defined correctly. + echo This environment variable is needed to run this program. + echo NB: JAVA_HOME should point to a JDK not a JRE. + exit 1 +fi +if [ ! $os400 ]; then + if [ ! -x $JAVA_HOME/bin/jdb ]; then +echo Error: The JAVA_HOME/bin/jdb directory is missing or not executable. +echo The JAVA_HOME environment variable is not defined correctly. +echo This environment variable is needed to run this program. +echo NB: JAVA_HOME should point to a JDK not a JRE. exit 1 fi fi +if [ ! -x $JAVA_HOME/bin/javac ]; then + echo Error: The JAVA_HOME/bin/javac directory is missing or not executable. + echo The JAVA_HOME environment variable is not defined correctly. + echo This environment variable is needed to run this program. + echo NB: JAVA_HOME should point to a JDK not a JRE. + exit 1 +fi if [ -z $BASEDIR ]; then echo The BASEDIR environment variable is not defined echo This environment variable is needed to run this program - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session DistributedManager.java FileStore.java ManagerBase.java PersistentManager.java PersistentManagerBase.java StandardManager.java StandardSession.java StandardSessionFacade.java
markt 2005/02/14 13:21:41
Modified:catalina/src/share/org/apache/catalina/session
DistributedManager.java FileStore.java
ManagerBase.java PersistentManager.java
PersistentManagerBase.java StandardManager.java
StandardSession.java StandardSessionFacade.java
Log:
Clean up Eclipse warnings for o.a.c.session
- remove unused imports
- static access warnings
Revision ChangesPath
1.7 +3 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/DistributedManager.java
Index: DistributedManager.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/DistributedManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DistributedManager.java 26 Aug 2004 21:39:08 - 1.6
+++ DistributedManager.java 14 Feb 2005 21:21:41 - 1.7
@@ -16,17 +16,12 @@
package org.apache.catalina.session;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
import org.apache.catalina.Cluster;
import org.apache.catalina.Container;
import org.apache.catalina.LifecycleException;
@@ -82,14 +77,14 @@
* codelt;descriptiongt;/lt;versiongt;/code.
*/
public String getInfo() {
-return (this.info);
+return (info);
}
/**
* Return the descriptive short name of this Manager implementation.
*/
public String getName() {
-return (this.name);
+return (name);
}
1.13 +1 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java
Index: FileStore.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FileStore.java26 Aug 2004 21:39:08 - 1.12
+++ FileStore.java14 Feb 2005 21:21:41 - 1.13
@@ -25,11 +25,8 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
-import java.io.Serializable;
import java.util.ArrayList;
import javax.servlet.ServletContext;
import org.apache.catalina.Context;
1.21 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Index: ManagerBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ManagerBase.java 26 Aug 2004 21:39:08 - 1.20
+++ ManagerBase.java 14 Feb 2005 21:21:41 - 1.21
@@ -374,7 +374,7 @@
*/
public String getInfo() {
-return (this.info);
+return (info);
}
1.12 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManager.java
Index: PersistentManager.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PersistentManager.java26 Aug 2004 21:39:08 - 1.11
+++ PersistentManager.java14 Feb 2005 21:21:41 - 1.12
@@ -60,7 +60,7 @@
*/
public String getInfo() {
-return (this.info);
+return (info);
}
1.20 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java
Index: PersistentManagerBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PersistentManagerBase.java26 Aug 2004 21:39:08 - 1.19
+++ PersistentManagerBase.java14 Feb 2005 21:21:41 - 1.20
@@ -321,7 +321,7 @@
*/
public String getInfo
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
markt 2005/02/13 11:54:49
Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
- Port Remy's fix for 33463 that was introduced by my (invalid) fix for 32559.
- Aligned start and reload with respect to attributes
- Remaining issue (as TC5) is that stop fires events for the welcome files
Revision ChangesPath
1.129 +21 -21
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/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 16 Jan 2005 18:06:28 - 1.128
+++ StandardContext.java 13 Feb 2005 19:54:49 - 1.129
@@ -2464,13 +2464,6 @@
// Shut down filters
filterStop();
-// Clear all application-originated servlet context attributes
-if (context != null)
-context.clearAttributes();
-
-// Shut down application event listeners
-listenerStop();
-
// Shut down our session manager
if ((manager != null) (manager instanceof Lifecycle)) {
try {
@@ -2495,6 +2488,13 @@
}
}
+// Shut down application event listeners
+listenerStop();
+
+// Clear all application-originated servlet context attributes
+if (context != null)
+context.clearAttributes();
+
if (isUseNaming()) {
// Stop
namingContextListener.lifecycleEvent
@@ -2540,6 +2540,10 @@
// Binding thread
oldCCL = bindThread();
+// Restore the Welcome Files and Resources context attributes
+postResources();
+postWelcomeFiles();
+
// Restart our application event listeners and filters
if (ok) {
if (!listenerStart()) {
@@ -2554,10 +2558,6 @@
}
}
-// Restore the Welcome Files and Resources context attributes
-postResources();
-postWelcomeFiles();
-
// Restart our currently defined servlets
for (int i = 0; i children.length; i++) {
if (!ok)
@@ -3319,9 +3319,9 @@
try {
fireContainerEvent(beforeContextDestroyed, listener);
listener.contextDestroyed(event);
-fireContainerEvent(beforeContextDestroyed, listener);
+fireContainerEvent(afterContextDestroyed, listener);
} catch (Throwable t) {
-fireContainerEvent(beforeContextDestroyed, listener);
+fireContainerEvent(afterContextDestroyed, listener);
log(sm.getString(standardContext.listenerStop,
listeners[j].getClass().getName()), t);
ok = false;
@@ -3695,13 +3695,6 @@
// Stop our filters
filterStop();
-// Clear all application-originated servlet context attributes
-if (context != null)
-context.clearAttributes();
-
-// Stop our application listeners
-listenerStop();
-
// Finalize our character set mapper
setCharsetMapper(null);
@@ -3730,6 +3723,13 @@
((Lifecycle) children[i]).stop();
}
+// Stop our application listeners
+listenerStop();
+
+// Clear all application-originated servlet context attributes
+if (context != null)
+context.clearAttributes();
+
// Stop our Mappers, if any
Mapper mappers[] = findMappers();
for (int i = 0; i mappers.length; i++) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina build.xml
markt 2005/02/08 15:06:30
Modified:catalina build.xml
Log:
Fix bug 10982. include o.a.naming.resources.jndi.Handler in
naming-resources.jar
Revision ChangesPath
1.137 +1 -1 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- build.xml 27 Dec 2004 00:05:41 - 1.136
+++ build.xml 8 Feb 2005 23:06:30 - 1.137
@@ -1173,7 +1173,7 @@
!-- Naming - Resources JAR File --
jar jarfile=${catalina.deploy}/common/lib/naming-resources.jar
fileset dir=${catalina.build}/server/classes
-include name=org/apache/naming/resources/* /
+include name=org/apache/naming/resources/** /
/fileset
/jar
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/jndi Handler.java
markt 2005/02/04 14:08:03 Modified:catalina/src/share/org/apache/naming ContextAccessController.java EjbRef.java JndiPermission.java NamingContextBindingsEnumeration.java NamingContextEnumeration.java ResourceEnvRef.java ResourceLinkRef.java ResourceRef.java StringManager.java TransactionRef.java catalina/src/share/org/apache/naming/factory ResourceLinkFactory.java TyrexResourceFactory.java TyrexTransactionFactory.java catalina/src/share/org/apache/naming/resources BaseDirContext.java DirContextURLStreamHandler.java DirContextURLStreamHandlerFactory.java FileDirContext.java ProxyDirContext.java RecyclableNamingEnumeration.java ResourceAttributes.java catalina/src/share/org/apache/naming/resources/jndi Handler.java Log: Remove unused imports (identified by Eclipse) from o.a.naming package. Revision ChangesPath 1.5 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ContextAccessController.java Index: ContextAccessController.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/ContextAccessController.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ContextAccessController.java 26 Aug 2004 21:46:17 - 1.4 +++ ContextAccessController.java 4 Feb 2005 22:08:02 - 1.5 @@ -18,7 +18,6 @@ package org.apache.naming; import java.util.Hashtable; -import javax.naming.NamingException; /** * Handles the access control on the JNDI contexts. 1.4 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/EjbRef.java Index: EjbRef.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/EjbRef.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- EjbRef.java 26 Aug 2004 21:46:17 - 1.3 +++ EjbRef.java 4 Feb 2005 22:08:02 - 1.4 @@ -17,7 +17,6 @@ package org.apache.naming; -import java.util.Hashtable; import javax.naming.Reference; import javax.naming.Context; import javax.naming.StringRefAddr; 1.4 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/JndiPermission.java Index: JndiPermission.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/JndiPermission.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JndiPermission.java 26 Aug 2004 21:46:17 - 1.3 +++ JndiPermission.java 4 Feb 2005 22:08:02 - 1.4 @@ -18,7 +18,6 @@ package org.apache.naming; import java.security.BasicPermission; -import java.security.Permission; /** * Java SecurityManager Permission class for JNDI name based file resources 1.3 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContextBindingsEnumeration.java Index: NamingContextBindingsEnumeration.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContextBindingsEnumeration.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NamingContextBindingsEnumeration.java 26 Aug 2004 21:46:17 - 1.2 +++ NamingContextBindingsEnumeration.java 4 Feb 2005 22:08:02 - 1.3 @@ -17,7 +17,6 @@ package org.apache.naming; -import java.util.Hashtable; import java.util.Vector; import java.util.Enumeration; import javax.naming.NamingException; 1.3 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContextEnumeration.java Index: NamingContextEnumeration.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContextEnumeration.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NamingContextEnumeration.java 26 Aug 2004 21:46:17 - 1.2 +++ NamingContextEnumeration.java 4 Feb 2005 22:08:02 - 1.3 @@ -17,7 +17,6 @@ package org.apache.naming; -import java.util.Hashtable; import java.util.Vector; import java.util.Enumeration; import javax.naming.NamingException; 1.3 +1 -3 jakarta
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm DataSourceRealm.java LocalStrings.properties
markt 2005/02/03 14:47:07
Modified:catalina/src/share/org/apache/catalina/realm
DataSourceRealm.java LocalStrings.properties
Log:
Port fix for bug 33357 from TC5.
- Fixes connection leaks
- Improves efficiency
- Submitted by Dominik Drzewiecki
Revision ChangesPath
1.5 +100 -88
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
Index: DataSourceRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DataSourceRealm.java 27 Nov 2004 18:29:44 - 1.4
+++ DataSourceRealm.java 3 Feb 2005 22:47:07 - 1.5
@@ -245,6 +245,11 @@
*/
public Principal authenticate(String username, String credentials) {
+// No user - can't possibly authenticate, don't bother the database
then
+if (username == null) {
+return null;
+}
+
Connection dbConnection = null;
try {
@@ -257,32 +262,17 @@
}
// Acquire a Principal object for this user
-Principal principal = authenticate(dbConnection,
- username, credentials);
-
-if( !dbConnection.getAutoCommit() ) {
-dbConnection.commit();
-}
-
-// Release the database connection we just used
-close(dbConnection);
-dbConnection = null;
-
-// Return the Principal (if any)
-return (principal);
+return authenticate(dbConnection, username, credentials);
} catch (SQLException e) {
-
// Log the problem for posterity
log(sm.getString(dataSourceRealm.exception), e);
-// Close the connection so that it gets reopened next time
-if (dbConnection != null)
-close(dbConnection);
-
// Return not authenticated for this request
return (null);
+} finally {
+close(dbConnection);
}
}
@@ -305,17 +295,11 @@
*
* @exception SQLException if a database error occurs
*/
-private Principal authenticate(Connection dbConnection,
- String username,
- String credentials) {
-
+protected Principal authenticate(Connection dbConnection,
+ String username,
+ String credentials) throws SQLException
{
-// No user - can't possibly authenticate
-if (username == null) {
-return (null);
-}
-
-String dbCredentials = getPassword(username);
+String dbCredentials = getPassword(dbConnection, username);
// Validate the user's credentials
boolean validated = false;
@@ -336,7 +320,7 @@
return (null);
}
-ArrayList list = getRoles(username);
+ArrayList list = getRoles(dbConnection, username);
// Create and return a suitable Principal for this user
return (new GenericPrincipal(this, username, credentials, list));
@@ -357,6 +341,9 @@
// Close this database connection, and log any errors
try {
+if (!dbConnection.getAutoCommit()) {
+dbConnection.commit();
+}
dbConnection.close();
} catch (SQLException e) {
log(sm.getString(dataSourceRealm.close), e); // Just log it
here
@@ -386,28 +373,6 @@
/**
- * Return a PreparedStatement configured to perform the SELECT required
- * to retrieve user credentials for the specified username.
- *
- * @param dbConnection The database connection to be used
- * @param username Username for which credentials should be retrieved
- *
- * @exception SQLException if a database error occurs
- */
-private PreparedStatement credentials(Connection dbConnection,
-String username)
-throws SQLException {
-
-PreparedStatement credentials =
-dbConnection.prepareStatement(preparedCredentials.toString());
-
-credentials.setString(1, username);
-return (credentials);
-
-}
-
-
-/**
* Return a short name for this Realm implementation.
*/
protected String getName() {
@@ -422,9 +387,6 @@
*/
protected String getPassword(String username) {
-ResultSet rs
cvs commit: jakarta-tomcat-4.0 tomcat.nsi
markt 2005/02/03 15:39:18
Modified:.tomcat.nsi
Log:
Fix bug 23277. Make clear WebDAV is one of the exmaple web apps in the windows
installer.
- Also upgraded to use modern UI.
Revision ChangesPath
1.39 +57 -35jakarta-tomcat-4.0/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- tomcat.nsi9 Sep 2004 20:46:57 - 1.38
+++ tomcat.nsi3 Feb 2005 23:39:18 - 1.39
@@ -1,6 +1,7 @@
; Tomcat 4 script for Nullsoft Installer
; $Id$
+!include MUI.nsh
Name Apache Tomcat 4.1
OutFile tomcat4.exe
@@ -9,38 +10,31 @@
SetCompressor lzma
SetDatablockOptimize on
-BGGradient 00 80 FF
-InstallColors FF8080 00
-InstProgressFlags smooth colored
-
!include StrFunc.nsh
${StrRep}
-PageEx license
- LicenseText You must read the following license before installing:
- LicenseData INSTALLLICENSE
-PageExEnd
-
-PageEx components
- ComponentText This will install the Apache Tomcat 4.1 servlet container
on your computer:
-PageExEnd
-
-PageEx directory
- DirText Please select a location to install Tomcat 4.1 (or use the
default):
-PageExEnd
+!define MUI_COMPONENTSPAGE_SMALLDESC
+
+!insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
+
+!define MUI_COMPONENTSPAGE_TEXT_TOP This will install the Apache Tomcat 4.1
servlet container on your computer:
+!insertmacro MUI_PAGE_COMPONENTS
+
+!define MUI_DIRECTORYPAGE_TEXT_TOP Please select a location to install
Tomcat 4.1 (or use the default):
+!insertmacro MUI_PAGE_DIRECTORY
+
+!insertmacro MUI_PAGE_INSTFILES
-Page instfiles
Page custom configure : Basic settings
-UninstPage uninstConfirm
-UninstPage instfiles
-
-Icon main.ico
-UninstallIcon uninst.ico
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE English
InstType Normal
InstType Minimum
-InstType Full (w/ Source Code)
+InstType Full (with source code)
AutoCloseWindow false
ShowInstDetails show
SetOverwrite on
@@ -49,10 +43,14 @@
InstallDir $PROGRAMFILES\Apache Group\Tomcat 4.1
InstallDirRegKey HKLM SOFTWARE\Apache Group\Tomcat\4.1
-SubSection /e Main
- Section Tomcat (required)
+ReserveFile config.ini
+!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+!insertmacro MUI_RESERVEFILE_LANGDLL
-SectionIn 1 2 3
+SubSection /e Main Section1
+ Section Tomcat (required) Section2
+
+SectionIn 1 2 3 RO
SetOutPath $INSTDIR
File tomcat.ico
@@ -78,7 +76,7 @@
SectionEnd
- Section NT Service (NT/2k/XP only)
+ Section NT Service (NT/2k/XP only) Section3
SectionIn 3
@@ -94,7 +92,7 @@
SectionEnd
- Section JSP Development Shell Extensions
+ Section JSP Development Shell Extensions Section4
SectionIn 1 2 3
; back up old value of .jsp
@@ -113,7 +111,7 @@
SectionEnd
- Section Tomcat Start Menu Group
+ Section Tomcat Start Menu Group Section5
SectionIn 1 2 3
@@ -144,8 +142,8 @@
SectionEnd
SubSectionEnd
-SubSection Documentation and Examples
- Section Tomcat Documentation
+SubSection Documentation and Examples Section6
+ Section Tomcat Documentation Section7
SectionIn 1 3
SetOutPath $INSTDIR\webapps
@@ -162,7 +160,7 @@
SectionEnd
- Section Example Web Applications
+ Section Example Web Applications Section8
SectionIn 1 3
@@ -177,9 +175,9 @@
SectionEnd
SubSEctionEnd
-SubSection Developer Resources
+SubSection Developer Resources Section9
- Section Tomcat Source Code
+ Section Tomcat Source Code Section10
SectionIn 3
SetOutPath $INSTDIR
@@ -190,6 +188,30 @@
SubSectionEnd
+LangString DESC_Section1 ${LANG_ENGLISH} The core Tomcat components.
+LangString DESC_Section2 ${LANG_ENGLISH} The Tomcat servlet container.
+LangString DESC_Section3 ${LANG_ENGLISH} Additional files and configuration
to enable Tomcat to be run as a Windows service.
+LangString DESC_Section4 ${LANG_ENGLISH} Configure NotePad as the default
editor for JSP files.
+LangString DESC_Section5 ${LANG_ENGLISH} Add Tomcat icons to the Start
menu.
+LangString DESC_Section6 ${LANG_ENGLISH} Optional web applications.
+LangString DESC_Section7 ${LANG_ENGLISH} Deploys the documentation web
aplication.
+LangString DESC_Section8 ${LANG_ENGLISH} Deploys the JSP servlets
examples web application and the WebDAV example web application.
+LangString DESC_Section9 ${LANG_ENGLISH} Optional resource for developers.
+LangString DESC_Section10 ${LANG_ENGLISH} Places the Tomcat and Tomcat
Connector source code
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Bootstrap.java BootstrapService.java ClassLoaderFactory.java EmbeddedManager.java EmbeddedManagerMBean.java EngineConfig.java EngineRuleSet.java HostRuleSet.java NamingRuleSet.java TldRuleSet.java Tool.java UserConfig.java
markt 2005/02/03 15:53:43 Modified:catalina/src/share/org/apache/catalina/startup Bootstrap.java BootstrapService.java ClassLoaderFactory.java EmbeddedManager.java EmbeddedManagerMBean.java EngineConfig.java EngineRuleSet.java HostRuleSet.java NamingRuleSet.java TldRuleSet.java Tool.java UserConfig.java Log: Remove unused imports in o.a.c.startup package Revision ChangesPath 1.38 +1 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java Index: Bootstrap.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- Bootstrap.java26 Aug 2004 21:41:12 - 1.37 +++ Bootstrap.java3 Feb 2005 23:53:43 - 1.38 @@ -19,13 +19,7 @@ import java.io.File; -import java.io.IOException; import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import org.apache.catalina.loader.Extension; -import org.apache.catalina.loader.StandardClassLoader; /** 1.19 +1 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java Index: BootstrapService.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- BootstrapService.java 26 Aug 2004 21:41:12 - 1.18 +++ BootstrapService.java 3 Feb 2005 23:53:43 - 1.19 @@ -19,15 +19,9 @@ import java.io.File; -import java.io.IOException; import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; import org.apache.commons.daemon.Daemon; import org.apache.commons.daemon.DaemonContext; -import org.apache.catalina.loader.Extension; -import org.apache.catalina.loader.StandardClassLoader; /** 1.10 +1 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java Index: ClassLoaderFactory.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ClassLoaderFactory.java 26 Aug 2004 21:41:12 - 1.9 +++ ClassLoaderFactory.java 3 Feb 2005 23:53:43 - 1.10 @@ -19,11 +19,8 @@ import java.io.File; -import java.io.IOException; import java.net.URL; import java.util.ArrayList; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; import org.apache.catalina.loader.StandardClassLoader; 1.6 +1 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/EmbeddedManager.java Index: EmbeddedManager.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/EmbeddedManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- EmbeddedManager.java 26 Aug 2004 21:41:12 - 1.5 +++ EmbeddedManager.java 3 Feb 2005 23:53:43 - 1.6 @@ -18,17 +18,11 @@ import java.net.InetAddress; import org.apache.catalina.Connector; -import org.apache.catalina.Container; import org.apache.catalina.Context; import org.apache.catalina.Engine; import org.apache.catalina.Host; -import org.apache.catalina.Lifecycle; -import org.apache.catalina.LifecycleEvent; -import org.apache.catalina.LifecycleException; -import org.apache.catalina.LifecycleListener; import org.apache.catalina.Logger; import org.apache.catalina.Realm; -import org.apache.catalina.connector.http.HttpConnector; import javax.management.NotificationBroadcasterSupport; import javax.management.ObjectName; import javax.management.MBeanServer; 1.6 +1 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/EmbeddedManagerMBean.java Index: EmbeddedManagerMBean.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/EmbeddedManagerMBean.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- EmbeddedManagerMBean.java 26 Aug 2004 21:41:13 - 1.5 +++ EmbeddedManagerMBean.java 3 Feb
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config globalresources.xml
markt 2005/01/21 11:24:13 Modified:webapps/tomcat-docs/config globalresources.xml Log: Port improved into text from TC5. Should prevent bugs like 27158. Revision ChangesPath 1.3 +11 -3 jakarta-tomcat-4.0/webapps/tomcat-docs/config/globalresources.xml Index: globalresources.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/globalresources.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- globalresources.xml 12 Jan 2003 17:26:48 - 1.2 +++ globalresources.xml 21 Jan 2005 19:24:13 - 1.3 @@ -16,9 +16,17 @@ section name=Introduction - pThe strongGlobalNamingResources/strong element represents the global - JNDI resources which are defined - for the a href=server.htmlServer/a./p + pThe strongGlobalNamingResources/strong element defines the global + JNDI resources for the a href=server.htmlServer/a./p + + pThese resources are listed in the server's global JNDI resource context. + This context is distinct from the per-web-application JNDI contexts + described in + the a href=../jndi-resources-howto.htmlJNDI Resources HOW-TO/a. + The resources defined in this element are strongnot/strong visible in + the per-web-application contexts unless you explicitly link them with + a href=context.html#Resource Linkslt;ResourceLinkgt;/a elements. + /p /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
markt 2005/01/16 10:06:28
Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
Fix bug 25508. Multiple services configured with engines of the same name
cause JNDI lookups to fail in all but the first engine to be created. Use the
service name (which has to be unique) rather than the engine name when
building the NamingContext name.
Revision ChangesPath
1.128 +34 -20
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- StandardContext.java 24 Dec 2004 16:48:18 - 1.127
+++ StandardContext.java 16 Jan 2005 18:06:28 - 1.128
@@ -42,6 +42,7 @@
import org.apache.catalina.Container;
import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
+import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.Globals;
import org.apache.catalina.InstanceListener;
@@ -53,6 +54,7 @@
import org.apache.catalina.Mapper;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
+import org.apache.catalina.Service;
import org.apache.catalina.Wrapper;
import org.apache.catalina.deploy.ApplicationParameter;
import org.apache.catalina.deploy.ContextEjb;
@@ -3943,25 +3945,37 @@
* Get naming context full name.
*/
private String getNamingContextName() {
- if (namingContextName == null) {
- Container parent = getParent();
- if (parent == null) {
- namingContextName = getName();
- } else {
- Stack stk = new Stack();
- StringBuffer buff = new StringBuffer();
- while (parent != null) {
- stk.push(parent.getName());
- parent = parent.getParent();
- }
- while (!stk.empty()) {
- buff.append(/ + stk.pop());
- }
- buff.append(getName());
- namingContextName = buff.toString();
- }
- }
- return namingContextName;
+if (namingContextName == null) {
+Container parent = getParent();
+if (parent == null) {
+namingContextName = getName();
+} else {
+Stack stk = new Stack();
+StringBuffer buff = new StringBuffer();
+while (parent != null) {
+// Use service name rather than engine name to guarantee
+// uniqueness - fixes bug 25508
+if (parent instanceof Engine) {
+Service service = ((Engine) parent).getService();
+if (service == null) {
+// use engine name anyway
+stk.push(parent.getName());
+} else {
+stk.push(service.getName());
+}
+} else {
+stk.push(parent.getName());
+}
+parent = parent.getParent();
+}
+while (!stk.empty()) {
+buff.append(/ + stk.pop());
+}
+buff.append(getName());
+namingContextName = buff.toString();
+}
+}
+return namingContextName;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
[EMAIL PROTECTED] wrote: markt 2005/01/16 10:06:28 Modified:catalina/src/share/org/apache/catalina/core StandardContext.java Log: Fix bug 25508. Multiple services configured with engines of the same name cause JNDI lookups to fail in all but the first engine to be created. Use the service name (which has to be unique) rather than the engine name when building the NamingContext name. Please don't try porting this fix (which is very risky) as I would have to veto it. Service name, engine name, and JMX domain are all tied in TC 5. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
FWIW I also did some testing around this on TC5. Multiple services that
each contain an engine with the same name creates all sorts of
confusion. It behaves as if the same engine is shared by multiple
services but I haven't looked at the code yet so I am not 100% sure what
is actually going on.
Until I figure out what is going on the work-around (for those few users
who might have this setup) is simple - use different names for the each
engine.
Mark
[EMAIL PROTECTED] wrote:
markt 2005/01/16 10:06:28
Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
Fix bug 25508. Multiple services configured with engines of the same name
cause JNDI lookups to fail in all but the first engine to be created. Use the
service name (which has to be unique) rather than the engine name when
building the NamingContext name.
Revision ChangesPath
1.128 +34 -20jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- StandardContext.java 24 Dec 2004 16:48:18 - 1.127
+++ StandardContext.java 16 Jan 2005 18:06:28 - 1.128
@@ -42,6 +42,7 @@
import org.apache.catalina.Container;
import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
+import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.Globals;
import org.apache.catalina.InstanceListener;
@@ -53,6 +54,7 @@
import org.apache.catalina.Mapper;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
+import org.apache.catalina.Service;
import org.apache.catalina.Wrapper;
import org.apache.catalina.deploy.ApplicationParameter;
import org.apache.catalina.deploy.ContextEjb;
@@ -3943,25 +3945,37 @@
* Get naming context full name.
*/
private String getNamingContextName() {
- if (namingContextName == null) {
- Container parent = getParent();
- if (parent == null) {
- namingContextName = getName();
- } else {
- Stack stk = new Stack();
- StringBuffer buff = new StringBuffer();
- while (parent != null) {
- stk.push(parent.getName());
- parent = parent.getParent();
- }
- while (!stk.empty()) {
- buff.append(/ + stk.pop());
- }
- buff.append(getName());
- namingContextName = buff.toString();
- }
- }
- return namingContextName;
+if (namingContextName == null) {
+Container parent = getParent();
+if (parent == null) {
+namingContextName = getName();
+} else {
+Stack stk = new Stack();
+StringBuffer buff = new StringBuffer();
+while (parent != null) {
+// Use service name rather than engine name to guarantee
+// uniqueness - fixes bug 25508
+if (parent instanceof Engine) {
+Service service = ((Engine) parent).getService();
+if (service == null) {
+// use engine name anyway
+stk.push(parent.getName());
+} else {
+stk.push(service.getName());
+}
+} else {
+stk.push(parent.getName());
+}
+parent = parent.getParent();
+}
+while (!stk.empty()) {
+buff.append(/ + stk.pop());
+}
+buff.append(getName());
+namingContextName = buff.toString();
+}
+}
+return namingContextName;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
Remy Maucherat wrote: [EMAIL PROTECTED] wrote: markt 2005/01/16 10:06:28 Modified:catalina/src/share/org/apache/catalina/core StandardContext.java Log: Fix bug 25508. Multiple services configured with engines of the same name cause JNDI lookups to fail in all but the first engine to be created. Use the service name (which has to be unique) rather than the engine name when building the NamingContext name. Please don't try porting this fix (which is very risky) as I would have to veto it. Service name, engine name, and JMX domain are all tied in TC 5. Do you mean risky in general or risky in TC5? I understand why it would be in TC5 but not in the general case. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
Mark Thomas wrote: Do you mean risky in general or risky in TC5? I understand why it would be in TC5 but not in the general case. I meant that the patch touches a sensitive area, which makes it risky. I didn't really read it (I don't use 4.1 anymore), so it will likely be fine :) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
Mark Thomas wrote: FWIW I also did some testing around this on TC5. Multiple services that each contain an engine with the same name creates all sorts of confusion. It behaves as if the same engine is shared by multiple services but I haven't looked at the code yet so I am not 100% sure what is actually going on. Until I figure out what is going on the work-around (for those few users who might have this setup) is simple - use different names for the each engine. Yes, there's still redundant data in this area (name on both the engine and service), and not enough checks are done. Engine names must be unique, and should match the associated service name (as at the end, it ends up being used as the JMX domain). One cleanup area I missed in 5.5 development. I suppose there was far more urgent cleanup to do, and we can now focus on details that were overlooked :) (but after Yoav tags 5.5.7, thx ;) ) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
- Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: Tomcat Developers List tomcat-dev@jakarta.apache.org Sent: Sunday, January 16, 2005 10:38 AM Subject: Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java Mark Thomas wrote: FWIW I also did some testing around this on TC5. Multiple services that each contain an engine with the same name creates all sorts of confusion. It behaves as if the same engine is shared by multiple services but I haven't looked at the code yet so I am not 100% sure what is actually going on. Until I figure out what is going on the work-around (for those few users who might have this setup) is simple - use different names for the each engine. Yes, there's still redundant data in this area (name on both the engine and service), and not enough checks are done. Engine names must be unique, and should match the associated service name (as at the end, it ends up being used as the JMX domain). One cleanup area I missed in 5.5 development. I suppose there was far more urgent cleanup to do, and we can now focus on details that were overlooked :) (but after Yoav tags 5.5.7, thx ;) ) Yes, merging the Engine and the Service would have been a nice cleanup for 5.5, but wasn't as urgent as the other stuff. For example, from the JMX OName point of view, it looks like it should be possible to have multiple Services attached to the same Engine (but you certainly can't have multiple Engines with the same Service). Given that 5.5 has had a stable release, it's probably not a good idea to do this in that branch. Possibly something for the TC 6 release plan. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves LocalStrings_fr.properties
markt 2005/01/15 06:11:02 Modified:catalina/src/share/org/apache/catalina/authenticator LocalStrings_fr.properties catalina/src/share/org/apache/catalina/cluster LocalStrings_fr.properties catalina/src/share/org/apache/catalina/connector LocalStrings_fr.properties catalina/src/share/org/apache/catalina/connector/http10 LocalStrings_fr.properties catalina/src/share/org/apache/catalina/connector/http LocalStrings_fr.properties catalina/src/share/org/apache/catalina/core LocalStrings_fr.properties catalina/src/share/org/apache/catalina/loader LocaStrings_fr.properties catalina/src/share/org/apache/catalina/logger LocalStrings_fr.properties catalina/src/share/org/apache/catalina/realm LocalStrings_fr.properties catalina/src/share/org/apache/catalina/servlets LocalStrings_fr.properties catalina/src/share/org/apache/catalina/session LocalStrings_fr.properties catalina/src/share/org/apache/catalina/startup LocalStrings_fr.properties catalina/src/share/org/apache/catalina/util LocalStrings_fr.properties catalina/src/share/org/apache/catalina/valves LocalStrings_fr.properties Log: Fix bug 28849. Update french translations. - Patch provided by Stephane Bailliez Revision ChangesPath 1.2 +8 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/LocalStrings_fr.properties Index: LocalStrings_fr.properties === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/LocalStrings_fr.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LocalStrings_fr.properties6 Nov 2002 09:21:18 - 1.1 +++ LocalStrings_fr.properties15 Jan 2005 14:11:01 - 1.2 @@ -1,12 +1,13 @@ -authenticator.alreadyStarted=L''intercepteur de sécurité (security interceptor) a déjà été démarré +authenticator.alreadyStarted=L'intercepteur de sécurité (security interceptor) a déjà été démarré authenticator.certificates=Aucune chaîne de certificat client (client certificate chain) dans cette requête -authenticator.forbidden=L''accès à la ressource demandée a été interdit -authenticator.formlogin=Référence directe à la form de connexion (form login page) invalide +authenticator.forbidden=L'accès à la ressource demandée a été interdit +authenticator.formlogin=Référence directe au formulaire d'authentification (form login page) invalide authenticator.invalid=Chaîne de certificat client invalide dans cette requête authenticator.keystore=Exception lors du chargement du référentiel de clefs (key store) -authenticator.manager=Exception lors de l''initialisation des gestionnaires d''authentification (trust managers) -authenticator.notAuthenticated=Erreur de configuration: Impossible de procéder à un contrôle d''accès sans un principal authentifié (authenticated principal) +authenticator.manager=Exception lors de l'initialisation des gestionnaires d'authentification (trust managers) +authenticator.notAuthenticated=Erreur de configuration: Impossible de procéder à un contrôle d'accès sans un utilisateur authentifié (authenticated principal) authenticator.notContext=Erreur de configuration: Doit être attaché à un contexte -authenticator.notStarted=L''intercepteur de sécurité (security interceptor) n''a pas encore été démarré -authenticator.unauthorized=Impossible d''authentifier avec les crédits fournis (provided credentials) +authenticator.notStarted=L'intercepteur de sécurité (security interceptor) n'a pas encore été démarré +authenticator.sessionExpired=Le temps alloué pour le processus d'authentification a expiré. Si vous souhaitez continuer, vous devez soit revenir en deux fois en arrière et re-cliquer sur le lien, ou bien fermer et réouvrir votre navigateur +authenticator.unauthorized=Impossible d'authentifier avec les crédits fournis (provided credentials) authenticator.userDataConstraint=Cette requête viole une contrainte donnée utilisateur (user data constraint) pour cette application 1.2 +1 -1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/LocalStrings_fr.properties Index: LocalStrings_fr.properties === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationHttpRequest.java
markt 2005/01/15 12:27:05
Modified:catalina/src/share/org/apache/catalina/core
ApplicationHttpRequest.java
Log:
Fix bug 28222. request.getRequestURL() in forwarded jsp/servlet returns
original url rather than new url as per SRV8.4. Uses same code as
CoyoteRequest.getRequestURL()
Revision ChangesPath
1.15 +28 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ApplicationHttpRequest.java 22 Dec 2004 23:12:50 - 1.14
+++ ApplicationHttpRequest.java 15 Jan 2005 20:27:05 - 1.15
@@ -325,6 +325,33 @@
/**
+ * Override the codegetRequestURL()/code method of the wrapped
+ * request.
+ */
+public StringBuffer getRequestURL() {
+
+StringBuffer url = new StringBuffer();
+String scheme = getScheme();
+int port = getServerPort();
+if (port 0)
+port = 80; // Work around java.net.URL bug
+
+url.append(scheme);
+url.append(://);
+url.append(getServerName());
+if ((scheme.equals(http) (port != 80))
+|| (scheme.equals(https) (port != 443))) {
+url.append(':');
+url.append(port);
+}
+url.append(getRequestURI());
+
+return (url);
+
+}
+
+
+/**
* Override the codegetServletPath()/code method of the wrapped
* request.
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets LocalStrings.properties LocalStrings_ja.properties ManagerServlet.java
markt 2005/01/14 14:47:39
Modified:catalina/src/share/org/apache/catalina/servlets
LocalStrings.properties LocalStrings_ja.properties
ManagerServlet.java
Log:
Fix bug 28830. ManagerServlet broken for deploy (undeploy)
- Based on a patch provided by Stephane Bailliez
Revision ChangesPath
1.22 +2 -0
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- LocalStrings.properties 11 Jan 2003 21:10:28 - 1.21
+++ LocalStrings.properties 14 Jan 2005 22:47:38 - 1.22
@@ -52,6 +52,8 @@
managerServlet.deployed=OK - Deployed application at context path {0}
managerServlet.exception=FAIL - Encountered exception {0}
managerServlet.installed=OK - Installed application at context path {0}
+managerServlet.installUploadFail=FAIL - Install Upload Failed, Exception: {0}
+managerServlet.installUploadWarExists=FAIL - War file \{0}\ already exists
on server
managerServlet.invalidPath=FAIL - Invalid context path {0} was specified
managerServlet.invalidWar=FAIL - Invalid application URL {0} was specified
managerServlet.listed=OK - Listed applications for virtual host {0}
1.7 +2 -0
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/LocalStrings_ja.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LocalStrings_ja.properties4 Mar 2003 17:22:15 - 1.6
+++ LocalStrings_ja.properties14 Jan 2005 22:47:38 - 1.7
@@ -52,6 +52,8 @@
managerServlet.deployed=OK -
\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0}
\u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u3057\u307e\u3057\u305f
managerServlet.exception=\u5931\u6557 - \u4f8b\u5916 {0}
\u304c\u767a\u751f\u3057\u307e\u3057\u305f
managerServlet.installed=OK -
\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0}
\u306b\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3057\u305f
+managerServlet.installUploadFail=\u5931\u6557 -
\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3001\u4f8b\u5916:
{0}
+managerServlet.installUploadWarExists=\u5931\u6557 -
WAR\u30d5\u30a1\u30a4\u30eb \{0}\
\u306f\u3059\u3067\u306b\u30b5\u30fc\u30d0\u4e0a\u306b\u5b58\u5728\u3057\u307e\u3059
managerServlet.invalidPath=\u5931\u6557 -
\u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0}
\u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f
managerServlet.invalidWar=\u5931\u6557 -
\u7121\u52b9\u306a\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306eURL {0}
\u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f
managerServlet.listed=OK - \u30d0\u30fc\u30c1\u30e3\u30eb\u30db\u30b9\u30c8
{0}
\u306e\u30ea\u30b9\u30c8\u3055\u308c\u305f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
1.36 +48 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java
Index: ManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ManagerServlet.java 5 Jan 2005 11:54:37 - 1.35
+++ ManagerServlet.java 14 Jan 2005 22:47:38 - 1.36
@@ -475,17 +475,42 @@
return;
}
+// Identify the appBase of the owning Host of this Context
+// (if any)
+String appBase = ((Host) context.getParent()).getAppBase();
+File appBaseDir = new File(appBase);
+if (!appBaseDir.isAbsolute()) {
+appBaseDir = new File(System.getProperty(catalina.base),
+ appBase);
+}
+File localWar = new File(appBaseDir, basename + .war);
+if (localWar.exists()) {
+writer.println(sm.getString
+(managerServlet.installUploadWarExists,localWar));
+return;
+}
+
// Upload the web application archive to a local WAR file
-File localWar = new File(deployed, basename + .war);
+File tempWar = new File(deployed, localWar.getName
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets HTMLManagerServlet.java
markt 2005/01/14 14:55:22
Modified:catalina/src/share/org/apache/catalina/servlets
HTMLManagerServlet.java
Log:
Better align upload behaviour of Manager HTMLManager
Revision ChangesPath
1.20 +38 -13
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java
Index: HTMLManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- HTMLManagerServlet.java 5 Jan 2005 11:54:37 - 1.19
+++ HTMLManagerServlet.java 14 Jan 2005 22:55:22 - 1.20
@@ -21,8 +21,8 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
import java.text.MessageFormat;
import java.util.Iterator;
import java.util.List;
@@ -36,8 +36,8 @@
import org.apache.catalina.Host;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
-import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.DiskFileUpload;
+import org.apache.commons.fileupload.FileItem;
/**
* Servlet that enables remote management of the web applications installed
@@ -145,8 +145,11 @@
response.setLocale(locale);
response.setContentType(text/html; charset= + charset);
-String message = ;
+StringWriter stringWriter = new StringWriter();
+PrintWriter writer = new PrintWriter(stringWriter);
+boolean uploadFailed = true;
+
// Create a new file upload handler
DiskFileUpload upload = new DiskFileUpload();
@@ -160,6 +163,8 @@
// Parse the request
String war = null;
FileItem warUpload = null;
+File xmlFile = null;
+
try {
List items = upload.parseRequest(request);
@@ -179,14 +184,14 @@
}
while(true) {
if (warUpload == null) {
-message = sm.getString
-(htmlManagerServlet.installUploadNoFile);
+writer.println(sm.getString
+(htmlManagerServlet.installUploadNoFile));
break;
}
war = warUpload.getName();
if (!war.toLowerCase().endsWith(.war)) {
-message = sm.getString
-(htmlManagerServlet.installUploadNotWar,war);
+writer.println(sm.getString
+(htmlManagerServlet.installUploadNotWar,war));
break;
}
// Get the filename if uploaded name includes a path
@@ -196,6 +201,9 @@
if (war.lastIndexOf('/') = 0) {
war = war.substring(war.lastIndexOf('/') + 1);
}
+
+String xmlName = war.substring(0,war.length()-4) + .xml;
+
// Identify the appBase of the owning Host of this Context
// (if any)
String appBase = null;
@@ -208,8 +216,8 @@
}
File file = new File(appBaseDir,war);
if (file.exists()) {
-message = sm.getString
-(htmlManagerServlet.installUploadWarExists,war);
+writer.println(sm.getString
+(htmlManagerServlet.installUploadWarExists,war));
break;
}
warUpload.write(file);
@@ -221,12 +229,20 @@
file.delete();
throw e;
}
+
+// Extract the context.xml file, if any
+xmlFile = new File(appBaseDir, xmlName);
+extractXml(file, xmlFile);
+
+uploadFailed = false;
+
break;
}
} catch(Exception e) {
-message = sm.getString
+String message = sm.getString
(htmlManagerServlet.installUploadFail, e.getMessage());
log(message, e);
+writer.println(message);
} finally {
if (warUpload != null) {
warUpload.delete();
@@ -234,11 +250,19 @@
warUpload = null;
}
+// Define the context.xml URL if present
+String xmlURL = null;
+if (xmlFile != null xmlFile.exists()) {
+xmlURL
cvs commit: jakarta-tomcat-4.0/webapps/admin/context context.jsp
markt 2005/01/14 15:30:32 Modified:catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context AddContextAction.java ContextForm.java DeleteContextAction.java DeleteContextForm.java DeleteContextsAction.java EditContextAction.java SaveContextAction.java webapps/admin/context context.jsp Log: Fix bug 33085. Expose privileged attribute of context through admin webapp. Also, remove unused imports in o.a.c.webapp.admin.context package Revision ChangesPath 1.84 +5 -1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- mbeans-descriptors.xml19 Nov 2004 20:52:02 - 1.83 +++ mbeans-descriptors.xml14 Jan 2005 23:30:31 - 1.84 @@ -2125,6 +2125,10 @@ application type=boolean/ +attribute name=privileged + description=The privileged flag for this web application + type=boolean/ + attribute name=path description=The context path for this Context type=java.lang.String/ 1.76 +1 -0 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties Index: ApplicationResources_en.properties === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- ApplicationResources_en.properties22 Jan 2004 02:39:33 - 1.75 +++ ApplicationResources_en.properties14 Jan 2005 23:30:31 - 1.76 @@ -146,6 +146,7 @@ context.cross.context=Cross Context context.docBase=Document Base context.override=Override +context.privileged=Privileged context.path=Path context.reloadable=Reloadable context.swallowOutput=Swallow Output 1.7 +2 -4 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java Index: AddContextAction.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- AddContextAction.java 26 Aug 2004 21:56:08 - 1.6 +++ AddContextAction.java 14 Jan 2005 23:30:31 - 1.7 @@ -18,18 +18,15 @@ import java.io.IOException; import java.util.Locale; -import java.util.ArrayList; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.util.MessageResources; -import org.apache.webapp.admin.LabelValueBean; import org.apache.webapp.admin.Lists; import org.apache.webapp.admin.TomcatTreeBuilder; /** @@ -96,6 +93,7 @@ contextFm.setCrossContext(false); contextFm.setDocBase(); contextFm.setOverride(false); +contextFm.setPrivileged(false); contextFm.setPath(); contextFm.setReloadable(false); contextFm.setSwallowOutput(false); 1.14 +24 -2 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java Index: ContextForm.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ContextForm.java 26 Aug 2004 21:56:08 - 1.13 +++ ContextForm.java 14 Jan 2005 23:30:31 - 1.14 @@ -22,7 +22,6 @@ import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; -import
cvs commit: jakarta-tomcat-4.0/webapps/admin/images Context.gif Host.gif
jfarcand2005/01/11 11:46:02 Modified:webapps/admin/images Context.gif Host.gif Log: As pointed by Remy, remove Sun Copyright on those two files. Revision ChangesPath 1.2 +2 -5 jakarta-tomcat-4.0/webapps/admin/images/Context.gif Binary file 1.2 +1 -4 jakarta-tomcat-4.0/webapps/admin/images/Host.gif Binary file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs manager-howto.xml
markt 2005/01/11 13:08:11 Modified:webapps/tomcat-docs manager-howto.xml Log: Fix bug 28867. Correct manager how to to show correct way to reference ROOT context. - Submitted by Stephane Bailliez Revision ChangesPath 1.21 +15 -22jakarta-tomcat-4.0/webapps/tomcat-docs/manager-howto.xml Index: manager-howto.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/manager-howto.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- manager-howto.xml 13 Jan 2003 23:25:45 - 1.20 +++ manager-howto.xml 11 Jan 2005 21:08:10 - 1.21 @@ -222,7 +222,7 @@ ul listrongpath/strong - The context path (including the leading slash) of the web application you are dealing with. To select the ROOT web -application, specify a zero-length string. strongNOTE/strong - +application, specify /. strongNOTE/strong - It is not possible to perform administrative commands on the Manager application itself./li listrongwar/strong - URL of a web application archive (WAR) file, @@ -312,9 +312,8 @@ /blockquote/li liemInvalid context path was specified/em blockquote -pThe context path must start with a slash character, unless you are -referencing the ROOT web application -- in which case the context path -must be a zero-length string./p +pThe context path must start with a slash character. To reference the +ROOT web application use /./p /blockquote/li liemNo context path was specified/em blockquote @@ -488,9 +487,8 @@ /blockquote/li liemInvalid context path was specified/em blockquote -pThe context path must start with a slash character, unless you are -referencing the ROOT web application -- in which case the context path -must be a / string./p +pThe context path must start with a slash character. To reference the +ROOT web application use /./p /blockquote/li liemContext path must match the directory or WAR file name:/em blockquote @@ -563,9 +561,8 @@ /blockquote/li liemInvalid context path was specified/em blockquote -pThe context path must start with a slash character, unless you are -referencing the ROOT web application -- in which case the context path -must be a zero-length string./p +pThe context path must start with a slash character. To reference the +ROOT web application use /./p /blockquote/li liemNo context exists for path /foo/em blockquote @@ -622,9 +619,8 @@ /blockquote/li liemInvalid context path was specified/em blockquote -pThe context path must start with a slash character, unless you are -referencing the ROOT web application -- in which case the context path -must be a zero-length string./p +pThe context path must start with a slash character. To reference the +ROOT web application use /./p /blockquote/li liemNo context exists for path /foo/em blockquote @@ -811,9 +807,8 @@ /blockquote/li liemInvalid context path was specified/em blockquote -pThe context path must start with a slash character, unless you are -referencing the ROOT web application -- in which case the context path -must be a zero-length string./p +pThe context path must start with a slash character. To reference the +ROOT web application use /./p /blockquote/li liemNo context exists for path /foo/em blockquote @@ -854,9 +849,8 @@ /blockquote/li liemInvalid context path was specified/em blockquote -pThe context path must start with a slash character, unless you are -referencing the ROOT web application -- in which case the context path -must be a zero-length string./p +pThe context path must start with a slash character. To reference the +ROOT web application use /./p /blockquote/li liemNo context exists for path /foo/em blockquote @@ -906,9 +900,8 @@ /blockquote/li liemInvalid context path was specified/em blockquote -pThe context path must start with a slash character, unless you are -referencing the ROOT web application -- in which case the context path -must be a zero-length string./p +pThe context path must start with a slash character. To reference the +ROOT web application use /./p /blockquote/li liemNo context exists for path /foo/em blockquote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs realm-howto.xml
markt 2005/01/07 01:24:19
Modified:catalina/src/share/org/apache/catalina/authenticator
FormAuthenticator.java
catalina/src/share/org/apache/catalina/realm RealmBase.java
webapps/tomcat-docs/config valve.xml
webapps/tomcat-docs realm-howto.xml
Log:
Fix bug 31198. Support non-ASCII user names and passwords in FORM and
DIGEST authentication.
Revision ChangesPath
1.24 +28 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java
Index: FormAuthenticator.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- FormAuthenticator.java26 Aug 2004 21:27:39 - 1.23
+++ FormAuthenticator.java7 Jan 2005 09:24:19 - 1.24
@@ -57,6 +57,13 @@
org.apache.catalina.authenticator.FormAuthenticator/1.0;
+/**
+ * Character encoding to use to read the username and password parameters
+ * from the request. If not set, the encoding of the request body will be
+ * used.
+ */
+protected String characterEncoding = null;
+
// -
Properties
@@ -65,11 +72,27 @@
*/
public String getInfo() {
-return (this.info);
+return (FormAuthenticator.info);
}
+/**
+ * Return the character encoding to use to read the username and
password.
+ */
+public String getCharacterEncoding() {
+return characterEncoding;
+}
+
+
+/**
+ * Set the character encoding to be used to read the username and
password.
+ */
+public void setCharacterEncoding(String encoding) {
+characterEncoding = encoding;
+}
+
+
// - Public
Methods
@@ -220,6 +243,9 @@
// Yes -- Validate the specified credentials and redirect
// to the error page if they are not correct
Realm realm = context.getRealm();
+if (characterEncoding != null) {
+hreq.setCharacterEncoding(characterEncoding);
+}
String username = hreq.getParameter(Constants.FORM_USERNAME);
String password = hreq.getParameter(Constants.FORM_PASSWORD);
if (debug = 1)
1.16 +22 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/RealmBase.java
Index: RealmBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/RealmBase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RealmBase.java27 Nov 2004 18:29:44 - 1.15
+++ RealmBase.java7 Jan 2005 09:24:19 - 1.16
@@ -730,9 +730,11 @@
*
* @param credentials Password or other credentials to use in
* authenticating this username
- * @param algorithm Algorithm used to do th digest
+ * @param algorithm Algorithm used to do the digest
+ * @param encoding Character encoding of the string to digest
*/
-public final static String Digest(String credentials, String algorithm) {
+public final static String Digest(String credentials, String algorithm,
+ String encoding) {
try {
// Obtain a new message digest with digest encryption
@@ -741,7 +743,11 @@
// encode the credentials
// Should use the digestEncoding, but that's not a static field
-md.update(credentials.getBytes());
+if (encoding == null) {
+md.update(credentials.getBytes());
+} else {
+md.update(credentials.getBytes(encoding));
+}
// Digest the credentials and return as hexadecimal
return (HexUtils.convert(md.digest()));
@@ -759,15 +765,23 @@
* If exception, the plain credentials string is returned
*/
public static void main(String args[]) {
+
+String encoding = null;
+int firstCredentialArg = 2;
+
+if (args.length 4 args[2].equalsIgnoreCase(-e)) {
+encoding = args[3];
+firstCredentialArg = 4;
+}
-if(args.length 2 args[0].equalsIgnoreCase(-a)) {
-for(int i=2; i args.length ; i++){
+if(args.length firstCredentialArg
args[0].equalsIgnoreCase(-a)) {
+for(int i=firstCredentialArg; i args.length ; i
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util CGIProcessEnvironment.java DOMWriter.java DateTool.java ProcessEnvironment.java ProcessHelper.java RequestUtil.java ResourceSet.java StringManager.java
markt 2005/01/07 08:34:08
Modified:catalina/src/share/org/apache/catalina/util
CGIProcessEnvironment.java DOMWriter.java
DateTool.java ProcessEnvironment.java
ProcessHelper.java RequestUtil.java
ResourceSet.java StringManager.java
Log:
Remove unused imports in o.a.c.util package.
Revision ChangesPath
1.5 +1 -31
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java
Index: CGIProcessEnvironment.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CGIProcessEnvironment.java26 Aug 2004 21:42:40 - 1.4
+++ CGIProcessEnvironment.java7 Jan 2005 16:34:08 - 1.5
@@ -17,43 +17,13 @@
package org.apache.catalina.util;
-import java.lang.Process;
import java.io.File;
-import java.io.Writer;
-import java.io.Reader;
-import java.io.PrintWriter;
-import java.io.BufferedWriter;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
import java.net.URLEncoder;
import java.util.Hashtable;
-import java.util.Vector;
import java.util.Enumeration;
import java.util.StringTokenizer;
-import java.util.Locale;
-import java.util.Date;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
import javax.servlet.ServletContext;
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.Cookie;
-import org.apache.catalina.Context;
-import org.apache.catalina.Wrapper;
-
-
-
-// import org.apache.catalina.util.StringManager;
-
/**
1.5 +1 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/DOMWriter.java
Index: DOMWriter.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/DOMWriter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMWriter.java26 Aug 2004 21:42:40 - 1.4
+++ DOMWriter.java7 Jan 2005 16:34:08 - 1.5
@@ -121,7 +121,7 @@
// print document
case Node.DOCUMENT_NODE: {
if ( !canonical ) {
- String Encoding = this.getWriterEncoding();
+ String Encoding = getWriterEncoding();
if( Encoding.equalsIgnoreCase( DEFAULT ) )
Encoding = UTF-8;
else if( Encoding.equalsIgnoreCase( Unicode ) )
1.4 +0 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/DateTool.java
Index: DateTool.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/DateTool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DateTool.java 26 Aug 2004 21:42:40 - 1.3
+++ DateTool.java 7 Jan 2005 16:34:08 - 1.4
@@ -17,8 +17,6 @@
package org.apache.catalina.util;
-import java.io.IOException;
-import java.io.OutputStream;
import java.util.*;
import java.text.*;
1.4 +1 -29
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/ProcessEnvironment.java
Index: ProcessEnvironment.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/ProcessEnvironment.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProcessEnvironment.java 26 Aug 2004 21:43:16 - 1.3
+++ ProcessEnvironment.java 7 Jan 2005 16:34:08 - 1.4
@@ -16,39 +16,11 @@
package org.apache.catalina.util;
-import java.lang.Process;
import java.io.File;
-import java.io.Writer;
-import java.io.Reader;
-import java.io.PrintWriter;
-import java.io.BufferedWriter;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.net.URLEncoder;
import
Re: DO NOT REPLY [Bug 3534] - FileUpload doesn't work with Apache, mod_webapp and tomcat 4.0 RC1
On Jan 5, 2005, at 9:04 PM, [EMAIL PROTECTED] wrote: Bugzilla ran a sanity check last night, which caused some old mails to get sent. I don't know whether Bugzilla was correct about not having sent these, but this should not happen again. My apologies for the inconvenience. S. -- [EMAIL PROTECTED] http://www.temme.net/sander/ PGP FP: 51B4 8727 466A 0BC3 69F4 B7B8 B2BE BC40 1529 24AF smime.p7s Description: S/MIME cryptographic signature
cvs commit: jakarta-tomcat-4.0/webapps/examples/jsp/snp snoop.jsp
markt 2005/01/05 02:25:04 Modified:webapps/examples/jsp/snp snoop.jsp Log: Fix possible XSS issue. Revision ChangesPath 1.3 +1 -1 jakarta-tomcat-4.0/webapps/examples/jsp/snp/snoop.jsp Index: snoop.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/jsp/snp/snoop.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- snoop.jsp 23 Apr 2002 15:17:26 - 1.2 +++ snoop.jsp 5 Jan 2005 10:25:04 - 1.3 @@ -7,7 +7,7 @@ body bgcolor=white h1 Request Information /h1 font size=4 -JSP Request Method: %= request.getMethod() % +JSP Request Method: %= util.HTMLFilter.filter(request.getMethod()) % br Request URI: %= request.getRequestURI() % br - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/examples/jsp/snp snoop.jsp
markt 2005/01/05 02:34:52 Modified:webapps/examples/jsp/snp snoop.jsp Log: Make code consistent. Revision ChangesPath 1.4 +1 -1 jakarta-tomcat-4.0/webapps/examples/jsp/snp/snoop.jsp Index: snoop.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/jsp/snp/snoop.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- snoop.jsp 5 Jan 2005 10:25:04 - 1.3 +++ snoop.jsp 5 Jan 2005 10:34:52 - 1.4 @@ -7,7 +7,7 @@ body bgcolor=white h1 Request Information /h1 font size=4 -JSP Request Method: %= util.HTMLFilter.filter(request.getMethod()) % +JSP Request Method: % out.print(util.HTMLFilter.filter(request.getMethod())); % br Request URI: %= request.getRequestURI() % br - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/examples/jsp/snp snoop.jsp
markt 2005/01/05 03:14:09 Modified:webapps/examples/jsp/snp snoop.jsp Log: Another possible XSS issue. Revision ChangesPath 1.5 +1 -1 jakarta-tomcat-4.0/webapps/examples/jsp/snp/snoop.jsp Index: snoop.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/jsp/snp/snoop.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- snoop.jsp 5 Jan 2005 10:34:52 - 1.4 +++ snoop.jsp 5 Jan 2005 11:14:09 - 1.5 @@ -21,7 +21,7 @@ br Content length: %= request.getContentLength() % br -Content type: %= request.getContentType() % +Content type: % out.print(util.HTMLFilter.filter(request.getContentType())); % br Server name: %= request.getServerName() % br - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets HTMLManagerServlet.java ManagerServlet.java
markt 2005/01/05 03:54:37
Modified:catalina/src/share/org/apache/catalina/servlets
HTMLManagerServlet.java ManagerServlet.java
Log:
Fix trivial (since it is within the manager web app that should not be
publically accessible) XSS issue.
- Ported from TC5.
Revision ChangesPath
1.19 +4 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java
Index: HTMLManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- HTMLManagerServlet.java 26 Aug 2004 21:38:13 - 1.18
+++ HTMLManagerServlet.java 5 Jan 2005 11:54:37 - 1.19
@@ -34,6 +34,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Context;
import org.apache.catalina.Host;
+import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.DiskFileUpload;
@@ -110,7 +111,8 @@
message = stop(path);
} else {
message =
-sm.getString(managerServlet.unknownCommand, command);
+sm.getString(managerServlet.unknownCommand,
+ RequestUtil.filter(command));
}
list(request, response, message);
1.35 +26 -14
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java
Index: ManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ManagerServlet.java 26 Aug 2004 21:38:13 - 1.34
+++ ManagerServlet.java 5 Jan 2005 11:54:37 - 1.35
@@ -53,6 +53,7 @@
import org.apache.catalina.UserDatabase;
import org.apache.catalina.Wrapper;
import org.apache.catalina.core.StandardServer;
+import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.StringManager;
import org.apache.naming.resources.ProxyDirContext;
@@ -455,7 +456,8 @@
// Validate the requested context path
if ((path == null) || path.length() == 0 || !path.startsWith(/)) {
-writer.println(sm.getString(managerServlet.invalidPath, path));
+writer.println(sm.getString(managerServlet.invalidPath,
+RequestUtil.filter(path)));
return;
}
String displayPath = path;
@@ -644,7 +646,7 @@
if (path == null || path.length() == 0 || !path.startsWith(/))
{
writer.println(sm.getString(managerServlet.invalidPath,
-path));
+RequestUtil.filter(path)));
return;
}
String displayPath = path;
@@ -724,7 +726,8 @@
log(restart: Reloading web application at ' + path + ');
if ((path == null) || (!path.startsWith(/) path.equals())) {
-writer.println(sm.getString(managerServlet.invalidPath, path));
+writer.println(sm.getString(managerServlet.invalidPath,
+RequestUtil.filter(path)));
return;
}
String displayPath = path;
@@ -773,7 +776,8 @@
log(remove: Removing web application at ' + path + ');
if ((path == null) || (!path.startsWith(/) path.equals())) {
-writer.println(sm.getString(managerServlet.invalidPath, path));
+writer.println(sm.getString(managerServlet.invalidPath,
+RequestUtil.filter(path)));
return;
}
String displayPath = path;
@@ -783,7 +787,8 @@
try {
Context context = deployer.findDeployedApp(path);
if (context == null) {
-writer.println(sm.getString(managerServlet.noContext,
displayPath));
+writer.println(sm.getString(managerServlet.noContext,
+
RequestUtil.filter(displayPath)));
return;
}
// It isn't possible for the manager to remove itself
@@ -977,7 +982,8 @@
log(sessions: Session information for web application at ' +
path + ');
if ((path == null) || (!path.startsWith(/) path.equals())) {
-writer.println
DO NOT REPLY [Bug 5186] - Installation Instructions for Configuring Tomcat 4.0 to Cooperate with IIS 4.0/5.0
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=5186. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=5186 --- Additional Comments From [EMAIL PROTECTED] 2003-10-05 17:56 --- *** Bug 5185 has been marked as a duplicate of this bug. *** -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 3534] - FileUpload doesn't work with Apache, mod_webapp and tomcat 4.0 RC1
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=3534. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=3534 --- Additional Comments From [EMAIL PROTECTED] 2003-10-05 18:00 --- *** Bug 5427 has been marked as a duplicate of this bug. *** -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/examples/servlets reqparams.html
markt 2005/01/04 14:47:39
Modified:webapps/examples/servlets reqparams.html
Log:
Fix bug 6582. Align example source code with what is actually in the servlet.
Revision ChangesPath
1.2 +30 -8
jakarta-tomcat-4.0/webapps/examples/servlets/reqparams.html
Index: reqparams.html
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/servlets/reqparams.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reqparams.html17 Aug 2000 00:58:20 - 1.1
+++ reqparams.html4 Jan 2005 22:47:39 - 1.2
@@ -21,19 +21,41 @@
{
response.setContentType(quot;font
color=#009900text/html/fontquot;);
PrintWriter out = response.getWriter();
-out.println(quot;GET Request. No Form Data Postedquot;);
+out.println(quot;font color=#009900lt;htmlgt;/fontquot;);
+out.println(quot;font color=#009900lt;headgt;/fontquot;);
+out.println(quot;font color=#009900lt;titlegt;Request
Parameters Examplelt;/titlegt;/fontquot;);
+out.println(quot;font color=#009900lt;/headgt;/fontquot;);
+out.println(quot;font color=#009900lt;bodygt;/fontquot;);
+out.println(quot;font color=#009900lt;h3gt;Request Parameters
Examplelt;/h3gt;/fontquot;);
+out.println(quot;font color=#009900Parameters in this
request:lt;brgt;/fontquot;);
+if (firstName != null || lastName != null) {
+out.println(quot;font color=#009900First
Name:/fontquot;);
+out.println(quot;font color=#009900 = /fontquot; +
HTMLFilter.filter(firstName) + quot;font
color=#009900lt;brgt;/fontquot;);
+out.println(quot;font color=#009900Last Name:/fontquot;);
+out.println(quot;font color=#009900 = /fontquot; +
HTMLFilter.filter(lastName));
+} else {
+out.println(quot;font color=#009900No Parameters, Please
enter some/fontquot;);
+}
+out.println(quot;font color=#009900lt;Pgt;/fontquot;);
+out.print(quot;font color=#009900lt;form
action=\/fontquot;);
+out.print(quot;font color=#009900RequestParamExample\
/fontquot;);
+out.println(quot;font
color=#009900method=POSTgt;/fontquot;);
+out.println(quot;font color=#009900First Name:/fontquot;);
+out.println(quot;font color=#009900lt;input type=text size=20
name=firstnamegt;/fontquot;);
+out.println(quot;font color=#009900lt;brgt;/fontquot;);
+out.println(quot;font color=#009900Last Name:/fontquot;);
+out.println(quot;font color=#009900lt;input type=text size=20
name=lastnamegt;/fontquot;);
+out.println(quot;font color=#009900lt;brgt;/fontquot;);
+out.println(quot;font color=#009900lt;input
type=submitgt;/fontquot;);
+out.println(quot;font color=#009900lt;/formgt;/fontquot;);
+out.println(quot;font color=#009900lt;/bodygt;/fontquot;);
+out.println(quot;font color=#009900lt;/htmlgt;/fontquot;);
}
font color=#FFpublic void/font doPost(HttpServletRequest
request, HttpServletResponse res)
font color=#FFthrows/font IOException, ServletException
{
-Enumeration e = request.getParameterNames();
- PrintWriter out = res.getWriter ();
-while (e.hasMoreElements()) {
-String name = (String)e.nextElement();
-String value = request.getParameter(name);
-out.println(name + quot;font color=#009900 = /fontquot;
+ value);
-}
+doGet(request, response);
}
}/pre
/body
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm JNDIRealm.java
markt 2005/01/01 03:06:59 Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java Log: Correct bugzilla URL Revision ChangesPath 1.21 +2 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java Index: JNDIRealm.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- JNDIRealm.java10 Oct 2004 20:38:08 - 1.20 +++ JNDIRealm.java1 Jan 2005 11:06:58 - 1.21 @@ -141,7 +141,7 @@ * pstrongWARNING/strong - There is a reported bug against the Netscape * provider code (com.netscape.jndi.ldap.LdapContextFactory) with respect to * successfully authenticated a non-existing user. The - * report is here: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11210 . + * report is here: http://issues.apache.org/bugzilla/show_bug.cgi?id=11210 . * With luck, Netscape has updated their provider code and this is not an * issue. /p * - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardHostDeployer.java
markt 2004/12/30 10:06:53
Modified:catalina/src/share/org/apache/catalina/core
StandardHostDeployer.java
Log:
Fix bug 32779. NPE on undeploy when deployed with a context.xml file
Revision ChangesPath
1.16 +11 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java
Index: StandardHostDeployer.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StandardHostDeployer.java 26 Aug 2004 21:32:20 - 1.15
+++ StandardHostDeployer.java 30 Dec 2004 18:06:53 - 1.16
@@ -478,16 +478,25 @@
// Determine if directory/war to remove is in the host
appBase
boolean isAppBase = false;
+
File appBase = new File(host.getAppBase());
if (!appBase.isAbsolute())
appBase = new File(System.getProperty(catalina.base),
host.getAppBase());
+
File contextFile = new File(context.getDocBase());
+
+if (!contextFile.isAbsolute()) {
+// Must be relative to appBase
+contextFile = new File(appBase.getAbsolutePath(),
+ contextFile.getPath());
+}
+
File baseDir = contextFile.getParentFile();
if
(appBase.getCanonicalPath().equals(baseDir.getCanonicalPath())) {
isAppBase = true;
}
-
+
boolean isWAR = false;
if (contextFile.getName().toLowerCase().endsWith(.war)) {
isWAR = true;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 BUILDING.txt build.properties.default
markt 2004/12/26 15:41:01
Modified:.BUILDING.txt build.properties.default
Log:
Update build to use 1.0 final of commons daemon rather than
the alpha realease.
Revision ChangesPath
1.35 +4 -4 jakarta-tomcat-4.0/BUILDING.txt
Index: BUILDING.txt
===
RCS file: /home/cvs/jakarta-tomcat-4.0/BUILDING.txt,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- BUILDING.txt 18 Jun 2004 18:28:15 - 1.34
+++ BUILDING.txt 26 Dec 2004 23:41:01 - 1.35
@@ -455,15 +455,15 @@
NOTE: This step is only required if you wish to build the classes needed to
run Tomcat as a native operating system daemon using commons-daemon.
-* Download a binary distribution of version 1.0-Alpha or later from:
+* Download a binary distribution of version 1.0 or later from:
http://jakarta.apache.org/builds/jakarta-commons/nightly/commons-daemon
On a Windows platform, you will need:
-commons-daemon-1.0-Alpha.zip
+commons-daemon-1.0.zip
On a Unix platform, you will need:
-commons-daemon-1.0-Alpha.tar.gz
+commons-daemon-1.0.tar.gz
* Unpack the binary distribution into a convenient location so that the
distribution resides in its own directory.
1.4 +5 -5 jakarta-tomcat-4.0/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-4.0/build.properties.default,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.properties.default 16 Sep 2004 20:31:54 - 1.3
+++ build.properties.default 26 Dec 2004 23:41:01 - 1.4
@@ -152,12 +152,12 @@
activation.jar=${activation.lib}/activation.jar
-# - Commons Daemon, version 1.0-Alpha or later -
-commons-daemon.home=${base.path}/commons-daemon-1.0-Alpha
+# - Commons Daemon, version 1.0 or later -
+commons-daemon.home=${base.path}/commons-daemon-1.0
commons-daemon.lib=${commons-daemon.home}
commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-#commons-daemon.loc=${base-jakarta.loc}/commons/daemon/binaries/daemon-1.0-Alpha.tar.gz
-commons-daemon.loc=http://www.apache.org/dist/jakarta/commons/daemon/binaries/commons-daemon-1.0-Alpha.tar.gz
+#commons-daemon.loc=${base-jakarta.loc}/commons/daemon/binaries/daemon-1.0.tar.gz
+commons-daemon.loc=http://www.apache.org/dist/jakarta/commons/daemon/binaries/commons-daemon-1.0.tar.gz
# - Commons DBCP, version 1.0 or later -
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina build.xml
markt 2004/12/26 15:50:26
Modified:catalina build.xml
Log:
Align tc4 build with modifications in connectors' build
Revision ChangesPath
1.135 +2 -0 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- build.xml 21 Nov 2004 17:01:11 - 1.134
+++ build.xml 26 Dec 2004 23:50:26 - 1.135
@@ -31,6 +31,8 @@
property name=tomcat-util.jar
value=${tomcat-util.home}/build/lib/tomcat-util.jar/
property name=tomcat-coyote.jar
+ value=${tomcat-coyote.home}/build/lib/tomcat-coyote.jar/
+ property name=tomcat4-coyote.jar
value=${tomcat-coyote.home}/build/lib/tomcat4-coyote.jar/
property name=tomcat-jk.jar
value=${tomcat-jk.home}/build/lib/tomcat-jk.jar/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina build.xml
markt 2004/12/26 16:05:41
Modified:catalina build.xml
Log:
Copy the extra jar overlooked in the last commit.
Revision ChangesPath
1.136 +2 -0 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- build.xml 26 Dec 2004 23:50:26 - 1.135
+++ build.xml 27 Dec 2004 00:05:41 - 1.136
@@ -871,6 +871,8 @@
copy todir=${catalina.deploy}/server/lib
file=${tomcat-coyote.jar}/
+copy todir=${catalina.deploy}/server/lib
+ file=${tomcat4-coyote.jar}/
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
markt 2004/12/24 08:48:19
Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
Fix bug 32559. Make reload and stop/start more similar in terms
of ordering although the fundamental difference remains.
Revision ChangesPath
1.127 +16 -12
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- StandardContext.java 19 Nov 2004 20:52:02 - 1.126
+++ StandardContext.java 24 Dec 2004 16:48:18 - 1.127
@@ -2459,6 +2459,16 @@
// Binding thread
ClassLoader oldCCL = bindThread();
+// Shut down filters
+filterStop();
+
+// Clear all application-originated servlet context attributes
+if (context != null)
+context.clearAttributes();
+
+// Shut down application event listeners
+listenerStop();
+
// Shut down our session manager
if ((manager != null) (manager instanceof Lifecycle)) {
try {
@@ -2483,18 +2493,8 @@
}
}
-// Shut down application event listeners
-listenerStop();
-
-// Clear all application-originated servlet context attributes
-if (context != null)
-context.clearAttributes();
-
-// Shut down filters
-filterStop();
-
if (isUseNaming()) {
-// Start
+// Stop
namingContextListener.lifecycleEvent
(new LifecycleEvent(this, Lifecycle.STOP_EVENT));
}
@@ -3692,6 +3692,10 @@
// Stop our filters
filterStop();
+
+// Clear all application-originated servlet context attributes
+if (context != null)
+context.clearAttributes();
// Stop our application listeners
listenerStop();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.sh
markt 2004/12/24 09:17:34 Modified:catalina/src/bin catalina.sh Log: Fix bug 28305. Provide greater control over redirection of stdout and stderr - Patch provided by Daniel Rall Revision ChangesPath 1.38 +13 -4 jakarta-tomcat-4.0/catalina/src/bin/catalina.sh Index: catalina.sh === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- catalina.sh 15 Aug 2004 15:20:15 - 1.37 +++ catalina.sh 24 Dec 2004 17:17:34 - 1.38 @@ -17,6 +17,9 @@ # the JVM should use (java.io.tmpdir). Defaults to # $CATALINA_BASE/temp. # +# CATALINA_OUT(Optional) Location of the file to which stdout and stderr +# are written. Defaults to $CATALINA_BASE/logs/catalina.out. +# # JAVA_HOME Must point at your Java Development Kit installation. # # JAVA_OPTS (Optional) Java runtime options used when the start, @@ -115,6 +118,11 @@ CATALINA_TMPDIR=$CATALINA_BASE/temp fi +if [ -z $CATALINA_OUT ] ; then + # Use default location for redirected stdout/stderr + CATALINA_OUT=$CATALINA_BASE/logs/catalina.out +fi + # For Cygwin, switch paths to Windows format before running java if $cygwin; then JAVA_HOME=`cygpath --path --windows $JAVA_HOME` @@ -131,6 +139,7 @@ echo Using CATALINA_BASE: $CATALINA_BASE echo Using CATALINA_HOME: $CATALINA_HOME echo Using CATALINA_TMPDIR: $CATALINA_TMPDIR +echo Using CATALINA_OUT:$CATALINA_OUT echo Using JAVA_HOME: $JAVA_HOME if [ $1 = jpda ] ; then @@ -214,7 +223,7 @@ elif [ $1 = start ] ; then shift - touch $CATALINA_BASE/logs/catalina.out + touch $CATALINA_OUT if [ $1 = -security ] ; then echo Using Security Manager shift @@ -226,7 +235,7 @@ -Dcatalina.home=$CATALINA_HOME \ -Djava.io.tmpdir=$CATALINA_TMPDIR \ org.apache.catalina.startup.Bootstrap $@ start \ - $CATALINA_BASE/logs/catalina.out 21 + $CATALINA_OUT 21 if [ ! -z $CATALINA_PID ]; then echo $! $CATALINA_PID @@ -238,7 +247,7 @@ -Dcatalina.home=$CATALINA_HOME \ -Djava.io.tmpdir=$CATALINA_TMPDIR \ org.apache.catalina.startup.Bootstrap $@ start \ - $CATALINA_BASE/logs/catalina.out 21 + $CATALINA_OUT 21 if [ ! -z $CATALINA_PID ]; then echo $! $CATALINA_PID - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationContextFacade.java ApplicationFilterChain.java ApplicationFilterConfig.java ApplicationHttpRequest.java ApplicationHttpResponse.java ApplicationRequest.java ApplicationResponse.java ContainerBase.java FastEngineMapper.java MappingRequest.java StandardContextMapper.java StandardContextValve.java StandardEngine.java StandardEngineMapper.java StandardEngineValve.java StandardHost.java StandardHostMapper.java StandardHostValve.java StandardPipeline.java StandardServer.java StandardService.java StandardWrapper.java StandardWrapperFacade.java
markt 2004/12/22 15:12:51 Modified:catalina/src/share/org/apache/catalina/core ApplicationContextFacade.java ApplicationFilterChain.java ApplicationFilterConfig.java ApplicationHttpRequest.java ApplicationHttpResponse.java ApplicationRequest.java ApplicationResponse.java ContainerBase.java FastEngineMapper.java MappingRequest.java StandardContextMapper.java StandardContextValve.java StandardEngine.java StandardEngineMapper.java StandardEngineValve.java StandardHost.java StandardHostMapper.java StandardHostValve.java StandardPipeline.java StandardServer.java StandardService.java StandardWrapper.java StandardWrapperFacade.java Log: Tidy code / fix Eclipse warnings in o.a.c.core: - unused imports - access of static fields Revision ChangesPath 1.5 +1 -16 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java Index: ApplicationContextFacade.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApplicationContextFacade.java 26 Aug 2004 21:31:21 - 1.4 +++ ApplicationContextFacade.java 22 Dec 2004 23:12:50 - 1.5 @@ -19,29 +19,14 @@ import java.io.InputStream; -import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.security.PrivilegedExceptionAction; -import java.security.PrivilegedActionException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; import java.util.Set; -import javax.naming.NamingException; -import javax.naming.Binding; -import javax.naming.directory.DirContext; import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.ServletException; -import javax.servlet.ServletContextAttributeEvent; -import javax.servlet.ServletContextAttributeListener; -import javax.servlet.http.HttpServletRequest; /** 1.13 +1 -3 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java Index: ApplicationFilterChain.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ApplicationFilterChain.java 26 Aug 2004 21:31:21 - 1.12 +++ ApplicationFilterChain.java 22 Dec 2004 23:12:50 - 1.13 @@ -21,11 +21,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import java.security.AccessController; import java.security.PrivilegedActionException; import javax.servlet.Filter; import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.ServletRequest; 1.10 +1 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java Index: ApplicationFilterConfig.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ApplicationFilterConfig.java 26 Aug 2004 21:31:21 - 1.9 +++ ApplicationFilterConfig.java 22 Dec 2004 23:12:50 - 1.10 @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Enumeration; -import java.util.Iterator; import java.util.Map; import javax.servlet.Filter; import javax.servlet.FilterConfig; 1.14 +2 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java Index: ApplicationHttpRequest.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ApplicationHttpRequest.java 26 Aug 2004 21:31:21 - 1.13 +++ ApplicationHttpRequest.java
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ContainerBase.java
markt 2004/12/22 15:28:47
Modified:catalina/src/share/org/apache/catalina/core
ContainerBase.java
Log:
Fix bug 32453. Cross-context calls to getContext can return null during
initialisation.
- Port of Remy's patch to TC5 for same issue.
Revision ChangesPath
1.24 +9 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ContainerBase.java
Index: ContainerBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ContainerBase.java22 Dec 2004 23:12:50 - 1.23
+++ ContainerBase.java22 Dec 2004 23:28:47 - 1.24
@@ -768,16 +768,23 @@
child.getName() +
' is not unique);
child.setParent((Container) this); // May throw IAE
+children.put(child.getName(), child);
+
if (started (child instanceof Lifecycle)) {
+boolean success = false;
try {
((Lifecycle) child).start();
+success = true;
} catch (LifecycleException e) {
log(ContainerBase.addChild: start: , e);
throw new IllegalStateException
(ContainerBase.addChild: start: + e);
+} finally {
+if (!success) {
+children.remove(child.getName());
+}
}
}
-children.put(child.getName(), child);
fireContainerEvent(ADD_CHILD_EVENT, child);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/webdav index.html
markt 2004/12/20 10:47:05 Modified:catalina/src/share/org/apache/catalina/servlets WebdavServlet.java webapps/webdav/WEB-INF web.xml webapps/webdav index.html Log: Fix webDAV servlet so it can be used via any arbitrary mapping (eg /webdav/*) to edit the contents of a web application Revision ChangesPath 1.37 +2 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java Index: WebdavServlet.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- WebdavServlet.java26 Aug 2004 21:38:13 - 1.36 +++ WebdavServlet.java20 Dec 2004 18:47:05 - 1.37 @@ -1962,7 +1962,7 @@ // Generating href element generatedXML.writeElement(null, href, XMLWriter.OPENING); -String href = req.getContextPath(); +String href = req.getContextPath() + req.getServletPath(); if ((href.endsWith(/)) (path.startsWith(/))) href += path.substring(1); else 1.4 +1 -1 jakarta-tomcat-4.0/webapps/webdav/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/webdav/WEB-INF/web.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- web.xml 2 Sep 2002 13:45:23 - 1.3 +++ web.xml 20 Dec 2004 18:47:05 - 1.4 @@ -35,7 +35,7 @@ !-- The mapping for the webdav servlet -- servlet-mapping servlet-namewebdav/servlet-name -url-pattern//url-pattern +url-pattern/*/url-pattern /servlet-mapping !-- Establish the default MIME type mappings -- 1.6 +13 -0 jakarta-tomcat-4.0/webapps/webdav/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/webdav/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.html9 Oct 2001 02:41:21 - 1.5 +++ index.html20 Dec 2004 18:47:05 - 1.6 @@ -26,6 +26,19 @@ safety reasons. It can be put in read-write mode by editing the web application descriptor file (WEB-INF/web.xml). +pTo add remote authoring to your web application, you need to make the following +changes: +ul +liAdd the webDAV servlet to your web application. See the web application +deployment descriptor for an example. Don't forget to make it read/write. +liAdd a servlet mapping for the webDAV servlet with a url pattern of /webdav/* +to your web.xml. +liAdd an appropriate security constraint to prevent unauthorised changes to your +web application. +liYou can then edit your web application using a webDAV client using a url +like font face=Courier New, Courier,monohttp://host:port/webapp/webdav/font/li +/ul + pWorking WebDAV clients include : ul liAdobe GoLive 5.0 (and other WebDAV-enabled Adobe products, like - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: Project tomcat-catalina (in module jakarta-tomcat-4.0) success
To whom it may satisfy... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project tomcat-catalina *no longer* has an issue. The current state of this project is 'Success'. Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Sole output [catalina.jar] identifier set to project name -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -INFO- No license on redistributable project with outputs. The following work was performed: http://brutus.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/gump_work/build_jakarta-tomcat-4.0_tomcat-catalina.html Work Name: build_jakarta-tomcat-4.0_tomcat-catalina (Type: Build) Work ended in a state of : Success Elapsed: 14 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dcommons-beanutils.jar=/usr/local/gump/public/workspace/jakarta-commons/beanutils/dist/commons-beanutils-core.jar -Djtc.home=/usr/local/gump/public/workspace/jakarta-tomcat-connectors -Dversion=4.1.25-dev -Dregexp.jar=/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-06122004.jar -Dcommons-logging-api.jar=/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging-api.jar -Dservlet.jar=/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar -Dcommons-logging.jar=/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging.jar -Dcommons-collections.jar=/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-06122004.jar -Dcommons-digester.jar=/usr/local/gump/public/workspace/jakarta-commons/digester/dist/commons-digester.jar deploy-catalina [Working Directory: /usr/local/gump/public/workspace/jakarta-tomcat-4.0/catalina] CLASSPATH: /opt/jdk1.4/lib/tools.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-stylebook.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-swing.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-trax.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-junit.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant.jar:/usr/local/gump/public/workspace/jakarta-tomcat-connectors/util/build/lib/tomcat-util.jar:/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar:/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-06122004.jar:/usr/local/gump/public/workspace/ant/bootstrap/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/bootstrap/lib/ant.jar:/usr/local/gump/public/workspace/jakarta-commons/fileupload/target/commons-fileupload-06122004.jar:/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-06122004.jar:/usr/local/gump/public/workspace/jakarta-commons/beanutils/dist/commons-beanutils-core.jar:/usr/local/gump/public/workspace/jakarta-commons/digester/dist/commons-digester.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging.jar - [copy] Copying 1 file to /home/gump/workspaces2/public/workspace/jakarta-tomcat-4.0/catalina/build/server/lib build-catalina: [javac] Compiling 335 source files to /home/gump/workspaces2/public/workspace/jakarta-tomcat-4.0/catalina/build/server/classes [javac] This version of java does not support the classic compiler; upgrading to modern [javac] Note: Some input files use or override a deprecated API. [javac] Note: Recompile with -deprecation for details. [copy] Copying 76 files to /home/gump/workspaces2/public/workspace/jakarta-tomcat-4.0/catalina/build/server/classes build-main: deploy-prepare: [mkdir] Created dir: /home/gump/workspaces2/public/workspace/jakarta-tomcat-4.0/build [mkdir] Created dir: /home/gump/workspaces2/public/workspace/jakarta-tomcat-4.0/build/bin [mkdir] Created dir: /home/gump/workspaces2/public/workspace/jakarta-tomcat-4.0/build/conf [mkdir] Created dir: /home/gump/workspaces2/public/workspace/jakarta-tomcat-4.0/build/logs [mkdir] Created dir: /home/gump/workspaces2/public/workspace/jakarta-tomcat-4.0/build/common/classes [mkdir] Created
[GUMP@brutus]: Project jakarta-tomcat-4.0 (in module jakarta-tomcat-4.0) success
To whom it may satisfy... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-4.0 *no longer* has an issue. The current state of this project is 'Success'. Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Output [naming-resources.jar] identifier set to output basename: [naming-resources] -DEBUG- Output [servlets-default.jar] identifier set to output basename: [servlets-default] -DEBUG- Output [naming-common.jar] identifier set to output basename: [naming-common] -DEBUG- Output [catalina.jar] identifier set to output basename: [catalina] -DEBUG- Output [bootstrap.jar] identifier set to output basename: [bootstrap] -DEBUG- Output [servlets-common.jar] identifier set to output basename: [servlets-common] -DEBUG- Output [servlets-invoker.jar] identifier set to output basename: [servlets-invoker] -DEBUG- Dependency on javamail exists, no need to add for property mail.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.jar. -DEBUG- Dependency on jmx exists, no need to add for property jmx.jar. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xerces.jar. -DEBUG- Dependency on jakarta-tomcat-util exists, no need to add for property tomcat-util.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on ant exists, no need to add for property ant.home. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.home. -DEBUG- Dependency on jsse exists, no need to add for property jsse.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.home. -DEBUG- Dependency on jmx exists, no need to add for property jmxtools.jar. -DEBUG- Dependency on jndi exists, no need to add for property jndi.home. -DEBUG- Dependency on javamail exists, no need to add for property mail.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.home. -INFO- No license on redistributable project with outputs. The following work was performed: http://brutus.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/gump_work/build_jakarta-tomcat-4.0_jakarta-tomcat-4.0.html Work Name: build_jakarta-tomcat-4.0_jakarta-tomcat-4.0 (Type: Build) Work ended in a state of : Success Elapsed: 53 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/serializer.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djaas.jar=/usr/local/gump/packages/jaas1_0/lib/jaas.jar -Djmx.jar=/usr/local/gump/packages/jmx-1_2-ri/lib/jmxri.jar -Djmx.home=/usr/local/gump/packages/jmx-1_2-ri -Djdbc20ext.jar=/usr/local/gump/packages/jdbc2_0/jdbc2_0-stdext.jar -Dregexp.jar=/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-06122004.jar -Dmail.home=/usr/local/gump/packages/javamail-1.3.2 -Dant.home=/usr/local/gump/public/workspace/ant/dist -Dservlet.jar=/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar -Dxerces.jar=/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar -Dcommons-collections.jar=/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-06122004.jar -Dldap.jar=/usr/local/gump/packages/ldap-1_2_4/lib/ldap.jar -Djsse.home=/usr/local/gump/packages/jsse1.0.3 -Dtomcat-coyote.jar=/usr/local/gump/public/workspace/jakarta-tomcat-connectors/coyote/build/lib/tomcat-coyote.jar -Dmail.jar=/usr/local/gump/packages/javamail-1.3.2/mail.jar -Dcommons-digester.jar=/usr/local/gump/public/workspace/jakarta-commons/digester/dist/commons-digester.jar -Djndi.jar=/usr/local/gump/packages/jndi1_2_1/lib/jndi.jar -Djmxtools.jar=/usr/local/gump/packages/jmx-1_2-ri/lib/jmxtools.jar -Dactivation.home=/usr/local/gump/packages/jaf-1.0.1 -Dregexp.home=/usr/local/gump/public/workspace/jakarta-regexp/build -Dcommons-beanutils.jar=/usr/local/gump/public/workspace/jakarta-commons/beanutils/dist/commons-beanutils-core.jar -Dcommons-modeler.jar=/usr/local/gump/public/workspace/jakarta
[GUMP@brutus]: Project jakarta-tomcat-4.0 (in module jakarta-tomcat-4.0) success
To whom it may satisfy... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-4.0 *no longer* has an issue. The current state of this project is 'Success'. Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Output [naming-resources.jar] identifier set to output basename: [naming-resources] -DEBUG- Output [servlets-default.jar] identifier set to output basename: [servlets-default] -DEBUG- Output [naming-common.jar] identifier set to output basename: [naming-common] -DEBUG- Output [catalina.jar] identifier set to output basename: [catalina] -DEBUG- Output [bootstrap.jar] identifier set to output basename: [bootstrap] -DEBUG- Output [servlets-common.jar] identifier set to output basename: [servlets-common] -DEBUG- Output [servlets-invoker.jar] identifier set to output basename: [servlets-invoker] -DEBUG- Dependency on javamail exists, no need to add for property mail.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.jar. -DEBUG- Dependency on jmx exists, no need to add for property jmx.jar. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on xml-xerces exists, no need to add for property xerces.jar. -DEBUG- Dependency on jakarta-tomcat-util exists, no need to add for property tomcat-util.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on ant exists, no need to add for property ant.home. -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.home. -DEBUG- Dependency on jsse exists, no need to add for property jsse.home. -DEBUG- Dependency on jmx exists, no need to add for property jmx.home. -DEBUG- Dependency on jmx exists, no need to add for property jmxtools.jar. -DEBUG- Dependency on jndi exists, no need to add for property jndi.home. -DEBUG- Dependency on javamail exists, no need to add for property mail.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.home. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -DEBUG- Dependency on jaf exists, no need to add for property activation.home. -INFO- No license on redistributable project with outputs. The following work was performed: http://brutus.apache.org/gump/public/jakarta-tomcat-4.0/jakarta-tomcat-4.0/gump_work/build_jakarta-tomcat-4.0_jakarta-tomcat-4.0.html Work Name: build_jakarta-tomcat-4.0_jakarta-tomcat-4.0 (Type: Build) Work ended in a state of : Success Elapsed: 48 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-xerces2/java/build/xml-apis.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/serializer.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djaas.jar=/usr/local/gump/packages/jaas1_0/lib/jaas.jar -Djmx.jar=/usr/local/gump/packages/jmx-1_2-ri/lib/jmxri.jar -Djmx.home=/usr/local/gump/packages/jmx-1_2-ri -Djdbc20ext.jar=/usr/local/gump/packages/jdbc2_0/jdbc2_0-stdext.jar -Dregexp.jar=/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-29112004.jar -Dmail.home=/usr/local/gump/packages/javamail-1.3.2 -Dant.home=/usr/local/gump/public/workspace/ant/dist -Dservlet.jar=/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar -Dxerces.jar=/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar -Dcommons-collections.jar=/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-29112004.jar -Dldap.jar=/usr/local/gump/packages/ldap-1_2_4/lib/ldap.jar -Djsse.home=/usr/local/gump/packages/jsse1.0.3 -Dtomcat-coyote.jar=/usr/local/gump/public/workspace/jakarta-tomcat-connectors/coyote/build/lib/tomcat-coyote.jar -Dmail.jar=/usr/local/gump/packages/javamail-1.3.2/mail.jar -Dcommons-digester.jar=/usr/local/gump/public/workspace/jakarta-commons/digester/dist/commons-digester.jar -Djndi.jar=/usr/local/gump/packages/jndi1_2_1/lib/jndi.jar -Djmxtools.jar=/usr/local/gump/packages/jmx-1_2-ri/lib/jmxtools.jar -Dactivation.home=/usr/local/gump/packages/jaf-1.0.1 -Dregexp.home=/usr/local/gump/public/workspace/jakarta-regexp/build -Dcommons-beanutils.jar=/usr/local/gump/public/workspace/jakarta-commons/beanutils/dist/commons-beanutils-core.jar
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets CGIServlet.java
markt 2004/11/29 13:38:41
Modified:catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
Log:
Fix bug 32429. stderr line count was always 1.
- Patch provided by Mark Claassen
Revision ChangesPath
1.30 +6 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
Index: CGIServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- CGIServlet.java 21 Nov 2004 17:22:49 - 1.29
+++ CGIServlet.java 29 Nov 2004 21:38:41 - 1.30
@@ -1847,8 +1847,8 @@
try {
while ((line = rdr.readLine()) != null) {
log(runCGI (stderr): + line) ;
+lineCount++ ;
}
-lineCount++ ;
} catch (IOException e) {
log(sendToLog error, e) ;
} finally {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets CGIServlet.java
markt 2004/11/29 14:00:44
Modified:catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
Log:
Fix bug 32431. Typo in CGI servlet
- Patch provided by Mark Claassen
- Ported from TC5
Revision ChangesPath
1.31 +6 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
Index: CGIServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- CGIServlet.java 29 Nov 2004 21:38:41 - 1.30
+++ CGIServlet.java 29 Nov 2004 22:00:44 - 1.31
@@ -1722,7 +1722,7 @@
if(contentStream != null) {
commandsStdIn = new
BufferedOutputStream(proc.getOutputStream());
-proc.getOutputStream().write(contentStream.toByteArray());
+commandsStdIn.write(contentStream.toByteArray());
commandsStdIn.flush();
commandsStdIn.close();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets CGIServlet.java
markt 2004/11/29 14:47:41 Modified:catalina/src/share/org/apache/catalina/servlets CGIServlet.java Log: Fix bug 32340. Class cast exceotions from toString() method. - Reported by Mark Claassen. Revision ChangesPath 1.32 +6 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java Index: CGIServlet.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- CGIServlet.java 29 Nov 2004 22:00:44 - 1.31 +++ CGIServlet.java 29 Nov 2004 22:47:41 - 1.32 @@ -1707,7 +1707,7 @@ contentStream.write(lineSep.getBytes()); contentLength = lineSep.length() + lenRead; } -env.put(CONTENT_LENGTH, new Integer(contentLength)); +env.put(CONTENT_LENGTH, Integer.toString(contentLength)); } } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: Project tomcat-catalina (in module jakarta-tomcat-4.0) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project tomcat-catalina has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Configuration Failed'. For reference only, the following projects are affected by this: - tomcat-catalina : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Sole output [catalina.jar] identifier set to project name -ERROR- No such project [commons-collections] for property. -ERROR- No such project [commons-beanutils] for property. -ERROR- No such project [commons-digester] for property. -ERROR- No such project [commons-logging] for property. -ERROR- No such project [commons-logging] for property. -ERROR- Cannot resolve output/outputpath of *unknown* [commons-beanutils] -ERROR- Unhandled Property: commons-beanutils.jar on: Ant on Project:tomcat-catalina -ERROR- Cannot resolve output/outputpath of *unknown* [commons-logging] -ERROR- Unhandled Property: commons-logging-api.jar on: Ant on Project:tomcat-catalina -ERROR- Cannot resolve output/outputpath of *unknown* [commons-logging] -ERROR- Unhandled Property: commons-logging.jar on: Ant on Project:tomcat-catalina -ERROR- Cannot resolve output/outputpath of *unknown* [commons-collections] -ERROR- Unhandled Property: commons-collections.jar on: Ant on Project:tomcat-catalina -ERROR- Cannot resolve output/outputpath of *unknown* [commons-digester] -ERROR- Unhandled Property: commons-digester.jar on: Ant on Project:tomcat-catalina -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -INFO- Failed with reason configuration failed -ERROR- Bad Dependency. Project: commons-fileupload unknown to *this* workspace -DEBUG- Extracted fallback artifacts from Gump Repository To subscribe to this information via syndicated feeds: - RSS: http://brutus.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/rss.xml - Atom: http://brutus.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/atom.xml == Gump Tracking Only === Produced by Gump version 2.2. Gump Run 18002129112004, brutus:brutus-public:18002129112004 Gump E-mail Identifier (unique within run) #28. -- Apache Gump http://gump.apache.org/ [Instance: brutus] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs realm-howto.xml
markt 2004/11/27 10:29:44
Modified:catalina/src/share/org/apache/catalina/realm
DataSourceRealm.java JAASRealm.java JDBCRealm.java
LocalStrings.properties MemoryRealm.java
RealmBase.java UserDatabaseRealm.java
webapps/tomcat-docs realm-howto.xml
Log:
Fix bug 19767. Port support for digested passwords with DIGEST
authentication for JDBC and DataSource realms from TC5.
Remove unused imports in o.a.c.realm package
Revision ChangesPath
1.4 +135 -73
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
Index: DataSourceRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DataSourceRealm.java 26 Aug 2004 21:37:21 - 1.3
+++ DataSourceRealm.java 27 Nov 2004 18:29:44 - 1.4
@@ -18,36 +18,20 @@
package org.apache.catalina.realm;
-import java.io.File;
-import java.security.MessageDigest;
import java.security.Principal;
import java.sql.Connection;
-import java.sql.Driver;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.Properties;
-import javax.naming.InitialContext;
import javax.naming.Context;
-import javax.naming.NamingException;
import javax.sql.DataSource;
-import org.apache.catalina.Container;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.LifecycleListener;
-import org.apache.catalina.Logger;
-import org.apache.catalina.Realm;
-import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.core.StandardServer;
-import org.apache.catalina.util.HexUtils;
-import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
-import org.apache.catalina.util.Base64;
/**
*
@@ -323,64 +307,37 @@
*/
private Principal authenticate(Connection dbConnection,
String username,
- String credentials)
-throws SQLException {
+ String credentials) {
-ResultSet rs = null;
-PreparedStatement stmt = null;
-ArrayList list = null;
-try {
-// Look up the user's credentials
-String dbCredentials = null;
-stmt = credentials(dbConnection, username);
-rs = stmt.executeQuery();
-while (rs.next()) {
-dbCredentials = rs.getString(1).trim();
-}
-rs.close();
-rs = null;
-stmt.close();
-stmt = null;
-if (dbCredentials == null) {
-return (null);
-}
-
-// Validate the user's credentials
-boolean validated = false;
-if (hasMessageDigest()) {
-// Hex hashes should be compared case-insensitive
-validated =
(digest(credentials).equalsIgnoreCase(dbCredentials));
-} else
-validated = (digest(credentials).equals(dbCredentials));
-
-if (validated) {
-if (debug = 2)
-log(sm.getString(dataSourceRealm.authenticateSuccess,
- username));
-} else {
-if (debug = 2)
-log(sm.getString(dataSourceRealm.authenticateFailure,
- username));
-return (null);
-}
-
-// Accumulate the user's roles
-list = new ArrayList();
-stmt = roles(dbConnection, username);
-rs = stmt.executeQuery();
-while (rs.next()) {
-list.add(rs.getString(1).trim());
-}
-} finally {
-if (rs != null) {
-rs.close();
-}
-if (stmt != null) {
-stmt.close();
-}
+// No user - can't possibly authenticate
+if (username == null) {
+return (null);
}
+String dbCredentials = getPassword(username);
+
+// Validate the user's credentials
+boolean validated = false;
+if (hasMessageDigest()) {
+// Hex hashes should be compared case-insensitive
+validated =
(digest
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java
markt 2004/11/22 11:37:06
Modified:catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
Port Remy's fix for ensuring mime boundaries start with a new line
Revision ChangesPath
1.64 +6 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- DefaultServlet.java 26 Aug 2004 21:38:13 - 1.63
+++ DefaultServlet.java 22 Nov 2004 19:37:06 - 1.64
@@ -1241,7 +1241,7 @@
// Parsing the range list
while (commaTokenizer.hasMoreTokens()) {
-String rangeDefinition = commaTokenizer.nextToken();
+String rangeDefinition = commaTokenizer.nextToken().trim();
Range currentRange = new Range();
currentRange.length = fileLength;
@@ -1851,6 +1851,7 @@
Range currentRange = (Range) ranges.nextElement();
// Writing MIME header.
+ostream.println();
ostream.println(-- + mimeSeparation);
if (contentType != null)
ostream.println(Content-Type: + contentType);
@@ -1871,6 +1872,7 @@
}
+ostream.println();
ostream.print(-- + mimeSeparation + --);
// Rethrow any exception that has occurred
@@ -1905,6 +1907,7 @@
Range currentRange = (Range) ranges.nextElement();
// Writing MIME header.
+writer.println();
writer.println(-- + mimeSeparation);
if (contentType != null)
writer.println(Content-Type: + contentType);
@@ -1925,6 +1928,7 @@
}
+writer.println();
writer.print(-- + mimeSeparation + --);
// Rethrow any exception that has occurred
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
