Fix 500 error unable to find templates when running under windows (#56)

* Fix 500 error unable to find templates when running under windows

* add start.bat for windows

Author: Crim

CHANGELOG.md

@@ -2,7 +2,11 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## 1.0.2 (01/26/2018
+## 1.0.3 (01/26/2018)
+- Fix 500 error unable to find templates when running under windows.
+- Add start.bat script for running under windows.
+
+## 1.0.2 (01/26/2018)
 - Increase file upload limit from 15MB to 64MB.
 
 ## 1.0.1 (01/17/2018)

Dockerfile

@@ -4,13 +4,16 @@ FROM openjdk:8-jre-alpine
 # Dockerfile author / maintainer
 MAINTAINER SourceLab.org <stephen.powis@gmail.com>
 
+## Define version to install
+ENV WV_VER=1.0.2
+
 # Create app and data directories
 RUN mkdir -p /app
 WORKDIR /app
 
 # Download latest distribution inside image
 # Extract package into /app stripping top level directory contained within the zip.
-RUN wget https://github.com/SourceLabOrg/kafka-webview/releases/download/v1.0.2/kafka-webview-ui-1.0.2-bin.zip && unzip -d /app kafka-webview-ui-*-bin.zip && rm -f /app/kafka-webview-ui-*-bin.zip && f=`ls` && mv /app/*/* /app && rmdir $f && rm -f /app/kafka-webview-ui-*-sources.jar && rm -f /app/kafka-webview-ui-*-javadoc.jar && apk add --update bash && rm -rf /var/cache/apk/*
+RUN wget https://github.com/SourceLabOrg/kafka-webview/releases/download/v${WV_VER}/kafka-webview-ui-${WV_VER}-bin.zip && unzip -d /app kafka-webview-ui-*-bin.zip && rm -f /app/kafka-webview-ui-*-bin.zip && f=`ls` && mv /app/*/* /app && rmdir $f && rm -f /app/kafka-webview-ui-*-sources.jar && rm -f /app/kafka-webview-ui-*-javadoc.jar && apk add --update bash && rm -rf /var/cache/apk/*
 
 # Create volume to persist data
 VOLUME /app/data

kafka-webview-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.sourcelab</groupId>
         <artifactId>kafka-webview</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kafka-webview-plugin</artifactId>

kafka-webview-ui/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <artifactId>kafka-webview</artifactId>
         <groupId>org.sourcelab</groupId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kafka-webview-ui</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
 
     <!-- Module Description and Ownership -->
     <name>Kafka WebView UI</name>

kafka-webview-ui/src/assembly/distribution/start.bat

@@ -0,0 +1,5 @@
+## Define configuration
+set SPRING_CONFIG_LOCATION=classpath:/config/base.yml,config.yml
+
+## launch webapp
+java -jar kafka-webview-ui-*.jar

kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/configuration/filter/FilterConfigController.java

@@ -157,7 +157,7 @@ public String update(
             bindingResult.addError(new FieldError(
                 "filterForm", "file", "", true, null, null, "Select a jar to upload")
             );
-            return "/configuration/filter/create";
+            return "configuration/filter/create";
         }
 
         // If filter exists
@@ -191,7 +191,7 @@ public String update(
                     null,
                     "Filter must have unique name")
                 );
-                return "/configuration/filter/create";
+                return "configuration/filter/create";
             }
         }
 
@@ -205,7 +205,7 @@ public String update(
                 bindingResult.addError(new FieldError(
                     "filterForm", "file", "", true, null, null, "File must have a .jar extension")
                 );
-                return "/configuration/filter/create";
+                return "configuration/filter/create";
             }
 
             try {
@@ -232,7 +232,7 @@ public String update(
                     bindingResult.addError(new FieldError(
                         "filterForm", "file", "", true, null, null, exception.getMessage())
                     );
-                    return "/configuration/filter/create";
+                    return "configuration/filter/create";
                 }
 
                 // If successful overwrite original jar

kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/configuration/messageformat/MessageFormatController.java

@@ -188,7 +188,7 @@ public String create(
             bindingResult.addError(new FieldError(
                 "messageFormatForm", "file", "", true, null, null, "Select a jar to upload")
             );
-            return "/configuration/messageFormat/create";
+            return "configuration/messageFormat/create";
         }
 
         // If filter exists
@@ -233,7 +233,7 @@ public String create(
                         "messageFormatForm", "file", "", true, null, null, exception.getMessage())
                     );
                     // And re-display the form.
-                    return "/configuration/messageFormat/create";
+                    return "configuration/messageFormat/create";
                 }
                 // Ok new JAR looks good.
                 // 1 - remove pre-existing jar if it exists

pom.xml

@@ -7,7 +7,7 @@
     <groupId>org.sourcelab</groupId>
     <artifactId>kafka-webview</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
 
     <!-- Define submodules -->
     <modules>