svn commit: r1053416 - in /myfaces/extensions/cdi/trunk: jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/ test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/jun...

[gp...@apache.org]

Author: gpetracek
Date: Tue Dec 28 19:55:03 2010
New Revision: 1053416

URL: http://svn.apache.org/viewvc?rev=1053416&view=rev
Log:
small improvements

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareApplicationMessagesMessageResolver.java
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareApplicationMessagesMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareApplicationMessagesMessageResolver.java?rev=1053416&r1=1053415&r2=1053416&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareApplicationMessagesMessageResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareApplicationMessagesMessageResolver.java Tue Dec 28 19:55:03 2010
@@ -26,6 +26,7 @@ import org.apache.myfaces.extensions.cdi
 import java.util.Locale;
 import java.util.Map;
 import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 /**
  * @author Gerhard Petracek
@@ -47,7 +48,13 @@ class JsfAwareApplicationMessagesMessage
         {
             messageDescriptor = extractKey(messageDescriptor);
 
-            return JsfUtils.getCustomFacesMessageBundle(messageContext.getLocale()).getString(messageDescriptor);
+            ResourceBundle resourceBundle = JsfUtils.getCustomFacesMessageBundle(messageContext.getLocale());
+
+            if(resourceBundle == null)
+            {
+                return defaultFacesMessage(messageDescriptor, messageContext.getLocale());
+            }
+            return resourceBundle.getString(messageDescriptor);
         }
         catch (MissingResourceException e)
         {

Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java?rev=1053416&r1=1053415&r2=1053416&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java Tue Dec 28 19:55:03 2010
@@ -36,6 +36,7 @@ import org.junit.Before;
 import javax.faces.FactoryFinder;
 import javax.faces.application.Application;
 import javax.faces.application.ApplicationFactory;
+import javax.faces.component.UIViewRoot;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.context.FacesContextFactory;
@@ -45,6 +46,7 @@ import javax.faces.render.RenderKit;
 import javax.faces.render.RenderKitFactory;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.Locale;
 
 /**
  * @author Gerhard Petracek
@@ -86,6 +88,8 @@ public abstract class AbstractJsfAwareTe
 
         initJsfObjects();
 
+        initDefaultView();
+
         super.before();
     }
 
@@ -126,6 +130,20 @@ public abstract class AbstractJsfAwareTe
         initRenderKit();
     }
 
+    protected void initDefaultView()
+    {
+        UIViewRoot root = new UIViewRoot();
+        root.setViewId("/viewId");
+        root.setLocale(getLocale());
+        root.setRenderKitId(RenderKitFactory.HTML_BASIC_RENDER_KIT);
+        facesContext.setViewRoot(root);
+    }
+
+    protected Locale getLocale()
+    {
+        return Locale.getDefault();
+    }
+
     protected void initServletObjects() throws Exception
     {
         servletContext = new MockServletContext();