Skip to content

Commit f9da4c1

Browse files
ITHitBuildITHitBuild
committed
3.2.2438
1 parent 210af22 commit f9da4c1

6 files changed

Lines changed: 19 additions & 21 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.2435.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
33+
'webdav-server-3.2.2438.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.2435', {
74+
implementation('com.ithit.webdav.integration:android-integration:3.2.2438', {
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.2435'
79+
jarJar 'com.ithit.webdav:webdav-server:3.2.2438'
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.2435</version>
9+
<version>3.2.2438</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.2435</version>
26+
<version>3.2.2438</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.2435</version>
96+
<version>3.2.2438</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.2435/META-INF</outputDirectory>
136+
<outputDirectory>${project.build.directory}/deltav-3.2.2438/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.2435</warSourceDirectory>
215+
<warSourceDirectory>target/deltav-3.2.2438</warSourceDirectory>
216216
</configuration>
217217
</plugin>
218218
<plugin>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,12 +728,11 @@ int genVersionId() throws ServerException {
728728
*/
729729
void moveThisItem(FolderImpl destFolder, String destName, FolderImpl parent) throws ServerException {
730730

731-
getDataAccess().executeUpdate("DELETE FROM Locks WHERE ItemID = ?", getId());
732731
getDataAccess().executeUpdate("UPDATE Repository SET"
733732
+ " Name = ?"
734733
+ ", Parent = ?"
735734
+ " WHERE ID = ?", destName, destFolder.getId(), getId());
736-
735+
getDataAccess().executeUpdate("DELETE FROM Locks WHERE ItemID = ?", getId());
737736

738737
parent.updateModified();
739738
destFolder.updateModified();

‎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.2435</version>
9+
<version>3.2.2438</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.2435</version>
39+
<version>3.2.2438</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.2435</version>
115+
<version>3.2.2438</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.2435</warSourceDirectory>
201+
<warSourceDirectory>target/filesystemstorage-3.2.2438</warSourceDirectory>
202202
</configuration>
203203
</plugin>
204204
<plugin>

‎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>3.2.2435</version>
9+
<version>3.2.2438</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.2435</version>
26+
<version>3.2.2438</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.2435</version>
96+
<version>3.2.2438</version>
9797
</dependency>
9898

9999
<dependency>
@@ -133,7 +133,7 @@
133133
<goal>copy-resources</goal>
134134
</goals>
135135
<configuration>
136-
<outputDirectory>${project.build.directory}/oraclestorage-3.2.2435/META-INF</outputDirectory>
136+
<outputDirectory>${project.build.directory}/oraclestorage-3.2.2438/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/oraclestorage-3.2.2435</warSourceDirectory>
215+
<warSourceDirectory>target/oraclestorage-3.2.2438</warSourceDirectory>
216216
</configuration>
217217
</plugin>
218218
<plugin>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,12 +701,11 @@ int genItemId() throws ServerException {
701701
*/
702702
void moveThisItem(FolderImpl destFolder, String destName, FolderImpl parent) throws ServerException {
703703

704-
getDataAccess().executeUpdate("DELETE FROM Locks WHERE ItemID = ?", getId());
705704
getDataAccess().executeUpdate("UPDATE Repository SET"
706705
+ " Name = ?"
707706
+ ", Parent = ?"
708707
+ " WHERE ID = ?", destName, destFolder.getId(), getId());
709-
708+
getDataAccess().executeUpdate("DELETE FROM Locks WHERE ItemID = ?", getId());
710709

711710
parent.updateModified();
712711
destFolder.updateModified();

0 commit comments

Comments
 (0)