From add2876b70fdb875a0d3651cf77b201d3e4e46ab Mon Sep 17 00:00:00 2001
From: IT Hit <build@ithit.com>
Date: Thu, 14 Dec 2017 20:56:02 +0200
Subject: [PATCH] 3.1.2208

---
 README.md                                         |  6 +++---
 androidfsstorage/app/build.gradle                 |  6 +++---
 .../app/src/main/assets/MyCustomHandlerPage.html  |  4 ++--
 .../assets/{afb => wwwroot}/AjaxFileBrowser.html  |  0
 .../{afb => wwwroot}/AjaxIntegrationTests.html    |  0
 ...roidLogContext.java => AndroidNanoLogger.java} | 15 ++++++++++-----
 .../androidfsstorage/CustomFolderGetHandler.java  |  4 ++--
 .../androidfsstorage/HierarchyItemImpl.java       |  3 +--
 .../android/AndroidConfigurationHelper.java       |  6 +++---
 .../android/NanoIntentService.java                |  9 ++++-----
 androidfsstorage/build.gradle                     |  4 +++-
 deltav/pom.xml                                    | 15 ++++++++-------
 .../samples/deltavservlet/HierarchyItemImpl.java  |  2 +-
 .../samples/deltavservlet/WebDavServlet.java      | 10 +++++-----
 filesystemstorage/pom.xml                         | 13 +++++++------
 .../fsstorageservlet/HierarchyItemImpl.java       |  2 +-
 .../samples/fsstorageservlet/WebDavServlet.java   | 10 +++++-----
 oraclestorage/pom.xml                             | 15 ++++++++-------
 .../oraclestorageservlet/HierarchyItemImpl.java   |  2 +-
 .../oraclestorageservlet/WebDavServlet.java       | 10 +++++-----
 20 files changed, 72 insertions(+), 64 deletions(-)
 rename androidfsstorage/app/src/main/assets/{afb => wwwroot}/AjaxFileBrowser.html (100%)
 rename androidfsstorage/app/src/main/assets/{afb => wwwroot}/AjaxIntegrationTests.html (100%)
 rename androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/{AndroidLogContext.java => AndroidNanoLogger.java} (81%)

