hammant 02/05/12 03:36:09
Modified: ftpserver/src/java/org/apache/avalon/ftpserver
FtpConfig.java FtpServerImpl.java
ftpserver/src/java/org/apache/avalon/ftpserver/ip
AbstractIpRestrictor.java
ftpserver/src/java/org/apache/avalon/ftpserver/usermanager
AbstractUserManager.java ObjStoreUserManager.java
Added: ftpserver/lib avalon-framework.jar
Removed: ftpserver/lib avalon-framework-4.1.2.jar
Log:
compose(..) becomes service(..)
Revision Changes Path
1.1 jakarta-avalon-apps/ftpserver/lib/avalon-framework.jar
<<Binary file>>
1.14 +10 -10
jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpConfig.java
Index: FtpConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpConfig.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FtpConfig.java 26 Apr 2002 14:34:14 -0000 1.13
+++ FtpConfig.java 12 May 2002 10:36:09 -0000 1.14
@@ -1,4 +1,4 @@
-// $Id: FtpConfig.java,v 1.13 2002/04/26 14:34:14 rana_b Exp $
+// $Id: FtpConfig.java,v 1.14 2002/05/12 10:36:09 hammant Exp $
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -15,10 +15,10 @@
import java.net.UnknownHostException;
import org.apache.avalon.phoenix.BlockContext;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.ftpserver.util.AsyncMessageQueue;
import org.apache.avalon.ftpserver.ip.IpRestrictorInterface;
@@ -61,7 +61,7 @@
private Configuration mConf = null;
private BlockContext mContext = null;
private Logger mLogger = null;
- private ComponentManager mCompManager = null;
+ private ServiceManager mServiceManager = null;
private FtpStatistics mStatistics = null;
private AsyncMessageQueue mMsgQ = null;
@@ -94,10 +94,10 @@
/**
* Set component manager - fourth step.
*/
- public void setComponentManager(ComponentManager compManager) throws
ComponentException {
- mCompManager = compManager;
- mIpRestrictor =
(IpRestrictorInterface)compManager.lookup(IpRestrictorInterface.ROLE);
- mUserManager =
(UserManagerInterface)compManager.lookup(UserManagerInterface.ROLE);
+ public void setServiceManager(ServiceManager serviceManager) throws
ServiceException {
+ mServiceManager = serviceManager;
+ mIpRestrictor =
(IpRestrictorInterface)serviceManager.lookup(IpRestrictorInterface.ROLE);
+ mUserManager =
(UserManagerInterface)serviceManager.lookup(UserManagerInterface.ROLE);
}
@@ -224,8 +224,8 @@
/**
* Get component manager
*/
- public ComponentManager getComponentManager() {
- return mCompManager;
+ public ServiceManager getServiceManager() {
+ return mServiceManager;
}
/**
1.14 +11 -11
jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpServerImpl.java
Index: FtpServerImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpServerImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FtpServerImpl.java 31 Mar 2002 16:42:18 -0000 1.13
+++ FtpServerImpl.java 12 May 2002 10:36:09 -0000 1.14
@@ -12,7 +12,7 @@
import org.apache.avalon.ftpserver.interfaces.FtpServerInterface;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -25,8 +25,8 @@
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
import
org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
@@ -51,7 +51,7 @@
implements Block,
FtpServerInterface,
Contextualizable,
- Composable,
+ Serviceable,
Configurable,
Disposable,
ConnectionHandlerFactory {
@@ -59,7 +59,7 @@
private ServerSocket mServerSocket = null;
private SocketManager mSocManager = null;
private ConnectionManager mConManager = null;
- private ComponentManager mCompManager = null;
+ private ServiceManager mServiceManager = null;
private BlockContext mContext = null;
private FtpConfig mConfig = null;
@@ -89,18 +89,18 @@
/**
* Get all managers - second step.
*/
- public void compose(ComponentManager compManager) throws
ComponentException {
+ public void service(ServiceManager serviceManager) throws
ServiceException {
+ mServiceManager = serviceManager;
try {
- mCompManager = compManager;
- mConfig.setComponentManager(mCompManager);
+ mConfig.setServiceManager(mServiceManager);
- mSocManager =
(SocketManager)compManager.lookup(SocketManager.ROLE);
- mConManager =
(ConnectionManager)compManager.lookup(ConnectionManager.ROLE);
}
catch(Exception ex) {
getLogger().error("FtpServerImpl.compose()", ex);
- throw new ComponentException("FtpServerImpl.compose()", ex);
+ throw new ServiceException("FtpServerImpl.compose()", ex);
}
+ mSocManager =
(SocketManager)serviceManager.lookup(SocketManager.ROLE);
+ mConManager =
(ConnectionManager)serviceManager.lookup(ConnectionManager.ROLE);
}
1.3 +10 -10
jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/ip/AbstractIpRestrictor.java
Index: AbstractIpRestrictor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/ip/AbstractIpRestrictor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractIpRestrictor.java 7 Apr 2002 17:02:23 -0000 1.2
+++ AbstractIpRestrictor.java 12 May 2002 10:36:09 -0000 1.3
@@ -21,9 +21,9 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.Context;
@@ -39,14 +39,14 @@
implements IpRestrictorInterface,
Block,
Contextualizable,
- Composable,
+ Serviceable,
Configurable,
Initializable,
Disposable {
protected Configuration mConfig;
protected BlockContext mBlockContext;
- protected ComponentManager mComponentManager;
+ protected ServiceManager mServiceManager;
protected boolean mbAllowIp;
/**
@@ -67,15 +67,15 @@
/**
* Set component manager - second step.
*/
- public void compose(ComponentManager compManager) throws
ComponentException {
- mComponentManager = compManager;
+ public void service(ServiceManager serviceManager) throws
ServiceException {
+ mServiceManager = serviceManager;
}
/**
- * Get component manager.
+ * Get service manager.
*/
- public ComponentManager getComponentManager() {
- return mComponentManager;
+ public ServiceManager getServiceManager() {
+ return mServiceManager;
}
1.4 +10 -10
jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/AbstractUserManager.java
Index: AbstractUserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/AbstractUserManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractUserManager.java 1 Apr 2002 17:20:07 -0000 1.3
+++ AbstractUserManager.java 12 May 2002 10:36:09 -0000 1.4
@@ -19,9 +19,9 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.Context;
@@ -37,14 +37,14 @@
implements UserManagerInterface,
Block,
Contextualizable,
- Composable,
+ Serviceable,
Configurable,
Initializable,
Disposable {
protected Configuration mConfig;
protected BlockContext mBlockContext;
- protected ComponentManager mComponentManager;
+ protected ServiceManager mServiceManager;
protected String mstAdminName;
/**
@@ -65,15 +65,15 @@
/**
* Set component manager - second step.
*/
- public void compose(ComponentManager compManager) throws
ComponentException {
- mComponentManager = compManager;
+ public void service(ServiceManager serviceManager) throws
ServiceException {
+ mServiceManager = serviceManager;
}
/**
- * Get component manager.
+ * Get service manager.
*/
- public ComponentManager getComponentManager() {
- return mComponentManager;
+ public ServiceManager getServiceManager() {
+ return mServiceManager;
}
1.3 +5 -5
jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/ObjStoreUserManager.java
Index: ObjStoreUserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/ObjStoreUserManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ObjStoreUserManager.java 1 Apr 2002 17:17:18 -0000 1.2
+++ ObjStoreUserManager.java 12 May 2002 10:36:09 -0000 1.3
@@ -17,8 +17,8 @@
import org.apache.avalon.cornerstone.services.store.Store;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
/**
@@ -44,9 +44,9 @@
/**
* Get store manager.
*/
- public void compose(ComponentManager compManager) throws
ComponentException {
- super.compose(compManager);
- mStore = (Store) compManager.lookup(Store.class.getName());
+ public void service(ServiceManager serviceManager) throws
ServiceException {
+ super.service(serviceManager);
+ mStore = (Store) serviceManager.lookup(Store.class.getName());
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
