Author: rgoers
Date: Thu Nov 4 14:47:42 2010
New Revision: 1031013
URL: http://svn.apache.org/viewvc?rev=1031013&view=rev
Log:
Fix the site errors found by Jorg
Removed:
commons/proper/vfs/trunk/src/site/xdoc/3rdparty.xml
Modified:
commons/proper/vfs/trunk/core/pom.xml
commons/proper/vfs/trunk/pom.xml
commons/proper/vfs/trunk/src/site/site.xml
commons/proper/vfs/trunk/src/site/xdoc/download.xml
commons/proper/vfs/trunk/src/site/xdoc/download_vfs.xml
commons/proper/vfs/trunk/src/site/xdoc/filesystems.xml
commons/proper/vfs/trunk/src/site/xdoc/index.xml
Modified: commons/proper/vfs/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/pom.xml?rev=1031013&r1=1031012&r2=1031013&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/pom.xml (original)
+++ commons/proper/vfs/trunk/core/pom.xml Thu Nov 4 14:47:42 2010
@@ -62,6 +62,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -168,7 +169,6 @@
</plugin>
<plugin>
- <!-- surfire do not honor suite(), see MSUREFIRE-131 why our tests
wont work with maven 2 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: commons/proper/vfs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1031013&r1=1031012&r2=1031013&view=diff
==============================================================================
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Thu Nov 4 14:47:42 2010
@@ -116,7 +116,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<commons.componentid>vfs</commons.componentid>
- <commons.release.version>${project.version}</commons.release.version>
+ <commons.release.version>2.0</commons.release.version>
<!--<commons.rc.version>RC1</commons.rc.version> -->
<commons.binary.suffix />
<commons.jira.id>VFS</commons.jira.id>
Modified: commons/proper/vfs/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/site.xml?rev=1031013&r1=1031012&r2=1031013&view=diff
==============================================================================
--- commons/proper/vfs/trunk/src/site/site.xml (original)
+++ commons/proper/vfs/trunk/src/site/site.xml Thu Nov 4 14:47:42 2010
@@ -28,7 +28,6 @@
<menu name="Commons VFS">
<item name="Overview" href="/index.html"/>
<item name="Download and Build" href="/download.html"/>
- <item name="3rd party plugins" href="/3rdparty.html"/>
<item name="Using the API" href="/api.html"/>
<item name="API JavaDocs" href="/apidocs/index.html"/>
<item name="File Systems" href="/filesystems.html"/>
@@ -43,7 +42,7 @@
<item name="Source Repository" href="/source-repository.html"/>
<item name="To Do List" href="/todo.html"/>
</menu>
-
+
<menu name="Components">
<item name="Core" href="commons-vfs/index.html"/>
<item name="Examples" href="commons-vfs-examples/index.html"/>
Modified: commons/proper/vfs/trunk/src/site/xdoc/download.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/xdoc/download.xml?rev=1031013&r1=1031012&r2=1031013&view=diff
==============================================================================
--- commons/proper/vfs/trunk/src/site/xdoc/download.xml (original)
+++ commons/proper/vfs/trunk/src/site/xdoc/download.xml Thu Nov 4 14:47:42 2010
@@ -25,7 +25,7 @@
<section name="Download">
<p>
The latest release of Commons VFS can be found
- <a
href="http://commons.apache.org/downloads/download_vfs.cgi";>here</a>
+ <a href="download_vfs.html">here</a>
.
</p>
<p>
@@ -54,21 +54,16 @@
<tr>
<td>
<a href="http://commons.apache.org/net/";>Commons
Net</a>
- Version 1.4.1 or later.
+ Version 2.0 or later.
</td>
- <td rowspan="2">FTP</td>
+ <td>FTP</td>
</tr>
<tr>
<td>
<a
href="http://commons.apache.org/httpclient/";>Commons Httpclient</a>
- .
- Version 2.0.
- </td>
- <td>
- WebDAV
- <br/>
- HTTP, URI Utils
+ Version 3.0.
</td>
+ <td>WebDAV, HTTP, URI Utils</td>
</tr>
<tr>
<td>
@@ -115,25 +110,18 @@
<a
href="http://svn.apache.org/repos/asf/commons/proper/vfs/tags";>
http://svn.apache.org/repos/asf/commons/proper/vfs/tags</a>
</li>
- <li>
- Download a nightly source snapshot from
- <a
href="http://people.apache.org/builds/commons/nightly/commons-vfs/";>here</a>
- .
+ <li>
+ Obtain the source from the latest release distribution.
See the <a href="/download_vfs.html">downloads</a> page.
</li>
</ul>
<p>
- To build Commons VFS, you can either:
- </p>
- <ul>
- <li>
- Use
+ To build Commons VFS, you can use
<a href="http://maven.apache.org";>Maven</a>
- 2.1.0 or later. Use mvn install to build all the core,
examples and sandbox. The
+ 2.2.1 or later. Use mvn install to build all the core,
examples and sandbox. The
jars will then be installed for use by other maven-based
builds. The jars can either
be copied from the local maven repository or the target
sub-directories for non-Maven
builds.
- </li>
- </ul>
+ </p>
</section>
</body>
</document>
Modified: commons/proper/vfs/trunk/src/site/xdoc/download_vfs.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/xdoc/download_vfs.xml?rev=1031013&r1=1031012&r2=1031013&view=diff
==============================================================================
--- commons/proper/vfs/trunk/src/site/xdoc/download_vfs.xml (original)
+++ commons/proper/vfs/trunk/src/site/xdoc/download_vfs.xml Thu Nov 4 14:47:42
2010
@@ -95,32 +95,32 @@ limitations under the License.
</p>
</subsection>
</section>
- <section name="Commons VFS 2.0-SNAPSHOT ">
+ <section name="Commons VFS 2.0 ">
<subsection name="Binaries">
<table>
<tr>
- <td><a
href="[preferred]/commons/vfs/binaries/commons-vfs-2.0-SNAPSHOT.tar.gz">commons-vfs-2.0-SNAPSHOT.tar.gz</a></td>
- <td><a
href="http://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.0-SNAPSHOT.tar.gz.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.0-SNAPSHOT.tar.gz.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/vfs/binaries/commons-vfs-2.0.tar.gz">commons-vfs-2.0.tar.gz</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.0.tar.gz.md5";>md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.0.tar.gz.asc";>pgp</a></td>
</tr>
<tr>
- <td><a
href="[preferred]/commons/vfs/binaries/commons-vfs-2.0-SNAPSHOT.zip">commons-vfs-2.0-SNAPSHOT.zip</a></td>
- <td><a
href="http://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.0-SNAPSHOT.zip.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.0-SNAPSHOT.zip.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/vfs/binaries/commons-vfs-2.0.zip">commons-vfs-2.0.zip</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.0.zip.md5";>md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.0.zip.asc";>pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a
href="[preferred]/commons/vfs/source/commons-vfs-2.0-SNAPSHOT-src.tar.gz">commons-vfs-2.0-SNAPSHOT-src.tar.gz</a></td>
- <td><a
href="http://www.apache.org/dist/commons/vfs/source/commons-vfs-2.0-SNAPSHOT-src.tar.gz.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/vfs/source/commons-vfs-2.0-SNAPSHOT-src.tar.gz.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/vfs/source/commons-vfs-2.0-src.tar.gz">commons-vfs-2.0-src.tar.gz</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/vfs/source/commons-vfs-2.0-src.tar.gz.md5";>md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/vfs/source/commons-vfs-2.0-src.tar.gz.asc";>pgp</a></td>
</tr>
<tr>
- <td><a
href="[preferred]/commons/vfs/source/commons-vfs-2.0-SNAPSHOT-src.zip">commons-vfs-2.0-SNAPSHOT-src.zip</a></td>
- <td><a
href="http://www.apache.org/dist/commons/vfs/source/commons-vfs-2.0-SNAPSHOT-src.zip.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/vfs/source/commons-vfs-2.0-SNAPSHOT-src.zip.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/vfs/source/commons-vfs-2.0-src.zip">commons-vfs-2.0-src.zip</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/vfs/source/commons-vfs-2.0-src.zip.md5";>md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/vfs/source/commons-vfs-2.0-src.zip.asc";>pgp</a></td>
</tr>
</table>
</subsection>
Modified: commons/proper/vfs/trunk/src/site/xdoc/filesystems.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/xdoc/filesystems.xml?rev=1031013&r1=1031012&r2=1031013&view=diff
==============================================================================
--- commons/proper/vfs/trunk/src/site/xdoc/filesystems.xml (original)
+++ commons/proper/vfs/trunk/src/site/xdoc/filesystems.xml Thu Nov 4 14:47:42
2010
@@ -30,6 +30,9 @@
<a href="#FTP">FTP</a>
</li>
<li>
+ <a href="#FTPS">FTPS</a>
+ </li>
+ <li>
<a href="#Local Files">Local Files</a>
</li>
<li>
@@ -54,11 +57,8 @@
<a href="#ram">ram</a>
</li>
<li>
- <a href="#mime">mime</a>
+ <a href="#WebDAV">WebDAV</a><br />
</li>
- <li>
- <a href="#WebDAV">WebDAV</a><br />
- </li>
</ul>
</section>
@@ -400,6 +400,35 @@
</section>
+ <section name="FTPS">
+
+ <p>Provides access to the files on an FTP server over SSL.</p>
+
+ <p>
+ <b>URI Format</b>
+ </p>
+
+ <p>
+ <code>ftps://[
+ <i>username</i>[:
+ <i>password</i>]...@]
+ <i>hostname</i>[:
+ <i>port</i>][
+ <i>absolute-path</i>]
+ </code>
+ </p>
+
+ <p>
+ <b>Examples</b>
+ </p>
+ <ul>
+ <li>
+
<code>ftps://myusername:mypassw...@somehost/pub/downloads/somefile.tgz</code>
+ </li>
+ </ul>
+
+ </section>
+
<section name="SFTP">
<p>
Modified: commons/proper/vfs/trunk/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/xdoc/index.xml?rev=1031013&r1=1031012&r2=1031013&view=diff
==============================================================================
--- commons/proper/vfs/trunk/src/site/xdoc/index.xml (original)
+++ commons/proper/vfs/trunk/src/site/xdoc/index.xml Thu Nov 4 14:47:42 2010
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -64,31 +64,6 @@
</section>
- <section name="News">
- <p>
- VFS is split into core, examples and sandbox now.
- </p>
- <p>
- Due to some technical reasons we had to move the jcifs (smb)
filesystem to
- the sandbox. So if you need one of these filesystems you have
to build VFS manually.
- </p>
- <p>
- To build VFS, it will be best to check-it-out from svn and use
maven 2 to
- build.
- </p>
- <p>
- And - we have a new filesystem: mime (read only for sure)<br/>
- This filesystem allows you to read e-mails like archives, e.g.
the attachments are the
- children of the mail itself.<br />
- You'll find it in our sandbox.
- </p>
- <p>
- Also notice that we now have a "3rd party plugins" page. It
will list all external
- plugins available for VFS.<br />
- You have such a beast - and will get listed? Just drop me a
mail: imario -at- apache.org
- </p>
- </section>
-
</body>
</document>
