Skip to content

Commit 3a0ddac

Browse files
ITHitBuildITHitBuild
committed
4.1.2715
1 parent 5d3cf9c commit 3a0ddac

78 files changed

Lines changed: 1013 additions & 235 deletions

File tree

Some content is hidden

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

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

‎Java/deltav/pom.xml‎

Lines changed: 14 additions & 10 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.1.2703</version>
9+
<version>4.1.2715</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.1.2703</version>
26+
<version>4.1.2715</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>commons-dbcp</groupId>
@@ -46,27 +46,27 @@
4646
<dependency>
4747
<groupId>org.apache.lucene</groupId>
4848
<artifactId>lucene-core</artifactId>
49-
<version>6.2.0</version>
49+
<version>7.5.0</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.apache.lucene</groupId>
5353
<artifactId>lucene-queryparser</artifactId>
54-
<version>6.2.0</version>
54+
<version>7.5.0</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>org.apache.lucene</groupId>
5858
<artifactId>lucene-highlighter</artifactId>
59-
<version>6.2.0</version>
59+
<version>7.5.0</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>org.apache.tika</groupId>
6363
<artifactId>tika-core</artifactId>
64-
<version>1.19</version>
64+
<version>1.19.1</version>
6565
</dependency>
6666
<dependency>
6767
<groupId>org.apache.tika</groupId>
6868
<artifactId>tika-parsers</artifactId>
69-
<version>1.19</version>
69+
<version>1.19.1</version>
7070
<exclusions>
7171
<exclusion>
7272
<artifactId>cxf-core</artifactId>
@@ -116,12 +116,16 @@
116116
<artifactId>activation</artifactId>
117117
<groupId>javax.activation</groupId>
118118
</exclusion>
119+
<exclusion>
120+
<groupId>org.apache.sis.storage</groupId>
121+
<artifactId>sis-netcdf</artifactId>
122+
</exclusion>
119123
</exclusions>
120124
</dependency>
121125
<dependency>
122126
<groupId>com.ithit.webdav</groupId>
123127
<artifactId>webdav-server</artifactId>
124-
<version>4.1.2703</version>
128+
<version>4.1.2715</version>
125129
</dependency>
126130

127131
<dependency>
@@ -161,7 +165,7 @@
161165
<goal>copy-resources</goal>
162166
</goals>
163167
<configuration>
164-
<outputDirectory>${project.build.directory}/deltav-4.1.2703/META-INF</outputDirectory>
168+
<outputDirectory>${project.build.directory}/deltav-4.1.2715/META-INF</outputDirectory>
165169
<overwrite>true</overwrite>
166170
<resources>
167171
<resource>
@@ -240,7 +244,7 @@
240244
<server>filesystem</server>
241245
<port>11021</port>
242246
<path>/</path>
243-
<warSourceDirectory>target/deltav-4.1.2703</warSourceDirectory>
247+
<warSourceDirectory>target/deltav-4.1.2715</warSourceDirectory>
244248
</configuration>
245249
</plugin>
246250
<plugin>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.apache.lucene.store.Directory;
2020
import org.apache.lucene.store.FSDirectory;
2121
import org.apache.tika.Tika;
22+
import org.apache.tika.exception.ZeroByteFileException;
2223
import org.apache.tika.metadata.Metadata;
2324

