3.0.2101

Author: ITHitBuild

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.2008.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
+            'webdav-server-3.0.2101.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.2008', {
+    compile ('com.ithit.webdav.integration:android-integration:3.0.2101', {
         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.2008'
+    jarJar 'com.ithit.webdav:webdav-server:3.0.2101'
     testCompile 'junit:junit:4.12'
 }

androidfsstorage/build.gradle

@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         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

androidfsstorage/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Oct 17 12:43:17 EEST 2017
+#Thu Oct 26 13:05:47 EEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

deltav/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.ithit.webdav.samples</groupId>
     <artifactId>deltav</artifactId>
-    <version>3.0.2008</version>
+    <version>3.0.2101</version>
     <packaging>war</packaging>
 
     <properties>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.ithit.webdav.integration</groupId>
             <artifactId>servlet-integration</artifactId>
-            <version>3.0.2008</version>
+            <version>3.0.2101</version>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>com.ithit.webdav</groupId>
             <artifactId>webdav-server</artifactId>
-            <version>3.0.2008</version>
+            <version>3.0.2101</version>
         </dependency>
 
         <dependency>
@@ -133,7 +133,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/deltav-3.0.2008/META-INF</outputDirectory>
+                            <outputDirectory>${project.build.directory}/deltav-3.0.2101/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.2008</warSourceDirectory>
+                    <warSourceDirectory>target/deltav-3.0.2101</warSourceDirectory>
                 </configuration>
             </plugin>
             <plugin>

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

@@ -5,23 +5,24 @@
 import com.ithit.webdav.integration.servlet.HttpServletDavResponse;
 import com.ithit.webdav.server.DefaultLoggerImpl;
 import com.ithit.webdav.server.Logger;
+import com.ithit.webdav.server.MimeType;
 import com.ithit.webdav.server.deltav.AutoVersion;
 import com.ithit.webdav.server.exceptions.DavException;
 import com.ithit.webdav.server.exceptions.WebDavStatus;
+import com.ithit.webdav.server.util.StringUtil;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.*;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 
 /**
  * This servlet processes WEBDAV requests.
@@ -36,6 +37,7 @@ public class WebDavServlet extends HttpServlet {
     private boolean autoputUnderVersionControl;
     private static final String DEFAULT_INDEX_PATH = "WEB-INF/Index";
     private SearchFacade searchFacade;
+    private String resourcePath;
 
     /**
      * Reads license file content.
@@ -53,9 +55,7 @@ private static String getContents(String fileName) throws ServletException {
                 contents.append(line);
                 contents.append(System.getProperty("line.separator"));
             }
-        } catch (IOException ex) {
-            ex.printStackTrace();
-            throw new ServletException("File not found: " + fileName, ex);
+        } catch (IOException ignored) {
         }
 
         return contents.toString();
@@ -92,6 +92,7 @@ public void init(ServletConfig servletConfig) throws ServletException {
         logger = new DefaultLoggerImpl(new HttpDavLoggingContext(servletConfig.getServletContext()));
 
         String licenseFile = servletConfig.getInitParameter("license");
+        resourcePath = servletConfig.getInitParameter("resources");
         showExceptions = "true".equals(servletConfig.getInitParameter("showExceptions"));
         try {
             autoVersionMode = AutoVersion.valueOf(servletConfig.getInitParameter("autoVersionMode"));
@@ -140,6 +141,11 @@ protected void service(HttpServletRequest httpServletRequest, HttpServletRespons
             throws ServletException, IOException {
 
         WebDavEngine engine = new WebDavEngine(logger, license);
+        if (!StringUtil.isNullOrEmpty(resourcePath)) {
+            if (StringUtil.trimStart(httpServletRequest.getRequestURI(), "/").startsWith(StringUtil.trimStart(resourcePath, "/"))) {
+                processResources(httpServletRequest, httpServletResponse, engine.getResponseCharacterEncoding());
+            }
+        }
         HttpServletDavRequest davRequest = new HttpServletDavRequest(httpServletRequest);
         HttpServletDavResponse davResponse = new HttpServletDavResponse(httpServletResponse);
         CustomFolderGetHandler handler = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), engine.getVersion());
@@ -169,6 +175,43 @@ protected void service(HttpServletRequest httpServletRequest, HttpServletRespons
         }
     }
 
+    private void processResources(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, String  charset) throws IOException {
+        Path path = Paths.get(WebDavServlet.getRealPath(), "WEB-INF", httpServletRequest.getRequestURI());
+        try( OutputStream out = httpServletResponse.getOutputStream()) {
+            if (!httpServletRequest.getRequestURI().contains("Plugins")) {
+                PrintStream stream = new PrintStream(out, true, charset);
+                httpServletResponse.setCharacterEncoding(charset);
+                httpServletResponse.setContentType(MimeType.getInstance().getMimeType(getFileExtension(path.toFile())));
+                List<String> lines = Files.readAllLines(path, Charset.defaultCharset());
+                for (String s : lines) {
+                    stream.println(s);
+                }
+            } else {
+                httpServletResponse.setContentType("application/octet-stream");
+                String fileName = path.getFileName().toString();
+                httpServletResponse.setHeader("Content-disposition", "attachment; filename=" + fileName);
+                File file = path.toFile();
+                httpServletResponse.setContentLength((int) file.length());
+                try (FileInputStream in = new FileInputStream(file)) {
+                    byte[] buffer = new byte[4096];
+                    int length;
+                    while ((length = in.read(buffer)) > 0) {
+                        out.write(buffer, 0, length);
+                    }
+                }
+            }
+        }
+    }
+
+    private String getFileExtension(File file) {
+        String name = file.getName();
+        try {
+            return name.substring(name.lastIndexOf(".") + 1);
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
     /**
      * Creates index folder if not exists.
      *

deltav/src/main/webapp/WEB-INF/MyCustomHandlerPage.html

@@ -319,20 +319,20 @@ <h3>Connect with WebDAV Client</h3>
     To load files from your website download them here: https://www.webdavsystem.com/ajax/download,
     deploy them to your website and replace the 'https://www.ajaxbrowser.com/ITHitService/' path in this file.
 -->
-<script src="https://www.ajaxbrowser.com/ITHitService/WebDAVAJAXLibrary/ITHitWebDAVClient.js"
+<script src="wwwroot/node_modules/webdav.client/ITHitWebDAVClient.js"
         type="text/javascript"></script>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.jquery.min.js"></script>
 <script>
     function OpenAjaxFileBrowserWindow() {
-        window.open("<%context path%>" + "afb/AjaxFileBrowser.jsp", "", "menubar=1,location=1,status=1,scrollbars=1,resizable=1,width=900,height=600");
+        window.open("<%context path%>" + "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("<%context path%>" + "afb/AjaxIntegrationTests.jsp", "", "menubar=1,location=1,status=1,scrollbars=1,resizable=1,width=" + width + ",height=" + height);
+        window.open("<%context path%>" + "wwwroot/AjaxIntegrationTests.html", "", "menubar=1,location=1,status=1,scrollbars=1,resizable=1,width=" + width + ",height=" + height);
     }
 
     (function () {
@@ -809,7 +809,7 @@ <h3>Connect with WebDAV Client</h3>
                     // IT Hit WebDAV Ajax Library protocol installers path.
                     // Used to open non-MS Office documents or if MS Office is
                     // not installed as well as to open OS File Manager.
-                    var installersFolderPath = 'https://www.ajaxbrowser.com/ITHitService/WebDAVAJAXLibrary/Plugins/';
+                    var installersFolderPath = 'wwwroot/node_modules/webdav.client/Plugins/';
 
                     var installerFilePath = installersFolderPath + ITHit.WebDAV.Client.DocManager.GetInstallFileName();
                     window.open(installerFilePath);

deltav/src/main/webapp/WEB-INF/afb/AjaxIntegrationTests.jsp

@@ -27,30 +27,16 @@
             <param-name>index-interval</param-name>
             <param-value>2</param-value>
         </init-param>
+        <init-param>
+            <param-name>resources</param-name>
+            <param-value>wwwroot</param-value>
+        </init-param>
     </servlet>
     <servlet-mapping>
         <servlet-name>WebDav servlet</servlet-name>
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
 
-    <servlet>
-        <servlet-name>AjaxBrowser</servlet-name>
-        <jsp-file>/WEB-INF/afb/AjaxFileBrowser.jsp</jsp-file>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>AjaxBrowser</servlet-name>
-        <url-pattern>/afb/AjaxFileBrowser.jsp</url-pattern>
-    </servlet-mapping>
-
-    <servlet>
-        <servlet-name>AjaxTest</servlet-name>
-        <jsp-file>/WEB-INF/afb/AjaxIntegrationTests.jsp</jsp-file>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>AjaxTest</servlet-name>
-        <url-pattern>/afb/AjaxIntegrationTests.jsp</url-pattern>
-    </servlet-mapping>
-
     <resource-ref>
         <description>Oracle connections</description>
         <res-ref-name>jdbc/Oracle</res-ref-name>

deltav/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,9 @@
+
+<html lang="en">
+<head>
+    <script src="node_modules/webdav.client/Tests/ITHitTests.js" type="text/javascript"></script>
+    <script src="node_modules/webdav.client/ITHitWebDAVClient.js" type="text/javascript"></script>
+</head>
+<body>
+</body>
+</html>