[jbehave-scm] [scm-web][1/1] JBEHAVE-968: Extracted WikiConfigurer interface to allow injection via @Inject.

[Mauro Talevi]

commit 56d5f6dbbd5edf2cb2bf5a317953f0eafbcbd571
Author:     Mauro Talevi <mauro.tal...@aquilonia.org>
AuthorDate: Thu, 12 Dec 2013 19:47:04 +0100
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Thu, 12 Dec 2013 19:47:04 +0100

    JBEHAVE-968: Extracted WikiConfigurer interface to allow injection via 
@Inject.

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 f69cfb4..2f61d69 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
@@ -58,7 +58,7 @@ public class WebRunnerApplication extends WebApplication {
             bind(Embedder.class).toInstance(embedder());
             bind(FileManager.class).toInstance(fileManager());
             bind(ResourceIndexer.class).toInstance(resourceIndexer());
-            bind(WikiConfiguration.class).toInstance(wikiConfiguration());
+            bind(WikiConfigurer.class).toInstance(wikiConfiguration());
         }
 
     }
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 672f013..1690775 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
@@ -1,6 +1,6 @@
 package org.jbehave.web.runner.wicket;
 
-public class WikiConfiguration {
+public class WikiConfiguration implements WikiConfigurer {
 
        private String uri;
        
diff --git 
a/web-runner/src/main/java/org/jbehave/web/runner/wicket/WikiConfigurer.java 
b/web-runner/src/main/java/org/jbehave/web/runner/wicket/WikiConfigurer.java
new file mode 100644
index 0000000..d2fc31f
--- /dev/null
+++ b/web-runner/src/main/java/org/jbehave/web/runner/wicket/WikiConfigurer.java
@@ -0,0 +1,7 @@
+package org.jbehave.web.runner.wicket;
+
+public interface WikiConfigurer {
+
+       String getURI();
+       
+}
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 6e0f4cf..30b5f8a 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
@@ -17,7 +17,7 @@ import org.jbehave.core.io.rest.Resource;
 import org.jbehave.core.io.rest.ResourceIndexer;
 import org.jbehave.web.runner.context.WikiContext;
 import org.jbehave.web.runner.context.WikiContext.SerializableResource;
-import org.jbehave.web.runner.wicket.WikiConfiguration;
+import org.jbehave.web.runner.wicket.WikiConfigurer;
 
 import com.google.inject.Inject;
 
@@ -26,9 +26,9 @@ public class IndexWiki extends Template {
 
        @Inject
        private ResourceIndexer indexer;
-       // @Inject
-       private WikiConfiguration configuration = new WikiConfiguration(
-                       "http://demo.redmine.org/projects/jbehave-rest/wiki";);
+       
+       @Inject
+       private WikiConfigurer configurer;
        
        private WikiContext wikiContext = new WikiContext();
 
@@ -41,7 +41,7 @@ public class IndexWiki extends Template {
                public IndexForm(final String id) {
                        super(id, new CompoundPropertyModel<ValueMap>(new 
ValueMap()));
                        setMarkupId("indexForm");
-                       add(new Label("uri", configuration.getURI()));
+                       add(new Label("uri", configurer.getURI()));
                        add(new Button("updateButton"));
                        add(new 
PropertyListView<SerializableResource>("resourcesList", new 
ArrayList<SerializableResource>()) {
                                @Override
@@ -58,7 +58,7 @@ public class IndexWiki extends Template {
                }
 
                private void indexResources() {
-                       String uri = configuration.getURI();
+                       String uri = configurer.getURI();
                        Map<String, Resource> resources = 
indexer.indexResources(uri);
                        wikiContext.setResources(resources);            
                        PropertyListView<SerializableResource> view = 
(PropertyListView<SerializableResource>) get("resourcesList");