You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2002/05/22 22:41:36 UTC
cvs commit: jakarta-avalon-apps/ftpserver/src/manifest ftp-server.mf
hammant 02/05/22 13:41:36
Modified: ftpserver build.xml
ftpserver/src/java/org/apache/avalon/ftpserver
FtpConfig.java FtpServerImpl.java
ftpserver/src/java/org/apache/avalon/ftpserver/ip
AbstractIpRestrictor.java FileIpRestrictor.java
ftpserver/src/java/org/apache/avalon/ftpserver/usermanager
AbstractUserManager.java DbUserManager.java
LdapUserManager.java ObjStoreUserManager.java
PropertiesUserManager.java
Removed: ftpserver/src/java/org/apache/avalon/ftpserver
FtpServerImpl.xinfo
ftpserver/src/java/org/apache/avalon/ftpserver/ip
FileIpRestrictor.xinfo
ftpserver/src/java/org/apache/avalon/ftpserver/usermanager
DbUserManager.xinfo LdapUserManager.xinfo
ObjStoreUserManager.xinfo
PropertiesUserManager.xinfo
ftpserver/src/manifest ftp-server.mf
Log:
.xinfo and manifest generated by xdoclet now.
Revision Changes Path
1.33 +28 -2 jakarta-avalon-apps/ftpserver/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/build.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.xml 18 May 2002 10:52:14 -0000 1.32
+++ build.xml 22 May 2002 20:41:35 -0000 1.33
@@ -57,6 +57,7 @@
-->
<property name="build.dir" value="build"/>
<property name="build.lib" value="${build.dir}/lib"/>
+ <property name="build.xdoclet" value="${build.dir}/xdoclet"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.javadocs" value="${build.dir}/javadocs"/>
@@ -228,6 +229,28 @@
</target>
+ <!-- Make .xinfo and manifest automatically for blocks -->
+ <target name="phoenix-xdoclet" depends="compile">
+
+ <mkdir dir="${build.xdoclet}"/>
+
+ <taskdef name="phoenix-blocks"
+ classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet"
+ classpathref="project.class.path"/>
+
+ <phoenix-blocks
+ destdir="${build.xdoclet}"
+ classpathref="project.class.path">
+ <fileset dir="${java.dir}">
+ <include name="**" />
+ </fileset>
+ <blockinfo/>
+ <manifest manifestFile="manifest.mf" />
+ </phoenix-blocks>
+
+
+ </target>
+
<!--==============================-->
<!-- create all jar files -->
@@ -235,7 +258,7 @@
<target name="main" depends="sars" description="Default target to generate build products minus docs"/>
<target name="all" depends="compile" description="Generates all the FtpServer jar/bar/sar files"/>
- <target name="sars" depends="compile">
+ <target name="sars" depends="phoenix-xdoclet">
<mkdir dir="${build.lib}"/>
<!-- remote admin jar file -->
@@ -253,8 +276,11 @@
<!-- jar file -->
<jar jarfile="${build.lib}/${jar.name}.jar"
- manifest="${manifest.dir}/${jar.name}.mf">
+ manifest="${build.xdoclet}/manifest.mf">
<fileset dir="${build.classes}" excludes="**/gui/*"/>
+ <fileset dir="${build.xdoclet}">
+ <include name="**/*.xinfo"/>
+ </fileset>
</jar>
<!-- sar file -->
1.15 +3 -11 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FtpConfig.java 12 May 2002 10:36:09 -0000 1.14
+++ FtpConfig.java 22 May 2002 20:41:35 -0000 1.15
@@ -1,4 +1,4 @@
-// $Id: FtpConfig.java,v 1.14 2002/05/12 10:36:09 hammant Exp $
+// $Id: FtpConfig.java,v 1.15 2002/05/22 20:41:35 hammant Exp $
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -61,8 +61,7 @@
private Configuration mConf = null;
private BlockContext mContext = null;
private Logger mLogger = null;
- private ServiceManager mServiceManager = null;
-
+
private FtpStatistics mStatistics = null;
private AsyncMessageQueue mMsgQ = null;
@@ -93,9 +92,9 @@
/**
* Set component manager - fourth step.
+ * TODO - case for more blocks here? - PJH
*/
public void setServiceManager(ServiceManager serviceManager) throws ServiceException {
- mServiceManager = serviceManager;
mIpRestrictor = (IpRestrictorInterface)serviceManager.lookup(IpRestrictorInterface.ROLE);
mUserManager = (UserManagerInterface)serviceManager.lookup(UserManagerInterface.ROLE);
}
@@ -219,13 +218,6 @@
*/
public BlockContext getContext() {
return mContext;
- }
-
- /**
- * Get component manager
- */
- public ServiceManager getServiceManager() {
- return mServiceManager;
}
/**
1.16 +10 -10 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FtpServerImpl.java 18 May 2002 09:49:01 -0000 1.15
+++ FtpServerImpl.java 22 May 2002 20:41:35 -0000 1.16
@@ -42,6 +42,9 @@
* from the jar file. This is also the starting point of remote
* admin.
*
+ * @phoenix:block
+ * @phoenix:service name="org.apache.avalon.ftpserver.interfaces.FtpServerInterface"
+ *
* @author Rana Bhattacharyya <ra...@yahoo.com>
* @author Paul Hammant <Pa...@yahoo.com>
* @version 1.0
@@ -57,7 +60,7 @@
private ServerSocket mServerSocket = null;
private SocketManager mSocManager = null;
private ConnectionManager mConManager = null;
- private ServiceManager mServiceManager = null;
+// private ServiceManager mServiceManager = null;
private BlockContext mContext = null;
private FtpConfig mConfig = null;
@@ -86,17 +89,14 @@
/**
* Get all managers - second step.
+ * @phoenix:dependency name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
+ * @phoenix:dependency name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
+ * @phoenix:dependency name="org.apache.avalon.ftpserver.usermanager.UserManagerInterface"
+ * @phoenix:dependency name="org.apache.avalon.ftpserver.ip.IpRestrictorInterface"
+ *
*/
public void service(ServiceManager serviceManager) throws ServiceException {
- mServiceManager = serviceManager;
- try {
- mConfig.setServiceManager(mServiceManager);
-
- }
- catch(Exception ex) {
- getLogger().error("FtpServerImpl.compose()", ex);
- throw new ServiceException("FtpServerImpl.compose()", ex);
- }
+ mConfig.setServiceManager(serviceManager);
mSocManager = (SocketManager)serviceManager.lookup(SocketManager.ROLE);
mConManager = (ConnectionManager)serviceManager.lookup(ConnectionManager.ROLE);
}
1.5 +0 -18 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractIpRestrictor.java 18 May 2002 09:49:01 -0000 1.4
+++ AbstractIpRestrictor.java 22 May 2002 20:41:36 -0000 1.5
@@ -37,14 +37,12 @@
abstract class AbstractIpRestrictor extends AbstractLogEnabled
implements IpRestrictorInterface,
Contextualizable,
- Serviceable,
Configurable,
Initializable,
Disposable {
protected Configuration mConfig;
protected BlockContext mBlockContext;
- protected ServiceManager mServiceManager;
protected boolean mbAllowIp;
/**
@@ -60,22 +58,6 @@
public BlockContext getContext() {
return mBlockContext;
}
-
-
- /**
- * Set component manager - second step.
- */
- public void service(ServiceManager serviceManager) throws ServiceException {
- mServiceManager = serviceManager;
- }
-
- /**
- * Get service manager.
- */
- public ServiceManager getServiceManager() {
- return mServiceManager;
- }
-
/**
* Configure user manager - third step.
1.4 +6 -9 jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/ip/FileIpRestrictor.java
Index: FileIpRestrictor.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/ip/FileIpRestrictor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileIpRestrictor.java 20 May 2002 10:20:18 -0000 1.3
+++ FileIpRestrictor.java 22 May 2002 20:41:36 -0000 1.4
@@ -21,6 +21,8 @@
import org.apache.avalon.phoenix.BlockContext;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.ftpserver.util.IoUtils;
import org.apache.avalon.ftpserver.util.RegularExpr;
@@ -29,10 +31,12 @@
/**
* This class provides IP restriction functionality.
*
+ * @phoenix:block
+ * @phoenix:service name="org.apache.avalon.ftpserver.ip.IpRestrictorInterface"
+ *
* @author <a href="mailto:rana_b@yahoo.com">Rana Bhattacharyya</a>
*/
-public
-class FileIpRestrictor extends AbstractIpRestrictor {
+public class FileIpRestrictor extends AbstractIpRestrictor {
private static final String LINE_SEP = System.getProperty("line.separator", "\n");
@@ -40,12 +44,6 @@
private Vector mAllEntries = new Vector();
/**
- * Default constructor.
- */
- public FileIpRestrictor() {
- }
-
- /**
* Set application context.
*/
public void contextualize(Context context) throws ContextException {
@@ -61,7 +59,6 @@
}
getLogger().info("IP restrictor file = " + mIpFile);
}
-
/**
* Read the list from the file.
1.6 +0 -18 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractUserManager.java 18 May 2002 09:49:01 -0000 1.5
+++ AbstractUserManager.java 22 May 2002 20:41:36 -0000 1.6
@@ -35,14 +35,12 @@
abstract class AbstractUserManager extends AbstractLogEnabled
implements UserManagerInterface,
Contextualizable,
- Serviceable,
Configurable,
Initializable,
Disposable {
protected Configuration mConfig;
protected BlockContext mBlockContext;
- protected ServiceManager mServiceManager;
protected String mstAdminName;
/**
@@ -58,22 +56,6 @@
public BlockContext getContext() {
return mBlockContext;
}
-
-
- /**
- * Set component manager - second step.
- */
- public void service(ServiceManager serviceManager) throws ServiceException {
- mServiceManager = serviceManager;
- }
-
- /**
- * Get service manager.
- */
- public ServiceManager getServiceManager() {
- return mServiceManager;
- }
-
/**
* Configure user manager - third step.
1.8 +3 -0 jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/DbUserManager.java
Index: DbUserManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/DbUserManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DbUserManager.java 10 Mar 2002 06:09:36 -0000 1.7
+++ DbUserManager.java 22 May 2002 20:41:36 -0000 1.8
@@ -40,6 +40,9 @@
* )
* </pre>
*
+ * @phoenix:block
+ * @phoenix:service name="org.apache.avalon.ftpserver.usermanager.UserManagerInterface"
+ *
* @author <a href="mailto:rana_b@yahoo.com">Rana Bhattacharyya</a>
*/
public
1.8 +4 -2 jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/LdapUserManager.java
Index: LdapUserManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/LdapUserManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LdapUserManager.java 20 May 2002 10:20:18 -0000 1.7
+++ LdapUserManager.java 22 May 2002 20:41:36 -0000 1.8
@@ -33,10 +33,12 @@
* The LDAP requires the password to be nonempty for simple authentication. So
* instead of using empty string password (""), we will be using single space (" ").
*
+ * @phoenix:block
+ * @phoenix:service name="org.apache.avalon.ftpserver.usermanager.UserManagerInterface"
+ *
* @author <a href="mailto:rana_b@yahoo.com">Rana Bhattacharyya</a>
*/
-public
-class LdapUserManager extends AbstractUserManager {
+public class LdapUserManager extends AbstractUserManager {
// LDAP attributes
1.4 +7 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ObjStoreUserManager.java 12 May 2002 10:36:09 -0000 1.3
+++ ObjStoreUserManager.java 22 May 2002 20:41:36 -0000 1.4
@@ -19,15 +19,19 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
/**
* File object repository based user manager.
*
+ * @phoenix:block
+ * @phoenix:service name="org.apache.avalon.ftpserver.usermanager.UserManagerInterface"
+ *
* @author <a href="mailto:rana_b@yahoo.com">Rana Bhattacharyya</a>
*/
public
-class ObjStoreUserManager extends AbstractUserManager {
+class ObjStoreUserManager extends AbstractUserManager implements Serviceable {
protected Configuration mStoreConfig;
protected Store mStore;
@@ -43,9 +47,10 @@
/**
* Get store manager.
+ *
+ * @phoenix:dependency name="org.apache.avalon.cornerstone.services.store.Store"
*/
public void service(ServiceManager serviceManager) throws ServiceException {
- super.service(serviceManager);
mStore = (Store) serviceManager.lookup(Store.class.getName());
}
1.8 +4 -2 jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/PropertiesUserManager.java
Index: PropertiesUserManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/PropertiesUserManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PropertiesUserManager.java 20 May 2002 10:20:18 -0000 1.7
+++ PropertiesUserManager.java 22 May 2002 20:41:36 -0000 1.8
@@ -33,10 +33,12 @@
* implementation. We use <code>user.properties</code> file
* to store user data.
*
+ * @phoenix:block
+ * @phoenix:service name="org.apache.avalon.ftpserver.usermanager.UserManagerInterface"
+ *
* @author <a href="mailto:rana_b@yahoo.com">Rana Bhattacharyya</a>
*/
-public
-class PropertiesUserManager extends AbstractUserManager {
+public class PropertiesUserManager extends AbstractUserManager {
private static final String PREFIX = "FtpServer.user.";
private static final String USER_PROP = "user.properties";
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>