Skip to content

Commit 7765a9f

Browse files
ITHitBuildITHitBuild
committed
4.1.2760
1 parent 248bd73 commit 7765a9f

File tree

6 files changed

+49
-64
lines changed

6 files changed

+49
-64
lines changed

‎Java/deltav/pom.xml‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
53
<modelVersion>4.0.0</modelVersion>
64

75
<groupId>com.ithit.webdav.samples</groupId>
86
<artifactId>deltav</artifactId>
9-
<version>4.1.2743</version>
7+
<version>4.1.2760</version>
108
<packaging>war</packaging>
119

1210
<properties>
@@ -24,7 +22,7 @@
2422
<dependency>
2523
<groupId>com.ithit.webdav.integration</groupId>
2624
<artifactId>servlet-integration</artifactId>
27-
<version>4.1.2743</version>
25+
<version>4.1.2760</version>
2826
</dependency>
2927
<dependency>
3028
<groupId>commons-dbcp</groupId>
@@ -126,7 +124,7 @@
126124
<dependency>
127125
<groupId>com.ithit.webdav</groupId>
128126
<artifactId>webdav-server</artifactId>
129-
<version>4.1.2743</version>
127+
<version>4.1.2760</version>
130128
</dependency>
131129

132130
<dependency>
@@ -166,7 +164,7 @@
166164
<goal>copy-resources</goal>
167165
</goals>
168166
<configuration>
169-
<outputDirectory>${project.build.directory}/deltav-4.1.2743/META-INF</outputDirectory>
167+
<outputDirectory>${project.build.directory}/deltav-4.1.2760/META-INF</outputDirectory>
170168
<overwrite>true</overwrite>
171169
<resources>
172170
<resource>
@@ -194,15 +192,9 @@
194192
</goals>
195193
<configuration>
196194
<target>
197-
<input
198-
message="Please enter the test database url ofr jdbc connection: "
199-
addproperty="db.url" defaultvalue="jdbc:oracle:thin:@localhost:1521:XE"/>
200-
<input
201-
message="Please enter the test database login: "
202-
addproperty="db.login" defaultvalue="system"/>
203-
<input
204-
message="Please enter the test database login: "
205-
addproperty="db.password" />
195+
<input message="Please enter the test database url ofr jdbc connection: " addproperty="db.url" defaultvalue="jdbc:oracle:thin:@localhost:1521:XE" />
196+
<input message="Please enter the test database login: " addproperty="db.login" defaultvalue="system" />
197+
<input message="Please enter the test database login: " addproperty="db.password" />
206198
</target>
207199
<exportAntProperties>true</exportAntProperties>
208200
</configuration>
@@ -216,7 +208,7 @@
216208
<configuration>
217209
<target>
218210
<exec executable="start" vmlauncher="false">
219-
<arg line="http://localhost:11021/"/>
211+
<arg line="http://localhost:11021/" />
220212
</exec>
221213
</target>
222214
</configuration>
@@ -230,7 +222,7 @@
230222
<configuration>
231223
<target>
232224
<exec executable="xdg-open">
233-
<arg line="http://localhost:11021/"/>
225+
<arg line="http://localhost:11021/" />
234226
</exec>
235227
</target>
236228
</configuration>
@@ -245,7 +237,7 @@
245237
<server>filesystem</server>
246238
<port>11021</port>
247239
<path>/</path>
248-
<warSourceDirectory>target/deltav-4.1.2743</warSourceDirectory>
240+
<warSourceDirectory>target/deltav-4.1.2760</warSourceDirectory>
249241
</configuration>
250242
</plugin>
251243
<plugin>

‎Java/filesystemstorage/pom.xml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
53
<modelVersion>4.0.0</modelVersion>
64

75
<groupId>com.ithit.webdav.samples</groupId>
86
<artifactId>filesystemstorage</artifactId>
9-
<version>4.1.2743</version>
7+
<version>4.1.2760</version>
108
<packaging>war</packaging>
119

