Skip to content

Commit 5056681

Browse files
committed
6.1.7907-Beta
1 parent bf90db9 commit 5056681

File tree

21 files changed

+119
-101
lines changed

21 files changed

+119
-101
lines changed

Java/androidfsstorage/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<li>Android API Level 19</li>
88
</ul>
99
<h2>Setting the License</h2>
10-
<p>To run the example, you will need a valid IT Hit WebDAV Server Engine License. You can download the license in&nbsp;the&nbsp;<a title="Download" href="https://www.webdavsystem.com/javaserver/download/">product download area</a>.&nbsp;Note that the Engine is fully functional with a trial license and does not have any limitations. The trial license is valid for one month and the engine will stop working after this. You can check the expiration date inside the license file.&nbsp;Download the license file and specify it's content in&nbsp;<span class="code">License</span>&nbsp;field under&nbsp;<span class="code">DavEngineOptions</span>&nbsp;in&nbsp;<span class="code">/androidfsstorage/app/src/main/assets/webdavsettings.json</span>&nbsp;file.</p>
11-
<p>You can also run the sample&nbsp;without explicitly specifying a license&nbsp;for 5 days. In this case&nbsp;the&nbsp;Engine will automatically request the trial license from IT Hit website https://www.webdavsystem.com. Make sure it is accessible via firewalls, if any. After 5 days the Engine will stop working. To extend the trial period you will need to download a license in a&nbsp;<a title="Download" href="https://www.webdavsystem.com/javaserver/download/">product download area</a>&nbsp;and specify it in&nbsp;<span class="code">webdavsettings.json</span></p>
10+
<p>To run the example, you will need a valid IT Hit WebDAV Server Engine License. You can download the license in&nbsp;the&nbsp;<a title="Download" href="https://www.webdavsystem.com/javaserver/download/">product download area</a>.&nbsp;Note that the Engine is fully functional with a trial license and does not have any limitations. The trial license is valid for one month and the engine will stop working after this. You can check the expiration date inside the license file.&nbsp;Download the license file and specify it's content in&nbsp;<code class="code">License</code>&nbsp;field under&nbsp;<code class="code">DavEngineOptions</code>&nbsp;in&nbsp;<code class="code">/androidfsstorage/app/src/main/assets/webdavsettings.json</code>&nbsp;file.</p>
11+
<p>You can also run the sample&nbsp;without explicitly specifying a license&nbsp;for 5 days. In this case&nbsp;the&nbsp;Engine will automatically request the trial license from IT Hit website https://www.webdavsystem.com. Make sure it is accessible via firewalls, if any. After 5 days the Engine will stop working. To extend the trial period you will need to download a license in a&nbsp;<a title="Download" href="https://www.webdavsystem.com/javaserver/download/">product download area</a>&nbsp;and specify it in&nbsp;<code class="code">webdavsettings.json</code></p>
1212
<h2>Accessing files via WebDAV</h2>
1313
<p>By default your server runs on port 8181. After running the application on Android you will see the following screen with the instructions about ho to connect:</p>
1414
<p style="text-align: center;"><img id="__mcenew" alt="Connection instructions are displayed when you run the Android WebDAV Server." src="https://www.webdavsystem.com/media/1653/androidwebdavserver.png" rel="111413"></p>
@@ -22,3 +22,4 @@
2222
<p>&nbsp;</p>
2323
<h3 class="para d-inline next-article-heading">Next Article:</h3>
2424
<a title="WebDAV Server with Versioning Example, Java" href="https://www.webdavsystem.com/javaserver/server_examples/deltav_storage/">WebDAV Server Example with Versioning, Java</a>
25+

