Skip to content

Commit 32e61b5

Browse files
committed
4.4.3821
1 parent 8dc715c commit 32e61b5

File tree

142 files changed

+9933
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+9933
-93
lines changed

Java/androidfsstorage/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ android {
3030
jarJar {
3131
rules = [
3232
'stax-api-1.0.1.jar' : 'javax.xml.** com.ithit.webdav.xml.@1',
33-
'webdav-server-4.3.3605.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
33+
'webdav-server-4.4.3821.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
3434
]
3535
}
3636

@@ -71,11 +71,11 @@ dependencies {
7171
implementation 'commons-io:commons-io:2.4'
7272
implementation 'com.google.code.gson:gson:2.7'
7373
implementation 'com.android.support:appcompat-v7:27.1.1'
74-
implementation('com.ithit.webdav.integration:android-integration:4.3.3605', {
74+
implementation('com.ithit.webdav.integration:android-integration:4.4.3821', {
7575
exclude group: 'org.nanohttpd', module: 'nanohttpd'
7676
})
7777
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
7878
jarJar 'stax:stax-api:1.0.1'
79-
jarJar 'com.ithit.webdav:webdav-server:4.3.3605'
79+
jarJar 'com.ithit.webdav:webdav-server:4.4.3821'
8080
testImplementation 'junit:junit:4.12'
8181
}

Java/androidfsstorage/app/src/main/assets/MyCustomHandlerPage.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
88
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0/css/bootstrap.min.css" rel="stylesheet">
99
<link href="https://use.fontawesome.com/releases/v5.0.10/css/all.css" rel="stylesheet">
10-
<link href="<%context root%>wwwroot/css/webdav-layout.css" rel="stylesheet"/>
10+
<link href="/wwwroot/css/webdav-layout.css" rel="stylesheet"/>
1111
</head>
1212
<body>
1313
<nav class="navbar navbar-expand-md navbar-dark bg-dark mb-4">
@@ -170,9 +170,9 @@ <h3>Client Version</h3>
170170
</main>
171171
<script>
172172
var webDavSettings = {
173-
ApplicationPath: '<%context root%>',
174-
WebSocketPath: '<%ws root%>',
175-
ApplicationProtocolsPath: '<%context root%>wwwroot/js/node_modules/webdav.client/Plugins/',
173+
ApplicationPath: '/',
174+
WebSocketPath: '',
175+
ApplicationProtocolsPath: '/wwwroot/js/node_modules/webdav.client/Plugins/',
176176
EditDocAuth: {
177177
Authentication: 'anonymous',
178178
CookieNames: null, // Coma separated list of cookie names to search for.
@@ -182,26 +182,26 @@ <h3>Client Version</h3>
182182
}
183183

184184
function OpenAjaxFileBrowserWindow() {
185-
window.open("<%context root%>" + "wwwroot/AjaxFileBrowser.html", "", "menubar=1,location=1,status=1,scrollbars=1,resizable=1,width=900,height=600");
185+
window.open("/wwwroot/AjaxFileBrowser.html", "", "menubar=1,location=1,status=1,scrollbars=1,resizable=1,width=900,height=600");
186186
}
187187

188188
function OpenTestsWindow() {
189189
var width = Math.round(screen.width * 0.5);
190190
var height = Math.round(screen.height * 0.8);
191-
window.open("<%context root%>" + "wwwroot/AjaxIntegrationTests.html", "", "menubar=1,location=1,status=1,scrollbars=1,resizable=1,width=" + width + ",height=" + height);
191+
window.open("/wwwroot/AjaxIntegrationTests.html", "", "menubar=1,location=1,status=1,scrollbars=1,resizable=1,width=" + width + ",height=" + height);
192192
}
193193
</script>
194194
<!--
195195
JavaScript file required to run WebDAV Ajax library is loaded from Node.js Package Manager.
196196
To load files from your website download them here: https://www.webdavsystem.com/ajax/download,
197197
deploy them to your website and replace the path below in this file.
198198
-->
199-
<script src="<%context root%>wwwroot/js/node_modules/webdav.client/ITHitWebDAVClient.js"></script>
199+
<script src="/wwwroot/js/node_modules/webdav.client/ITHitWebDAVClient.js"></script>
200200
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
201201
<script src="https://cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.jquery.min.js"></script>
202202
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0/js/bootstrap.min.js"></script>
203-
<script src="<%context root%>wwwroot/js/webdav-gridview.js"></script>
204-
<script src="<%context root%>wwwroot/js/webdav-uploader.js"></script>
205-
<script src="<%context root%>wwwroot/js/webdav-websocket.js"></script>
203+
<script src="/wwwroot/js/webdav-gridview.js"></script>
204+
<script src="/wwwroot/js/webdav-uploader.js"></script>
205+
<script src="/wwwroot/js/webdav-websocket.js"></script>
206206
</body>
207207
</html>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
2929
protected void onCreate(Bundle savedInstanceState) {
3030
super.onCreate(savedInstanceState);
3131
setContentView(R.layout.main);
32-
label = (TextView) findViewById(R.id.logOutput);
33-
Button clearButton = (Button) findViewById(R.id.btn_clearLog);
32+
label = findViewById(R.id.logOutput);
33+
Button clearButton = findViewById(R.id.btn_clearLog);
3434
clearButton.setOnClickListener(this);
35-
mapVideoButton = (Button) findViewById(R.id.btn_mapVideo);
35+
mapVideoButton = findViewById(R.id.btn_mapVideo);
3636
mapVideoButton.setOnClickListener(this);
3737
nanoIntent = new Intent(this, NanoIntentService.class);
3838
startService(nanoIntent);
@@ -65,7 +65,7 @@ public void output(final String message) {
6565
@Override
6666
public void run() {
6767
label.append(message + "\n\n");
68-
final ScrollView scrollView = (ScrollView) findViewById(R.id.scrollOutput);
68+
final ScrollView scrollView = findViewById(R.id.scrollOutput);
6969
scrollView.post(new Runnable() {
7070
@Override
7171
public void run() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void onDestroy() {
129129

130130
private void initUserStorage(String path) {
131131
AssetManager assetManager = this.getAssets();
132-
String assets[];
132+
String[] assets;
133133
try {
134134
assets = assetManager.list(path);
135135
if (assets.length == 0) {

Java/deltav/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>deltav</artifactId>
9-
<version>4.3.3604</version>
9+
<version>4.4.3821</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>4.3.3604</version>
26+
<version>4.4.3821</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>4.3.3604</version>
128+
<version>4.4.3821</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-4.3.3604/META-INF</outputDirectory>
168+
<outputDirectory>${project.build.directory}/deltav-4.4.3821/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-4.3.3604</warSourceDirectory>
247+
<warSourceDirectory>target/deltav-4.4.3821</warSourceDirectory>
248248
</configuration>
249249
</plugin>
250250
<plugin>

Java/filesystemstorage/pom.xml

Lines changed: 4 additions & 4 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>4.3.3604</version>
9+
<version>4.4.3821</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>4.3.3604</version>
37+
<version>4.4.3821</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>4.3.3604</version>
145+
<version>4.4.3821</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-4.3.3604</warSourceDirectory>
231+
<warSourceDirectory>target/filesystemstorage-4.4.3821</warSourceDirectory>
232232
</configuration>
233233
</plugin>
234234
<plugin>

Java/oraclestorage/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>oraclestorage</artifactId>
9-
<version>4.3.3604</version>
9+
<version>4.4.3821</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>4.3.3604</version>
26+
<version>4.4.3821</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>4.3.3604</version>
128+
<version>4.4.3821</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-4.3.3604/META-INF</outputDirectory>
168+
<outputDirectory>${project.build.directory}/oraclestorage-4.4.3821/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-4.3.3604</warSourceDirectory>
247+
<warSourceDirectory>target/oraclestorage-4.4.3821</warSourceDirectory>
248248
</configuration>
249249
</plugin>
250250
<plugin>

Java/oraclestorage/src/main/java/com/ithit/webdav/samples/oraclestorageservlet/HierarchyItemImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* Your file items must implement {@link com.ithit.webdav.server.File} interface, folder items - {@link Folder} interface.
2121
* </p>
2222
*/
23-
public abstract class HierarchyItemImpl implements com.ithit.webdav.server.HierarchyItem, Lock {
23+
public abstract class HierarchyItemImpl implements HierarchyItem, Lock {
2424

2525
static final String SNIPPET = "snippet";
2626
final int id;
@@ -235,7 +235,7 @@ public List<Property> getPropertyNames() throws ServerException {
235235
* Modifies and removes properties for this item.
236236
*
237237
* @param setProps Array of properties to be set.
238-
* @param delProps Array of properties to be removed. {@link Property#value} field is ignored.
238+
* @param delProps Array of properties to be removed. {@link Property#getValue()} field is ignored.
239239
* Specifying the removal of a property that does not exist is not an error.
240240
* @throws LockedException this item was locked and client did not provide lock token.
241241
* @throws MultistatusException If update fails for a property, this exception shall be thrown and contain

0 commit comments

Comments
 (0)