Fix the html status page in the jaxrs1.1 implementation.

hawkular · Aug 21, 2015 · e27e4bc · e27e4bc
1 parent 9406b7e
commit e27e4bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/api/metrics-api-jaxrs-1.1/pom.xml b/api/metrics-api-jaxrs-1.1/pom.xml
@@ -151,15 +151,15 @@
               <directory>${basedir}/src/main/webapp</directory>
               <excludes>
                 <exclude>WEB-INF/web.xml</exclude>
-                <exclude>static/index.html</exclude>
+                <exclude>index.html</exclude>
               </excludes>
             </resource>
             <resource>
               <filtering>true</filtering>
               <directory>${basedir}/src/main/webapp</directory>
               <includes>
                 <include>WEB-INF/web.xml</include>
-                <include>static/index.html</include>
+                <include>index.html</include>
               </includes>
             </resource>
           </webResources>

diff --git a/...trics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/filter/TenantFilter.java b/...trics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/filter/TenantFilter.java
@@ -58,7 +58,9 @@ public ServerResponse preProcess(HttpRequest request, ResourceMethod method) thr
         String path = request.getUri().getPath();
 
         if (path.startsWith("/tenants") || path.startsWith("/db") || path.startsWith(StatusHandler.PATH)
-                || path.equals(BaseHandler.PATH) || path.startsWith(VirtualClockHandler.PATH)) {
+                //On older version, the path value from localhost:8080/hawkular/metrics is an empty String instead of /
+                || path.equals(BaseHandler.PATH) || path.equals("")
+                || path.startsWith(VirtualClockHandler.PATH)) {
             // Tenants, Influx and status handlers do not check the tenant header
             return null;
         }