1210
<properties>
@@ -34,7 +32,7 @@
3432
<dependency>
3533
<groupId>com.ithit.webdav.integration</groupId>
3634
<artifactId>servlet-integration</artifactId>
37-
<version>4.1.2743</version>
35+
<version>4.1.2760</version>
3836
</dependency>
3937
<dependency>
4038
<groupId>commons-io</groupId>
@@ -136,7 +134,7 @@
136134
<dependency>
137135
<groupId>com.ithit.webdav</groupId>
138136
<artifactId>webdav-server</artifactId>
139-
<version>4.1.2743</version>
137+
<version>4.1.2760</version>
140138
</dependency>
141139
<dependency>
142140
<groupId>net.java.dev.jna</groupId>
@@ -193,7 +191,7 @@
193191
<configuration>
194192
<target>
195193
<exec executable="start" vmlauncher="false">
196-
<arg line="http://localhost:11021/"/>
194+
<arg line="http://localhost:11021/" />
197195
</exec>
198196
</target>
199197
</configuration>
@@ -207,7 +205,7 @@
207205
<configuration>
208206
<target>
209207
<exec executable="xdg-open">
210-
<arg line="http://localhost:11021/"/>
208+
<arg line="http://localhost:11021/" />
211209
</exec>
212210
</target>
213211
</configuration>
@@ -222,7 +220,7 @@
222220
<server>filesystem</server>
223221
<port>11021</port>
224222
<path>/</path>
225-
<warSourceDirectory>target/filesystemstorage-4.1.2743</warSourceDirectory>
223+
<warSourceDirectory>target/filesystemstorage-4.1.2760</warSourceDirectory>
226224
</configuration>
227225
</plugin>
228226
<plugin>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ class FileImpl extends HierarchyItemImpl implements File, Lock,
4646
private FileImpl(String name, String path, long created, long modified, WebDavEngine engine) {
4747
super(name, path, created, modified, engine);
4848

49-
/* Mac OS X doesn't work with ExtendedOpenOption.NOSHARE_DELETE */
50-
this.allowedOpenFileOptions = (System.getProperty("os.name").contains("Mac")) ?
49+
/* Mac OS X and Ubuntu doesn't work with ExtendedOpenOption.NOSHARE_DELETE */
50+
String systemName = System.getProperty("os.name").toLowerCase();
51+
this.allowedOpenFileOptions = (systemName.contains("mac") || systemName.contains("linux")) ?
5152
(new OpenOption[]{StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.READ}) :
5253
(new OpenOption[]{StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.READ,
5354
ExtendedOpenOption.NOSHARE_DELETE});

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import java.io.IOException;
66
import java.nio.ByteBuffer;
77
import java.nio.charset.Charset;
8+
import java.nio.file.FileSystemException;
89
import java.nio.file.Files;
9-
import java.nio.file.NoSuchFileException;
1010
import java.nio.file.Paths;
1111
import java.nio.file.attribute.UserDefinedFileAttributeView;
1212

@@ -40,11 +40,15 @@ public String getExtendedAttribute(String path, String attribName) throws Server
4040
.getFileAttributeView(Paths.get(path), UserDefinedFileAttributeView.class);
4141
ByteBuffer buf;
4242
try {
43+
if (view.list().isEmpty()) {
44+
return null;
45+
}
46+
4347
buf = ByteBuffer.allocate(view.size(attribName));
4448
view.read(attribName, buf);
4549
buf.flip();
4650
return Charset.defaultCharset().decode(buf).toString();
47-
} catch (NoSuchFileException ignored) {
51+
} catch (FileSystemException ignore) {
4852
} catch (IOException e) {
4953
throw new ServerException(String.format("Reading attribute '%s' from file '%s' failed.", attribName, path), e);
5054
}

‎Java/oraclestorage/pom.xml‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
53
<modelVersion>4.0.0</modelVersion>
64

75
<groupId>com.ithit.webdav.samples</groupId>
86
<artifactId>oraclestorage</artifactId>
9-
<version>4.1.2743</version>
7+
<version>4.1.2760</version>
108
<packaging>war</packaging>
119

1210
<properties>
@@ -23,7 +21,7 @@
2321
<dependency>
2422
<groupId>com.ithit.webdav.integration</groupId>
2523
<artifactId>servlet-integration</artifactId>
26-
<version>4.1.2743</version>
24+
<version>4.1.2760</version>
2725
</dependency>
2826
<dependency>
2927
<groupId>commons-dbcp</groupId>
@@ -125,7 +123,7 @@
125123
<dependency>
126124
<groupId>com.ithit.webdav</groupId>
127125
<artifactId>webdav-server</artifactId>
128-
<version>4.1.2743</version>
126+
<version>4.1.2760</version>
129127
</dependency>
130128

131129
<dependency>
@@ -165,7 +163,7 @@
165163
<goal>copy-resources</goal>
166164
</goals>
167165
<configuration>
168-
<outputDirectory>${project.build.directory}/oraclestorage-4.1.2743/META-INF</outputDirectory>
166+
<outputDirectory>${project.build.directory}/oraclestorage-4.1.2760/META-INF</outputDirectory>
169167
<overwrite>true</overwrite>
170168
<resources>
171169
<resource>
@@ -193,15 +191,9 @@
193191
</goals>
194192
<configuration>
195193
<target>
196-
<input
197-
message="Please enter the test database url ofr jdbc connection: "
198-
addproperty="db.url" defaultvalue="jdbc:oracle:thin:@localhost:1521:XE"/>
199-
<input
200-
message="Please enter the test database login: "
201-
addproperty="db.login" defaultvalue="system"/>
202-
<input
203-
message="Please enter the test database login: "
204-
addproperty="db.password" />
194+
<input message="Please enter the test database url ofr jdbc connection: " addproperty="db.url" defaultvalue="jdbc:oracle:thin:@localhost:1521:XE" />
195+
<input message="Please enter the test database login: " addproperty="db.login" defaultvalue="system" />
196+
<input message="Please enter the test database login: " addproperty="db.password" />
205197
</target>
206198
<exportAntProperties>true</exportAntProperties>
207199
</configuration>
@@ -215,7 +207,7 @@
215207
<configuration>
216208
<target>
217209
<exec executable="start" vmlauncher="false">
218-
<arg line="http://localhost:11021/"/>
210+
<arg line="http://localhost:11021/" />
219211
</exec>
220212
</target>
221213
</configuration>
@@ -229,7 +221,7 @@
229221
<configuration>
230222
<target>
231223
<exec executable="xdg-open">
232-
<arg line="http://localhost:11021/"/>
224+
<arg line="http://localhost:11021/" />
233225
</exec>
234226
</target>
235227
</configuration>
@@ -244,7 +236,7 @@
244236
<server>filesystem</server>
245237
<port>11021</port>
246238
<path>/</path>
247-
<warSourceDirectory>target/oraclestorage-4.1.2743</warSourceDirectory>
239+
<warSourceDirectory>target/oraclestorage-4.1.2760</warSourceDirectory>
248240
</configuration>
249241
</plugin>
250242
<plugin>

‎Kotlin/filesystemstorage/pom.xml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
53
<modelVersion>4.0.0</modelVersion>
64

75
<groupId>com.ithit.webdav.samples</groupId>
86
<artifactId>kotlinfs</artifactId>
9-
<version>4.1.2743</version>
7+
<version>4.1.2760</version>
108
<packaging>war</packaging>
119

1210
<properties>
@@ -34,7 +32,7 @@
3432
<dependency>
3533
<groupId>com.ithit.webdav.integration</groupId>
3634
<artifactId>servlet-integration</artifactId>
37-
<version>4.1.2743</version>
35+
<version>4.1.2760</version>
3836
</dependency>
3937
<dependency>
4038
<groupId>commons-io</groupId>
@@ -142,7 +140,7 @@
142140
<dependency>
143141
<groupId>com.ithit.webdav</groupId>
144142
<artifactId>webdav-server</artifactId>
145-
<version>4.1.2743</version>
143+
<version>4.1.2760</version>
146144
</dependency>
147145
<dependency>
148146
<groupId>net.java.dev.jna</groupId>
@@ -211,7 +209,7 @@
211209
<configuration>
212210
<target>
213211
<exec executable="start" vmlauncher="false">
214-
<arg line="http://localhost:11021/"/>
212+
<arg line="http://localhost:11021/" />
215213
</exec>
216214
</target>
217215
</configuration>
@@ -225,7 +223,7 @@
225223
<configuration>
226224
<target>
227225
<exec executable="xdg-open">
228-
<arg line="http://localhost:11021/"/>
226+
<arg line="http://localhost:11021/" />
229227
</exec>
230228
</target>
231229
</configuration>
@@ -240,7 +238,7 @@
240238
<server>filesystem</server>
241239
<port>11021</port>
242240
<path>/</path>
243-
<warSourceDirectory>target/kotlinfs-4.1.2743</warSourceDirectory>
241+
<warSourceDirectory>target/kotlinfs-4.1.2760</warSourceDirectory>
244242
</configuration>
245243
</plugin>
246244
<plugin>

0 commit comments

Comments
 (0)