luehe 2004/04/14 18:44:09
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java StandardDefaultContext.java
catalina/src/share/org/apache/catalina/valves
RequestFilterValve.java
catalina/src/share/org/apache/catalina/mbeans
DefaultContextMBean.java GroupMBean.java
MemoryUserDatabaseMBean.java
NamingResourcesMBean.java StandardContextMBean.java
UserMBean.java
catalina/src/share/org/apache/catalina/loader
StandardClassLoader.java WebappClassLoader.java
Log:
"Hide" Throwable.initCause() inside Jdk14Compat, in order to preserver BC with J2SE
1.3
Revision Changes Path
1.127 +21 -11
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- StandardContext.java 13 Apr 2004 23:59:50 -0000 1.126
+++ StandardContext.java 15 Apr 2004 01:44:08 -0000 1.127
@@ -101,6 +101,7 @@
import org.apache.naming.resources.FileDirContext;
import org.apache.naming.resources.ProxyDirContext;
import org.apache.naming.resources.WARDirContext;
+import org.apache.tomcat.util.compat.JdkCompat;
/**
* Standard implementation of the <b>Context</b> interface. Each
@@ -135,6 +136,22 @@
}
+ // ----------------------------------------------------- Class Variables
+
+
+ /**
+ * The descriptive information string for this implementation.
+ */
+ private static final String info =
+ "org.apache.catalina.core.StandardContext/1.0";
+
+
+ /**
+ * JDK compatibility support
+ */
+ private static final JdkCompat jdkCompat = JdkCompat.getJdkCompat();
+
+
// ----------------------------------------------------- Instance Variables
@@ -305,13 +322,6 @@
/**
- * The descriptive information string for this implementation.
- */
- private static final String info =
- "org.apache.catalina.core.StandardContext/1.0";
-
-
- /**
* The set of classnames of InstanceListeners that will be added
* to each newly created Wrapper by <code>createWrapper()</code>.
*/
@@ -5066,7 +5076,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for environment " + envs[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -5091,7 +5101,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for resource " + resources[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -5116,7 +5126,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for resource " + links[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
1.14 +22 -12
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StandardDefaultContext.java 13 Apr 2004 23:59:50 -0000 1.13
+++ StandardDefaultContext.java 15 Apr 2004 01:44:09 -0000 1.14
@@ -53,6 +53,7 @@
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
import org.apache.naming.ContextAccessController;
+import org.apache.tomcat.util.compat.JdkCompat;
/**
* Used to store the default configuration a Host will use
@@ -81,6 +82,22 @@
}
+ // ----------------------------------------------------- Class Variables
+
+
+ /**
+ * The string manager for this package.
+ */
+ protected static StringManager sm =
+ StringManager.getManager(Constants.Package);
+
+
+ /**
+ * JDK compatibility support
+ */
+ private static final JdkCompat jdkCompat = JdkCompat.getJdkCompat();
+
+
// ----------------------------------------------------- Instance Variables
@@ -264,13 +281,6 @@
/**
- * The string manager for this package.
- */
- protected static StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
- /**
* The property change support for this component.
*/
protected PropertyChangeSupport support = new PropertyChangeSupport(this);
@@ -1534,7 +1544,7 @@
} catch(Exception e) {
IllegalArgumentException iae = new IllegalArgumentException
("DefaultContext custom Loader install failed");
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -1698,7 +1708,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for environment " + envs[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -1724,7 +1734,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for resource " + resources[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -1749,7 +1759,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for resource " + links[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
1.5 +26 -17
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestFilterValve.java
Index: RequestFilterValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestFilterValve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestFilterValve.java 14 Apr 2004 17:45:18 -0000 1.4
+++ RequestFilterValve.java 15 Apr 2004 01:44:09 -0000 1.5
@@ -31,7 +31,7 @@
import org.apache.catalina.util.StringManager;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
-
+import org.apache.tomcat.util.compat.JdkCompat;
/**
* Implementation of a Valve that performs filtering based on comparing the
@@ -71,6 +71,29 @@
extends ValveBase {
+ // ----------------------------------------------------- Class Variables
+
+
+ /**
+ * JDK compatibility support
+ */
+ private static final JdkCompat jdkCompat = JdkCompat.getJdkCompat();
+
+
+ /**
+ * The descriptive information related to this implementation.
+ */
+ private static final String info =
+ "org.apache.catalina.valves.RequestFilterValve/1.0";
+
+
+ /**
+ * The StringManager for this package.
+ */
+ protected static StringManager sm =
+ StringManager.getManager(Constants.Package);
+
+
// ----------------------------------------------------- Instance Variables
@@ -98,20 +121,6 @@
protected String deny = null;
- /**
- * The descriptive information related to this implementation.
- */
- private static final String info =
- "org.apache.catalina.valves.RequestFilterValve/1.0";
-
-
- /**
- * The StringManager for this package.
- */
- protected static StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
// ------------------------------------------------------------- Properties
@@ -230,7 +239,7 @@
} catch (RESyntaxException e) {
IllegalArgumentException iae = new IllegalArgumentException
(sm.getString("requestFilterValve.syntax", pattern));
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
list = list.substring(comma + 1);
1.5 +14 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java
Index: DefaultContextMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultContextMBean.java 14 Apr 2004 17:29:16 -0000 1.4
+++ DefaultContextMBean.java 15 Apr 2004 01:44:09 -0000 1.5
@@ -32,6 +32,7 @@
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.compat.JdkCompat;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
@@ -64,6 +65,15 @@
}
+ // ----------------------------------------------------- Class Variables
+
+
+ /**
+ * JDK compatibility support
+ */
+ private static final JdkCompat jdkCompat = JdkCompat.getJdkCompat();
+
+
// ----------------------------------------------------- Instance Variables
@@ -107,7 +117,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for environment " + envs[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -132,7 +142,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for resource " + resources[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -157,7 +167,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for resource " + links[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
1.5 +13 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/GroupMBean.java
Index: GroupMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/GroupMBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GroupMBean.java 14 Apr 2004 17:29:16 -0000 1.4
+++ GroupMBean.java 15 Apr 2004 01:44:09 -0000 1.5
@@ -32,7 +32,7 @@
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
-
+import org.apache.tomcat.util.compat.JdkCompat;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
@@ -65,6 +65,15 @@
}
+ // ----------------------------------------------------- Class Variables
+
+
+ /**
+ * JDK compatibility support
+ */
+ private static final JdkCompat jdkCompat = JdkCompat.getJdkCompat();
+
+
// ----------------------------------------------------- Instance Variables
@@ -108,7 +117,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for role " + role);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -135,7 +144,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for user " + user);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
1.4 +20 -11
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
Index: MemoryUserDatabaseMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MemoryUserDatabaseMBean.java 14 Apr 2004 17:29:16 -0000 1.3
+++ MemoryUserDatabaseMBean.java 15 Apr 2004 01:44:09 -0000 1.4
@@ -31,7 +31,7 @@
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
-
+import org.apache.tomcat.util.compat.JdkCompat;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
@@ -64,6 +64,15 @@
}
+ // ----------------------------------------------------- Class Variables
+
+
+ /**
+ * JDK compatibility support
+ */
+ private static final JdkCompat jdkCompat = JdkCompat.getJdkCompat();
+
+
// ----------------------------------------------------- Instance Variables
@@ -179,7 +188,7 @@
} catch (Exception e) {
IllegalArgumentException iae = new IllegalArgumentException
("Exception creating group " + group + " MBean");
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
return (findGroup(groupname));
@@ -202,7 +211,7 @@
} catch (Exception e) {
IllegalArgumentException iae = new IllegalArgumentException
("Exception creating role " + role + " MBean");
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
return (findRole(rolename));
@@ -227,7 +236,7 @@
} catch (Exception e) {
IllegalArgumentException iae = new IllegalArgumentException
("Exception creating user " + user + " MBean");
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
return (findUser(username));
@@ -255,7 +264,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for group " + group);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
@@ -282,7 +291,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for role " + role);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
@@ -309,7 +318,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for user " + user);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
@@ -334,7 +343,7 @@
} catch (Exception e) {
IllegalArgumentException iae = new IllegalArgumentException
("Exception destroying group " + group + " MBean");
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
@@ -359,7 +368,7 @@
} catch (Exception e) {
IllegalArgumentException iae = new IllegalArgumentException
("Exception destroying role " + role + " MBean");
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
@@ -384,7 +393,7 @@
} catch (Exception e) {
IllegalArgumentException iae = new IllegalArgumentException
("Exception destroying user " + user + " MBean");
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
1.6 +14 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
Index: NamingResourcesMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NamingResourcesMBean.java 14 Apr 2004 17:29:16 -0000 1.5
+++ NamingResourcesMBean.java 15 Apr 2004 01:44:09 -0000 1.6
@@ -31,7 +31,7 @@
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
-
+import org.apache.tomcat.util.compat.JdkCompat;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
@@ -64,6 +64,15 @@
}
+ // ----------------------------------------------------- Class Variables
+
+
+ /**
+ * JDK compatibility support
+ */
+ private static final JdkCompat jdkCompat = JdkCompat.getJdkCompat();
+
+
// ----------------------------------------------------- Instance Variables
/**
@@ -97,7 +106,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for environment " + envs[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -123,7 +132,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for resource " + resources[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -149,7 +158,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for resource " + resourceLinks[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
1.7 +14 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java
Index: StandardContextMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StandardContextMBean.java 14 Apr 2004 17:29:16 -0000 1.6
+++ StandardContextMBean.java 15 Apr 2004 01:44:09 -0000 1.7
@@ -32,6 +32,7 @@
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.compat.JdkCompat;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
@@ -64,6 +65,15 @@
}
+ // ----------------------------------------------------- Class Variables
+
+
+ /**
+ * JDK compatibility support
+ */
+ private static final JdkCompat jdkCompat = JdkCompat.getJdkCompat();
+
+
// ----------------------------------------------------- Instance Variables
@@ -116,7 +126,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for environment " + envs[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -141,7 +151,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for resource " + resources[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -166,7 +176,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for resource " + links[i]);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
1.5 +13 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/UserMBean.java
Index: UserMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/UserMBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UserMBean.java 14 Apr 2004 17:29:16 -0000 1.4
+++ UserMBean.java 15 Apr 2004 01:44:09 -0000 1.5
@@ -32,7 +32,7 @@
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
-
+import org.apache.tomcat.util.compat.JdkCompat;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
@@ -65,6 +65,15 @@
}
+ // ----------------------------------------------------- Class Variables
+
+
+ /**
+ * JDK compatibility support
+ */
+ private static final JdkCompat jdkCompat = JdkCompat.getJdkCompat();
+
+
// ----------------------------------------------------- Instance Variables
@@ -108,7 +117,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for group " + group);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
@@ -135,7 +144,7 @@
} catch (MalformedObjectNameException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Cannot create object name for role " + role);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
}
1.10 +13 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
Index: StandardClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StandardClassLoader.java 14 Apr 2004 17:35:41 -0000 1.9
+++ StandardClassLoader.java 15 Apr 2004 01:44:09 -0000 1.10
@@ -42,7 +42,7 @@
import java.util.jar.Manifest;
import org.apache.naming.JndiPermission;
-
+import org.apache.tomcat.util.compat.JdkCompat;
/**
* Subclass implementation of <b>java.net.URLClassLoader</b> that knows how
@@ -198,6 +198,15 @@
}
+ // ----------------------------------------------------- Class Variables
+
+
+ /**
+ * JDK compatibility support
+ */
+ private static final JdkCompat jdkCompat = JdkCompat.getJdkCompat();
+
+
// ----------------------------------------------------- Instance Variables
@@ -372,7 +381,7 @@
} catch (MalformedURLException e) {
IllegalArgumentException iae = new IllegalArgumentException
("Invalid repository: " + repository);
- iae.initCause(e);
+ jdkCompat.chainException(iae, e);
throw iae;
}
@@ -947,7 +956,7 @@
} catch (Throwable t) {
IllegalArgumentException iae = new IllegalArgumentException
("addRepositoryInternal");
- iae.initCause(t);
+ jdkCompat.chainException(iae, t);
throw iae;
} finally {
if (jarFile != null) {
1.33 +7 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Index: WebappClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- WebappClassLoader.java 14 Apr 2004 17:35:41 -0000 1.32
+++ WebappClassLoader.java 15 Apr 2004 01:44:09 -0000 1.33
@@ -136,10 +136,10 @@
"javax.servlet.Servlet" // Servlet API
};
- /**
- * Jdk Compatibility Support.
- */
- private static JdkCompat jdkCompat = JdkCompat.getJdkCompat();
+ /**
+ * Jdk Compatibility Support.
+ */
+ private static JdkCompat jdkCompat = JdkCompat.getJdkCompat();
/**
* Set of package names which are not allowed to be loaded from a webapp
@@ -546,8 +546,8 @@
repositoryURLs = null;
} catch (MalformedURLException e) {
IllegalArgumentException iae = new IllegalArgumentException
- ("Invalid repository: " + repository);
- iae.initCause(e);
+ ("Invalid repository: " + repository);
+ jdkCompat.chainException(iae, e);
throw iae;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
