Author: ngn
Date: Tue Sep 9 13:55:19 2008
New Revision: 693604
URL: http://svn.apache.org/viewvc?rev=693604&view=rev
Log:
Cleaning up package structure for messages and SSL
Added:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResource.java
(contents, props changed)
- copied, changed from r693183,
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/MessageResource.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/impl/
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java
(contents, props changed)
- copied, changed from r693183,
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java
(contents, props changed)
- copied, changed from r693183,
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/AliasKeyManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java
(contents, props changed)
- copied, changed from r693215,
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java
(contents, props changed)
- copied, changed from r693183,
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/ExtendedAliasKeyManager.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
(contents, props changed)
- copied, changed from r693183,
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/AliasKeymanagerTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
(contents, props changed)
- copied, changed from r693183,
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExtendedAliasKeymanagerTest.java
Removed:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/MessageResource.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/internal/
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/AliasKeyManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/ExtendedAliasKeyManager.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/AliasKeymanagerTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExtendedAliasKeymanagerTest.java
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
Tue Sep 9 13:55:19 2008
@@ -34,10 +34,10 @@
import org.apache.ftpserver.ftplet.FtpletContainer;
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.interfaces.MessageResource;
import org.apache.ftpserver.listener.Listener;
import org.apache.ftpserver.listener.nio.NioListener;
-import org.apache.ftpserver.message.MessageResourceImpl;
+import org.apache.ftpserver.message.MessageResource;
+import org.apache.ftpserver.message.impl.DefaultMessageResource;
import org.apache.ftpserver.usermanager.BaseUser;
import org.apache.ftpserver.usermanager.ConcurrentLoginPermission;
import org.apache.ftpserver.usermanager.PropertiesUserManager;
@@ -57,7 +57,7 @@
private final Logger LOG = LoggerFactory
.getLogger(DefaultFtpServerContext.class);
- private MessageResource messageResource = new MessageResourceImpl();
+ private MessageResource messageResource = new DefaultMessageResource();
private UserManager userManager = new PropertiesUserManager();
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
(original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
Tue Sep 9 13:55:19 2008
@@ -26,8 +26,8 @@
import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.interfaces.MessageResource;
import org.apache.ftpserver.listener.Listener;
+import org.apache.ftpserver.message.MessageResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java
Tue Sep 9 13:55:19 2008
@@ -26,7 +26,7 @@
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.interfaces.MessageResource;
+import org.apache.ftpserver.message.MessageResource;
import org.apache.ftpserver.util.FtpReplyUtil;
/**
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java
Tue Sep 9 13:55:19 2008
@@ -27,7 +27,7 @@
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.interfaces.MessageResource;
+import org.apache.ftpserver.message.MessageResource;
import org.apache.ftpserver.util.FtpReplyUtil;
/**
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
Tue Sep 9 13:55:19 2008
@@ -29,8 +29,8 @@
import org.apache.ftpserver.DefaultDataConnectionConfiguration.Passive;
import org.apache.ftpserver.interfaces.DataConnectionConfiguration;
import org.apache.ftpserver.listener.nio.NioListener;
-import org.apache.ftpserver.ssl.DefaultSslConfiguration;
import org.apache.ftpserver.ssl.SslConfiguration;
+import org.apache.ftpserver.ssl.impl.DefaultSslConfiguration;
import org.apache.mina.filter.firewall.Subnet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java
Tue Sep 9 13:55:19 2008
@@ -26,8 +26,8 @@
import org.apache.ftpserver.DefaultConnectionConfig;
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.FtpServerConfigurationException;
-import org.apache.ftpserver.interfaces.MessageResource;
-import org.apache.ftpserver.message.MessageResourceImpl;
+import org.apache.ftpserver.message.MessageResource;
+import org.apache.ftpserver.message.impl.DefaultMessageResource;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedMap;
import
org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
@@ -140,7 +140,7 @@
final ParserContext parserContext,
final BeanDefinitionBuilder builder) {
- MessageResourceImpl mr = new MessageResourceImpl();
+ DefaultMessageResource mr = new DefaultMessageResource();
if (StringUtils.hasText(childElm.getAttribute("languages"))) {
String langString = childElm.getAttribute("languages");
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java
Tue Sep 9 13:55:19 2008
@@ -26,6 +26,7 @@
import org.apache.ftpserver.ftplet.FtpletContainer;
import org.apache.ftpserver.ftplet.FtpletContext;
import org.apache.ftpserver.listener.Listener;
+import org.apache.ftpserver.message.MessageResource;
/**
* This is basically <code>org.apache.ftpserver.ftplet.FtpletContext</code>
with
Copied:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResource.java
(from r693183,
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/MessageResource.java)
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResource.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResource.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/MessageResource.java&r1=693183&r2=693604&rev=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/MessageResource.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResource.java
Tue Sep 9 13:55:19 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.interfaces;
+package org.apache.ftpserver.message;
import java.util.Properties;
Propchange:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java
(from r693183,
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java)
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java&r1=693183&r2=693604&rev=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java
Tue Sep 9 13:55:19 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.message;
+package org.apache.ftpserver.message.impl;
import java.io.File;
import java.io.FileInputStream;
@@ -32,7 +32,7 @@
import org.apache.ftpserver.FtpServerConfigurationException;
import org.apache.ftpserver.ftplet.FtpException;
-import org.apache.ftpserver.interfaces.MessageResource;
+import org.apache.ftpserver.message.MessageResource;
import org.apache.ftpserver.util.IoUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,10 +47,10 @@
* @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public class MessageResourceImpl implements MessageResource {
+public class DefaultMessageResource implements MessageResource {
private final Logger LOG = LoggerFactory
- .getLogger(MessageResourceImpl.class);
+ .getLogger(DefaultMessageResource.class);
private final static String RESOURCE_PATH =
"org/apache/ftpserver/message/";
Propchange:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java
(from r693183,
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/AliasKeyManager.java)
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/AliasKeyManager.java&r1=693183&r2=693604&rev=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/AliasKeyManager.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java
Tue Sep 9 13:55:19 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.ftpserver.ssl;
+package org.apache.ftpserver.ssl.impl;
import java.net.Socket;
import java.security.Principal;
Propchange:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java
(from r693215,
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java)
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java&r1=693215&r2=693604&rev=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java
Tue Sep 9 13:55:19 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.ssl;
+package org.apache.ftpserver.ssl.impl;
import java.io.File;
import java.io.FileInputStream;
@@ -33,6 +33,8 @@
import javax.net.ssl.X509KeyManager;
import org.apache.ftpserver.FtpServerConfigurationException;
+import org.apache.ftpserver.ssl.ClientAuth;
+import org.apache.ftpserver.ssl.SslConfiguration;
import org.apache.ftpserver.util.ClassUtils;
import org.apache.ftpserver.util.IoUtils;
import org.slf4j.Logger;
Propchange:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java
(from r693183,
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/ExtendedAliasKeyManager.java)
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/ExtendedAliasKeyManager.java&r1=693183&r2=693604&rev=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/ExtendedAliasKeyManager.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java
Tue Sep 9 13:55:19 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.ftpserver.ssl;
+package org.apache.ftpserver.ssl.impl;
import java.net.Socket;
import java.security.Principal;
Propchange:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java
Tue Sep 9 13:55:19 2008
@@ -19,7 +19,6 @@
package org.apache.ftpserver.usermanager;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java
Tue Sep 9 13:55:19 2008
@@ -30,7 +30,7 @@
import org.apache.ftpserver.ftplet.FtpStatistics;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.interfaces.MessageResource;
+import org.apache.ftpserver.message.MessageResource;
/**
* FTP reply translator.
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java
Tue Sep 9 13:55:19 2008
@@ -30,7 +30,7 @@
import org.apache.ftpserver.ftplet.FtpStatistics;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.interfaces.MessageResource;
+import org.apache.ftpserver.message.MessageResource;
/**
* FTP reply translator.
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java
Tue Sep 9 13:55:19 2008
@@ -21,7 +21,7 @@
import org.apache.ftpserver.DefaultFtpServerContext;
import org.apache.ftpserver.FtpServer;
-import org.apache.ftpserver.message.MessageResourceImpl;
+import org.apache.ftpserver.message.impl.DefaultMessageResource;
/**
*
@@ -42,7 +42,7 @@
DefaultFtpServerContext context = (DefaultFtpServerContext) server
.getServerContext();
- MessageResourceImpl resource = (MessageResourceImpl) context
+ DefaultMessageResource resource = (DefaultMessageResource) context
.getMessageResource();
resource.setLanguages(new String[] { "en", "zh-tw" });
return server;
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
Tue Sep 9 13:55:19 2008
@@ -33,7 +33,7 @@
import org.apache.ftpserver.filesystem.NativeFileSystemManager;
import org.apache.ftpserver.listener.Listener;
import org.apache.ftpserver.listener.nio.NioListener;
-import org.apache.ftpserver.ssl.DefaultSslConfiguration;
+import org.apache.ftpserver.ssl.impl.DefaultSslConfiguration;
import org.apache.mina.filter.firewall.Subnet;
import org.springframework.beans.factory.xml.XmlBeanFactory;
import org.springframework.core.io.FileSystemResource;
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
Tue Sep 9 13:55:19 2008
@@ -25,6 +25,7 @@
import org.apache.ftpserver.DefaultFtpServerContext;
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.listener.nio.NioListener;
+import org.apache.ftpserver.ssl.impl.DefaultSslConfiguration;
/**
*
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java?rev=693604&r1=693603&r2=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
Tue Sep 9 13:55:19 2008
@@ -34,6 +34,7 @@
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.clienttests.ClientTestTemplate;
import org.apache.ftpserver.listener.nio.NioListener;
+import org.apache.ftpserver.ssl.impl.DefaultSslConfiguration;
import org.apache.ftpserver.test.TestUtil;
import org.apache.ftpserver.util.IoUtils;
Copied:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
(from r693183,
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/AliasKeymanagerTest.java)
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java?p2=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java&p1=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/AliasKeymanagerTest.java&r1=693183&r2=693604&rev=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/AliasKeymanagerTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
Tue Sep 9 13:55:19 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.ssl;
+package org.apache.ftpserver.ssl.impl;
import java.io.FileInputStream;
import java.security.KeyStore;
@@ -25,6 +25,8 @@
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
+import org.apache.ftpserver.ssl.impl.AliasKeyManager;
+
import junit.framework.TestCase;
/**
Propchange:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
(from r693183,
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExtendedAliasKeymanagerTest.java)
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java?p2=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java&p1=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExtendedAliasKeymanagerTest.java&r1=693183&r2=693604&rev=693604&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExtendedAliasKeymanagerTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
Tue Sep 9 13:55:19 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.ssl;
+package org.apache.ftpserver.ssl.impl;
import java.io.FileInputStream;
import java.security.KeyStore;
@@ -25,6 +25,8 @@
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
+import org.apache.ftpserver.ssl.impl.ExtendedAliasKeyManager;
+
import junit.framework.TestCase;
/**
Propchange:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
