You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/08/29 09:32:18 UTC
svn commit: r690135 -
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBase.java
Author: matzew
Date: Fri Aug 29 00:32:18 2008
New Revision: 690135
URL: http://svn.apache.org/viewvc?rev=690135&view=rev
Log:
TRINIDAD-1191 - Delayed loading of renderers to facilitate faster start up time
Thanks to Ari hadi for his patch
Modified:
myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBase.java
Modified: myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBase.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBase.java?rev=690135&r1=690134&r2=690135&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBase.java (original)
+++ myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBase.java Fri Aug 29 00:32:18 2008
@@ -23,6 +23,7 @@
import java.net.URL;
+import java.util.Enumeration;
import java.util.Map;
import java.util.Properties;
@@ -218,52 +219,62 @@
if (loader == null)
loader = getClass().getClassLoader();
- URL resource = loader.getResource(fileName);
- if (resource != null)
+ try
{
- try
- {
- Properties properties = new Properties();
- _LOG.fine("Loading renderkit map from {0}", resource);
- InputStream is = resource.openStream();
- try
- {
- properties.load(is);
- }
- finally
+ for (Enumeration e = loader.getResources(fileName) ; e.hasMoreElements() ;)
{
- is.close();
- }
+ URL resource = (URL)e.nextElement();
+ if (resource != null)
+ {
+ try
+ {
+ Properties properties = new Properties();
+ _LOG.fine("Loading renderkit map from {0}", resource);
+ InputStream is = resource.openStream();
+ try
+ {
+ properties.load(is);
+ }
+ finally
+ {
+ is.close();
+ }
+
+ for (Map.Entry<Object, Object> entry : properties.entrySet())
+ {
+ String key = (String) entry.getKey();
+ int barIndex = key.indexOf('|');
+ if (barIndex < 0)
+ {
+ _LOG.warning("Invalid renderkit map entry: {0}", key);
+ continue;
+ }
- for (Map.Entry<Object, Object> entry : properties.entrySet())
- {
- String key = (String) entry.getKey();
- int barIndex = key.indexOf('|');
- if (barIndex < 0)
- {
- _LOG.warning("Invalid renderkit map entry: {0}", key);
- continue;
- }
-
- String componentFamily = key.substring(0, barIndex);
- String rendererType = key.substring(barIndex + 1);
-
- String className = (String) entry.getValue();
-
- addRenderer(componentFamily, rendererType, className);
+ String componentFamily = key.substring(0, barIndex);
+ String rendererType = key.substring(barIndex + 1);
+
+ String className = (String) entry.getValue();
+
+ addRenderer(componentFamily, rendererType, className);
+ }
+ }
+ catch (IOException ioe)
+ {
+ _LOG.severe("CANNOT_LOAD_URL", resource);
+ _LOG.severe(ioe);
+ }
+ }
+ else
+ {
+ _LOG.severe("CANNOT_LOAD_URL", resource);
+ }
}
- }
- catch (IOException ioe)
- {
- _LOG.severe("CANNOT_LOAD_URL", fileName);
- _LOG.severe(ioe);
- }
}
- else
+ catch(IOException ioe)
{
- _LOG.severe("CANNOT_LOAD_URL", fileName);
+ _LOG.severe("CANNOT_LOAD_RESOURCES", fileName);
+ _LOG.severe(ioe);
}
-
}