Skip to content

Commit 81b4205

Browse files
ITHitBuildITHitBuild
committed
4.5.4195
1 parent b117b40 commit 81b4205

11 files changed

Lines changed: 96 additions & 68 deletions

File tree

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

‎Java/deltav/pom.xml‎

Lines changed: 11 additions & 11 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.5.4062</version>
9+
<version>4.5.4195</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.5.4062</version>
26+
<version>4.5.4195</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>commons-dbcp</groupId>
@@ -38,9 +38,9 @@
3838
<scope>runtime</scope>
3939
</dependency>
4040
<dependency>
41-
<groupId>com.hynnet</groupId>
42-
<artifactId>oracle-driver-ojdbc6</artifactId>
43-
<version>12.1.0.1</version>
41+
<groupId>com.oracle</groupId>
42+
<artifactId>ojdbc7</artifactId>
43+
<version>12.1.0.2</version>
4444
<scope>runtime</scope>
4545
</dependency>
4646
<dependency>
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>com.ithit.webdav</groupId>
127127
<artifactId>webdav-server</artifactId>
128-
<version>4.5.4062</version>
128+
<version>4.5.4195</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.5.4062/META-INF</outputDirectory>
168+
<outputDirectory>${project.build.directory}/deltav-4.5.4195/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.5.4062</warSourceDirectory>
247+
<warSourceDirectory>target/deltav-4.5.4195</warSourceDirectory>
248248
</configuration>
249249
</plugin>
250250
<plugin>
@@ -253,9 +253,9 @@
253253
<version>1.5</version>
254254
<dependencies>
255255
<dependency>
256-
<groupId>com.hynnet</groupId>
257-
<artifactId>oracle-driver-ojdbc6</artifactId>
258-
<version>12.1.0.1</version>
256+
<groupId>com.oracle</groupId>
257+
<artifactId>ojdbc7</artifactId>
258+
<version>12.1.0.2</version>
259259
</dependency>
260260
</dependencies>
261261
<configuration>

‎Java/filesystemstorage/pom.xml‎

Lines changed: 7 additions & 7 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.5.4062</version>
9+
<version>4.5.4195</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.5.4062</version>
37+
<version>4.5.4195</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>commons-io</groupId>
@@ -55,9 +55,9 @@
5555
<scope>provided</scope>
5656
</dependency>
5757
<dependency>
58-
<groupId>com.hynnet</groupId>
59-
<artifactId>oracle-driver-ojdbc6</artifactId>
60-
<version>12.1.0.1</version>
58+
<groupId>com.oracle</groupId>
59+
<artifactId>ojdbc7</artifactId>
60+
<version>12.1.0.2</version>
6161
<scope>provided</scope>
6262
</dependency>
6363
<dependency>
@@ -142,7 +142,7 @@
142142
<dependency>
143143
<groupId>com.ithit.webdav</groupId>
144144
<artifactId>webdav-server</artifactId>
145-
<version>4.5.4062</version>
145+
<version>4.5.4195</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.5.4062</warSourceDirectory>
231+
<warSourceDirectory>target/filesystemstorage-4.5.4195</warSourceDirectory>
232232
</configuration>
233233
</plugin>
234234
<plugin>

‎Java/oraclestorage/pom.xml‎

Lines changed: 11 additions & 11 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.5.4062</version>
9+
<version>4.5.4195</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.5.4062</version>
26+
<version>4.5.4195</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>commons-dbcp</groupId>
@@ -38,9 +38,9 @@
3838
<scope>runtime</scope>
3939
</dependency>
4040
<dependency>
41-
<groupId>com.hynnet</groupId>
42-
<artifactId>oracle-driver-ojdbc6</artifactId>
43-
<version>12.1.0.1</version>
41+
<groupId>com.oracle</groupId>
42+
<artifactId>ojdbc7</artifactId>
43+
<version>12.1.0.2</version>
4444
<scope>runtime</scope>
4545
</dependency>
4646
<dependency>
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>com.ithit.webdav</groupId>
127127
<artifactId>webdav-server</artifactId>
128-
<version>4.5.4062</version>
128+
<version>4.5.4195</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.5.4062/META-INF</outputDirectory>
168+
<outputDirectory>${project.build.directory}/oraclestorage-4.5.4195/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.5.4062</warSourceDirectory>
247+
<warSourceDirectory>target/oraclestorage-4.5.4195</warSourceDirectory>
248248
</configuration>
249249
</plugin>
250250
<plugin>
@@ -253,9 +253,9 @@
253253
<version>1.5</version>
254254
<dependencies>
255255
<dependency>
256-
<groupId>com.hynnet</groupId>
257-
<artifactId>oracle-driver-ojdbc6</artifactId>
258-
<version>12.1.0.1</version>
256+
<groupId>com.oracle</groupId>
257+
<artifactId>ojdbc7</artifactId>
258+
<version>12.1.0.2</version>
259259
</dependency>
260260
</dependencies>
261261
<configuration>

‎Java/springbootfsstorage/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<groupId>com.ithit.webdav.samples</groupId>
1111
<artifactId>springbootfsstorage</artifactId>
12-
<version>4.5.4062</version>
12+
<version>4.5.4195</version>
1313
<name>springbootfsstorage</name>
1414
<description>Demo project for Spring Boot</description>
1515

