4.6.4283

Author: ITHitBuild

Java/androidfsstorage/app/build.gradle

@@ -30,7 +30,7 @@ android {
 jarJar {
     rules = [
             'stax-api-1.0.1.jar'        : 'javax.xml.** com.ithit.webdav.xml.@1',
-            'webdav-server-4.5.4195.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
+            'webdav-server-4.6.4283.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
     ]
 }
 
@@ -71,11 +71,11 @@ dependencies {
     implementation 'commons-io:commons-io:2.4'
     implementation 'com.google.code.gson:gson:2.7'
     implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation('com.ithit.webdav.integration:android-integration:4.5.4195', {
+    implementation('com.ithit.webdav.integration:android-integration:4.6.4283', {
         exclude group: 'org.nanohttpd', module: 'nanohttpd'
     })
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     jarJar 'stax:stax-api:1.0.1'
-    jarJar 'com.ithit.webdav:webdav-server:4.5.4195'
+    jarJar 'com.ithit.webdav:webdav-server:4.6.4283'
     testImplementation 'junit:junit:4.12'
 }

Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/AndroidWebDavServer.java

@@ -60,7 +60,6 @@ public Response serve(IHTTPSession session) {
         CustomFolderGetHandler handlerHead = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), engine.getVersion(), config);
         handler.setPreviousHandler(engine.registerMethodHandler("GET", handler));
         handlerHead.setPreviousHandler(engine.registerMethodHandler("HEAD", handlerHead));
-        engine.setServletRequest(davRequest);
 
         try {
             engine.service(davRequest, davResponse);

Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/CustomFolderGetHandler.java

@@ -4,8 +4,8 @@
 import com.ithit.webdav.server.HierarchyItem;
 import com.ithit.webdav.server.MethodHandler;
 import com.ithit.webdav.server.exceptions.DavException;
-import com.ithit.webdav.server.http.DavRequest;
-import com.ithit.webdav.server.http.DavResponse;
+import com.ithit.webdav.server.DavRequest;
+import com.ithit.webdav.server.DavResponse;
 
 import org.apache.commons.io.IOUtils;
 

Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/HierarchyItemImpl.java

@@ -13,6 +13,7 @@
 import com.ithit.webdav.server.exceptions.MultistatusException;
 import com.ithit.webdav.server.exceptions.PreconditionFailedException;
 import com.ithit.webdav.server.exceptions.ServerException;
+import com.ithit.webdav.server.util.DavContext;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
@@ -278,7 +279,7 @@ private boolean clientHasToken() throws ServerException {
         if (activeLocks.size() == 0) {
             return true;
         }
-        List<String> clientLockTokens = getEngine().getRequest().getClientLockTokens();
+        List<String> clientLockTokens = DavContext.currentRequest().getClientLockTokens();
         for (LockInfo lockInfo: activeLocks) {
             if (clientLockTokens.contains(lockInfo.getToken())) {
                 return true;

Java/androidfsstorage/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/WebDavEngine.java

@@ -1,6 +1,5 @@
 package com.ithit.webdav.samples.androidfsstorage;
 
-import com.ithit.webdav.integration.android.AndroidDavRequest;
 import com.ithit.webdav.server.Engine;
 import com.ithit.webdav.server.HierarchyItem;
 import com.ithit.webdav.server.Logger;
@@ -15,7 +14,6 @@ public class WebDavEngine extends Engine {
 
     private final Logger logger;
     private final String license;
-    private AndroidDavRequest request;
 
     /**
      * Initializes a new instance of the WebDavEngine class.
@@ -75,23 +73,4 @@ public Logger getLogger() {
     public String getLicense() {
         return license;
     }
-
-    /**
-     * Returns original servlet request.
-     *
-     * @return Original servlet request.
-     */
-    AndroidDavRequest getRequest() {
-        return request;
-    }
-
-    /**
-     * Set original servlet request.
-     *
-     * @param httpServletRequest Original servlet request.
-     */
-    void setServletRequest(AndroidDavRequest httpServletRequest) {
-        this.request = httpServletRequest;
-    }
-
 }

Java/deltav/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.ithit.webdav.samples</groupId>
     <artifactId>deltav</artifactId>
-    <version>4.5.4195</version>
+    <version>4.6.4283</version>
     <packaging>war</packaging>
 
     <properties>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.ithit.webdav.integration</groupId>
             <artifactId>servlet-integration</artifactId>
-            <version>4.5.4195</version>
+            <version>4.6.4283</version>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>
@@ -125,7 +125,7 @@
         <dependency>
             <groupId>com.ithit.webdav</groupId>
             <artifactId>webdav-server</artifactId>
-            <version>4.5.4195</version>
+            <version>4.6.4283</version>
         </dependency>
 
         <dependency>
@@ -165,7 +165,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/deltav-4.5.4195/META-INF</outputDirectory>
+                            <outputDirectory>${project.build.directory}/deltav-4.6.4283/META-INF</outputDirectory>
                             <overwrite>true</overwrite>
                             <resources>
                                 <resource>
@@ -244,7 +244,7 @@
                     <server>filesystem</server>
                     <port>11021</port>
                     <path>/</path>
-                    <warSourceDirectory>target/deltav-4.5.4195</warSourceDirectory>
+                    <warSourceDirectory>target/deltav-4.6.4283</warSourceDirectory>
                 </configuration>
             </plugin>
             <plugin>

Java/deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/CustomFolderGetHandler.java

@@ -4,8 +4,8 @@
 import com.ithit.webdav.server.HierarchyItem;
 import com.ithit.webdav.server.MethodHandler;
 import com.ithit.webdav.server.exceptions.DavException;
-import com.ithit.webdav.server.http.DavRequest;
-import com.ithit.webdav.server.http.DavResponse;
+import com.ithit.webdav.server.DavRequest;
+import com.ithit.webdav.server.DavResponse;
 
 import java.io.IOException;
 import java.io.PrintStream;

Java/deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/HierarchyItemImpl.java

@@ -2,6 +2,7 @@
 
 import com.ithit.webdav.server.*;
 import com.ithit.webdav.server.exceptions.*;
+import com.ithit.webdav.server.util.DavContext;
 import com.ithit.webdav.server.util.StringUtil;
 
 import javax.servlet.http.HttpServletRequest;
@@ -388,7 +389,7 @@ boolean clientHasToken() throws ServerException {
         List<LockInfo> itemLocks = getActiveLocks();
         if (itemLocks.size() == 0)
             return true;
-        List<String> clientLockTokens = getEngine().getRequest().getClientLockTokens();
+        List<String> clientLockTokens = DavContext.currentRequest().getClientLockTokens();
         for (String clientLockToken : clientLockTokens)
             for (LockInfo itemLock : itemLocks)
                 if (clientLockToken.equals(itemLock.getToken()))
@@ -746,8 +747,8 @@ void moveThisItem(FolderImpl destFolder, String destName, FolderImpl parent) thr
      * @return Returns User name performing request.
      */
     String getUserName() {
-        if (((HttpServletRequest)getEngine().getRequest().getOriginalRequest()).getUserPrincipal() != null) {
-            return ((HttpServletRequest)getEngine().getRequest().getOriginalRequest()).getUserPrincipal().getName();
+        if (((HttpServletRequest)DavContext.currentRequest().getOriginalRequest()).getUserPrincipal() != null) {
+            return ((HttpServletRequest)DavContext.currentRequest().getOriginalRequest()).getUserPrincipal().getName();
         }
 
         return "Anonymous";

Java/deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/WebDavEngine.java

@@ -1,14 +1,12 @@
 package com.ithit.webdav.samples.deltavservlet;
 
-import com.ithit.webdav.integration.servlet.HttpServletDavRequest;
 import com.ithit.webdav.samples.deltavservlet.websocket.WebSocketServer;
 import com.ithit.webdav.server.Engine;
 import com.ithit.webdav.server.HierarchyItem;
 import com.ithit.webdav.server.Logger;
 import com.ithit.webdav.server.deltav.AutoVersion;
 import com.ithit.webdav.server.exceptions.ServerException;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,7 +19,6 @@ public class WebDavEngine extends Engine {
 
     private static final WebSocketServer _FAKED_WEB_SOCKET = new WebSocketServer();
     private WebSocketServer webSocketServer;
-    private HttpServletDavRequest request;
     private final Logger logger;
     private final String license;
     private DataAccess dataAccess;
@@ -40,15 +37,6 @@ public class WebDavEngine extends Engine {
         this.license = license;
     }
 
-    /**
-     * Set original servlet request.
-     *
-     * @param httpServletRequest Original servlet request.
-     */
-    void setServletRequest(HttpServletDavRequest httpServletRequest) {
-        this.request = httpServletRequest;
-    }
-
     /**
      * Creates {@link HierarchyItem} instance by path.
      *
@@ -170,15 +158,6 @@ void setDataAccess(DataAccess dataAccess) {
         this.dataAccess = dataAccess;
     }
 
-    /**
-     * Returns original {@link HttpServletRequest}.
-     *
-     * @return Returns original {@link HttpServletRequest}.
-     */
-    HttpServletDavRequest getRequest() {
-        return request;
-    }
-
     /**
      * Returns {@link AutoVersion} rule for version mode.
      *

Java/deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/WebDavServlet.java

@@ -146,7 +146,6 @@ protected void service(HttpServletRequest httpServletRequest, HttpServletRespons
 
         engine.setAutoPutUnderVersionControl(autoputUnderVersionControl);
         engine.setAutoVersionMode(autoVersionMode);
-        engine.setServletRequest(davRequest);
         engine.setSearchFacade(searchFacade);
         HttpSession session = httpServletRequest.getSession();
         session.setAttribute("engine", engine);