2425
import java.io.IOException;
@@ -196,13 +197,15 @@ private void indexContent(Integer currentId, FileImpl file, Document doc) {
196197
doc.add(new TextField(CONTENTS, content, Field.Store.YES));
197198
}
198199
} catch (Exception ex) {
199-
logger.logError("Cannot index content.", ex);
200+
if (!(ex instanceof ZeroByteFileException)) {
201+
logger.logError("Error while indexing content: " + currentId, ex);
202+
}
200203
} finally {
201204
if (stream != null) {
202205
try {
203206
stream.close();
204207
} catch (IOException e) {
205-
logger.logError("Error while indexing file content: " + currentId, e);
208+
logger.logError("Error closing stream while indexing: " + currentId, e);
206209
}
207210
}
208211
}

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,20 @@
6060
<tr>
6161
<th class="d-none d-sm-table-cell" scope="col">#</th>
6262
<th scope="col"></th>
63-
<th class="ellipsis" scope="col"><span>Display Name</span></th>
64-
<th class="text-right" scope="col">Size</th>
65-
<th class="d-none d-sm-table-cell" scope="col">Modified</th>
63+
<th class="ellipsis sort" scope="col" data-sort-column="displayname"><span>Display Name</span></th>
64+
<th class="d-none d-sm-table-cell sort" scope="col" data-sort-column="getcontenttype">Type</th>
65+
<th class="sort" scope="col" data-sort-column="quota-used-bytes">Size</th>
66+
<th class="d-none d-sm-table-cell sort" scope="col" data-sort-column="getlastmodified">Modified</th>
6667
<th class="column-action" scope="col"></th>
6768
</tr>
6869
</thead>
6970
<tbody></tbody>
7071
</table>
7172
</div>
73+
<nav aria-label="Page navigation">
74+
<ul class="pagination flex-wrap justify-content-end ithit-pagination-container">
75+
</ul>
76+
</nav>
7277
<div id="ConfirmModal" class="modal" tabindex="-1" role="dialog" aria-labelledby="ConfirmModalLabel">
7378
<div class="modal-dialog modal-sm" role="document">
7479
<div class="modal-content">
@@ -199,6 +204,7 @@ <h3>Client Version</h3>
199204
<script src="<%context root%>wwwroot/js/node_modules/webdav.client/ITHitWebDAVClient.js?version=<%startTime%>"></script>
200205
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
201206
<script src="https://cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.jquery.min.js"></script>
207+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script>
202208
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0/js/bootstrap.min.js"></script>
203209
<script src="<%context root%>wwwroot/js/webdav-gridview.js"></script>
204210
<script src="<%context root%>wwwroot/js/webdav-uploader.js"></script>

‎Java/deltav/src/main/webapp/WEB-INF/wwwroot/css/webdav-layout.css‎

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,35 @@
3232
width: 85px;
3333
}
3434

35+
th.sort {
36+
position: relative;
37+
cursor: pointer;
38+
}
39+
40+
th.sort.ascending, th.sort.descending {
41+
padding-right: 15px;
42+
}
43+
44+
th.sort.ascending:after, th.sort.descending:after {
45+
content: "\f0de";
46+
font-family: "Font Awesome 5 Free";
47+
display: inline-block;
48+
position: absolute;
49+
left: -5px;
50+
}
51+
52+
th.sort.descending:after {
53+
content: "\f0dd";
54+
bottom: 8px;
55+
}
56+
3557
@media (max-width: 767px) {
3658
.ithit-search-container .twitter-typeahead {
3759
padding-right: 53px;
3860
}
3961

4062
.ithit-search-container button {
41-
width: 38px;
63+
width: 50px;
4264
}
4365
}
4466

@@ -76,10 +98,20 @@ table.ithit-grid-container > tbody > tr > td {
7698
}
7799

78100
table.ithit-grid-container > thead > tr > th:nth-child(1),
79-
table.ithit-grid-container > tbody > tr > td:nth-child(1),
101+
table.ithit-grid-container > tbody > tr > td:nth-child(1) {
102+
text-align: right;
103+
}
104+
105+
table.ithit-grid-container > thead > tr > th:nth-child(4),
106+
table.ithit-grid-container > tbody > tr > td:nth-child(4) {
107+
min-width: 120px;
108+
max-width: 120px;
109+
}
110+
80111
table.ithit-grid-container > thead > tr > th:nth-child(5),
81112
table.ithit-grid-container > tbody > tr > td:nth-child(5) {
82-
text-align: right;
113+
min-width: 100px;
114+
max-width: 100px;
83115
}
84116

85117
table.ithit-grid-container > tbody > tr > td:nth-child(3) {
@@ -200,6 +232,10 @@ table tr.hover {
200232
background-color: #f5f5f5;
201233
}
202234

235+
.table td, .table th {
236+
padding: 0.5rem;
237+
}
238+
203239
.table-responsive {
204240
border: none;
205241
}
@@ -329,6 +365,16 @@ button.btn.btn-transparent {
329365
margin-top: 15px;
330366
}
331367

332-
.btn {
333-
min-width: 70px;
368+
p.error-message {
369+
margin: 0;
370+
}
371+
372+
.btn-info {
373+
padding: 0px 5px !important;
374+
line-height: 1.2;
375+
margin-top: -3px;
376+
}
377+
378+
.btn-info .fas {
379+
vertical-align: initial;
334380
}

0 commit comments

Comments
 (0)