7:26 p.m.
Author: remy.maucherat(a)jboss.com
Date: 2007-12-03 20:25:59 -0500 (Mon, 03 Dec 2007)
New Revision: 363
Modified:
trunk/RUNNING.txt
trunk/bin/catalina.bat
trunk/bin/catalina.sh
trunk/bin/service.bat
trunk/java/javax/servlet/resources/j2ee_1_4.xsd
trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd
trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd
trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
trunk/java/org/apache/catalina/manager/LocalStrings.properties
trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
trunk/java/org/apache/coyote/http11/Http11Protocol.java
trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
trunk/webapps/docs/changelog.xml
Log:
- Port another round of patches from Tomcat.
Modified: trunk/RUNNING.txt
===================================================================
--- trunk/RUNNING.txt 2007-12-03 15:25:04 UTC (rev 362)
+++ trunk/RUNNING.txt 2007-12-04 01:25:59 UTC (rev 363)
@@ -89,6 +89,8 @@
calculate all relative references for files in the following directories based
on the value of $CATALINA_BASE instead of $CATALINA_HOME:
+* bin - Only setenv.sh (*nix) and setenv.bat (windows)
+
* conf - Server configuration files (including server.xml)
* logs - Log and output files
Modified: trunk/bin/catalina.bat
===================================================================
--- trunk/bin/catalina.bat 2007-12-03 15:25:04 UTC (rev 362)
+++ trunk/bin/catalina.bat 2007-12-04 01:25:59 UTC (rev 363)
@@ -68,7 +68,12 @@
:okHome
rem Get standard environment variables
+if "%CATALINA_BASE%" == "" goto gotSetenvHome
+if exist "%CATALINA_BASE%\bin\setenv.bat" call
"%CATALINA_BASE%\bin\setenv.bat"
+goto gotSetenvBase
+:gotSetenvHome
if exist "%CATALINA_HOME%\bin\setenv.bat" call
"%CATALINA_HOME%\bin\setenv.bat"
+:gotSetenvBase
rem Get standard Java environment variables
if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath
Modified: trunk/bin/catalina.sh
===================================================================
--- trunk/bin/catalina.sh 2007-12-03 15:25:04 UTC (rev 362)
+++ trunk/bin/catalina.sh 2007-12-04 01:25:59 UTC (rev 363)
@@ -99,7 +99,9 @@
# Only set CATALINA_HOME if not already set
[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ;
pwd`
-if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
+if [ -r "$CATALINA_BASE"/bin/setenv.sh ]; then
+ . "$CATALINA_BASE"/bin/setenv.sh
+elif [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
. "$CATALINA_HOME"/bin/setenv.sh
fi
Modified: trunk/bin/service.bat
===================================================================
--- trunk/bin/service.bat 2007-12-03 15:25:04 UTC (rev 362)
+++ trunk/bin/service.bat 2007-12-04 01:25:59 UTC (rev 363)
@@ -120,7 +120,7 @@
set PR_LOGPATH=%CATALINA_BASE%\logs
set PR_STDOUTPUT=auto
set PR_STDERROR=auto
-"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions
"-Djava.io.tmpdir=%CATALINA_BASE%\temp" --JvmMs 128 --JvmMx 256
+"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions
"-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
--JvmMs 128 --JvmMx 256
echo The service '%SERVICE_NAME%' has been installed.
:end
Modified: trunk/java/javax/servlet/resources/j2ee_1_4.xsd
===================================================================
--- trunk/java/javax/servlet/resources/j2ee_1_4.xsd 2007-12-03 15:25:04 UTC (rev 362)
+++ trunk/java/javax/servlet/resources/j2ee_1_4.xsd 2007-12-04 01:25:59 UTC (rev 363)
@@ -28,40 +28,6 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:annotation>
- <xsd:documentation>
-
- Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
- Road, Palo Alto, California 94303, U.S.A. All rights
- reserved.
-
- Sun Microsystems, Inc. has intellectual property rights
- relating to technology described in this document. In
- particular, and without limitation, these intellectual
- property rights may include one or more of the U.S. patents
- listed at http://www.sun.com/patents and one or more
- additional patents or pending patent applications in the
- U.S. and other countries.
-
- This document and the technology which it describes are
- distributed under licenses restricting their use, copying,
- distribution, and decompilation. No part of this document
- may be reproduced in any form by any means without prior
- written authorization of Sun and its licensors, if any.
-
- Third-party software, including font technology, is
- copyrighted and licensed from Sun suppliers.
-
- Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
- JavaServer Pages, Enterprise JavaBeans and the Java Coffee
- Cup logo are trademarks or registered trademarks of Sun
- Microsystems, Inc. in the U.S. and other countries.
-
- Federal Acquisitions: Commercial Software - Government Users
- Subject to Standard License Terms and Conditions.
-
- </xsd:documentation>
- </xsd:annotation>
<xsd:annotation>
<xsd:documentation>
Modified: trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd
===================================================================
--- trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd 2007-12-03 15:25:04 UTC
(rev 362)
+++ trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd 2007-12-04 01:25:59 UTC
(rev 363)
@@ -31,40 +31,6 @@
<xsd:annotation>
<xsd:documentation>
- Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
- Road, Palo Alto, California 94303, U.S.A. All rights
- reserved.
-
- Sun Microsystems, Inc. has intellectual property rights
- relating to technology described in this document. In
- particular, and without limitation, these intellectual
- property rights may include one or more of the U.S. patents
- listed at http://www.sun.com/patents and one or more
- additional patents or pending patent applications in the
- U.S. and other countries.
-
- This document and the technology which it describes are
- distributed under licenses restricting their use, copying,
- distribution, and decompilation. No part of this document
- may be reproduced in any form by any means without prior
- written authorization of Sun and its licensors, if any.
-
- Third-party software, including font technology, is
- copyrighted and licensed from Sun suppliers.
-
- Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
- JavaServer Pages, Enterprise JavaBeans and the Java Coffee
- Cup logo are trademarks or registered trademarks of Sun
- Microsystems, Inc. in the U.S. and other countries.
-
- Federal Acquisitions: Commercial Software - Government Users
- Subject to Standard License Terms and Conditions.
-
- </xsd:documentation>
- </xsd:annotation>
- <xsd:annotation>
- <xsd:documentation>
-
(C) Copyright International Business Machines Corporation 2002
</xsd:documentation>
Modified: trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd
===================================================================
--- trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd 2007-12-03
15:25:04 UTC (rev 362)
+++ trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd 2007-12-04
01:25:59 UTC (rev 363)
@@ -31,40 +31,6 @@
<xsd:annotation>
<xsd:documentation>
- Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
- Road, Palo Alto, California 94303, U.S.A. All rights
- reserved.
-
- Sun Microsystems, Inc. has intellectual property rights
- relating to technology described in this document. In
- particular, and without limitation, these intellectual
- property rights may include one or more of the U.S. patents
- listed at http://www.sun.com/patents and one or more
- additional patents or pending patent applications in the
- U.S. and other countries.
-
- This document and the technology which it describes are
- distributed under licenses restricting their use, copying,
- distribution, and decompilation. No part of this document
- may be reproduced in any form by any means without prior
- written authorization of Sun and its licensors, if any.
-
- Third-party software, including font technology, is
- copyrighted and licensed from Sun suppliers.
-
- Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
- JavaServer Pages, Enterprise JavaBeans and the Java Coffee
- Cup logo are trademarks or registered trademarks of Sun
- Microsystems, Inc. in the U.S. and other countries.
-
- Federal Acquisitions: Commercial Software - Government Users
- Subject to Standard License Terms and Conditions.
-
- </xsd:documentation>
- </xsd:annotation>
- <xsd:annotation>
- <xsd:documentation>
-
(C) Copyright International Business Machines Corporation 2002
</xsd:documentation>
Modified: trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
===================================================================
--- trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 2007-12-03 15:25:04 UTC
(rev 362)
+++ trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 2007-12-04 01:25:59 UTC
(rev 363)
@@ -229,6 +229,12 @@
path = "/" + basename;
}
+ if ((host.findChild(path) != null) && !isDeployed(path)) {
+ message = sm.getString
+ ("htmlManagerServlet.deployUploadInServerXml", war);
+ break;
+ }
+
if (!isServiced(path)) {
addServiced(path);
try {
Modified: trunk/java/org/apache/catalina/manager/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/catalina/manager/LocalStrings.properties 2007-12-03 15:25:04 UTC
(rev 362)
+++ trunk/java/org/apache/catalina/manager/LocalStrings.properties 2007-12-04 01:25:59 UTC
(rev 363)
@@ -23,6 +23,7 @@
htmlManagerServlet.deployUpload=WAR file to deploy
htmlManagerServlet.deployUploadFail=FAIL - Deploy Upload Failed, Exception: {0}
htmlManagerServlet.deployUploadFile=Select WAR file to upload
+htmlManagerServlet.deployUploadInServerXml=FAIL - War file \"{0}\" cannot be
uploaded if context is defined in server.xml
htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded \"{0}\" must be a
.war
htmlManagerServlet.deployUploadNoFile=FAIL - File upload failed, no file
htmlManagerServlet.deployUploadWarExists=FAIL - War file \"{0}\" already exists
on server
Modified: trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
===================================================================
--- trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 2007-12-03 15:25:04 UTC
(rev 362)
+++ trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 2007-12-04 01:25:59 UTC
(rev 363)
@@ -629,8 +629,8 @@
processor.setMaxKeepAliveRequests(proto.maxKeepAliveRequests);
processor.setTimeout(proto.timeout);
processor.setDisableUploadTimeout(proto.disableUploadTimeout);
+ processor.setCompressionMinSize(proto.compressionMinSize);
processor.setCompression(proto.compression);
- processor.setCompressionMinSize(proto.compressionMinSize);
processor.setNoCompressionUserAgents(proto.noCompressionUserAgents);
processor.setCompressableMimeTypes(proto.compressableMimeTypes);
processor.setRestrictedUserAgents(proto.restrictedUserAgents);
Modified: trunk/java/org/apache/coyote/http11/Http11Protocol.java
===================================================================
--- trunk/java/org/apache/coyote/http11/Http11Protocol.java 2007-12-03 15:25:04 UTC (rev
362)
+++ trunk/java/org/apache/coyote/http11/Http11Protocol.java 2007-12-04 01:25:59 UTC (rev
363)
@@ -641,8 +641,8 @@
processor.setKeepAliveTimeout(proto.keepAliveTimeout);
processor.setTimeout(proto.timeout);
processor.setDisableUploadTimeout(proto.disableUploadTimeout);
+ processor.setCompressionMinSize(proto.compressionMinSize);
processor.setCompression(proto.compression);
- processor.setCompressionMinSize(proto.compressionMinSize);
processor.setNoCompressionUserAgents(proto.noCompressionUserAgents);
processor.setCompressableMimeTypes(proto.compressableMimeTypes);
processor.setRestrictedUserAgents(proto.restrictedUserAgents);
Modified: trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java 2007-12-03 15:25:04 UTC
(rev 362)
+++ trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java 2007-12-04 01:25:59 UTC
(rev 363)
@@ -527,13 +527,26 @@
page.visit(errVisitor);
Node errNode = errVisitor.getJspSourceNode();
if ((errNode != null) && (errNode.getStart() != null)) {
- javacError = new JavacErrorDetail(
- fname,
- lineNum,
- errNode.getStart().getFile(),
- errNode.getStart().getLineNumber(),
- errMsgBuf,
- ctxt);
+ // If this is a scriplet node then there is a one to one mapping
+ // between JSP lines and Java lines
+ if (errVisitor.getJspSourceNode() instanceof Node.Scriptlet) {
+ javacError = new JavacErrorDetail(
+ fname,
+ lineNum,
+ errNode.getStart().getFile(),
+ errNode.getStart().getLineNumber() + lineNum -
+ errVisitor.getJspSourceNode().getBeginJavaLine(),
+ errMsgBuf,
+ ctxt);
+ } else {
+ javacError = new JavacErrorDetail(
+ fname,
+ lineNum,
+ errNode.getStart().getFile(),
+ errNode.getStart().getLineNumber(),
+ errMsgBuf,
+ ctxt);
+ }
} else {
/*
* javac error line number cannot be mapped to JSP page
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2007-12-03 15:25:04 UTC (rev 362)
+++ trunk/webapps/docs/changelog.xml 2007-12-04 01:25:59 UTC (rev 363)
@@ -96,6 +96,17 @@
<fix><bug>43687</bug> Remove conditional headers on Form Auth
replay,
since the UA (esp. FireFox) isn't expecting it.
</fix>
+ <fix>
+ <bug>43594</bug>: Use setenv from CATALINA_BASE (if set) in
preference
+ to the one in CATALINA_HOME. Patch provided by Shaddy Baddah. (markt)
+ </fix>
+ <fix>
+ <bug>43957</bug>: Service.bat doesn't configure logging
correctly. Patch
+ provided by Richard Fearn. (markt)
+ </fix>
+ <fix>
+ Fix IOException handling when parsing post parameters. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -110,6 +121,10 @@
<fix>
Additional cookie fixes. (jfclere)
</fix>
+ <fix>
+ <bug>43622</bug>: Don't overwrite the min compression size set by
the
+ compression attribute with the default. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
@@ -120,8 +135,22 @@
<fix>
<bug>43702</bug>: Inner class files have unnecessarily long names.
(markt)
</fix>
+ <fix>
+ <bug>43757</bug>: Rather than use string matching to work out the
line
+ in the JSP with the error, use the SMAP info and the knowledge that for
+ a scriptlet there is a one to one line mapping. (markt)
+ </fix>
</changelog>
</subsection>
+ <subsection name="Webapps">
+ <changelog>
+ <fix>
+ <bug>43611</bug>: Provide an error message if user tries to upload a
war
+ for a context defined in server.xml rather than failing silently.
+ (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.15 (remm)">