Skip to content

Commit 9325ed5

Browse files
ITHitBuildITHitBuild
committed
5.1.5432
1 parent 665f711 commit 9325ed5

File tree

27 files changed

+152
-363
lines changed

27 files changed

+152
-363
lines changed

‎Java/androidfsstorage/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ android {
3434
jarJar {
3535
rules = [
3636
'stax-api-1.0.1.jar' : 'javax.xml.** com.ithit.webdav.xml.@1',
37-
'webdav-server-5.1.5406.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
37+
'webdav-server-5.1.5432.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
3838
]
3939
}
4040

@@ -75,11 +75,11 @@ dependencies {
7575
implementation 'commons-io:commons-io:2.7'
7676
implementation 'com.google.code.gson:gson:2.7'
7777
implementation 'com.android.support:appcompat-v7:27.1.1'
78-
implementation('com.ithit.webdav.integration:android-integration:5.1.5406', {
78+
implementation('com.ithit.webdav.integration:android-integration:5.1.5432', {
7979
exclude group: 'org.nanohttpd', module: 'nanohttpd'
8080
})
8181
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
8282
jarJar 'stax:stax-api:1.0.1'
83-
jarJar 'com.ithit.webdav:webdav-server:5.1.5406'
83+
jarJar 'com.ithit.webdav:webdav-server:5.1.5432'
8484
testImplementation 'junit:junit:4.12'
8585
}

‎Java/androidfsstorage/app/src/main/assets/wwwroot/js/package-lock.json‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Java/deltav/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,4 @@ This will download IT Hit WebDAV Ajax Library files into your project. Note that
104104
<p>&nbsp;</p>
105105
<h3 class="para d-inline next-article-heading">Next Article:</h3>
106106
<a title="Running the WebDAV Samples" href="https://www.webdavsystem.com/javaserver/server_examples/running_webdav_samples/">Running the WebDAV Samples</a>
107+

‎Java/deltav/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.ithit.webdav.samples</groupId>
88
<artifactId>deltav</artifactId>
9-
<version>5.1.5406</version>
9+
<version>5.1.5432</version>
1010
<packaging>war</packaging>
1111

1212
<properties>
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>com.ithit.webdav.integration</groupId>
2525
<artifactId>servlet-integration</artifactId>
26-
<version>5.1.5406</version>
26+
<version>5.1.5432</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>commons-dbcp</groupId>
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>com.ithit.webdav</groupId>
127127
<artifactId>webdav-server</artifactId>
128-
<version>5.1.5406</version>
128+
<version>5.1.5432</version>
129129
</dependency>
130130

131131
<dependency>
@@ -165,7 +165,7 @@
165165
<goal>copy-resources</goal>
166166
</goals>
167167
<configuration>
168-
<outputDirectory>${project.build.directory}/deltav-5.1.5406/META-INF</outputDirectory>
168+
<outputDirectory>${project.build.directory}/deltav-5.1.5432/META-INF</outputDirectory>
169169
<overwrite>true</overwrite>
170170
<resources>
171171
<resource>
@@ -244,7 +244,7 @@
244244
<server>filesystem</server>
245245
<port>11021</port>
246246
<path>/</path>
247-
<warSourceDirectory>target/deltav-5.1.5406</warSourceDirectory>
247+
<warSourceDirectory>target/deltav-5.1.5432</warSourceDirectory>
248248
</configuration>
249249
</plugin>
250250
<plugin>
@@ -297,7 +297,7 @@
297297
<configuration>
298298
<arguments>update</arguments>
299299
<workingDirectory>src/main/webapp/WEB-INF/wwwroot/js</workingDirectory>
300-
<installDirectory>c:\temp\</installDirectory>
300+
<installDirectory>C:\Users\build\AppData\Local\Temp\</installDirectory>
301301
</configuration>
302302
</execution>
303303
<execution>

‎Java/deltav/src/main/webapp/WEB-INF/wwwroot/js/package-lock.json‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Java/filesystemstorage/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.ithit.webdav.samples</groupId>
88
<artifactId>filesystemstorage</artifactId>
9-
<version>5.1.5406</version>
9+
<version>5.1.5432</version>
1010
<packaging>war</packaging>
1111

1212
<properties>
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>com.ithit.webdav.integration</groupId>
3636
<artifactId>servlet-integration</artifactId>
37-
<version>5.1.5406</version>
37+
<version>5.1.5432</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>commons-io</groupId>
@@ -142,7 +142,7 @@
142142
<dependency>
143143
<groupId>com.ithit.webdav</groupId>
144144
<artifactId>webdav-server</artifactId>
145-
<version>5.1.5406</version>
145+
<version>5.1.5432</version>
146146
</dependency>
147147
<dependency>
148148
<groupId>net.java.dev.jna</groupId>
@@ -228,7 +228,7 @@
228228
<server>filesystem</server>
229229
<port>11021</port>
230230
<path>/</path>
231-
<warSourceDirectory>target/filesystemstorage-5.1.5406</warSourceDirectory>
231+
<warSourceDirectory>target/filesystemstorage-5.1.5432</warSourceDirectory>
232232
</configuration>
233233
</plugin>
234234
<plugin>
@@ -256,7 +256,7 @@
256256
<configuration>
257257
<arguments>update</arguments>
258258
<workingDirectory>src/main/webapp/WEB-INF/wwwroot/js</workingDirectory>
259-
<installDirectory>c:\temp\</installDirectory>
259+
<installDirectory>C:\Users\build\AppData\Local\Temp\</installDirectory>
260260
</configuration>
261261
</execution>
262262
<execution>

‎Java/filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/HierarchyItemImpl.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -434,21 +434,19 @@ private boolean hasLock(boolean skipShared) throws ServerException {
434434
public List<LockInfo> getActiveLocks() throws ServerException {
435435
if (activeLocks == null) {
436436
String activeLocksJson = ExtendedAttributesExtension.getExtendedAttribute(getFullPath().toString(), activeLocksAttribute);
437-
activeLocks = SerializationUtils.deserializeList(LockInfo.class, activeLocksJson)
438-
.stream()
439-
.filter(x -> System.currentTimeMillis() < x.getTimeout())
440-
.map(lock -> new LockInfo(
441-
lock.isShared(),
442-
lock.isDeep(),
443-
lock.getToken(),
444-
(lock.getTimeout() < 1 || lock.getTimeout() == Long.MAX_VALUE) ? lock.getTimeout() : (lock.getTimeout() - System.currentTimeMillis()) / 1000,
445-
lock.getOwner())
446-
)
447-
.collect(Collectors.toList());
437+
activeLocks = new ArrayList<>(SerializationUtils.deserializeList(LockInfo.class, activeLocksJson));
448438
} else {
449439
activeLocks = new LinkedList<>();
450440
}
451-
return activeLocks;
441+
return activeLocks.stream()
442+
.filter(x -> System.currentTimeMillis() < x.getTimeout())
443+
.map(lock -> new LockInfo(
444+
lock.isShared(),
445+
lock.isDeep(),
446+
lock.getToken(),
447+
(lock.getTimeout() < 0 || lock.getTimeout() == Long.MAX_VALUE) ? lock.getTimeout() : (lock.getTimeout() - System.currentTimeMillis()) / 1000,
448+
lock.getOwner()))
449+
.collect(Collectors.toList());
452450
}
453451

454452
/**

‎Java/filesystemstorage/src/main/webapp/WEB-INF/wwwroot/js/package-lock.json‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Java/oraclestorage/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ This will download IT Hit WebDAV Ajax Library files into your project. Note that
8484
<p>On the diagram below you can see the classes in&nbsp;WebDAV OracleStorage project.</p>
8585
<p><img id="__mcenew" alt="Oracle class diagram" src="https://www.webdavsystem.com/media/1562/oraclediagram.png" rel="109211"></p>
8686
<p>To adapt the sample to your needs, you will modify these classes to read and write data from and into your storage. You can find more about this in&nbsp;<a title="Creating WebDAV Server" href="https://www.webdavsystem.com/javaserver/doc/">Creating a Class 1 WebDAV Server</a>&nbsp;and&nbsp;<a title="Class 2 / 3 Server" href="https://www.webdavsystem.com/javaserver/doc/create_class_2_webdav_server/">Creating Class 2 WebDAV Server</a>&nbsp;article as well as in the&nbsp;<a href="http://java.webdavsystem.com/">class reference documentation</a>.</p>
87-
<h2>How Things Get Stored – Overview of the Oracle Back-end</h2>
87+
<h2>How Things Get Stored – Overview of the Oracle Back-end</h2>
8888
<p>The database consists of 3 entities as depicted in the figure below.</p>
8989
<p><img id="__mcenew" alt="Oracle DB diagram" src="https://www.webdavsystem.com/media/1559/oraclestoragedb.jpg" rel="109205"></p>
9090
<h3>Repository Table</h3>

‎Java/oraclestorage/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.ithit.webdav.samples</groupId>
88
<artifactId>oraclestorage</artifactId>
9-
<version>5.1.5406</version>
9+
<version>5.1.5432</version>
1010
<packaging>war</packaging>
1111

1212
<properties>
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>com.ithit.webdav.integration</groupId>
2525
<artifactId>servlet-integration</artifactId>
26-
<version>5.1.5406</version>
26+
<version>5.1.5432</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>commons-dbcp</groupId>
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>com.ithit.webdav</groupId>
127127
<artifactId>webdav-server</artifactId>
128-
<version>5.1.5406</version>
128+
<version>5.1.5432</version>
129129
</dependency>
130130

131131
<dependency>
@@ -165,7 +165,7 @@
165165
<goal>copy-resources</goal>
166166
</goals>
167167
<configuration>
168-
<outputDirectory>${project.build.directory}/oraclestorage-5.1.5406/META-INF</outputDirectory>
168+
<outputDirectory>${project.build.directory}/oraclestorage-5.1.5432/META-INF</outputDirectory>
169169
<overwrite>true</overwrite>
170170
<resources>
171171
<resource>
@@ -244,7 +244,7 @@
244244
<server>filesystem</server>
245245
<port>11021</port>
246246
<path>/</path>
247-
<warSourceDirectory>target/oraclestorage-5.1.5406</warSourceDirectory>
247+
<warSourceDirectory>target/oraclestorage-5.1.5432</warSourceDirectory>
248248
</configuration>
249249
</plugin>
250250
<plugin>
@@ -297,7 +297,7 @@
297297
<configuration>
298298
<arguments>update</arguments>
299299
<workingDirectory>src/main/webapp/WEB-INF/wwwroot/js</workingDirectory>
300-
<installDirectory>c:\temp\</installDirectory>
300+
<installDirectory>C:\Users\build\AppData\Local\Temp\</installDirectory>
301301
</configuration>
302302
</execution>
303303
<execution>

0 commit comments

Comments
 (0)