4.4.3821

ITHit · Mar 4, 2020 · 32e61b5 · 32e61b5
1 parent 8dc715c
commit 32e61b5
Show file tree

Hide file tree

Showing 142 changed files with 9,933 additions and 93 deletions.
diff --git a/Java/androidfsstorage/app/build.gradle b/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.3.3605.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
+            'webdav-server-4.4.3821.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.3.3605', {
+    implementation('com.ithit.webdav.integration:android-integration:4.4.3821', {
         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.3.3605'
+    jarJar 'com.ithit.webdav:webdav-server:4.4.3821'
     testImplementation 'junit:junit:4.12'
 }
diff --git a/Java/androidfsstorage/app/src/main/assets/MyCustomHandlerPage.html b/Java/androidfsstorage/app/src/main/assets/MyCustomHandlerPage.html
@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0/css/bootstrap.min.css" rel="stylesheet">
     <link href="https://use.fontawesome.com/releases/v5.0.10/css/all.css" rel="stylesheet">
-    <link href="<%context root%>wwwroot/css/webdav-layout.css" rel="stylesheet"/>
+    <link href="/wwwroot/css/webdav-layout.css" rel="stylesheet"/>
 </head>
 <body>
 <nav class="navbar navbar-expand-md navbar-dark bg-dark mb-4">
@@ -170,9 +170,9 @@ <h3>Client Version</h3>
 </main>
 <script>
     var webDavSettings = {
-        ApplicationPath: '<%context root%>',
-        WebSocketPath: '<%ws root%>',
-        ApplicationProtocolsPath: '<%context root%>wwwroot/js/node_modules/webdav.client/Plugins/',
+        ApplicationPath: '/',
+        WebSocketPath: '',
+        ApplicationProtocolsPath: '/wwwroot/js/node_modules/webdav.client/Plugins/',
         EditDocAuth: {
             Authentication: 'anonymous',
             CookieNames: null,                                 // Coma separated list of cookie names to search for.
@@ -182,26 +182,26 @@ <h3>Client Version</h3>
     }
 
     function OpenAjaxFileBrowserWindow() {
-        window.open("<%context root%>" + "wwwroot/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("<%context root%>" + "wwwroot/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);
     }
 </script>
 <!--
 JavaScript file required to run WebDAV Ajax library is loaded from Node.js Package Manager.
 To load files from your website download them here: https://www.webdavsystem.com/ajax/download,
 deploy them to your website and replace the path below in this file.
 -->
-<script src="<%context root%>wwwroot/js/node_modules/webdav.client/ITHitWebDAVClient.js"></script>
+<script src="/wwwroot/js/node_modules/webdav.client/ITHitWebDAVClient.js"></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 src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0/js/bootstrap.min.js"></script>
-<script src="<%context root%>wwwroot/js/webdav-gridview.js"></script>
-<script src="<%context root%>wwwroot/js/webdav-uploader.js"></script>
-<script src="<%context root%>wwwroot/js/webdav-websocket.js"></script>
+<script src="/wwwroot/js/webdav-gridview.js"></script>
+<script src="/wwwroot/js/webdav-uploader.js"></script>
+<script src="/wwwroot/js/webdav-websocket.js"></script>
 </body>
 </html>
diff --git a/...age/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/android/MainActivity.java b/...age/app/src/main/java/com/ithit/webdav/samples/androidfsstorage/android/MainActivity.java
@@ -29,10 +29,10 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
-        label = (TextView) findViewById(R.id.logOutput);
-        Button clearButton = (Button) findViewById(R.id.btn_clearLog);
+        label = findViewById(R.id.logOutput);
+        Button clearButton = findViewById(R.id.btn_clearLog);
         clearButton.setOnClickListener(this);
-        mapVideoButton = (Button) findViewById(R.id.btn_mapVideo);
+        mapVideoButton = findViewById(R.id.btn_mapVideo);
         mapVideoButton.setOnClickListener(this);
         nanoIntent = new Intent(this, NanoIntentService.class);
         startService(nanoIntent);
@@ -65,7 +65,7 @@ public void output(final String message) {
             @Override
             public void run() {
                 label.append(message + "\n\n");
-                final ScrollView scrollView = (ScrollView) findViewById(R.id.scrollOutput);
+                final ScrollView scrollView = findViewById(R.id.scrollOutput);
                 scrollView.post(new Runnable() {
                     @Override
                     public void run() {

diff --git a/...pp/src/main/java/com/ithit/webdav/samples/androidfsstorage/android/NanoIntentService.java b/...pp/src/main/java/com/ithit/webdav/samples/androidfsstorage/android/NanoIntentService.java
@@ -129,7 +129,7 @@ public void onDestroy() {
 
     private void initUserStorage(String path) {
         AssetManager assetManager = this.getAssets();
-        String assets[];
+        String[] assets;
         try {
             assets = assetManager.list(path);
             if (assets.length == 0) {

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

diff --git a/Java/filesystemstorage/pom.xml b/Java/filesystemstorage/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.ithit.webdav.samples</groupId>
     <artifactId>filesystemstorage</artifactId>
-    <version>4.3.3604</version>
+    <version>4.4.3821</version>
     <packaging>war</packaging>
 
     <properties>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.ithit.webdav.integration</groupId>
             <artifactId>servlet-integration</artifactId>
-            <version>4.3.3604</version>
+            <version>4.4.3821</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -142,7 +142,7 @@
         <dependency>
             <groupId>com.ithit.webdav</groupId>
             <artifactId>webdav-server</artifactId>
-            <version>4.3.3604</version>
+            <version>4.4.3821</version>
         </dependency>
         <dependency>
             <groupId>net.java.dev.jna</groupId>
@@ -228,7 +228,7 @@
                     <server>filesystem</server>
                     <port>11021</port>
                     <path>/</path>
-                    <warSourceDirectory>target/filesystemstorage-4.3.3604</warSourceDirectory>
+                    <warSourceDirectory>target/filesystemstorage-4.4.3821</warSourceDirectory>
                 </configuration>
             </plugin>
 			<plugin>

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

diff --git a/...torage/src/main/java/com/ithit/webdav/samples/oraclestorageservlet/HierarchyItemImpl.java b/...torage/src/main/java/com/ithit/webdav/samples/oraclestorageservlet/HierarchyItemImpl.java
@@ -20,7 +20,7 @@
  * Your file items must implement {@link com.ithit.webdav.server.File} interface, folder items - {@link Folder} interface.
  * </p>
  */
-public abstract class HierarchyItemImpl implements com.ithit.webdav.server.HierarchyItem, Lock {
+public abstract class HierarchyItemImpl implements HierarchyItem, Lock {
 
     static final String SNIPPET = "snippet";
     final int id;
@@ -235,7 +235,7 @@ public List<Property> getPropertyNames() throws ServerException {
      * Modifies and removes properties for this item.
      *
      * @param setProps Array of properties to be set.
-     * @param delProps Array of properties to be removed. {@link Property#value} field is ignored.
+     * @param delProps Array of properties to be removed. {@link Property#getValue()} field is ignored.
      *                 Specifying the removal of a property that does not exist is not an error.
      * @throws LockedException      this item was locked and client did not provide lock token.
      * @throws MultistatusException If update fails for a property, this exception shall be thrown and contain

diff --git a/Java/springboot/mvnw → Java/springbootfsstorage/mvnw b/Java/springboot/mvnw → Java/springbootfsstorage/mvnw
diff --git a/Java/springboot/mvnw.cmd → Java/springbootfsstorage/mvnw.cmd b/Java/springboot/mvnw.cmd → Java/springbootfsstorage/mvnw.cmd
diff --git a/Java/springboot/pom.xml → Java/springbootfsstorage/pom.xml b/Java/springboot/pom.xml → Java/springbootfsstorage/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.2.4.RELEASE</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.ithit.webdav.samples</groupId>
-    <artifactId>springboot</artifactId>
-    <version>4.3.3604</version>
-    <name>springboot</name>
+    <artifactId>springbootfsstorage</artifactId>
+    <version>4.4.3821</version>
+    <name>springbootfsstorage</name>
     <description>Demo project for Spring Boot</description>
 
     <properties>
@@ -38,28 +38,17 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.vintage</groupId>
-                    <artifactId>junit-vintage-engine</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
         <!-- WebDav dependencies -->
         <dependency>
             <groupId>com.ithit.webdav</groupId>
             <artifactId>webdav-server</artifactId>
-            <version>4.3.3604</version>
+            <version>4.4.3821</version>
         </dependency>
         <dependency>
             <groupId>com.ithit.webdav.integration</groupId>
             <artifactId>servlet-integration</artifactId>
-            <version>4.3.3604</version>
+            <version>4.4.3821</version>
         </dependency>
 
         <!-- JNA dependencies -->

diff --git a/...ringboot/SpringBootSampleApplication.java → ...ngbootfs/SpringBootSampleApplication.java b/...ringboot/SpringBootSampleApplication.java → ...ngbootfs/SpringBootSampleApplication.java
@@ -1,4 +1,4 @@
-package com.ithit.webdav.samples.springboot;
+package com.ithit.webdav.samples.springbootfs;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...les/springboot/common/ResourceReader.java → ...s/springbootfs/common/ResourceReader.java b/...les/springboot/common/ResourceReader.java → ...s/springbootfs/common/ResourceReader.java
@@ -1,7 +1,7 @@
-package com.ithit.webdav.samples.springboot.common;
+package com.ithit.webdav.samples.springbootfs.common;
 
-import com.ithit.webdav.samples.springboot.SpringBootSampleApplication;
-import com.ithit.webdav.samples.springboot.configuration.WebDavConfigurationProperties;
+import com.ithit.webdav.samples.springbootfs.SpringBootSampleApplication;
+import com.ithit.webdav.samples.springbootfs.configuration.WebDavConfigurationProperties;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...ot/configuration/WebDavConfiguration.java → ...fs/configuration/WebDavConfiguration.java b/...ot/configuration/WebDavConfiguration.java → ...fs/configuration/WebDavConfiguration.java
@@ -1,12 +1,12 @@
-package com.ithit.webdav.samples.springboot.configuration;
+package com.ithit.webdav.samples.springbootfs.configuration;
 
-import com.ithit.webdav.samples.springboot.common.ResourceReader;
-import com.ithit.webdav.samples.springboot.extendedattributes.ExtendedAttributesExtension;
-import com.ithit.webdav.samples.springboot.impl.CustomFolderGetHandler;
-import com.ithit.webdav.samples.springboot.impl.SearchFacade;
-import com.ithit.webdav.samples.springboot.impl.WebDavEngine;
-import com.ithit.webdav.samples.springboot.websocket.SocketHandler;
-import com.ithit.webdav.samples.springboot.websocket.WebSocketServer;
+import com.ithit.webdav.samples.springbootfs.common.ResourceReader;
+import com.ithit.webdav.samples.springbootfs.extendedattributes.ExtendedAttributesExtension;
+import com.ithit.webdav.samples.springbootfs.impl.CustomFolderGetHandler;
+import com.ithit.webdav.samples.springbootfs.impl.SearchFacade;
+import com.ithit.webdav.samples.springbootfs.impl.WebDavEngine;
+import com.ithit.webdav.samples.springbootfs.websocket.SocketHandler;
+import com.ithit.webdav.samples.springbootfs.websocket.WebSocketServer;
 import com.ithit.webdav.server.Engine;
 import com.ithit.webdav.server.util.StringUtil;
 import lombok.AccessLevel;

diff --git a/...ration/WebDavConfigurationProperties.java → ...ration/WebDavConfigurationProperties.java b/...ration/WebDavConfigurationProperties.java → ...ration/WebDavConfigurationProperties.java
@@ -1,4 +1,4 @@
-package com.ithit.webdav.samples.springboot.configuration;
+package com.ithit.webdav.samples.springbootfs.configuration;
 
 import lombok.AccessLevel;
 import lombok.Getter;

diff --git a/...ples/springboot/controller/DavFilter.java → ...es/springbootfs/controller/DavFilter.java b/...ples/springboot/controller/DavFilter.java → ...es/springbootfs/controller/DavFilter.java
@@ -1,6 +1,6 @@
-package com.ithit.webdav.samples.springboot.controller;
+package com.ithit.webdav.samples.springbootfs.controller;
 
-import com.ithit.webdav.samples.springboot.configuration.WebDavConfigurationProperties;
+import com.ithit.webdav.samples.springbootfs.configuration.WebDavConfigurationProperties;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;

diff --git a/...ingboot/controller/SamplesController.java → ...gbootfs/controller/SamplesController.java b/...ingboot/controller/SamplesController.java → ...gbootfs/controller/SamplesController.java
@@ -1,8 +1,8 @@
-package com.ithit.webdav.samples.springboot.controller;
+package com.ithit.webdav.samples.springbootfs.controller;
 
 import com.ithit.webdav.integration.servlet.HttpServletDavRequest;
 import com.ithit.webdav.integration.servlet.HttpServletDavResponse;
-import com.ithit.webdav.samples.springboot.impl.WebDavEngine;
+import com.ithit.webdav.samples.springbootfs.impl.WebDavEngine;
 import com.ithit.webdav.server.exceptions.DavException;
 import com.ithit.webdav.server.exceptions.WebDavStatus;
 import lombok.AccessLevel;

diff --git a/...dattributes/DefaultExtendedAttribute.java → ...dattributes/DefaultExtendedAttribute.java b/...dattributes/DefaultExtendedAttribute.java → ...dattributes/DefaultExtendedAttribute.java
@@ -1,4 +1,4 @@
-package com.ithit.webdav.samples.springboot.extendedattributes;
+package com.ithit.webdav.samples.springbootfs.extendedattributes;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

diff --git a/...extendedattributes/ExtendedAttribute.java → ...extendedattributes/ExtendedAttribute.java b/...extendedattributes/ExtendedAttribute.java → ...extendedattributes/ExtendedAttribute.java
@@ -1,4 +1,4 @@
-package com.ithit.webdav.samples.springboot.extendedattributes;
+package com.ithit.webdav.samples.springbootfs.extendedattributes;
 
 import java.io.IOException;
 

diff --git a/...dattributes/ExtendedAttributeFactory.java → ...dattributes/ExtendedAttributeFactory.java b/...dattributes/ExtendedAttributeFactory.java → ...dattributes/ExtendedAttributeFactory.java
@@ -1,4 +1,4 @@
-package com.ithit.webdav.samples.springboot.extendedattributes;
+package com.ithit.webdav.samples.springbootfs.extendedattributes;
 
 /**
  * Factory-singleton which creates a ExtendedAttribute instance.

diff --git a/...tributes/ExtendedAttributesExtension.java → ...tributes/ExtendedAttributesExtension.java b/...tributes/ExtendedAttributesExtension.java → ...tributes/ExtendedAttributesExtension.java
@@ -1,4 +1,4 @@
-package com.ithit.webdav.samples.springboot.extendedattributes;
+package com.ithit.webdav.samples.springbootfs.extendedattributes;
 
 import com.ithit.webdav.server.exceptions.ServerException;
 

diff --git a/...endedattributes/OSXExtendedAttribute.java → ...endedattributes/OSXExtendedAttribute.java b/...endedattributes/OSXExtendedAttribute.java → ...endedattributes/OSXExtendedAttribute.java
@@ -1,4 +1,4 @@
-package com.ithit.webdav.samples.springboot.extendedattributes;
+package com.ithit.webdav.samples.springbootfs.extendedattributes;
 
 import com.sun.jna.platform.mac.XAttrUtil;