Merge 76caf4b into defb3d4

searls · Feb 19, 2014 · 9ddec2a · 9ddec2a
2 parents defb3d4 + 76caf4b
commit 9ddec2a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/com/github/searls/jasmine/config/JasmineConfiguration.java b/src/main/java/com/github/searls/jasmine/config/JasmineConfiguration.java
@@ -16,6 +16,8 @@ public interface JasmineConfiguration {
 	String getSrcDirectoryName();
 	String getSpecDirectoryName();
 
+	String getWebjarDirectoryName();
+
 	ScriptSearch getSources();
 	ScriptSearch getSpecs();
 

diff --git a/src/main/java/com/github/searls/jasmine/mojo/AbstractJasmineMojo.java b/src/main/java/com/github/searls/jasmine/mojo/AbstractJasmineMojo.java
@@ -445,6 +445,14 @@ public abstract class AbstractJasmineMojo extends AbstractMojo implements Jasmin
   )
   protected String connectorClass;
 
+	/**
+	 * <p>The context from which webjar scripts will be served.</p>
+	 *
+	 * @since 1.3.1.5
+	 */
+	@Parameter(property="webjarDirectoryName", defaultValue="webjar")
+	protected String webjarDirectoryName;
+
 	@Parameter(defaultValue="${project}", readonly=true)
 	protected MavenProject mavenProject;
 
@@ -518,6 +526,11 @@ public String getSpecDirectoryName() {
 		return this.specDirectoryName;
 	}
 
+	@Override
+	public String getWebjarDirectoryName() {
+		return webjarDirectoryName;
+	}
+
 	@Override
 	public List<String> getPreloadSources() {
 		this.addRequireJsIfNecessary(); // This is temporary until the scriptLoaderPath parameter is removed

diff --git a/src/main/java/com/github/searls/jasmine/server/ResourceHandlerConfigurator.java b/src/main/java/com/github/searls/jasmine/server/ResourceHandlerConfigurator.java
@@ -45,7 +45,7 @@ public Handler createHandler() throws IOException  {
     classPathContextHandler.setHandler(new ClassPathResourceHandler(configuration.getProjectClassLoader()));
     classPathContextHandler.setAliases(true);
 
-    ContextHandler webJarsContextHandler = contexts.addContext("/webjar", "");
+    ContextHandler webJarsContextHandler = contexts.addContext("/" + this.configuration.getWebjarDirectoryName(), "");
     webJarsContextHandler.setHandler(new WebJarResourceHandler(configuration.getProjectClassLoader()));
     webJarsContextHandler.setAliases(true);