JBossWeb SVN: r1128 - sandbox/webapps.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-06-24 03:22:30 -0400 (Wed, 24 Jun 2009)
New Revision: 1128
Modified:
sandbox/webapps/myapp.xml
Log:
Add the SSL <transport-guarantee>CONFIDENTIAL</transport-guarantee> for ssl.jsp
Modified: sandbox/webapps/myapp.xml
===================================================================
--- sandbox/webapps/myapp.xml 2009-06-24 06:53:15 UTC (rev 1127)
+++ sandbox/webapps/myapp.xml 2009-06-24 07:22:30 UTC (rev 1128)
@@ -179,6 +179,18 @@
</auth-constraint>
</security-constraint>
+ <!-- SSL Security testings transport-guarantee (NONE, INTEGRAL, CONFIDENTIAL)-->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>SSL Security Tests</web-resource-name>
+ <url-pattern>/ssl.jsp</url-pattern>
+ </web-resource-collection>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+
+
<!-- Define the Login Configuration for this Application -->
<login-config>
<auth-method>FORM</auth-method>
15 years, 6 months
JBossWeb SVN: r1127 - in sandbox/webapps: src and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-06-24 02:53:15 -0400 (Wed, 24 Jun 2009)
New Revision: 1127
Modified:
sandbox/webapps/metainf/context.xml
sandbox/webapps/src/TestServlet.java
Log:
Test for null headers and "emptySessionPath" replacement.
Modified: sandbox/webapps/metainf/context.xml
===================================================================
--- sandbox/webapps/metainf/context.xml 2009-06-22 14:55:15 UTC (rev 1126)
+++ sandbox/webapps/metainf/context.xml 2009-06-24 06:53:15 UTC (rev 1127)
@@ -1,2 +1,3 @@
<Context privileged="true">
+ <SessionCookie Path="/"/>
</Context>
Modified: sandbox/webapps/src/TestServlet.java
===================================================================
--- sandbox/webapps/src/TestServlet.java 2009-06-22 14:55:15 UTC (rev 1126)
+++ sandbox/webapps/src/TestServlet.java 2009-06-24 06:53:15 UTC (rev 1127)
@@ -94,6 +94,10 @@
responseStream.close();
return;
}
+ if (testValue != null && testValue.compareToIgnoreCase("NULL_HEADER")==0) {
+ response.addHeader("", "empty");
+ return;
+ }
String createValue = request.getParameter("create");
int icreate = 0;
15 years, 6 months
JBossWeb SVN: r1126 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-06-22 10:55:15 -0400 (Mon, 22 Jun 2009)
New Revision: 1126
Modified:
trunk/PATCHES.txt
trunk/build.properties.default
trunk/webapps/docs/changelog.xml
Log:
- Pool 1.5.1.
Modified: trunk/PATCHES.txt
===================================================================
--- trunk/PATCHES.txt 2009-06-22 14:52:50 UTC (rev 1125)
+++ trunk/PATCHES.txt 2009-06-22 14:55:15 UTC (rev 1126)
@@ -75,7 +75,7 @@
781036
Some configBase creation flag
-781779
+781779 and all followups
Useless syncing
782000 782005 782007 782010 782013 782032
Modified: trunk/build.properties.default
===================================================================
--- trunk/build.properties.default 2009-06-22 14:52:50 UTC (rev 1125)
+++ trunk/build.properties.default 2009-06-22 14:55:15 UTC (rev 1126)
@@ -48,8 +48,8 @@
commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
# ----- Commons Pool, version 1.1 or later -----
-commons-pool.home=${base.path}/commons-pool-1.5-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.5.1-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.1-src.tar.gz
# ----- NSIS, version 2.0 or later -----
nsis.home=${base.path}/nsis-2.44
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-06-22 14:52:50 UTC (rev 1125)
+++ trunk/webapps/docs/changelog.xml 2009-06-22 14:55:15 UTC (rev 1126)
@@ -22,6 +22,9 @@
<update>
Servlet 3.0 API. (markt, remm)
</update>
+ <update>
+ Commons Pool 1.5.1. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="Catalina">
@@ -97,11 +100,17 @@
<bug>47299</bug>: Expose Container.fireContainerEvent, which became public long ago. (remm)
</fix>
<fix>
- Two bugs related to session activity with the persistent manager. (markt)
+ Three bugs related to session activity with the persistent manager. (kkolinko, markt)
</fix>
<fix>
<bug>47343</bug>: Fix redeploy resources order. (markt)
</fix>
+ <fix>
+ Add support for chunked POSTs. (markt)
+ </fix>
+ <fix>
+ MIME types cleanup. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
15 years, 6 months
JBossWeb SVN: r1125 - in trunk/java/org/apache/catalina: valves and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-06-22 10:52:50 -0400 (Mon, 22 Jun 2009)
New Revision: 1125
Modified:
trunk/java/org/apache/catalina/session/PersistentManagerBase.java
trunk/java/org/apache/catalina/session/StandardSession.java
trunk/java/org/apache/catalina/valves/PersistentValve.java
Log:
- Persistent manager access count fixes.
Modified: trunk/java/org/apache/catalina/session/PersistentManagerBase.java
===================================================================
--- trunk/java/org/apache/catalina/session/PersistentManagerBase.java 2009-06-22 14:51:28 UTC (rev 1124)
+++ trunk/java/org/apache/catalina/session/PersistentManagerBase.java 2009-06-22 14:52:50 UTC (rev 1125)
@@ -1053,11 +1053,10 @@
int timeIdle = // Truncate, do not round up
(int) ((timeNow - session.getLastAccessedTime()) / 1000L);
if (timeIdle > maxIdleSwap && timeIdle > minIdleSwap) {
- if (sessions[i] instanceof StandardSession) {
- if (((StandardSession) sessions[i]).accessCount.get() > 0) {
- // Session is currently being accessed - skip it
- continue;
- }
+ if (session.accessCount != null &&
+ session.accessCount.get() > 0) {
+ // Session is currently being accessed - skip it
+ continue;
}
if (log.isDebugEnabled())
log.debug(sm.getString
@@ -1099,24 +1098,24 @@
long timeNow = System.currentTimeMillis();
for (int i = 0; i < sessions.length && toswap > 0; i++) {
- synchronized (sessions[i]) {
+ StandardSession session = (StandardSession) sessions[i];
+ synchronized (session) {
int timeIdle = // Truncate, do not round up
- (int) ((timeNow - sessions[i].getLastAccessedTime()) / 1000L);
+ (int) ((timeNow - session.getThisAccessedTimeInternal()) / 1000L);
if (timeIdle > minIdleSwap) {
- if (sessions[i] instanceof StandardSession) {
- if (((StandardSession) sessions[i]).accessCount.get() > 0) {
- // Session is currently being accessed - skip it
- continue;
- }
+ if (session.accessCount != null &&
+ session.accessCount.get() > 0) {
+ // Session is currently being accessed - skip it
+ continue;
}
if(log.isDebugEnabled())
log.debug(sm.getString
("persistentManager.swapTooManyActive",
- sessions[i].getIdInternal(), new Integer(timeIdle)));
+ session.getIdInternal(), new Integer(timeIdle)));
try {
- swapOut(sessions[i]);
+ swapOut(session);
} catch (IOException e) {
- ; // This is logged in writeSession()
+ // This is logged in writeSession()
}
toswap--;
}
Modified: trunk/java/org/apache/catalina/session/StandardSession.java
===================================================================
--- trunk/java/org/apache/catalina/session/StandardSession.java 2009-06-22 14:51:28 UTC (rev 1124)
+++ trunk/java/org/apache/catalina/session/StandardSession.java 2009-06-22 14:52:50 UTC (rev 1125)
@@ -395,7 +395,32 @@
* session, as the number of milliseconds since midnight, January 1, 1970
* GMT. Actions that your application takes, such as getting or setting
* a value associated with the session, do not affect the access time.
+ * This one gets updated whenever a request starts.
*/
+ public long getThisAccessedTime() {
+
+ if (!isValidInternal()) {
+ throw new IllegalStateException
+ (sm.getString("standardSession.getThisAccessedTime.ise"));
+ }
+
+ return (this.thisAccessedTime);
+ }
+
+ /**
+ * Return the last client access time without invalidation check
+ * @see #getThisAccessedTime().
+ */
+ public long getThisAccessedTimeInternal() {
+ return (this.thisAccessedTime);
+ }
+
+ /**
+ * Return the last time the client sent a request associated with this
+ * session, as the number of milliseconds since midnight, January 1, 1970
+ * GMT. Actions that your application takes, such as getting or setting
+ * a value associated with the session, do not affect the access time.
+ */
public long getLastAccessedTime() {
if (!isValidInternal()) {
Modified: trunk/java/org/apache/catalina/valves/PersistentValve.java
===================================================================
--- trunk/java/org/apache/catalina/valves/PersistentValve.java 2009-06-22 14:51:28 UTC (rev 1124)
+++ trunk/java/org/apache/catalina/valves/PersistentValve.java 2009-06-22 14:52:50 UTC (rev 1125)
@@ -137,6 +137,7 @@
manager.add(session);
// ((StandardSession)session).activate();
session.access();
+ session.endAccess();
}
}
}
15 years, 6 months
JBossWeb SVN: r1124 - in trunk/java/org/apache: catalina/servlets and 1 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-06-22 10:51:28 -0400 (Mon, 22 Jun 2009)
New Revision: 1124
Modified:
trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
trunk/java/org/apache/catalina/manager/ManagerServlet.java
trunk/java/org/apache/catalina/servlets/DefaultServlet.java
trunk/java/org/apache/jasper/Constants.java
trunk/java/org/apache/jasper/EmbeddedServletOptions.java
Log:
- Sync: use the regular Servlet API constant.
Modified: trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
===================================================================
--- trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 2009-06-22 14:28:45 UTC (rev 1123)
+++ trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 2009-06-22 14:51:28 UTC (rev 1124)
@@ -31,6 +31,8 @@
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -174,8 +176,7 @@
DiskFileUpload upload = new DiskFileUpload();
// Get the tempdir
- File tempdir = (File) getServletContext().getAttribute
- ("javax.servlet.context.tempdir");
+ File tempdir = (File) getServletContext().getAttribute(ServletContext.TEMPDIR);
// Set upload parameters
upload.setSizeMax(-1);
upload.setRepositoryPath(tempdir.getCanonicalPath());
Modified: trunk/java/org/apache/catalina/manager/ManagerServlet.java
===================================================================
--- trunk/java/org/apache/catalina/manager/ManagerServlet.java 2009-06-22 14:28:45 UTC (rev 1123)
+++ trunk/java/org/apache/catalina/manager/ManagerServlet.java 2009-06-22 14:51:28 UTC (rev 1124)
@@ -30,6 +30,7 @@
import javax.management.ObjectName;
import javax.naming.Binding;
import javax.naming.NamingEnumeration;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
import javax.servlet.UnavailableException;
@@ -467,8 +468,7 @@
}
// Calculate the directory into which we will be deploying applications
- versioned = (File) getServletContext().getAttribute
- ("javax.servlet.context.tempdir");
+ versioned = (File) getServletContext().getAttribute(ServletContext.TEMPDIR);
// Identify the appBase of the owning Host of this Context
// (if any)
Modified: trunk/java/org/apache/catalina/servlets/DefaultServlet.java
===================================================================
--- trunk/java/org/apache/catalina/servlets/DefaultServlet.java 2009-06-22 14:28:45 UTC (rev 1123)
+++ trunk/java/org/apache/catalina/servlets/DefaultServlet.java 2009-06-22 14:51:28 UTC (rev 1124)
@@ -42,6 +42,7 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.UnavailableException;
@@ -453,7 +454,7 @@
// resource - create a temp. file on the local filesystem to
// perform this operation
File tempDir = (File) getServletContext().getAttribute
- ("javax.servlet.context.tempdir");
+ (ServletContext.TEMPDIR);
// Convert all '/' characters to '.' in resourcePath
String convertedResourcePath = path.replace('/', '.');
File contentFile = new File(tempDir, convertedResourcePath);
Modified: trunk/java/org/apache/jasper/Constants.java
===================================================================
--- trunk/java/org/apache/jasper/Constants.java 2009-06-22 14:28:45 UTC (rev 1123)
+++ trunk/java/org/apache/jasper/Constants.java 2009-06-22 14:51:28 UTC (rev 1124)
@@ -120,7 +120,6 @@
* uses.
*/
public static final String INC_SERVLET_PATH = "javax.servlet.include.servlet_path";
- public static final String TMP_DIR = "javax.servlet.context.tempdir";
// Must be kept in sync with org/apache/catalina/Globals.java
public static final String ALT_DD_ATTR =
Modified: trunk/java/org/apache/jasper/EmbeddedServletOptions.java
===================================================================
--- trunk/java/org/apache/jasper/EmbeddedServletOptions.java 2009-06-22 14:28:45 UTC (rev 1123)
+++ trunk/java/org/apache/jasper/EmbeddedServletOptions.java 2009-06-22 14:51:28 UTC (rev 1124)
@@ -557,7 +557,7 @@
scratchDir = new File(dir);
} else {
// First try the Servlet 2.2 javax.servlet.context.tempdir property
- scratchDir = (File) context.getAttribute(Constants.TMP_DIR);
+ scratchDir = (File) context.getAttribute(ServletContext.TEMPDIR);
if (scratchDir == null) {
// Not running in a Servlet 2.2 container.
// Try to get the JDK 1.2 java.io.tmpdir property
15 years, 6 months
JBossWeb SVN: r1123 - trunk/java/org/apache/catalina/startup.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-06-22 10:28:45 -0400 (Mon, 22 Jun 2009)
New Revision: 1123
Modified:
trunk/java/org/apache/catalina/startup/Tomcat.java
Log:
- Sync utility embedded class.
Modified: trunk/java/org/apache/catalina/startup/Tomcat.java
===================================================================
--- trunk/java/org/apache/catalina/startup/Tomcat.java 2009-06-22 14:13:03 UTC (rev 1122)
+++ trunk/java/org/apache/catalina/startup/Tomcat.java 2009-06-22 14:28:45 UTC (rev 1123)
@@ -42,7 +42,6 @@
import org.apache.catalina.core.StandardServer;
import org.apache.catalina.core.StandardService;
import org.apache.catalina.core.StandardWrapper;
-import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.realm.GenericPrincipal;
import org.apache.catalina.realm.RealmBase;
import org.apache.catalina.session.StandardManager;
@@ -78,7 +77,7 @@
* see setters for doc. It can be used for simple tests and
* demo.
*
- * @see TomcatStartupAPITest for examples on how to use this
+ * @see TestTomcat for examples on how to use this
* @author Costin Manolache
*/
public class Tomcat {
@@ -247,7 +246,6 @@
* Initialize and start the server.
*/
public void start() throws Exception {
- setSilent();
getServer();
getConnector();
server.initialize();
@@ -421,7 +419,7 @@
initSimpleAuth();
}
ctx.setRealm(defaultRealm);
- initWebappDefaults(ctx);
+ ctx.addLifecycleListener(new DefaultWebXmlListener());
ContextConfig ctxCfg = new ContextConfig();
ctx.addLifecycleListener( ctxCfg );
@@ -506,8 +504,14 @@
"org.apache.catalina.core.StandardEngine",
"org.apache.catalina.startup.ContextConfig",
"org.apache.catalina.core.ApplicationContext",
+ "org.apache.catalina.core.AprLifecycleListener"
};
+ /**
+ * Sets the log level to WARN for the loggers that log information on
+ * Tomcat start up. This prevents the usual startup information being
+ * logged to the console.
+ */
public void setSilent() {
for (String s : silences) {
Logger.getLogger(s).setLevel(Level.WARNING);
@@ -523,7 +527,8 @@
Logger.getLogger(base).setLevel(Level.WARNING);
}
- /** Init default servlets for the context. This should be the programmatic
+ /**
+ * Provide default configuration for a context. This is the programmatic
* equivalent of the default web.xml.
*
* TODO: in normal tomcat, if default-web.xml is not found, use this
@@ -531,44 +536,35 @@
*/
public static void initWebappDefaults(StandardContext ctx) {
// Default servlet
- StandardWrapper servlet =
- addServlet(ctx, "default",
- //new DefaultServlet());
- // Or:
- "org.apache.catalina.servlets.DefaultServlet");
- servlet.addInitParameter("listings", "false");
+ StandardWrapper servlet = addServlet(
+ ctx, "default", "org.apache.catalina.servlets.DefaultServlet");
servlet.setLoadOnStartup(1);
- // class name - to avoid loading all deps
- servlet = addServlet(ctx, "jsp",
- "org.apache.jasper.servlet.JspServlet");
+ // JSP servlet (by class name - to avoid loading all deps)
+ servlet = addServlet(
+ ctx, "jsp", "org.apache.jasper.servlet.JspServlet");
servlet.addInitParameter("fork", "false");
- servlet.addInitParameter("xpoweredBy", "false");
+ servlet.setLoadOnStartup(3);
- // in default web.xml - but not here, only needed if you have
- // jsps.
- //servlet.setLoadOnStartup(3);
-
+ // Servlet mappings
ctx.addServletMapping("/", "default");
ctx.addServletMapping("*.jsp", "jsp");
ctx.addServletMapping("*.jspx", "jsp");
+
// Sessions
ctx.setManager( new StandardManager());
ctx.setSessionTimeout(30);
- // TODO: read mime from /etc/mime.types on linux, or some
- // resource
+ // MIME mappings
for (int i = 0; i < DEFAULT_MIME_MAPPINGS.length; ) {
ctx.addMimeMapping(DEFAULT_MIME_MAPPINGS[i++],
DEFAULT_MIME_MAPPINGS[i++]);
}
+
+ // Welcome files
ctx.addWelcomeFile("index.html");
ctx.addWelcomeFile("index.htm");
ctx.addWelcomeFile("index.jsp");
-
- ctx.setLoginConfig( new LoginConfig("NONE", null, null, null));
-
- // TODO: set a default realm, add simple API to add users
}
@@ -592,6 +588,24 @@
}
+
+ /**
+ * Fix reload - required if reloading and using programmatic configuration.
+ * When a context is reloaded, any programmatic configuration is lost. This
+ * listener sets the equivalent of conf/web.xml when the context starts. The
+ * context needs to be an instance of StandardContext for this listener to
+ * have any effect.
+ */
+ public static class DefaultWebXmlListener implements LifecycleListener {
+ public void lifecycleEvent(LifecycleEvent event) {
+ if (Lifecycle.BEFORE_START_EVENT.equals(event.getType()) &&
+ event.getLifecycle() instanceof StandardContext) {
+ initWebappDefaults((StandardContext) event.getLifecycle());
+ }
+ }
+ }
+
+
/** Helper class for wrapping existing servlets. This disables servlet
* lifecycle and normal reloading, but also reduces overhead and provide
* more direct control over the servlet.
@@ -710,12 +724,21 @@
"odp", "application/vnd.oasis.opendocument.presentation",
"ods", "application/vnd.oasis.opendocument.spreadsheet",
"odt", "application/vnd.oasis.opendocument.text",
- "ogg", "application/ogg",
- "otg ", "application/vnd.oasis.opendocument.graphics-template",
+ "otg", "application/vnd.oasis.opendocument.graphics-template",
"oth", "application/vnd.oasis.opendocument.text-web",
"otp", "application/vnd.oasis.opendocument.presentation-template",
"ots", "application/vnd.oasis.opendocument.spreadsheet-template ",
- "ott", "application/vnd.oasis.opendocument.text-template",
+ "ott", "application/vnd.oasis.opendocument.text-template",
+ "ogx", "application/ogg",
+ "ogv", "video/ogg",
+ "oga", "audio/ogg",
+ "ogg", "audio/ogg",
+ "spx", "audio/ogg",
+ "faca", "audio/flac",
+ "anx", "application/annodex",
+ "axa", "audio/annodex",
+ "axv", "video/annodex",
+ "xspf", "application/xspf+xml",
"pbm", "image/x-portable-bitmap",
"pct", "image/pict",
"pdf", "application/pdf",
@@ -727,7 +750,8 @@
"pnm", "image/x-portable-anymap",
"pnt", "image/x-macpaint",
"ppm", "image/x-portable-pixmap",
- "ppt", "application/powerpoint",
+ "ppt", "application/vnd.ms-powerpoint",
+ "pps", "application/vnd.ms-powerpoint",
"ps", "application/postscript",
"psd", "image/x-photoshop",
"qt", "video/quicktime",
@@ -749,6 +773,8 @@
"src", "application/x-wais-source",
"sv4cpio", "application/x-sv4cpio",
"sv4crc", "application/x-sv4crc",
+ "svg", "image/svg+xml",
+ "svgz", "image/svg+xml",
"swf", "application/x-shockwave-flash",
"t", "application/x-troff",
"tar", "application/x-tar",
@@ -767,16 +793,15 @@
"xbm", "image/x-xbitmap",
"xht", "application/xhtml+xml",
"xhtml", "application/xhtml+xml",
+ "xls", "application/vnd.ms-excel",
"xml", "application/xml",
"xpm", "image/x-xpixmap",
"xsl", "application/xml",
"xslt", "application/xslt+xml",
"xul", "application/vnd.mozilla.xul+xml",
"xwd", "image/x-xwindowdump",
+ "vsd", "application/x-visio",
"wav", "audio/x-wav",
- "svg", "image/svg+xml",
- "svgz", "image/svg+xml",
- "vsd", "application/x-visio",
"wbmp", "image/vnd.wap.wbmp",
"wml", "text/vnd.wap.wml",
"wmlc", "application/vnd.wap.wmlc",
@@ -787,9 +812,6 @@
"wspolicy", "application/wspolicy+xml",
"Z", "application/x-compress",
"z", "application/x-compress",
- "zip", "application/zip",
- "xls", "application/vnd.ms-excel",
- "doc", "application/vnd.ms-word",
- "ppt", "application/vnd.ms-powerpoint"
+ "zip", "application/zip"
};
}
15 years, 6 months
JBossWeb SVN: r1122 - trunk/test/webapps/cometd/examples/simplechat.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-06-22 10:13:03 -0400 (Mon, 22 Jun 2009)
New Revision: 1122
Modified:
trunk/test/webapps/cometd/examples/simplechat/ticker.html
Log:
- Sync: fix to the test (which was working for me).
Modified: trunk/test/webapps/cometd/examples/simplechat/ticker.html
===================================================================
--- trunk/test/webapps/cometd/examples/simplechat/ticker.html 2009-06-22 14:08:51 UTC (rev 1121)
+++ trunk/test/webapps/cometd/examples/simplechat/ticker.html 2009-06-22 14:13:03 UTC (rev 1122)
@@ -1,4 +1,20 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1" >
@@ -10,16 +26,6 @@
dojo.require("dojox.cometd");
-dojo.addOnUnload(function() {
- dojox.cometd.init("/cometd/cometd");
- dojox.cometd.startBatch();
- dojox.cometd.unsubscribe("/stock/GOOG", this,"");
- dojox.cometd.unsubscribe("/stock/YHOO", this,"");
- dojox.cometd.unsubscribe("/stock/SPRG", this,"");
- dojox.cometd.endBatch();
- });
-
-
dojo.addOnLoad(function() {
dojox.cometd.init("/cometd/cometd");
dojox.cometd.startBatch();
@@ -30,16 +36,27 @@
});
+dojo.addOnUnload(function() {
+ dojox.cometd.startBatch();
+ dojox.cometd.unsubscribe("/stock/GOOG", this,"");
+ dojox.cometd.unsubscribe("/stock/YHOO", this,"");
+ dojox.cometd.unsubscribe("/stock/SPRG", this,"");
+ dojox.cometd.endBatch();
+ });
+
+
+
+
function subscribe(box, symbol) {
- if (box.checked) {
- dojox.cometd.subscribe("/stock/"+symbol, onMsgEvent);
- var rowCurrent = dojo.byId("row."+symbol);
- rowCurrent.bgColor="white";
- } else {
- dojox.cometd.unsubscribe("/stock/"+symbol, onMsgEvent);
- var rowCurrent = dojo.byId("row."+symbol);
- rowCurrent.bgColor="gray";
- }
+ if (box.checked) {
+ dojox.cometd.subscribe("/stock/"+symbol, onMsgEvent);
+ var rowCurrent = dojo.byId("row."+symbol);
+ rowCurrent.bgColor="white";
+ } else {
+ dojox.cometd.unsubscribe("/stock/"+symbol, onMsgEvent);
+ var rowCurrent = dojo.byId("row."+symbol);
+ rowCurrent.bgColor="gray";
+ }
}
function removeChildrenFromNode(node)
@@ -51,10 +68,10 @@
var len = node.childNodes.length;
- while (node.hasChildNodes())
- {
- node.removeChild(node.firstChild);
- }
+ while (node.hasChildNodes())
+ {
+ node.removeChild(node.firstChild);
+ }
}
function onMsgEvent(event) {
@@ -78,16 +95,16 @@
var table = dojo.byId("stocktable");
var rows = table.getElementsByTagName("tr");
for(i = 0; i < rows.length; i++){
- if (rows[i].bgColor != "gray") {
- rows[i].bgColor = "white";
- }
+ if (rows[i].bgColor != "gray") {
+ rows[i].bgColor = "white";
+ }
}
//manipulate rows
var rowCurrent = dojo.byId("row."+symbol);
if (pricechange<=0) {
rowCurrent.bgColor = "red";
} else {
- rowCurrent.bgColor = "cyan";
+ rowCurrent.bgColor = "cyan";
}
}
15 years, 6 months
JBossWeb SVN: r1121 - trunk/java/org/apache/catalina/connector.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-06-22 10:08:51 -0400 (Mon, 22 Jun 2009)
New Revision: 1121
Modified:
trunk/java/org/apache/catalina/connector/Request.java
Log:
- Sync: support chunked POSTs.
Modified: trunk/java/org/apache/catalina/connector/Request.java
===================================================================
--- trunk/java/org/apache/catalina/connector/Request.java 2009-06-22 14:08:27 UTC (rev 1120)
+++ trunk/java/org/apache/catalina/connector/Request.java 2009-06-22 14:08:51 UTC (rev 1121)
@@ -102,6 +102,7 @@
import org.apache.catalina.util.StringParser;
import org.apache.coyote.ActionCode;
import org.apache.tomcat.util.buf.B2CConverter;
+import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.buf.StringCache;
import org.apache.tomcat.util.http.Cookies;
@@ -2674,7 +2675,8 @@
int maxPostSize = connector.getMaxPostSize();
if ((maxPostSize > 0) && (len > maxPostSize)) {
if (context.getLogger().isDebugEnabled()) {
- context.getLogger().debug("Post too large");
+ context.getLogger().debug(
+ sm.getString("coyoteRequest.postTooLarge"));
}
return;
}
@@ -2699,12 +2701,58 @@
return;
}
parameters.processParameters(formData, 0, len);
+ } else if ("chunked".equalsIgnoreCase(
+ coyoteRequest.getHeader("transfer-encoding"))) {
+ byte[] formData = null;
+ try {
+ formData = readChunkedPostBody();
+ } catch (IOException e) {
+ // Client disconnect
+ if (context.getLogger().isDebugEnabled()) {
+ context.getLogger().debug(
+ sm.getString("coyoteRequest.parseParameters"), e);
+ }
+ return;
+ }
+ parameters.processParameters(formData, 0, formData.length);
}
}
/**
+ * Read chunked post body.
+ */
+ protected byte[] readChunkedPostBody() throws IOException {
+ ByteChunk body = new ByteChunk();
+
+ byte[] buffer = new byte[CACHED_POST_LEN];
+
+ int len = 0;
+ while (len > -1) {
+ len = getStream().read(buffer, 0, CACHED_POST_LEN);
+ if (connector.getMaxPostSize() > 0 &&
+ (body.getLength() + len) > connector.getMaxPostSize()) {
+ // Too much data
+ throw new IllegalArgumentException(
+ sm.getString("coyoteRequest.postTooLarge"));
+ }
+ if (len > 0) {
+ body.append(buffer, 0, len);
+ }
+ }
+ if (body.getLength() < body.getBuffer().length) {
+ int length = body.getLength();
+ byte[] result = new byte[length];
+ System.arraycopy(body.getBuffer(), 0, result, 0, length);
+ return result;
+ } else {
+ return body.getBuffer();
+ }
+ }
+
+
+ /**
* Parse multipart.
*/
protected void parseMultipart() {
15 years, 6 months
JBossWeb SVN: r1120 - in trunk/java/org: apache/catalina/core and 4 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-06-22 10:08:27 -0400 (Mon, 22 Jun 2009)
New Revision: 1120
Modified:
trunk/java/org/apache/catalina/Globals.java
trunk/java/org/apache/catalina/core/ContextJarRepository.java
trunk/java/org/apache/catalina/core/StandardContext.java
trunk/java/org/apache/catalina/loader/LegacyWebappLoader.java
trunk/java/org/apache/catalina/loader/WebappLoader.java
trunk/java/org/apache/catalina/servlets/CGIServlet.java
trunk/java/org/apache/catalina/session/FileStore.java
trunk/java/org/apache/catalina/session/StandardManager.java
trunk/java/org/jboss/web/php/ScriptEnvironment.java
Log:
- Sync: use the regular Servlet API constant.
Modified: trunk/java/org/apache/catalina/Globals.java
===================================================================
--- trunk/java/org/apache/catalina/Globals.java 2009-06-22 14:07:44 UTC (rev 1119)
+++ trunk/java/org/apache/catalina/Globals.java 2009-06-22 14:08:27 UTC (rev 1120)
@@ -342,15 +342,6 @@
/**
- * The servlet context attribute under which we store a temporary
- * working directory (as an object of type File) for use by servlets
- * within this web application.
- */
- public static final String WORK_DIR_ATTR =
- "javax.servlet.context.tempdir";
-
-
- /**
* The master flag which controls strict servlet specification
* compliance.
*/
Modified: trunk/java/org/apache/catalina/core/ContextJarRepository.java
===================================================================
--- trunk/java/org/apache/catalina/core/ContextJarRepository.java 2009-06-22 14:07:44 UTC (rev 1119)
+++ trunk/java/org/apache/catalina/core/ContextJarRepository.java 2009-06-22 14:08:27 UTC (rev 1120)
@@ -66,7 +66,6 @@
import org.apache.catalina.Contained;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
-import org.apache.catalina.Globals;
import org.apache.catalina.JarRepository;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
@@ -301,7 +300,7 @@
return;
// Access work directory
- File workDir = (File) servletContext.getAttribute(Globals.WORK_DIR_ATTR);
+ File workDir = (File) servletContext.getAttribute(ServletContext.TEMPDIR);
if (workDir == null) {
// FIXME: this is actually an error
log.info("No work dir for " + servletContext);
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2009-06-22 14:07:44 UTC (rev 1119)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2009-06-22 14:08:27 UTC (rev 1120)
@@ -4922,10 +4922,10 @@
dir.mkdirs();
// Set the appropriate servlet context attribute
- getServletContext().setAttribute(Globals.WORK_DIR_ATTR, dir);
+ getServletContext().setAttribute(ServletContext.TEMPDIR, dir);
if (getServletContext() instanceof ApplicationContext)
((ApplicationContext) getServletContext()).setAttributeReadOnly
- (Globals.WORK_DIR_ATTR);
+ (ServletContext.TEMPDIR);
}
Modified: trunk/java/org/apache/catalina/loader/LegacyWebappLoader.java
===================================================================
--- trunk/java/org/apache/catalina/loader/LegacyWebappLoader.java 2009-06-22 14:07:44 UTC (rev 1119)
+++ trunk/java/org/apache/catalina/loader/LegacyWebappLoader.java 2009-06-22 14:08:27 UTC (rev 1120)
@@ -801,7 +801,7 @@
// Assigning permissions for the work directory
File workDir =
- (File) servletContext.getAttribute(Globals.WORK_DIR_ATTR);
+ (File) servletContext.getAttribute(ServletContext.TEMPDIR);
if (workDir != null) {
try {
String workDirPath = workDir.getCanonicalPath();
@@ -892,7 +892,7 @@
loaderRepositories=new ArrayList();
// Loading the work directory
File workDir =
- (File) servletContext.getAttribute(Globals.WORK_DIR_ATTR);
+ (File) servletContext.getAttribute(ServletContext.TEMPDIR);
if (workDir == null) {
log.info("No work dir for " + servletContext);
}
Modified: trunk/java/org/apache/catalina/loader/WebappLoader.java
===================================================================
--- trunk/java/org/apache/catalina/loader/WebappLoader.java 2009-06-22 14:07:44 UTC (rev 1119)
+++ trunk/java/org/apache/catalina/loader/WebappLoader.java 2009-06-22 14:08:27 UTC (rev 1120)
@@ -574,7 +574,7 @@
throw new IllegalStateException("No servlet context available");
File workDir =
- (File) servletContext.getAttribute(Globals.WORK_DIR_ATTR);
+ (File) servletContext.getAttribute(ServletContext.TEMPDIR);
if (workDir == null) {
log.info("No work dir for " + servletContext);
}
@@ -734,7 +734,7 @@
// Assigning permissions for the work directory
File workDir =
- (File) servletContext.getAttribute(Globals.WORK_DIR_ATTR);
+ (File) servletContext.getAttribute(ServletContext.TEMPDIR);
if (workDir != null) {
try {
String workDirPath = workDir.getCanonicalPath();
Modified: trunk/java/org/apache/catalina/servlets/CGIServlet.java
===================================================================
--- trunk/java/org/apache/catalina/servlets/CGIServlet.java 2009-06-22 14:07:44 UTC (rev 1119)
+++ trunk/java/org/apache/catalina/servlets/CGIServlet.java 2009-06-22 14:08:27 UTC (rev 1120)
@@ -715,7 +715,7 @@
protected void setupFromContext(ServletContext context) {
this.context = context;
this.webAppRootDir = context.getRealPath("/");
- this.tmpDir = (File) context.getAttribute(Globals.WORK_DIR_ATTR);
+ this.tmpDir = (File) context.getAttribute(ServletContext.TEMPDIR);
}
Modified: trunk/java/org/apache/catalina/session/FileStore.java
===================================================================
--- trunk/java/org/apache/catalina/session/FileStore.java 2009-06-22 14:07:44 UTC (rev 1119)
+++ trunk/java/org/apache/catalina/session/FileStore.java 2009-06-22 14:08:27 UTC (rev 1120)
@@ -401,7 +401,7 @@
ServletContext servletContext =
((Context) container).getServletContext();
File work = (File)
- servletContext.getAttribute(Globals.WORK_DIR_ATTR);
+ servletContext.getAttribute(ServletContext.TEMPDIR);
file = new File(work, this.directory);
} else {
throw new IllegalArgumentException
Modified: trunk/java/org/apache/catalina/session/StandardManager.java
===================================================================
--- trunk/java/org/apache/catalina/session/StandardManager.java 2009-06-22 14:07:44 UTC (rev 1119)
+++ trunk/java/org/apache/catalina/session/StandardManager.java 2009-06-22 14:08:27 UTC (rev 1120)
@@ -34,19 +34,19 @@
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Iterator;
+
import javax.servlet.ServletContext;
+
import org.apache.catalina.Container;
import org.apache.catalina.Context;
-import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Loader;
import org.apache.catalina.Session;
+import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.CustomObjectInputStream;
import org.apache.catalina.util.LifecycleSupport;
-
-import org.apache.catalina.security.SecurityUtil;
/**
* Standard implementation of the <b>Manager</b> interface that provides
* simple session persistence across restarts of this component (such as
@@ -738,7 +738,7 @@
ServletContext servletContext =
((Context) container).getServletContext();
File tempdir = (File)
- servletContext.getAttribute(Globals.WORK_DIR_ATTR);
+ servletContext.getAttribute(ServletContext.TEMPDIR);
if (tempdir != null)
file = new File(tempdir, pathname);
}
Modified: trunk/java/org/jboss/web/php/ScriptEnvironment.java
===================================================================
--- trunk/java/org/jboss/web/php/ScriptEnvironment.java 2009-06-22 14:07:44 UTC (rev 1119)
+++ trunk/java/org/jboss/web/php/ScriptEnvironment.java 2009-06-22 14:08:27 UTC (rev 1120)
@@ -39,7 +39,6 @@
import org.apache.catalina.Globals;
import org.apache.catalina.util.IOTools;
import org.jboss.logging.Logger;
-import org.jboss.logging.Logger;
/**
@@ -570,7 +569,7 @@
this.scriptPathPrefix = scriptPathPrefix;
this.context = context;
this.webAppRootDir = context.getRealPath("/");
- this.tempDir = (File)context.getAttribute(Globals.WORK_DIR_ATTR);
+ this.tempDir = (File)context.getAttribute(ServletContext.TEMPDIR);
if (req.getAttribute(Globals.INCLUDE_CONTEXT_PATH_ATTR) != null) {
15 years, 6 months
JBossWeb SVN: r1119 - trunk/conf.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2009-06-22 10:07:44 -0400 (Mon, 22 Jun 2009)
New Revision: 1119
Modified:
trunk/conf/web.xml
Log:
- Sync: MIME type cleanup.
Modified: trunk/conf/web.xml
===================================================================
--- trunk/conf/web.xml 2009-06-18 14:37:09 UTC (rev 1118)
+++ trunk/conf/web.xml 2009-06-22 14:07:44 UTC (rev 1119)
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
@@ -49,14 +65,14 @@
<!-- readmeFile File name to display with the directory -->
<!-- contents. [null] -->
<!-- -->
- <!-- useAcceptRanges Should the Accept-Ranges header be included -->
- <!-- in responses where appropriate? [true] -->
- <!-- -->
<!-- sendfileSize If the connector used supports sendfile, this -->
<!-- represents the minimal file size in KB for -->
<!-- which sendfile will be used. Use a negative -->
<!-- value to always disable sendfile. [48] -->
<!-- -->
+ <!-- useAcceptRanges Should the Accept-Ranges header be included -->
+ <!-- in responses where appropriate? [true] -->
+ <!-- -->
<!-- For directory listing customization. Checks localXsltFile, then -->
<!-- globalXsltFile, then defaults to original behavior. -->
<!-- -->
@@ -86,34 +102,6 @@
</servlet>
- <!-- The "invoker" servlet, which executes anonymous servlet classes -->
- <!-- that have not been defined in a web.xml file. Traditionally, this -->
- <!-- servlet is mapped to the URL pattern "/servlet/*", but you can map -->
- <!-- it to other patterns as well. The extra path info portion of such a -->
- <!-- request must be the fully qualified class name of a Java class that -->
- <!-- implements Servlet (or extends HttpServlet), or the servlet name -->
- <!-- of an existing servlet definition. This servlet supports the -->
- <!-- following initialization parameters (default values are in square -->
- <!-- brackets): -->
- <!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. [0] -->
-
-<!--
- <servlet>
- <servlet-name>invoker</servlet-name>
- <servlet-class>
- org.apache.catalina.servlets.InvokerServlet
- </servlet-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
--->
-
-
<!-- The JSP page compiler and execution servlet, which is the mechanism -->
<!-- used by Tomcat to support JSP pages. Traditionally, this servlet -->
<!-- is mapped to the URL pattern "*.jsp". This servlet supports the -->
@@ -123,41 +111,51 @@
<!-- checkInterval If development is false and checkInterval is -->
<!-- greater than zero, background compilations are -->
<!-- enabled. checkInterval is the time in seconds -->
- <!-- between checks to see if a JSP page needs to -->
- <!-- be recompiled. [0] -->
+ <!-- between checks to see if a JSP page (and its -->
+ <!-- dependent files) needs to be recompiled. [0] -->
<!-- -->
- <!-- modificationTestInterval -->
- <!-- Causes a JSP (and its dependent files) to not -->
- <!-- be checked for modification during the -->
- <!-- specified time interval (in seconds) from the -->
- <!-- last time the JSP was checked for -->
- <!-- modification. A value of 0 will cause the JSP -->
- <!-- to be checked on every access. -->
- <!-- Used in development mode only. [4] -->
- <!-- -->
- <!-- compiler Which compiler Ant should use to compile JSP -->
- <!-- pages. See the jasper documentation for more -->
- <!-- information. -->
- <!-- -->
<!-- classdebuginfo Should the class file be compiled with -->
<!-- debugging information? [true] -->
<!-- -->
- <!-- classpath What class path should I use while compiling -->
- <!-- generated servlets? [Created dynamically -->
- <!-- based on the current web application] -->
+ <!-- compilerSourceVM Compiler source VM. [1.5] -->
<!-- -->
+ <!-- compilerTargetVM Compiler target VM. [1.5] -->
+ <!-- -->
<!-- development Is Jasper used in development mode? If true, -->
<!-- the frequency at which JSPs are checked for -->
<!-- modification may be specified via the -->
<!-- modificationTestInterval parameter. [true] -->
<!-- -->
+ <!-- displaySourceFragment -->
+ <!-- Should a source fragment be included in -->
+ <!-- exception messages? [true] -->
+ <!-- -->
+ <!-- dumpSmap Should the SMAP info for JSR45 debugging be -->
+ <!-- dumped to a file? [false] -->
+ <!-- False if suppressSmap is true -->
+ <!-- -->
<!-- enablePooling Determines whether tag handler pooling is -->
- <!-- enabled [true] -->
+ <!-- enabled. This is a compilation option. It will -->
+ <!-- not alter the behaviour of JSPs that have -->
+ <!-- already been compiled. [true] -->
<!-- -->
+ <!-- engineOptionsClass Allows specifying the Options class used to -->
+ <!-- configure Jasper. If not present, the default -->
+ <!-- EmbeddedServletOptions will be used. -->
+ <!-- -->
+ <!-- errorOnUseBeanInvalidClassAttribute -->
+ <!-- Should Jasper issue an error when the value of -->
+ <!-- the class attribute in an useBean action is -->
+ <!-- not a valid bean class? [true] -->
+ <!-- -->
<!-- fork Tell Ant to fork compiles of JSP pages so that -->
<!-- a separate JVM is used for JSP page compiles -->
<!-- from the one Tomcat is running in. [true] -->
<!-- -->
+ <!-- genStrAsCharArray Should text strings be generated as char -->
+ <!-- arrays, to improve performance in some cases? -->
+ <!-- [false] -->
+ <!-- -->
<!-- ieClassId The class-id value to be sent to Internet -->
<!-- Explorer when using <jsp:plugin> tags. -->
<!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] -->
@@ -172,42 +170,28 @@
<!-- print statement per input line, to ease -->
<!-- debugging? [true] -->
<!-- -->
- <!-- trimSpaces Should white spaces in template text between -->
- <!-- actions or directives be trimmed? [false] -->
+ <!-- modificationTestInterval -->
+ <!-- Causes a JSP (and its dependent files) to not -->
+ <!-- be checked for modification during the -->
+ <!-- specified time interval (in seconds) from the -->
+ <!-- last time the JSP was checked for -->
+ <!-- modification. A value of 0 will cause the JSP -->
+ <!-- to be checked on every access. -->
+ <!-- Used in development mode only. [4] -->
<!-- -->
- <!-- suppressSmap Should the generation of SMAP info for JSR45 -->
- <!-- debugging be suppressed? [false] -->
- <!-- -->
- <!-- dumpSmap Should the SMAP info for JSR45 debugging be -->
- <!-- dumped to a file? [false] -->
- <!-- False if suppressSmap is true -->
- <!-- -->
- <!-- genStrAsCharArray Should text strings be generated as char -->
- <!-- arrays, to improve performance in some cases? -->
- <!-- [false] -->
- <!-- -->
- <!-- errorOnUseBeanInvalidClassAttribute -->
- <!-- Should Jasper issue an error when the value of -->
- <!-- the class attribute in an useBean action is -->
- <!-- not a valid bean class? [true] -->
- <!-- -->
<!-- scratchdir What scratch directory should we use when -->
<!-- compiling JSP pages? [default work directory -->
<!-- for the current web application] -->
<!-- -->
+ <!-- suppressSmap Should the generation of SMAP info for JSR45 -->
+ <!-- debugging be suppressed? [false] -->
+ <!-- -->
+ <!-- trimSpaces Should white spaces in template text between -->
+ <!-- actions or directives be trimmed? [false] -->
+ <!-- -->
<!-- xpoweredBy Determines whether X-Powered-By response -->
<!-- header is added by generated servlet [false] -->
<!-- -->
- <!-- compilerTargetVM Compiler target VM -->
- <!-- default is System.properties -->
- <!-- java.specification.version > 1.4 -->
- <!-- [1.5] else [1.4] -->
- <!-- -->
- <!-- compilerSourceVM Compiler source VM -->
- <!-- default is System.properties -->
- <!-- java.specification.version > 1.4 -->
- <!-- [1.5] else [1.4] -->
- <!-- -->
<!-- If you wish to use Jikes to compile JSP pages: -->
<!-- Please see the "Using Jikes" section of the Jasper-HowTo -->
<!-- page in the Tomcat documentation. -->
@@ -340,14 +324,6 @@
<url-pattern>/</url-pattern>
</servlet-mapping>
- <!-- The mapping for the invoker servlet -->
-<!--
- <servlet-mapping>
- <servlet-name>invoker</servlet-name>
- <url-pattern>/servlet/*</url-pattern>
- </servlet-mapping>
--->
-
<!-- The mapping for the JSP servlet -->
<servlet-mapping>
<servlet-name>jsp</servlet-name>
@@ -408,11 +384,6 @@
<!-- Should "virtual" paths be interpreted as -->
<!-- relative to the context root, instead of -->
<!-- the server root? (0=false, 1=true) [0] -->
- <!-- -->
- <!-- -->
- <!-- IMPORTANT: To use the SSI filter, you also need to rename the -->
- <!-- $CATALINA_HOME/server/lib/servlets-ssi.renametojar file -->
- <!-- to $CATALINA_HOME/server/lib/servlets-ssi.jar -->
<!--
<filter>
@@ -924,9 +895,13 @@
</mime-mapping>
<mime-mapping>
<extension>ppt</extension>
- <mime-type>application/powerpoint</mime-type>
+ <mime-type>application/vnd.ms-powerpoint</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>pps</extension>
+ <mime-type>application/vnd.ms-powerpoint</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>ps</extension>
<mime-type>application/postscript</mime-type>
</mime-mapping>
@@ -1013,6 +988,14 @@
<mime-type>application/x-sv4crc</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>svg</extension>
+ <mime-type>image/svg+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>svgz</extension>
+ <mime-type>image/svg+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>swf</extension>
<mime-type>application/x-shockwave-flash</mime-type>
</mime-mapping>
@@ -1085,6 +1068,10 @@
<mime-type>application/xhtml+xml</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>xls</extension>
+ <mime-type>application/vnd.ms-excel</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>xml</extension>
<mime-type>application/xml</mime-type>
</mime-mapping>
@@ -1109,22 +1096,14 @@
<mime-type>image/x-xwindowdump</mime-type>
</mime-mapping>
<mime-mapping>
- <extension>wav</extension>
- <mime-type>audio/x-wav</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>svg</extension>
- <mime-type>image/svg+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>svgz</extension>
- <mime-type>image/svg+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
<extension>vsd</extension>
<mime-type>application/x-visio</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>wav</extension>
+ <mime-type>audio/x-wav</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<!-- Wireless Bitmap -->
<extension>wbmp</extension>
<mime-type>image/vnd.wap.wbmp</mime-type>
@@ -1158,6 +1137,10 @@
<mime-type>x-world/x-vrml</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>wspolicy</extension>
+ <mime-type>application/wspolicy+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>Z</extension>
<mime-type>application/x-compress</mime-type>
</mime-mapping>
@@ -1169,18 +1152,6 @@
<extension>zip</extension>
<mime-type>application/zip</mime-type>
</mime-mapping>
- <mime-mapping>
- <extension>xls</extension>
- <mime-type>application/vnd.ms-excel</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>doc</extension>
- <mime-type>application/vnd.ms-word</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ppt</extension>
- <mime-type>application/vnd.ms-powerpoint</mime-type>
- </mime-mapping>
<!-- ==================== Default Welcome File List ===================== -->
<!-- When a request URI refers to a directory, the default servlet looks -->
15 years, 6 months