You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2004/06/22 00:16:50 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup ContextConfig.java LocalStrings.properties
markt 2004/06/21 15:16:50
Modified: catalina/src/share/org/apache/catalina/startup
ContextConfig.java LocalStrings.properties
Log:
Fix 18650. Provide a better message in the log if the temp directory is missing
Remove unused imports identified by Eclipse
Revision Changes Path
1.69 +14 -19 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ContextConfig.java 3 Mar 2004 21:49:55 -0000 1.68
+++ ContextConfig.java 21 Jun 2004 22:16:50 -0000 1.69
@@ -70,19 +70,14 @@
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.net.JarURLConnection;
-import java.net.MalformedURLException;
import java.net.URL;
-import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.Set;
-import java.util.Stack;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import javax.naming.NamingException;
@@ -95,9 +90,7 @@
import org.apache.catalina.Connector;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
-import org.apache.catalina.DefaultContext;
import org.apache.catalina.Engine;
-import org.apache.catalina.Globals;
import org.apache.catalina.Host;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
@@ -109,20 +102,12 @@
import org.apache.catalina.Wrapper;
import org.apache.catalina.core.ContainerBase;
import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.deploy.ApplicationParameter;
-import org.apache.catalina.deploy.ContextEjb;
-import org.apache.catalina.deploy.ContextEnvironment;
-import org.apache.catalina.deploy.ContextLocalEjb;
-import org.apache.catalina.deploy.ContextResource;
-import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.ErrorPage;
import org.apache.catalina.deploy.FilterDef;
import org.apache.catalina.deploy.FilterMap;
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.SecurityConstraint;
-import org.apache.catalina.loader.Extension;
import org.apache.catalina.util.StringManager;
-import org.apache.catalina.valves.ValveBase;
import org.apache.commons.digester.Digester;
import org.xml.sax.InputSource;
import org.xml.sax.SAXParseException;
@@ -926,6 +911,16 @@
}
// FIXME - Closing the JAR file messes up the class loader???
// jarFile.close();
+ } catch (IOException ioe) {
+ File tmp = new File(System.getProperty("java.io.tmpdir"));
+ if (!tmp.canWrite()) {
+ throw new ServletException
+ (sm.getString("contextConfig.noTempDir"), ioe);
+ } else {
+ throw new ServletException
+ (sm.getString("contextConfig.tldJarIOException",
+ resourcePath), ioe);
+ }
} catch (Exception e) {
if (name == null) {
throw new ServletException
1.17 +2 -0 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- LocalStrings.properties 10 Jan 2003 15:52:18 -0000 1.16
+++ LocalStrings.properties 21 Jun 2004 22:16:50 -0000 1.17
@@ -17,6 +17,7 @@
contextConfig.defaultParse=Parse error in default web.xml
contextConfig.defaultPosition=Occurred at line {0} column {1}
contextConfig.missingRealm=No Realm has been configured to authenticate against
+contextConfig.noTempDir=Required temporary directory $CATALINA_BASE/temp is missing
contextConfig.role.auth=WARNING: Security role name {0} used in an <auth-constraint> without being defined in a <security-role>
contextConfig.role.link=WARNING: Security role name {0} used in a <role-link> without being defined in a <security-role>
contextConfig.role.runas=WARNING: Security role name {0} used in a <run-as> without being defined in a <security-role>
@@ -24,6 +25,7 @@
contextConfig.stop=ContextConfig: Processing STOP
contextConfig.tldEntryException=Exception processing TLD {0} in JAR at resource path {1}
contextConfig.tldFileException=Exception processing TLD at resource path {0}
+contextConfig.tldJarIOException=IOException processing JAR at resource path {0}
contextConfig.tldJarException=Exception processing JAR at resource path {0}
contextConfig.tldResourcePath=Invalid TLD resource path {0}
contextConfig.unavailable=Marking this application unavailable due to previous error(s)
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org