JBossWeb SVN: r1155 - trunk/java/org/apache/catalina/deploy.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-08-31 19:28:52 -0400 (Mon, 31 Aug 2009)
New Revision: 1155
Modified:
trunk/java/org/apache/catalina/deploy/SecurityCollection.java
Log:
- Fix cut and paste oops.
Modified: trunk/java/org/apache/catalina/deploy/SecurityCollection.java
===================================================================
--- trunk/java/org/apache/catalina/deploy/SecurityCollection.java 2009-08-31 17:41:55 UTC (rev 1154)
+++ trunk/java/org/apache/catalina/deploy/SecurityCollection.java 2009-08-31 23:28:52 UTC (rev 1155)
@@ -255,8 +255,6 @@
*/
public boolean findMethodOmission(String method) {
- if (methods.length == 0)
- return (true);
for (int i = 0; i < methodOmissions.length; i++) {
if (methodOmissions[i].equals(method))
return (true);
14 years, 8 months
JBossWeb SVN: r1154 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-08-31 13:41:55 -0400 (Mon, 31 Aug 2009)
New Revision: 1154
Added:
tags/JBOSSWEB_3_0_0_ALPHA2/
Log:
- New build, so that there are no known JSP issues.
Copied: tags/JBOSSWEB_3_0_0_ALPHA2 (from rev 1153, trunk)
14 years, 8 months
JBossWeb SVN: r1153 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-08-31 13:38:52 -0400 (Mon, 31 Aug 2009)
New Revision: 1153
Modified:
trunk/java/org/apache/catalina/manager/ManagerServlet.java
trunk/webapps/docs/changelog.xml
Log:
- Port divide by zero fix.
Modified: trunk/java/org/apache/catalina/manager/ManagerServlet.java
===================================================================
--- trunk/java/org/apache/catalina/manager/ManagerServlet.java 2009-08-31 15:12:09 UTC (rev 1152)
+++ trunk/java/org/apache/catalina/manager/ManagerServlet.java 2009-08-31 17:38:52 UTC (rev 1153)
@@ -1074,6 +1074,8 @@
int histoInterval = maxInactiveInterval / maxCount;
if ( histoInterval * maxCount < maxInactiveInterval )
histoInterval++;
+ if (histoInterval == 0)
+ histoInterval = 1;
maxCount = maxInactiveInterval / histoInterval;
if ( histoInterval * maxCount < maxInactiveInterval )
maxCount++;
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-08-31 15:12:09 UTC (rev 1152)
+++ trunk/webapps/docs/changelog.xml 2009-08-31 17:38:52 UTC (rev 1153)
@@ -130,6 +130,9 @@
<fix>
Register filters with JMX. (markt)
</fix>
+ <fix>
+ <bug>47705</bug>: Fix divide by zero in the manager sessions command. (funkman)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
14 years, 8 months
JBossWeb SVN: r1152 - in trunk: res/jboss/org/apache/catalina/startup and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-08-31 11:12:09 -0400 (Mon, 31 Aug 2009)
New Revision: 1152
Modified:
trunk/java/org/apache/catalina/core/StandardContext.java
trunk/res/jboss/org/apache/catalina/startup/catalina.properties
Log:
- Add back a flag (from a system property because it's quite useless).
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2009-08-31 15:10:49 UTC (rev 1151)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2009-08-31 15:12:09 UTC (rev 1152)
@@ -127,7 +127,10 @@
{
protected static Logger log = Logger.getLogger(StandardContext.class);
+ public static final boolean CONFIGBASE_MKDIRS =
+ Boolean.valueOf(System.getProperty("org.apache.catalina.core.CONFIGBASE_MKDIRS", "true")).booleanValue();
+
// ----------------------------------------------------------- Constructors
@@ -4817,7 +4820,9 @@
if (host != null) {
configBase = new File(configBase, host.getName());
}
- configBase.mkdirs();
+ if (CONFIGBASE_MKDIRS) {
+ configBase.mkdirs();
+ }
return configBase;
}
Modified: trunk/res/jboss/org/apache/catalina/startup/catalina.properties
===================================================================
--- trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2009-08-31 15:10:49 UTC (rev 1151)
+++ trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2009-08-31 15:12:09 UTC (rev 1152)
@@ -3,6 +3,7 @@
org.apache.catalina.core.StandardService.DELAY_CONNECTOR_STARTUP=true
org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true
org.apache.catalina.connector.Request.SESSION_ID_CHECK=true
+org.apache.catalina.core.CONFIGBASE_MKDIRS=false
org.apache.catalina.core.StandardHost.autoDeploy=false
org.apache.catalina.core.StandardHost.configClass=org.jboss.web.tomcat.service.deployers.JBossContextConfig
org.apache.catalina.core.StandardHost.deployOnStartup=false
14 years, 8 months
JBossWeb SVN: r1151 - trunk/java/org/apache/jasper/compiler.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-08-31 11:10:49 -0400 (Mon, 31 Aug 2009)
New Revision: 1151
Modified:
trunk/java/org/apache/jasper/compiler/PageInfo.java
Log:
- Fix oops (when using a tei, I think).
Modified: trunk/java/org/apache/jasper/compiler/PageInfo.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/PageInfo.java 2009-08-31 15:10:14 UTC (rev 1150)
+++ trunk/java/org/apache/jasper/compiler/PageInfo.java 2009-08-31 15:10:49 UTC (rev 1151)
@@ -101,6 +101,7 @@
this.jspFile = jspFile;
this.beanRepository = beanRepository;
+ this.varInfoNames = new HashSet<String>();
this.taglibsMap = new HashMap();
this.jspPrefixMapper = new HashMap();
this.xmlPrefixMapper = new HashMap();
14 years, 8 months
JBossWeb SVN: r1150 - trunk/java/org/apache/catalina/startup.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-08-31 11:10:14 -0400 (Mon, 31 Aug 2009)
New Revision: 1150
Modified:
trunk/java/org/apache/catalina/startup/ContextConfig.java
Log:
- Use the JAR repository when parsing TLDs (I don't see any reason not to), must be something I did forget.
Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java
===================================================================
--- trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-08-31 09:34:38 UTC (rev 1149)
+++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-08-31 15:10:14 UTC (rev 1150)
@@ -650,11 +650,11 @@
if (jarPath.equals("")) {
continue;
}
- JarFile jarFile = null;
- try {
- jarFile = new JarFile(jarPath);
- Iterator<String> jarTLDsIterator = TLDs.get(jarPath).iterator();
- while (jarTLDsIterator.hasNext()) {
+ JarRepository jarRepository = context.getJarRepository();
+ JarFile jarFile = jarRepository.findJar(jarPath);
+ Iterator<String> jarTLDsIterator = TLDs.get(jarPath).iterator();
+ while (jarTLDsIterator.hasNext()) {
+ try {
String tldPath = jarTLDsIterator.next();
stream = jarFile.getInputStream(jarFile.getEntry(tldPath));
synchronized (tldDigester) {
@@ -680,17 +680,17 @@
context.addJspTagLibrary(jarPath, tagLibraryInfo);
}
}
- }
- } catch (Exception e) {
- log.error(sm.getString("contextConfig.tldJarException",
- jarPath, context.getPath()), e);
- ok = false;
- } finally {
- if (jarFile != null) {
- try {
- jarFile.close();
- } catch (Throwable t) {
- // Ignore
+ } catch (Exception e) {
+ log.error(sm.getString("contextConfig.tldJarException",
+ jarPath, context.getPath()), e);
+ ok = false;
+ } finally {
+ if (stream != null) {
+ try {
+ stream.close();
+ } catch (Throwable t) {
+ // Ignore
+ }
}
}
}
14 years, 8 months
JBossWeb SVN: r1149 - trunk/java/org/apache/jasper/compiler.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-08-31 05:34:38 -0400 (Mon, 31 Aug 2009)
New Revision: 1149
Modified:
trunk/java/org/apache/jasper/compiler/Generator.java
Log:
- Port regression fix: Update list of introduced variables before the tag body is processed in case they are used in the tag body.
Modified: trunk/java/org/apache/jasper/compiler/Generator.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Generator.java 2009-08-31 09:34:00 UTC (rev 1148)
+++ trunk/java/org/apache/jasper/compiler/Generator.java 2009-08-31 09:34:38 UTC (rev 1149)
@@ -1764,6 +1764,17 @@
generateLocalVariables(out, n);
}
+ // Add the named objects to the list of 'introduced' names to enable
+ // a later test as per JSP.5.3
+ VariableInfo[] infos = n.getVariableInfos();
+ if (infos != null && infos.length > 0) {
+ for (int i = 0; i < infos.length; i++) {
+ VariableInfo info = infos[i];
+ if (info != null && info.getVarName() != null)
+ pageInfo.getVarInfoNames().add(info.getVarName());
+ }
+ }
+
if (n.implementsSimpleTag()) {
generateCustomDoTag(n, handlerInfo, tagHandlerVar);
} else {
@@ -1815,17 +1826,6 @@
out = outSave;
}
- // Add the named objects to the list of 'introduced' names to enable
- // a later test as per JSP.5.3
- VariableInfo[] infos = n.getVariableInfos();
- if (infos != null && infos.length > 0) {
- for (int i = 0; i < infos.length; i++) {
- VariableInfo info = infos[i];
- if (info != null && info.getVarName() != null)
- pageInfo.getVarInfoNames().add(info.getVarName());
- }
- }
-
}
private static final String SINGLE_QUOTE = "'";
14 years, 8 months
JBossWeb SVN: r1148 - in trunk: java/org/apache/tomcat/util/http and 1 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-08-31 05:34:00 -0400 (Mon, 31 Aug 2009)
New Revision: 1148
Modified:
trunk/PATCHES.txt
trunk/java/org/apache/tomcat/util/http/ServerCookie.java
trunk/webapps/docs/changelog.xml
Log:
- In the end, port IE flag for cookies.
Modified: trunk/PATCHES.txt
===================================================================
--- trunk/PATCHES.txt 2009-08-28 17:24:57 UTC (rev 1147)
+++ trunk/PATCHES.txt 2009-08-31 09:34:00 UTC (rev 1148)
@@ -35,9 +35,6 @@
Executor modifications, very specialized work that breaks the Executor design (a single task can be submitted
to the real executor more than once) to supposedly work better with the NIO connector.
-728947
-Lame IE 6 and 7 cookie hack for expires.
-
various
New JDBC pool module
Modified: trunk/java/org/apache/tomcat/util/http/ServerCookie.java
===================================================================
--- trunk/java/org/apache/tomcat/util/http/ServerCookie.java 2009-08-28 17:24:57 UTC (rev 1147)
+++ trunk/java/org/apache/tomcat/util/http/ServerCookie.java 2009-08-31 09:34:00 UTC (rev 1148)
@@ -79,7 +79,13 @@
public static final boolean VERSION_SWITCH =
Boolean.valueOf(System.getProperty("org.apache.tomcat.util.http.ServerCookie.VERSION_SWITCH", "true")).booleanValue();
+ /**
+ * If set to false, we don't use the IE6/7 Max-Age/Expires work around
+ */
+ public static final boolean ALWAYS_ADD_EXPIRES =
+ Boolean.valueOf(System.getProperty("org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES", "false")).booleanValue();
+
// Note: Servlet Spec =< 2.5 only refers to Netscape and RFC2109,
// not RFC2965
@@ -308,18 +314,19 @@
// Max-Age=secs ... or use old "Expires" format
// TODO RFC2965 Discard
if (maxAge >= 0) {
- if (version == 0) {
+ // IE6, IE7 and possibly other browsers don't understand Max-Age.
+ // They do understand Expires, even with V1 cookies!
+ if (version == 0 || ALWAYS_ADD_EXPIRES) {
// Wdy, DD-Mon-YY HH:MM:SS GMT ( Expires Netscape format )
buf.append ("; Expires=");
// To expire immediately we need to set the time in past
- if (maxAge == 0) {
+ if (maxAge == 0)
buf.append( ancientDate );
- } else {
+ else
OLD_COOKIE_FORMAT.get().format(
new Date(System.currentTimeMillis() +
maxAge*1000L),
- buf, new FieldPosition(0));
- }
+ buf, new FieldPosition(0));
} else {
buf.append ("; Max-Age=");
buf.append (maxAge);
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-08-28 17:24:57 UTC (rev 1147)
+++ trunk/webapps/docs/changelog.xml 2009-08-31 09:34:00 UTC (rev 1148)
@@ -146,6 +146,9 @@
<fix>
<jboss-jira>JBAS-6442</jboss-jira>: The character encoder should tolerate unmappable characters. (jfclere)
</fix>
+ <fix>
+ Add flag to set Expires for cookie expiration on IE. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
14 years, 8 months
JBossWeb SVN: r1147 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-08-28 13:24:57 -0400 (Fri, 28 Aug 2009)
New Revision: 1147
Added:
tags/JBOSSWEB_3_0_0_ALPHA1/
Log:
- Tag for testing purposes with AS.
Copied: tags/JBOSSWEB_3_0_0_ALPHA1 (from rev 1146, trunk)
14 years, 9 months
JBossWeb SVN: r1146 - branches/2.1.x/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-08-21 10:13:01 -0400 (Fri, 21 Aug 2009)
New Revision: 1146
Modified:
branches/2.1.x/webapps/docs/changelog.xml
Log:
- Update changelog.
Modified: branches/2.1.x/webapps/docs/changelog.xml
===================================================================
--- branches/2.1.x/webapps/docs/changelog.xml 2009-08-18 14:06:05 UTC (rev 1145)
+++ branches/2.1.x/webapps/docs/changelog.xml 2009-08-21 14:13:01 UTC (rev 1146)
@@ -16,7 +16,7 @@
<body>
-<section name="JBoss Web 2.1.3.GA (remm)">
+<section name="JBoss Web 2.1.4.GA (remm)">
<subsection name="General">
<changelog>
</changelog>
@@ -33,6 +33,9 @@
</subsection>
<subsection name="Coyote">
<changelog>
+ <fix>
+ <jboss-jira>JBAS-6442</jboss-jira>: The character encoder should tolerate unmappable characters. (jfclere)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
14 years, 9 months