Author: buildbot
Date: Wed Oct 31 15:04:15 2012
New Revision: 836737
Log:
Staging update by buildbot for mina
Modified:
websites/staging/mina/trunk/content/ (props changed)
websites/staging/mina/trunk/content/ftpserver/configuration_logging.html
websites/staging/mina/trunk/content/ftpserver/configuration_passive_ports.html
websites/staging/mina/trunk/content/ftpserver/configuration_server.html
Propchange: websites/staging/mina/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Oct 31 15:04:15 2012
@@ -1 +1 @@
-1404169
+1404183
Modified:
websites/staging/mina/trunk/content/ftpserver/configuration_logging.html
==============================================================================
--- websites/staging/mina/trunk/content/ftpserver/configuration_logging.html
(original)
+++ websites/staging/mina/trunk/content/ftpserver/configuration_logging.html
Wed Oct 31 15:04:15 2012
@@ -113,59 +113,61 @@
<h2 id="mdc-logging">MDC logging</h2>
<p>FtpServer supports <a href="http://www.slf4j.org/manual.html#mdc";>MDC
logging</a>. Basically, it provides session based information for the logger.
Of primary interest in the case of FtpServer are the user name and remote IP
address for each session. The log4j example below shows how to enable these to
be logged.</p>
<p>The following propeties are made available for MDC logging</p>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh">Token</TH>
-<TH class="confluenceTh">Description</TH>
-</TR>
-<TR>
-<TD class="confluenceTd">session</TD>
-<TD class="confluenceTd"> A unique session ID, the same available from
FtpSession.getSessionId()</TD>
-</TR>
-<TR>
-<TD class="confluenceTd">userName</TD>
-<TD class="confluenceTd"> The user name of the user, only available after the
USER command has been issued</TD>
-</TR>
-<TR>
-<TD class="confluenceTd">remoteAddress</TD>
-<TD class="confluenceTd"> The IP and local port of the client</TD>
-</TR>
-<TR>
-<TD class="confluenceTd">remoteIp</TD>
-<TD class="confluenceTd"> The IP of the client</TD>
-</TR>
-<TR>
-<TD class="confluenceTd">remotePort</TD>
-<TD class="confluenceTd"> The port used for the socket at the client</TD>
-</TR>
-<TR>
-<TD class="confluenceTd">localAddress</TD>
-<TD class="confluenceTd"> The local IP and port of the server for this
session</TD>
-</TR>
-<TR>
-<TD class="confluenceTd">localIp</TD>
-<TD class="confluenceTd"> The local IP of the server for this session</TD>
-</TR>
-<TR>
-<TD class="confluenceTd">localPort</TD>
-<TD class="confluenceTd"> The local port of the server for this session</TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th>Token</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>session</td>
+<td>A unique session ID, the same available from FtpSession.getSessionId()</td>
+</tr>
+<tr>
+<td>userName</td>
+<td>The user name of the user, only available after the USER command has been
issued</td>
+</tr>
+<tr>
+<td>remoteAddress</td>
+<td>The IP and local port of the client</td>
+</tr>
+<tr>
+<td>remoteIp</td>
+<td>The IP of the client</td>
+</tr>
+<tr>
+<td>remotePort</td>
+<td>The port used for the socket at the client</td>
+</tr>
+<tr>
+<td>localAddress</td>
+<td>The local IP and port of the server for this session</td>
+</tr>
+<tr>
+<td>localIp</td>
+<td>The local IP of the server for this session</td>
+</tr>
+<tr>
+<td>localPort</td>
+<td>The local port of the server for this session</td>
+</tr>
+</tbody>
+</table>
<h2 id="log4j">log4j</h2>
<p>If you need to setup detailed logging from within FtpServer's code, then
you can use a simple log4j configuration. Note that this logging can be very
verbose depending on the log level you chose to use. The log4j jar is bundled
with the binary distribution. This is an optional jar file.</p>
<p>The log4j configuration file location is
<INSTALL_DIR>/common/classes/log4j.properties. You can modify this file to
configure log4j.</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV
class="preformattedContent panelContent">
-<PRE>log4j.rootLogger=DEBUG, R
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=./res/log/log.gen
-log4j.appender.R.MaxFileSize=10MB
-log4j.appender.R.MaxBackupIndex=10
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=[%5p] %d [%X{userName}]
[%X{remoteIp}] %m%n
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="n">log4j</span><span
class="o">.</span><span class="n">rootLogger</span><span
class="o">=</span><span class="n">DEBUG</span><span class="p">,</span> <span
class="n">R</span>
+<span class="n">log4j</span><span class="o">.</span><span
class="n">appender</span><span class="o">.</span><span class="n">R</span><span
class="o">=</span><span class="n">org</span><span class="o">.</span><span
class="n">apache</span><span class="o">.</span><span
class="n">log4j</span><span class="o">.</span><span
class="n">RollingFileAppender</span>
+<span class="n">log4j</span><span class="o">.</span><span
class="n">appender</span><span class="o">.</span><span class="n">R</span><span
class="o">.</span><span class="n">File</span><span class="o">=.</span><span
class="sr">/res/</span><span class="nb">log</span><span class="o">/</span><span
class="nb">log</span><span class="o">.</span><span class="n">gen</span>
+<span class="n">log4j</span><span class="o">.</span><span
class="n">appender</span><span class="o">.</span><span class="n">R</span><span
class="o">.</span><span class="n">MaxFileSize</span><span
class="o">=</span><span class="mi">10</span><span class="n">MB</span>
+<span class="n">log4j</span><span class="o">.</span><span
class="n">appender</span><span class="o">.</span><span class="n">R</span><span
class="o">.</span><span class="n">MaxBackupIndex</span><span
class="o">=</span><span class="mi">10</span>
+<span class="n">log4j</span><span class="o">.</span><span
class="n">appender</span><span class="o">.</span><span class="n">R</span><span
class="o">.</span><span class="n">layout</span><span class="o">=</span><span
class="n">org</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">log4j</span><span class="o">.</span><span
class="n">PatternLayout</span>
+<span class="n">log4j</span><span class="o">.</span><span
class="n">appender</span><span class="o">.</span><span class="n">R</span><span
class="o">.</span><span class="n">layout</span><span class="o">.</span><span
class="n">ConversionPattern</span><span class="o">=</span><span
class="p">[</span><span class="nv">%5p</span><span class="p">]</span> <span
class="nv">%d</span> <span class="p">[</span><span class="nv">%X</span><span
class="p">{</span><span class="n">userName</span><span class="p">}]</span>
<span class="p">[</span><span class="nv">%X</span><span class="p">{</span><span
class="n">remoteIp</span><span class="p">}]</span> <span class="nv">%m%n</span>
+</pre></div>
+
+
<p>This log4j configuration sets up a file called log.gen in your FTP Server
./res/log folder with a maximum file size of 10MB and up to 10 backups. DEBUG
log level is specified.</p>
<p>You should consult the log4j documentation for more options.</p>
Modified:
websites/staging/mina/trunk/content/ftpserver/configuration_passive_ports.html
==============================================================================
---
websites/staging/mina/trunk/content/ftpserver/configuration_passive_ports.html
(original)
+++
websites/staging/mina/trunk/content/ftpserver/configuration_passive_ports.html
Wed Oct 31 15:04:15 2012
@@ -112,30 +112,36 @@
<p>When the server has used up all passive ports (one per client doing passive
data transfer), the next clients will have to wait for an available port. It is
therefore advised to provide multiple passive ports.</p>
<p>If a value (specific port or start or end of an range) is outside of the
allowed values of 0 and 65535, an error will be thrown at startup.</p>
<h2 id="examples">Examples:</h2>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TD class="confluenceTd"> 0 </TD>
-<TD class="confluenceTd"> Any available port is used as the passive port </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> 123 </TD>
-<TD class="confluenceTd"> Port 123 will be used as the passive port </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> 123,133 </TD>
-<TD class="confluenceTd"> Port 123 and 133 will be used as the passive port
</TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> 123-125 </TD>
-<TD class="confluenceTd"> Any port in a range from 123 to 125 will be used as
the passive port </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> 123-125, 127, 129-130 </TD>
-<TD class="confluenceTd"> Any port in a range from 123 to 125, port 127 or in
the range from 129 to 130 will be used as the passive port </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>0</td>
+<td>Any available port is used as the passive port</td>
+</tr>
+<tr>
+<td>123</td>
+<td>Port 123 will be used as the passive port</td>
+</tr>
+<tr>
+<td>123,133</td>
+<td>Port 123 and 133 will be used as the passive port</td>
+</tr>
+<tr>
+<td>123-125</td>
+<td>Any port in a range from 123 to 125 will be used as the passive port</td>
+</tr>
+<tr>
+<td>123-125, 127, 129-130</td>
+<td>Any port in a range from 123 to 125, port 127 or in the range from 129 to
130 will be used as the passive port</td>
+</tr>
+</tbody>
+</table>
</div><!-- rightColumn -->
<div id="endContent"></div>
Modified:
websites/staging/mina/trunk/content/ftpserver/configuration_server.html
==============================================================================
--- websites/staging/mina/trunk/content/ftpserver/configuration_server.html
(original)
+++ websites/staging/mina/trunk/content/ftpserver/configuration_server.html Wed
Oct 31 15:04:15 2012
@@ -110,75 +110,75 @@
<h1 id="server">Server</h1>
<p>Some configuration is done for the entire server. This affects all
listeners, for login limits, the sum of the logins for all listeners are
enforced.</p>
<p>Using the XML configuration, this following examples shows all available
configurations for the server</p>
-<p><DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent
panelContent">
-<PRE class="code-java">
-<server xmlns=<SPAN class="code-quote">"http:<SPAN
class="code-comment">//mina.apache.org/ftpserver/spring/v1"</SPAN>
-</SPAN> xmlns:xsi=<SPAN class="code-quote">"http:<SPAN
class="code-comment">//www.w3.org/2001/XMLSchema-instance"</SPAN>
-</SPAN> xsi:schemaLocation=<SPAN class="code-quote">"http:<SPAN
class="code-comment">//mina.apache.org/ftpserver/spring/v1
http://mina.apache.org/ftpserver/ftpserver-1.0.xsd"</SPAN>
-</SPAN> id=<SPAN class="code-quote">"server"</SPAN> <br />
- max-logins=<SPAN class="code-quote">"500"</SPAN>
- anon-enabled=<SPAN class="code-quote">"<SPAN
class="code-keyword">false</SPAN>"</SPAN>
- max-anon-logins=<SPAN class="code-quote">"123"</SPAN>
- max-login-failures=<SPAN class="code-quote">"124"</SPAN>
- login-failure-delay=<SPAN class="code-quote">"125"</SPAN>
- >
+<div class="codehilite"><pre><span class="nt"><server</span> <span
class="na">xmlns=</span><span
class="s">"http://mina.apache.org/ftpserver/spring/v1"</span>
+ <span class="na">xmlns:xsi=</span><span
class="s">"http://www.w3.org/2001/XMLSchema-instance"</span>
+ <span class="na">xsi:schemaLocation=</span><span
class="s">"http://mina.apache.org/ftpserver/spring/v1
http://mina.apache.org/ftpserver/ftpserver-1.0.xsd"</span>
+ <span class="na">id=</span><span class="s">"server"</span>
+ <span class="na">max-logins=</span><span class="s">"500"</span>
+ <span class="na">anon-enabled=</span><span
class="s">"false"</span>
+ <span class="na">max-anon-logins=</span><span
class="s">"123"</span>
+ <span class="na">max-login-failures=</span><span
class="s">"124"</span>
+ <span class="na">login-failure-delay=</span><span
class="s">"125"</span><span class="nt">></span>
...
-</server>
-</PRE>
-</DIV></DIV></p>
+<span class="nt"></server></span>
+</pre></div>
+
+
<h2 id="server-element">server element</h2>
-<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"> id </TD>
-<TD class="confluenceTd"> A unique identifier for this server within this XML
configiration </TD>
-<TD class="confluenceTd"> Yes </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> max-threads </TD>
-<TD class="confluenceTd"> The maximum number of threads used in the thread
pool for handling client connections </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> max-logins, or 16 if neither value is set </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> max-logins </TD>
-<TD class="confluenceTd"> The maximum number of simultaneous users </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> 10 </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> max-anon-logins </TD>
-<TD class="confluenceTd"> The maximum number of simultaneous anonymous users
</TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> 10 </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> anon-enabled </TD>
-<TD class="confluenceTd"> Are anonymous logins enabled? </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> true </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> max-login-failures </TD>
-<TD class="confluenceTd"> The number of failed login attempts before the
connection is closed </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> 3 </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> login-failure-delay </TD>
-<TD class="confluenceTd"> The number of milliseconds that the connection is
delayed after a failed login attempt. Used to limit to possibility of brute
force guessing passwords. </TD>
-<TD class="confluenceTd"> No </TD>
-<TD class="confluenceTd"> 500 </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>id</td>
+<td>A unique identifier for this server within this XML configiration</td>
+<td>Yes</td>
+<td> </td>
+</tr>
+<tr>
+<td>max-threads</td>
+<td>The maximum number of threads used in the thread pool for handling client
connections</td>
+<td>No</td>
+<td>max-logins, or 16 if neither value is set</td>
+</tr>
+<tr>
+<td>max-logins</td>
+<td>The maximum number of simultaneous users</td>
+<td>No</td>
+<td>10</td>
+</tr>
+<tr>
+<td>max-anon-logins</td>
+<td>The maximum number of simultaneous anonymous users</td>
+<td>No</td>
+<td>10</td>
+</tr>
+<tr>
+<td>anon-enabled</td>
+<td>Are anonymous logins enabled?</td>
+<td>No</td>
+<td>true</td>
+</tr>
+<tr>
+<td>max-login-failures</td>
+<td>The number of failed login attempts before the connection is closed</td>
+<td>No</td>
+<td>3</td>
+</tr>
+<tr>
+<td>login-failure-delay</td>
+<td>The number of milliseconds that the connection is delayed after a failed
login attempt. Used to limit to possibility of brute force guessing
passwords.</td>
+<td>No</td>
+<td>500</td>
+</tr>
+</tbody>
+</table>
</div><!-- rightColumn -->
<div id="endContent"></div>
