Skip to content

Commit 7c8325e

Browse files
ITHitBuildITHitBuild
committed
3.2.2431
1 parent bf975be commit 7c8325e

18 files changed

Lines changed: 38 additions & 31 deletions

File tree

‎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-3.2.2420.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
33+
'webdav-server-3.2.2431.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:3.2.2420', {
74+
implementation('com.ithit.webdav.integration:android-integration:3.2.2431', {
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:3.2.2420'
79+
jarJar 'com.ithit.webdav:webdav-server:3.2.2431'
8080
testImplementation 'junit:junit:4.12'
8181
}

‎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>3.2.2420</version>
9+
<version>3.2.2431</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>3.2.2420</version>
26+
<version>3.2.2431</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>commons-dbcp</groupId>
@@ -93,7 +93,7 @@
9393
<dependency>
9494
<groupId>com.ithit.webdav</groupId>
9595
<artifactId>webdav-server</artifactId>
96-
<version>3.2.2420</version>
96+
<version>3.2.2431</version>
9797
</dependency>
9898

9999
<dependency>
@@ -133,7 +133,7 @@
133133
<goal>copy-resources</goal>
134134
</goals>
135135
<configuration>
136-
<outputDirectory>${project.build.directory}/deltav-3.2.2420/META-INF</outputDirectory>
136+
<outputDirectory>${project.build.directory}/deltav-3.2.2431/META-INF</outputDirectory>
137137
<overwrite>true</overwrite>
138138
<resources>
139139
<resource>
@@ -212,7 +212,7 @@
212212
<server>filesystem</server>
213213
<port>11021</port>
214214
<path>/</path>
215-
<warSourceDirectory>target/deltav-3.2.2420</warSourceDirectory>
215+
<warSourceDirectory>target/deltav-3.2.2431</warSourceDirectory>
216216
</configuration>
217217
</plugin>
218218
<plugin>

‎deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/CustomFolderGetHandler.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ public void processRequest(DavRequest request, DavResponse response, HierarchyIt
5656
if (line.contains(ws)) {
5757
line = line.replace(ws, wsContext);
5858
}
59+
String version = "<%startTime%>";
60+
if (line.contains(version)) {
61+
line = line.replace(version, WebDavServlet.START_TIME);
62+
}
5963
stream.println(line);
6064
}
6165
stream.flush();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class WebDavServlet extends HttpServlet {
3636
private boolean autoputUnderVersionControl;
3737
private static final String DEFAULT_INDEX_PATH = "WEB-INF/Index";
3838
private SearchFacade searchFacade;
39+
static final String START_TIME = "" + System.currentTimeMillis();
3940

4041
/**
4142
* Reads license file content.

‎deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/staticresourceservlet/FileServlet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class FileServlet extends HttpServlet {
4343

4444
private static final long serialVersionUID = 1L;
4545
private static final int DEFAULT_STREAM_BUFFER_SIZE = 10240;
46-
private static final Long DEFAULT_EXPIRE_TIME_IN_SECONDS = TimeUnit.DAYS.toSeconds(5);
46+
private static final Long DEFAULT_EXPIRE_TIME_IN_SECONDS = TimeUnit.DAYS.toSeconds(1);
4747
private static final long ONE_SECOND_IN_MILLIS = TimeUnit.SECONDS.toMillis(1);
4848
private static final String ETAG = "W/\"%s-%s\"";
4949
private static final Pattern RANGE_PATTERN = Pattern.compile("^bytes=[0-9]*-[0-9]*(,[0-9]*-[0-9]*)*$");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ <h3>Client Version</h3>
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="<%context root%>wwwroot/js/node_modules/webdav.client/ITHitWebDAVClient.js?version=<%startTime%>"></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>

‎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>3.2.2420</version>
9+
<version>3.2.2431</version>
1010
<packaging>war</packaging>
1111

1212
<properties>
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>com.ithit.webdav.integration</groupId>
3838
<artifactId>servlet-integration</artifactId>
39-
<version>3.2.2420</version>
39+
<version>3.2.2431</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>commons-io</groupId>
@@ -112,7 +112,7 @@
112112
<dependency>
113113
<groupId>com.ithit.webdav</groupId>
114114
<artifactId>webdav-server</artifactId>
115-
<version>3.2.2420</version>
115+
<version>3.2.2431</version>
116116
</dependency>
117117
<dependency>
118118
<groupId>net.java.dev.jna</groupId>
@@ -198,7 +198,7 @@
198198
<server>filesystem</server>
199199
<port>11021</port>
200200
<path>/</path>
201-
<warSourceDirectory>target/filesystemstorage-3.2.2420</warSourceDirectory>
201+
<warSourceDirectory>target/filesystemstorage-3.2.2431</warSourceDirectory>
202202
</configuration>
203203
</plugin>
204204
<plugin>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ public void processRequest(DavRequest request, DavResponse response, HierarchyIt
6464
if (line.contains(ws)) {
6565
line = line.replace(ws, wsContext);
6666
}
67+
String version = "<%startTime%>";
68+
if (line.contains(version)) {
69+
line = line.replace(version, WebDavServlet.START_TIME);
70+
}
6771
stream.println(line);
6872
}
6973
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public class WebDavServlet extends HttpServlet {
4040
private boolean showExceptions;
4141
private SearchFacade searchFacade;
4242
private String license;
43+
static final String START_TIME = "" + System.currentTimeMillis();
4344

4445
/**
4546
* Returns root folder for the WebDav.

‎filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/staticresourceservlet/FileServlet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class FileServlet extends HttpServlet {
4343

4444
private static final long serialVersionUID = 1L;
4545
private static final int DEFAULT_STREAM_BUFFER_SIZE = 10240;
46-
private static final Long DEFAULT_EXPIRE_TIME_IN_SECONDS = TimeUnit.DAYS.toSeconds(5);
46+
private static final Long DEFAULT_EXPIRE_TIME_IN_SECONDS = TimeUnit.DAYS.toSeconds(1);
4747
private static final long ONE_SECOND_IN_MILLIS = TimeUnit.SECONDS.toMillis(1);
4848
private static final String ETAG = "W/\"%s-%s\"";
4949
private static final Pattern RANGE_PATTERN = Pattern.compile("^bytes=[0-9]*-[0-9]*(,[0-9]*-[0-9]*)*$");

0 commit comments

Comments
 (0)