rana_b 2003/10/25 12:49:52
Modified: src/java/org/apache/ftpserver/usermanager
PropertiesUserManager.java AbstractUserManager.java
src/java/org/apache/ftpserver FtpServerImpl.java
FtpConfig.java
src/java/org/apache/ftpserver/ip FileIpRestrictor.java
AbstractIpRestrictor.java
Log:
Removed BlockContext references - Timothy's changes
Revision Changes Path
1.3 +7 -4
incubator-ftpserver/src/java/org/apache/ftpserver/usermanager/PropertiesUserManager.java
Index: PropertiesUserManager.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/usermanager/PropertiesUserManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertiesUserManager.java 23 Jun 2003 16:33:59 -0000 1.2
+++ PropertiesUserManager.java 25 Oct 2003 19:49:52 -0000 1.3
@@ -71,8 +71,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.phoenix.BlockContext;
-
import org.apache.ftpserver.util.IoUtils;
import org.apache.ftpserver.util.BaseProperties;
import org.apache.ftpserver.util.EncryptUtils;
@@ -112,7 +110,12 @@
public void contextualize(Context context) throws ContextException {
super.contextualize(context);
try {
- mUserDataFile = new
File(((BlockContext)context).getBaseDirectory(), USER_PROP) ;
+ File appDir = (File)context.get("app.home");
+ if(!appDir.exists()) {
+ appDir.mkdirs();
+ }
+ mUserDataFile = new File(appDir, USER_PROP);
+
mUserDataFile.createNewFile();
mUserData = new BaseProperties(mUserDataFile);
mlLastModified = mUserDataFile.lastModified();
1.2 +6 -7
incubator-ftpserver/src/java/org/apache/ftpserver/usermanager/AbstractUserManager.java
Index: AbstractUserManager.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/usermanager/AbstractUserManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractUserManager.java 31 Mar 2003 06:50:26 -0000 1.1
+++ AbstractUserManager.java 25 Oct 2003 19:49:52 -0000 1.2
@@ -56,7 +56,6 @@
*/
package org.apache.ftpserver.usermanager;
-import org.apache.avalon.phoenix.BlockContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.activity.Initializable;
@@ -88,21 +87,21 @@
Disposable {
protected Configuration mConfig;
- protected BlockContext mBlockContext;
+ protected Context mContext;
protected String mstAdminName;
/**
* Set context object - first step.
*/
public void contextualize(Context context) throws ContextException {
- mBlockContext = (BlockContext) context;
+ mContext = context;
}
/**
- * Get block context.
+ * Get application context.
*/
- public BlockContext getContext() {
- return mBlockContext;
+ public Context getContext() {
+ return mContext;
}
/**
1.2 +3 -4
incubator-ftpserver/src/java/org/apache/ftpserver/FtpServerImpl.java
Index: FtpServerImpl.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/FtpServerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FtpServerImpl.java 31 Mar 2003 06:50:02 -0000 1.1
+++ FtpServerImpl.java 25 Oct 2003 19:49:52 -0000 1.2
@@ -76,7 +76,6 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.ftpserver.interfaces.FtpServerInterface;
-import org.apache.avalon.phoenix.BlockContext;
/**
@@ -102,7 +101,7 @@
private ServerSocket mServerSocket = null;
private SocketManager mSocManager = null;
private ConnectionManager mConManager = null;
- private BlockContext mContext = null;
+ private Context mContext = null;
private FtpConfig mConfig = null;
/**
@@ -118,7 +117,7 @@
try {
mConfig = new FtpConfig();
mConfig.setLogger(getLogger());
- mContext = (BlockContext)context;
+ mContext = context;
mConfig.setContext(mContext);
}
catch(Exception ex) {
1.2 +14 -6
incubator-ftpserver/src/java/org/apache/ftpserver/FtpConfig.java
Index: FtpConfig.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/FtpConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FtpConfig.java 31 Mar 2003 06:50:02 -0000 1.1
+++ FtpConfig.java 25 Oct 2003 19:49:52 -0000 1.2
@@ -69,7 +69,8 @@
import org.apache.ftpserver.remote.RemoteHandler;
import org.apache.ftpserver.usermanager.UserManagerInterface;
import org.apache.ftpserver.util.AsyncMessageQueue;
-import org.apache.avalon.phoenix.BlockContext;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
/**
* Ftp configuration class. It has all ftp server configuration
@@ -90,7 +91,7 @@
private InetAddress mSelfAddress = null;
private Configuration mConf = null;
- private BlockContext mContext = null;
+ private Context mContext = null;
private Logger mLogger = null;
private FtpStatistics mStatistics = null;
@@ -129,7 +130,7 @@
/**
* Set context - third step.
*/
- public void setContext(BlockContext ctx) {
+ public void setContext(Context ctx) {
mContext = ctx;
}
@@ -330,7 +331,7 @@
/**
* Get context
*/
- public BlockContext getContext() {
+ public Context getContext() {
return mContext;
}
@@ -446,7 +447,14 @@
* Get base directory
*/
public File getBaseDirectory() {
- return mContext.getBaseDirectory();
+ File baseDir = null;
+ try {
+ baseDir = (File) mContext.get("app.home");
+ }
+ catch (ContextException ex) {
+ mLogger.warn("Unable to retrieve application base directory",
ex);
+ }
+ return baseDir;
}
/**
1.2 +7 -3
incubator-ftpserver/src/java/org/apache/ftpserver/ip/FileIpRestrictor.java
Index: FileIpRestrictor.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/ip/FileIpRestrictor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileIpRestrictor.java 31 Mar 2003 06:50:25 -0000 1.1
+++ FileIpRestrictor.java 25 Oct 2003 19:49:52 -0000 1.2
@@ -69,7 +69,7 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.ftpserver.util.IoUtils;
import org.apache.ftpserver.util.RegularExpr;
-import org.apache.avalon.phoenix.BlockContext;
+
/**
@@ -92,7 +92,11 @@
*/
public void contextualize(Context context) throws ContextException {
super.contextualize(context);
- mIpFile = new File( ((BlockContext)context).getBaseDirectory(),
"ip.properties" );
+ File appDir = (File)context.get("app.home");
+ if(!appDir.exists()) {
+ appDir.mkdirs();
+ }
+ mIpFile = new File(appDir, "ip.properties" );
try {
reload();
}
1.2 +7 -7
incubator-ftpserver/src/java/org/apache/ftpserver/ip/AbstractIpRestrictor.java
Index: AbstractIpRestrictor.java
===================================================================
RCS file:
/home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/ip/AbstractIpRestrictor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractIpRestrictor.java 31 Mar 2003 06:50:25 -0000 1.1
+++ AbstractIpRestrictor.java 25 Oct 2003 19:49:52 -0000 1.2
@@ -68,7 +68,7 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.phoenix.BlockContext;
+
/**
* Abstract ip restrictor class.
@@ -84,21 +84,21 @@
Disposable {
protected Configuration mConfig;
- protected BlockContext mBlockContext;
+ protected Context mContext;
protected boolean mbAllowIp;
/**
* Set context object - first step.
*/
public void contextualize(Context context) throws ContextException {
- mBlockContext = (BlockContext) context;
+ mContext = context;
}
/**
- * Get block context.
+ * Get application context.
*/
- public BlockContext getContext() {
- return mBlockContext;
+ public Context getContext() {
+ return mContext;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
