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