diff --git a/README.md b/README.md
index 9eca670..f9e24da 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ WebDAV server with file system back-end storage is a fully functional Class 2 se
 ## WebDAV Server with Versioning Example
 This example demonstrates how you can implement file versioning support in your WebDAV server. It is using auto-versioning and each time you save a file the new version is created. Your client application does not need to know anything about versioning support on a server side. While capable of handling any WebDAV clients, this DeltaV sample is optimized to work with Microsoft Office. It is using Lock/Unlock commands to minimize an amount of versions created. [more...](https://www.webdavsystem.com/javaserver/server_examples/deltav_storage/)
 
-## Android WebDAV Server on NanoHTTPD Example
- A modified NanoHTTPD mobile WebDAV server that runs on Android. It stores all files in mobile device file system while locks and properties in SQLite. This sample provides access to the documents inside a mobile app folder. To see the documents a user opens a sample web page served by this server in a web browser on any machine in the local network. A user can open, edit and save documents back to the mobile device as well as can upload, download and manage documents using any WebDAV client. The sample requires license. 
+## Android WebDAV Server Example
+ A mobile WebDAV server that runs on Android on modified NanoHTTPD server. It stores all files in mobile device file system while locks and properties in SQLite. This sample provides access to the documents inside a mobile app folder. To see the documents a user opens a sample web page served by this server in a web browser on any machine in the local network. A user can open, edit and save documents back to the mobile device as well as can upload, download and manage documents using any WebDAV client. The sample requires license. 
  Its text should be added to the **webdavsettings.json** file (see **assets** folder) in the **License** section. Please change all double quotes to single quotes in the license text or remove **xml** header.
- To build example execute **buildAndroid.bat** or **buildAndroid**  in the root folder.
\ No newline at end of file
+ To build example execute **buildAndroid.bat** or **buildAndroid**  in the root folder.  [more...](https://www.webdavsystem.com/javaserver/server_examples/android/)
\ No newline at end of file
diff --git a/androidfsstorage/app/build.gradle b/androidfsstorage/app/build.gradle
index 0262c46..046f865 100644
--- a/androidfsstorage/app/build.gradle
+++ b/androidfsstorage/app/build.gradle
@@ -23,7 +23,7 @@ android {
 jarJar {
     rules = [
             'stax-api-1.0.1.jar': 'javax.xml.** com.ithit.webdav.xml.@1',
-            'webdav-server-3.0.2101.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
+            'webdav-server-3.1.2208.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
     ]
 }
 
@@ -38,11 +38,11 @@ dependencies {
     compile 'commons-io:commons-io:2.4'
     compile 'com.google.code.gson:gson:2.7'
     compile 'com.android.support:appcompat-v7:26.+'
-    compile ('com.ithit.webdav.integration:android-integration:3.0.2101', {
+    compile ('com.ithit.webdav.integration:android-integration:3.1.2208', {
         exclude group: 'org.nanohttpd', module: 'nanohttpd'
     })
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     jarJar 'stax:stax-api:1.0.1'
-    jarJar 'com.ithit.webdav:webdav-server:3.0.2101'
+    jarJar 'com.ithit.webdav:webdav-server:3.1.2208'
     testCompile 'junit:junit:4.12'
 }
\ No newline at end of file
diff --git a/androidfsstorage/app/src/main/assets/MyCustomHandlerPage.html b/androidfsstorage/app/src/main/assets/MyCustomHandlerPage.html
index d0a50c6..8ce3584 100644
--- a/androidfsstorage/app/src/main/assets/MyCustomHandlerPage.html
+++ b/androidfsstorage/app/src/main/assets/MyCustomHandlerPage.html
@@ -326,13 +326,13 @@ <h3>Connect with WebDAV Client</h3>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.jquery.min.js"></script>
 <script>
     function OpenAjaxFileBrowserWindow() {
-        window.open("afb/AjaxFileBrowser.html", "", "menubar=1,location=1,status=1,scrollbars=1,resizable=1,width=900,height=600");
+        window.open("wwwroot/AjaxFileBrowser.html", "", "menubar=1,location=1,status=1,scrollbars=1,resizable=1,width=900,height=600");
     }
 
     function OpenTestsWindow() {
         var width = Math.round(screen.width * 0.5);
         var height = Math.round(screen.height * 0.8);
-        window.open("afb/AjaxIntegrationTests.html", "", "menubar=1,location=1,status=1,scrollbars=1,resizable=1,width=" + width + ",height=" + height);
+        window.open("wwwroot/AjaxIntegrationTests.html", "", "menubar=1,location=1,status=1,scrollbars=1,resizable=1,width=" + width + ",height=" + height);
     }
 
     (function () {
diff --git a/androidfsstorage/app/src/main/assets/afb/AjaxFileBrowser.html b/androidfsstorage/app/src/main/assets/wwwroot/AjaxFileBrowser.html
similarity index 100%
rename from androidfsstorage/app/src/main/assets/afb/AjaxFileBrowser.html
rename to androidfsstorage/app/src/main/assets/wwwroot/AjaxFileBrowser.html
diff --git a/androidfsstorage/app/src/main/assets/afb/AjaxIntegrationTests.html b/androidfsstorage/app/src/main/assets/wwwroot/AjaxIntegrationTests.html
similarity index 100%
rename from androidfsstorage/app/src/main/assets/afb/AjaxIntegrationTests.html
rename to androidfsstorage/app/src/main/assets/wwwroot/AjaxIntegrationTests.html
diff --git a/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/AndroidLogContext.java b/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/AndroidNanoLogger.java
similarity index 81%
rename from androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/AndroidLogContext.java
rename to androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/AndroidNanoLogger.java
index 3c0eab3..be0fc90 100644
--- a/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/AndroidLogContext.java
+++ b/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/AndroidNanoLogger.java
@@ -3,13 +3,13 @@
 import android.app.Service;
 import android.content.Intent;
 
-import com.ithit.webdav.integration.android.AndroidLoggingContext;
 import com.ithit.webdav.samples.androidfsstorage.android.NanoBroadcastReceiver;
+import com.ithit.webdav.server.Logger;
 
 /**
  * Represents logging messages to the application view on devices, running Android.
  */
-public class AndroidLogContext extends AndroidLoggingContext {
+public class AndroidNanoLogger implements Logger {
 
     /**
      * Logging intent service.
@@ -20,7 +20,7 @@ public class AndroidLogContext extends AndroidLoggingContext {
      * Creates new instance of this class.
      * @param intentService Logging intent service.
      */
-    public AndroidLogContext(Service intentService) {
+    public AndroidNanoLogger(Service intentService) {
         this.intentService = intentService;
     }
 
@@ -29,7 +29,7 @@ public AndroidLogContext(Service intentService) {
      * @param message Text message.
      */
     @Override
-    public void log(String message) {
+    public void logDebug(String message) {
         Intent broadcastIntent = new Intent(NanoBroadcastReceiver.LOG_OUTPUT);
         broadcastIntent.addCategory(Intent.CATEGORY_DEFAULT);
         broadcastIntent.putExtra("message", message);
@@ -42,7 +42,7 @@ public void log(String message) {
      * @param throwable Error.
      */
     @Override
-    public void log(String message, Throwable throwable) {
+    public void logError(String message, Throwable throwable) {
         Intent broadcastIntent = new Intent(NanoBroadcastReceiver.LOG_OUTPUT);
         broadcastIntent.addCategory(Intent.CATEGORY_DEFAULT);
         StringBuilder trace = new StringBuilder();
@@ -52,4 +52,9 @@ public void log(String message, Throwable throwable) {
         broadcastIntent.putExtra("message", message + "\n\n" + trace);
         intentService.sendBroadcast(broadcastIntent);
     }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return true;
+    }
 }
diff --git a/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/CustomFolderGetHandler.java b/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/CustomFolderGetHandler.java
index 2df02e7..7266315 100644
--- a/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/CustomFolderGetHandler.java
+++ b/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/CustomFolderGetHandler.java
@@ -55,7 +55,7 @@ public void processRequest(DavRequest request, DavResponse response, HierarchyIt
             }
             stream.flush();
         } else {
-            if (request.getRequestURI().contains("afb/AjaxIntegrationTests.html")) {
+            if (request.getRequestURI().contains("wwwroot/AjaxIntegrationTests.html")) {
                 PrintStream stream = new PrintStream(response.getOutputStream(), true, charset);
                 response.setCharacterEncoding(charset);
                 response.setContentType("text/html");
@@ -63,7 +63,7 @@ public void processRequest(DavRequest request, DavResponse response, HierarchyIt
                     stream.println(line);
                 }
                 stream.flush();
-            } else if (request.getRequestURI().contains("afb/AjaxFileBrowser.html")) {
+            } else if (request.getRequestURI().contains("wwwroot/AjaxFileBrowser.html")) {
                 PrintStream stream = new PrintStream(response.getOutputStream(), true, charset);
                 response.setCharacterEncoding(charset);
                 response.setContentType("text/html");
diff --git a/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/HierarchyItemImpl.java b/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/HierarchyItemImpl.java
index 474cbaa..6b253be 100644
--- a/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/HierarchyItemImpl.java
+++ b/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/HierarchyItemImpl.java
@@ -1,7 +1,6 @@
 package com.ithit.webdav.samples.androidfsstorage;
 
 import com.ithit.webdav.samples.androidfsstorage.extendedattributes.ExtendedAttributesExtension;
-import com.ithit.webdav.server.Engine;
 import com.ithit.webdav.server.Folder;
 import com.ithit.webdav.server.HierarchyItem;
 import com.ithit.webdav.server.Lock;
@@ -279,7 +278,7 @@ private boolean clientHasToken() throws ServerException {
         if (activeLocks.size() == 0) {
             return true;
         }
-        List<String> clientLockTokens = Engine.getClientLockTokens(getEngine().getRequest());
+        List<String> clientLockTokens = getEngine().getRequest().getClientLockTokens();
         for (LockInfo lockInfo: activeLocks) {
             if (clientLockTokens.contains(lockInfo.getToken())) {
                 return true;
diff --git a/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/android/AndroidConfigurationHelper.java b/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/android/AndroidConfigurationHelper.java
index 4ff5a98..90aadc8 100644
--- a/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/android/AndroidConfigurationHelper.java
+++ b/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/android/AndroidConfigurationHelper.java
@@ -38,16 +38,16 @@ private void fillConfigMap(String jsonString) {
     }
 
     private String readConfig(AssetManager assetManager, String jsonFileName) {
-        String jsonString = "";
+        StringBuilder jsonString = new StringBuilder();
         try {
             List<String> jsonLines = IOUtils.readLines(assetManager.open(jsonFileName));
 
             for (String s: jsonLines) {
-                jsonString += s;
+                jsonString.append(s);
             }
         } catch (IOException ignored) {
         }
-        return jsonString;
+        return jsonString.toString();
     }
 
 
diff --git a/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/android/NanoIntentService.java b/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/android/NanoIntentService.java
index 49ec761..d1c91e9 100644
--- a/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/android/NanoIntentService.java
+++ b/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/android/NanoIntentService.java
@@ -7,10 +7,9 @@
 import android.os.IBinder;
 import android.util.Log;
 
-import com.ithit.webdav.samples.androidfsstorage.AndroidLogContext;
+import com.ithit.webdav.samples.androidfsstorage.AndroidNanoLogger;
 import com.ithit.webdav.samples.androidfsstorage.AndroidWebDavServer;
 import com.ithit.webdav.samples.androidfsstorage.Config;
-import com.ithit.webdav.server.DefaultLoggerImpl;
 import com.ithit.webdav.server.Logger;
 
 import org.apache.commons.io.IOUtils;
@@ -40,7 +39,7 @@ public NanoIntentService() {}
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        Logger logger = new DefaultLoggerImpl(new AndroidLogContext(this));
+        Logger logger = new AndroidNanoLogger(this);
 
         InputStream getPage = null;
         InputStream errorPage = null;
@@ -49,8 +48,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         try {
             getPage = getApplicationContext().getAssets().open("MyCustomHandlerPage.html");
             errorPage = getApplicationContext().getAssets().open("attributesErrorPage.html");
-            testPage = getApplicationContext().getAssets().open("afb/AjaxIntegrationTests.html");
-            browserPage = getApplicationContext().getAssets().open("afb/AjaxFileBrowser.html");
+            testPage = getApplicationContext().getAssets().open("wwwroot/AjaxIntegrationTests.html");
+            browserPage = getApplicationContext().getAssets().open("wwwroot/AjaxFileBrowser.html");
             List<String> getPageLines = IOUtils.readLines(getPage, StandardCharsets.UTF_8);
             List<String> errorPageLines = IOUtils.readLines(errorPage, StandardCharsets.UTF_8);
             List<String> testPageLines = IOUtils.readLines(testPage, StandardCharsets.UTF_8);
diff --git a/androidfsstorage/build.gradle b/androidfsstorage/build.gradle
index b91f1a3..e41a7b7 100644
--- a/androidfsstorage/build.gradle
+++ b/androidfsstorage/build.gradle
@@ -2,11 +2,12 @@
 
 buildscript {
     repositories {
+        mavenLocal()
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'ru.tinkoff.gradle:jarjar:1.1.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenLocal()
         jcenter()
     }
 }
diff --git a/deltav/pom.xml b/deltav/pom.xml
index 80166e9..95dd912 100644
--- a/deltav/pom.xml
+++ b/deltav/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.ithit.webdav.samples</groupId>
     <artifactId>deltav</artifactId>
-    <version>3.0.2114</version>
+    <version>3.1.2208</version>
     <packaging>war</packaging>
 
     <properties>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.ithit.webdav.integration</groupId>
             <artifactId>servlet-integration</artifactId>
-            <version>3.0.2114</version>
+            <version>3.1.2208</version>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>com.ithit.webdav</groupId>
             <artifactId>webdav-server</artifactId>
-            <version>3.0.2114</version>
+            <version>3.1.2208</version>
         </dependency>
 
         <dependency>
@@ -133,7 +133,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/deltav-3.0.2114/META-INF</outputDirectory>
+                            <outputDirectory>${project.build.directory}/deltav-3.1.2208/META-INF</outputDirectory>
                             <overwrite>true</overwrite>
                             <resources>
                                 <resource>
@@ -212,7 +212,7 @@
                     <server>filesystem</server>
                     <port>11021</port>
                     <path>/</path>
-                    <warSourceDirectory>target/deltav-3.0.2114</warSourceDirectory>
+                    <warSourceDirectory>target/deltav-3.1.2208</warSourceDirectory>
                 </configuration>
             </plugin>
             <plugin>
@@ -251,7 +251,6 @@
                             <goal>install-node-and-npm</goal>
                         </goals>
                         <configuration>
-							<escapeString>\</escapeString>
                             <installDirectory>${java.io.tmpdir}</installDirectory>
                             <nodeVersion>v4.6.0</nodeVersion>
                         </configuration>
@@ -263,13 +262,15 @@
                         </goals>
                         <phase>generate-resources</phase>
                         <configuration>
-							<escapeString>\</escapeString>
                             <arguments>install</arguments>
                             <workingDirectory>src/main/webapp/WEB-INF/wwwroot</workingDirectory>
                             <installDirectory>${java.io.tmpdir}</installDirectory>
                         </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <escapeString>\</escapeString>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/HierarchyItemImpl.java b/deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/HierarchyItemImpl.java
index e10d2a8..7b47698 100644
--- a/deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/HierarchyItemImpl.java
+++ b/deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/HierarchyItemImpl.java
@@ -388,7 +388,7 @@ boolean clientHasToken() throws ServerException {
         List<LockInfo> itemLocks = getActiveLocks();
         if (itemLocks.size() == 0)
             return true;
-        List<String> clientLockTokens = Engine.getClientLockTokens(getEngine().getRequest());
+        List<String> clientLockTokens = getEngine().getRequest().getClientLockTokens();
         for (String clientLockToken : clientLockTokens)
             for (LockInfo itemLock : itemLocks)
                 if (clientLockToken.equals(itemLock.getToken()))
diff --git a/deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/WebDavServlet.java b/deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/WebDavServlet.java
index 45d5168..9d346c2 100644
--- a/deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/WebDavServlet.java
+++ b/deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/WebDavServlet.java
@@ -1,9 +1,9 @@
 package com.ithit.webdav.samples.deltavservlet;
 
-import com.ithit.webdav.integration.servlet.HttpDavLoggingContext;
 import com.ithit.webdav.integration.servlet.HttpServletDavRequest;
 import com.ithit.webdav.integration.servlet.HttpServletDavResponse;
-import com.ithit.webdav.server.DefaultLoggerImpl;
+import com.ithit.webdav.integration.servlet.HttpServletLoggerImpl;
+import com.ithit.webdav.server.Engine;
 import com.ithit.webdav.server.Logger;
 import com.ithit.webdav.server.MimeType;
 import com.ithit.webdav.server.deltav.AutoVersion;
@@ -89,7 +89,7 @@ static String getContext() {
     public void init(ServletConfig servletConfig) throws ServletException {
         super.init(servletConfig);
 
-        logger = new DefaultLoggerImpl(new HttpDavLoggingContext(servletConfig.getServletContext()));
+        logger = new HttpServletLoggerImpl(servletConfig.getServletContext());
 
         String licenseFile = servletConfig.getInitParameter("license");
         resourcePath = servletConfig.getInitParameter("resources");
@@ -148,8 +148,8 @@ protected void service(HttpServletRequest httpServletRequest, HttpServletRespons
         }
         HttpServletDavRequest davRequest = new HttpServletDavRequest(httpServletRequest);
         HttpServletDavResponse davResponse = new HttpServletDavResponse(httpServletResponse);
-        CustomFolderGetHandler handler = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), engine.getVersion());
-        CustomFolderGetHandler handlerHead = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), engine.getVersion());
+        CustomFolderGetHandler handler = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), Engine.getVersion());
+        CustomFolderGetHandler handlerHead = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), Engine.getVersion());
         handler.setPreviousHandler(engine.registerMethodHandler("GET", handler));
         handlerHead.setPreviousHandler(engine.registerMethodHandler("HEAD", handlerHead));
 
diff --git a/filesystemstorage/pom.xml b/filesystemstorage/pom.xml
index 7d89d0b..dfe1c5c 100644
--- a/filesystemstorage/pom.xml
+++ b/filesystemstorage/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.ithit.webdav.samples</groupId>
     <artifactId>filesystemstorage</artifactId>
-    <version>3.0.2114</version>
+    <version>3.1.2208</version>
     <packaging>war</packaging>
 
     <properties>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.ithit.webdav.integration</groupId>
             <artifactId>servlet-integration</artifactId>
-            <version>3.0.2114</version>
+            <version>3.1.2208</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>com.ithit.webdav</groupId>
             <artifactId>webdav-server</artifactId>
-            <version>3.0.2114</version>
+            <version>3.1.2208</version>
         </dependency>
         <dependency>
             <groupId>net.java.dev.jna</groupId>
@@ -198,7 +198,7 @@
                     <server>filesystem</server>
                     <port>11021</port>
                     <path>/</path>
-                    <warSourceDirectory>target/filesystemstorage-3.0.2114</warSourceDirectory>
+                    <warSourceDirectory>target/filesystemstorage-3.1.2208</warSourceDirectory>
                 </configuration>
             </plugin>
 			<plugin>
@@ -212,7 +212,6 @@
                             <goal>install-node-and-npm</goal>
                         </goals>
                         <configuration>
-							<escapeString>\</escapeString>
                             <installDirectory>${java.io.tmpdir}</installDirectory>
                             <nodeVersion>v4.6.0</nodeVersion>
                         </configuration>
@@ -224,13 +223,15 @@
                         </goals>
                         <phase>generate-resources</phase>
                         <configuration>
-							<escapeString>\</escapeString>
                             <arguments>install</arguments>
                             <workingDirectory>src/main/webapp/WEB-INF/wwwroot</workingDirectory>
                             <installDirectory>${java.io.tmpdir}</installDirectory>
                         </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <escapeString>\</escapeString>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/HierarchyItemImpl.java b/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/HierarchyItemImpl.java
index 73b55e7..7aad21c 100644
--- a/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/HierarchyItemImpl.java
+++ b/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/HierarchyItemImpl.java
@@ -278,7 +278,7 @@ private boolean clientHasToken() throws ServerException {
         if (activeLocks.size() == 0) {
             return true;
         }
-        List<String> clientLockTokens = Engine.getClientLockTokens(getEngine().getRequest());
+        List<String> clientLockTokens = getEngine().getRequest().getClientLockTokens();
         return !activeLocks.stream().filter(x -> clientLockTokens.contains(x.getToken())).collect(Collectors.toList()).isEmpty();
     }
 
diff --git a/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/WebDavServlet.java b/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/WebDavServlet.java
index f011e5d..47a8f92 100644
--- a/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/WebDavServlet.java
+++ b/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/WebDavServlet.java
@@ -1,10 +1,10 @@
 package com.ithit.webdav.samples.fsstorageservlet;
 
-import com.ithit.webdav.integration.servlet.HttpDavLoggingContext;
 import com.ithit.webdav.integration.servlet.HttpServletDavRequest;
 import com.ithit.webdav.integration.servlet.HttpServletDavResponse;
+import com.ithit.webdav.integration.servlet.HttpServletLoggerImpl;
 import com.ithit.webdav.samples.fsstorageservlet.extendedattributes.ExtendedAttributesExtension;
-import com.ithit.webdav.server.DefaultLoggerImpl;
+import com.ithit.webdav.server.Engine;
 import com.ithit.webdav.server.Logger;
 import com.ithit.webdav.server.MimeType;
 import com.ithit.webdav.server.exceptions.DavException;
@@ -97,7 +97,7 @@ public void init(ServletConfig servletConfig) throws ServletException {
         } catch (IOException e) {
             license = "";
         }
-        logger = new DefaultLoggerImpl(new HttpDavLoggingContext(servletConfig.getServletContext()));
+        logger = new HttpServletLoggerImpl(servletConfig.getServletContext());
         realPath = servletConfig.getServletContext().getRealPath("/");
         servletContext = servletConfig.getServletContext().getContextPath();
         rootLocalPath = servletConfig.getInitParameter("root");
@@ -183,8 +183,8 @@ protected void service(HttpServletRequest httpServletRequest, HttpServletRespons
         }
         HttpServletDavRequest davRequest = new HttpServletDavRequest(httpServletRequest);
         HttpServletDavResponse davResponse = new HttpServletDavResponse(httpServletResponse);
-        CustomFolderGetHandler handler = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), engine.getVersion());
-        CustomFolderGetHandler handlerHead = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), engine.getVersion());
+        CustomFolderGetHandler handler = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), Engine.getVersion());
+        CustomFolderGetHandler handlerHead = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), Engine.getVersion());
         handler.setPreviousHandler(engine.registerMethodHandler("GET", handler));
         handlerHead.setPreviousHandler(engine.registerMethodHandler("HEAD", handlerHead));
         engine.setServletRequest(davRequest);
diff --git a/oraclestorage/pom.xml b/oraclestorage/pom.xml
index c110df9..94b7603 100644
--- a/oraclestorage/pom.xml
+++ b/oraclestorage/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.ithit.webdav.samples</groupId>
     <artifactId>oraclestorage</artifactId>
-    <version>3.0.2114</version>
+    <version>3.1.2208</version>
     <packaging>war</packaging>
 
     <properties>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.ithit.webdav.integration</groupId>
             <artifactId>servlet-integration</artifactId>
-            <version>3.0.2114</version>
+            <version>3.1.2208</version>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>com.ithit.webdav</groupId>
             <artifactId>webdav-server</artifactId>
-            <version>3.0.2114</version>
+            <version>3.1.2208</version>
         </dependency>
 
         <dependency>
@@ -133,7 +133,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/oraclestorage-3.0.2114/META-INF</outputDirectory>
+                            <outputDirectory>${project.build.directory}/oraclestorage-3.1.2208/META-INF</outputDirectory>
                             <overwrite>true</overwrite>
                             <resources>
                                 <resource>
@@ -212,7 +212,7 @@
                     <server>filesystem</server>
                     <port>11021</port>
                     <path>/</path>
-                    <warSourceDirectory>target/oraclestorage-3.0.2114</warSourceDirectory>
+                    <warSourceDirectory>target/oraclestorage-3.1.2208</warSourceDirectory>
                 </configuration>
             </plugin>
             <plugin>
@@ -251,7 +251,6 @@
                             <goal>install-node-and-npm</goal>
                         </goals>
                         <configuration>
-							<escapeString>\</escapeString>
                             <installDirectory>${java.io.tmpdir}</installDirectory>
                             <nodeVersion>v4.6.0</nodeVersion>
                         </configuration>
@@ -263,13 +262,15 @@
                         </goals>
                         <phase>generate-resources</phase>
                         <configuration>
-							<escapeString>\</escapeString>
                             <arguments>install</arguments>
                             <workingDirectory>src/main/webapp/WEB-INF/wwwroot</workingDirectory>
                             <installDirectory>${java.io.tmpdir}</installDirectory>
                         </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <escapeString>\</escapeString>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/oraclestorage/src/main/java/com/ithit/webdav/samples/oraclestorageservlet/HierarchyItemImpl.java b/oraclestorage/src/main/java/com/ithit/webdav/samples/oraclestorageservlet/HierarchyItemImpl.java
index b0b08e3..e2da004 100644
--- a/oraclestorage/src/main/java/com/ithit/webdav/samples/oraclestorageservlet/HierarchyItemImpl.java
+++ b/oraclestorage/src/main/java/com/ithit/webdav/samples/oraclestorageservlet/HierarchyItemImpl.java
@@ -379,7 +379,7 @@ boolean clientHasToken() throws ServerException {
         List<LockInfo> itemLocks = getActiveLocks();
         if (itemLocks.size() == 0)
             return true;
-        List<String> clientLockTokens = Engine.getClientLockTokens(getEngine().getRequest());
+        List<String> clientLockTokens = getEngine().getRequest().getClientLockTokens();
         for (String clientLockToken : clientLockTokens)
             for (LockInfo itemLock : itemLocks)
                 if (clientLockToken.equals(itemLock.getToken()))
diff --git a/oraclestorage/src/main/java/com/ithit/webdav/samples/oraclestorageservlet/WebDavServlet.java b/oraclestorage/src/main/java/com/ithit/webdav/samples/oraclestorageservlet/WebDavServlet.java
index 9cd88ca..60e2bd9 100644
--- a/oraclestorage/src/main/java/com/ithit/webdav/samples/oraclestorageservlet/WebDavServlet.java
+++ b/oraclestorage/src/main/java/com/ithit/webdav/samples/oraclestorageservlet/WebDavServlet.java
@@ -1,9 +1,9 @@
 package com.ithit.webdav.samples.oraclestorageservlet;
 
-import com.ithit.webdav.integration.servlet.HttpDavLoggingContext;
 import com.ithit.webdav.integration.servlet.HttpServletDavRequest;
 import com.ithit.webdav.integration.servlet.HttpServletDavResponse;
-import com.ithit.webdav.server.DefaultLoggerImpl;
+import com.ithit.webdav.integration.servlet.HttpServletLoggerImpl;
+import com.ithit.webdav.server.Engine;
 import com.ithit.webdav.server.Logger;
 import com.ithit.webdav.server.MimeType;
 import com.ithit.webdav.server.exceptions.DavException;
@@ -92,7 +92,7 @@ public void init(ServletConfig servletConfig) throws ServletException {
         license = getContents(licenseFile);
         realPath = servletConfig.getServletContext().getRealPath("");
         servletContext = servletConfig.getServletContext().getContextPath();
-        logger = new DefaultLoggerImpl(new HttpDavLoggingContext(servletConfig.getServletContext()));
+        logger = new HttpServletLoggerImpl(servletConfig.getServletContext());
         WebDavEngine engine = new WebDavEngine(logger, license);
         DataAccess dataAccess = new DataAccess(engine);
         engine.setDataAccess(dataAccess);
@@ -137,8 +137,8 @@ protected void service(HttpServletRequest httpServletRequest, HttpServletRespons
         }
         HttpServletDavRequest davRequest = new HttpServletDavRequest(httpServletRequest);
         HttpServletDavResponse davResponse = new HttpServletDavResponse(httpServletResponse);
-        CustomFolderGetHandler handler = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), engine.getVersion());
-        CustomFolderGetHandler handlerHead = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), engine.getVersion());
+        CustomFolderGetHandler handler = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), Engine.getVersion());
+        CustomFolderGetHandler handlerHead = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), Engine.getVersion());
         handler.setPreviousHandler(engine.registerMethodHandler("GET", handler));
         handlerHead.setPreviousHandler(engine.registerMethodHandler("HEAD", handlerHead));