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 2016/11/26 10:20:46 UTC
svn commit: r1771456 - in /myfaces/tobago/trunk/tobago-core/src:
main/java/org/apache/myfaces/tobago/context/
main/java/org/apache/myfaces/tobago/internal/config/
main/java/org/apache/myfaces/tobago/internal/context/
main/java/org/apache/myfaces/tobago...
Author: lofwyr
Date: Sat Nov 26 10:20:46 2016
New Revision: 1771456
URL: http://svn.apache.org/viewvc?rev=1771456&view=rev
Log:
TOBAGO-1636: End of theme-dependent resource selection (ResourceManager)
* remove attributes resource-dir (from tobago config) and resource-path (from theme)
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Theme.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParserUnitTest.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/MockTheme.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Theme.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Theme.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Theme.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Theme.java Sat Nov 26 10:20:46 2016
@@ -30,8 +30,6 @@ public interface Theme {
String getDisplayName();
- String getResourcePath();
-
/**
* For internal use only.
*/
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java Sat Nov 26 10:20:46 2016
@@ -38,7 +38,6 @@ public class ThemeImpl implements Theme,
private String name;
private String displayName;
- private String resourcePath;
private ThemeImpl fallback;
private String fallbackName;
private List<Theme> fallbackList;
@@ -92,16 +91,6 @@ public class ThemeImpl implements Theme,
this.displayName = displayName;
}
- @Override
- public String getResourcePath() {
- return resourcePath;
- }
-
- public void setResourcePath(final String resourcePath) {
- checkLocked();
- this.resourcePath = resourcePath;
- }
-
public ThemeImpl getFallback() {
return fallback;
}
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=1771456&r1=1771455&r2=1771456&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 Sat Nov 26 10:20:46 2016
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.intern
import org.apache.commons.collections.CollectionUtils;
import org.apache.myfaces.tobago.config.TobagoConfig;
-import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
@@ -53,10 +52,7 @@ public final class TobagoConfigBuilder {
sorter.sort();
final TobagoConfigImpl tobagoConfig = sorter.merge();
- // todo: cleanup, use one central TobagoConfig, no singleton ResourceManager
- // resources
tobagoConfig.initProjectState(servletContext);
- ResourceManagerFactory.init(servletContext, tobagoConfig);
// prepare themes
tobagoConfig.resolveThemes();
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java Sat Nov 26 10:20:46 2016
@@ -40,7 +40,6 @@ public class TobagoConfigFragment {
private List<String> supportedThemeNames;
private String defaultThemeName;
- private List<String> resourceDirs;
private RenderersConfig renderersConfig;
private Boolean createSessionSecret;
private Boolean checkSessionSecret;
@@ -57,7 +56,6 @@ public class TobagoConfigFragment {
before = new ArrayList<String>();
after = new ArrayList<String>();
supportedThemeNames = new ArrayList<String>();
- resourceDirs = new ArrayList<String>();
themeDefinitions = new ArrayList<ThemeImpl>();
mimeTypes = new HashMap<String, String>();
}
@@ -78,19 +76,6 @@ public class TobagoConfigFragment {
this.defaultThemeName = defaultThemeName;
}
- public void addResourceDir(final String resourceDir) {
- if (!resourceDirs.contains(resourceDir)) {
- if (LOG.isInfoEnabled()) {
- LOG.info("adding resourceDir = '{}'", resourceDir);
- }
- resourceDirs.add(resourceDir);
- }
- }
-
- public List<String> getResourceDirs() {
- return resourceDirs;
- }
-
public RenderersConfig getRenderersConfig() {
return renderersConfig;
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java Sat Nov 26 10:20:46 2016
@@ -58,7 +58,6 @@ public class TobagoConfigImpl extends To
private List<String> supportedThemeNames;
private Theme defaultTheme;
private String defaultThemeName;
- private List<String> resourceDirs;
private Map<String, ThemeImpl> availableThemes;
private RenderersConfig renderersConfig;
private ProjectStage projectStage;
@@ -77,7 +76,6 @@ public class TobagoConfigImpl extends To
supportedThemeNames = new ArrayList<String>();
supportedThemes = new ArrayList<Theme>();
availableThemes = new HashMap<String, ThemeImpl>();
- resourceDirs = new ArrayList<String>();
createSessionSecret = true;
checkSessionSecret = true;
preventFrameAttacks = true;
@@ -96,7 +94,6 @@ public class TobagoConfigImpl extends To
((ThemeImpl) theme).lock();
}
supportedThemeNames = Collections.unmodifiableList(supportedThemeNames);
- resourceDirs = Collections.unmodifiableList(resourceDirs);
availableThemes = Collections.unmodifiableMap(availableThemes);
if (renderersConfig instanceof RenderersConfigImpl) {
@@ -122,10 +119,6 @@ public class TobagoConfigImpl extends To
protected void resolveThemes() {
checkLocked();
- for (final Theme theme : availableThemes.values()) {
- addResourceDir(theme.getResourcePath());
- }
-
if (defaultThemeName != null) {
defaultTheme = availableThemes.get(defaultThemeName);
checkThemeIsAvailable(defaultThemeName, defaultTheme);
@@ -205,20 +198,6 @@ public class TobagoConfigImpl extends To
return supportedThemes;
}
- protected void addResourceDir(final String resourceDir) {
- checkLocked();
- if (!resourceDirs.contains(resourceDir)) {
- if (LOG.isInfoEnabled()) {
- LOG.info("adding resourceDir = '{}'", resourceDir);
- }
- resourceDirs.add(0, resourceDir);
- }
- }
-
- public List<String> getResourceDirs() {
- return resourceDirs;
- }
-
@Override
public Theme getDefaultTheme() {
return defaultTheme;
@@ -399,8 +378,6 @@ public class TobagoConfigImpl extends To
}
builder.append("], \ndefaultTheme=");
builder.append(defaultTheme != null ? defaultTheme.getName() : null);
- builder.append(", \nresourceDirs=");
- builder.append(resourceDirs);
builder.append(", \navailableThemes=");
builder.append(availableThemes.keySet());
builder.append(", \nprojectStage=");
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java Sat Nov 26 10:20:46 2016
@@ -57,7 +57,6 @@ public class TobagoConfigParser extends
private static final int THEME_CONFIG = 1930630086;
private static final int DEFAULT_THEME = -114431171;
private static final int SUPPORTED_THEME = -822303766;
- private static final int RESOURCE_DIR = -385546674;
private static final int CREATE_SESSION_SECRET = 413906616;
private static final int CHECK_SESSION_SECRET = 275994924;
private static final int PREVENT_FRAME_ATTACKS = 270456726;
@@ -71,7 +70,6 @@ public class TobagoConfigParser extends
private static final int THEME_DEFINITIONS = -255617156;
private static final int THEME_DEFINITION = 1515774935;
private static final int DISPLAY_NAME = 1568910518;
- private static final int RESOURCE_PATH = 933304964;
private static final int FALLBACK = 761243362;
private static final int VERSIONED = -1407102089;
private static final int RESOURCES = -1983070683;
@@ -229,7 +227,6 @@ public class TobagoConfigParser extends
case ORDERING:
case BEFORE:
case AFTER:
- case RESOURCE_DIR:
case THEME_CONFIG:
case DEFAULT_THEME:
case SUPPORTED_THEME:
@@ -242,7 +239,6 @@ public class TobagoConfigParser extends
case DIRECTIVE:
case THEME_DEFINITIONS:
case DISPLAY_NAME:
- case RESOURCE_PATH:
case VERSIONED:
case FALLBACK:
case SANITIZER:
@@ -314,10 +310,6 @@ public class TobagoConfigParser extends
tobagoConfig.addSupportedThemeName(text);
break;
- case RESOURCE_DIR:
- tobagoConfig.addResourceDir(text);
- break;
-
case CREATE_SESSION_SECRET:
tobagoConfig.setCreateSessionSecret(text);
break;
@@ -346,10 +338,6 @@ public class TobagoConfigParser extends
currentTheme.setDisplayName(text);
break;
- case RESOURCE_PATH:
- currentTheme.setResourcePath(text);
- break;
-
case FALLBACK:
currentTheme.setFallbackName(text);
break;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java Sat Nov 26 10:20:46 2016
@@ -91,11 +91,6 @@ public class TobagoConfigSorter implemen
result.addSupportedThemeName(supported);
}
- // resource dirs
- for (final String dir : fragment.getResourceDirs()) {
- result.addResourceDir(dir);
- }
-
// renderers config
if (fragment.getRenderersConfig() != null) {
if (result.getRenderersConfig() instanceof RenderersConfigImpl) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java Sat Nov 26 10:20:46 2016
@@ -150,13 +150,14 @@ class ResourceLocator {
final TobagoConfigFragment tobagoConfig = new TobagoConfigParser().parse(tobagoConfigUrl);
for (final ThemeImpl theme : tobagoConfig.getThemeDefinitions()) {
detectThemeVersion(tobagoConfigUrl, theme);
- final String prefix = ensureSlash(theme.getResourcePath());
- final String protocol = tobagoConfigUrl.getProtocol();
+ //XXX RM
+// final String prefix = ensureSlash(theme.getResourcePath());
+// final String protocol = tobagoConfigUrl.getProtocol();
// tomcat uses jar // weblogic uses zip // IBM WebSphere uses wsjar
- if (!"jar".equals(protocol) && !"zip".equals(protocol) && !"wsjar".equals(protocol)) {
- LOG.warn("Unknown protocol '" + tobagoConfigUrl + "'");
- }
- addResources(resources, tobagoConfigUrl, prefix, 0);
+// if (!"jar".equals(protocol) && !"zip".equals(protocol) && !"wsjar".equals(protocol)) {
+// LOG.warn("Unknown protocol '" + tobagoConfigUrl + "'");
+// }
+// addResources(resources, tobagoConfigUrl, prefix, 0);
}
}
} catch (final Exception e) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java Sat Nov 26 10:20:46 2016
@@ -19,10 +19,8 @@
package org.apache.myfaces.tobago.internal.context;
-import org.apache.myfaces.tobago.context.ResourceManager;
import org.apache.myfaces.tobago.internal.config.TobagoConfigImpl;
-import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -36,17 +34,6 @@ public final class ResourceManagerFactor
private static boolean initialized;
- public static ResourceManager getResourceManager(final FacesContext facesContext) {
- assert initialized;
- return (ResourceManager) facesContext.getExternalContext()
- .getApplicationMap().get(RESOURCE_MANAGER);
- }
-
- public static ResourceManager getResourceManager(final ServletContext servletContext) {
- assert initialized;
- return (ResourceManager) servletContext.getAttribute(RESOURCE_MANAGER);
- }
-
public static void init(
final ServletContext servletContext, final TobagoConfigImpl tobagoConfig)
throws ServletException {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java Sat Nov 26 10:20:46 2016
@@ -225,20 +225,19 @@ public class ResourceManagerImpl impleme
// after that check the whole resources tree
// e.g. 1. application, 2. library or renderkit
for (final Theme currentTheme : theme.getFallbackList()) {// theme loop
- for (final String resourceDirectory : tobagoConfig.getResourceDirs()) {
for (final String browserType : browser.getFallbackList()) { // browser loop
for (final String localeSuffix : locales) { // locale loop
for (final String extension : extensions) { // extensions loop
if (production) {
boolean found = checkPath(reverseOrder, returnKey, matches,
- resourceDirectory, contentType, currentTheme, browserType, subDir, name, MINIMIZE_SUFFIX,
+ "dummy", contentType, currentTheme, browserType, subDir, name, MINIMIZE_SUFFIX,
localeSuffix, extension, key);
if (found && single) {
return matches;
}
if (!found) {
found = checkPath(reverseOrder, returnKey, matches,
- resourceDirectory, contentType, currentTheme, browserType, subDir, name, null,
+ "dummy", contentType, currentTheme, browserType, subDir, name, null,
localeSuffix, extension, key);
if (found && single) {
return matches;
@@ -246,7 +245,7 @@ public class ResourceManagerImpl impleme
}
} else {
final boolean found = checkPath(reverseOrder, returnKey, matches,
- resourceDirectory, contentType, currentTheme, browserType, subDir, name, null,
+ "dummy", contentType, currentTheme, browserType, subDir, name, null,
localeSuffix, extension, key);
if (found && single) {
return matches;
@@ -255,7 +254,6 @@ public class ResourceManagerImpl impleme
}
}
}
- }
}
if (matches.isEmpty()) {
@@ -268,8 +266,7 @@ public class ResourceManagerImpl impleme
if (!production && !ignoreMissing) {
LOG.warn("Path not found, and no fallback (using empty string) "
- + "resourceDirs='" + tobagoConfig.getResourceDirs()
- + "' contentType='" + contentType
+ + "contentType='" + contentType
+ "' theme='" + theme.getName()
+ "' browser='" + browser
+ "' subDir='" + subDir
@@ -322,12 +319,13 @@ public class ResourceManagerImpl impleme
localeSuffix, extension, key, null);
if (resourceList.containsKey(path)) {
final String result;
- if (returnKey && resourceDirectory.equals(currentTheme.getResourcePath())) {
- result = makePath(resourceDirectory, contentType, currentTheme, browserType, subDir, name, minimizeSuffix,
- localeSuffix, extension, key, currentTheme.getVersion());
- } else {
+ //XXX RM
+// if (returnKey && resourceDirectory.equals(currentTheme.getResourcePath())) {
+// result = makePath(resourceDirectory, contentType, currentTheme, browserType, subDir, name, minimizeSuffix,
+// localeSuffix, extension, key, currentTheme.getVersion());
+// } else {
result = returnKey ? path : resourceList.get(path);
- }
+// }
if (reverseOrder) {
matches.add(0, result);
} else {
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=1771456&r1=1771455&r2=1771456&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 Nov 26 10:20:46 2016
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.servle
import org.apache.myfaces.tobago.application.ProjectStage;
import org.apache.myfaces.tobago.config.TobagoConfig;
-import org.apache.myfaces.tobago.context.Theme;
import org.apache.myfaces.tobago.internal.util.IoUtils;
import org.apache.myfaces.tobago.internal.util.MimeTypeUtils;
import org.apache.myfaces.tobago.internal.util.ResponseUtils;
@@ -36,9 +35,6 @@ import javax.servlet.http.HttpServletRes
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
/**
* <pre>
@@ -74,7 +70,6 @@ public class ResourceServlet extends Htt
private Long expires;
private int bufferSize;
- private Set<String> resourceDirs = new HashSet<String>();
private boolean nosniffHeader;
@Override
@@ -84,9 +79,6 @@ public class ResourceServlet extends Htt
if (tobagoConfig.getProjectStage() == ProjectStage.Production) {
expires = 24 * 60 * 60 * 1000L;
}
- final Theme defaultTheme = tobagoConfig.getDefaultTheme();
- addResourceDir(defaultTheme.getFallbackList());
- addResourceDir(tobagoConfig.getSupportedThemes());
final String expiresString = servletConfig.getInitParameter("expires");
if (expiresString != null) {
@@ -108,21 +100,6 @@ public class ResourceServlet extends Htt
nosniffHeader = tobagoConfig.isSetNosniffHeader();
}
- private void addResourceDir(final List<Theme> themes) {
- for (final Theme theme : themes) {
- addResourceDir(theme);
- }
- }
-
- private void addResourceDir(final Theme theme) {
- final String dir = theme.getResourcePath();
- if (dir.startsWith("/")) {
- resourceDirs.add(dir.substring(1));
- } else {
- resourceDirs.add(dir);
- }
- }
-
@Override
protected void doGet(
final HttpServletRequest request, final HttpServletResponse response)
@@ -130,16 +107,6 @@ public class ResourceServlet extends Htt
final String requestURI = request.getRequestURI();
String resource = requestURI.substring(request.getContextPath().length() + 1);
- for (final String resourceDir : resourceDirs) {
- if (resource.startsWith(resourceDir)) {
- final int dirLength = resourceDir.length();
- if (dirLength < resource.length() && Character.isDigit(resource.charAt(dirLength + 1))) {
- // cut off the version number
- resource = resourceDir + resource.substring(resource.indexOf('/', dirLength + 1));
- }
- break;
- }
- }
if (expires != null) {
response.setDateHeader("Last-Modified", 0);
response.setHeader("Cache-Control", "Public, max-age=" + expires);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java Sat Nov 26 10:20:46 2016
@@ -69,7 +69,6 @@ public class TobagoServletContextListene
builder.append("\n*************************************************************************************");
final String note = builder.toString();
LOG.info(note);
- LOG.info("ResourcesManager: " + ResourceManagerFactory.getResourceManager(servletContext));
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java Sat Nov 26 10:20:46 2016
@@ -98,12 +98,6 @@ public abstract class AbstractTobagoTest
application.addComponent(UIButton.COMPONENT_TYPE, UIButton.class.getName());
application.addComponent(UIPopup.COMPONENT_TYPE, UIPopup.class.getName());
- try {
- ResourceManagerFactory.init(servletContext, tobagoConfig);
- } catch (final AssertionError e) {
- // ignored in the moment. TODO
- LOG.error("Todo: remove this hack", e);
- }
tobagoConfig.lock();
}
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParserUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParserUnitTest.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParserUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParserUnitTest.java Sat Nov 26 10:20:46 2016
@@ -62,10 +62,6 @@ public class TobagoConfigParserUnitTest
Assert.assertEquals("my-before-1", fragment.getBefore().get(0));
Assert.assertEquals("my-before-2", fragment.getBefore().get(1));
- Assert.assertEquals(2, fragment.getResourceDirs().size());
- Assert.assertEquals("my-resource-1", fragment.getResourceDirs().get(0));
- Assert.assertEquals("my-resource-2", fragment.getResourceDirs().get(1));
-
Assert.assertEquals(false, fragment.getCreateSessionSecret().booleanValue());
Assert.assertEquals(false, fragment.getCheckSessionSecret().booleanValue());
Assert.assertEquals(false, fragment.getPreventFrameAttacks().booleanValue());
@@ -83,7 +79,6 @@ public class TobagoConfigParserUnitTest
final ThemeImpl theme1 = fragment.getThemeDefinitions().get(0);
Assert.assertEquals("my-theme-1", theme1.getName());
Assert.assertEquals("My Theme 1", theme1.getDisplayName());
- Assert.assertEquals("/my/path-1", theme1.getResourcePath());
Assert.assertTrue(theme1.isVersioned());
Assert.assertTrue(theme1.getRenderersConfig().isMarkupSupported("themeRenderer", "theme-markup"));
Assert.assertTrue(theme1.getProductionResources().isProduction());
@@ -93,7 +88,6 @@ public class TobagoConfigParserUnitTest
final ThemeImpl theme2 = fragment.getThemeDefinitions().get(1);
Assert.assertEquals("my-theme-2", theme2.getName());
Assert.assertEquals("my-theme-1", theme2.getFallbackName());
- Assert.assertEquals("/my/path-2", theme2.getResourcePath());
Assert.assertFalse(theme2.isVersioned());
Assert.assertFalse(theme2.getResources().isProduction());
Assert.assertEquals(0, theme2.getResources().getScriptList().size());
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/MockTheme.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/MockTheme.java?rev=1771456&r1=1771455&r2=1771456&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/MockTheme.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/MockTheme.java Sat Nov 26 10:20:46 2016
@@ -61,11 +61,6 @@ public class MockTheme extends ThemeImpl
}
@Override
- public String getResourcePath() {
- return null;
- }
-
- @Override
public RenderersConfig getRenderersConfig() {
return config;
}