You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2012/06/02 21:03:15 UTC

svn commit: r1345557 - /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java

Author: bommel
Date: Sat Jun  2 19:03:14 2012
New Revision: 1345557

URL: http://svn.apache.org/viewvc?rev=1345557&view=rev
Log:
(TOBAGO-945) Add the version of Tobago to the resources URL to avoid caching when updating Tobago

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java?rev=1345557&r1=1345556&r2=1345557&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java Sat Jun  2 19:03:14 2012
@@ -81,7 +81,7 @@ public class ResourceServlet extends Htt
        expires = 24 * 60 * 60 * 1000L;
     }
     Theme defaultTheme = tobagoConfig.getDefaultTheme();
-    addResourceDir(defaultTheme);
+    addResourceDir(defaultTheme.getFallbackList());
     addResourceDir(tobagoConfig.getSupportedThemes());
 
     String expiresString = servletConfig.getInitParameter("expires");
@@ -116,7 +116,6 @@ public class ResourceServlet extends Htt
     } else {
       resourceDirs.add(dir);
     }
-    addResourceDir(theme.getFallbackList());
   }
 
     @Override