Author: sebb
Date: Tue May 31 14:48:57 2011
New Revision: 1129717
URL: http://svn.apache.org/viewvc?rev=1129717&view=rev
Log:
Javadoc fixes
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DataConnectionConfigurationFactory.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpHandler.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DataConnectionConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DataConnectionConfigurationFactory.java?rev=1129717&r1=1129716&r2=1129717&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DataConnectionConfigurationFactory.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DataConnectionConfigurationFactory.java
Tue May 31 14:48:57 2011
@@ -315,7 +315,7 @@ public class DataConnectionConfiguration
/**
* Set whether ssl is required for the data connection
- * @param sslMandatory True if ssl is mandatory for the data connection
+ * @param implicitSsl True if ssl is mandatory for the data connection
*/
public void setImplicitSsl(boolean implicitSsl) {
this.implicitSsl = implicitSsl;
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java?rev=1129717&r1=1129716&r2=1129717&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java
Tue May 31 14:48:57 2011
@@ -44,8 +44,6 @@ public class FtpServerFactory {
/**
* Creates a server with the default configuration
- *
- * @throws Exception
*/
public FtpServerFactory() {
serverContext = new DefaultFtpServerContext();
@@ -224,11 +222,6 @@ public class FtpServerFactory {
* Set the message resource to be used with this server
* @param connectionConfig The {@link ConnectionConfig} to be used
* by servers created by this factory
- *
- * @param messageResource
- * The {@link MessageResource}
- * @throws IllegalStateException
- * If a custom server context has been set
*/
public void setConnectionConfig(final ConnectionConfig connectionConfig) {
serverContext.setConnectionConfig(connectionConfig);
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java?rev=1129717&r1=1129716&r2=1129717&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java
Tue May 31 14:48:57 2011
@@ -33,7 +33,7 @@ import org.apache.ftpserver.ftplet.Ftple
public interface FtpletContainer extends Ftplet {
/**
- * Retrive the {@link Ftplet} identified by the name (as provided in the
+ * Retrieve the {@link Ftplet} identified by the name (as provided in the
* {@link #addFtplet(String, Ftplet)} method.
*
* @param name
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpHandler.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpHandler.java?rev=1129717&r1=1129716&r2=1129717&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpHandler.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpHandler.java
Tue May 31 14:48:57 2011
@@ -49,8 +49,8 @@ public interface FtpHandler {
/**
* Invoked when a connection has been opened. This method is invoked after
- * {@link #sessionCreated(IoSession)}. The biggest difference from
- * {@link #sessionCreated(IoSession)} is that it's invoked from other
thread
+ * {@link #sessionCreated(FtpIoSession)}. The biggest difference from
+ * {@link #sessionCreated(FtpIoSession)} is that it's invoked from other
thread
* than an I/O processor thread once thread modesl is configured properly.
*/
void sessionOpened(FtpIoSession session) throws Exception;
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java?rev=1129717&r1=1129716&r2=1129717&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java
Tue May 31 14:48:57 2011
@@ -270,11 +270,10 @@ public class ListenerFactory {
}
/**
- * @deprecated Replaced by the IpFilter.
* Sets the {@link Subnet}s that listeners created by this factory will
block from connecting
* @param blockedSubnets
* The list of {@link Subnet}s
- * @param blockedAddresses
+ * @deprecated Replaced by the IpFilter.
*/
@Deprecated
public void setBlockedSubnets(List<Subnet> blockedSubnets) {
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java?rev=1129717&r1=1129716&r2=1129717&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
Tue May 31 14:48:57 2011
@@ -61,7 +61,7 @@ public class FtpLoggingFilter extends Lo
}
/**
- * @see
LoggingFilter#messageReceived(org.apache.mina.core.IoFilter.NextFilter,
+ * @see
LoggingFilter#messageReceived(org.apache.mina.core.filterchain.IoFilter.NextFilter,
* IoSession, Object)
*/
@Override
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java?rev=1129717&r1=1129716&r2=1129717&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java
Tue May 31 14:48:57 2011
@@ -49,11 +49,9 @@ public final class AliasKeyManager imple
*
* @param mgr
* The X509KeyManager used as a delegate
- * @param keyStore
- * @param serverKeyAlias
+ * @param keyAlias
* The alias name of the server's keypair and supporting
* certificate chain
- * @param keyAlias
*/
public AliasKeyManager(KeyManager mgr, String keyAlias) {
this.delegate = (X509KeyManager) mgr;
