[jboss-cvs] JBossAS SVN: r93161 - in trunk: 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-09-03 08:41:03 -0400 (Thu, 03 Sep 2009)
New Revision: 93161

Modified:
   trunk/component-matrix/pom.xml
   trunk/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java
Log:
JBAS-7130 Stack trace when starting up "all" configuration
JBAS-7226 Upgrade to JSF2 Release Candidate


Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-09-03 12:25:57 UTC (rev 93160)
+++ trunk/component-matrix/pom.xml	2009-09-03 12:41:03 UTC (rev 93161)
@@ -33,7 +33,7 @@
     <version.apache.xalan>2.7.0.patch02-brew</version.apache.xalan>
     <version.commons.beanutils>1.8.0</version.commons.beanutils>
     <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>1.2.1.GA</version.jboss.jaxr>
     <version.jboss.jbossts>4.6.1.GA</version.jboss.jbossts>

Modified: trunk/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java	2009-09-03 12:25:57 UTC (rev 93160)
+++ trunk/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java	2009-09-03 12:41:03 UTC (rev 93161)
@@ -21,6 +21,7 @@
  */
 package org.jboss.web.jsf.integration.config;
 
+import com.sun.faces.config.ConfigurationException;
 import com.sun.faces.config.ConfigureListener;
 import javax.faces.validator.BeanValidator;
 import javax.servlet.ServletContext;
@@ -60,7 +61,17 @@
         initializeJspRuntime();
         addBeanValidatorFactory();
         initialized = true;
-        super.contextInitialized(event);
+        
+        try
+        {
+           super.contextInitialized(event);
+        }
+        catch (ConfigurationException e)
+        {
+           // HACK! HACK! HACK! This will be cleaned up with JSFDeployer.
+           if ("no web.xml present".equals(e.getMessage())) return;
+           throw e;
+        }
     }
     
     @Override