Repository: wicket Updated Branches: refs/heads/WICKET-5713-meta-inf-wicket e4262674d -> d106598d4
WICKET-5713 Move /wicket.properties to /META-INF/wicket/xyz.properties Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d106598d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d106598d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d106598d Branch: refs/heads/WICKET-5713-meta-inf-wicket Commit: d106598d4e244122eb330ae84de9cdc6f0ac1413 Parents: e426267 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Thu Oct 2 13:00:16 2014 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Thu Oct 2 13:00:16 2014 +0200 ---------------------------------------------------------------------- wicket-core/src/main/java/org/apache/wicket/Application.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d106598d/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 f2fd258..5376284 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application.java +++ b/wicket-core/src/main/java/org/apache/wicket/Application.java @@ -508,6 +508,7 @@ public abstract class Application implements UnboundListener, IEventSink { properties.load(jarEntryStream); load(properties); + break; // atm there is no need to have more than one .properties file } } }