@@ -43,12 +43,12 @@
4343
<dependency>
4444
<groupId>com.ithit.webdav</groupId>
4545
<artifactId>webdav-server</artifactId>
46-
<version>4.5.4062</version>
46+
<version>4.5.4195</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>com.ithit.webdav.integration</groupId>
5050
<artifactId>servlet-integration</artifactId>
51-
<version>4.5.4062</version>
51+
<version>4.5.4195</version>
5252
</dependency>
5353

5454
<!-- JNA dependencies -->

‎Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/configuration/WebDavConfiguration.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.springframework.core.Ordered;
2222
import org.springframework.core.io.Resource;
2323
import org.springframework.util.StreamUtils;
24+
import org.springframework.web.context.annotation.RequestScope;
2425
import org.springframework.web.cors.CorsConfiguration;
2526
import org.springframework.web.cors.CorsConfigurationSource;
2627
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@@ -79,6 +80,7 @@ public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
7980
registry.addHandler(socketHandler, properties.getRootWebSocket()).setAllowedOrigins("*");
8081
}
8182

83+
@RequestScope
8284
@Bean
8385
public WebDavEngine engine() {
8486
rootLocalPath = Paths.get(properties.getRootFolder()).normalize().toString();
@@ -97,7 +99,7 @@ public WebDavEngine engine() {
9799
handlerHead.setPreviousHandler(webDavEngine.registerMethodHandler("HEAD", handlerHead));
98100
String indexLocalPath = createIndexPath();
99101
if (rootLocalPath != null && indexLocalPath != null) {
100-
SearchFacade searchFacade = new SearchFacade(webDavEngine, webDavEngine.getLogger());
102+
SearchFacade searchFacade = SearchFacade.getInstance(webDavEngine, webDavEngine.getLogger());
101103
searchFacade.indexRootFolder(rootLocalPath, indexLocalPath, 2);
102104
webDavEngine.setSearchFacade(searchFacade);
103105
}

‎Java/springbootfsstorage/src/main/java/com/ithit/webdav/samples/springbootfs/impl/SearchFacade.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,21 @@ public class SearchFacade {
3939
private Searcher searcher;
4040
private WebDavEngine engine;
4141
private Logger logger;
42+
private static SearchFacade INSTANCE;
43+
private volatile boolean indexed = false;
4244

43-
public SearchFacade(WebDavEngine webDavEngine, Logger logger) {
45+
private SearchFacade(WebDavEngine webDavEngine, Logger logger) {
4446
engine = webDavEngine;
4547
this.logger = logger;
4648
}
4749

50+
public synchronized static SearchFacade getInstance(WebDavEngine webDavEngine, Logger logger) {
51+
if (INSTANCE == null) {
52+
INSTANCE = new SearchFacade(webDavEngine, logger);
53+
}
54+
return INSTANCE;
55+
}
56+
4857
/**
4958
* Returns Indexer instance
5059
*
@@ -129,7 +138,10 @@ void schedule() {
129138
* @param interval Daemon commit interval.
130139
*/
131140
public void indexRootFolder(String dataFolder, String indexFolder, Integer interval) {
132-
new IndexTask(dataFolder, indexFolder, interval).schedule();
141+
if (!indexed) {
142+
indexed = true;
143+
new IndexTask(dataFolder, indexFolder, interval).schedule();
144+
}
133145
}
134146

135147
/**

‎Java/springbootoraclestorage/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<groupId>com.ithit.webdav.samples</groupId>
1111
<artifactId>springbootoraclestorage</artifactId>
12-
<version>4.5.4062</version>
12+
<version>4.5.4195</version>
1313
<name>springbootoraclestorage</name>
1414
<description>Demo project for Spring Boot</description>
1515

@@ -53,12 +53,12 @@
5353
<dependency>
5454
<groupId>com.ithit.webdav</groupId>
5555
<artifactId>webdav-server</artifactId>
56-
<version>4.5.4062</version>
56+
<version>4.5.4195</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>com.ithit.webdav.integration</groupId>
6060
<artifactId>servlet-integration</artifactId>
61-
<version>4.5.4062</version>
61+
<version>4.5.4195</version>
6262
</dependency>
6363

6464
<!-- Oracle dependencies -->

‎Java/springbootoraclestorage/src/main/java/com/ithit/webdav/samples/springbootoracle/configuration/WebDavConfiguration.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.springframework.core.Ordered;
2222
import org.springframework.core.io.Resource;
2323
import org.springframework.util.StreamUtils;
24+
import org.springframework.web.context.annotation.RequestScope;
2425
import org.springframework.web.cors.CorsConfiguration;
2526
import org.springframework.web.cors.CorsConfigurationSource;
2627
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@@ -79,6 +80,7 @@ public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
7980
registry.addHandler(socketHandler, properties.getRootWebSocket()).setAllowedOrigins("*");
8081
}
8182

83+
@RequestScope
8284
@Bean
8385
public WebDavEngine engine() {
8486
String license;
@@ -96,7 +98,7 @@ public WebDavEngine engine() {
9698
DataAccess dataAccess = new DataAccess(webDavEngine, dataSource);
9799
webDavEngine.setDataAccess(dataAccess);
98100
if (indexLocalPath != null) {
99-
SearchFacade searchFacade = new SearchFacade(dataAccess, webDavEngine.getLogger());
101+
SearchFacade searchFacade = SearchFacade.getInstance(dataAccess, webDavEngine.getLogger());
100102
searchFacade.indexRootFolder(indexLocalPath, 2);
101103
webDavEngine.setSearchFacade(searchFacade);
102104
}

0 commit comments

Comments
 (0)