[richfaces-svn-commits] JBoss Rich Faces SVN: r15970 - branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2009-11-22 22:02:45 -0500 (Sun, 22 Nov 2009)
New Revision: 15970

Modified:
   branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java
Log:
Minor optimization for JSF 2.0 mock application factory
Added debug logger outputting JSF 2.0 vs 1.2/1.1 information

Modified: branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java
===================================================================
--- branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java	2009-11-23 02:53:20 UTC (rev 15969)
+++ branches/community/3.3.X/framework/test/src/main/java/org/ajax4jsf/tests/Ajax4JsfMockApplicationFactory.java	2009-11-23 03:02:45 UTC (rev 15970)
@@ -24,10 +24,14 @@
 import javax.faces.FacesException;
 import javax.faces.application.Application;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.shale.test.mock.MockApplication;
 
 public class Ajax4JsfMockApplicationFactory extends org.apache.shale.test.mock.MockApplicationFactory {
 
+	private static final Log LOG = LogFactory.getLog(Ajax4JsfMockApplicationFactory.class);
+	
 	private Application application;
 
 	public Ajax4JsfMockApplicationFactory() {
@@ -50,7 +54,7 @@
 			
 			application = (MockApplication) clazz.newInstance();
 
-			return application;
+			LOG.debug("Successfully created JSF 2.0 MockApplication class");
 		} catch (NoClassDefFoundError e) {
 			clazz = null; // We are not running in a JSF 2.0 environment
 		} catch (ClassNotFoundException e) {
@@ -61,7 +65,12 @@
 			throw new FacesException(e);
 		}
 
-		return super.getApplication();
+		if (application == null) {
+			LOG.debug("Falling back to JSF 1.1/1.2 MockApplication");
+			application = super.getApplication();
+		}
+	
+		return application;
 	}
 
 	@Override