Author: remy.maucherat(a)jboss.com Date: 2008-01-08 06:49:17 -0500 (Tue, 08 Jan 2008) New Revision: 389 Modified: trunk/java/org/apache/catalina/core/AprLifecycleListener.java trunk/java/org/apache/jasper/compiler/Parser.java trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java trunk/webapps/docs/changelog.xml Log: - Nested tags handling. - Fix some JMX features. Modified: trunk/java/org/apache/catalina/core/AprLifecycleListener.java =================================================================== --- trunk/java/org/apache/catalina/core/AprLifecycleListener.java 2008-01-04 17:21:51 UTC (rev 388) +++ trunk/java/org/apache/catalina/core/AprLifecycleListener.java 2008-01-08 11:49:17 UTC (rev 389) @@ -59,7 +59,7 @@ protected static final int TCN_REQUIRED_MAJOR = 1; protected static final int TCN_REQUIRED_MINOR = 1; protected static final int TCN_REQUIRED_PATCH = 8; - protected static final int TCN_RECOMMENDED_PV = 10; + protected static final int TCN_RECOMMENDED_PV = 12; // ---------------------------------------------- Properties Modified: trunk/java/org/apache/jasper/compiler/Parser.java =================================================================== --- trunk/java/org/apache/jasper/compiler/Parser.java 2008-01-04 17:21:51 UTC (rev 388) +++ trunk/java/org/apache/jasper/compiler/Parser.java 2008-01-08 11:49:17 UTC (rev 389) @@ -422,6 +422,12 @@ if (ctxt.getOptions().isCaching()) { ctxt.getOptions().getCache().put(uri, impl); } + } else { + // Current compilation context needs location of cached + // tag files + for (TagFileInfo info : impl.getTagFiles()) { + ctxt.setTagFileJarUrl(info.getPath(), ctxt.getTagFileJarUrl()); + } } pageInfo.addTaglib(uri, impl); } Modified: trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java =================================================================== --- trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java 2008-01-04 17:21:51 UTC (rev 388) +++ trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java 2008-01-08 11:49:17 UTC (rev 389) @@ -542,7 +542,7 @@ Object object = null; NoSuchMethodException exception = null; try { - object = this; + object = bean; m = object.getClass().getMethod(setMethod, signature); } catch (NoSuchMethodException e) { exception = e;; @@ -601,7 +601,7 @@ Object object = null; Exception exception = null; try { - object = this; + object = bean; method = object.getClass().getMethod(aname, types); } catch (NoSuchMethodException e) { exception = e; Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-01-04 17:21:51 UTC (rev 388) +++ trunk/webapps/docs/changelog.xml 2008-01-08 11:49:17 UTC (rev 389) @@ -149,6 +149,9 @@ <fix> No need to swallow input if there is an error. (remm) </fix> + <fix> + <bug>43868</bug>: MBean methods getInvoke() and getSetter() were broken. (markt) + </fix> </changelog> </subsection> <subsection name="Jasper"> @@ -178,6 +181,9 @@ <fix> <bug>43758</bug>: Fix NPE with empty scripting elements. (markt) </fix> + <fix> + <bug>43743</bug>: Correctly handle nest tag files packaged in a jar. (markt) + </fix> </changelog> </subsection> <subsection name="Webapps">