JBossWeb SVN: r372 - in trunk/java/org/apache: tomcat/jni and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-07 10:04:29 -0500 (Fri, 07 Dec 2007)
New Revision: 372
Modified:
trunk/java/org/apache/catalina/core/AprLifecycleListener.java
trunk/java/org/apache/tomcat/jni/SSL.java
Log:
Don't load the entropy but sets the name of file the entropy is collected from.
Modified: trunk/java/org/apache/catalina/core/AprLifecycleListener.java
===================================================================
--- trunk/java/org/apache/catalina/core/AprLifecycleListener.java 2007-12-06 18:16:40 UTC (rev 371)
+++ trunk/java/org/apache/catalina/core/AprLifecycleListener.java 2007-12-07 15:04:29 UTC (rev 372)
@@ -205,17 +205,17 @@
//only once per VM
return;
}
- String methodName = "initialize";
+ String methodName = "randSet";
Class paramTypes[] = new Class[1];
paramTypes[0] = String.class;
Object paramValues[] = new Object[1];
- paramValues[0] = "on".equalsIgnoreCase(SSLEngine)?null:SSLEngine;
+ paramValues[0] = SSLRandomSeed;
Class clazz = Class.forName("org.apache.tomcat.jni.SSL");
Method method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
- methodName = "randLoad";
- paramValues[0] = SSLRandomSeed;
+ methodName = "initialize";
+ paramValues[0] = "on".equalsIgnoreCase(SSLEngine)?null:SSLEngine;
method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
Modified: trunk/java/org/apache/tomcat/jni/SSL.java
===================================================================
--- trunk/java/org/apache/tomcat/jni/SSL.java 2007-12-06 18:16:40 UTC (rev 371)
+++ trunk/java/org/apache/tomcat/jni/SSL.java 2007-12-07 15:04:29 UTC (rev 372)
@@ -227,6 +227,12 @@
public static native int initialize(String engine);
/**
+ * Set source of entropy to use in SSL
+ * @param filename Filename containing random data
+ */
+ public static native boolean randSet(String filename);
+
+ /**
* Add content of the file to the PRNG
* @param filename Filename containing random data.
* If null the default file will be tested.
17 years, 3 months
JBossWeb SVN: r371 - in branches: JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-12-06 13:16:40 -0500 (Thu, 06 Dec 2007)
New Revision: 371
Modified:
branches/2.0.x/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java
Log:
- Add option to configure the random source, and better default.
Modified: branches/2.0.x/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java
===================================================================
--- branches/2.0.x/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java 2007-12-06 17:49:45 UTC (rev 370)
+++ branches/2.0.x/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java 2007-12-06 18:16:40 UTC (rev 371)
@@ -63,6 +63,7 @@
// ---------------------------------------------- Properties
protected static String SSLEngine = "on"; //default on
+ protected static String SSLRandomSeed = "builtin";
protected static boolean sslInitialized = false;
protected static boolean aprInitialized = false;
@@ -211,6 +212,12 @@
Class clazz = Class.forName("org.apache.tomcat.jni.SSL");
Method method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
+
+ methodName = "randLoad";
+ paramValues[0] = SSLRandomSeed;
+ method = clazz.getMethod(methodName, paramTypes);
+ method.invoke(null, paramValues);
+
sslInitialized = true;
}
@@ -222,4 +229,12 @@
this.SSLEngine = SSLEngine;
}
+ public String getSSLRandomSeed() {
+ return SSLRandomSeed;
+ }
+
+ public void setSSLRandomSeed(String SSLRandomSeed) {
+ this.SSLRandomSeed = SSLRandomSeed;
+ }
+
}
Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java
===================================================================
--- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java 2007-12-06 17:49:45 UTC (rev 370)
+++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java 2007-12-06 18:16:40 UTC (rev 371)
@@ -18,7 +18,9 @@
package org.apache.catalina.core;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
@@ -27,17 +29,15 @@
import org.apache.commons.logging.LogFactory;
import org.apache.tomcat.jni.Library;
-import java.lang.reflect.InvocationTargetException;
-
/**
* Implementation of <code>LifecycleListener</code> that will init and
* and destroy APR.
*
* @author Remy Maucherat
* @author Filip Hanik
- * @version $Revision: 524730 $ $Date: 2007-04-02 08:24:33 +0200 (lun., 02 avr. 2007) $
+ * @version $Revision: 534930 $ $Date: 2007-05-03 18:43:35 +0200 (jeu., 03 mai 2007) $
* @since 4.1
*/
@@ -64,6 +64,7 @@
// ---------------------------------------------- Properties
protected static String SSLEngine = "on"; //default on
+ protected static String SSLRandomSeed = "builtin";
protected static boolean sslInitialized = false;
protected static boolean aprInitialized = false;
@@ -212,6 +213,12 @@
Class clazz = Class.forName("org.apache.tomcat.jni.SSL");
Method method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
+
+ methodName = "randLoad";
+ paramValues[0] = SSLRandomSeed;
+ method = clazz.getMethod(methodName, paramTypes);
+ method.invoke(null, paramValues);
+
sslInitialized = true;
}
@@ -222,4 +229,13 @@
public void setSSLEngine(String SSLEngine) {
this.SSLEngine = SSLEngine;
}
+
+ public String getSSLRandomSeed() {
+ return SSLRandomSeed;
+ }
+
+ public void setSSLRandomSeed(String SSLRandomSeed) {
+ this.SSLRandomSeed = SSLRandomSeed;
+ }
+
}
17 years, 3 months
JBossWeb SVN: r370 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-06 12:49:45 -0500 (Thu, 06 Dec 2007)
New Revision: 370
Modified:
trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Log:
Allow to specify a random device.
SSLRandomSeed="/dev/random"
SSLRandomSeed="/dev/urandom"
SSLRandomSeed="builtin" (Default).
The native already exists.
Modified: trunk/java/org/apache/catalina/core/AprLifecycleListener.java
===================================================================
--- trunk/java/org/apache/catalina/core/AprLifecycleListener.java 2007-12-06 16:35:04 UTC (rev 369)
+++ trunk/java/org/apache/catalina/core/AprLifecycleListener.java 2007-12-06 17:49:45 UTC (rev 370)
@@ -64,6 +64,7 @@
// ---------------------------------------------- Properties
protected static String SSLEngine = "on"; //default on
+ protected static String SSLRandomSeed = "builtin";
protected static boolean sslInitialized = false;
protected static boolean aprInitialized = false;
@@ -212,6 +213,12 @@
Class clazz = Class.forName("org.apache.tomcat.jni.SSL");
Method method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
+
+ methodName = "randLoad";
+ paramValues[0] = SSLRandomSeed;
+ method = clazz.getMethod(methodName, paramTypes);
+ method.invoke(null, paramValues);
+
sslInitialized = true;
}
@@ -223,4 +230,11 @@
this.SSLEngine = SSLEngine;
}
+ public String getSSLRandomSeed() {
+ return SSLRandomSeed;
+ }
+
+ public void setSSLRandomSeed(String SSLRandomSeed) {
+ this.SSLRandomSeed = SSLRandomSeed;
+ }
}
17 years, 3 months
JBossWeb SVN: r369 - sandbox/tomcat/tomcat6.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-12-06 11:35:04 -0500 (Thu, 06 Dec 2007)
New Revision: 369
Modified:
sandbox/tomcat/tomcat6/README
Log:
- Readme clarification.
Modified: sandbox/tomcat/tomcat6/README
===================================================================
--- sandbox/tomcat/tomcat6/README 2007-12-06 16:07:23 UTC (rev 368)
+++ sandbox/tomcat/tomcat6/README 2007-12-06 16:35:04 UTC (rev 369)
@@ -1,3 +1,5 @@
+Patch for svn: http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_15/
+
patch.build.patch: Arrange build.
cluster.patch: remove cluster and documentation.
nio.patch: remove nio and documentation.
@@ -2,2 +4,2 @@
oldjk.patch: remove the old jk code.
-security.patch: security patches included in 6.0.16
\ No newline at end of file
+security.patch: parameter parsing (incl in Tomcat 6.0.16)
17 years, 3 months
JBossWeb SVN: r368 - sandbox/tomcat/tomcat6.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-12-06 11:07:23 -0500 (Thu, 06 Dec 2007)
New Revision: 368
Added:
sandbox/tomcat/tomcat6/security.patch
Modified:
sandbox/tomcat/tomcat6/
sandbox/tomcat/tomcat6/README
Log:
- Add security patch to the patch list.
Property changes on: sandbox/tomcat/tomcat6
___________________________________________________________________
Name: svn:ignore
+ .project
Modified: sandbox/tomcat/tomcat6/README
===================================================================
--- sandbox/tomcat/tomcat6/README 2007-12-06 16:00:21 UTC (rev 367)
+++ sandbox/tomcat/tomcat6/README 2007-12-06 16:07:23 UTC (rev 368)
@@ -2,3 +2,4 @@
cluster.patch: remove cluster and documentation.
nio.patch: remove nio and documentation.
oldjk.patch: remove the old jk code.
+security.patch: security patches included in 6.0.16
\ No newline at end of file
Added: sandbox/tomcat/tomcat6/security.patch
===================================================================
--- sandbox/tomcat/tomcat6/security.patch (rev 0)
+++ sandbox/tomcat/tomcat6/security.patch 2007-12-06 16:07:23 UTC (rev 368)
@@ -0,0 +1,13 @@
+Index: java/org/apache/catalina/connector/Request.java
+===================================================================
+--- java/org/apache/catalina/connector/Request.java (revision 601766)
++++ java/org/apache/catalina/connector/Request.java (working copy)
+@@ -2466,6 +2466,7 @@
+ context.getLogger().debug(
+ sm.getString("coyoteRequest.parseParameters"), e);
+ }
++ return;
+ }
+ parameters.processParameters(formData, 0, len);
+ }
+
17 years, 3 months
JBossWeb SVN: r367 - branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-06 11:00:21 -0500 (Thu, 06 Dec 2007)
New Revision: 367
Modified:
branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java
Log:
Port from tc6.0.x:
Fix the bug in AprLifecycleListener, the value of SSLEngine is never transferred to the listener.
http://jira.jboss.com/jira/browse/JBNATIVE-51 / https://na1.salesforce.com/50030000004BUj8
Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java
===================================================================
--- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java 2007-12-04 22:24:00 UTC (rev 366)
+++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java 2007-12-06 16:00:21 UTC (rev 367)
@@ -215,4 +215,11 @@
sslInitialized = true;
}
+ public String getSSLEngine() {
+ return SSLEngine;
+ }
+
+ public void setSSLEngine(String SSLEngine) {
+ this.SSLEngine = SSLEngine;
+ }
}
17 years, 3 months
JBossWeb SVN: r366 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-12-04 17:24:00 -0500 (Tue, 04 Dec 2007)
New Revision: 366
Added:
tags/JBOSSWEB_2_1_0_CR9/
Log:
- JBoss Web 2.1.0 CR9.
Copied: tags/JBOSSWEB_2_1_0_CR9 (from rev 365, trunk)
17 years, 3 months
JBossWeb SVN: r365 - trunk/java/org/apache/catalina/core.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-12-04 12:24:02 -0500 (Tue, 04 Dec 2007)
New Revision: 365
Modified:
trunk/java/org/apache/catalina/core/StandardContext.java
Log:
- Fix reloading bug caused by the instance manager.
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2007-12-04 01:38:06 UTC (rev 364)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2007-12-04 17:24:02 UTC (rev 365)
@@ -4681,6 +4681,7 @@
applicationListeners = new String[0];
applicationEventListenersObjects = new Object[0];
applicationLifecycleListenersObjects = new Object[0];
+ instanceManager = null;
if(log.isDebugEnabled())
log.debug("resetContext " + oname);
17 years, 3 months
JBossWeb SVN: r364 - in trunk/java/javax/servlet: resources and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2007-12-03 20:38:06 -0500 (Mon, 03 Dec 2007)
New Revision: 364
Modified:
trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd
trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd
trunk/java/javax/servlet/resources/web-app_2_4.xsd
Log:
- Port current resources from Tomcat.
Modified: trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd
===================================================================
--- trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd 2007-12-04 01:25:59 UTC (rev 363)
+++ trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd 2007-12-04 01:38:06 UTC (rev 364)
@@ -31,41 +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>
-
This is the XML Schema for the JSP 2.0 deployment descriptor
types. The JSP 2.0 schema contains all the special
structures and datatypes that are necessary to use JSP files
Modified: trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd
===================================================================
--- trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd 2007-12-04 01:25:59 UTC (rev 363)
+++ trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd 2007-12-04 01:38:06 UTC (rev 364)
@@ -31,41 +31,6 @@
<xsd:annotation>
<xsd:documentation>
-
- Copyright 2003 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>
<![CDATA[
This is the XML Schema for the JSP Taglibrary
Modified: trunk/java/javax/servlet/resources/web-app_2_4.xsd
===================================================================
--- trunk/java/javax/servlet/resources/web-app_2_4.xsd 2007-12-04 01:25:59 UTC (rev 363)
+++ trunk/java/javax/servlet/resources/web-app_2_4.xsd 2007-12-04 01:38:06 UTC (rev 364)
@@ -30,41 +30,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>
<![CDATA[
This is the XML Schema for the Servlet 2.4 deployment descriptor.
17 years, 3 months
JBossWeb SVN: r363 - in trunk: bin and 5 other directories.
by jbossweb-commits＠lists.jboss.org
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)">
17 years, 3 months