Repository: wicket Updated Branches: refs/heads/master 082b88874 -> d5609b0ee
Use a non-null scope while trying to locate the WordList resource Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d5609b0e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d5609b0e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d5609b0e Branch: refs/heads/master Commit: d5609b0ee3c0dece2439d733118ea4b2a81ed405 Parents: 082b888 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Aug 18 08:44:45 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Aug 18 08:44:45 2014 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/examples/hangman/WordGenerator.java | 2 +- wicket-experimental/wicket-atmosphere/pom.xml | 2 +- .../main/java/org/apache/wicket/atmosphere/Initializer.java | 8 +------- 3 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d5609b0e/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java index 1f31be0..36a6c7c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java @@ -52,7 +52,7 @@ public class WordGenerator implements IClusterable { try { - final IResourceStream resource = new ResourceStreamLocator().locate(null, + final IResourceStream resource = new ResourceStreamLocator().locate(WordGenerator.class, "org/apache/wicket/examples/hangman/WordList", null, null, Locale.getDefault(), ".txt", false); final String wordlist = Streams.readString(resource.getInputStream()); http://git-wip-us.apache.org/repos/asf/wicket/blob/d5609b0e/wicket-experimental/wicket-atmosphere/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/pom.xml b/wicket-experimental/wicket-atmosphere/pom.xml index 5d279fe..77544b7 100644 --- a/wicket-experimental/wicket-atmosphere/pom.xml +++ b/wicket-experimental/wicket-atmosphere/pom.xml @@ -67,7 +67,7 @@ <dependency> <groupId>de.agilecoders.wicket.webjars</groupId> <artifactId>wicket-webjars</artifactId> - <version>0.5.0-SNAPSHOT</version> + <version>0.5.0-M2</version> </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> http://git-wip-us.apache.org/repos/asf/wicket/blob/d5609b0e/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Initializer.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Initializer.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Initializer.java index 5b3a790..9ca643d 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Initializer.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Initializer.java @@ -29,14 +29,8 @@ public class Initializer implements IInitializer @Override public void init(Application application) { - try + if (WicketWebjars.isInstalled(application) == false) { - WicketWebjars.settings(); - } - catch (IllegalStateException x) - { - // try to install only if it is not already installed - // TODO simplify once wicket-webjars has WicketWebjars#isInstalled(application) WicketWebjars.install((org.apache.wicket.protocol.http.WebApplication) application); } }
