final fixes - Wima 2.0 is releasable

epam · May 22, 2021 · 3d58b5d · 3d58b5d
1 parent f5be759
commit 3d58b5d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/config/docker/Dockerfile-Wilma b/config/docker/Dockerfile-Wilma
@@ -14,10 +14,10 @@ RUN \
   apt-get install -y openjdk-11-jre && \
   apt-get upgrade -y && \
   rm -rf /var/lib/apt/lists/* && \
-  wget https://github.com/epam/Wilma/releases/download/V2.0.451/wilma-application-2.0.451.zip && \
-  unzip wilma-application-2.0.451.zip && \
-  mv wilma-2.0.451.jar wilma.jar && \
-  rm -f wilma-application-2.0.451.zip
+  wget https://github.com/epam/Wilma/releases/download/V2.0.459/wilma-application-2.0.459.zip && \
+  unzip wilma-application-2.0.459.zip && \
+  mv wilma-2.0.459.jar wilma.jar && \
+  rm -f wilma-application-2.0.459.zip
 
 COPY start_wilma.sh /data/
 RUN \

diff --git a/config/docker/Dockerfile-Wilma_and_Wilma_Message_Search b/config/docker/Dockerfile-Wilma_and_Wilma_Message_Search
@@ -11,10 +11,10 @@ RUN \
   apt-get upgrade -y && \
   apt-get install -y openjdk-11-jdk && \
   rm -rf /var/libs/apt/lists/* && \
-  wget https://github.com/epam/Wilma/releases/download/V2.0.451/wilma-message-search-2.0.451.zip && \
-  unzip -o wilma-message-search-2.0.451.zip && \
-  mv wilma-message-search-2.0.451.jar wilma-message-search.jar && \
-  rm -f wilma-message-search-2.0.451.zip
+  wget https://github.com/epam/Wilma/releases/download/V2.0.451/wilma-message-search-2.0.459.zip && \
+  unzip -o wilma-message-search-2.0.459.zip && \
+  mv wilma-message-search-2.0.459.jar wilma-message-search.jar && \
+  rm -f wilma-message-search-2.0.459.zip
 
 COPY start_wilma_and_message_search.sh /data/
 RUN \

diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
-#Fri May 21 23:49:57 CEST 2021
-VERSION_CODE=455
+#Sat May 22 13:51:36 CEST 2021
+VERSION_CODE=458
diff --git a/.../modules/wilma-common/src/main/java/com/epam/wilma/common/helper/LogFilePathProvider.java b/.../modules/wilma-common/src/main/java/com/epam/wilma/common/helper/LogFilePathProvider.java
@@ -51,6 +51,6 @@ public Path getLogFilePath() {
      * @return Path of the application log folder
      */
     public Path getAppLogFilePath() {
-        return FileSystems.getDefault().getPath("log", "app");
+        return FileSystems.getDefault().getPath("log");
     }
 }
diff --git a/.../src/main/java/com/epam/wilma/stubconfig/initializer/support/helper/WilmaClassLoader.java b/.../src/main/java/com/epam/wilma/stubconfig/initializer/support/helper/WilmaClassLoader.java
@@ -17,6 +17,7 @@
 You should have received a copy of the GNU General Public License
 along with Wilma.  If not, see <http://www.gnu.org/licenses/>.
 ===========================================================================*/
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -72,7 +73,7 @@ private byte[] transferToByteArray(InputStream inputStream) throws ClassNotFound
         ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
         int nextValue;
         try {
-            while ( (nextValue = inputStream.read()) != -1 ) {
+            while ((nextValue = inputStream.read()) != -1) {
                 byteStream.write(nextValue);
             }
         } catch (IOException e) {

diff --git a/wilma-application/modules/wilma-webapp/src/main/resources/web-admin/js/logs.js b/wilma-application/modules/wilma-webapp/src/main/resources/web-admin/js/logs.js
@@ -3,12 +3,12 @@ $(document).ready(function() {
     $("#nav-wilma-log").addClass("active");
 
     // gets the version and sets the version label
-    $.get('../config/public/version', function(data) {
+    $.get('/config/public/version', function(data) {
         $("#span-version").text(data.wilmaVersion);
     });
 
     // GETs list of message files and creates links from each
-    $.get('../config/public/logs', function(data) {
+    $.get('/config/public/logs', function(data) {
         var filesLenght = data.files.length;
         if (filesLenght > 0) {
             appendNewLogFileRow(data, 0);
@@ -18,16 +18,16 @@ $(document).ready(function() {
         }
     });
 
-    $.get('../config/public/actualload', function(data) {
+    $.get('/config/public/actualload', function(data) {
         $("#span-messages-logger-queue-info").text(data.loggerQueueSize);
         $("#span-messages-response-queue-info").text(data.responseQueueSize);
     });
 });
 
 function appendNewLogFileRow(data, i) {
     var li = $("<li>");
-    var a = $("<a href='../config/public/logs/" + data.files[i] + "'>").text(data.files[i]);
-    var btn = $("<a target='_blank' href='../config/public/logs/" + data.files[i]
+    var a = $("<a href='/config/public/logs/" + data.files[i] + "'>").text(data.files[i]);
+    var btn = $("<a target='_blank' href='/config/public/logs/" + data.files[i]
                       + "?source=true'>").text("[Source]");
     li.append(a);
     li.append("     ");