Serve angular UI from current jaxrs API

api/metrics-api-jaxrs/pom.xml

@@ -109,6 +109,11 @@
       <artifactId>cdi-api</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>io.undertow</groupId>
+      <artifactId>undertow-servlet</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.jboss.logging</groupId>

api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/filter/TenantFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Red Hat, Inc. and/or its affiliates
+ * Copyright 2014-2017 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.hawkular.metrics.api.jaxrs.filter;
 
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
@@ -56,7 +55,10 @@ public void filter(ContainerRequestContext requestContext) throws IOException {
         UriInfo uriInfo = requestContext.getUriInfo();
         String path = uriInfo.getPath();
 
-        if (path.startsWith("/tenants") || path.startsWith(StatusHandler.PATH) || path.equals(BaseHandler.PATH)) {
+        if (path.startsWith("/tenants")
+                || path.startsWith(StatusHandler.PATH)
+                || path.startsWith("/ui")
+                || path.equals(BaseHandler.PATH)) {
             // Some handlers do not check the tenant header
             return;
         }

api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/BaseHandler.java

@@ -26,7 +26,6 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -66,8 +65,7 @@ public Response baseJSON() {
     @GET
     @Produces({APPLICATION_XHTML_XML, TEXT_HTML})
     public void baseHTML(@Context ServletContext context) throws Exception {
-        HttpServletRequest request = ResteasyProviderFactory.getContextData(HttpServletRequest.class);
         HttpServletResponse response = ResteasyProviderFactory.getContextData(HttpServletResponse.class);
-        request.getRequestDispatcher("/static/index.html").forward(request, response);
+        response.sendRedirect("/hawkular/metrics/ui/index.html");
     }
 }

api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/ClientRouterDispatchingServlet.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2014-2017 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.hawkular.metrics.api.jaxrs.handler;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import io.undertow.servlet.handlers.DefaultServlet;
+
+/**
+ * Servlet used for delivering static data as undertow's DefaultServlet and preserves url for client-side router
+ * such as Angular's in single-page app context
+ * @author Joel Takvorian
+ */
+public class ClientRouterDispatchingServlet extends DefaultServlet {
+
+    @Override
+    protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
+        String path = req.getPathInfo();
+        // FIXME: find a safer & more generic way.
+        // Beware, urls could be like "hawkular/metrics/ui/something/file/abc.json" which is not necessarily static content
+        // Maybe put all in "assets", but need to find how to do it with dynamically loaded fonts
+        if (path.endsWith(".js")
+                || path.endsWith(".css")
+                || path.endsWith(".woff2")
+                || path.endsWith(".ttf")
+                || path.endsWith(".html")
+                || path.endsWith(".png")
+                || path.endsWith(".jpg")) {
+            super.doGet(req, resp);
+            return;
+        }
+        req.getRequestDispatcher("/ui/index.html").forward(req, resp);
+    }
+}

api/metrics-api-jaxrs/src/main/webapp/WEB-INF/web.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2014-2016 Red Hat, Inc. and/or its affiliates
+    Copyright 2014-2017 Red Hat, Inc. and/or its affiliates
     and other contributors as indicated by the @author tags.
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,16 +35,18 @@
   </resource-env-ref>
 
   <servlet>
-    <servlet-name>staticContent</servlet-name>
-    <servlet-class>io.undertow.servlet.handlers.DefaultServlet</servlet-class>
-    <init-param>
-      <param-name>resolve-against-context-root</param-name>
-      <param-value>true</param-value>
-    </init-param>
+    <servlet-name>angularRoutes</servlet-name>
+    <servlet-class>org.hawkular.metrics.api.jaxrs.handler.ClientRouterDispatchingServlet</servlet-class>
   </servlet>
 
   <servlet-mapping>
-    <servlet-name>staticContent</servlet-name>
-    <url-pattern>/static/*</url-pattern>
+    <servlet-name>angularRoutes</servlet-name>
+    <url-pattern>/ui</url-pattern>
   </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>angularRoutes</servlet-name>
+    <url-pattern>/ui/*</url-pattern>
+  </servlet-mapping>
+
 </web-app>