Author: remy.maucherat(a)jboss.com Date: 2008-07-17 14:05:56 -0400 (Thu, 17 Jul 2008) New Revision: 719 Modified: trunk/java/org/apache/jasper/JspCompilationContext.java trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java trunk/java/org/apache/jasper/compiler/TagFileProcessor.java trunk/webapps/docs/changelog.xml Log: - Remove mandatory usage of a URLClassLoader for the webapp classloader. Modified: trunk/java/org/apache/jasper/JspCompilationContext.java =================================================================== --- trunk/java/org/apache/jasper/JspCompilationContext.java 2008-07-17 17:43:56 UTC (rev 718) +++ trunk/java/org/apache/jasper/JspCompilationContext.java 2008-07-17 18:05:56 UTC (rev 719) @@ -77,7 +77,7 @@ protected String baseURI; protected String outputDir; protected ServletContext context; - protected URLClassLoader loader; + protected ClassLoader loader; protected JspRuntimeContext rctxt; @@ -170,7 +170,7 @@ return rctxt.getParentClassLoader(); } - public void setClassLoader(URLClassLoader loader) { + public void setClassLoader(ClassLoader loader) { this.loader = loader; } Modified: trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java =================================================================== --- trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 2008-07-17 17:43:56 UTC (rev 718) +++ trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 2008-07-17 18:05:56 UTC (rev 719) @@ -110,11 +110,9 @@ this.options = options; // Get the parent class loader - parentClassLoader = - (URLClassLoader) Thread.currentThread().getContextClassLoader(); + parentClassLoader = Thread.currentThread().getContextClassLoader(); if (parentClassLoader == null) { - parentClassLoader = - (URLClassLoader)this.getClass().getClassLoader(); + parentClassLoader = this.getClass().getClassLoader(); } if (log.isDebugEnabled()) { Modified: trunk/java/org/apache/jasper/compiler/TagFileProcessor.java =================================================================== --- trunk/java/org/apache/jasper/compiler/TagFileProcessor.java 2008-07-17 17:43:56 UTC (rev 718) +++ trunk/java/org/apache/jasper/compiler/TagFileProcessor.java 2008-07-17 18:05:56 UTC (rev 719) @@ -545,8 +545,7 @@ rctxt.addWrapper(tagFilePath, wrapper); // Use same classloader and classpath for compiling tag files - wrapper.getJspEngineContext().setClassLoader( - (URLClassLoader) ctxt.getClassLoader()); + wrapper.getJspEngineContext().setClassLoader(ctxt.getClassLoader()); wrapper.getJspEngineContext().setClassPath(ctxt.getClassPath()); } else { // Make sure that JspCompilationContext gets the latest TagInfo Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-07-17 17:43:56 UTC (rev 718) +++ trunk/webapps/docs/changelog.xml 2008-07-17 18:05:56 UTC (rev 719) @@ -45,6 +45,12 @@ <fix> org.jboss.web should be loaded as container classes. (remm) </fix> + <fix> + Instance manager checks were not done properly. (remm) + </fix> + <fix> + Prevent various possible character encoding hacks. (remm) + </fix> </changelog> </subsection> <subsection name="Jasper"> @@ -53,6 +59,9 @@ <bug>42565</bug>: EL ternary expression without space before colon now works. Patch provided by Lucas Galfaso. (markt) </fix> + <fix> + <jira>98</jira>: Remove mandatory usage of URLClassLoader for better integration with AS. (remm) + </fix> </changelog> </subsection> <subsection name="Native">