diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c1091ba..5d27e74e 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/Dockerfile b/Dockerfile index 077e6ac3..5518d3b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,13 +4,16 @@ FROM openjdk:8-jre-alpine # Dockerfile author / maintainer MAINTAINER SourceLab.org +## 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 diff --git a/kafka-webview-plugin/pom.xml b/kafka-webview-plugin/pom.xml index 421a46cb..4ff6e607 100644 --- a/kafka-webview-plugin/pom.xml +++ b/kafka-webview-plugin/pom.xml @@ -5,7 +5,7 @@ org.sourcelab kafka-webview - 1.0.2 + 1.0.3 4.0.0 kafka-webview-plugin diff --git a/kafka-webview-ui/pom.xml b/kafka-webview-ui/pom.xml index 5c626d0e..e78c3af2 100644 --- a/kafka-webview-ui/pom.xml +++ b/kafka-webview-ui/pom.xml @@ -5,11 +5,11 @@ kafka-webview org.sourcelab - 1.0.2 + 1.0.3 4.0.0 kafka-webview-ui - 1.0.2 + 1.0.3 Kafka WebView UI diff --git a/kafka-webview-ui/src/assembly/distribution/start.bat b/kafka-webview-ui/src/assembly/distribution/start.bat new file mode 100644 index 00000000..c348342a --- /dev/null +++ b/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 diff --git a/kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/configuration/filter/FilterConfigController.java b/kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/configuration/filter/FilterConfigController.java index 37d0c906..be231186 100644 --- a/kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/configuration/filter/FilterConfigController.java +++ b/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 diff --git a/kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/configuration/messageformat/MessageFormatController.java b/kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/configuration/messageformat/MessageFormatController.java index 6c52173d..734370fa 100644 --- a/kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/configuration/messageformat/MessageFormatController.java +++ b/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 diff --git a/pom.xml b/pom.xml index f290098a..3b800f7e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.sourcelab kafka-webview pom - 1.0.2 + 1.0.3