[jboss-cvs] JBossAS SVN: r92983 - in branches/Branch_5_x: 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: 2009-08-28 16:42:16 -0400 (Fri, 28 Aug 2009)
New Revision: 92983

Modified:
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java
Log:
JBAS-7217 Stack trace when no web.xml exists in the web app
JBAS-7130 Upgrade JSF to 2.0.0-RC


Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-08-28 19:28:23 UTC (rev 92982)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-08-28 20:42:16 UTC (rev 92983)
@@ -32,7 +32,7 @@
   <properties>
     <version.apache.xalan>2.7.0.patch02-brew</version.apache.xalan>
     <version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
-    <version.javax.faces>2.0.0-Beta2</version.javax.faces>
+    <version.javax.faces>2.0.0-RC</version.javax.faces>
     <version.javax.validation>1.0.CR3</version.javax.validation>
     <version.jboss.jaxr>2.0.1</version.jboss.jaxr>
     <version.jboss.jbossts>4.6.1.GA</version.jboss.jbossts>

Modified: branches/Branch_5_x/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java
===================================================================
--- branches/Branch_5_x/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java	2009-08-28 19:28:23 UTC (rev 92982)
+++ branches/Branch_5_x/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java	2009-08-28 20:42:16 UTC (rev 92983)
@@ -21,6 +21,7 @@
  */
 package org.jboss.web.jsf.integration.config;
 
+import com.sun.faces.config.ConfigurationException;
 import javax.faces.validator.BeanValidator;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
@@ -65,7 +66,16 @@
         initializeJspRuntime();
         initialized = true;
         addBeanValidatorFactory();
-        super.contextInitialized(event);
+        try
+        {
+           super.contextInitialized(event);
+        }
+        catch (ConfigurationException e)
+        {
+           // HACK! HACK! HACK!
+           if ("no web.xml present".equals(e.getMessage())) return;
+           throw e;
+        }
     }
     
     @Override