Add root path to velocity context

fcrepo-http-api/src/main/java/org/fcrepo/http/api/responses/StreamingBaseHtmlProvider.java

@@ -42,7 +42,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-
+import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
@@ -89,16 +89,6 @@ public class StreamingBaseHtmlProvider implements MessageBodyWriter<RdfNamespace
      */
     public static final String templatesLocation = "/views";
 
-    /**
-     * Location in the classpath where the common css file is to be found.
-     */
-    public static final String commonCssLocation = "/views/common.css";
-
-    /**
-     * Location in the classpath where the common javascript file is to be found.
-     */
-    public static final String commonJsLocation = "/views/common.js";
-
     /**
      * A map from String names for primary node types to the Velocity templates
      * that should be used for those node types.
@@ -117,7 +107,6 @@ public class StreamingBaseHtmlProvider implements MessageBodyWriter<RdfNamespace
 
     @PostConstruct
     void init() throws IOException {
-
         LOGGER.trace("Velocity engine initializing...");
         final Properties properties = new Properties();
         final String fcrepoHome = getProperty("fcrepo.home");
@@ -165,7 +154,6 @@ public void writeTo(final RdfNamespacedStream nsStream, final Class<?> type,
                         final OutputStream entityStream) throws IOException {
 
         final Node subject = ViewHelpers.getContentNode(nsStream.stream.topic());
-
         final Model model = nsStream.stream.collect(toModel());
         model.setNsPrefixes(nsStream.namespaces);
 
@@ -184,6 +172,14 @@ protected Context getContext(final Model model, final Node subject) {
         final FieldTool fieldTool = new FieldTool();
 
         final Context context = new VelocityContext();
+        final String[] baseUrl = uriInfo.getBaseUri().getPath().split("/");
+        if (baseUrl.length > 0) {
+            final String staticBaseUrl =
+                Arrays.asList(Arrays.copyOf(baseUrl, baseUrl.length - 1)).stream().collect(Collectors.joining("/"));
+            context.put("staticBaseUrl", staticBaseUrl);
+        } else {
+            context.put("staticBaseUrl", "/");
+        }
         context.put("rdfLexicon", fieldTool.in(RdfLexicon.class));
         context.put("helpers", VIEW_HELPERS);
         context.put("esc", escapeTool);

fcrepo-http-api/src/main/resources/views/common-head.vsl

@@ -1,6 +1,6 @@
-<link rel="icon" type="image/png" href="$uriInfo.baseUriBuilder.build()../static/images/fcrepo-favicon.png">
-<script src="$uriInfo.baseUriBuilder.build()../static/js/jquery-1.9.1.min.js" ></script>
-<script src="$uriInfo.baseUriBuilder.build()../static/js/bootstrap-3.0.0.min.js"></script>
-<link href="$uriInfo.baseUriBuilder.build()../static/css/bootstrap-3.0.0.min.css" rel="stylesheet">
-<script type="text/javascript" src="$uriInfo.baseUriBuilder.build()fcr:assets/common.js"></script>
-<link rel="stylesheet" type="text/css" href="$uriInfo.baseUriBuilder.build()fcr:assets/common.css">
+<link rel="icon" type="image/png" href="$staticBaseUrl/static/images/fcrepo-favicon.png">
+<script src="$staticBaseUrl/static/js/jquery-1.9.1.min.js" ></script>
+<script src="$staticBaseUrl/static/js/bootstrap-3.0.0.min.js"></script>
+<link href="$staticBaseUrl/static/css/bootstrap-3.0.0.min.css" rel="stylesheet">
+<script type="text/javascript" src="$staticBaseUrl/static/js/common.js"></script>
+<link rel="stylesheet" type="text/css" href="$staticBaseUrl/static/css/common.css">

fcrepo-http-api/src/test/java/org/fcrepo/http/api/responses/StreamingBaseHtmlProviderTest.java

@@ -40,6 +40,7 @@
 import java.io.Writer;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
+import java.net.URI;
 import java.util.stream.Stream;
 
 import javax.jcr.NamespaceRegistry;
@@ -112,6 +113,9 @@ public void setup() throws RepositoryException {
 
         testData2 = new RdfNamespacedStream(stream2, getNamespaces(mockSession));
         final UriInfo info = Mockito.mock(UriInfo.class);
+        final URI baseUri = URI.create("http://localhost:8080/rest/");
+        when(info.getBaseUri()).thenReturn(baseUri);
+
         setField(testProvider, "uriInfo", info);
     }