Re: cvs commit:jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servletsLocalStrings.properties ManagerServlet.java
Craig, From: [EMAIL PROTECTED] Subject: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets LocalStrings.properties ManagerServlet.java Date: 15 Sep 2001 23:31:30 - +standardContext.startCleanup-Exception during cleanup after start failed Please replace '-' with '='. Kazuhiro Kazama ([EMAIL PROTECTED]) NTT Network Innovation Laboratories
PATCH: Japanese Resource Bundles
This is a patch which has changes of english resources and some fixes.
And I forgot to send one japanese resource bundle which is located at
catalina/src/share/org/apache/naming/LocalStrings_ja.properties.
Kazuhiro Kazama ([EMAIL PROTECTED]) NTT Network Innovation Laboratories
contextBindings.unknownContext=\u672a\u77e5\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u540d\u3067\u3059
: {0}
contextBindings.noContextBoundToThread=\u3053\u306e\u30b9\u30ec\u30c3\u30c9\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u308b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u306f\u540d\u524d\u304c\u3042\u308a\u307e\u305b\u3093
contextBindings.noContextBoundToCL=\u3053\u306e\u30af\u30e9\u30b9\u30ed\u30fc\u30c0\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u308b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u306f\u540d\u524d\u304c\u3042\u308a\u307e\u305b\u3093
selectorContext.noJavaUrl=\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306fjava:
URL\u3092\u7528\u3044\u3066\u30a2\u30af\u30bb\u30b9\u3055\u308c\u306d\u3070\u306a\u308a\u307e\u305b\u3093
namingContext.contextExpected=\u540d\u524d\u304c\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
namingContext.nameNotBound=\u540d\u524d {0}
\u306f\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
namingContext.readOnly=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306f\u30ea\u30fc\u30c9\u30aa\u30f3\u30ea\u30fc\u3067\u3059
namingContext.invalidName=\u540d\u524d\u306f\u7121\u52b9\u3067\u3059
namingContext.alreadyBound=\u540d\u524d {0}
\u306f\u3059\u3067\u306b\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u3059
namingContext.noAbsoluteName=\u3053\u306e\u540d\u524d\u7a7a\u9593\u306b\u7d76\u5bfe\u540d\u3092\u751f\u6210\u3067\u304d\u307e\u305b\u3093
Index: catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties
===
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties,v
retrieving revision 1.1
diff -c -r1.1 LocalStrings_ja.properties
*** catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties
2001/09/13 02:19:21 1.1
--- catalina/src/share/org/apache/catalina/core/LocalStrings_ja.properties
2001/09/16 06:55:38
***
*** 59,64
--- 59,65
standardContext.securityConstraint.pattern=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u306e\u5236\u7d04\u306e\u4e2d\u306b\u7121\u52b9\u306a
url-pattern {0} \u304c\u3042\u308a\u307e\u3059
standardContext.servletMap.name=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30de\u30c3\u30d4\u30f3\u30b0\u304c\u672a\u77e5\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u540d
{0} \u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059
standardContext.servletMap.pattern=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30de\u30c3\u30d4\u30f3\u30b0\u4e2d\u306b\u7121\u52b9\u306a
url-pattern {0} \u304c\u3042\u308a\u307e\u3059
+
+standardContext.startCleanup=\u8d77\u52d5\u304c\u5931\u6557\u3057\u305f\u5f8c\u306e\u30af\u30ea\u30fc\u30f3\u30ca\u30c3\u30d7\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
standardContext.startFailed=\u4ee5\u524d\u306e\u30a8\u30e9\u30fc\u306e\u305f\u3081\u306b\u3001\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u8d77\u52d5\u304c\u5931\u6557\u3057\u307e\u3057\u305f
standardContext.startingLoader=\u30ed\u30fc\u30c0\u3092\u8d77\u52d5\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
standardContext.startingManager=\u30de\u30cd\u30fc\u30b8\u30e3\u3092\u8d77\u52d5\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
***
*** 69,75
standardContext.urlDecode=\u30ea\u30af\u30a8\u30b9\u30c8\u30d1\u30b9 {0}
\u306eURL\u30c7\u30b3\u30fc\u30c9\u304c\u3067\u304d\u307e\u305b\u3093
standardContext.urlPattern.patternWarning=\u8b66\u544a: Servlet
2.3\u3067\u306f\u3001URL\u30d1\u30bf\u30fc\u30f3 {0}
\u306f\u3001'/'\u3067\u958b\u59cb\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
standardContext.urlValidate=URL\u30c7\u30b3\u30fc\u30c9\u3055\u308c\u305f\u30ea\u30af\u30a8\u30b9\u30c8\u30d1\u30b9
{0} \u3092\u691c\u8a3c\u3067\u304d\u307e\u305b\u3093
! standardContext.wrapper.error=JSP\u30d5\u30a1\u30a4\u30eb {0}
\u306f'/'\u3067\u958b\u59cb\u3057\u306a\u3051\u308c\u3070\u3044\u304bsmen
standardContext.wrapper.warning=\u8b66\u544a: Servlet
2.3\u3067\u306f\u3001JSP\u30d5\u30a1\u30a4\u30eb {0}
\u306f\u3001'/'\u3067\u958b\u59cb\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
standardContext.invalidEnvEntryValue={0}
\u74b0\u5883\u30a8\u30f3\u30c8\u30ea\u306f\u6307\u5b9a\u3055\u308c\u305f\u578b\u306b\u5bfe\u3057\u3066\u7121\u52b9\u306a\u5024\u3092\u6301\u3063\u3066\u3044\u307e\u3059
standardContext.invalidEnvEntryType={0}
DO NOT REPLY [Bug 3640] New: - Fix JSPC taglib support when taglib is included at jar
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3640. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3640 Summary: Fix JSPC taglib support when taglib is included at jar Product: Tomcat 4 Version: 4.0 Release Candidate 2 Platform: PC OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Jasper AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] JSPC now compiles only webapp. Bundled tld at jar are not handled. Test with rc2 and nightly build.
DO NOT REPLY [Bug 3640] - Fix JSPC taglib support when taglib is included at jar
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3640. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3640 --- Additional Comments From [EMAIL PROTECTED] 2001-09-16 02:16 --- Created an attachment (id=554) Fix getResourcePath // build complete context relative path
DO NOT REPLY [Bug 3640] - Fix JSPC taglib support when taglib is included at jar
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3640. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3640 --- Additional Comments From [EMAIL PROTECTED] 2001-09-16 02:17 --- Created an attachment (id=555) Handle URLClassLoader relative path !!
[GUMP] Build Failure - Tomcat 4.0
This email is autogenerated from the output from:
http://jakarta.apache.org/builds/gump/2001-09-16/jakarta-tomcat-4.0.html
Buildfile: build.xml
deploy-prepare:
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-4.0/build
deploy-static:
deploy:
[echo] Target: Catalina - Deploy ...
build-prepare:
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/bin
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/classes
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/common
[mkdir] Created dir:
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/common/classes
[mkdir] Created dir:
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/common/lib
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/conf
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/lib
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/server
[mkdir] Created dir:
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/server/classes
[mkdir] Created dir:
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/server/lib
build-static:
[copy] Copying 9 files to
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build/bin
[copy] Could not find file
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/${activation.jar} to copy.
BUILD FAILED
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/build.xml:102: Could not find file
/home/rubys/jakarta/jakarta-tomcat-4.0/catalina/${activation.jar} to copy.
Total time: 4 seconds
Bug report for Tomcat 3 [2001/09/16]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal EHN=Ehnancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 82|Unc|Nor|2000-08-29|Jasper not affected by mod_rewrite BugRat Report#4| | 177|Unc|Maj|2000-10-11|Race condition during servlet initialization BugRa| | 182|Unc|Nor|2000-10-12|JSP error-page doesn't work with virtual hosts Bug| | 274|Unc|Nor|2000-12-04|request.getUserPrincipal() doesn't work when user | | 276|Unc|Nor|2000-12-04|JNI problem: bufferedreader.read fails in Tomcat/I| | 319|Unc|Nor|2000-12-12|Tomcat does not launch with given Unix script file| | 384|Unc|Nor|2000-12-30|AJP13 returns no Status Message (Reason-Phrase RFC| | 405|Unc|Nor|2001-01-05|response.sendRedirect() in MS Explorer 5.5 fails u| | 437|Unc|Nor|2001-01-12|req.getParameter(name) Ignores charset. always ass| | 463|Unc|Nor|2001-01-17|Ctx( /examples ): IOException in: R( /examples + | | 620|Unc|Nor|2001-02-15|StopTomcat defaults to localhost | | 864|Ver|Maj|2001-03-06|Duplicated definition when the same custom tag is | | 1112|Ver|Maj|2001-03-26|Jdk12Interceptor sets wrong ContextClassLoader| | 1253|Opn|Nor|2001-04-06|Frequent Connection reset by peer errors | | 1663|Unc|Maj|2001-05-08|Tomcat -SSL problem | | 1798|New|Cri|2001-05-17|Tomcat 3.2.2b5 with Apache and ajp13 stops respond| | 2333|New|Nor|2001-06-26|HTTP Reason will be destroyed in header using AJP1| | 2550|New|Nor|2001-07-10|Ajp13 Connection hanging on static content. | | 3566|Opn|Nor|2001-09-12|System.err and System.out /dev/null ? | | 3581|Opn|Nor|2001-09-13|Ctx() : Error creating validation mark - java.io.| | 3600|New|Enh|2001-09-14|/etc/rc.d scripts of the rpm | | 3602|New|Enh|2001-09-14|Tomcat is enabled by default after an rpm install | | 3604|New|Nor|2001-09-14|/etc/rc.d scripts and stop command| | 3606|New|Enh|2001-09-14|Tomcat rpms are not FHS compliant | | 3641|New|Nor|2001-09-16|Bad value in query string parameter while forwardi| +-+---+---+--+--+ | Total 25 bugs | +---+
Bug report for Tomcat 4 [2001/09/16]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal EHN=Ehnancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 821|Ver|Maj|2001-03-02|JSPC doesn't like NT paths| | 2997|Ass|Enh|2001-08-05|webapp connector should recover when tomcat is res| | 3055|New|Nor|2001-08-09|jsp:plugin tag ignores the name attribute | | 3127|New|Nor|2001-08-14|jsp:directive.include / not supported | | 3196|New|Nor|2001-08-20|javadoc errors| | 3344|New|Min|2001-08-29|A typo in jakarta-servletapi-4/src/share/javax/ser| | 3476|Ass|Nor|2001-09-06|can not use other than default location for war fi| | 3509|Ass|Cri|2001-09-07|Apache 1.3.20 mod_webapp Tomcat 4b7 HANGS | | 3511|New|Blk|2001-09-09|line to long | | 3515|New|Cri|2001-09-10|Processes hanging after stopping Tomcat | | 3529|Opn|Blk|2001-09-10|JSPC can't handle taglib's :RC1 | | 3534|Ass|Maj|2001-09-10|FileUpload doesn't work with Apache, mod_webapp an| | 3546|Ver|Min|2001-09-11|req.getDateHeader() can fail under load | | 3594|Unc|Maj|2001-09-13|Have to reload page or page will not be shown | | 3612|New|Nor|2001-09-14|getServletPath() method returns wrong value | | 3640|New|Nor|2001-09-16|Fix JSPC taglib support when taglib is included at| +-+---+---+--+--+ | Total 16 bugs | +---+
DO NOT REPLY [Bug 3612] - getServletPath() method returns wrong value
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3612. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3612 [EMAIL PROTECTED] changed: What|Removed |Added AssignedTo|tomcat- |[EMAIL PROTECTED] |[EMAIL PROTECTED] |
Re: DO NOT REPLY [Bug 3612] - getServletPath() method returnswrong value
[EMAIL PROTECTED] [EMAIL PROTECTED] wrote: DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3612. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3612 [EMAIL PROTECTED] changed: What|Removed |Added AssignedTo|tomcat- |[EMAIL PROTECTED] |[EMAIL PROTECTED] | Guys, it would be so cool that when you start tackling a bug, you assign it to yourself and change its status to assigned. In this way bugs won't appear as new and unreviewed on the list. Pier
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core LocalStrings.properties
craigmcc01/09/16 15:26:33
Modified:catalina/src/share/org/apache/catalina/core
LocalStrings.properties
Log:
Fix typo.
Submitted by: Kazuhiro Kazama [EMAIL PROTECTED]
Revision ChangesPath
1.37 +1 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings.properties,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- LocalStrings.properties 2001/09/15 23:31:29 1.36
+++ LocalStrings.properties 2001/09/16 22:26:33 1.37
@@ -59,7 +59,7 @@
standardContext.securityConstraint.pattern=Invalid url-pattern {0} in security
constraint
standardContext.servletMap.name=Servlet mapping specifies an unknown servlet name
{0}
standardContext.servletMap.pattern=Invalid url-pattern {0} in servlet mapping
-standardContext.startCleanup-Exception during cleanup after start failed
+standardContext.startCleanup=Exception during cleanup after start failed
standardContext.startFailed=Context startup failed due to previous errors
standardContext.startingLoader=Exception starting Loader
standardContext.startingManager=Exception starting Manager
cvs commit: jakarta-tomcat-connectors/webapp/support mkinstalldirs.sh
pier01/09/16 16:53:24
Added: webapp/support mkinstalldirs.sh
Log:
Added mkinstalldirs.sh required for installations.
Revision ChangesPath
1.1 jakarta-tomcat-connectors/webapp/support/mkinstalldirs.sh
Index: mkinstalldirs.sh
===
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman [EMAIL PROTECTED]
# Created: 1993-05-16
# Public domain
# $Id: mkinstalldirs.sh,v 1.1 2001/09/16 23:53:24 pier Exp $
errstatus=0
dirmode=
usage=\
Usage: mkinstalldirs [-h] [--help] [-m mode] dir ...
# process command line arguments
while test $# -gt 0 ; do
case ${1} in
-h | --help | --h* ) # -h for help
echo ${usage} 12; exit 0 ;;
-m ) # -m PERM arg
shift
test $# -eq 0 { echo ${usage} 12; exit 1; }
dirmode=${1}
shift ;;
-- ) shift; break ;; # stop option processing
-* ) echo ${usage} 12; exit 1 ;; # unknown option
* ) break ;;# first non-opt arg
esac
done
for file
do
set fnord `echo :$file | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
for d
do
pathcomp=$pathcomp$d
case $pathcomp in
-* ) pathcomp=./$pathcomp ;;
esac
if test ! -d $pathcomp; then
echo mkdir $pathcomp
mkdir $pathcomp || lasterr=$?
if test ! -d $pathcomp; then
errstatus=$lasterr
else
if test ! -z $dirmode; then
echo chmod $dirmode $pathcomp
lasterr=
chmod $dirmode $pathcomp || lasterr=$?
if test ! -z $lasterr; then
errstatus=$lasterr
fi
fi
fi
fi
pathcomp=$pathcomp/
done
done
exit $errstatus
# Local Variables:
# mode:shell-script
# sh-indentation:3
# End:
cvs commit: jakarta-tomcat-connectors/webapp/support apjava.m4
pier01/09/16 16:54:20
Modified:webapp/support apjava.m4
Log:
Correctly discover Java binaries if JAVA_ENABLED is set to true
Revision ChangesPath
1.11 +36 -16jakarta-tomcat-connectors/webapp/support/apjava.m4
Index: apjava.m4
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/apjava.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apjava.m4 2001/09/15 23:33:46 1.10
+++ apjava.m4 2001/09/16 23:54:20 1.11
@@ -57,7 +57,7 @@
dnl --
dnl Author Pier Fumagalli [EMAIL PROTECTED]
-dnl Version $Id: apjava.m4,v 1.10 2001/09/15 23:33:46 pier Exp $
+dnl Version $Id: apjava.m4,v 1.11 2001/09/16 23:54:20 pier Exp $
dnl --
dnl --
@@ -72,13 +72,13 @@
specified its value will be inherited from the
JAVA_HOME environment variable).],
[
- case ${withval} in
- yes|YES|true|TRUE)
-JAVA_ENABLE=TRUE
+ case ${enableval} in
+ |yes|YES|true|TRUE)
+JAVA_ENABLE=true
;;
*)
-JAVA_ENABLE=TRUE
-JAVA_HOME=${withval}
+JAVA_ENABLE=true
+JAVA_HOME=${enableval}
;;
esac
@@ -87,12 +87,10 @@
if ${TEST} ! -z ${JAVA_HOME}
then
LOCAL_RESOLVEDIR(JAVA_HOME,${JAVA_HOME},[java home directory])
-AC_MSG_RESULT([error])
-AC_MSG_ERROR([java home not specified and not found in environment])
fi
],[
- JAVA_ENABLE=FALSE
+ JAVA_ENABLE=false
AC_MSG_RESULT([no])
]
)
@@ -107,12 +105,19 @@
dnl retrieved from the JAVACFLAGS environment variable and checked.
dnl --
AC_DEFUN([JAVA_JAVAC],[
- if ${TEST} -z ${JAVA_HOME}
+ if ${TEST} ${JAVA_ENABLE} = false
then
JAVAC=
JAVACFLAGS=
else
-LOCAL_CHECK_PROG(JAVAC,javac,${JAVA_HOME}/bin)
+if ${TEST} -n ${JAVA_HOME}
+then
+ local_path=${JAVA_HOME}/bin
+else
+ local_path=
+fi
+LOCAL_CHECK_PROG(JAVAC,javac,${local_path})
+unset local_path
AC_CACHE_CHECK([wether the Java compiler (${JAVAC}) works],
ap_cv_prog_javac_works,[
@@ -127,7 +132,8 @@
AC_MSG_RESULT(no)
AC_MSG_ERROR([${JAVAC} cannot compile])
fi
-])
+]
+ )
fi
AC_SUBST(JAVAC)
AC_SUBST(JAVACFLAGS)
@@ -139,11 +145,18 @@
dnl the binary name in the JAR environment variable.
dnl --
AC_DEFUN([JAVA_JAR],[
- if ${TEST} -z ${JAVA_HOME}
+ if ${TEST} ${JAVA_ENABLE} = false
then
JAR=
else
-LOCAL_CHECK_PROG(JAR,jar,${JAVA_HOME}/bin)
+if ${TEST} -n ${JAVA_HOME}
+then
+ local_path=${JAVA_HOME}/bin
+else
+ local_path=
+fi
+LOCAL_CHECK_PROG(JAR,jar,${local_path})
+unset local_path
fi
AC_SUBST(JAR)
])
@@ -154,11 +167,18 @@
dnl Exports the binary name in the JAR environment variable.
dnl --
AC_DEFUN([JAVA_JAVADOC],[
- if ${TEST} -z ${JAVA_HOME}
+ if ${TEST} ${JAVA_ENABLE} = false
then
JAVADOC=
else
-LOCAL_CHECK_PROG(JAVADOC,javadoc,${JAVA_HOME}/bin)
+if ${TEST} -n ${JAVA_HOME}
+then
+ local_path=${JAVA_HOME}/bin
+else
+ local_path=
+fi
+LOCAL_CHECK_PROG(JAVADOC,javadoc,${local_path})
+unset local_path
fi
AC_SUBST(JAVADOC)
])
cvs commit: jakarta-tomcat-connectors/webapp/support aplocal.m4
pier01/09/16 16:55:05 Modified:webapp/support aplocal.m4 Log: Added ln to the list of required binaries. Revision ChangesPath 1.8 +3 -1 jakarta-tomcat-connectors/webapp/support/aplocal.m4 Index: aplocal.m4 === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/aplocal.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- aplocal.m42001/09/15 04:44:43 1.7 +++ aplocal.m42001/09/16 23:55:05 1.8 @@ -57,7 +57,7 @@ dnl -- dnl Author Pier Fumagalli [EMAIL PROTECTED] -dnl Version $Id: aplocal.m4,v 1.7 2001/09/15 04:44:43 pier Exp $ +dnl Version $Id: aplocal.m4,v 1.8 2001/09/16 23:55:05 pier Exp $ dnl -- dnl -- @@ -72,6 +72,7 @@ LOCAL_CHECK_PROG(GREP,grep) LOCAL_CHECK_PROG(CAT,cat) LOCAL_CHECK_PROG(SED,sed) + LOCAL_CHECK_PROG(LN,ln) LOCAL_CHECK_PROG(RM,rm) AC_SUBST(TEST) AC_SUBST(TRUE) @@ -79,6 +80,7 @@ AC_SUBST(GREP) AC_SUBST(CAT) AC_SUBST(SED) + AC_SUBST(LN) AC_SUBST(RM) ])
cvs commit: jakarta-tomcat-connectors/webapp/support config.sub
pier01/09/16 16:56:18 Modified:webapp/support config.sub Log: Updating config.sub from latest AutoConf release Revision ChangesPath 1.2 +180 -131 jakarta-tomcat-connectors/webapp/support/config.sub Index: config.sub === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/config.sub,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.sub2001/09/15 21:41:24 1.1 +++ config.sub2001/09/16 23:56:18 1.2 @@ -1,8 +1,10 @@ #! /bin/sh -# Configuration validation subroutine script, version 1.1. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -# + +timestamp='2001-06-08' + # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -27,12 +29,6 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# -# This file contains changes for Apache, clearly marked below. -# These changes are hereby donated to the public domain. -# - -# Written by Per Bothner [EMAIL PROTECTED]. # Please send patches to [EMAIL PROTECTED]. # # Configuration subroutine to validate and canonicalize a configuration type. @@ -55,47 +51,76 @@ #CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] -then - echo Configuration name missing. 12 - echo Usage: $0 CPU-MFR-OPSYS 12 - echo or $0 ALIAS 12 - echo where ALIAS is a recognized configuration type. 12 - exit 1 -fi +me=`echo $0 | sed -e 's,.*/,,'` -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; +usage=\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to [EMAIL PROTECTED]. + +version=\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +help= +Try \`$me --help' for more information. + +# Parse command line +while test $# -gt 0 ; do + case $1 in +--time-stamp | --time* | -t ) + echo $timestamp ; exit 0 ;; +--version | -v ) + echo $version ; exit 0 ;; +--help | --h* | -h ) + echo $usage; exit 0 ;; +-- ) # Stop option processing + shift; break ;; +- ) # Use stdin as input. + break ;; +-* ) + echo $me: invalid option $1$help + exit 1 ;; + +*local*) + # First pass through any local machine types. + echo $1 + exit 0;; + +* ) + break ;; + esac +done + +case $# in + 0) echo $me: missing argument$help 2 +exit 1;; + 1) ;; + *) echo $me: too many arguments$help 2 +exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu*) + nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; - -# changes for Apache -# - tpf | os390 | vmcms) -os=-$maybe_os -basic_machine=s390; -;; - mvs) -os=-mvs -basic_machine=i370; -;; -# -# end Apache changes - *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -118,7 +143,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple) + -apple | -axis)
cvs commit: jakarta-tomcat-connectors/webapp/support install.sh
pier01/09/16 16:56:34
Modified:webapp/support install.sh
Log:
Updating install.sh from latest AutoConf release
Revision ChangesPath
1.2 +221 -82 jakarta-tomcat-connectors/webapp/support/install.sh
Index: install.sh
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/install.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- install.sh2001/09/15 21:41:24 1.1
+++ install.sh2001/09/16 23:56:34 1.2
@@ -1,21 +1,37 @@
#!/bin/sh
-##
-## install.sh -- install a program, script or datafile
-##
-## Based on `install-sh' from the X Consortium's X11R5 distribution
-## as of 89/12/18 which is freely available.
-## Cleaned up for Apache's Autoconf-style Interface (APACI)
-## by Ralf S. Engelschall [EMAIL PROTECTED]
-##
#
-# This script falls under the Apache License.
-# See http://www.apache.org/docs/LICENSE
-
-
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
#
-# put in absolute paths if you don't have them in your path;
-# or use env. vars.
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission. M.I.T. makes no representations about the
+# suitability of this software for any purpose. It is provided as is
+# without express or implied warranty.
#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch. It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
mvprog=${MVPROG-mv}
cpprog=${CPPROG-cp}
chmodprog=${CHMODPROG-chmod}
@@ -23,90 +39,213 @@
chgrpprog=${CHGRPPROG-chgrp}
stripprog=${STRIPPROG-strip}
rmprog=${RMPROG-rm}
+mkdirprog=${MKDIRPROG-mkdir}
-#
-# parse argument line
-#
+transformbasename=
+transform_arg=
instcmd=$mvprog
-chmodcmd=
+chmodcmd=$chmodprog 0755
chowncmd=
chgrpcmd=
stripcmd=
rmcmd=$rmprog -f
mvcmd=$mvprog
-ext=
src=
dst=
-while [ x$1 != x ]; do
+dir_arg=
+
+while [ x$1 != x ]; do
case $1 in
--c) instcmd=$cpprog
-shift; continue
-;;
--m) chmodcmd=$chmodprog $2
-shift; shift; continue
-;;
--o) chowncmd=$chownprog $2
-shift; shift; continue
-;;
--g) chgrpcmd=$chgrpprog $2
-shift; shift; continue
-;;
--s) stripcmd=$stripprog
-shift; continue
-;;
--S) stripcmd=$stripprog $2
-shift; shift; continue
-;;
--e) ext=$2
-shift; shift; continue
-;;
-*) if [ x$src = x ]; then
-src=$1
-else
-dst=$1
-fi
-shift; continue
-;;
+ -c) instcmd=$cpprog
+ shift
+ continue;;
+
+ -d) dir_arg=true
+ shift
+ continue;;
+
+ -m) chmodcmd=$chmodprog $2
+ shift
+ shift
+ continue;;
+
+ -o) chowncmd=$chownprog $2
+ shift
+ shift
+ continue;;
+
+ -g) chgrpcmd=$chgrpprog $2
+ shift
+ shift
+ continue;;
+
+ -s) stripcmd=$stripprog
+ shift
+ continue;;
+
+ -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+ shift
+ continue;;
+
+ -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+ shift
+ continue;;
+
+ *) if [ x$src = x ]
+ then
+ src=$1
+ else
+ # this colon is to work around a 386BSD /bin/sh bug
+ :
+ dst=$1
+ fi
+ shift
+ continue;;
esac
done
-if [ x$src = x ]; then
- echo install.sh: no input file specified
- exit 1
cvs commit: jakarta-tomcat-connectors/webapp/apache-1.3 Makefile.in
pier01/09/16 16:57:47
Modified:webapp/apache-1.3 Makefile.in
Log:
Changed the way in which the module is built (this should fix the problem
on Linux where APXS is broken).
Revision ChangesPath
1.12 +26 -53jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 2001/09/05 11:05:47 1.11
+++ Makefile.in 2001/09/16 23:57:47 1.12
@@ -56,60 +56,33 @@
# = #
# @author Pier Fumagalli mailto:[EMAIL PROTECTED]
-# @version $Id: Makefile.in,v 1.11 2001/09/05 11:05:47 jfclere Exp $
+# @version $Id: Makefile.in,v 1.12 2001/09/16 23:57:47 pier Exp $
-include @SRCDIR@/Makedefs
+include @TGTDIR@/Makedefs
-APXS_CC =@APXS_CC@
-APXS_TARGET =@APXS_TARGET@
-APXS_CFLAGS =@APXS_CFLAGS@
-APXS_SBINDIR = @APXS_SBINDIR@
-APXS_CFLAGS_SHLIB = @APXS_CFLAGS_SHLIB@
-APXS_INCLUDEDIR =@APXS_INCLUDEDIR@
-APXS_LD_SHLIB = @APXS_LD_SHLIB@
-APXS_LIBEXECDIR =@APXS_LIBEXECDIR@
-APXS_LDFLAGS_SHLIB = @APXS_LDFLAGS_SHLIB@
-APXS_SYSCONFDIR =@APXS_SYSCONFDIR@
-APXS_LIBS_SHLIB =@APXS_LIBS_SHLIB@
-APXS_PREFIX =@APXS_PREFIX@
-APXS = @APXS@
-
-MODULE = mod_webapp.so
-
-all: $(MODULE)
-
-mod_webapp.lo: mod_webapp.c @SRCDIR@/Makedefs
- @$(ECHO) Compiling Apache 1.3 WebApp module
- @$(SHELL) $(LIBTOOL) $(LTFLAGS) --mode=compile \
- $(CC) $(CFLAGS) $(APXS_CFLAGS) \
- $(APXS_CFLAGS_SHLIB) \
- -I$(APXS_INCLUDEDIR) \
- $(CPPFLAGS) \
- -c $ -o $@
-
-mod_webapp.so: mod_webapp.lo @SRCDIR@/lib/libwebapp.la @APRDIR@/libapr.la
- @$(ECHO) Linking Apache 1.3 WebApp Module
- @$(SHELL) $(LIBTOOL) $(LTFLAGS) --mode=link \
- $(APXS_LD_SHLIB) $(APXS_LDFLAGS_SHLIB) \
- mod_webapp.lo @SRCDIR@/lib/libwebapp.la \
- $(LIBTOOL_LIBS) $(EXTRA_LIBS) @APRDIR@/libapr.la \
- -o mod_webapp.so
-
-install: mod_webapp.so
- @$(ECHO) Installing Apache 1.3 WebApp Module
- @$(SHELL) $(LIBTOOL) --mode=install cp $(MODULE) $(APXS_LIBEXECDIR)
+SRCS = mod_webapp.c
+OBJS = mod_webapp.o
+
+MOD =mod_webapp.so
+
+APXS = @APXS@
+
+build: $(MOD)
+
clean:
- @for ENTRY in *.o *.lo $(MODULE) .libs ; \
- do \
- if $(TEST) -f $${ENTRY} ; \
- then \
- $(ECHO) Removing file $${ENTRY} ; \
- $(RM) -f $${ENTRY} ; \
- fi ; \
- if $(TEST) -d $${ENTRY} ; \
- then \
- $(ECHO) Removing directory $${ENTRY} ; \
- $(RM) -rf $${ENTRY} ; \
- fi ; \
- done
+ @$(MECHO) Cleaning up
+ @$(DEXEC) $(RM) -f $(OBJS) $(MOD)
+
+$(MOD): $(SRCS)
+ @$(APXS) -c \
+ -Wc,$(CFLAGS) $(APR_CFLAGS) $(CPPFLAGS) $(APR_CPPFLAGS) \
+ -Wl,$(APR_LDFLAGS) $(APR_LIBS) \
+ -I$(APR_INCDIR) -I$(SRCDIR)/include $(APR_INCLUDES) \
+ -L$(TGTDIR)/lib -L$(APR_LIBDIR) \
+ -lapr -lwebapp -o $@ $
+
+$(SRCS):
+ @$(MECHO) Linking \$@\
+ @$(DEXEC) $(LN) -s $(SRCDIR)/apache-1.3/$@ ./$@
+
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
pier01/09/16 16:59:27
Modified:webapp/lib Makefile.in
Log:
Removed dependancies on LibTool for compilation as it's broken on more
platforms than in the ones in which it works (I don't want to include all
libtool hacks used by APR).
Revision ChangesPath
1.14 +47 -37jakarta-tomcat-connectors/webapp/lib/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.in 2001/08/06 20:23:43 1.13
+++ Makefile.in 2001/09/16 23:59:27 1.14
@@ -56,44 +56,54 @@
# = #
# @author Pier Fumagalli mailto:[EMAIL PROTECTED]
-# @version $Id: Makefile.in,v 1.13 2001/08/06 20:23:43 pier Exp $
+# @version $Id: Makefile.in,v 1.14 2001/09/16 23:59:27 pier Exp $
-include @SRCDIR@/Makedefs
+include @TGTDIR@/Makedefs
-OBJS = wa_main.lo wa_config.lo wa_request.lo
-PROVS = pr_info.lo \
- pr_warp.lo \
- pr_warp_packet.lo \
- pr_warp_network.lo \
- pr_warp_config.lo
-
-LIB = libwebapp.la
-
-all: pr_warp_defs.h $(LIB)
-
-$(LIB): $(OBJS) $(PROVS)
- @$(ECHO) Creating library $(LIB)
- @$(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -static -o $(LIB) \
- $(OBJS) $(PROVS) 1 /dev/null
-
-pr_warp_defs.h: @SRCDIR@/java/Constants.java
- @$(ECHO) Generating pr_warp_defs.h
- @$(CAT) @SRCDIR@/java/Constants.java | \
- grep TYPE_ | \
- sed s/public static final int/#define/g | \
- sed y/=;/ / pr_warp_defs.h
+SRCS = pr_info.c \
+ pr_warp.c \
+ pr_warp.h \
+ pr_warp_config.c \
+ pr_warp_network.c \
+ pr_warp_packet.c \
+ wa_config.c \
+ wa_main.c \
+ wa_request.c \
+
+OBJS = wa_main.o \
+ wa_config.o \
+ wa_request.o
+
+PROVS = pr_info.o \
+ pr_warp.o \
+ pr_warp_packet.o \
+ pr_warp_network.o \
+ pr_warp_config.o
+LIB =libwebapp.a
+
+WARPH = pr_warp_defs.h
+
+build: $(LIB)
+
clean:
- @for ENTRY in *.o *.lo $(LIB) pr_warp_defs.h .libs ; \
- do \
- if $(TEST) -f $${ENTRY} ; \
- then \
- $(ECHO) Removing file $${ENTRY} ; \
- $(RM) -f $${ENTRY} ; \
- fi ; \
- if $(TEST) -d $${ENTRY} ; \
- then \
- $(ECHO) Removing directory $${ENTRY} ; \
- $(RM) -rf $${ENTRY} ; \
- fi ; \
- done
+ @$(MECHO) Cleaning up
+ @$(DEXEC) $(RM) -f $(OBJS) $(PROVS) $(LIB) $(WARPH)
+
+$(LIB): $(SRCS) $(WARPH) $(OBJS) $(PROVS)
+ @$(MECHO) Creating library \$@\
+ @$(DEXEC) $(AR) cr $@ $(OBJS) $(PROVS)
+ @$(DEXEC) $(RANLIB) $@
+
+pr_warp_defs.h: $(SRCDIR)/java/Constants.java
+ @$(MECHO) Generating \$@\
+ @$(CAT) $ | \
+ $(GREP) TYPE_ | \
+ $(SED) s/public static final int/#define/g | \
+ $(SED) y/=;/ / $@
+
+$(SRCS):
+ @$(MECHO) Linking \$@\
+ @$(DEXEC) $(LN) -s $(SRCDIR)/lib/$@ ./$@
+
+
cvs commit: jakarta-tomcat-connectors/webapp configure.in
pier01/09/16 17:00:32
Modified:webapp configure.in
Log:
Updated the way in wich targets are handled.
Added new targets for API documentation.
Revision ChangesPath
1.36 +166 -33 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- configure.in 2001/09/16 00:30:10 1.35
+++ configure.in 2001/09/17 00:00:32 1.36
@@ -58,7 +58,7 @@
dnl --
dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
-dnl Version $Id: configure.in,v 1.35 2001/09/16 00:30:10 pier Exp $
+dnl Version $Id: configure.in,v 1.36 2001/09/17 00:00:32 pier Exp $
dnl --
dnl --
@@ -78,13 +78,12 @@
dnl --
dnl Setup initial variable value
dnl
-dnl New vars: MODULE TARGET_BUILD TARGET_CLEAN
+dnl New vars: MODULE TARGET
dnl APR_CFGFLG APR_SRCDIR APR_LIBDIR APR_INCDIR APR_VARFIL
dnl Upd vars: N/A
dnl --
MODULE=
-TARGET_BUILD=lib-build
-TARGET_CLEAN=lib-clean
+TARGET=lib
APR_CFGFLG=
APR_SRCDIR=
APR_LIBDIR=
@@ -92,8 +91,7 @@
APR_VARFIL=
AC_SUBST(MODULE)
-AC_SUBST(TARGET_BUILD)
-AC_SUBST(TARGET_CLEAN)
+AC_SUBST(TARGET)
AC_SUBST(APR_CFGFLG)
AC_SUBST(APR_SRCDIR)
AC_SUBST(APR_LIBDIR)
@@ -149,7 +147,9 @@
],[
AC_MSG_RESULT([no])
DEBUG=false
- ])
+DEXEC=
+ ]
+)
AC_SUBST(DEBUG)
dnl -
@@ -178,7 +178,7 @@
when the --enable-java option is not specified.],
[
case ${withval} in
-yes|YES|true|TRUE)
+|yes|YES|true|TRUE)
TC4DIR=/usr/local/tomcat
;;
*)
@@ -191,13 +191,117 @@
)
AC_SUBST(TC4DIR)
+dnl -
+dnl Check wether we have to build the C API documentation or not
+dnl
+dnl New vars: PERL SCANDOC SCANDOCFLAGS
+dnl Upd vars: TARGET
+dnl -
+LOCAL_HEADER([API documentation generation])
+AC_MSG_CHECKING([for C API documentation])
+AC_ARG_ENABLE(apidocs-c,
+ [ --enable-apidocs-c[=PERL]
+ enbale generation of C API documentation using
+ ScanDoc (PERL is the name of the Perl interpreter
+ used to run ScanDoc. If not specified this is
+ looked up in your current path).],
+ [
+AC_MSG_RESULT([yes])
+
+AC_MSG_CHECKING([for Perl interpreter])
+case ${enableval} in
+|yes|YES|true|TRUE)
+ LOCAL_CHECK_PROG(PERL,perl)
+ ;;
+*)
+ PERL=${enableval}
+ ;;
+esac
+
+if ${TEST} ! -x ${PERL}
+then
+ AC_MSG_RESULT([error])
+ AC_MSG_ERROR([cannot execute perl \${PERL}\])
+fi
+AC_MSG_RESULT([${PERL}])
+
+AC_MSG_CHECKING([for ScanDoc to use])
+SCANDOC=${SRCDIR}/support/scandoc.pl
+if ${TEST} ! -f ${SCANDOC}
+then
+ AC_MSG_RESULT([error])
+ AC_MSG_ERROR([cannof find ScanDoc \${SCANDOC}\])
+fi
+AC_MSG_RESULT([${SCANDOC}])
+
+AC_MSG_CHECKING([for ScanDoc template])
+if ${TEST} ! -f ${SRCDIR}/support/template.pl
+then
+ AC_MSG_RESULT([error])
+ AC_MSG_ERROR([cannof find ScanDoc \${SRCDIR}/support/template.pl\])
+fi
+AC_MSG_RESULT([${SRCDIR}/support/template.pl])
+SCANDOCFLAGS=-i ${SRCDIR}/support/template.pl
+
+TARGET=${TARGET} apidocs-c
+ ],[
+AC_MSG_RESULT([no])
+PERL=
+ ]
+)
+AC_SUBST(PERL)
+AC_SUBST(SCANDOC)
+AC_SUBST(SCANDOCFLAGS)
+
+dnl -
+dnl Check wether we have to build the Java API documentation or not
+dnl
+dnl New vars: N/A
+dnl Upd vars: JAVADOC TARGET
+dnl -
+AC_MSG_CHECKING([for Java API documentation])
+AC_ARG_ENABLE(apidocs-java,
+ [ --enable-apidocs-java[=JAVADOC]
+ enbale generation of Java API documentation using
+ JavaDoc (If JAVADOC is not set its value will be
+ discovered by \--enable-java\).],
+ [
+
cvs commit: jakarta-tomcat-connectors/webapp Makedefs.in configure.in
pier01/09/16 17:08:22 Modified:webapp Makedefs.in configure.in Log: Added ln, api-docs valies and enabling verbose compilation Revision ChangesPath 1.10 +22 -7 jakarta-tomcat-connectors/webapp/Makedefs.in Index: Makedefs.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makedefs.in 2001/09/16 00:31:00 1.9 +++ Makedefs.in 2001/09/17 00:08:22 1.10 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makedefs.in,v 1.9 2001/09/16 00:31:00 pier Exp $ +# @version $Id: Makedefs.in,v 1.10 2001/09/17 00:08:22 pier Exp $ .SUFFIXES: .c .o @@ -70,10 +70,11 @@ GREP = @GREP@ CAT = @CAT@ SED = @SED@ +LN = @LN@ RM = @RM@ # - -# Compilation settings +# Compilation settings and Makefile macros # - # The target module to build @@ -88,6 +89,10 @@ TGTDIR = @TGTDIR@ # The directory of a Tomcat 4.0 binary distribution TC4DIR = @TC4DIR@ +# The list of configure-generated files +CFGFILES = @CFCFILES@ ./config.cache ./config.log ./config.status +# GNU-Make style echo +MECHO = $(ECHO) $(MAKE)[$(MAKELEVEL)]: # - # APR library values @@ -147,12 +152,22 @@ CLASSPATH = @CLASSPATH@ # - +# ScanDoc Documentation tool settings +# - + +# PERL interpreter +PERL = @PERL@ +# ScanDoc documentation tool +SCANDOC = @SCANDOC@ +# Scandoc flags +SCANDOCFLAGS = @SCANDOCFLAGS@ + +# - # C-Compilation default setting # - .c.o: - @$(ECHO) Compiling \$\ - @$(CC) $(CFLAGS) $(CPPFLAGS) \ - $(APR_CFLAGS) $(APR_CPPFLAGS) $(APR_INCLUDES) \ - -I$(APR_INCDIR) -I$(SRCDIR)/include \ - -c $ -o $@ + $(CC) $(CFLAGS) $(CPPFLAGS) \ + $(APR_CFLAGS) $(APR_CPPFLAGS) $(APR_INCLUDES) \ + -I$(APR_INCDIR) -I$(SRCDIR)/include \ + -c $ -o $@ 1.37 +1 -2 jakarta-tomcat-connectors/webapp/configure.in Index: configure.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- configure.in 2001/09/17 00:00:32 1.36 +++ configure.in 2001/09/17 00:08:22 1.37 @@ -58,7 +58,7 @@ dnl -- dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED] dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED] -dnl Version $Id: configure.in,v 1.36 2001/09/17 00:00:32 pier Exp $ +dnl Version $Id: configure.in,v 1.37 2001/09/17 00:08:22 pier Exp $ dnl -- dnl -- @@ -147,7 +147,6 @@ ],[ AC_MSG_RESULT([no]) DEBUG=false -DEXEC= ] ) AC_SUBST(DEBUG)
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
pier01/09/16 17:08:56
Modified:webapp Makefile.in
Log:
New Makefile.
Revision ChangesPath
1.18 +45 -90jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.in 2001/09/05 11:05:47 1.17
+++ Makefile.in 2001/09/17 00:08:56 1.18
@@ -56,97 +56,52 @@
# = #
# @author Pier Fumagalli mailto:[EMAIL PROTECTED]
-# @version $Id: Makefile.in,v 1.17 2001/09/05 11:05:47 jfclere Exp $
+# @version $Id: Makefile.in,v 1.18 2001/09/17 00:08:56 pier Exp $
-include @SRCDIR@/Makedefs
+include @TGTDIR@/Makedefs
-LOCALDIRS = @TGTDIRS@ @TARGET@
-APRDIR = @APRDIR@
-INSTALLDIR = @TARGET@
-
-CFGS = @CONFIGFILES@ \
- @SRCDIR@/lib/pr_warp_defs.h \
- config.cache \
- config.log \
- config.status
-
-all: @APR_BUILD@ local-all
-
-install: local-install
-
-clean: @APR_CLEAN@ local-clean
-
-distclean: clean
- @$(ECHO)
- @$(ECHO) Removing configure generated files...
- @$(RM) -f $(CFGS)
-
-cvsclean: distclean
- @$(ECHO)
- @$(ECHO) Removing configure script...
- @$(ECHO) -f configure
-
-apr-all:
- @for DIR in $(APRDIR) ; do \
- $(ECHO) ; \
- $(ECHO) Compiling sources in $${DIR}... ; \
- cd $${DIR} ; \
- $(MAKE) all ; \
- RET=$$? ; \
- cd $(SRCDIR) ; \
- if $(TEST) $${RET} != 0 ; then \
- exit $${RET} ; \
- fi ; \
- done
+all: lib-build
+build: @TARGET_BUILD@
+clean: @TARGET_CLEAN@
+
+lib-build:
+ @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=lib MTGT=build
+
+lib-clean:
+ @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=lib MTGT=clean
+
+apr-build:
+ @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=$(APR_SRCDIR) MTGT=all
+ @$(MECHO) Installing APR library in \$(APR_LIBDIR)\
+ @$(APR_SRCDIR)/libtool --silent --mode=install \
+ $(SRCDIR)/support/install.sh -c \
+ $(APR_SRCDIR)/libapr.la \
+ $(APR_LIBDIR) 2/dev/null
+ @$(APR_SRCDIR)/libtool --silent --mode=finish \
+ $(APR_LIBDIR)
apr-clean:
- @for DIR in $(APRDIR) ; do \
- $(ECHO) ; \
- $(ECHO) Cleaning up $${DIR}... ; \
- cd $${DIR} ; \
- $(MAKE) clean ; \
- RET=$$? ; \
- cd $(SRCDIR) ; \
- if test $${RET} != 0 ; then \
- exit $${RET} ; \
- fi ; \
- done
-
-local-all:
- @for DIR in $(LOCALDIRS) ; do \
- $(ECHO) ; \
- $(ECHO) Compiling sources in $${DIR}... ; \
- cd $${DIR} ; \
- $(MAKE) all ; \
- RET=$$? ; \
- cd $(SRCDIR) ; \
- if test $${RET} != 0 ; then \
- exit $${RET} ; \
- fi ; \
- done
-
-local-clean:
- @for DIR in $(LOCALDIRS) ; do \
- $(ECHO) ; \
- $(ECHO) Cleaning up $${DIR}... ; \
- cd $${DIR} ; \
- $(MAKE) clean ; \
- RET=$$? ; \
- cd $(SRCDIR) ; \
- if test $${RET} != 0 ; then \
- exit $${RET} ; \
- fi ; \
- done
-
-local-install:
- @for DIR in $(INSTALLDIR) ; do \
- $(ECHO) ; \
- $(ECHO) Installing from $${DIR}... ; \
- cd $${DIR} ; \
- $(MAKE) install ; \
- RET=$$? ; \
- cd $(SRCDIR) ; \
- if test $${RET} != 0 ; then \
- exit $${RET} ; \
- fi ; \
- done
+ @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=$(APR_SRCDIR) MTGT=clean
+ @$(MECHO) Cleaning up APR library in \$(APR_LIBDIR)\
+ @$(RM) -f $(APR_LIBDIR)/libapr.*
+
+apache-1.3-build:
+ @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=apache-1.3 MTGT=build
+
+apache-1.3-clean:
+ @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=apache-1.3 MTGT=clean
+
+template:
+ @ { \
+ $(ECHO) ; \
+ $(MECHO) Entering directory \$(MDIR)\ ; \
+ cd $(MDIR) ; \
+ $(MECHO) Invoking \$(MAKE) $(MFLG) $(MTGT)\ ; \
+ $(MAKE) $(MFLG) $(MTGT); \
+ RET=$$? ; \
+ $(MECHO) Exiting directory \$(MDIR)\ ; \
+ cd $(SRCDIR) ; \
+ if test $${RET} != 0 ; then \
+ exit $${RET} ; \
+ fi ; \
+ }
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
pier01/09/16 17:09:41 Modified:webapp/apache-1.3 Makefile.in webapp/lib Makefile.in Log: Removed DEBUG compilation and enabled verbose. Revision ChangesPath 1.13 +3 -5 jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile.in 2001/09/16 23:57:47 1.12 +++ Makefile.in 2001/09/17 00:09:41 1.13 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.12 2001/09/16 23:57:47 pier Exp $ +# @version $Id: Makefile.in,v 1.13 2001/09/17 00:09:41 pier Exp $ include @TGTDIR@/Makedefs @@ -71,8 +71,7 @@ build: $(MOD) clean: - @$(MECHO) Cleaning up - @$(DEXEC) $(RM) -f $(OBJS) $(MOD) + $(RM) -f $(OBJS) $(MOD) $(MOD): $(SRCS) @$(APXS) -c \ @@ -84,5 +83,4 @@ $(SRCS): @$(MECHO) Linking \$@\ - @$(DEXEC) $(LN) -s $(SRCDIR)/apache-1.3/$@ ./$@ - + $(LN) -s $(SRCDIR)/apache-1.3/$@ ./$@ 1.15 +5 -7 jakarta-tomcat-connectors/webapp/lib/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.in 2001/09/16 23:59:27 1.14 +++ Makefile.in 2001/09/17 00:09:41 1.15 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.14 2001/09/16 23:59:27 pier Exp $ +# @version $Id: Makefile.in,v 1.15 2001/09/17 00:09:41 pier Exp $ include @TGTDIR@/Makedefs @@ -87,13 +87,12 @@ build: $(LIB) clean: - @$(MECHO) Cleaning up - @$(DEXEC) $(RM) -f $(OBJS) $(PROVS) $(LIB) $(WARPH) + $(RM) -f $(OBJS) $(PROVS) $(LIB) $(WARPH) $(LIB): $(SRCS) $(WARPH) $(OBJS) $(PROVS) @$(MECHO) Creating library \$@\ - @$(DEXEC) $(AR) cr $@ $(OBJS) $(PROVS) - @$(DEXEC) $(RANLIB) $@ + $(AR) cr $@ $(OBJS) $(PROVS) + $(RANLIB) $@ pr_warp_defs.h: $(SRCDIR)/java/Constants.java @$(MECHO) Generating \$@\ @@ -103,7 +102,6 @@ $(SED) y/=;/ / $@ $(SRCS): - @$(MECHO) Linking \$@\ - @$(DEXEC) $(LN) -s $(SRCDIR)/lib/$@ ./$@ + $(LN) -s $(SRCDIR)/lib/$@ ./$@
mod_webapp: statically linked Apache
Hi Pier, I can see by the number of recent commits that you are very busy with mod_webapp. Can you tell me if the new stuff will include support for mod_webapp with a statically linked Apache of is it still DSO only? Bojan
DO NOT REPLY [Bug 3641] - Bad value in query string parameter while forwarding request
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3641. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3641 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2001-09-16 17:48 --- Fixed, please check the next nightly.
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
pier01/09/16 17:42:59
Modified:webapp Makedefs.in Makefile.in configure.in
webapp/apache-1.3 Makefile.in
webapp/lib Makefile.in
Log:
Revised how distclean works.
Revision ChangesPath
1.11 +10 -6 jakarta-tomcat-connectors/webapp/Makedefs.in
Index: Makedefs.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makedefs.in 2001/09/17 00:08:22 1.10
+++ Makedefs.in 2001/09/17 00:42:59 1.11
@@ -56,7 +56,7 @@
# = #
# @author Pier Fumagalli mailto:[EMAIL PROTECTED]
-# @version $Id: Makedefs.in,v 1.10 2001/09/17 00:08:22 pier Exp $
+# @version $Id: Makedefs.in,v 1.11 2001/09/17 00:42:59 pier Exp $
.SUFFIXES: .c .o
@@ -90,7 +90,9 @@
# The directory of a Tomcat 4.0 binary distribution
TC4DIR = @TC4DIR@
# The list of configure-generated files
-CFGFILES = @CFCFILES@ ./config.cache ./config.log ./config.status
+CFGFILES = @CFGFILES@ ./config.cache ./config.log ./config.status
+# The file holding the list of makefile-generated files
+LSTFILE = $(TGTDIR)/config.list
# GNU-Make style echo
MECHO = $(ECHO) $(MAKE)[$(MAKELEVEL)]:
@@ -165,9 +167,11 @@
# -
# C-Compilation default setting
# -
+
+ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) \
+ $(APR_CFLAGS) $(APR_CPPFLAGS) $(APR_INCLUDES) \
+ -I$(APR_INCDIR) -I$(SRCDIR)/include
+
.c.o:
- $(CC) $(CFLAGS) $(CPPFLAGS) \
- $(APR_CFLAGS) $(APR_CPPFLAGS) $(APR_INCLUDES) \
- -I$(APR_INCDIR) -I$(SRCDIR)/include \
- -c $ -o $@
+ $(CC) $(ALL_CFLAGS) -c $ -o $@
1.19 +16 -7 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 2001/09/17 00:08:56 1.18
+++ Makefile.in 2001/09/17 00:42:59 1.19
@@ -56,19 +56,22 @@
# = #
# @author Pier Fumagalli mailto:[EMAIL PROTECTED]
-# @version $Id: Makefile.in,v 1.18 2001/09/17 00:08:56 pier Exp $
+# @version $Id: Makefile.in,v 1.19 2001/09/17 00:42:59 pier Exp $
include @TGTDIR@/Makedefs
-all: lib-build
+all: build
+
build: @TARGET_BUILD@
-clean: @TARGET_CLEAN@
-lib-build:
- @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=lib MTGT=build
+clean: @TARGET_CLEAN@
-lib-clean:
- @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=lib MTGT=clean
+distclean: clean
+ @$(MECHO) Removing makefile generated files
+ $(RM) -f `$(CAT) $(LSTFILE)`
+ $(RM) -f $(LSTFILE)
+ @$(MECHO) Removing configure generated files
+ $(RM) -f $(CFGFILES)
apr-build:
@$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=$(APR_SRCDIR) MTGT=all
@@ -84,6 +87,12 @@
@$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=$(APR_SRCDIR) MTGT=clean
@$(MECHO) Cleaning up APR library in \$(APR_LIBDIR)\
@$(RM) -f $(APR_LIBDIR)/libapr.*
+
+lib-build:
+ @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=lib MTGT=build
+
+lib-clean:
+ @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=lib MTGT=clean
apache-1.3-build:
@$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=apache-1.3 MTGT=build
1.38 +12 -10jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- configure.in 2001/09/17 00:08:22 1.37
+++ configure.in 2001/09/17 00:42:59 1.38
@@ -58,7 +58,7 @@
dnl --
dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
-dnl Version $Id: configure.in,v 1.37 2001/09/17 00:08:22 pier Exp $
+dnl Version $Id: configure.in,v 1.38 2001/09/17 00:42:59 pier Exp $
dnl --
dnl --
@@ -124,6 +124,7 @@
AC_SUBST(AR)
AC_SUBST(RANLIB)
AC_PROG_CC()
+LOCAL_CHECK_PROG(CC,${CC})
AC_PROG_CC_C_O()
AC_PROG_CPP()
AC_SUBST(CPPFLAGS)
@@ -483,10 +484,10 @@
dnl Build the APR configure script
dnl
Re: mod_webapp: statically linked Apache
Bojan Smojver [EMAIL PROTECTED] wrote: Hi Pier, I can see by the number of recent commits that you are very busy with mod_webapp. Can you tell me if the new stuff will include support for mod_webapp with a statically linked Apache of is it still DSO only? It's still DSO-only... Any particular reason why you can't use mod_so? Pier
cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade RequestDispatcherImpl.java
costin 01/09/16 17:44:55
Modified:.build.xml
src/facade22/org/apache/tomcat/facade
RequestDispatcherImpl.java
Log:
#2641, thanks Daniele Gaffuri for reporting the bug.
Also, removed the (unused) container/tomcat-startup.jar
Revision ChangesPath
1.152 +0 -5 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- build.xml 2001/09/07 04:25:20 1.151
+++ build.xml 2001/09/17 00:44:54 1.152
@@ -387,11 +387,6 @@
include name=org/apache/tomcat/startup/**/
exclude name=**/EmbededTomcat.java unless=jdk12.present/
/javac
-jar jarfile=${tomcat.build}/lib/container/tomcat-startup.jar
- basedir=${tomcat.build}/classes
- manifest=src/build/manifests/manifest.startup
- include name=org/apache/tomcat/startup/**/
-/jar
jar jarfile=${tomcat.build}/lib/common/etomcat.jar
basedir=${tomcat.build}/classes
1.22 +8 -4
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java
Index: RequestDispatcherImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- RequestDispatcherImpl.java2001/08/26 01:47:41 1.21
+++ RequestDispatcherImpl.java2001/09/17 00:44:55 1.22
@@ -236,16 +236,20 @@
// Process existing parameters, if not already done so
// ( otherwise we'll process some twice )
realRequest.parameters().handleQueryParameters();
- // Set the query string - the sum of the old one and new one.
+ // Set the query string - the sum of the new one and old one.
String oldQS=realRequest.queryString().toString();
- String newQS=(oldQS==null ) ? queryString : oldQS + +
- queryString;
+ String newQS=(oldQS==null ) ? queryString : queryString + +
+ oldQS;
realRequest.queryString().setString(newQS);
// Process the additional parsm. We don't know if the old
// params were processed ( so we need to make sure they are,
// i.e. a known state ).
- realRequest.parameters().processParameters( queryString );
+ realRequest.parameters().push();
+ Parameters child=realRequest.parameters().getCurrentSet();
+
+ child.processParameters( queryString );
+ //realRequest.parameters().processParameters( queryString );
}
// run the new request through the context manager
Solution to Bug #753.
There is a solution to the bug #753.
String name = new String(request.getParameter("onoma").getBytes("8859_1"), "UTF-8");
Where "onoma" is the value taken from the submitted form and "name" the variable which
will be assigned with the UNICODE value of "onoma".
It works OK with my application.
Christos Digas
UK Internet Banking
http://www.ukinternetbanking.com
[EMAIL PROTECTED]
Re: mod_webapp: statically linked Apache
Pier Fumagalli wrote: Bojan Smojver [EMAIL PROTECTED] wrote: Hi Pier, I can see by the number of recent commits that you are very busy with mod_webapp. Can you tell me if the new stuff will include support for mod_webapp with a statically linked Apache of is it still DSO only? It's still DSO-only... Any particular reason why you can't use mod_so? Pier It's just that statically linked Apache is faster then the DSO version, uses less memory and mod_jk (which I use now with TC 3.3) works with it just fine (I use my own script to build mod_jk shipped with TC 3.3 and j-t-c version comes with support for statically linked Apache). Apart from that, no, not really. Bojan
RE: [J-T-C] Apache 2.0 code review required
Hi Henri et all, I'd like to sync tomcat_32, jakarta-tomcat, and j-t-c with the same code-- that is, using r-uri in all cases, but re-encoding it with ap_escape_uri. This seemed to be the consensus a month or two ago in the discussions, as proxies do the same thing (decode, then re-encode). The spec issue is simply to have (at least) the appropriate charaters escaped in the uri available to the servlet. This change would both enable mod_rewrite and also be compliant with the spec. Keith | -Original Message- | From: GOMEZ Henri [mailto:[EMAIL PROTECTED]] | Sent: Friday, September 14, 2001 7:16 PM | To: [EMAIL PROTECTED] | Subject: RE: [J-T-C] Apache 2.0 code review required | | | I don't think keeping everything as dumb as the dumbest server | is a good | idea - but the big problem is making sure those features don't | interfere | too much with the servlet spec ( see the mod_rewrite discussion ). | | The mod_rewrite case is now handled elegantly via JkOptions :)
Re: mod_webapp: statically linked Apache
Bojan Smojver [EMAIL PROTECTED] wrote: Pier Fumagalli wrote: Bojan Smojver [EMAIL PROTECTED] wrote: Hi Pier, I can see by the number of recent commits that you are very busy with mod_webapp. Can you tell me if the new stuff will include support for mod_webapp with a statically linked Apache of is it still DSO only? It's still DSO-only... Any particular reason why you can't use mod_so? Pier It's just that statically linked Apache is faster then the DSO version, uses less memory and mod_jk (which I use now with TC 3.3) works with it just fine (I use my own script to build mod_jk shipped with TC 3.3 and j-t-c version comes with support for statically linked Apache). Apart from that, no, not really. Faster? Well, probably yes, during startup... But once you have the pointer to the module structure, it's as-fast as statically linked... Can be done (after 4.0 final). Pier
DO NOT REPLY [Bug 3643] New: - Enable static-linking within Apache for WebApp module
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3643. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3643 Summary: Enable static-linking within Apache for WebApp module Product: Tomcat 4 Version: Nightly Build Platform: All OS/Version: All Status: NEW Severity: Enhancement Priority: Other Component: Connectors AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] The WebApp module doesn't come with a default script and makefile to allow static linking within Apache. Bojan Smojver [EMAIL PROTECTED] says it would be a nice feature to have
DO NOT REPLY [Bug 3643] - Enable static-linking within Apache for WebApp module
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3643. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3643 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||REMIND
Re: mod_webapp: statically linked Apache
Pier Fumagalli wrote: Bojan Smojver [EMAIL PROTECTED] wrote: Pier Fumagalli wrote: Bojan Smojver [EMAIL PROTECTED] wrote: Hi Pier, I can see by the number of recent commits that you are very busy with mod_webapp. Can you tell me if the new stuff will include support for mod_webapp with a statically linked Apache of is it still DSO only? It's still DSO-only... Any particular reason why you can't use mod_so? Pier It's just that statically linked Apache is faster then the DSO version, uses less memory and mod_jk (which I use now with TC 3.3) works with it just fine (I use my own script to build mod_jk shipped with TC 3.3 and j-t-c version comes with support for statically linked Apache). Apart from that, no, not really. Faster? Well, probably yes, during startup... But once you have the pointer to the module structure, it's as-fast as statically linked... Can be done (after 4.0 final). Thanks. I've just noticed your post at Bugzilla. Nice touch ;-) No hurry at all (I'm not even using TC 4 yet, just keeping my options open). And mod_jk does a nice job anyway... Bojan
Re: mod_webapp: statically linked Apache
Bojan Smojver [EMAIL PROTECTED] wrote: Thanks. I've just noticed your post at Bugzilla. Nice touch ;-) If I don't post it there, I'll forget about it in less than 5 minutes :) Now it's in my reminded bugs default query :) No hurry at all (I'm not even using TC 4 yet, just keeping my options open). And mod_jk does a nice job anyway... Yeah... Right now I want the sucker to BUILD :) Pier
cvs commit: jakarta-tomcat-connectors/webapp/lib pr_warp.c
pier01/09/16 20:09:56
Modified:webapp/lib pr_warp.c
Log:
Fix for Bug 2997:
When Tomcat is restarted, now the WebApp module automatically
reconnects thru WARP.
Previously the first request sent to Apache will come up with
an error saying Communitcation interrupted, but depending on
the number of active processes, that might have taken quite a
while (every process had to reconnect).
Now if the first packet doesn't go thru, we try once to re-
establish connection with Tomcat, so the Communication
interrupted message doesn't pop up anymore.
Revision ChangesPath
1.14 +22 -2 jakarta-tomcat-connectors/webapp/lib/pr_warp.c
Index: pr_warp.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/pr_warp.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pr_warp.c 2001/08/09 20:03:43 1.13
+++ pr_warp.c 2001/09/17 03:09:56 1.14
@@ -54,7 +54,7 @@
* *
* = */
-/* @version $Id: pr_warp.c,v 1.13 2001/08/09 20:03:43 pier Exp $ */
+/* @version $Id: pr_warp.c,v 1.14 2001/09/17 03:09:56 pier Exp $ */
#include pr_warp.h
/* Initialize this provider. */
@@ -250,7 +250,27 @@
p_write_string(pack,r-prot);
if (n_send(conf-sock,pack)!=wa_true) {
n_disconnect(conn);
-return(wa_rerror(WA_MARK,r,500,Communitcation interrupted));
+if (n_connect(conn)==wa_true) {
+wa_debug(WA_MARK,Connection \%s\ reopened,conn-name);
+if (c_configure(conn)==wa_true) {
+wa_debug(WA_MARK,Connection \%s\ reconfigured,conn-name);
+} else {
+wa_log(WA_MARK,Cannot reconfigure connection %s,conn-name);
+return(wa_rerror(WA_MARK,r,500,
+ Cannot reconfigure connection \%s\,
+ conn-name));
+}
+if (n_send(conf-sock,pack)!=wa_true) {
+ return(wa_rerror(WA_MARK,r,500,
+ Communitcation broken while reconnecting));
+} else {
+wa_debug(WA_MARK,Re-Req. %s %s %s,r-meth,r-ruri,r-prot);
+}
+} else {
+wa_log(WA_MARK,Cannot open connection %s,conn-name);
+return(wa_rerror(WA_MARK,r,500,Cannot open connection %s,
+ conn-name));
+}
} else {
wa_debug(WA_MARK,Req. %s %s %s,r-meth,r-ruri,r-prot);
}
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/appdev build.xml.txt
craigmcc01/09/16 20:16:58
Modified:webapps/tomcat-docs/appdev build.xml.txt
Log:
Modify the default class path created when compiling to include all of the
classes that Tomcat 4 automatically exposes to web applications. In this
way, there is no special case for servlet.jar or other commonly required
files.
Applications built with this file will need no customizations unless they
have other JAR files that need to be included in /WEB-INF/lib.
Revision ChangesPath
1.2 +25 -27jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt
Index: build.xml.txt
===
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml.txt 2001/07/28 22:54:13 1.1
+++ build.xml.txt 2001/09/17 03:16:58 1.2
@@ -18,7 +18,7 @@
Each of the following properties are used in the build script.
Values for these properties are set by the first place they are
defined, from the following list:
- * Definitions on the ant command line (ant -Ddeploy.home=xyz compile)
+ * Definitions on the ant command line (ant -Dcatalina.home=xyz compile)
* Definitions from a build.properties file in the top level
source directory
* Definitions from a build.properties file in the developer's
@@ -109,15 +109,10 @@
* Being copied into the /WEB-INF/lib directory during execution
of the deploy target.
- For the purposes of this example, the servlet.jar property should be set
- to the pathname of the servlet.jar file included in your Tomcat 4 release.
- It is included on the compiler classpath (because this is required in order
- to compile a servlet), but is not copied to the deployment directory because
- servlet containers already provide it at runtime.
-
- This example also includes a dummy foo.jar property, used to illustrate
- where you would make customizations for your own external dependencies
- in order to use them for compilation and/or deployment.
+ Because we will automatically include all of the Java classes that Tomcat 4
+ exposes to web applications, we will not need to explicitly list any of those
+ dependencies. You only need to worry about external dependencies for JAR
+ files that you are going to include inside your /WEB-INF/lib directory.
--
@@ -127,11 +122,7 @@
value=/path/to/foo.jar/
--
- property name=servlet.jar
- value=${catalina.home}/common/lib/servlet.jar/
-
-
!-- Compilation Classpath === --
!--
@@ -139,23 +130,30 @@
Rather than relying on the CLASSPATH environment variable, Ant includes
features that makes it easy to dynamically construct the classpath you
need for each compilation. The example below constructs the compile
- classpath to include the servlet.jar file, and includes comments on where
- you would insert your own additional JAR files. Such references should
- be based on external dependency properties, as described above, so that
- you can customize the actual location of the JAR files using build.properties
- files.
+ classpath to include the servlet.jar file, as well as the other components
+ that Tomcat makes available to web applications automatically, plus anything
+ that you explicitly added.
--
path id=compile.classpath
-
-!-- Include for the servlet.jar file --
-pathelement location=${servlet.jar}/
-!-- Dummy include for our foo.jar file --
+!-- Include all JAR files that will be included in /WEB-INF/lib --
+!-- *** CUSTOMIZE HERE AS REQUIRED BY YOUR APPLICATION *** --
!--
pathelement location=${foo.jar}/
--
+
+!-- Include all elements that Tomcat exposes to applications --
+pathelement location=${catalina.home}/common/classes/
+fileset dir=${catalina.home}/common/lib
+ include name=*.jar/
+/fileset
+pathelement location=${catalina.home}/classes/
+fileset dir=${catalina.home}/lib
+ include name=*.jar/
+/fileset
+
/path
@@ -244,11 +242,11 @@
fileset dir=${build.home}/
/copy
-!-- Pick up external dependencies as required --
-mkdir dir=${deploy.home}/WEB-INF/lib/
+!-- Copy external dependencies as required --
+!-- *** CUSTOMIZE HERE AS REQUIRED BY YOUR APPLICATION *** --
+mkdir dir=${deploy.home}/WEB-INF/lib/
!--
-copy tofile=${deploy.home}/WEB-INF/lib/foo.jar
- file=${foo.jar}/
+copy todir=${deploy.home}/WEB-INF/lib file=${foo.jar}/
--
/target
DO NOT REPLY [Bug 3644] New: - Errors reloading resources from jars: possible JDK bug
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3644. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3644 Summary: Errors reloading resources from jars: possible JDK bug Product: Tomcat 3 Version: 3.3 Beta 2 Platform: PC URL: N/A OS/Version: Linux Status: NEW Severity: Minor Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] The problem occurs when whole or parts of an application are distributed in a jar file and reload feature of Tomcat is turned on. If jar file is updated, either of the following might occur: - resources from within jar cannot be read - class itself cannot be found within jar (comes back to first the first) To replicate the problem with class loading do this: - create a servlet and pack it into WEB-INF/lib/app.jar - keep making changes to the servlet, pack it and put into WEB-INF/lib - attempt to use the servlet To replicate the problem with resource loading do this: - in your servlet call: ServletClassName.class.getResourceAsStream(file-packed-in-jar); or: this.getClass().getClassLoader().getResourceAsStream(file-packed-in-jar); - change the contents of the jar file and distribute into WEB-INF/lib - use the servlet The 'amount of change' to the jar file seems to make a difference. Small changes are less likely to cause errors. If the resource you're attempting to fetch is packed in the same jar with the servlet that fetches it, you might get intermittent resource loading problems or ClassNotFoundException thrown by DependClassLoader (which indicates that class itself could not be loaded). ClassNotFoundException happens due to the IOException being thrown by reading from ZipFile$1 (this is an InputStream), in method readFully() of DependClassLoader. This indicates that it is ZipFile of JDK that is probably broken and cannot read an updated jar file. The workaround is to use straight classes and files in WEB-INF/classes directory.
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs jndi-resources-howto.xml
craigmcc01/09/16 20:49:16 Modified:webapps/tomcat-docs jndi-resources-howto.xml Log: Simplify the JNDI Resources HOW-TO instructions for JDBC data sources, now that Tomcat 4 includes a much larger number of JAR files as part of the standard binary distribution. Revision ChangesPath 1.6 +11 -33jakarta-tomcat-4.0/webapps/tomcat-docs/jndi-resources-howto.xml Index: jndi-resources-howto.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/jndi-resources-howto.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jndi-resources-howto.xml 2001/09/13 00:01:48 1.5 +++ jndi-resources-howto.xml 2001/09/17 03:49:16 1.6 @@ -411,47 +411,25 @@ all J2EE platforms must provide to applications)./li /ul -h31. Download And Install Required Packages/h3 - -pUse of the data source JNDI resource involves downloading and installing -several packages that are not included with Tomcat. -Follow these steps:/p -ul -liDownload the JDBC Optional Package (version 2.0) from -a href=http://java.sun.com/products/jdbc/download.html;http://java.sun.com/products/jdbc/download.html/a./li -liInstall the codejdbc2_0-stdext.jar/code file from this package -into the code$CATALINA_HOME/common/lib/code directory, so that it -is available to both Catalina internal classes and to web applications. -/li -liDownload the Java Transaction API (JTA) package (version 1.0.1) from -a href=http://java.sun.com/products/jta/;http://java.sun.com/products/jta//a./li -liInstall the codejta-spec1_0_1.jar/code file from this package -into the code$CATALINA_HOME/common/lib/code directory, so that it -is available to both Catalina internal classes and to web applications. -/li -liDownload the Tyrex Data Source Package (version 0.9.7) from -a href=http://tyrex.exolab.org;http://tyrex.exolab.org/a./li -liInstall the codetyrex-0.9.7.0.jar/code file from this release -into the code$CATALINA_HOME/common/lib/code directory, so that it -is available to both Catalina internal classes and to web applications. -/li -liTyrex requires that you provide a JDBC driver to actually connect -to the underlying database. Place the JAR file for your database -driver into the code$CATALINA_HOME/common/lib/code directory, -so that it is available to both Catalina internal classes and to -web applications./li -/ul - pstrongNOTE/strong - The default data source support in Tomcat supports Tyrex. However, it is possible to use any other connection pool that implements codejavax.sql.DataSource/code, by writing your own custom resource factory, as described a href=#Adding Custom Resource Factoriesbelow/a./p +h31. Install Your JDBC Driver/h3 + +pUse of the emJDBC Data Sources/em JNDI Resource Factory requires +that you make an appropriate JDBC driver available to both Tomcat internal +classes and to your web application. This is most easily accomplished by +installing the driver's JAR file(s) into the +code$CATALINA_HOME/common/lib/code directory, which makes the driver +available both to the resource factory and to your application./p + h32. Declare Your Resource Requirements/h3 -pNExt, modify the web application deployment -descriptor (code/WEB-INF/web.xml/code) to declare the JNDI name under +pNext, modify the web application deployment descriptor +(code/WEB-INF/web.xml/code) to declare the JNDI name under which you will look up preconfigured data source. By convention, all such names should resolve to the codejdbc/code subcontext (relative to the standard codejava:comp/env/code naming context that is the root of
DO NOT REPLY [Bug 82] - Jasper not affected by mod_rewrite BugRat Report#49
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=82. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=82 [EMAIL PROTECTED] changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2001-09-16 21:45 --- Fixed in 3.3 ( optional behavior implemented by Henri should use either unparsed_uri or uri - the second will work with rewrite )
DO NOT REPLY [Bug 463] - Ctx( /examples ): IOException in: R( /examples + + null) Not an ISO 8859_1 character:? BugRat Report#788
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=463. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=463 [EMAIL PROTECTED] changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2001-09-16 21:53 --- This should be fixed in 3.3 We use a different solution, we can't use the Locale.getDefault() due to servlet spec ( which requires ISO8859_1 ). Please verify in 3.3 and let me know if this is still a problem ( and the stack trace )
DO NOT REPLY [Bug 437] - req.getParameter(name) Ignores charset. always assumes ISO8859-1. BugRat Report#753
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=437. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=437 [EMAIL PROTECTED] changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2001-09-16 21:55 --- Many charset problems are now fixed in 3.3. IF you specify charset on output, IE and newer mozilla will do the right thing, but still they will not send any encoding. However we do track the encoding per session.
DO NOT REPLY [Bug 405] - response.sendRedirect() in MS Explorer 5.5 fails using both ApacheModuleJServ and mod_jk adapters with Apache. BugRat Report#705
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=405. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=405 [EMAIL PROTECTED] changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2001-09-16 21:58 --- redirect() should be at the beginning of the page, before sending content.
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/buf DateTool.java MessageBytes.java
costin 01/09/16 21:56:02
Modified:src/facade22/org/apache/tomcat/facade HttpSessionFacade.java
src/share/org/apache/tomcat/modules/server
Http10Interceptor.java
src/share/org/apache/tomcat/util/buf DateTool.java
MessageBytes.java
Log:
Number 7 on the todo list, keep DateFormat as a local variable in the response.
The request/response is recycled and there is only one HttpResponse per thread - so
no synchronization is needed.
Initial fix for #1 ( I'm refering to Larry's Remaining issues ), it needs to be
verified. I
tried to avoid sync() on the typical case, and have the overhead only if the value
implements
the listener.
Revision ChangesPath
1.13 +29 -19
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpSessionFacade.java
Index: HttpSessionFacade.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpSessionFacade.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HttpSessionFacade.java2001/09/01 03:20:55 1.12
+++ HttpSessionFacade.java2001/09/17 04:56:02 1.13
@@ -184,22 +184,24 @@
public void setAttribute(String name, Object value) {
checkValid();
Object oldValue;
-// ServerSessionManager ssm=(ServerSessionManager)
-// realSession.getManager();
-// Original code - it's up to session manager to decide
-// what it can handle.
-// if (ssm.isDistributable()
-//!(value instanceof Serializable))
-// throw new IllegalArgumentException
-// (sm.getString(standardSession.setAttribute.iae));
-oldValue=realSession.getAttribute( name) ;
-if (oldValue!=null) {
-removeAttribute(name);
-}
-if (value instanceof HttpSessionBindingListener)
- ((HttpSessionBindingListener) value).valueBound
-(new HttpSessionBindingEvent( this, name));
-realSession.setAttribute( name, value );
+if (value instanceof HttpSessionBindingListener) {
+ synchronized( this ) {
+ oldValue=realSession.getAttribute( name) ;
+ if (oldValue!=null) {
+ removeAttribute(name);
+ }
+ ((HttpSessionBindingListener) value).valueBound
+ (new HttpSessionBindingEvent( this, name));
+ realSession.setAttribute( name, value );
+ }
+ } else {
+ oldValue=realSession.getAttribute( name) ;
+ if (oldValue!=null) {
+ removeAttribute(name);
+ }
+ // no sync overhead
+ realSession.setAttribute( name, value );
+ }
}
@@ -264,10 +266,18 @@
public void removeAttribute(String name) {
checkValid();
Object object=realSession.getAttribute( name );
- realSession.removeAttribute(name);
if (object instanceof HttpSessionBindingListener) {
- ((HttpSessionBindingListener) object).valueUnbound
- (new HttpSessionBindingEvent( this, name));
+ synchronized( this ) {
+ // double check ( probably not needed since setAttribute calls
+ // remove if it detects a value
+ object=realSession.getAttribute( name );
+ realSession.removeAttribute(name);
+ ((HttpSessionBindingListener) object).valueUnbound
+ (new HttpSessionBindingEvent( this, name));
+ }
+ } else {
+ // Regular object, no sync overhead
+ realSession.removeAttribute(name);
}
}
1.23 +30 -20
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java
Index: Http10Interceptor.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Http10Interceptor.java2001/09/01 13:03:06 1.22
+++ Http10Interceptor.java2001/09/17 04:56:02 1.23
@@ -63,9 +63,10 @@
import java.io.*;
import java.net.*;
import java.util.*;
+import java.text.*;
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.buf.*;
import org.apache.tomcat.util.http.*;
import org.apache.tomcat.util.net.*;
import org.apache.tomcat.util.net.ServerSocketFactory;
@@ -127,8 +128,8 @@
Object thData[]=new Object[3];
HttpRequest reqA=new HttpRequest();
HttpResponse resA=new
cvs commit: jakarta-tomcat-connectors/webapp/java WarpConfigurationHandler.java WarpConnection.java
pier01/09/16 22:03:24
Modified:webapp/java WarpConfigurationHandler.java
WarpConnection.java
Log:
Removed packet dumping (the Java WARP protocol stack is stable).
Added better information when applications cannot be autodeployed.
Revision ChangesPath
1.15 +1 -1
jakarta-tomcat-connectors/webapp/java/WarpConfigurationHandler.java
Index: WarpConfigurationHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/webapp/java/WarpConfigurationHandler.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WarpConfigurationHandler.java 2001/08/31 17:55:09 1.14
+++ WarpConfigurationHandler.java 2001/09/17 05:03:24 1.15
@@ -294,7 +294,7 @@
if (!file.exists()) {
logger.log(Cannot find \+file.getPath()+\ for appl. \+
- applName);
+ applName+\ host \+host.getName()+\);
return(null);
}
1.20 +2 -2 jakarta-tomcat-connectors/webapp/java/WarpConnection.java
Index: WarpConnection.java
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/java/WarpConnection.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- WarpConnection.java 2001/09/10 00:19:41 1.19
+++ WarpConnection.java 2001/09/17 05:03:24 1.20
@@ -213,7 +213,7 @@
if (Constants.DEBUG) {
String typ=Integer.toHexString(packet.getType());
logger.debug( TYPE=+typ+ LENGTH=+packet.size);
-logger.debug( +packet.dump());
+//logger.debug( +packet.dump());
}
this.output.write(packet.getType()0x0ff);
@@ -255,7 +255,7 @@
if (Constants.DEBUG) {
String typ=Integer.toHexString(packet.getType());
logger.debug( TYPE=+typ+ LENGTH=+packet.size);
-logger.debug( +packet.dump());
+// logger.debug( +packet.dump());
}
}
}
cvs commit: jakarta-tomcat-connectors/webapp/java Makefile.in
pier01/09/16 22:04:02
Modified:webapp/java Makefile.in
Log:
New Java makefile.
Revision ChangesPath
1.3 +25 -34jakarta-tomcat-connectors/webapp/java/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/java/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 2001/08/06 20:59:35 1.2
+++ Makefile.in 2001/09/17 05:04:02 1.3
@@ -56,43 +56,34 @@
# = #
# @author Pier Fumagalli mailto:[EMAIL PROTECTED]
-# @version $Id: Makefile.in,v 1.2 2001/08/06 20:59:35 pier Exp $
+# @version $Id: Makefile.in,v 1.3 2001/09/17 05:04:02 pier Exp $
-include @SRCDIR@/Makedefs
+include @TGTDIR@/Makedefs
-ARCHIVE = warp.jar
-
-all: $(ARCHIVE)
+SRCS = WarpConfigurationHandler.java \
+ WarpConnection.java \
+ WarpConnector.java \
+ WarpEngine.java \
+ WarpHost.java \
+ WarpLogger.java \
+ WarpPacket.java \
+ WarpRequest.java \
+ WarpRequestHandler.java \
+ WarpResponse.java \
-$(ARCHIVE): *.java @SRCDIR@/Makedefs
- @$(ECHO) Compiling Java sources with CLASSPATH set to:
-
- @CP=$(JAVACPATH):$${CLASSPATH} ; \
- for ENTRY in `$(ECHO) $${CP} | $(SED) y/:/\ /` ; \
- do \
- $(ECHO) $${ENTRY} ; \
- done ; \
- for ENTRY in *.java ; \
- do \
- $(ECHO) Compiling $${ENTRY} ; \
- done ; \
- $(JAVAC) $(JAVACFLAGS) -d . -classpath $(JAVACPATH):$${CLASSPATH} \
- *.java
+ARCHIVE = warp.jar
- @$(ECHO) Storing classes in warp.jar
- @$(JAR) -cvf0 warp.jar org/ 1/dev/null
+build: $(SRCS) $(ARCHIVE)
clean:
- @for ENTRY in $(ARCHIVE) org ; \
- do \
- if $(TEST) -f $${ENTRY} ; \
- then \
- $(ECHO) Removing file $${ENTRY} ; \
- $(RM) -f $${ENTRY} ; \
- fi ; \
- if $(TEST) -d $${ENTRY} ; \
- then \
- $(ECHO) Removing directory $${ENTRY} ; \
- $(RM) -rf $${ENTRY} ; \
- fi ; \
- done
+ $(RM) -f $(ARCHIVE)
+ $(RM) -rf ./org
+
+$(ARCHIVE): $(SRCS) Constants.java
+ $(JAVAC) $(JAVACFLAGS) -d . -classpath $(CLASSPATH):$${CLASSPATH} \
+ Constants.java $(SRCS)
+ $(JAR) -cf0 warp.jar org/
+
+$(SRCS):
+ $(LN) -s $(SRCDIR)/java/$@ ./$@
+ @$(ECHO) $(TGTDIR)/java/$@ $(LSTFILE)
cvs commit: jakarta-tomcat-connectors/webapp/lib pr_warp.c
pier01/09/16 22:05:30
Modified:webapp/lib pr_warp.c
Log:
Removed packet dumping from C.
Revision ChangesPath
1.15 +5 -2 jakarta-tomcat-connectors/webapp/lib/pr_warp.c
Index: pr_warp.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/pr_warp.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pr_warp.c 2001/09/17 03:09:56 1.14
+++ pr_warp.c 2001/09/17 05:05:30 1.15
@@ -54,7 +54,7 @@
* *
* = */
-/* @version $Id: pr_warp.c,v 1.14 2001/09/17 03:09:56 pier Exp $ */
+/* @version $Id: pr_warp.c,v 1.15 2001/09/17 05:05:30 pier Exp $ */
#include pr_warp.h
/* Initialize this provider. */
@@ -397,7 +397,7 @@
wa_rwrite(r,pack-buff,pack-size);
wa_rflush(r);
pack-buff[pack-size]='\0';
-wa_debug(WA_MARK,=== %s,pack-buff);
+wa_debug(WA_MARK,Response body bytes: %d,pack-size);
break;
}
case TYPE_RES_DONE: {
@@ -409,7 +409,9 @@
int size=-1;
p_read_ushort(pack,size);
p_reset(pack);
+wa_debug(WA_MARK,Request body bytes: (Req=%d),size);
size=wa_rread(r,pack-buff,size);
+wa_debug(WA_MARK,Request body bytes: (Got=%d),size);
if (size==0) {
pack-type=TYPE_CBK_DONE;
} else if (size0) {
@@ -419,6 +421,7 @@
pack-type=TYPE_ERROR;
p_write_string(pack,Transfer interrupted);
}
+wa_debug(WA_MARK,Request body bytes: (Sent=%d),pack-size);
if (n_send(conf-sock,pack)!=wa_true) {
n_disconnect(conn);
return(wa_rerror(WA_MARK,r,500,Communitcation interrupted));
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
pier01/09/16 22:06:27 Modified:webapp Makefile.in Log: Added local (non APR) targets. Revision ChangesPath 1.20 +10 -3 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile.in 2001/09/17 00:42:59 1.19 +++ Makefile.in 2001/09/17 05:06:27 1.20 @@ -56,17 +56,18 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.19 2001/09/17 00:42:59 pier Exp $ +# @version $Id: Makefile.in,v 1.20 2001/09/17 05:06:27 pier Exp $ include @TGTDIR@/Makedefs all: build - build: @TARGET_BUILD@ - clean: @TARGET_CLEAN@ +lbuild: @TARGET_LBUILD@ +lclean: @TARGET_LCLEAN@ distclean: clean + @$(ECHO) $(LSTFILE) @$(MECHO) Removing makefile generated files $(RM) -f `$(CAT) $(LSTFILE)` $(RM) -f $(LSTFILE) @@ -93,6 +94,12 @@ lib-clean: @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=lib MTGT=clean + +java-build: + @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=java MTGT=build + +java-clean: + @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=java MTGT=clean apache-1.3-build: @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=apache-1.3 MTGT=build
cvs commit: jakarta-tomcat-connectors/webapp configure.in
pier01/09/16 22:07:01
Modified:webapp configure.in
Log:
Discover configure generated files as we process.
Revision ChangesPath
1.39 +56 -44jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- configure.in 2001/09/17 00:42:59 1.38
+++ configure.in 2001/09/17 05:07:01 1.39
@@ -58,7 +58,7 @@
dnl --
dnl Author Pier Fumagalli mailto:[EMAIL PROTECTED]
dnl Author Jon S. Stevens mailto:[EMAIL PROTECTED]
-dnl Version $Id: configure.in,v 1.38 2001/09/17 00:42:59 pier Exp $
+dnl Version $Id: configure.in,v 1.39 2001/09/17 05:07:01 pier Exp $
dnl --
dnl --
@@ -78,12 +78,13 @@
dnl --
dnl Setup initial variable value
dnl
-dnl New vars: MODULE TARGET
+dnl New vars: MODULE TARGET CFGFILES
dnl APR_CFGFLG APR_SRCDIR APR_LIBDIR APR_INCDIR APR_VARFIL
dnl Upd vars: N/A
dnl --
MODULE=
TARGET=lib
+CFGFILES=./Makefile ./Makedefs ./lib/Makefile ./java/Constants.java
APR_CFGFLG=
APR_SRCDIR=
APR_LIBDIR=
@@ -92,6 +93,7 @@
AC_SUBST(MODULE)
AC_SUBST(TARGET)
+AC_SUBST(CFGFILES)
AC_SUBST(APR_CFGFLG)
AC_SUBST(APR_SRCDIR)
AC_SUBST(APR_LIBDIR)
@@ -124,7 +126,9 @@
AC_SUBST(AR)
AC_SUBST(RANLIB)
AC_PROG_CC()
-LOCAL_CHECK_PROG(CC,${CC})
+local_cc=${CC}
+LOCAL_CHECK_PROG(CC,${local_cc})
+unset local_cc
AC_PROG_CC_C_O()
AC_PROG_CPP()
AC_SUBST(CPPFLAGS)
@@ -191,6 +195,42 @@
)
AC_SUBST(TC4DIR)
+dnl --
+dnl Check that we can build all classes depending on Tomcat if Java is enabled
+dnl
+dnl New vars: CLASSPATH
+dnl Upd vars: TC4DIR TARGET CFGFILES
+dnl --
+if ${TEST} $JAVA_ENABLE = true
+then
+ LOCAL_RESOLVEDIR(TC4DIR,${TC4DIR},[tomcat distribution directory])
+
+ if ${TEST} ! -f ${TC4DIR}/common/lib/servlet.jar
+ then
+AC_MSG_ERROR([Cannot find Servlet 2.3 jar in \${TC4DIR}\])
+ fi
+
+ if ${TEST} ! -f ${TC4DIR}/server/lib/catalina.jar
+ then
+AC_MSG_ERROR([Cannot find Catalina jar in \${TC4DIR}\])
+ fi
+
+ if ${TEST} -z ${CLASSPATH}
+ then
+CLASSPATH=${TC4DIR}/common/lib/servlet.jar
+ else
+CLASSPATH=${CLASSPATH}:${TC4DIR}/common/lib/servlet.jar
+ fi
+ CLASSPATH=${CLASSPATH}:${TC4DIR}/server/lib/catalina.jar
+
+ TARGET=${TARGET} java
+ CFGFILES=${CFGFILES} ./java/Makefile
+else
+ CLASSPATH=
+ TC4DIR=
+fi
+AC_SUBST(CLASSPATH)
+
dnl -
dnl Check wether we have to build the C API documentation or not
dnl
@@ -296,41 +336,6 @@
)
dnl --
-dnl Check that we can build all classes depending on Tomcat if Java is enabled
-dnl
-dnl New vars: CLASSPATH
-dnl Upd vars: TC4DIR TARGET
-dnl --
-if ${TEST} $JAVA_ENABLE = true
-then
- LOCAL_RESOLVEDIR(TC4DIR,${TC4DIR},[tomcat distribution directory])
-
- if ${TEST} ! -f ${TC4DIR}/common/lib/servlet.jar
- then
-AC_MSG_ERROR([Cannot find Servlet 2.3 jar in \${TC4DIR}\])
- fi
-
- if ${TEST} ! -f ${TC4DIR}/server/lib/catalina.jar
- then
-AC_MSG_ERROR([Cannot find Catalina jar in \${TC4DIR}\])
- fi
-
- if ${TEST} -z ${CLASSPATH}
- then
-CLASSPATH=${TC4DIR}/common/lib/servlet.jar
- else
-CLASSPATH=${CLASSPATH}:${TC4DIR}/common/lib/servlet.jar
- fi
- CLASSPATH=${CLASSPATH}:${TC4DIR}/server/lib/catalina.jar
-
- TARGET=${TARGET} java
-else
- CLASSPATH=
- TC4DIR=
-fi
-AC_SUBST(CLASSPATH)
-
-dnl --
dnl Process the --with-apr=... command line argument
dnl
dnl This is always processed, and sets the APR_SRCDIR variable. After this
@@ -449,6 +454,9 @@
dnl --
dnl Was a module specified?
+dnl
+dnl New vars: N/A
+dnl Upd vars: CFGFILES
dnl --
AC_MSG_CHECKING([target module])
@@ -458,6 +466,7 @@
AC_MSG_ERROR([No
cvs commit: jakarta-tomcat-connectors/webapp/apache-1.3 Makefile.in
pier01/09/16 22:08:08 Modified:webapp/apache-1.3 Makefile.in Log: Rebuild module if webapp library changed. Revision ChangesPath 1.15 +2 -2 jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.in 2001/09/17 00:42:59 1.14 +++ Makefile.in 2001/09/17 05:08:08 1.15 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.14 2001/09/17 00:42:59 pier Exp $ +# @version $Id: Makefile.in,v 1.15 2001/09/17 05:08:08 pier Exp $ include @TGTDIR@/Makedefs @@ -73,7 +73,7 @@ clean: $(RM) -f $(OBJS) $(MOD) -$(MOD): $(SRCS) +$(MOD): $(SRCS) $(TGTDIR)/lib/libwebapp.a @$(APXS) -c \ -Wc,$(CFLAGS) $(APR_CFLAGS) $(CPPFLAGS) $(APR_CPPFLAGS) \ -Wl,$(APR_LDFLAGS) $(APR_LIBS) \
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp Constants.java WarpConfigurationHandler.java WarpConnection.java WarpLogger.java WarpRequestHandler.java
pier01/09/16 22:10:55
Modified:catalina/src/share/org/apache/catalina/connector/warp
Constants.java WarpConfigurationHandler.java
WarpConnection.java WarpLogger.java
WarpRequestHandler.java
Log:
4.0 final integration.
Revision ChangesPath
1.5 +1 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/Constants.java
Index: Constants.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/Constants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Constants.java2001/09/10 00:25:49 1.4
+++ Constants.java2001/09/17 05:10:54 1.5
@@ -61,7 +61,7 @@
public static final String PACKAGE=org.apache.catalina.connector.warp;
/** Compile-in debug flag. */
-public static final boolean DEBUG=true;
+public static final boolean DEBUG=false;
/**
* The WARP protocol major version.
1.6 +1 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConfigurationHandler.java
Index: WarpConfigurationHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConfigurationHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WarpConfigurationHandler.java 2001/08/27 19:10:25 1.5
+++ WarpConfigurationHandler.java 2001/09/17 05:10:54 1.6
@@ -294,7 +294,7 @@
if (!file.exists()) {
logger.log(Cannot find \+file.getPath()+\ for appl. \+
- applName);
+ applName+\ host \+host.getName()+\);
return(null);
}
1.12 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnection.java
Index: WarpConnection.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnection.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WarpConnection.java 2001/09/10 00:25:49 1.11
+++ WarpConnection.java 2001/09/17 05:10:55 1.12
@@ -213,7 +213,7 @@
if (Constants.DEBUG) {
String typ=Integer.toHexString(packet.getType());
logger.debug( TYPE=+typ+ LENGTH=+packet.size);
-logger.debug( +packet.dump());
+//logger.debug( +packet.dump());
}
this.output.write(packet.getType()0x0ff);
@@ -255,7 +255,7 @@
if (Constants.DEBUG) {
String typ=Integer.toHexString(packet.getType());
logger.debug( TYPE=+typ+ LENGTH=+packet.size);
-logger.debug( +packet.dump());
+// logger.debug( +packet.dump());
}
}
}
1.2 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpLogger.java
Index: WarpLogger.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpLogger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WarpLogger.java 2001/07/19 23:59:15 1.1
+++ WarpLogger.java 2001/09/17 05:10:55 1.2
@@ -119,13 +119,13 @@
/** Log to the container logger with the specified level or to stderr */
private void log(String msg, Exception exc, int lev) {
if (this.container==null) {
-dump(msg,exc);
+if (Constants.DEBUG) dump(msg,exc);
return;
}
Logger logg=this.container.getLogger();
if (logg==null) {
-dump(msg,exc);
+if (Constants.DEBUG) dump(msg,exc);
return;
}
1.12 +26 -0
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpRequestHandler.java
Index: WarpRequestHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpRequestHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WarpRequestHandler.java 2001/08/09 20:08:58 1.11
+++ WarpRequestHandler.java 2001/09/17 05:10:55 1.12
@@ -75,6 +75,8 @@
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.StringParser;
+import java.security.Principal;
+
public class
Re: cvs commit:jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warpConstants.java WarpConfigurationHandler.java WarpConnection.javaWarpLogger.java WarpRequestHandler.java
[EMAIL PROTECTED] [EMAIL PROTECTED] wrote: Log: 4.0 final integration. GO for me... Still to do, fix Apache 1.3 under Windows (C-code in JTC only) Pier
Re: Remaining Tomcat 3.3 Issues
Larry, I tried to fix as much as possible, could you post an update with what remains open for RC1 ? On Wed, 12 Sep 2001, Larry Isaacs wrote: 1. HttpSessionFacade.setAttribute() isn't synchronized. If a second request called setAttribute() after this request's removeAttribute() and before realSession.setAttribute(), the second request's value would be overwritten without an valueUnbound() being called. Done ( well, I hope - I tried to avoid sync() on the 'typical' case ). 2. Evaluate Tomcat 3.3's vulnerability to Double Checked Locking. This is referred to in Bug #177. See: http://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html for details. I think ServletHandler.init() is currently subject to this vulnerability. I don't know - it seems very difficult to fix, maybe leave it for later? I don't think this is a very frequent case. 3. The spec doesn't address whether a the form-login-page and form-error-page should be excluded from the security-constraint, but it makes sense that it should. It might be best to postpone this. +1 to postpone, there is a workaround ( to put them in a different dir ). 4. Address user authentication via Ajp12 and Ajp13. Ajp12 has a test for isTomcatAuthentication() to see if req.setRemoteUser() should be called. I think Ajp13 doesn't have this yet and probably should. Also, if the user is anonymous, i.e. user = , should we call req.setRemoteUser() with this value? This prevents Tomcat's normal authentication from being triggered. Henri, Nacho - is this resolved ? 5. If a error handler is not found for an exception, check the root cause as well if it is a ServletException. This is mentioned in Bug 3233. I think it would be a good idea to apply this. I don't think we are prohibited by the spec. We could add an option to be safe if there is concern. Done. 6. StaticInterceptor is missing a localization enhancement added to Tomcat 3.2.x. Should this enhancement be ported to Tomcat 3.3? Is this still considered a regression, though it isn't part of the Servlet 2.2/JSP 1.1 spec? I don't think this is important - it's not required by the spec, and we can add it as a replacement module ( or in 3.3.1 ). I can do a merge if you want - shouldn't be difficult. 7. Evaluate whether anything should be done to deal with the use of non-thread-safe DateFormat and related classes. Done. 177 Race condition during servlet initialization BugRat Report#2 I would make this LATER. 182 JSP error-page doesn't work with virtual hosts BugRat Report I think this is fixed ( long ago ) in 3.3. 274 request.getUserPrincipal() doesn't work when user is authent It seems Larry noted it is fixed in 3.3, we might have few problems with cert auth ( since this is done by Apache, and I'm not sure it's very well tested ) 437 req.getParameter(name) Ignores charset. always assumes ISO88 This is resolved ( as much as possible - we can't cover all browser bugs ) 461 Use setCharacterEncoding(UTF8) does not change the way get Seems to be closed. 463 Ctx( /examples ): IOException in: R( /examples + + null) No This should be fixed in 3.3, 1253 Frequent Connection reset by peer errors Seems like a difficult bug, we should postpone it to RC2. 1482 Ignored session ids in encoded URLs This is marked as fixed. 1663 Tomcat -SSL problem Nothing we can fix in tomcat about this, but if we find a good way to sign certificates - it would be a good addition to the docs. For testing I do add the cert to the cacerts, I never signed a cert - it should be a way ( but it's not a tomcat bug ) 1798 Tomcat 3.2.2b5 with Apache and ajp13 stops responding after It seems Henri can't reproduce it - we should leave it open maybe we get more info. 3233 exception handling wrt errorpages seems to be incorrect Done. 3486 Session problem (with case insensitive context matching on windows) I believe this is invalid, and if it's valid we shouldn't try to fix it as it may brake something else and affect the security. Costin
Re: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/bufDateTool.java MessageBytes.java
On Sun, 16 Sep 2001, Remy Maucherat wrote: costin 01/09/16 21:56:02 Modified:src/share/org/apache/tomcat/util/buf DateTool.java MessageBytes.java Do you plan to keep the version of the buffers which is in j-t-c/util in sync ? I'll sync them after 3.3 is out, but long term I don't think they'll be in sync. There are many improvements and simplifications we can do in j-t-c, and if mod_jk is going to APR-land, I think it's a good idea to do some nice things with the java side as well. Too much 'maintainance' mode, need some action :-) Costin
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote InputBuffer.java OutputBuffer.java
remm01/09/16 22:28:52
Modified:coyote/src/java/org/apache/coyote InputBuffer.java
OutputBuffer.java
Log:
- Use some byte chunks instead of passing arrays. That allows all sorts of
tricks since it's fully possible to replace the internal array, append data, ...
Revision ChangesPath
1.2 +3 -1
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/InputBuffer.java
Index: InputBuffer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/InputBuffer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InputBuffer.java 2001/06/14 01:07:56 1.1
+++ InputBuffer.java 2001/09/17 05:28:52 1.2
@@ -61,6 +61,8 @@
import java.io.IOException;
+import org.apache.tomcat.util.buf.ByteChunk;
+
/**
* Input buffer.
*
@@ -69,7 +71,7 @@
public interface InputBuffer {
-public int doRead(byte b[], int off, int len)
+public int doRead(ByteChunk chunk)
throws IOException;
1.3 +3 -1
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/OutputBuffer.java
Index: OutputBuffer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/OutputBuffer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OutputBuffer.java 2001/07/10 02:55:01 1.2
+++ OutputBuffer.java 2001/09/17 05:28:52 1.3
@@ -61,6 +61,8 @@
import java.io.IOException;
+import org.apache.tomcat.util.buf.ByteChunk;
+
/**
* Output buffer.
*
@@ -69,7 +71,7 @@
public interface OutputBuffer {
-public int doWrite(byte b[], int off, int len)
+public int doWrite(ByteChunk chunk)
throws IOException;
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote Request.java Response.java
remm01/09/16 22:29:09
Modified:coyote/src/java/org/apache/coyote Request.java Response.java
Log:
- Use some byte chunks instead of passing arrays. That allows all sorts of
tricks since it's fully possible to replace the internal array, append data, ...
Revision ChangesPath
1.3 +4 -3
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java
Index: Request.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Request.java 2001/07/10 02:55:02 1.2
+++ Request.java 2001/09/17 05:29:09 1.3
@@ -64,6 +64,7 @@
import java.util.Enumeration;
import java.util.Hashtable;
+import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.buf.UDecoder;
@@ -327,11 +328,11 @@
/**
- * Read data from the input buffer and put it into a byte array.
+ * Read data from the input buffer and put it into a byte chunk.
*/
-public int doRead(byte b[], int off, int len)
+public int doRead(ByteChunk chunk/*byte b[], int off, int len*/)
throws IOException {
-int n = inputBuffer.doRead(b, off, len);
+int n = inputBuffer.doRead(chunk);
if (n 0)
available -= n;
return n;
1.3 +4 -2
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java
Index: Response.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Response.java 2001/07/10 02:55:02 1.2
+++ Response.java 2001/09/17 05:29:09 1.3
@@ -63,6 +63,8 @@
import java.io.IOException;
import java.util.Locale;
+import org.apache.tomcat.util.buf.ByteChunk;
+
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.http.MimeHeaders;
@@ -414,9 +416,9 @@
/**
* Write a chunk of bytes.
*/
-public void doWrite(byte buffer[], int pos, int count)
+public void doWrite(ByteChunk chunk/*byte buffer[], int pos, int count*/)
throws IOException {
-outputBuffer.doWrite(buffer, pos, count);
+outputBuffer.doWrite(chunk);
}
cvs commit: jakarta-tomcat-connectors/http11 - Imported sources
remm01/09/16 23:04:00 Log: - Initial import of the HTTP/1.1 connector based on Coyote. - It builds; it doesn't do anything meaningful yet (the I/O and parsing is half done, and there's no request processing yet). I'm only committing this because last time I was at this stage I didn't, my HD died, and I lost the work. This new version is better than the old new one, though, so it may be worth it. Status: Vendor Tag: APACHE Release Tags: V01 N jakarta-tomcat-connectors/http11/.cvsignore N jakarta-tomcat-connectors/http11/build.properties.sample N jakarta-tomcat-connectors/http11/build.xml N jakarta-tomcat-connectors/http11/src/conf/MANIFEST.MF N jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/OutputFilter.java N jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Constants.java N jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/LocalStrings.properties N jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Connector.java N jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java N jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalInputBuffer.java N jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InputFilter.java No conflicts created by this import
cvs commit: jakarta-tomcat-4.0 BUILDING.txt
ccain 01/09/16 23:18:57 Modified:.BUILDING.txt Log: Make the new Ant 1.4 requirement a little more visible. Revision ChangesPath 1.5 +4 -1 jakarta-tomcat-4.0/BUILDING.txt Index: BUILDING.txt === RCS file: /home/cvs/jakarta-tomcat-4.0/BUILDING.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BUILDING.txt 2001/09/16 05:59:42 1.4 +++ BUILDING.txt 2001/09/17 06:18:57 1.5 @@ -1,4 +1,4 @@ -$Id: BUILDING.txt,v 1.4 2001/09/16 05:59:42 craigmcc Exp $ +$Id: BUILDING.txt,v 1.5 2001/09/17 06:18:57 ccain Exp $ Building The Tomcat 4.0 Servlet/JSP Container @@ -25,6 +25,9 @@ (1) Download and Install the Ant Binary Distribution + +NOTE: Previous versions of Tomcat 4.0 relied on Ant 1.3 for the build +process. The 1.4 release is now required. * Download a binary distribution of Ant 1.4 from:
