You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2012/02/23 18:11:58 UTC
svn commit: r1292857 - in /myfaces/extensions/cdi/trunk/core:
api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ConfigUtils.java
impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/SimpleServiceProvider.java
Author: gpetracek
Date: Thu Feb 23 17:11:57 2012
New Revision: 1292857
URL: http://svn.apache.org/viewvc?rev=1292857&view=rev
Log:
EXTCDI-268 fallback for wls
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ConfigUtils.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/SimpleServiceProvider.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ConfigUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ConfigUtils.java?rev=1292857&r1=1292856&r2=1292857&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ConfigUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ConfigUtils.java Thu Feb 23 17:11:57 2012
@@ -106,9 +106,18 @@ public abstract class ConfigUtils
resourceBundle = ResourceBundle
.getBundle(bundleName, Locale.getDefault(), ClassUtils.getClassLoader(null));
}
+ //fallback - see EXTCDI-268
catch (MissingResourceException e)
{
- resourceBundle = null;
+ try
+ {
+ resourceBundle = ResourceBundle
+ .getBundle(bundleName, Locale.getDefault(), ConfigUtils.class.getClassLoader());
+ }
+ catch (MissingResourceException e2)
+ {
+ resourceBundle = null;
+ }
}
if (resourceBundle == null)
@@ -117,9 +126,18 @@ public abstract class ConfigUtils
{
resourceBundle = ResourceBundle.getBundle(FILE_NAME);
}
+ //fallback - see EXTCDI-268
catch (MissingResourceException e2)
{
- resourceBundle = null;
+ try
+ {
+ resourceBundle = ResourceBundle
+ .getBundle(FILE_NAME, Locale.getDefault(), ConfigUtils.class.getClassLoader());
+ }
+ catch (MissingResourceException e3)
+ {
+ resourceBundle = null;
+ }
}
}
@@ -189,6 +207,13 @@ public abstract class ConfigUtils
Properties properties = null;
ClassLoader classLoader = ClassUtils.getClassLoader(resourceName);
InputStream inputStream = classLoader.getResourceAsStream(resourceName);
+
+ //fallback - see EXTCDI-268
+ if (inputStream == null)
+ {
+ inputStream = ClassUtils.class.getClassLoader().getResourceAsStream(resourceName);
+ }
+
if (inputStream != null)
{
properties = new Properties();
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/SimpleServiceProvider.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/SimpleServiceProvider.java?rev=1292857&r1=1292856&r2=1292857&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/SimpleServiceProvider.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/SimpleServiceProvider.java Thu Feb 23 17:11:57 2012
@@ -87,8 +87,16 @@ public class SimpleServiceProvider<T> ex
try
{
+ String configFileLocation = getConfigFileLocation();
+
Enumeration<URL> serviceFileEnumerator =
- this.serviceProviderContext.getClassLoader().getResources(getConfigFileLocation());
+ this.serviceProviderContext.getClassLoader().getResources(configFileLocation);
+
+ //fallback - see EXTCDI-268
+ if (!serviceFileEnumerator.hasMoreElements())
+ {
+ serviceFileEnumerator = getClass().getClassLoader().getResources(configFileLocation);
+ }
while (serviceFileEnumerator.hasMoreElements())
{