You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/03/03 17:46:16 UTC
cvs commit: avalon-apps/phyre/src/java/org/apache/avalon/phyre/container DefaultPhyreContainer.java DefaultSubContext.java
bloritsch 2003/03/03 08:46:16
Modified: ftpserver/src/java/org/apache/avalon/ftpserver
BaseFtpConnection.java FtpConfig.java
FtpDataConnection.java FtpServerImpl.java
FtpUser.java
ftpserver/src/java/org/apache/avalon/ftpserver/gui
FtpAdmin.java FtpConnectionPanel.java
FtpConnectionTableModel.java
FtpStatisticsPanel.java SpyPanel.java
ftpserver/src/java/org/apache/avalon/ftpserver/ip
AbstractIpRestrictor.java FileIpRestrictor.java
ftpserver/src/java/org/apache/avalon/ftpserver/remote
RemoteHandler.java
ftpserver/src/java/org/apache/avalon/ftpserver/usermanager
AbstractUserManager.java DbUserManager.java
ftpserver/src/java/org/apache/avalon/ftpserver/util
StringUtils.java VirtualDirectory.java
phyre/src/java/org/apache/avalon/phyre Main.java
PhyreFrame.java
phyre/src/java/org/apache/avalon/phyre/container
DefaultPhyreContainer.java DefaultSubContext.java
Log:
organize imports and upgrade fortress refs
Revision Changes Path
1.5 +7 -9 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/BaseFtpConnection.java
Index: BaseFtpConnection.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/BaseFtpConnection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseFtpConnection.java 10 Oct 2002 16:04:11 -0000 1.4
+++ BaseFtpConnection.java 3 Mar 2003 16:46:15 -0000 1.5
@@ -7,22 +7,20 @@
*/
package org.apache.avalon.ftpserver;
-import java.io.IOException;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStreamReader;
-import java.net.Socket;
-import java.net.InetAddress;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.Socket;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
-
-import org.apache.avalon.ftpserver.util.StreamConnectorObserver;
+import org.apache.avalon.ftpserver.interfaces.FtpConnectionObserver;
+import org.apache.avalon.ftpserver.interfaces.SpyConnectionInterface;
import org.apache.avalon.ftpserver.util.IoUtils;
-import org.apache.avalon.ftpserver.util.StreamConnector;
import org.apache.avalon.ftpserver.util.Message;
-import org.apache.avalon.ftpserver.interfaces.SpyConnectionInterface;
-import org.apache.avalon.ftpserver.interfaces.FtpConnectionObserver;
+import org.apache.avalon.ftpserver.util.StreamConnectorObserver;
/**
1.18 +5 -10 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpConfig.java
Index: FtpConfig.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpConfig.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FtpConfig.java 20 Jan 2003 15:19:23 -0000 1.17
+++ FtpConfig.java 3 Mar 2003 16:46:15 -0000 1.18
@@ -12,22 +12,17 @@
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
-import java.net.UnknownHostException;
import java.util.StringTokenizer;
-import org.apache.avalon.phoenix.BlockContext;
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;
-
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.ftpserver.ip.IpRestrictorInterface;
-import org.apache.avalon.ftpserver.usermanager.UserManagerInterface;
-
import org.apache.avalon.ftpserver.remote.RemoteHandler;
+import org.apache.avalon.ftpserver.usermanager.UserManagerInterface;
+import org.apache.avalon.ftpserver.util.AsyncMessageQueue;
+import org.apache.avalon.phoenix.BlockContext;
/**
* Ftp configuration class. It has all ftp server configuration
1.10 +3 -4 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpDataConnection.java
Index: FtpDataConnection.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpDataConnection.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FtpDataConnection.java 20 Jan 2003 15:17:57 -0000 1.9
+++ FtpDataConnection.java 3 Mar 2003 16:46:15 -0000 1.10
@@ -10,10 +10,9 @@
package org.apache.avalon.ftpserver;
-import java.net.Socket;
-import java.net.ServerSocket;
import java.net.InetAddress;
-import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
/**
1.18 +11 -18 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpServerImpl.java
Index: FtpServerImpl.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpServerImpl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FtpServerImpl.java 20 Jan 2003 15:17:48 -0000 1.17
+++ FtpServerImpl.java 3 Mar 2003 16:46:15 -0000 1.18
@@ -10,30 +10,23 @@
import java.net.InetAddress;
import java.net.ServerSocket;
-import org.apache.avalon.ftpserver.interfaces.FtpServerInterface;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.ServiceManager;
-
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
+import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
+import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
+import org.apache.avalon.cornerstone.services.sockets.SocketManager;
+import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.ContextException;
-
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.activity.Disposable;
-
-import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
-
-import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
-import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
-import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
-import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
-import org.apache.avalon.cornerstone.services.sockets.SocketManager;
-
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.ftpserver.interfaces.FtpServerInterface;
import org.apache.avalon.phoenix.BlockContext;
1.13 +2 -3 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpUser.java
Index: FtpUser.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpUser.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FtpUser.java 20 May 2002 10:20:17 -0000 1.12
+++ FtpUser.java 3 Mar 2003 16:46:15 -0000 1.13
@@ -9,12 +9,11 @@
package org.apache.avalon.ftpserver;
import java.io.OutputStream;
-import java.io.BufferedOutputStream;
import java.io.Serializable;
-import org.apache.avalon.ftpserver.util.IoUtils;
-import org.apache.avalon.ftpserver.util.AsciiOutputStream;
import org.apache.avalon.ftpserver.usermanager.User;
+import org.apache.avalon.ftpserver.util.AsciiOutputStream;
+import org.apache.avalon.ftpserver.util.IoUtils;
/**
1.14 +19 -6 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/gui/FtpAdmin.java
Index: FtpAdmin.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/gui/FtpAdmin.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FtpAdmin.java 20 Jan 2003 15:21:36 -0000 1.13
+++ FtpAdmin.java 3 Mar 2003 16:46:15 -0000 1.14
@@ -8,19 +8,32 @@
package org.apache.avalon.ftpserver.gui;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
import java.rmi.Naming;
-import java.rmi.RemoteException;
import java.rmi.registry.Registry;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.JTextField;
import org.apache.avalon.ftpserver.FtpUser;
-import org.apache.avalon.ftpserver.remote.interfaces.RemoteHandlerInterface;
+import org.apache.avalon.ftpserver.remote.interfaces.ConnectionServiceInterface;
import org.apache.avalon.ftpserver.remote.interfaces.FtpConfigInterface;
import org.apache.avalon.ftpserver.remote.interfaces.FtpStatisticsInterface;
-import org.apache.avalon.ftpserver.remote.interfaces.ConnectionServiceInterface;
import org.apache.avalon.ftpserver.remote.interfaces.IpRestrictorInterface;
+import org.apache.avalon.ftpserver.remote.interfaces.RemoteHandlerInterface;
import org.apache.avalon.ftpserver.remote.interfaces.UserManagerInterface;
1.7 +12 -4 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/gui/FtpConnectionPanel.java
Index: FtpConnectionPanel.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/gui/FtpConnectionPanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FtpConnectionPanel.java 20 Jan 2003 15:19:57 -0000 1.6
+++ FtpConnectionPanel.java 3 Mar 2003 16:46:15 -0000 1.7
@@ -8,11 +8,19 @@
package org.apache.avalon.ftpserver.gui;
-import java.rmi.RemoteException;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTree;
import javax.swing.tree.TreePath;
+
import org.apache.avalon.ftpserver.FtpUser;
1.7 +4 -5 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/gui/FtpConnectionTableModel.java
Index: FtpConnectionTableModel.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/gui/FtpConnectionTableModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FtpConnectionTableModel.java 20 May 2002 10:20:17 -0000 1.6
+++ FtpConnectionTableModel.java 3 Mar 2003 16:46:15 -0000 1.7
@@ -8,20 +8,19 @@
package org.apache.avalon.ftpserver.gui;
-import java.rmi.RemoteException;
import java.net.InetAddress;
+import java.rmi.RemoteException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
-import java.util.Iterator;
import java.util.Vector;
-import java.util.Hashtable;
-import java.text.SimpleDateFormat;
+
import javax.swing.table.AbstractTableModel;
import org.apache.avalon.ftpserver.FtpUser;
+import org.apache.avalon.ftpserver.gui.remote.FtpConnectionObserverAdapter;
import org.apache.avalon.ftpserver.remote.interfaces.ConnectionServiceInterface;
import org.apache.avalon.ftpserver.remote.interfaces.FtpConnectionObserver;
-import org.apache.avalon.ftpserver.gui.remote.FtpConnectionObserverAdapter;
/**
1.14 +1 -4 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/gui/FtpStatisticsPanel.java
Index: FtpStatisticsPanel.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/gui/FtpStatisticsPanel.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FtpStatisticsPanel.java 22 Jan 2003 13:54:45 -0000 1.13
+++ FtpStatisticsPanel.java 3 Mar 2003 16:46:15 -0000 1.14
@@ -9,9 +9,7 @@
package org.apache.avalon.ftpserver.gui;
-import java.awt.BorderLayout;
import java.awt.Color;
-import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
@@ -21,7 +19,6 @@
import javax.swing.JButton;
import javax.swing.JLabel;
-import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.JTree;
1.3 +5 -4 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/gui/SpyPanel.java
Index: SpyPanel.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/gui/SpyPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SpyPanel.java 31 Mar 2002 16:52:43 -0000 1.2
+++ SpyPanel.java 3 Mar 2003 16:46:15 -0000 1.3
@@ -8,15 +8,16 @@
package org.apache.avalon.ftpserver.gui;
-import java.rmi.RemoteException;
import java.awt.BorderLayout;
+import java.rmi.RemoteException;
+
import javax.swing.JPanel;
-import javax.swing.JTextArea;
import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
import org.apache.avalon.ftpserver.FtpUser;
-import org.apache.avalon.ftpserver.remote.interfaces.SpyConnectionInterface;
import org.apache.avalon.ftpserver.gui.remote.SpyConnectionAdapter;
-import org.apache.avalon.ftpserver.gui.GuiUtils;
+import org.apache.avalon.ftpserver.remote.interfaces.SpyConnectionInterface;
/**
1.6 +4 -11 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/ip/AbstractIpRestrictor.java
Index: AbstractIpRestrictor.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/ip/AbstractIpRestrictor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractIpRestrictor.java 22 May 2002 20:41:36 -0000 1.5
+++ AbstractIpRestrictor.java 3 Mar 2003 16:46:16 -0000 1.6
@@ -10,23 +10,16 @@
import java.io.IOException;
-import org.apache.avalon.phoenix.BlockContext;
-
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Disposable;
-
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
-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;
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.
1.6 +4 -8 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/ip/FileIpRestrictor.java
Index: FileIpRestrictor.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/ip/FileIpRestrictor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FileIpRestrictor.java 10 Oct 2002 16:11:48 -0000 1.5
+++ FileIpRestrictor.java 3 Mar 2003 16:46:16 -0000 1.6
@@ -9,24 +9,20 @@
package org.apache.avalon.ftpserver.ip;
+import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
-import java.io.BufferedReader;
import java.io.FileWriter;
import java.io.IOException;
import java.net.InetAddress;
-import java.util.Vector;
-import java.util.Iterator;
import java.util.Collection;
+import java.util.Vector;
-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;
+import org.apache.avalon.phoenix.BlockContext;
/**
1.4 +3 -4 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/remote/RemoteHandler.java
Index: RemoteHandler.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/remote/RemoteHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemoteHandler.java 1 Apr 2002 17:24:32 -0000 1.3
+++ RemoteHandler.java 3 Mar 2003 16:46:16 -0000 1.4
@@ -9,16 +9,15 @@
package org.apache.avalon.ftpserver.remote;
import java.rmi.RemoteException;
-import java.rmi.registry.Registry;
import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
+import java.rmi.server.UID;
import java.rmi.server.UnicastRemoteObject;
import java.rmi.server.Unreferenced;
-import java.rmi.server.UID;
-import org.apache.avalon.ftpserver.usermanager.User;
-import org.apache.avalon.ftpserver.usermanager.UserManagerInterface;
import org.apache.avalon.ftpserver.remote.interfaces.FtpConfigInterface;
import org.apache.avalon.ftpserver.remote.interfaces.RemoteHandlerInterface;
+import org.apache.avalon.ftpserver.usermanager.UserManagerInterface;
/**
* Ftp server remote admin adapter. This is the starting point of remote admin.
1.7 +4 -11 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/AbstractUserManager.java
Index: AbstractUserManager.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/AbstractUserManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractUserManager.java 22 May 2002 20:41:36 -0000 1.6
+++ AbstractUserManager.java 3 Mar 2003 16:46:16 -0000 1.7
@@ -8,23 +8,16 @@
*/
package org.apache.avalon.ftpserver.usermanager;
-import org.apache.avalon.phoenix.BlockContext;
-
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Disposable;
-
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
-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;
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 user manager class.
1.13 +5 -9 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/DbUserManager.java
Index: DbUserManager.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/usermanager/DbUserManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DbUserManager.java 30 Oct 2002 06:15:10 -0000 1.12
+++ DbUserManager.java 3 Mar 2003 16:46:16 -0000 1.13
@@ -9,21 +9,17 @@
package org.apache.avalon.ftpserver.usermanager;
import java.io.File;
-import java.io.IOException;
-import java.io.FileReader;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Collections;
import java.sql.Connection;
import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.Statement;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.ftpserver.util.IoUtils;
/**
* This is another database based user manager class. I have
1.5 +1 -8 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/util/StringUtils.java
Index: StringUtils.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/util/StringUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringUtils.java 10 Oct 2002 15:59:47 -0000 1.4
+++ StringUtils.java 3 Mar 2003 16:46:16 -0000 1.5
@@ -9,13 +9,6 @@
package org.apache.avalon.ftpserver.util;
-import java.util.Vector;
-import java.util.Properties;
-import java.util.Enumeration;
-import java.io.StringWriter;
-import java.io.PrintWriter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
/**
1.8 +1 -2 avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/util/VirtualDirectory.java
Index: VirtualDirectory.java
===================================================================
RCS file: /home/cvs/avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/util/VirtualDirectory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VirtualDirectory.java 10 Oct 2002 15:59:04 -0000 1.7
+++ VirtualDirectory.java 3 Mar 2003 16:46:16 -0000 1.8
@@ -9,11 +9,10 @@
package org.apache.avalon.ftpserver.util;
import java.io.File;
-import java.io.Writer;
import java.io.IOException;
import java.io.Serializable;
+import java.io.Writer;
import java.util.Comparator;
-import java.util.Arrays;
import java.util.Date;
import java.util.StringTokenizer;
1.3 +1 -1 avalon-apps/phyre/src/java/org/apache/avalon/phyre/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/avalon-apps/phyre/src/java/org/apache/avalon/phyre/Main.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Main.java 31 Jul 2002 20:47:43 -0000 1.2
+++ Main.java 3 Mar 2003 16:46:16 -0000 1.3
@@ -49,7 +49,7 @@
{
CLOption option = ( CLOption ) clOptions.get( i );
- switch( option.getId() )
+ switch( option.getDescriptor().getId() )
{
case CLOption.TEXT_ARGUMENT:
System.out.println( "Unknown argument: " + option.getArgument() );
1.3 +9 -8 avalon-apps/phyre/src/java/org/apache/avalon/phyre/PhyreFrame.java
Index: PhyreFrame.java
===================================================================
RCS file: /home/cvs/avalon-apps/phyre/src/java/org/apache/avalon/phyre/PhyreFrame.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PhyreFrame.java 31 Jul 2002 20:47:43 -0000 1.2
+++ PhyreFrame.java 3 Mar 2003 16:46:16 -0000 1.3
@@ -12,10 +12,16 @@
import java.awt.Container;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
import org.apache.avalon.excalibur.logger.LoggerManager;
+import org.apache.avalon.fortress.ContainerManager;
+import org.apache.avalon.fortress.impl.DefaultContainerManager;
+import org.apache.avalon.fortress.util.ContextBuilder;
+import org.apache.avalon.fortress.util.ContextManager;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.ConsoleLogger;
@@ -26,11 +32,6 @@
import org.apache.avalon.phyre.dialogs.ConnectDialog;
import org.apache.avalon.phyre.mbean.MBeanManager;
import org.apache.avalon.phyre.mbean.MBeanServiceManager;
-import org.apache.excalibur.fortress.ContainerConstants;
-import org.apache.excalibur.fortress.ContainerManager;
-import org.apache.excalibur.fortress.DefaultContainerManager;
-import org.apache.excalibur.fortress.util.ContextBuilder;
-import org.apache.excalibur.fortress.util.ContextManager;
/**
* @author <a href="mailto:proyal@apache.org">Peter Royal</a>
@@ -69,12 +70,12 @@
contextManager.initialize();
final LoggerManager loggerManager =
- ( LoggerManager ) contextManager.getChildContext().get( ContainerConstants.LOGGER_MANAGER );
+ ( LoggerManager ) contextManager.getChildContext().get( LoggerManager.ROLE );
m_MBeanServiceManager.enableLogging( loggerManager.getLoggerForCategory( "mbean-server" ) );
m_containerManager = new DefaultContainerManager( contextManager );
- m_containerManager.initialize();
+ ContainerUtil.initialize(m_containerManager);
m_container = ( PhyreContainer ) m_containerManager.getContainer();
}
@@ -159,7 +160,7 @@
private void shutdown()
{
- m_containerManager.dispose();
+ ContainerUtil.dispose(m_containerManager);
System.exit( 1 );
}
1.2 +3 -14 avalon-apps/phyre/src/java/org/apache/avalon/phyre/container/DefaultPhyreContainer.java
Index: DefaultPhyreContainer.java
===================================================================
RCS file: /home/cvs/avalon-apps/phyre/src/java/org/apache/avalon/phyre/container/DefaultPhyreContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultPhyreContainer.java 31 Jul 2002 20:37:27 -0000 1.1
+++ DefaultPhyreContainer.java 3 Mar 2003 16:46:16 -0000 1.2
@@ -12,8 +12,8 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.excalibur.fortress.container.DefaultContainer;
-import org.apache.excalibur.fortress.handler.ComponentHandler;
+import org.apache.avalon.fortress.impl.DefaultContainer;
+import org.apache.avalon.fortress.impl.handler.ComponentHandler;
/**
* @author <a href="mailto:proyal@apache.org">Peter Royal</a>
@@ -34,14 +34,6 @@
( ContentPanelHelper ) containerContext.get( ContentPanelHelper.CONTEXT );
}
-// public void initialize() throws Exception
-// {
-// super.initialize();
-//
-// m_navigationPanelHelper.setNavigationPanel( getNavigationComponent() );
-// m_contentPanelHelper.setContentPanel( getDefaultContentComponent() );
-// }
-
public Component getDefaultContentComponent() throws ServiceException
{
return getComponent( CONTENT_ROLE, "default" );
@@ -53,10 +45,7 @@
try
{
- if( !handler.isInitialized() )
- {
- handler.initialize();
- }
+ handler.prepareHandler();
return ( Component ) handler.get();
}
1.2 +7 -6 avalon-apps/phyre/src/java/org/apache/avalon/phyre/container/DefaultSubContext.java
Index: DefaultSubContext.java
===================================================================
RCS file: /home/cvs/avalon-apps/phyre/src/java/org/apache/avalon/phyre/container/DefaultSubContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultSubContext.java 31 Jul 2002 20:37:27 -0000 1.1
+++ DefaultSubContext.java 3 Mar 2003 16:46:16 -0000 1.2
@@ -13,6 +13,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -22,10 +23,10 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phyre.mbean.MBeanAccessor;
-import org.apache.excalibur.fortress.ContainerManager;
-import org.apache.excalibur.fortress.DefaultContainerManager;
-import org.apache.excalibur.fortress.util.ContextBuilder;
-import org.apache.excalibur.fortress.util.ContextManager;
+import org.apache.avalon.fortress.ContainerManager;
+import org.apache.avalon.fortress.impl.DefaultContainerManager;
+import org.apache.avalon.fortress.util.ContextBuilder;
+import org.apache.avalon.fortress.util.ContextManager;
/**
* @author <a href="mailto:proyal@apache.org">Peter Royal</a>
@@ -105,7 +106,7 @@
m_contextManager.initialize();
m_containerManager = new DefaultContainerManager( m_contextManager, getLogger() );
- m_containerManager.initialize();
+ ContainerUtil.initialize(m_containerManager);
final PhyreContainer container = ( PhyreContainer ) m_containerManager.getContainer();
@@ -117,7 +118,7 @@
{
if( m_containerManager != null )
{
- m_containerManager.dispose();
+ ContainerUtil.dispose(m_containerManager);
}
if( m_contextManager != null )
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org