Java/androidfsstorage/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ android {
3434
jarJar {
3535
rules = [
3636
'stax-api-1.0.1.jar' : 'javax.xml.** com.ithit.webdav.xml.@1',
37-
'webdav-server-6.1.7901-Beta.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
37+
'webdav-server-6.1.7907-Beta.jar': 'javax.xml.stream.** com.ithit.webdav.xml.stream.@1'
3838
]
3939
}
4040

@@ -75,11 +75,11 @@ dependencies {
7575
implementation 'commons-io:commons-io:2.7'
7676
implementation 'com.google.code.gson:gson:2.8.9'
7777
implementation 'com.android.support:appcompat-v7:27.1.1'
78-
implementation('com.ithit.webdav.integration:android-integration:6.1.7901-Beta', {
78+
implementation('com.ithit.webdav.integration:android-integration:6.1.7907-Beta', {
7979
exclude group: 'org.nanohttpd', module: 'nanohttpd'
8080
})
8181
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
8282
jarJar 'stax:stax-api:1.0.1'
83-
jarJar 'com.ithit.webdav:webdav-server:6.1.7901-Beta'
83+
jarJar 'com.ithit.webdav:webdav-server:6.1.7907-Beta'
8484
testImplementation 'junit:junit:4.12'
8585
}

Java/androidfsstorage/app/src/main/assets/wwwroot/js/package-lock.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

Java/collectionsync/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>collectionsync</artifactId>
9-
<version>6.1.7901-Beta</version>
9+
<version>6.1.7907-Beta</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>6.1.7901-Beta</version>
37+
<version>6.1.7907-Beta</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>6.1.7901-Beta</version>
145+
<version>6.1.7907-Beta</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/collectionsync-6.1.7901-Beta</warSourceDirectory>
231+
<warSourceDirectory>target/collectionsync-6.1.7907-Beta</warSourceDirectory>
232232
</configuration>
233233
</plugin>
234234
<plugin>
@@ -256,7 +256,7 @@
256256
<configuration>
257257
<arguments>update</arguments>
258258
<workingDirectory>src/main/webapp/WEB-INF/wwwroot/js</workingDirectory>
259-
<installDirectory>c:\temp\</installDirectory>
259+
<installDirectory>C:\Users\build\AppData\Local\Temp\</installDirectory>
260260
</configuration>
261261
</execution>
262262
<execution>

Java/collectionsync/src/main/java/com/ithit/webdav/samples/collectionsync/FolderImpl.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,8 @@ public void delete() throws LockedException, MultistatusException,
208208
try {
209209
removeIndex(getFullPath(), this);
210210
FileUtils.cleanDirectory(getFullPath().toFile());
211-
if (isHidden(getFullPath())) {
212-
// hide folder, it is needed for sync-collection report.
213-
Files.setAttribute(getFullPath(), "dos:hidden", true, LinkOption.NOFOLLOW_LINKS);
214-
} else {
215-
FileUtils.deleteDirectory(getFullPath().toFile());
216-
}
211+
// hide folder, it is needed for sync-collection report.
212+
Files.setAttribute(getFullPath(), "dos:hidden", true, LinkOption.NOFOLLOW_LINKS);
217213
} catch (IOException e) {
218214
throw new ServerException(e);
219215
}

Java/deltav/README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<li><strong>Create the database.</strong>&nbsp;The Oracle database script is located in&nbsp;<em>\samples\deltav\db\<em>deltav</em>.sql</em>&nbsp;file. This script creates tables and populates them with data so your WebDAV server initially has several folders and files. To run the script login to Oracle administration web interface, go to&nbsp;<em>SQL-&gt;SQL Scripts-&gt;Create</em>, then paste content of deltav.sql to script field, specify a script name and click Run.<br>
1414
<p>It is also recommended to increase the datafile. After creating the database run the following command:</p>
1515
<div class="code">
16-
<pre class="brush:csharp;auto-links:false;toolbar:false"><span class="code">alter database datafile ' C:\oraclexe\oradata\XE\SYSTEM.DBF' resize 4g;</span></pre>
16+
<pre class="brush:csharp;auto-links:false;toolbar:false"><code class="code">alter database datafile ' C:\oraclexe\oradata\XE\SYSTEM.DBF' resize 4g;</code></pre>
1717
</div>
1818
<p>&nbsp;This is especially required if you would like to test WebDAV server running Oracle XE with&nbsp;<a href="https://www.webdavsystem.com/ajaxfilebrowser/">IT Hit AJAX File Browser</a>.</p>
1919
</li>
@@ -23,10 +23,10 @@
2323
&lt;param-value&gt;C:\License.lic&lt;/param-value&gt;
2424
&lt;/init-param&gt;</pre>
2525
The IT Hit Java WebDAV Server Library is fully functional and does not have any limitations. However, the trial period is limited to 1 month. After the trial period expires the Java WebDAV Server will stop working.</li>
26-
<li><span><strong>Download the IT Hit WebDAV Ajax Library.</strong>&nbsp;</span>You can do this with NPM command line tool, which is included with Node.js.&nbsp;Install the&nbsp;<a href="https://nodejs.org/en/download/">Node.js</a>&nbsp;and navigate to&nbsp;<span class="code">\deltav\WEB-INF\wwwroot\js\</span>&nbsp;folder. Run:&nbsp;
26+
<li><span><strong>Download the IT Hit WebDAV Ajax Library.</strong>&nbsp;</span>You can do this with NPM command line tool, which is included with Node.js.&nbsp;Install the&nbsp;<a href="https://nodejs.org/en/download/">Node.js</a>&nbsp;and navigate to&nbsp;<code class="code">\deltav\WEB-INF\wwwroot\js\</code>&nbsp;folder. Run:&nbsp;
2727
<pre class="brush:html;auto-links:false;toolbar:false">npm install&nbsp;webdav.client</pre>
2828
This will download IT Hit WebDAV Ajax Library files into your project. Note that Node.js itself is <strong>NOT</strong> required to run the server, it is used <strong>ONLY</strong> to install the required JavaScript files.</li>
29-
<li><strong>Configure the application server.</strong>&nbsp;Here we will configure WebDAV server to run on the website root (<span class="code">http://server.com/</span>).<span class="warn">While you can configure WebDAV server to run on site non-root (for instance on&nbsp;<span class="code">http://server.com/webdavroot/</span>) some WebDAV clients (such as some old versions or Mini-redirector, Microsoft Web Folders and MS Office 2007 and earlier) will fail to connect to non-root server. They submit configuration requests to server root and if they does not get the response they will not be able to connect.&nbsp;See also&nbsp;<a title="Working with MS Office" href="https://www.webdavsystem.com/javaserver/doc/ms_office_read_only/">Making Microsoft Office to Work with WebDAV Server</a> and&nbsp;<a title="Opening Docs" href="https://www.webdavsystem.com/ajax/programming/open-doc-webpage/opening_ms_office_docs/">Opening Microsoft Office Documents and Other Types of Files for Editing From a Web Page</a>.</span> <br><ol>
29+
<li><strong>Configure the application server.</strong>&nbsp;Here we will configure WebDAV server to run on the website root (<code class="code">http://server.com/</code>).<span class="warn">While you can configure WebDAV server to run on site non-root (for instance on&nbsp;<code class="code">http://server.com/webdavroot/</code>) some WebDAV clients (such as some old versions or Mini-redirector, Microsoft Web Folders and MS Office 2007 and earlier) will fail to connect to non-root server. They submit configuration requests to server root and if they does not get the response they will not be able to connect.&nbsp;See also&nbsp;<a title="Working with MS Office" href="https://www.webdavsystem.com/javaserver/doc/ms_office_read_only/">Making Microsoft Office to Work with WebDAV Server</a> and&nbsp;<a title="Opening Docs" href="https://www.webdavsystem.com/ajax/programming/open-doc-webpage/opening_ms_office_docs/">Opening Microsoft Office Documents and Other Types of Files for Editing From a Web Page</a>.</span> <br><ol>
3030
<li><span>In the case of Tomcat:</span><br>Copy&nbsp;<em>\<em>deltav&nbsp;</em></em>folder to&nbsp;<em>&lt;Your Tomcat location&gt;</em><em>\Tomcat x.x\webapps</em>&nbsp;folder. Add the following lines under the &lt;Host&gt; tag in&nbsp;<em>&lt;Your Tomcat location&gt;</em><em>\Tomcat x.x\conf\server.xml</em>:<br>
3131
<pre class="brush:csharp;auto-links:false;toolbar:false">&lt;Context path="" debug="0" docBase="deltav"&gt;
3232
&nbsp;&lt;Resource name="jdbc/Oracle" auth="Container"
@@ -36,7 +36,7 @@ This will download IT Hit WebDAV Ajax Library files into your project. Note that
3636
&lt;/Context&gt;</pre>
3737
<p>Specify Oracle database login credentials in Context tag. Check you service instance Id in server url.&nbsp;<br>Finally, restart the Tomcat for configuration changes to take effect.</p>
3838
<p>To see if your server is running type the root URL of your WebDAV site in a browser and you will see the list of folders. Now&nbsp;<a href="https://www.webdavsystem.com/server/access/">connect to the server with any WebDAV client</a>.</p>
39-
<p>If you experience any problems examine the log created by tomcat:&nbsp;<span class="code">&lt;Your Tomcat location&gt;\Tomcat x.x\logs\localhost.xxxx-xx-xx.log</span>.</p>
39+
<p>If you experience any problems examine the log created by tomcat:&nbsp;<code class="code">&lt;Your Tomcat location&gt;\Tomcat x.x\logs\localhost.xxxx-xx-xx.log</code>.</p>
4040
</li>
4141
<li><span>In the case of Glassfish:</span><ol>
4242
<li><span>Create oracle connection pool.</span>
@@ -88,8 +88,8 @@ This will download IT Hit WebDAV Ajax Library files into your project. Note that
8888
<p>On the diagram below you can see the classes in WebDAV DeltaV&nbsp;project.</p>
8989
<p><img id="__mcenew" alt="DeltaV diagram" src="https://www.webdavsystem.com/media/1561/deltavdiagram.png" rel="109210"></p>
9090
<p align="left">You can find more about&nbsp;building a server with versioning in&nbsp;<a title="DeltaV Server" href="https://www.webdavsystem.com/javaserver/doc/deltavserver/">Creating WebDAV Server with Versioning Support</a>&nbsp;article. You may also want to read&nbsp;<a title="Creating WebDAV Server" href="https://www.webdavsystem.com/javaserver/doc/">Creating a Class 1 WebDAV Server</a>&nbsp;and&nbsp;<a title="Class 2 / 3 Server" href="https://www.webdavsystem.com/javaserver/doc/create_class_2_webdav_server/">Creating Class 2 WebDAV Server</a>&nbsp;articles.</p>
91-
<h2>How Things Get Stored ? Overview of the Oracle Back-end</h2>
92-
<p>The database consists of 5 entities as depicted in the figure below. 2 of them, Property and Lock, are identical to the tables found in&nbsp;<a title="WebDAV SQL" href="https://www.webdavsystem.com/javaserver/server_examples/sql_storage/">SqlStorage example</a>&nbsp;- Properties and Lock. The&nbsp;<span class="code">Repository</span>&nbsp;table contains additional fields:&nbsp;<span class="code">CREATORDISPLAYNAME</span>,&nbsp;<span class="code">CHANGENOTES</span>,&nbsp;<span class="code">CHECKEDOUT</span>,&nbsp;<span class="code">AUTOVERSION</span>,&nbsp;<span class="code">VERSIONCONTROLLED,</span> <span class="code">CHECKEDINDURINGUNLCOK</span>and&nbsp;<span class="code">CHECKEDINONFILECOMPLETE</span>.</p>
91+
<h2>How Things Get Stored – Overview of the Oracle Back-end</h2>
92+
<p>The database consists of 5 entities as depicted in the figure below. 2 of them, Property and Lock, are identical to the tables found in&nbsp;<a title="WebDAV SQL" href="https://www.webdavsystem.com/javaserver/server_examples/sql_storage/">SqlStorage example</a>&nbsp;- Properties and Lock. The&nbsp;<code class="code">Repository</code>&nbsp;table contains additional fields:&nbsp;<code class="code">CREATORDISPLAYNAME</code>,&nbsp;<code class="code">CHANGENOTES</code>,&nbsp;<code class="code">CHECKEDOUT</code>,&nbsp;<code class="code">AUTOVERSION</code>,&nbsp;<code class="code">VERSIONCONTROLLED,</code> <code class="code">CHECKEDINDURINGUNLCOK</code>and&nbsp;<code class="code">CHECKEDINONFILECOMPLETE</code>.</p>
9393
<p><img id="__mcenew" alt="DeltaV DB diagram" src="https://www.webdavsystem.com/media/1560/deltavstoragedb.jpg" rel="109208"></p>
9494
<h3>Version table</h3>
9595
<p>The Version table contains file versions. If versioning is enabled each file contains at least one version in this table.</p>
@@ -104,3 +104,4 @@ This will download IT Hit WebDAV Ajax Library files into your project. Note that
104104
<p>&nbsp;</p>
105105
<h3 class="para d-inline next-article-heading">Next Article:</h3>
106106
<a title="Running the WebDAV Samples" href="https://www.webdavsystem.com/javaserver/server_examples/running_webdav_samples/">Running the WebDAV Samples</a>
107+

Java/deltav/pom.xml

Lines changed: 6 additions & 6 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>6.1.7901-Beta</version>
9+
<version>6.1.7907-Beta</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>6.1.7901-Beta</version>
26+
<version>6.1.7907-Beta</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>6.1.7901-Beta</version>
128+
<version>6.1.7907-Beta</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-6.1.7901-Beta/META-INF</outputDirectory>
168+
<outputDirectory>${project.build.directory}/deltav-6.1.7907-Beta/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-6.1.7901-Beta</warSourceDirectory>
247+
<warSourceDirectory>target/deltav-6.1.7907-Beta</warSourceDirectory>
248248
</configuration>
249249
</plugin>
250250
<plugin>
@@ -297,7 +297,7 @@
297297
<configuration>
298298
<arguments>update</arguments>
299299
<workingDirectory>src/main/webapp/WEB-INF/wwwroot/js</workingDirectory>
300-
<installDirectory>c:\temp\</installDirectory>
300+
<installDirectory>C:\Users\build\AppData\Local\Temp\</installDirectory>
301301
</configuration>
302302
</execution>
303303
<execution>

0 commit comments

Comments
 (0)