hammant 2004/08/22 05:23:58
Modified: core/src/java/org/apache/ftpserver/remote
RemoteHandlerFactory.java
core/src/java/org/apache/ftpserver/remote/interfaces
ConnectionServiceInterface.java
core/src/java/org/apache/ftpserver/usermanager
AvlalonLdapUserManager.java
gui/src/java/org/apache/ftpserver/gui CommonHandler.java
FtpAdmin.java FtpConnectionPanel.java
FtpConnectionTableModel.java FtpFileTableModel.java
FtpSpyContainerPanel.java FtpStatisticsPanel.java
FtpUserPanel.java SpyPanel.java
old/src/conf assembly.xml
remote/src/java/org/apache/ftpserver/remote
ConnectionService.java FtpConfig.java
FtpStatistics.java RemoteFtpConfig.java
RemoteHandlerFactoryImpl.java
RemoteHandlerImpl.java
Removed: core/src/java/org/apache/ftpserver AbstractFtpConfig.java
AvalonConnectionMonitor.java AvalonFileMonitor.java
AvalonFtpConfig.java
AvalonRemoteHandlerMonitor.java
AvalonUserManagerMonitor.java
BaseFtpConnection.java ConnectionService.java
FtpConfigBean.java FtpConnection.java
FtpDataConnection.java FtpRequest.java
FtpStatistics.java FtpStatus.java
FtpStatus.properties FtpWriter.java ServerImpl.java
SiteCommandHandler.java UserImpl.java
Log:
move to core package
Revision Changes Path
1.3 +2 -1
incubator-ftpserver/core/src/java/org/apache/ftpserver/remote/RemoteHandlerFactory.java
Index: RemoteHandlerFactory.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/core/src/java/org/apache/ftpserver/remote/RemoteHandlerFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoteHandlerFactory.java 22 Aug 2004 12:10:48 -0000 1.2
+++ RemoteHandlerFactory.java 22 Aug 2004 12:23:57 -0000 1.3
@@ -8,8 +8,9 @@
import java.rmi.RemoteException;
-import org.apache.ftpserver.AbstractFtpConfig;
+import org.apache.ftpserver.core.AbstractFtpConfig;
import org.apache.ftpserver.RemoteHandlerMonitor;
+import org.apache.ftpserver.core.AbstractFtpConfig;
/**
* @author Vladimirov
1.3 +2 -2
incubator-ftpserver/core/src/java/org/apache/ftpserver/remote/interfaces/ConnectionServiceInterface.java
Index: ConnectionServiceInterface.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/core/src/java/org/apache/ftpserver/remote/interfaces/ConnectionServiceInterface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConnectionServiceInterface.java 22 Aug 2004 12:10:48 -0000 1.2
+++ ConnectionServiceInterface.java 22 Aug 2004 12:23:57 -0000 1.3
@@ -22,7 +22,7 @@
import java.util.List;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import org.apache.ftpserver.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
/**
* Ftp user service interface - used by remote admin GUI.
1.3 +3 -2
incubator-ftpserver/core/src/java/org/apache/ftpserver/usermanager/AvlalonLdapUserManager.java
Index: AvlalonLdapUserManager.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/core/src/java/org/apache/ftpserver/usermanager/AvlalonLdapUserManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AvlalonLdapUserManager.java 22 Aug 2004 12:10:48 -0000 1.2
+++ AvlalonLdapUserManager.java 22 Aug 2004 12:23:57 -0000 1.3
@@ -5,7 +5,8 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.ftpserver.AvalonUserManagerMonitor;
+import org.apache.ftpserver.core.AvalonUserManagerMonitor;
+import org.apache.ftpserver.core.AvalonUserManagerMonitor;
import javax.naming.NamingException;
import javax.naming.directory.BasicAttribute;
1.3 +2 -2
incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/CommonHandler.java
Index: CommonHandler.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/CommonHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommonHandler.java 22 Aug 2004 12:10:48 -0000 1.2
+++ CommonHandler.java 22 Aug 2004 12:23:57 -0000 1.3
@@ -21,7 +21,7 @@
import java.awt.Component;
-import org.apache.ftpserver.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
import org.apache.ftpserver.remote.interfaces.RemoteHandlerInterface;
import org.apache.ftpserver.remote.interfaces.FtpConfigInterface;
import org.apache.ftpserver.remote.interfaces.FtpStatisticsInterface;
1.3 +3 -2
incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpAdmin.java
Index: FtpAdmin.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpAdmin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FtpAdmin.java 22 Aug 2004 12:10:48 -0000 1.2
+++ FtpAdmin.java 22 Aug 2004 12:23:57 -0000 1.3
@@ -39,7 +39,8 @@
import javax.swing.JPasswordField;
import javax.swing.JTextField;
-import org.apache.ftpserver.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
import org.apache.ftpserver.remote.interfaces.ConnectionServiceInterface;
import org.apache.ftpserver.remote.interfaces.FtpConfigInterface;
import org.apache.ftpserver.remote.interfaces.FtpStatisticsInterface;
1.3 +3 -2
incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpConnectionPanel.java
Index: FtpConnectionPanel.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpConnectionPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FtpConnectionPanel.java 22 Aug 2004 12:10:48 -0000 1.2
+++ FtpConnectionPanel.java 22 Aug 2004 12:23:57 -0000 1.3
@@ -32,7 +32,8 @@
import javax.swing.JTree;
import javax.swing.tree.TreePath;
-import org.apache.ftpserver.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
/**
1.3 +3 -2
incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpConnectionTableModel.java
Index: FtpConnectionTableModel.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpConnectionTableModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FtpConnectionTableModel.java 22 Aug 2004 12:10:48 -0000 1.2
+++ FtpConnectionTableModel.java 22 Aug 2004 12:23:57 -0000 1.3
@@ -29,7 +29,8 @@
import javax.swing.table.AbstractTableModel;
import org.apache.ftpserver.User;
-import org.apache.ftpserver.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
import org.apache.ftpserver.gui.remote.FtpConnectionObserverAdapter;
import org.apache.ftpserver.remote.interfaces.ConnectionServiceInterface;
import org.apache.ftpserver.remote.interfaces.FtpConnectionObserver;
1.3 +2 -2
incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpFileTableModel.java
Index: FtpFileTableModel.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpFileTableModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FtpFileTableModel.java 22 Aug 2004 12:10:48 -0000 1.2
+++ FtpFileTableModel.java 22 Aug 2004 12:23:57 -0000 1.3
@@ -23,7 +23,7 @@
import java.util.Vector;
import java.text.SimpleDateFormat;
import javax.swing.table.AbstractTableModel;
-import org.apache.ftpserver.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
/**
* This table model tracks user file related activities.
1.3 +2 -2
incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpSpyContainerPanel.java
Index: FtpSpyContainerPanel.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpSpyContainerPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FtpSpyContainerPanel.java 22 Aug 2004 12:10:48 -0000 1.2
+++ FtpSpyContainerPanel.java 22 Aug 2004 12:23:57 -0000 1.3
@@ -37,7 +37,7 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import org.apache.ftpserver.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
import org.apache.ftpserver.util.IoUtils;
/**
1.3 +3 -2
incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpStatisticsPanel.java
Index: FtpStatisticsPanel.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpStatisticsPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FtpStatisticsPanel.java 22 Aug 2004 12:10:48 -0000 1.2
+++ FtpStatisticsPanel.java 22 Aug 2004 12:23:57 -0000 1.3
@@ -32,7 +32,8 @@
import javax.swing.JTextField;
import javax.swing.JTree;
-import org.apache.ftpserver.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
import org.apache.ftpserver.gui.remote.FtpFileListenerAdapter;
import org.apache.ftpserver.gui.remote.FtpStatisticsListenerAdapter;
import org.apache.ftpserver.remote.interfaces.FtpFileListener;
1.3 +2 -2
incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpUserPanel.java
Index: FtpUserPanel.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/FtpUserPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FtpUserPanel.java 22 Aug 2004 12:10:48 -0000 1.2
+++ FtpUserPanel.java 22 Aug 2004 12:23:57 -0000 1.3
@@ -40,7 +40,7 @@
import javax.swing.JTree;
import javax.swing.SwingConstants;
-import org.apache.ftpserver.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
import org.apache.ftpserver.remote.interfaces.UserManagerInterface;
import org.apache.ftpserver.usermanager.User;
1.3 +3 -2
incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/SpyPanel.java
Index: SpyPanel.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/gui/src/java/org/apache/ftpserver/gui/SpyPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SpyPanel.java 22 Aug 2004 12:10:48 -0000 1.2
+++ SpyPanel.java 22 Aug 2004 12:23:57 -0000 1.3
@@ -32,7 +32,8 @@
import javax.swing.text.StyleConstants;
import org.apache.ftpserver.User;
-import org.apache.ftpserver.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
+import org.apache.ftpserver.core.UserImpl;
import org.apache.ftpserver.gui.remote.SpyConnectionAdapter;
import org.apache.ftpserver.remote.interfaces.SpyConnectionInterface;
1.3 +1 -1 incubator-ftpserver/old/src/conf/assembly.xml
Index: assembly.xml
===================================================================
RCS file: /home/cvs/incubator-ftpserver/old/src/conf/assembly.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- assembly.xml 22 Aug 2004 12:10:49 -0000 1.2
+++ assembly.xml 22 Aug 2004 12:23:57 -0000 1.3
@@ -31,7 +31,7 @@
<block class="org.apache.ftpserver.ip.AvalonFileIpRestrictor"
name="ip-restrictor"/>
<!-- Ftp server block -->
- <block class="org.apache.ftpserver.ServerImpl" name="ftp-server" >
+ <block class="org.apache.ftpserver.core.ServerImpl" name="ftp-server" >
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager" />
<provide name="ip-restrictor"
role="org.apache.ftpserver.ip.IpRestrictorInterface" />
1.3 +8 -6
incubator-ftpserver/remote/src/java/org/apache/ftpserver/remote/ConnectionService.java
Index: ConnectionService.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/remote/src/java/org/apache/ftpserver/remote/ConnectionService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConnectionService.java 22 Aug 2004 12:10:49 -0000 1.2
+++ ConnectionService.java 22 Aug 2004 12:23:58 -0000 1.3
@@ -22,8 +22,10 @@
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
-import org.apache.ftpserver.UserImpl;
-import org.apache.ftpserver.BaseFtpConnection;
+import org.apache.ftpserver.core.UserImpl;
+import org.apache.ftpserver.core.BaseFtpConnection;
+import org.apache.ftpserver.core.BaseFtpConnection;
+import org.apache.ftpserver.core.UserImpl;
import org.apache.ftpserver.remote.adapter.ConnectionObserverAdapter;
import org.apache.ftpserver.remote.adapter.SpyConnectionAdapter;
import org.apache.ftpserver.remote.interfaces.SpyConnectionInterface;
@@ -37,14 +39,14 @@
public
class ConnectionService implements
org.apache.ftpserver.remote.interfaces.ConnectionServiceInterface {
- private org.apache.ftpserver.ConnectionService mConnectionService;
+ private org.apache.ftpserver.core.ConnectionService mConnectionService;
private ConnectionObserverAdapter mConnectionObserverAdapter;
/**
* Constructor - sets the actual connection service object
*/
- public ConnectionService(final org.apache.ftpserver.ConnectionService
conService) throws RemoteException {
+ public ConnectionService(final
org.apache.ftpserver.core.ConnectionService conService) throws RemoteException {
mConnectionService = conService;
mConnectionObserverAdapter = new ConnectionObserverAdapter();
UnicastRemoteObject.exportObject(this);
@@ -53,7 +55,7 @@
/**
* Get the actual object.
*/
- public org.apache.ftpserver.ConnectionService getConnectionService() {
+ public org.apache.ftpserver.core.ConnectionService
getConnectionService() {
return mConnectionService;
}
1.2 +4 -4
incubator-ftpserver/remote/src/java/org/apache/ftpserver/remote/FtpConfig.java
Index: FtpConfig.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/remote/src/java/org/apache/ftpserver/remote/FtpConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FtpConfig.java 22 Aug 2004 11:54:30 -0000 1.1
+++ FtpConfig.java 22 Aug 2004 12:23:58 -0000 1.2
@@ -36,7 +36,7 @@
public
class FtpConfig implements FtpConfigInterface {
- private org.apache.ftpserver.AbstractFtpConfig mConfig;
+ private org.apache.ftpserver.core.AbstractFtpConfig mConfig;
private IpRestrictor mIpRestrictor;
private UserManager mUserManager;
@@ -46,7 +46,7 @@
/**
* Constructor - sets the actual config object.
*/
- public FtpConfig(org.apache.ftpserver.AbstractFtpConfig config) throws
RemoteException {
+ public FtpConfig(org.apache.ftpserver.core.AbstractFtpConfig config)
throws RemoteException {
mConfig = config;
mIpRestrictor = new IpRestrictor(config.getIpRestrictor());
mUserManager = new UserManager(config.getUserManager());
@@ -59,7 +59,7 @@
/**
* Get config
*/
- public org.apache.ftpserver.AbstractFtpConfig getConfig() {
+ public org.apache.ftpserver.core.AbstractFtpConfig getConfig() {
return mConfig;
}
1.3 +3 -3
incubator-ftpserver/remote/src/java/org/apache/ftpserver/remote/FtpStatistics.java
Index: FtpStatistics.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/remote/src/java/org/apache/ftpserver/remote/FtpStatistics.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FtpStatistics.java 22 Aug 2004 12:10:49 -0000 1.2
+++ FtpStatistics.java 22 Aug 2004 12:23:58 -0000 1.3
@@ -36,7 +36,7 @@
public
class FtpStatistics implements FtpStatisticsInterface {
- private org.apache.ftpserver.FtpStatistics mStatistics;
+ private org.apache.ftpserver.core.FtpStatistics mStatistics;
private StatisticsListenerAdapter mStatisticsListener;
private FileListenerAdapter mFileListener;
@@ -44,7 +44,7 @@
/**
* Constructor - sets the actual statistics object
*/
- public FtpStatistics(final org.apache.ftpserver.FtpStatistics
statistics) throws RemoteException {
+ public FtpStatistics(final org.apache.ftpserver.core.FtpStatistics
statistics) throws RemoteException {
mStatistics = statistics;
mStatisticsListener = new StatisticsListenerAdapter();
1.2 +2 -2
incubator-ftpserver/remote/src/java/org/apache/ftpserver/remote/RemoteFtpConfig.java
Index: RemoteFtpConfig.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/remote/src/java/org/apache/ftpserver/remote/RemoteFtpConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoteFtpConfig.java 22 Aug 2004 11:54:30 -0000 1.1
+++ RemoteFtpConfig.java 22 Aug 2004 12:23:58 -0000 1.2
@@ -27,7 +27,7 @@
import org.apache.ftpserver.remote.interfaces.ConnectionServiceInterface;
import org.apache.ftpserver.remote.interfaces.UserManagerInterface;
import org.apache.ftpserver.remote.interfaces.FtpStatisticsInterface;
-import org.apache.ftpserver.AbstractFtpConfig;
+import org.apache.ftpserver.core.AbstractFtpConfig;
/**
* Ftp configuration remote adapter. It is used by remote admin GUI.
1.3 +1 -1
incubator-ftpserver/remote/src/java/org/apache/ftpserver/remote/RemoteHandlerFactoryImpl.java
Index: RemoteHandlerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/remote/src/java/org/apache/ftpserver/remote/RemoteHandlerFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoteHandlerFactoryImpl.java 22 Aug 2004 12:10:49 -0000 1.2
+++ RemoteHandlerFactoryImpl.java 22 Aug 2004 12:23:58 -0000 1.3
@@ -8,7 +8,7 @@
import java.rmi.RemoteException;
-import org.apache.ftpserver.AbstractFtpConfig;
+import org.apache.ftpserver.core.AbstractFtpConfig;
import org.apache.ftpserver.RemoteHandlerMonitor;
import org.apache.ftpserver.RemoteHandlerMonitor;
1.3 +3 -2
incubator-ftpserver/remote/src/java/org/apache/ftpserver/remote/RemoteHandlerImpl.java
Index: RemoteHandlerImpl.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/remote/src/java/org/apache/ftpserver/remote/RemoteHandlerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoteHandlerImpl.java 22 Aug 2004 12:10:49 -0000 1.2
+++ RemoteHandlerImpl.java 22 Aug 2004 12:23:58 -0000 1.3
@@ -18,9 +18,10 @@
*/
package org.apache.ftpserver.remote;
-import org.apache.ftpserver.AbstractFtpConfig;
+import org.apache.ftpserver.core.AbstractFtpConfig;
import org.apache.ftpserver.RemoteHandlerMonitor;
import org.apache.ftpserver.RemoteHandlerMonitor;
+import org.apache.ftpserver.core.AbstractFtpConfig;
import org.apache.ftpserver.remote.interfaces.FtpConfigInterface;
import org.apache.ftpserver.remote.interfaces.RemoteHandlerInterface;
import org.apache.ftpserver.usermanager.UserManagerInterface;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
