You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by lo...@apache.org on 2011/05/23 19:17:05 UTC

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

Author: lofwyr
Date: Mon May 23 17:17:05 2011
New Revision: 1126602

URL: http://svn.apache.org/viewvc?rev=1126602&view=rev
Log:
TOBAGO-990 Refactor Tobago configuration
 - ordering: by default, the tobago-config.xml from the WEB-INF directory should be at the end

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=1126602&r1=1126601&r2=1126602&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 Mon May 23 17:17:05 2011
@@ -47,8 +47,8 @@ public class TobagoConfigBuilder {
 
   private TobagoConfigBuilder(ServletContext servletContext) throws ServletException, IOException, SAXException {
     list = new ArrayList<TobagoConfigFragment>();
-    configFromWebInf(servletContext);
     configFromClasspath();
+    configFromWebInf(servletContext);
     final TobagoConfigImpl tobagoConfig = mergeList();
 
     // todo: cleanup, use one central TobagoConfig, no singleton ResourceManager