Author: buildbot
Date: Wed Oct 31 14:29:18 2012
New Revision: 836734
Log:
Staging update by buildbot for mina
Modified:
websites/staging/mina/trunk/content/ (props changed)
websites/staging/mina/trunk/content/css/common.css
websites/staging/mina/trunk/content/ftpserver/configuration_listeners.html
Propchange: websites/staging/mina/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Oct 31 14:29:18 2012
@@ -1 +1 @@
-1404135
+1404169
Modified: websites/staging/mina/trunk/content/css/common.css
==============================================================================
--- websites/staging/mina/trunk/content/css/common.css (original)
+++ websites/staging/mina/trunk/content/css/common.css Wed Oct 31 14:29:18 2012
@@ -318,6 +318,48 @@ blockquote
border-left: 1px solid #1a6c0b;
}
+table
+{
+ margin: 5px;
+ border-collapse: collapse;
+}
+
+table td
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+}
+
+table th
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+ background-color: #f0f0f0;
+ text-align: center;
+}
+
+td
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+}
+
+th
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+ background-color: #f0f0f0;
+ text-align: center;
+}
+
table.confluenceTable
{
margin: 5px;
Modified:
websites/staging/mina/trunk/content/ftpserver/configuration_listeners.html
==============================================================================
--- websites/staging/mina/trunk/content/ftpserver/configuration_listeners.html
(original)
+++ websites/staging/mina/trunk/content/ftpserver/configuration_listeners.html
Wed Oct 31 14:29:18 2012
@@ -117,263 +117,281 @@
<p>Listeners are identified by a name, the default listener is identified by
"default".</p>
<p>The main network configuration is performed on the listeners, for example
the port to listen on and SSL configuration.</p>
<p>Within the XML configuration format, all listeners are configured in the
"listeners" element. A XML configuration example can therefore look like:</p>
-<p><DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-<listeners>
- <nio-listener name=<SPAN class="code-quote">"<SPAN
class="code-keyword">default</SPAN>"</SPAN> port=<SPAN
class="code-quote">"2222"</SPAN> implicit-ssl=<SPAN
class="code-quote">"<SPAN class="code-keyword">true</SPAN>"</SPAN>
idle-timeout=<SPAN class="code-quote">"60"</SPAN> local-address=<SPAN
class="code-quote">"1.2.3.4"</SPAN>>
- <ssl>
- <keystore file=<SPAN
class="code-quote">"mykeystore.jks"</SPAN> password=<SPAN
class="code-quote">"secret"</SPAN> key-password=<SPAN
class="code-quote">"otherSecret"</SPAN> />
- <truststore file=<SPAN
class="code-quote">"mytruststore.jks"</SPAN> password=<SPAN
class="code-quote">"secret"</SPAN>/>
- </ssl>
- <data-connection idle-timeout=<SPAN
class="code-quote">"60"</SPAN>>
- <active enabled=<SPAN class="code-quote">"<SPAN
class="code-keyword">true</SPAN>"</SPAN> local-address=<SPAN
class="code-quote">"1.2.3.4"</SPAN> local-port=<SPAN
class="code-quote">"2323"</SPAN> ip-check=<SPAN
class="code-quote">"<SPAN
class="code-keyword">true</SPAN>"</SPAN>/>
- <passive ports=<SPAN
class="code-quote">"123-125"</SPAN> address=<SPAN
class="code-quote">"1.2.3.4"</SPAN> external-address=<SPAN
class="code-quote">"1.2.3.4"</SPAN> />
- </data-connection>
- <blacklist>1.2.3.0/16, 1.2.4.0/16,
1.2.3.4</blacklist> <br />
- </nio-listener>
-</listeners>
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="nt"><listeners></span>
+ <span class="nt"><nio-listener</span> <span
class="na">name=</span><span class="s">"default"</span> <span
class="na">port=</span><span class="s">"2222"</span> <span
class="na">implicit-ssl=</span><span class="s">"true"</span> <span
class="na">idle-timeout=</span><span class="s">"60"</span> <span
class="na">local-address=</span><span class="s">"1.2.3.4"</span><span
class="nt">></span>
+ <span class="nt"><ssl></span>
+ <span class="nt"><keystore</span> <span
class="na">file=</span><span class="s">"mykeystore.jks"</span> <span
class="na">password=</span><span class="s">"secret"</span> <span
class="na">key-password=</span><span class="s">"otherSecret"</span>
<span class="nt">/></span>
+ <span class="nt"><truststore</span> <span
class="na">file=</span><span class="s">"mytruststore.jks"</span>
<span class="na">password=</span><span class="s">"secret"</span><span
class="nt">/></span>
+ <span class="nt"></ssl></span>
+ <span class="nt"><data-connection</span> <span
class="na">idle-timeout=</span><span class="s">"60"</span><span
class="nt">></span>
+ <span class="nt"><active</span> <span
class="na">enabled=</span><span class="s">"true"</span> <span
class="na">local-address=</span><span class="s">"1.2.3.4"</span>
<span class="na">local-port=</span><span class="s">"2323"</span>
<span class="na">ip-check=</span><span class="s">"true"</span><span
class="nt">></span>
+ <span class="nt"><passive</span> <span
class="na">ports=</span><span class="s">"123-12"</span><span
class="err">"</span> <span class="na">address=</span><span
class="s">"1.2.3.4"</span> <span
class="na">external-address=</span><span class="s">"1.2.3.4"</span>
<span class="nt">/></span>
+ <span class="nt"></data-connection></span>
+ <span class="nt"><blacklist></span>1.2.3.0/16, 1.2.4.0/16,
1.2.3.4<span class="nt"></blacklist></span>
+ <span class="nt"></nio-listener></span>
+<span class="nt"></listeners></span>
+</pre></div>
+
+
<h2 id="nio-listener-element">nio-listener element</h2>
<p>The listener shipped with FtpServer is called "nio-listener" since it is
based Java NIO for performance and scalability.</p>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Attribute </TH>
-<TH class="confluenceTh"> Description </TH>
-<TH class="confluenceTh"> Required </TH>
-<TH class="confluenceTh"> Default value </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> name </TD>
-<TD class="confluenceTd"> The listener name, if "default" it will
override the settings on the default listener </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> port </TD>
-<TD class="confluenceTd"> The port on which the listener will accept
connections </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> 21 </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> local-address </TD>
-<TD class="confluenceTd"> Server address the listener will bind to </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> All available </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> implicit-ssl </TD>
-<TD class="confluenceTd"> True if the listener should use implicit SSL </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> false </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> idle-timeout </TD>
-<TD class="confluenceTd"> The number of seconds before an inactive client is
disconnected. If this value is set to 0, the idle time is disabled (a client
can idle forever without getting disconnected by the server). If a lower
maximum idle time is configured on a user (e.g. using the PropertiesUserManager
idletime configuration), it will override the listener value. Thus, the
listener value enforce the upper threshold, but lower values can be provided
per user. </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> 300 </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th>Attribute</th>
+<th>Description</th>
+<th>Required</th>
+<th>Default value</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>name</td>
+<td>The listener name, if "default" it will override the settings on the
default listener</td>
+<td>Yes</td>
+<td> </td>
+</tr>
+<tr>
+<td>port</td>
+<td>The port on which the listener will accept connections</td>
+<td>No</td>
+<td>21</td>
+</tr>
+<tr>
+<td>local-address</td>
+<td>Server address the listener will bind to</td>
+<td>No</td>
+<td>All available</td>
+</tr>
+<tr>
+<td>implicit-ssl</td>
+<td>True if the listener should use implicit SSL</td>
+<td>No</td>
+<td>false</td>
+</tr>
+<tr>
+<td>idle-timeout</td>
+<td>The number of seconds before an inactive client is disconnected. If this
value is set to 0, the idle time is disabled (a client can idle forever without
getting disconnected by the server). If a lower maximum idle time is configured
on a user (e.g. using the PropertiesUserManager idletime configuration), it
will override the listener value. Thus, the listener value enforce the upper
threshold, but lower values can be provided per user.</td>
+<td>No</td>
+<td>300</td>
+</tr>
+</tbody>
+</table>
<h2 id="ssl-element">ssl element</h2>
<p>Required for listeners that should provide FTPS support.</p>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Attribute </TH>
-<TH class="confluenceTh"> Description </TH>
-<TH class="confluenceTh"> Required </TH>
-<TH class="confluenceTh"> Default value </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> protocol </TD>
-<TD class="confluenceTd"> The SSL protocol to use. Supported values are
"SSL" and "TLS" </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> TLS </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> client-authentication </TD>
-<TD class="confluenceTd"> Should client authentication be performed? Supported
values are "NEED", "WANT" and "NONE" </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> NONE </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> enabled-ciphersuites </TD>
-<TD class="confluenceTd"> A space-separated list of cipher suites to enable
for this connection. The exact cipher suites that can be used depends on the
Java version used, <A
href="http://java.sun.com/j2se/1.5.0/docs/guide/security/jsse/JSSERefGuide.html#AppA";
class="external-link" rel="nofollow">here</A> are the names for Sun's JSSE
provider. </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> All cipher suites are enabled </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th>Attribute</th>
+<th>Description</th>
+<th>Required</th>
+<th>Default value</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>protocol</td>
+<td>The SSL protocol to use. Supported values are "SSL" and "TLS"</td>
+<td>No</td>
+<td>TLS</td>
+</tr>
+<tr>
+<td>client-authentication</td>
+<td>Should client authentication be performed? Supported values are "NEED",
"WANT" and "NONE"</td>
+<td>No</td>
+<td>NONE</td>
+</tr>
+<tr>
+<td>enabled-ciphersuites</td>
+<td>A space-separated list of cipher suites to enable for this connection. The
exact cipher suites that can be used depends on the Java version used, <a
href="http://java.sun.com/j2se/1.5.0/docs/guide/security/jsse/JSSERefGuide.html#AppA";>here</a>
are the names for Sun's JSSE provider.</td>
+<td>No</td>
+<td>All cipher suites are enabled</td>
+</tr>
+</tbody>
+</table>
<h2 id="keystore-element">keystore element</h2>
<p>This element is required if the ssl element is provided. It provides
configuration for the key store used for finding the private key and server
certificate for the FTP server.</p>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Attribute </TH>
-<TH class="confluenceTh"> Description </TH>
-<TH class="confluenceTh"> Required </TH>
-<TH class="confluenceTh"> Default value </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> file </TD>
-<TD class="confluenceTd"> Path to the key store file </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> password </TD>
-<TD class="confluenceTd"> The password for the key store </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> key-password </TD>
-<TD class="confluenceTd"> Password for the key within the key store </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> Key store password </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> key-alias </TD>
-<TD class="confluenceTd"> Alias of the key to use within the key store </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> Uses first key found </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> type </TD>
-<TD class="confluenceTd"> Key store type </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> JRE key store default type, normally JKS </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> algorithm </TD>
-<TD class="confluenceTd"> Key store algorithm </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> SunX509 </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
-<h2 id="truststore-element">truststore element</h2>
+<table>
+<thead>
+<tr>
+<th>Attribute</th>
+<th>Description</th>
+<th>Required</th>
+<th>Default value</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>file</td>
+<td>Path to the key store file</td>
+<td>Yes</td>
+<td> </td>
+</tr>
+<tr>
+<td>password</td>
+<td>The password for the key store</td>
+<td>Yes</td>
+<td> </td>
+</tr>
+<tr>
+<td>Password for the key within the key store</td>
+<td>No</td>
+<td>Key store password</td>
+<td></td>
+</tr>
+<tr>
+<td>key-alias</td>
+<td>Alias of the key to use within the key store</td>
+<td>No <</td>
+<td>Uses first key found</td>
+</tr>
+<tr>
+<td>type</td>
+<td>Key store type</td>
+<td>No</td>
+<td>JRE key store default type, normally JKS</td>
+</tr>
+<tr>
+<td>algorithm</td>
+<td>Key store algorithm</td>
+<td>No</td>
+<td>SunX509</td>
+</tr>
+<tr>
+<td>## truststore element</td>
+<td></td>
+<td></td>
+<td></td>
+</tr>
+</tbody>
+</table>
<p>This element provides configuration for the trust store used for locating
trusted certificates.</p>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Attribute </TH>
-<TH class="confluenceTh"> Description </TH>
-<TH class="confluenceTh"> Required </TH>
-<TH class="confluenceTh"> Default value </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> file </TD>
-<TD class="confluenceTd"> Path to the trust store file </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> password </TD>
-<TD class="confluenceTd"> The password for the trust store </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> Certificates can be read without password </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> type </TD>
-<TD class="confluenceTd"> Trust store type </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> JRE key store default type, normally JKS </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> algorithm </TD>
-<TD class="confluenceTd"> Trust store algorithm </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> SunX509 </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th>Attribute</th>
+<th>Description</th>
+<th>Required</th>
+<th>Default value</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>file</td>
+<td>Path to the trust store file</td>
+<td>Yes</td>
+<td> </td>
+</tr>
+<tr>
+<td>password</td>
+<td>The password for the trust store</td>
+<td>No</td>
+<td>Certificates can be read without password</td>
+</tr>
+<tr>
+<td>type</td>
+<td>Trust store type</td>
+<td>No</td>
+<td>JRE key store default type, normally JKS</td>
+</tr>
+<tr>
+<td>algorithm</td>
+<td>Trust store algorithm</td>
+<td>No</td>
+<td>SunX509</td>
+</tr>
+</tbody>
+</table>
<h2 id="data-connection-element">data-connection element</h2>
<p>This element provides configuration for the data connection.</p>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Attribute </TH>
-<TH class="confluenceTh"> Description </TH>
-<TH class="confluenceTh"> Required </TH>
-<TH class="confluenceTh"> Default value </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> idle-timeout </TD>
-<TD class="confluenceTd"> Number of seconds before an idle data connection is
closed </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> 300 </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th>Attribute</th>
+<th>Description</th>
+<th>Required</th>
+<th>Default value</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>idle-timeout</td>
+<td>Number of seconds before an idle data connection is closed</td>
+<td>No</td>
+<td>300</td>
+</tr>
+</tbody>
+</table>
<h2 id="active-element">active element</h2>
<p>This element provides configuration for active data connections.</p>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Attribute </TH>
-<TH class="confluenceTh"> Description </TH>
-<TH class="confluenceTh"> Required </TH>
-<TH class="confluenceTh"> Default value </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> enabled </TD>
-<TD class="confluenceTd"> False if active data connections should not be
allowed </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> true </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> local-address </TD>
-<TD class="confluenceTd"> The local address the server will use when creating
a data connection </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> Any available </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> local-port </TD>
-<TD class="confluenceTd"> The local prt the server will use when creating a
data connection </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> Any available </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> ip-check </TD>
-<TD class="confluenceTd"> Should the server check that the IP address for the
data connection is the same as for the control socket? </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> false </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th>Attribute</th>
+<th>Description</th>
+<th>Required</th>
+<th>Default value</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>enabled</td>
+<td>False if active data connections should not be allowed</td>
+<td>No</td>
+<td>true</td>
+</tr>
+<tr>
+<td>local-address</td>
+<td>The local address the server will use when creating a data connection</td>
+<td>No</td>
+<td>Any available</td>
+</tr>
+<tr>
+<td>local-port</td>
+<td>The local prt the server will use when creating a data connection</td>
+<td>No</td>
+<td>Any available</td>
+</tr>
+<tr>
+<td>ip-check</td>
+<td>Should the server check that the IP address for the data connection is the
same as for the control socket?</td>
+<td>No</td>
+<td>false</td>
+</tr>
+</tbody>
+</table>
<h2 id="passive-element">passive element</h2>
<p>This element provides configuration for passive data connections.</p>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Attribute </TH>
-<TH class="confluenceTh"> Description </TH>
-<TH class="confluenceTh"> Required </TH>
-<TH class="confluenceTh"> Default value </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> ports </TD>
-<TD class="confluenceTd"> The ports on which the server is allowed to accept
passive data connections, see <A href="configure-passive-ports.html"
title="Configure passive ports">Configure passive ports</A> for details </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> Any available port </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> address </TD>
-<TD class="confluenceTd"> The address on which the server will listen to
passive data connections </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> The same address as the control socket for the
session </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> external-address </TD>
-<TD class="confluenceTd"> The address the server will claim to be listening on
in the PASV reply. Useful when the server is behind a NAT firewall and the
client sees a different address than the server is using </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th>Attribute</th>
+<th>Description</th>
+<th>Required</th>
+<th>Default value</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>class="confluenceTd"> ports</td>
+<td>The ports on which the server is allowed to accept passive data
connections, see <a href="configure-passive-ports.html">Configure passive
ports</a> for details</td>
+<td>No</td>
+<td>Any available port</td>
+</tr>
+<tr>
+<td>address</td>
+<td>The address on which the server will listen to passive data
connections</td>
+<td>No</td>
+<td>The same address as the control socket for the session</td>
+</tr>
+<tr>
+<td>external-address</td>
+<td>The address the server will claim to be listening on in the PASV reply.
Useful when the server is behind a NAT firewall and the client sees a different
address than the server is using</td>
+<td>No</td>
+<td> </td>
+</tr>
+</tbody>
+</table>
<h2 id="blacklist-element">blacklist element</h2>
<p>This element provides a list of black listed IP addresses and networks in
<a href="http://en.wikipedia.org/wiki/CIDR";>CIDR notation</a>.</p>
