commit 26f524c3e18ae4507b1fb525aa163e37a3703cbe Author: Mauro Talevi <mauro.tal...@aquilonia.org> AuthorDate: Thu, 12 Dec 2013 19:53:58 +0100 Commit: Mauro Talevi <mauro.tal...@aquilonia.org> CommitDate: Thu, 12 Dec 2013 19:53:58 +0100
JBEHAVE-968: Allow for credentials when accessing wiki. diff --git a/web-runner/src/main/java/org/jbehave/web/runner/wicket/WebRunnerApplication.java b/web-runner/src/main/java/org/jbehave/web/runner/wicket/WebRunnerApplication.java index 2f61d69..e9506f9 100644 --- a/web-runner/src/main/java/org/jbehave/web/runner/wicket/WebRunnerApplication.java +++ b/web-runner/src/main/java/org/jbehave/web/runner/wicket/WebRunnerApplication.java @@ -75,7 +75,8 @@ public class WebRunnerApplication extends WebApplication { } protected ResourceIndexer resourceIndexer() { - return new IndexFromRedmine(); + WikiConfiguration configuration = wikiConfiguration(); + return new IndexFromRedmine(configuration.getUsername(), configuration.getPassword()); } protected StoryRunner storyRunner() { diff --git a/web-runner/src/main/java/org/jbehave/web/runner/wicket/WikiConfiguration.java b/web-runner/src/main/java/org/jbehave/web/runner/wicket/WikiConfiguration.java index 1690775..a55a80c 100644 --- a/web-runner/src/main/java/org/jbehave/web/runner/wicket/WikiConfiguration.java +++ b/web-runner/src/main/java/org/jbehave/web/runner/wicket/WikiConfiguration.java @@ -3,13 +3,29 @@ package org.jbehave.web.runner.wicket; public class WikiConfiguration implements WikiConfigurer { private String uri; + private String username; + private String password; public WikiConfiguration(String uri) { + this(uri, null, null); + } + + public WikiConfiguration(String uri, String username, String password) { this.uri = uri; + this.username = username; + this.password = password; } public String getURI() { return uri; } + public String getUsername() { + return username; + } + + public String getPassword() { + return password; + } + } \ No newline at end of file diff --git a/web-runner/src/main/java/org/jbehave/web/runner/wicket/pages/IndexWiki.java b/web-runner/src/main/java/org/jbehave/web/runner/wicket/pages/IndexWiki.java index 30b5f8a..1c654f0 100644 --- a/web-runner/src/main/java/org/jbehave/web/runner/wicket/pages/IndexWiki.java +++ b/web-runner/src/main/java/org/jbehave/web/runner/wicket/pages/IndexWiki.java @@ -1,8 +1,6 @@ package org.jbehave.web.runner.wicket.pages; import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import java.util.Map; import org.apache.wicket.markup.html.basic.Label;