[jboss-cvs] JBossAS SVN: r81933 - in branches/Branch_4_2: tomcat/src/main/org/jboss/web/jsf/integration/config and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: stan.silvert at jboss.com
Date: 2008-12-01 21:03:37 -0500 (Mon, 01 Dec 2008)
New Revision: 81933

Modified:
   branches/Branch_4_2/build/build-thirdparty.xml
   branches/Branch_4_2/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java
Log:
JBPAPP-1460 Upgrade JSF to 1.2_10


Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml	2008-12-02 00:36:00 UTC (rev 81932)
+++ branches/Branch_4_2/build/build-thirdparty.xml	2008-12-02 02:03:37 UTC (rev 81933)
@@ -104,7 +104,7 @@
     <componentref name="sun-jaf" version="1.1"/>
     <componentref name="sun-javacc" version="3.2"/>
     <componentref name="sun-javamail" version="1.4"/>
-    <componentref name="sun-jsf" version="1.2_09"/>
+    <componentref name="sun-jsf" version="1.2_10"/>
     <componentref name="sun-jstl" version="1.2"/>
     <componentref name="sun-servlet" version="2.5-brew"/>
     <componentref name="trove" version="1.0.2-brew"/>

Modified: branches/Branch_4_2/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java
===================================================================
--- branches/Branch_4_2/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java	2008-12-02 00:36:00 UTC (rev 81932)
+++ branches/Branch_4_2/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java	2008-12-02 02:03:37 UTC (rev 81933)
@@ -49,6 +49,8 @@
     
     private ServletContext servletContext;
     
+    private boolean initialized = false;
+    
     public static boolean warBundlesJSFImpl(ServletContext servletContext)
     {
        String bundledJSFImpl = servletContext.getInitParameter(WAR_BUNDLES_JSF_IMPL);
@@ -70,9 +72,19 @@
 
         checkForMyFaces();
         initializeJspRuntime();
+        initialized = true;
         super.contextInitialized(event);
     }
     
+    public void contextDestroyed(ServletContextEvent event) 
+    {
+        if (initialized)
+        {
+           initialized = false;
+           super.contextDestroyed(event);
+        }
+    }
+
     // This method accounts for a peculiar problem with Jasper that pops up from time
     // to time.  In some cases, if the JspRuntimeContext is not loaded then the JspFactory
     // will not be initialized for JSF.  This method assures that it will always be