Author: elecharny
Date: Wed Oct 31 15:04:11 2012
New Revision: 1404183
URL: http://svn.apache.org/viewvc?rev=1404183&view=rev
Log:
Migrated some Tables
Modified:
mina/site/trunk/content/ftpserver/configuration_logging.mdtext
mina/site/trunk/content/ftpserver/configuration_passive_ports.mdtext
mina/site/trunk/content/ftpserver/configuration_server.mdtext
Modified: mina/site/trunk/content/ftpserver/configuration_logging.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/ftpserver/configuration_logging.mdtext?rev=1404183&r1=1404182&r2=1404183&view=diff
==============================================================================
--- mina/site/trunk/content/ftpserver/configuration_logging.mdtext (original)
+++ mina/site/trunk/content/ftpserver/configuration_logging.mdtext Wed Oct 31
15:04:11 2012
@@ -29,46 +29,16 @@ FtpServer supports [MDC logging](http://
The following propeties are made available for MDC logging
-<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>
+| Token | Description |
+|---|---|
+| session | A unique session ID, the same available from
FtpSession.getSessionId() |
+| userName | The user name of the user, only available after the USER command
has been issued |
+| remoteAddress | The IP and local port of the client |
+| remoteIp | The IP of the client |
+| remotePort | The port used for the socket at the client |
+| localAddress | The local IP and port of the server for this session |
+| localIp | The local IP of the server for this session |
+| localPort | The local port of the server for this session |
## log4j
@@ -76,16 +46,13 @@ If you need to setup detailed logging fr
The log4j configuration file location is
<INSTALL_DIR>/common/classes/log4j.properties. You can modify this file to
configure log4j.
-<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>
+ 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
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.
Modified: mina/site/trunk/content/ftpserver/configuration_passive_ports.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/ftpserver/configuration_passive_ports.mdtext?rev=1404183&r1=1404182&r2=1404183&view=diff
==============================================================================
--- mina/site/trunk/content/ftpserver/configuration_passive_ports.mdtext
(original)
+++ mina/site/trunk/content/ftpserver/configuration_passive_ports.mdtext Wed
Oct 31 15:04:11 2012
@@ -27,27 +27,10 @@ If a value (specific port or start or en
## Examples:
-<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>
+| | |
+|---|---|
+| 0 | Any available port is used as the passive port |
+| 123 | Port 123 will be used as the passive port |
+| 123,133 | Port 123 and 133 will be used as the passive port |
+| 123-125 | Any port in a range from 123 to 125 will be used as the passive
port |
+| 123-125, 127, 129-130 | 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 |
Modified: mina/site/trunk/content/ftpserver/configuration_server.mdtext
URL:
http://svn.apache.org/viewvc/mina/site/trunk/content/ftpserver/configuration_server.mdtext?rev=1404183&r1=1404182&r2=1404183&view=diff
==============================================================================
--- mina/site/trunk/content/ftpserver/configuration_server.mdtext (original)
+++ mina/site/trunk/content/ftpserver/configuration_server.mdtext Wed Oct 31
15:04:11 2012
@@ -23,75 +23,29 @@ Some configuration is done for the entir
Using the XML configuration, this following examples shows all available
configurations for the server
-<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>
- 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>
- >
-...
-</server>
-</PRE>
-</DIV></DIV>
+ :::XML
+ <server xmlns="http://mina.apache.org/ftpserver/spring/v1";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://mina.apache.org/ftpserver/spring/v1
http://mina.apache.org/ftpserver/ftpserver-1.0.xsd";
+ id="server"
+ max-logins="500"
+ anon-enabled="false"
+ max-anon-logins="123"
+ max-login-failures="124"
+ login-failure-delay="125">
+ ...
+ </server>
## server element
-<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>
+| Attribute | Description | Required | Default value |
+|---|---|---|---|
+| id | A unique identifier for this server within this XML configiration | Yes
| |
+| max-threads | The maximum number of threads used in the thread pool for
handling client connections | No | max-logins, or 16 if neither value is set |
+| max-logins | The maximum number of simultaneous users | No | 10 |
+| max-anon-logins | The maximum number of simultaneous anonymous users | No |
10 |
+| anon-enabled | Are anonymous logins enabled? | No | true |
+| max-login-failures | The number of failed login attempts before the
connection is closed | No | 3 |
+| login-failure-delay | The number of milliseconds that the connection is
delayed after a failed login attempt. Used to limit to possibility of brute
force guessing passwords. | No | 500 |
+
