Repository: wicket Updated Branches: refs/heads/master 549827f9f -> f569ea575
WICKET-5915 The application can not find /META-INF/wicket/**.properties on Windows systems Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f569ea57 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f569ea57 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f569ea57 Branch: refs/heads/master Commit: f569ea57562feb1af98db493a24910918027c082 Parents: 549827f Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed May 27 12:33:35 2015 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed May 27 12:33:35 2015 +0300 ---------------------------------------------------------------------- wicket-core/src/main/java/org/apache/wicket/Application.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f569ea57/wicket-core/src/main/java/org/apache/wicket/Application.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java index 0b263f7..a01f153 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application.java +++ b/wicket-core/src/main/java/org/apache/wicket/Application.java @@ -85,7 +85,6 @@ import org.apache.wicket.request.cycle.IRequestCycleListener; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.cycle.RequestCycleContext; import org.apache.wicket.request.cycle.RequestCycleListenerCollection; -import org.apache.wicket.request.mapper.CompoundRequestMapper; import org.apache.wicket.request.mapper.ICompoundRequestMapper; import org.apache.wicket.request.resource.ResourceReferenceRegistry; import org.apache.wicket.response.filter.EmptySrcAttributeCheckFilter; @@ -170,6 +169,8 @@ public abstract class Application implements UnboundListener, IEventSink private static final String PROPERTIES_FILE_EXTENSION = ".properties"; + private static final String META_INF_WICKET_PATH = File.pathSeparatorChar + "META-INF" + File.pathSeparatorChar + "wicket" + File.pathSeparatorChar; + /** root mapper */ private IRequestMapper rootRequestMapper; @@ -553,7 +554,7 @@ public abstract class Application implements UnboundListener, IEventSink public boolean accept(File file) { String fileName = file.getAbsolutePath(); - return fileName.contains("/META-INF/wicket/") && fileName.endsWith(PROPERTIES_FILE_EXTENSION); + return fileName.contains(META_INF_WICKET_PATH) && fileName.endsWith(PROPERTIES_FILE_EXTENSION); } }); for (File wicketPropertiesFile : files)
