You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2013/08/27 15:45:32 UTC

svn commit: r1517819 - /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java

Author: weber
Date: Tue Aug 27 13:45:32 2013
New Revision: 1517819

URL: http://svn.apache.org/r1517819
Log:
TOBAGO-1298: Re-implement TobagoConfigParser: add themeUrl to error message

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java?rev=1517819&r1=1517818&r2=1517819&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java Tue Aug 27 13:45:32 2013
@@ -97,16 +97,20 @@ public class TobagoConfigBuilder {
       CollectionUtils.addAll(urls, classLoader.getResources(META_INF_TOBAGO_CONFIG_XML));
 
       for (final URL themeUrl : urls) {
-        final TobagoConfigFragment fragment = new TobagoConfigParser().parse(themeUrl);
-        fragment.setUrl(themeUrl);
-        list.add(fragment);
+        try {
+          final TobagoConfigFragment fragment = new TobagoConfigParser().parse(themeUrl);
+          fragment.setUrl(themeUrl);
+          list.add(fragment);
 
-        // tomcat uses jar
-        // weblogic uses zip
-        // IBM WebSphere uses wsjar
-        final String protocol = themeUrl.getProtocol();
-        if (!"jar".equals(protocol) && !"zip".equals(protocol) && !"wsjar".equals(protocol)) {
-          LOG.warn("Unknown protocol '" + themeUrl + "'");
+          // tomcat uses jar
+          // weblogic uses zip
+          // IBM WebSphere uses wsjar
+          final String protocol = themeUrl.getProtocol();
+          if (!"jar".equals(protocol) && !"zip".equals(protocol) && !"wsjar".equals(protocol)) {
+            LOG.warn("Unknown protocol '" + themeUrl + "'");
+          }
+        } catch (Exception e) {
+          throw new Exception(e.getClass().getName() + " on themeUrl: " + themeUrl, e);
         }
       }
     } catch (Exception e) {