Author: markt
Date: Tue Aug 2 12:31:19 2016
New Revision: 1754907
URL: http://svn.apache.org/viewvc?rev=1754907&view=rev
Log:
Move ExceptionUtils so it is visible to the runtime classes when running under
a security manager.
Added:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ExceptionUtils.java
- copied, changed from r1754906,
tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/ExceptionUtils.java
Removed:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/ExceptionUtils.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Localizer.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
Tue Aug 2 12:31:19 2016
@@ -32,7 +32,7 @@ import javax.servlet.jsp.tagext.TagLibra
import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.util.ExceptionUtils;
+import org.apache.jasper.runtime.ExceptionUtils;
import org.apache.jasper.xmlparser.ParserUtils;
import org.apache.jasper.xmlparser.TreeNode;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java Tue Aug
2 12:31:19 2016
@@ -27,7 +27,7 @@ import java.util.jar.JarFile;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.util.ExceptionUtils;
+import org.apache.jasper.runtime.ExceptionUtils;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
Tue Aug 2 12:31:19 2016
@@ -37,10 +37,10 @@ import javax.servlet.jsp.JspFactory;
import org.apache.jasper.Constants;
import org.apache.jasper.JspCompilationContext;
import org.apache.jasper.Options;
+import org.apache.jasper.runtime.ExceptionUtils;
import org.apache.jasper.runtime.JspFactoryImpl;
import org.apache.jasper.security.SecurityClassLoad;
import org.apache.jasper.servlet.JspServletWrapper;
-import org.apache.jasper.util.ExceptionUtils;
import org.apache.jasper.util.FastRemovalDequeue;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Localizer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Localizer.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Localizer.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Localizer.java Tue Aug
2 12:31:19 2016
@@ -21,7 +21,7 @@ import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import org.apache.jasper.util.ExceptionUtils;
+import org.apache.jasper.runtime.ExceptionUtils;
/**
* Class responsible for converting error codes to corresponding localized
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java
Tue Aug 2 12:31:19 2016
@@ -25,7 +25,7 @@ import java.util.jar.JarFile;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.util.ExceptionUtils;
+import org.apache.jasper.runtime.ExceptionUtils;
import org.apache.jasper.xmlparser.XMLEncodingDetector;
import org.xml.sax.Attributes;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Tue Aug 2 12:31:19 2016
@@ -47,7 +47,7 @@ import javax.servlet.jsp.tagext.Variable
import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.util.ExceptionUtils;
+import org.apache.jasper.runtime.ExceptionUtils;
import org.apache.jasper.xmlparser.ParserUtils;
import org.apache.jasper.xmlparser.TreeNode;
import org.apache.juli.logging.Log;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
Tue Aug 2 12:31:19 2016
@@ -32,7 +32,7 @@ import javax.servlet.ServletContext;
import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
-import org.apache.jasper.util.ExceptionUtils;
+import org.apache.jasper.runtime.ExceptionUtils;
import org.apache.jasper.xmlparser.ParserUtils;
import org.apache.jasper.xmlparser.TreeNode;
import org.apache.juli.logging.Log;
Copied: tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ExceptionUtils.java
(from r1754906,
tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/ExceptionUtils.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ExceptionUtils.java?p2=tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ExceptionUtils.java&p1=tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/ExceptionUtils.java&r1=1754906&r2=1754907&rev=1754907&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/util/ExceptionUtils.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/ExceptionUtils.java Tue
Aug 2 12:31:19 2016
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jasper.util;
+package org.apache.jasper.runtime;
import java.lang.reflect.InvocationTargetException;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java Tue
Aug 2 12:31:19 2016
@@ -29,7 +29,6 @@ import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.PageContext;
import org.apache.jasper.Constants;
-import org.apache.jasper.util.ExceptionUtils;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
Tue Aug 2 12:31:19 2016
@@ -35,7 +35,6 @@ import javax.servlet.jsp.tagext.BodyCont
import org.apache.jasper.JasperException;
import org.apache.jasper.compiler.Localizer;
-import org.apache.jasper.util.ExceptionUtils;
/**
* Bunch of util methods that are used by code generated for useBean,
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java Tue
Aug 2 12:31:19 2016
@@ -22,7 +22,6 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
import org.apache.jasper.Constants;
-import org.apache.jasper.util.ExceptionUtils;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.InstanceManager;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
Tue Aug 2 12:31:19 2016
@@ -48,7 +48,7 @@ import javax.servlet.SessionTrackingMode
import javax.servlet.descriptor.JspConfigDescriptor;
import org.apache.jasper.JasperException;
-import org.apache.jasper.util.ExceptionUtils;
+import org.apache.jasper.runtime.ExceptionUtils;
/**
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java Tue Aug
2 12:31:19 2016
@@ -38,8 +38,8 @@ import org.apache.jasper.EmbeddedServlet
import org.apache.jasper.Options;
import org.apache.jasper.compiler.JspRuntimeContext;
import org.apache.jasper.compiler.Localizer;
+import org.apache.jasper.runtime.ExceptionUtils;
import org.apache.jasper.security.SecurityUtil;
-import org.apache.jasper.util.ExceptionUtils;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.PeriodicEventListener;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1754907&r1=1754906&r2=1754907&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
Tue Aug 2 12:31:19 2016
@@ -42,9 +42,9 @@ import org.apache.jasper.compiler.JarRes
import org.apache.jasper.compiler.JavacErrorDetail;
import org.apache.jasper.compiler.JspRuntimeContext;
import org.apache.jasper.compiler.Localizer;
+import org.apache.jasper.runtime.ExceptionUtils;
import org.apache.jasper.runtime.InstanceManagerFactory;
import org.apache.jasper.runtime.JspSourceDependent;
-import org.apache.jasper.util.ExceptionUtils;
import org.apache.jasper.util.FastRemovalDequeue;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
