james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r821546 [2/5] - in /james/server/trunk: avalon-socket-library/src/main/java/org/apache/james/socket/ core-api/src/test/java/org/ core-api/src/test/java/org/apache/ core-api/src/test/java/org/apache/james/ core-api/src/test/java/org/apache/j...
Date Sun, 04 Oct 2009 15:10:51 GMT
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java?rev=821546&r1=821545&r2=821546&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java Sun Oct  4 15:10:49 2009
@@ -22,30 +22,17 @@
 package org.apache.james.remotemanager;
 
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.net.Socket;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
-import javax.mail.internet.ParseException;
-
-import org.apache.james.Constants;
-import org.apache.james.api.user.JamesUser;
-import org.apache.james.api.user.User;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.vut.management.VirtualUserTableManagementException;
-import org.apache.james.management.BayesianAnalyzerManagementException;
-import org.apache.james.management.DomainListManagementException;
-import org.apache.james.management.ProcessorManagementService;
-import org.apache.james.management.SpoolFilter;
-import org.apache.james.socket.ProtocolHandler;
+import org.apache.commons.logging.Log;
+import org.apache.james.socket.CRLFTerminatedReader;
 import org.apache.james.socket.ProtocolContext;
-import org.apache.mailet.MailAddress;
+import org.apache.james.socket.ProtocolHandler;
+import org.apache.james.socket.Watchdog;
 
 
 /**
@@ -55,86 +42,51 @@
  * TODO: -improve protocol
  *       -much more...
  */
-public class RemoteManagerHandler implements ProtocolHandler {
-    
-    @SuppressWarnings("unchecked")
-    private static final Class[] WORKER_METHOD_PARAMETERSET = new Class[] {String.class, ProtocolContext.class};
-
-    private static final List<String> COMMANDLIST = Arrays.asList(new String[] { 
-        "MEMSTAT",
-        "ADDUSER",
-        "SETPASSWORD",
-        "DELUSER",
-        "LISTUSERS",
-        "COUNTUSERS",
-        "VERIFY",
-        "HELP",
-        "SETFORWARDING",
-        "SHOWFORWARDING",
-        "UNSETFORWARDING",
-        "SETALIAS",
-        "SHOWALIAS",
-        "UNSETALIAS",
-        "USER",
-        "LISTSPOOL",
-        "FLUSHSPOOL",
-        "DELETESPOOL",
-        "MOVEMAILS",
-        "ADDHAM",
-        "ADDSPAM",
-        "EXPORTBAYESIANDATA",
-        "IMPORTBAYESIANDATA",
-        "RESETBAYESIANDATA",
-        "LISTPROCESSORS",
-        "LISTMAILETS",
-        "LISTMATCHERS",
-        "SHOWMAILETINFO",
-        "SHOWMATCHERINFO",
-        "ADDMAPPING",
-        "REMOVEMAPPING",
-        "LISTMAPPING",
-        "LISTALLMAPPINGS",
-        "ADDDOMAIN",
-        "REMOVEDOMAIN",
-        "LISTDOMAINS",
-        "QUIT",
-        "SHUTDOWN"
-    });
-
+public class RemoteManagerHandler implements ProtocolHandler, RemoteManagerSession {
+ 
     /**
      * The per-service configuration data that applies to all handlers
      */
     private final RemoteManagerHandlerConfigurationData theConfigData;
+    private ProtocolContext context;
+   
+    private Map<Object,Object> stateMap = new HashMap<Object, Object>();
 
-    /**
-     * The current UsersRepository being managed/viewed/modified
-     */
-    private UsersRepository users;
-    
-    private CommandRegistry commandRegistry;
-    
-    private final static String HEADER_IDENTIFIER = "header=";
-    private final static String REGEX_IDENTIFIER = "regex=";
-    private final static String KEY_IDENTIFIER = "key=";
+    private boolean sessionEnded;
+
+    private RemoteManagerHandlerChain handlerChain;
 
-    private final static String ADD_MAPPING_ACTION = "ADD_MAPPING";
-    private final static String REMOVE_MAPPING_ACTION = "REMOVE_MAPPING";
+    private LinkedList<ConnectHandler> connectHandlers;
 
+    private LinkedList<LineHandler> lineHandlers;
     
-    public RemoteManagerHandler(RemoteManagerHandlerConfigurationData theConfigData) {
-        this.theConfigData = theConfigData;
-        // Reset the users repository to the default.
-        users = theConfigData.getUsersRepository();
-        
-        Command[] commands = theConfigData.getCommands();
-        commandRegistry = new CommandRegistry(commands);
+    public RemoteManagerHandler(final RemoteManagerHandlerConfigurationData theConfigData, final RemoteManagerHandlerChain handlerChain) {
+        this.theConfigData = theConfigData; 
+        this.handlerChain = handlerChain;
+        connectHandlers = handlerChain.getHandlers(ConnectHandler.class);
+        lineHandlers = handlerChain.getHandlers(LineHandler.class);
     }
 
     /**
      * @see org.apache.avalon.cornerstone.services.connection.ConnectionHandler#handleConnection(Socket)
      */
     public void handleProtocol(ProtocolContext context) throws IOException {
-        context.writeLoggedResponse("JAMES Remote Administration Tool " + Constants.SOFTWARE_VERSION );
+        this.context = context;
+        sessionEnded = false;
+        getState().put(RemoteManagerSession.CURRENT_USERREPOSITORY, "LocalUsers");
+
+
+        //Session started - RUN all connect handlers
+        if(connectHandlers != null) {
+            int count = connectHandlers.size();
+            for(int i = 0; i < count; i++) {
+                connectHandlers.get(i).onConnect(this);
+                if(sessionEnded) {
+                    break;
+                }
+            }
+        }
+
         context.writeLoggedResponse("Please enter your login and password");
         String login = null;
         String password = null;
@@ -165,29 +117,44 @@
             context.getLogger().info(infoBuffer.toString());
         }
 
-        try {
-            context.getOutputWriter().print(theConfigData.getPrompt());
-            context.getOutputWriter().flush();
-            context.getWatchdog().start();
-            while (parseCommand(context.getInputReader().readLine(), context)) {
-                context.getWatchdog().reset();
-                context.getOutputWriter().print(theConfigData.getPrompt());
-                context.getOutputWriter().flush();
+        context.getWatchdog().start();
+        while(!sessionEnded) {
+            String line = null;
+            // parse the command
+            try {
+                line = context.getInputReader().readLine();
+                if (line != null) {
+                    line = line.trim();
+                }
+            } catch (CRLFTerminatedReader.TerminationException te) {
+                context.writeLoggedFlushedResponse("-ERR Syntax error at character position " + te.position() + ". CR and LF must be CRLF paired.  See RFC 1939 #3.");
             }
-            context.getWatchdog().stop();
-        } catch (IOException ioe) {
-            //We can cleanly ignore this as it's probably a socket timeout
-        } catch (Throwable thr) {
-            System.out.println("Exception: " + thr.getMessage());
-            context.getLogger().error("Encountered exception in handling the remote manager connection.", thr);
-        }
-        StringBuilder infoBuffer =
-            new StringBuilder(64)
-                    .append("Logout for ")
-                    .append(login)
-                    .append(".");
-        context.getLogger().info(infoBuffer.toString());
 
+          if (line == null) {
+              break;
+          }
+
+          if (lineHandlers.size() > 0) {
+              context.getOutputWriter().print(theConfigData.getPrompt());
+              context.getOutputWriter().flush();
+              
+              ((LineHandler) lineHandlers.getLast()).onLine(this, line);
+          } else {
+              sessionEnded = true;
+          }
+          context.getWatchdog().reset();
+          
+        }
+        context.getWatchdog().stop();
+        if (context.getLogger().isInfoEnabled()) {
+            StringBuilder infoBuffer =
+                new StringBuilder(64)
+                        .append("Logout for ")
+                        .append(login)
+                        .append(".");
+            context.getLogger().info(infoBuffer.toString());
+        }
+       
     }
 
     /**
@@ -202,1592 +169,63 @@
      * Resets the handler data to a basic state.
      */
     public void resetHandler() {
-        // Reset user repository
-        users = theConfigData.getUsersRepository();
-    }
-
-    /**
-     * <p>This method parses and processes RemoteManager commands read off the
-     * wire in handleConnection.  It returns true if expecting additional
-     * commands, false otherwise.</p>
-     *
-     * @param rawCommand the raw command string passed in over the socket
-     * @param context not null
-     *
-     * @return whether additional commands are expected.
-     */
-    private boolean parseCommand( String rawCommand, ProtocolContext context ) {
-        if (rawCommand == null) {
-            return false;
-        }
-        String command = rawCommand.trim();
-        String argument = null;
-        int breakIndex = command.indexOf(" ");
-        if (breakIndex > 0) {
-            argument = command.substring(breakIndex + 1);
-            command = command.substring(0, breakIndex);
-        }
-        command = command.toUpperCase(Locale.US);
-        
-        if (!COMMANDLIST.contains(command)) {
-            final boolean result = commandRegistry.execute(command, argument, context.getOutputWriter());
-            context.getOutputWriter().flush();
-            return result;
-        }
+        sessionEnded = true;
+        getState().clear();
         
-        try {
-            Method method = getClass().getDeclaredMethod("do"+command, WORKER_METHOD_PARAMETERSET);
-            Boolean returnFlag = (Boolean)method.invoke(this, new Object[] {argument, context});
-            return returnFlag.booleanValue();
-        } catch (SecurityException e) {
-            context.writeLoggedFlushedResponse("could not determine executioner of command " + command);
-        } catch (NoSuchMethodException e) {
-            return doUnknownCommand(rawCommand, context);
-        } catch (Exception e) {
-            e.printStackTrace();
-            context.writeLoggedFlushedResponse("could not execute command " + command);
-        }
-        return false;
-   }
-
-    /**
-     * Handler method called upon receipt of an MEMSTAT command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doMEMSTAT(String argument, ProtocolContext context) {
-        context.writeLoggedFlushedResponse("Current memory statistics:");
-        context.writeLoggedFlushedResponse("\tFree Memory: " + Runtime.getRuntime().freeMemory());
-        context.writeLoggedFlushedResponse("\tTotal Memory: " + Runtime.getRuntime().totalMemory());
-        context.writeLoggedFlushedResponse("\tMax Memory: " + Runtime.getRuntime().maxMemory());
-
-        if ("-gc".equalsIgnoreCase(argument)) {
-            System.gc();
-            context.writeLoggedFlushedResponse("And after System.gc():");
-            context.writeLoggedFlushedResponse("\tFree Memory: " + Runtime.getRuntime().freeMemory());
-            context.writeLoggedFlushedResponse("\tTotal Memory: " + Runtime.getRuntime().totalMemory());
-            context.writeLoggedFlushedResponse("\tMax Memory: " + Runtime.getRuntime().maxMemory());
-        }
-
-        return true;
-    }
-    
-    /**
-     * Handler method called upon receipt of an ADDUSER command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doADDUSER(String argument, ProtocolContext context) {
-        int breakIndex = -1;
-        if ((argument == null) ||
-            (argument.equals("")) ||
-            ((breakIndex = argument.indexOf(" ")) < 0)) {
-            context.writeLoggedFlushedResponse("Usage: adduser [username] [password]");
-            return true;
-        }
-        String username = argument.substring(0,breakIndex);
-        String passwd = argument.substring(breakIndex + 1);
-        if (username.equals("") || passwd.equals("")) {
-            context.writeLoggedFlushedResponse("Usage: adduser [username] [password]");
-            return true;
-        }
-
-        boolean success = false;
-        if (users.contains(username)) {
-            StringBuilder responseBuffer =
-                new StringBuilder(64)
-                        .append("User ")
-                        .append(username)
-                        .append(" already exists");
-            String response = responseBuffer.toString();
-            context.writeLoggedResponse(response);
-        } else {
-            if((username.indexOf("@") < 0) == false) {
-                if(theConfigData.getMailServer().supportVirtualHosting() == false) {
-                    context.getOutputWriter().println("Virtualhosting not supported");
-                    context.getOutputWriter().flush();
-                    return true;
-                }
-                String domain = username.split("@")[1];
-                if (theConfigData.getDomainListManagement().containsDomain(domain) == false) {
-                    context.getOutputWriter().println("Domain not exists: " + domain);
-                    context.getOutputWriter().flush();
-                    return true;
-                }
-            }
-            success = users.addUser(username, passwd);
-        }
-        if ( success ) {
-            StringBuilder responseBuffer =
-                new StringBuilder(64)
-                        .append("User ")
-                        .append(username)
-                        .append(" added");
-            String response = responseBuffer.toString();
-            context.getOutputWriter().println(response);
-            context.getLogger().info(response);
-        } else {
-            context.getOutputWriter().println("Error adding user " + username);
-            context.getLogger().error("Error adding user " + username);
-        }
-        context.getOutputWriter().flush();
-        return true;
-    }
-
-    /**
-     * Handler method called upon receipt of an SETPASSWORD command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doSETPASSWORD(String argument, ProtocolContext context) {
-
-        int breakIndex = -1;
-        if ((argument == null) ||
-            (argument.equals("")) ||
-            ((breakIndex = argument.indexOf(" ")) < 0)) {
-            context.writeLoggedFlushedResponse("Usage: setpassword [username] [password]");
-            return true;
-        }
-        String username = argument.substring(0,breakIndex);
-        String passwd = argument.substring(breakIndex + 1);
-
-        if (username.equals("") || passwd.equals("")) {
-            context.writeLoggedFlushedResponse("Usage: adduser [username] [password]");
-            return true;
-        }
-        User user = users.getUserByName(username);
-        if (user == null) {
-            context.writeLoggedFlushedResponse("No such user " + username);
-            return true;
-        }
-        boolean success = user.setPassword(passwd);
-        if (success) {
-            users.updateUser(user);
-            StringBuilder responseBuffer =
-                new StringBuilder(64)
-                        .append("Password for ")
-                        .append(username)
-                        .append(" reset");
-            String response = responseBuffer.toString();
-            context.getOutputWriter().println(response);
-            context.getLogger().info(response);
-        } else {
-            context.getOutputWriter().println("Error resetting password");
-            context.getLogger().error("Error resetting password");
-        }
-        context.getOutputWriter().flush();
-        return true;
-    }
-
-    /**
-     * Handler method called upon receipt of an DELUSER command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doDELUSER(String argument, ProtocolContext context) {
-        String user = argument;
-        if ((user == null) || (user.equals(""))) {
-            context.writeLoggedFlushedResponse("Usage: deluser [username]");
-            return true;
-        }
-        if (users.contains(user)) {
-            try {
-                users.removeUser(user);
-                StringBuilder responseBuffer =
-                                             new StringBuilder(64)
-                                             .append("User ")
-                                             .append(user)
-                                             .append(" deleted");
-                String response = responseBuffer.toString();
-                context.getOutputWriter().println(response);
-                context.getLogger().info(response);
-            } catch (Exception e) {
-                StringBuilder exceptionBuffer =
-                                              new StringBuilder(128)
-                                              .append("Error deleting user ")
-                                              .append(user)
-                                              .append(" : ")
-                                              .append(e.getMessage());
-                String exception = exceptionBuffer.toString();
-                context.getOutputWriter().println(exception);
-                context.getLogger().error(exception);
-            }
-        } else {
-            StringBuilder responseBuffer =
-                                         new StringBuilder(64)
-                                         .append("User ")
-                                         .append(user)
-                                         .append(" doesn't exist");
-            String response = responseBuffer.toString();
-            context.getOutputWriter().println(response);
-        }
-        context.getOutputWriter().flush();
-        return true;
-    }
-
-    /**
-     * Handler method called upon receipt of an LISTUSERS command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doLISTUSERS(String argument, ProtocolContext context) {
-        if (argument == null) {
-            context.writeLoggedResponse("Existing accounts " + users.countUsers());
-            for (Iterator it = users.list(); it.hasNext();) {
-               context.writeLoggedResponse("user: " + (String) it.next());
-            }
-            context.getOutputWriter().flush();
-            return true;
-        } else {
-            if(theConfigData.getMailServer().supportVirtualHosting() == false) {
-                context.getOutputWriter().println("Virtualhosting not supported");
-                context.getOutputWriter().flush();
-                return true;
-            }
-        
-            ArrayList userList = getDomainUserList(argument);
-            context.writeLoggedResponse("Existing accounts from domain " + argument + " " + userList.size());
-            for (int i = 0; i <userList.size(); i++) {
-                context.writeLoggedResponse("user: " + userList.get(i));
-            }
-            context.getOutputWriter().flush();
-            return true;
-        }
-    }
-
-    /**
-     * Handler method called upon receipt of an COUNTUSERS command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doCOUNTUSERS(String argument, ProtocolContext context) {
-        if (argument == null) {
-            context.writeLoggedFlushedResponse("Existing accounts " + users.countUsers());
-            return true;
-        } else {
-            if(theConfigData.getMailServer().supportVirtualHosting() == false) {
-                context.getOutputWriter().println("Virtualhosting not supported");
-                context.getOutputWriter().flush();
-                return true;
-           }
-            
-           context.writeLoggedFlushedResponse("Existing accounts for domain " + argument + " " + getDomainUserList(argument).size());
-           return true;
-        }
+        // empty any previous line handler and add self (command dispatcher)
+        // as the default.
+        lineHandlers = handlerChain.getHandlers(LineHandler.class);
     }
 
-    /**
-     * Handler method called upon receipt of an VERIFY command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doVERIFY(String argument, ProtocolContext context) {
-        String user = argument;
-        if (user == null || user.equals("")) {
-            context.writeLoggedFlushedResponse("Usage: verify [username]");
-            return true;
-        }
-        if (users.contains(user)) {
-            StringBuilder responseBuffer =
-                new StringBuilder(64)
-                        .append("User ")
-                        .append(user)
-                        .append(" exists");
-            String response = responseBuffer.toString();
-            context.writeLoggedResponse(response);
-        } else {
-            StringBuilder responseBuffer =
-                new StringBuilder(64)
-                        .append("User ")
-                        .append(user)
-                        .append(" does not exist");
-            String response = responseBuffer.toString();
-            context.writeLoggedResponse(response);
-        }
-        context.getOutputWriter().flush();
-        return true;
-    }
+  
 
     /**
-     * Handler method called upon receipt of a HELP command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
+     * (non-Javadoc)
+     * @see org.apache.james.remotemanager.RemoteManagerSession#getLogger()
      */
-    @SuppressWarnings("unused")
-    private boolean doHELP(String argument, ProtocolContext context) {
-        context.getOutputWriter().println("Currently implemented commands:");
-        context.getOutputWriter().println("help                                                                    display this help");
-        context.getOutputWriter().println("listusers                                                               display existing accounts");
-        context.getOutputWriter().println("countusers                                                              display the number of existing accounts");
-        context.getOutputWriter().println("adduser [username] [password]                                           add a new user");
-        context.getOutputWriter().println("verify [username]                                                       verify if specified user exist");
-        context.getOutputWriter().println("deluser [username]                                                      delete existing user");
-        context.getOutputWriter().println("setpassword [username] [password]                                       sets a user's password");
-        context.getOutputWriter().println("setalias [user] [alias]                                                 locally forwards all email for 'user' to 'alias'");
-        context.getOutputWriter().println("showalias [username]                                                    shows a user's current email alias");
-        context.getOutputWriter().println("unsetalias [user]                                                       unsets an alias for 'user'");
-        context.getOutputWriter().println("setforwarding [username] [emailaddress]                                 forwards a user's email to another email address");
-        context.getOutputWriter().println("showforwarding [username]                                               shows a user's current email forwarding");
-        context.getOutputWriter().println("unsetforwarding [username]                                              removes a forward");
-        context.getOutputWriter().println("user [repositoryname]                                                   change to another user repository");
-        context.getOutputWriter().println("addmapping ([table=virtualusertablename]) [user@domain] [mapping]       add mapping for the given emailaddress");
-        context.getOutputWriter().println("removemapping ([table=virtualusertablename]) [user@domain] [mapping]    remove mapping for the given emailaddress");
-        context.getOutputWriter().println("listmapping ([table=virtualusertablename]) [user@domain]                list all mappings for the given emailaddress");
-        context.getOutputWriter().println("listallmappings ([table=virtualusertablename])                          list all mappings");
-        context.getOutputWriter().println("adddomain [domainname]                                                  add domain to local domains");
-        context.getOutputWriter().println("removedomain [domainname]                                               remove domain from local domains");
-        context.getOutputWriter().println("listdomains                                                             list local domains");
-        context.getOutputWriter().println("listspool [spoolrepositoryname] ([header=name] [regex=value])           list all mails which reside in the spool and have an error state");
-        context.getOutputWriter().println("flushspool [spoolrepositoryname] ([key] | [header=name] [regex=value])  try to resend the mail assing to the given key. If no key is given all mails get resend");
-        context.getOutputWriter().println("deletespool [spoolrepositoryname] ([key] | [header=name] [regex=value]) delete the mail assigned to the given key. If no key is given all mails get deleted");
-        context.getOutputWriter().println("movemails [srcSpoolrepositoryname] [dstSpoolrepositoryname] ([header=headername] [regex=regexValue])");
-        context.getOutputWriter().println("    [srcstate=sourcestate] [dststate=destinationstate]                  move mails from the source repository to the destination repository.");
-        context.getOutputWriter().println("listprocessors [processorname]                                          list names of all processors");
-        context.getOutputWriter().println("listmailets [processorname]                                             list names of all mailets for specified processor");
-        context.getOutputWriter().println("listmatchers [processorname]                                            list names of all mailets for specified processor");
-        context.getOutputWriter().println("showmailetinfo [processorname] [#index]                                 shows configuration for mailet of specified processor at given index");
-        context.getOutputWriter().println("showmatcherinfo [processorname] [#index]                                shows configuration for matcher of specified processor at given index");
-        context.getOutputWriter().println("addham dir/mbox [directory/mbox]                                        feed the BayesianAnalysisFeeder with the content of the directory or mbox file as HAM");
-        context.getOutputWriter().println("addspam dir/mbox [directory/mbox]                                       feed the BayesianAnalysisFeeder with the content of the directory or mbox file as SPAM");
-        context.getOutputWriter().println("exportbayesiandata [file]                                               export the BayesianAnalysis data to a xml file");
-        context.getOutputWriter().println("resetbayesiandata                                                       reset trained BayesianAnalysis data");
-        context.getOutputWriter().println("memstat ([-gc])                                                         shows memory usage. When called with -gc the garbage collector get called");
-        context.getOutputWriter().println("shutdown                                                                kills the current JVM (convenient when James is run as a daemon)");
-        context.getOutputWriter().println("quit                                                                    close connection");
-        context.getOutputWriter().flush();
-        return true;
-
+    public Log getLogger() {
+        return context.getLogger();
     }
 
     /**
-     * Handler method called upon receipt of an SETALIAS command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
+     * (non-Javadoc)
+     * @see org.apache.james.remotemanager.RemoteManagerSession#getState()
      */
-    @SuppressWarnings("unused")
-    private boolean doSETALIAS(String argument, ProtocolContext context) {
-        int breakIndex = -1;
-        if ((argument == null) ||
-            (argument.equals("")) ||
-            ((breakIndex = argument.indexOf(" ")) < 0)) {
-            context.writeLoggedFlushedResponse("Usage: setalias [username] [emailaddress]");
-            return true;
-        }
-        String username = argument.substring(0,breakIndex);
-        String alias = argument.substring(breakIndex + 1);
-        if (username.equals("") || alias.equals("")) {
-            context.writeLoggedFlushedResponse("Usage: setalias [username] [alias]");
-            return true;
-        }
-
-        User baseuser = users.getUserByName(username);
-        if (baseuser == null) {
-            context.writeLoggedFlushedResponse("No such user " + username);
-            return true;
-        }
-        if (! (baseuser instanceof JamesUser ) ) {
-            context.writeLoggedFlushedResponse("Can't set alias for this user type.");
-            return true;
-        }
-
-        JamesUser user = (JamesUser) baseuser;
-        JamesUser aliasUser = (JamesUser) users.getUserByName(alias);
-        if (aliasUser == null) {
-            context.writeLoggedFlushedResponse("Alias unknown to server - create that user first.");
-            return true;
-        }
-
-        boolean success = user.setAlias(alias);
-        if (success) {
-            user.setAliasing(true);
-            users.updateUser(user);
-            StringBuilder responseBuffer =
-                new StringBuilder(64)
-                        .append("Alias for ")
-                        .append(username)
-                        .append(" set to:")
-                        .append(alias);
-            String response = responseBuffer.toString();
-            context.getOutputWriter().println(response);
-            context.getLogger().info(response);
-        } else {
-            context.getOutputWriter().println("Error setting alias");
-            context.getLogger().error("Error setting alias");
-        }
-        context.getOutputWriter().flush();
-        return true;
+    public Map<Object, Object> getState() {
+        return stateMap;
     }
 
     /**
-     * Handler method called upon receipt of an SETFORWARDING command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
+     * (non-Javadoc)
+     * @see org.apache.james.remotemanager.RemoteManagerSession#getWatchdog()
      */
-    @SuppressWarnings("unused")
-    private boolean doSETFORWARDING(String argument, ProtocolContext context) {
-        int breakIndex = -1;
-        if ((argument == null) ||
-            (argument.equals("")) ||
-            ((breakIndex = argument.indexOf(" ")) < 0)) {
-            context.writeLoggedFlushedResponse("Usage: setforwarding [username] [emailaddress]");
-            return true;
-        }
-        String username = argument.substring(0,breakIndex);
-        String forward = argument.substring(breakIndex + 1);
-        if (username.equals("") || forward.equals("")) {
-           context.writeLoggedFlushedResponse("Usage: setforwarding [username] [emailaddress]");
-           return true;
-        }
-        // Verify user exists
-        User baseuser = users.getUserByName(username);
-        if (baseuser == null) {
-            context.writeLoggedFlushedResponse("No such user " + username);
-            return true;
-        } else if (! (baseuser instanceof JamesUser ) ) {
-            context.writeLoggedFlushedResponse("Can't set forwarding for this user type.");
-            return true;
-        }
-        JamesUser user = (JamesUser)baseuser;
-        // Verify acceptable email address
-        MailAddress forwardAddr;
-        try {
-             forwardAddr = new MailAddress(forward);
-        } catch(ParseException pe) {
-            context.writeLoggedResponse("Parse exception with that email address: " + pe.getMessage());
-            context.writeLoggedFlushedResponse("Forwarding address not added for " + username);
-            return true;
-        }
-
-        boolean success = user.setForwardingDestination(forwardAddr);
-        if (success) {
-            user.setForwarding(true);
-            users.updateUser(user);
-            StringBuilder responseBuffer =
-                new StringBuilder(64)
-                        .append("Forwarding destination for ")
-                        .append(username)
-                        .append(" set to:")
-                        .append(forwardAddr.toString());
-            String response = responseBuffer.toString();
-            context.getOutputWriter().println(response);
-            context.getLogger().info(response);
-        } else {
-            context.getOutputWriter().println("Error setting forwarding");
-            context.getLogger().error("Error setting forwarding");
-        }
-        context.getOutputWriter().flush();
-        return true;
-    }
-
-    /**
-     * Handler method called upon receipt of an SHOWALIAS command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param username the user name
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doSHOWALIAS(String username, ProtocolContext context) {
-        if ( username == null || username.equals("") ) {
-            context.writeLoggedFlushedResponse("Usage: showalias [username]");
-            return true;
-        }
-
-
-        User baseuser = users.getUserByName(username);
-        if (baseuser == null) {
-            context.writeLoggedFlushedResponse("No such user " + username);
-            return true;
-        } else if (! (baseuser instanceof JamesUser ) ) {
-            context.writeLoggedFlushedResponse("Can't show aliases for this user type.");
-            return true;
-        }
-
-        JamesUser user = (JamesUser)baseuser;
-        if ( user == null ) {
-            context.writeLoggedFlushedResponse("No such user " + username);
-            return true;
-        }
-
-        if ( !user.getAliasing() ) {
-            context.writeLoggedFlushedResponse("User " + username + " does not currently have an alias");
-            return true;
-        }
-
-        String alias = user.getAlias();
-
-        if ( alias == null || alias.equals("") ) {    //  defensive programming -- neither should occur
-            String errmsg = "For user " + username + ", the system indicates that aliasing is set but no alias was found";
-            context.getOutputWriter().println(errmsg);
-            context.getLogger().error(errmsg);
-            return true;
-        }
-
-        context.writeLoggedFlushedResponse("Current alias for " + username + " is: " + alias);
-        return true;
+    public Watchdog getWatchdog() {
+        return context.getWatchdog();
     }
 
     /**
-     * Handler method called upon receipt of an SHOWFORWARDING command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param username the user name
-     * @param context not null
+     * @see org.apache.james.remotemanager.RemoteManagerSession#writeRemoteManagerResponse(org.apache.james.remotemanager.RemoteManagerResponse)
      */
-    @SuppressWarnings("unused")
-    private boolean doSHOWFORWARDING(String username, ProtocolContext context) {
-        if ( username == null || username.equals("") ) {
-            context.writeLoggedFlushedResponse("Usage: showforwarding [username]");
-            return true;
-        }
-
-        // Verify user exists
-        User baseuser = users.getUserByName(username);
-        if (baseuser == null) {
-            context.writeLoggedFlushedResponse("No such user " + username);
-            return true;
-        } else if (! (baseuser instanceof JamesUser ) ) {
-            context.writeLoggedFlushedResponse("Can't set forwarding for this user type.");
-            return true;
-        }
-        JamesUser user = (JamesUser)baseuser;
-        if ( user == null ) {
-            context.writeLoggedFlushedResponse("No such user " + username);
-            return true;
-        }
-
-        if ( !user.getForwarding() ) {
-            context.writeLoggedFlushedResponse("User " + username + " is not currently being forwarded");
-            return true;
-        }
-
-        MailAddress fwdAddr = user.getForwardingDestination();
-
-        if ( fwdAddr == null ) {    //  defensive programming -- should not occur
-            String errmsg = "For user " + username + ", the system indicates that forwarding is set but no forwarding destination was found";
-            context.getOutputWriter().println(errmsg);
-            context.getLogger().error(errmsg);
-            return true;
-        }
-
-        context.writeLoggedFlushedResponse("Current forwarding destination for " + username + " is: " + fwdAddr);
-        return true;
-    }
-
-    /**
-     * Handler method called upon receipt of an UNSETALIAS command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doUNSETALIAS(String argument, ProtocolContext context) {
-        if ((argument == null) || (argument.equals(""))) {
-            context.writeLoggedFlushedResponse("Usage: unsetalias [username]");
-            return true;
-        }
-        String username = argument;
-        JamesUser user = (JamesUser) users.getUserByName(username);
-        if (user == null) {
-            context.writeLoggedResponse("No such user " + username);
-        } else if (user.getAliasing()){
-            user.setAliasing(false);
-            users.updateUser(user);
-            StringBuilder responseBuffer =
-                new StringBuilder(64)
-                        .append("Alias for ")
-                        .append(username)
-                        .append(" unset");
-            String response = responseBuffer.toString();
-            context.getOutputWriter().println(response);
-            context.getLogger().info(response);
-        } else {
-            context.writeLoggedResponse("Aliasing not active for" + username);
-        }
-        context.getOutputWriter().flush();
-        return true;
-    }
-
-    /**
-     * Handler method called upon receipt of an UNSETFORWARDING command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doUNSETFORWARDING(String argument, ProtocolContext context) {
-        if ((argument == null) || (argument.equals(""))) {
-            context.writeLoggedFlushedResponse("Usage: unsetforwarding [username]");
-            return true;
-        }
-        String username = argument;
-        JamesUser user = (JamesUser) users.getUserByName(username);
-        if (user == null) {
-            context.writeLoggedFlushedResponse("No such user " + username);
-        } else if (user.getForwarding()){
-            user.setForwarding(false);
-            users.updateUser(user);
-            StringBuilder responseBuffer =
-                new StringBuilder(64)
-                        .append("Forward for ")
-                        .append(username)
-                        .append(" unset");
-            String response = responseBuffer.toString();
-            context.getOutputWriter().println(response);
-            context.getOutputWriter().flush();
-            context.getLogger().info(response);
-        } else {
-            context.writeLoggedFlushedResponse("Forwarding not active for" + username);
-        }
-        return true;
-    }
-
-    /**
-     * Handler method called upon receipt of a USER command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doUSER(String argument, ProtocolContext context) {
-        if (argument == null || argument.equals("")) {
-            context.writeLoggedFlushedResponse("Usage: user [repositoryName]");
-            return true;
-        }
-        String repositoryName = argument.toLowerCase(Locale.US);
-        UsersRepository repos = theConfigData.getUserStore().getRepository(repositoryName);
-        if ( repos == null ) {
-            context.writeLoggedFlushedResponse("No such repository: " + repositoryName);
-        } else {
-            users = repos;
-            StringBuilder responseBuffer =
-                new StringBuilder(64)
-                        .append("Changed to repository '")
-                        .append(repositoryName)
-                        .append("'.");
-            context.writeLoggedFlushedResponse(responseBuffer.toString());
-        }
-        return true;
-    }
-
-    /**
-     * Handler method called upon receipt of a LISTSPOOL command. Returns
-     * whether further commands should be read off the wire.
-     * 
-     * @param argument
-     *            the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doLISTSPOOL(String argument, ProtocolContext context) {
-
-        int count = 0;
-        String[] args = null;
-        String headername = null;
-        String regex = null;
-        
-        if (argument != null) args = argument.split(" ");
-
-        // check if the command was called correct
-        if ((argument == null) || (argument.trim().equals("")) || args.length < 1 || args.length > 3 || (args.length > 1 && !args[1].startsWith(HEADER_IDENTIFIER)) || (args.length > 2 && !args[2].startsWith(REGEX_IDENTIFIER))) {
-            context.writeLoggedFlushedResponse("Usage: LISTSPOOL [spoolrepositoryname] ([header=headername] [regex=regexValue])");
-            return true;
-        }
-
-        String url = args[0];
-        
-        if (args.length > 1) { 
-            headername = args[1].substring(HEADER_IDENTIFIER.length());
-            regex = args[2].substring(REGEX_IDENTIFIER.length());
-        }
-        
-        try {
-            List spoolItems;
-            
-            if (headername == null || regex == null) {
-                spoolItems = theConfigData.getSpoolManagement().getSpoolItems(url, SpoolFilter.ERRORMAIL_FILTER);
-            } else {
-                spoolItems = theConfigData.getSpoolManagement().getSpoolItems(url, new SpoolFilter(SpoolFilter.ERROR_STATE,headername,regex));
-            }
+    public void writeRemoteManagerResponse(RemoteManagerResponse response) {
+        // Write a single-line or multiline response
+        if (response != null) {
+            if (response.getRawLine() != null) {
+                context.writeLoggedFlushedResponse(response.getRawLine());
+            } 
             
-            count = spoolItems.size();
-            if (count > 0) context.getOutputWriter().println("Messages in spool:");
-            for (Iterator iterator = spoolItems.iterator(); iterator.hasNext();) {
-                String item = (String) iterator.next();
-                context.getOutputWriter().println(item);
-                context.getOutputWriter().flush();
-            }
-            context.getOutputWriter().println("Number of spooled mails: " + count);
-            context.getOutputWriter().flush();
-        } catch (Exception e) {
-            context.getOutputWriter().println("Error opening the spoolrepository " + e.getMessage());
-            context.getOutputWriter().flush();
-            context.getLogger().error(
-                    "Error opening the spoolrepository " + e.getMessage());
-        }
-        return true;
-    }
-
-    /**
-     * Handler method called upon receipt of a LISTSPOOL command.
-     * Returns whether further commands should be read off the wire.
-     *
-     * @param argument the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doFLUSHSPOOL(String argument, ProtocolContext context) {
-        int count = 0;
-        String[] args = null;
-
-        if (argument != null)
-            args = argument.split(" ");
-
-        // check if the command was called correct
-        if ((argument == null || argument.trim().equals(""))
-                || (args.length < 1 || args.length > 3 || (!args[1].startsWith(KEY_IDENTIFIER) && (args.length > 1  
-                && !args[1].startsWith(HEADER_IDENTIFIER))) || (args.length == 3 && !args[2].startsWith(REGEX_IDENTIFIER)))) {
-            context.writeLoggedFlushedResponse("Usage: FLUSHSPOOL [spoolrepositoryname] ([key=mKey] | [header=headername] [regex=regexValue] )");
-            return true;
-        }
-
-        String url = args[0];
-        String key = null;
-        String header = null;
-        String regex = null;
-        
-        if (args[1].startsWith(KEY_IDENTIFIER)) {
-            key = args[1].substring(KEY_IDENTIFIER.length()); 
-        } else {
-            header = args[1].substring(HEADER_IDENTIFIER.length());
-            regex = args[2].substring(REGEX_IDENTIFIER.length()); 
-        }
-        
-        try {
-            if (key != null) {
-                count = theConfigData.getSpoolManagement().resendSpoolItems(url, key, null, SpoolFilter.ERRORMAIL_FILTER);
-            } else {
-                count = theConfigData.getSpoolManagement().resendSpoolItems(url, key, null, new SpoolFilter(SpoolFilter.ERROR_STATE,header,regex));
-            }
-            context.getOutputWriter().println("Number of flushed mails: " + count);
-            context.getOutputWriter().flush();
-
-        } catch (Exception e) {
-            context.getOutputWriter()
-                    .println("Error accessing the spoolrepository "
-                            + e.getMessage());
-            context.getOutputWriter().flush();
-            context.getLogger().error(
-                    "Error accessing the spoolrepository " + e.getMessage());
-        }
-        return true;
-    }
-
-    /**
-     * Handler method called upon receipt of a DELETESPOOL command. Returns
-     * whether further commands should be read off the wire.
-     * 
-     * @param argument
-     *            the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doDELETESPOOL(String argument, ProtocolContext context) {
-        String[] args = null;
-
-        if (argument != null)
-            args = argument.split(" ");
-
-        // check if the command was called correct
-        if ((argument == null || argument.trim().equals(""))
-                || (args.length < 1 || args.length > 3 || (args.length > 1 && (!args[1].startsWith(KEY_IDENTIFIER) 
-                && !args[1].startsWith(HEADER_IDENTIFIER))) || (args.length == 3 && !args[2].startsWith(REGEX_IDENTIFIER)))) {
-            context.writeLoggedFlushedResponse("Usage: DELETESPOOL [spoolrepositoryname] ([key=mKey] | [header=headername] [regex=regexValue])");
-            return true;
-        }
-
-        String url = args[0];
-        String key = null;
-        String header = null;
-        String regex = null;
-
-        if (args[1].startsWith(KEY_IDENTIFIER)) {
-            key = args[1].substring(KEY_IDENTIFIER.length()); 
-        } else {
-            header = args[1].substring(HEADER_IDENTIFIER.length());
-            regex = args[2].substring(REGEX_IDENTIFIER.length()); 
-        }
-
-        try {
-            ArrayList lockingFailures = new ArrayList();
-            int count = 0;
-            
-            if (key != null) {
-                count = theConfigData.getSpoolManagement().removeSpoolItems(url, key, lockingFailures, SpoolFilter.ERRORMAIL_FILTER);
-            } else {
-                count = theConfigData.getSpoolManagement().removeSpoolItems(url, key, lockingFailures, new SpoolFilter(SpoolFilter.ERROR_STATE,header,regex));
-            }
-            
-            for (Iterator iterator = lockingFailures.iterator(); iterator.hasNext();) {
-                String lockFailureKey = (String) iterator.next();
-                context.getOutputWriter().println("Error locking the mail with key:  " + lockFailureKey);
-            }
-            context.getOutputWriter().flush();
-
-            context.getOutputWriter().println("Number of deleted mails: " + count);
-            context.getOutputWriter().flush();
-
-        } catch (Exception e) {
-            context.getOutputWriter().println("Error opening the spoolrepository " + e.getMessage());
-            context.getOutputWriter().flush();
-            context.getLogger().error("Error opeing the spoolrepository " + e.getMessage());
-        }
-        return true;
-    }
-
-
-    /**
-     * Handler method called upon receipt of a MOVEMAILS command. Returns
-     * whether further commands should be read off the wire.
-     * 
-     * @param argument
-     *            the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doMOVEMAILS(String argument, ProtocolContext context) {
-        String[] args = null;
-
-        if (argument != null)
-            args = argument.split(" ");
-
-        // check if the command was called correct
-        if ((argument == null || argument.trim().equals(""))
-                || (args.length < 2 || args.length > 6)) {
-            context.writeLoggedFlushedResponse("Usage: MOVEMAILS [srcSpoolrepositoryname] [dstSpoolrepositoryname] ([header=headername] [regex=regexValue]) [srcstate=sourcestate] [dststate=destinationstate]");
-            return true;
-        }
-
-        String srcUrl = args[0];
-        String dstUrl = args[1];
-        
-        String dstState = null;
-        String srcState = null;
-        String header = null;
-        String regex = null;
-
-        for (int i = 2; i < args.length; i++) {
-            if (args[i].startsWith(HEADER_IDENTIFIER)) {
-                header = args[i].substring(HEADER_IDENTIFIER.length());
-            } else if (args[i].startsWith(REGEX_IDENTIFIER)) {
-                header = args[i].substring(REGEX_IDENTIFIER.length());
-            } else if (args[i].startsWith("srcstate=")) {
-                header = args[i].substring("srcstate=".length());
-            } else if (args[i].startsWith("dststate=")) {
-                header = args[i].substring("dststate=".length());
-            } else {
-                context.writeLoggedResponse("Unexpected parameter "+args[i]);
-                context.writeLoggedFlushedResponse("Usage: MOVEMAILS [srcSpoolrepositoryname] [dstSpoolrepositoryname] ([header=headername] [regex=regexValue]) [srcstate=sourcestate] [dststate=destinationstate]");
-                return true;
-            }
-        }
-        
-        if ((header != null && regex == null) || (header == null && regex != null)) {
-            if (regex == null) {
-                context.writeLoggedResponse("Bad parameters: used header without regex");
-            } else {
-                context.writeLoggedResponse("Bad parameters: used regex without header");
-            }
-            context.writeLoggedFlushedResponse("Usage: MOVEMAILS [srcSpoolrepositoryname] [dstSpoolrepositoryname] ([header=headername] [regex=regexValue]) [srcstate=sourcestate] [dststate=destinationstate]");
-            return true;
-        }
-
-        try {
-            int count = theConfigData.getSpoolManagement().moveSpoolItems(srcUrl, dstUrl, dstState, new SpoolFilter(srcState,header,regex));
-            
-            context.getOutputWriter().println("Number of moved mails: " + count);
-            context.getOutputWriter().flush();
-
-        } catch (Exception e) {
-            context.getOutputWriter().println("Error opening the spoolrepository " + e.getMessage());
-            context.getOutputWriter().flush();
-            context.getLogger().error("Error opeing the spoolrepository " + e.getMessage());
-        }
-        return true;
-    }
-
-    /**
-     * Handler method called upon receipt of a QUIT command. Returns whether
-     * further commands should be read off the wire.
-     * 
-     * @param argument
-     *            the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doQUIT(String argument, ProtocolContext context) {
-        context.writeLoggedFlushedResponse("Bye");
-        return false;
-    }
-
-    /**
-     * Handler method called upon receipt of a SHUTDOWN command. Returns whether
-     * further commands should be read off the wire.
-     * 
-     * @param argument
-     *            the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doSHUTDOWN(String argument, ProtocolContext context) {
-        context.writeLoggedFlushedResponse("Shutting down, bye bye");
-        System.exit(0);
-        return false;
-    }
-
-    /**
-     * Handler method called upon receipt of an unrecognized command. Returns
-     * whether further commands should be read off the wire.
-     * 
-     * @param argument
-     *            the unknown command
-     * @param context not null
-     */
-    private boolean doUnknownCommand(String argument, ProtocolContext context) {
-        context.writeLoggedFlushedResponse("Unknown command " + argument);
-        return true;
-    }
-    
-    /**
-     * Handler method called upon receipt of a ADDHAM command. Returns
-     * whether further commands should be read off the wire.
-     * 
-     * @param argument
-     *            the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doADDHAM(String argument, ProtocolContext context) {
-        String [] args = null;
-        int count = 0;
-        
-        if (argument != null) {
-            args = argument.split(" "); 
-        }
-        
-        // check if the command was called correct
-        if (argument == null || argument.trim().equals("") || (args != null && args.length != 2)) {
-            context.writeLoggedFlushedResponse("Usage: ADDHAM DIR/MBOX [dir/mbox]");
-            return true;
-        }
-
-        try {
-            
-            // stop watchdog cause feeding can take some time
-            context.getWatchdog().stop();  
-            
-            if (args[0].equalsIgnoreCase("DIR")) {
-                count = theConfigData.getBayesianAnalyzerManagement().addHamFromDir(args[1]);
-            } else if (args[0].equalsIgnoreCase("MBOX")) {
-                count = theConfigData.getBayesianAnalyzerManagement().addHamFromMbox(args[1]);
-            } else {
-                context.writeLoggedFlushedResponse("Usage: ADDHAM DIR/MBOX [dir/mbox]");
-                return true;
-            }
-            context.getOutputWriter().println("Feed the BayesianAnalysis with " + count + " HAM");
-            context.getOutputWriter().flush();
-        
-        } catch (BayesianAnalyzerManagementException e) {
-            context.getLogger().error("Error on feeding BayesianAnalysis: " + e);
-            context.getOutputWriter().println("Error on feeding BayesianAnalysis: " + e);
-            context.getOutputWriter().flush();
-            return true;
-        } finally {
-            context.getWatchdog().start();
-        }
-    
-        return true;
-    }
-    
-    /**
-     * Handler method called upon receipt of a ADDSPAM command. Returns
-     * whether further commands should be read off the wire.
-     * 
-     * @param argument
-     *            the argument passed in with the command
-     * @param context not null
-     */
-    @SuppressWarnings("unused")
-    private boolean doADDSPAM(String argument, ProtocolContext context) {
-        String [] args = null;
-        int count = 0;
-        
-        if (argument != null) {
-            args = argument.split(" "); 
-        }
-        // check if the command was called correct
-        if (argument == null || argument.trim().equals("") || (args != null && args.length != 2)) {
-            context.writeLoggedFlushedResponse("Usage: ADDSPAM DIR/MBOX [dir/mbox]");
-            return true;
-        }
-
-        try {
-            
-            // stop watchdog cause feeding can take some time
-            context.getWatchdog().stop();
-            
-            if (args[0].equalsIgnoreCase("DIR")) {
-                count = theConfigData.getBayesianAnalyzerManagement().addSpamFromDir(args[1]);
-            } else if (args[0].equalsIgnoreCase("MBOX")) {
-                count = theConfigData.getBayesianAnalyzerManagement().addSpamFromMbox(args[1]);
-            } else {
-                context.writeLoggedFlushedResponse("Usage: ADDHAM DIR/MBOX [dir/mbox]");
-                return true;
-            }
-            context.getOutputWriter().println("Feed the BayesianAnalysis with " + count + " SPAM");
-            context.getOutputWriter().flush();
-            
-        } catch (BayesianAnalyzerManagementException e) {
-            context.getLogger().error("Error on feeding BayesianAnalysis: " + e);
-            context.getOutputWriter().println("Error on feeding BayesianAnalysis: " + e);
-            context.getOutputWriter().flush();
-            return true;
-        } finally {
-            context.getWatchdog().start();
-        }
-    
-        return true;
-    }
-    
-   
-    
-    @SuppressWarnings("unused")
-    private boolean doEXPORTBAYESIANDATA(String argument, ProtocolContext context) {
-        // check if the command was called correct
-        if (argument == null || argument.trim().equals("")) {
-            context.writeLoggedFlushedResponse("Usage: EXPORTBAYESIANALYZERDATA [dir]");
-            return true;
-        }
-
-        try {
-            
-            // stop watchdog cause feeding can take some time
-            context.getWatchdog().stop();
-            
-            theConfigData.getBayesianAnalyzerManagement().exportData(argument);
-            context.getOutputWriter().println("Exported the BayesianAnalysis data");
-            context.getOutputWriter().flush();
-
-        } catch (BayesianAnalyzerManagementException e) {
-            context.getLogger().error("Error on exporting BayesianAnalysis data: " + e);
-            context.getOutputWriter().println("Error on exporting BayesianAnalysis data: " + e);
-            context.getOutputWriter().flush();
-            return true;
-        } finally {
-            context.getWatchdog().start();
-        }
-    
-        // check if any exception was thrown
-        return true;
-    }
-    
-    @SuppressWarnings("unused")
-    private boolean doIMPORTBAYESIANDATA(String argument, ProtocolContext context) {
-        // check if the command was called correct
-        if (argument == null || argument.trim().equals("")) {
-            context.writeLoggedFlushedResponse("Usage: IMPORTBAYESIANALYZERDATA [dir]");
-            return true;
-        }
-
-        try {
-            
-            // stop watchdog cause feeding can take some time
-            context.getWatchdog().stop();
-            
-            theConfigData.getBayesianAnalyzerManagement().importData(argument);
-            context.getOutputWriter().println("Imported the BayesianAnalysis data");
-            context.getOutputWriter().flush();
-
-        } catch (BayesianAnalyzerManagementException e) {
-            context.getLogger().error("Error on importing BayesianAnalysis data: " + e);
-            context.getOutputWriter().println("Error on importing BayesianAnalysis data: " + e);
-            context.getOutputWriter().flush();
-            return true;
-        } finally {
-            context.getWatchdog().start();
-        }
-    
-        return true;
-    }
-    
-    @SuppressWarnings("unused")
-    private boolean doRESETBAYESIANDATA(String argument, ProtocolContext context) {
-
-        try {           
-            // stop watchdog cause feeding can take some time
-            context.getWatchdog().stop();
-            
-            theConfigData.getBayesianAnalyzerManagement().resetData();
-            context.getOutputWriter().println("Reseted the BayesianAnalysis data");
-            context.getOutputWriter().flush();
-
-        } catch (BayesianAnalyzerManagementException e) {
-            context.getLogger().error("Error on reseting BayesianAnalysis data: " + e);
-            context.getOutputWriter().println("Error on reseting BayesianAnalysis data: " + e);
-            context.getOutputWriter().flush();
-            return true;
-        } finally {
-            context.getWatchdog().start();
-        }
-    
-        return true;
-    }
-
-    @SuppressWarnings("unused")
-    private boolean doLISTPROCESSORS(String argument, ProtocolContext context) {
-        String[] processorNames = theConfigData.getProcessorManagement().getProcessorNames();
-        context.writeLoggedResponse("Existing processors: " + processorNames.length);
-        for (int i = 0; i < processorNames.length; i++) {
-            context.writeLoggedResponse("\t" + processorNames[i]);
-         }
-        return true;
-    }
-
-    private boolean processorExists(String name) {
-        name = name.toLowerCase(Locale.US);
-        List processorList = Arrays.asList(theConfigData.getProcessorManagement().getProcessorNames());
-        return processorList.contains(name);
-    }
-    
-    @SuppressWarnings("unused")
-    private boolean doLISTMAILETS(String argument, ProtocolContext context) {
-        ProcessorManagementService processorManagement = theConfigData.getProcessorManagement();
-        if (argument == null || !processorExists(argument)) {
-            context.writeLoggedFlushedResponse("Usage: LISTMAILETS [processor]");
-            context.writeLoggedFlushedResponse("The list of valid processor names can be retrieved using command LISTPROCESSORS");
-            return true;
-        }
-        String[] mailetNames = processorManagement.getMailetNames(argument);
-        context.writeLoggedResponse("Existing mailets in processor: " + mailetNames.length);
-        for (int i = 0; i < mailetNames.length; i++) {
-            context.writeLoggedResponse((i+1) + ". " + mailetNames[i]);
-         }
-        return true;
-    }
-
-    @SuppressWarnings("unused")
-    private boolean doLISTMATCHERS(String argument, ProtocolContext context) {
-        ProcessorManagementService processorManagement = theConfigData.getProcessorManagement();
-        if (argument == null || !processorExists(argument)) {
-            context.writeLoggedFlushedResponse("Usage: LISTMATCHERS [processor]");
-            context.writeLoggedFlushedResponse("The list of valid processor names can be retrieved using command LISTPROCESSORS");
-            return true;
-        }
-        String[] matcherNames = processorManagement.getMatcherNames(argument);
-        context.writeLoggedResponse("Existing matchers in processor: " + matcherNames.length);
-        for (int i = 0; i < matcherNames.length; i++) {
-            context.writeLoggedResponse((i+1) + ". " + matcherNames[i]);
-         }
-        return true;
-    }
-
-    private Object[] extractMailetInfoParameters(String argument, String commandHelp, ProtocolContext context) {
-        String[] argList = argument.split(" ");
-        boolean argListOK = argument != null && argList != null && argList.length == 2;
-        if (!argListOK) {
-            context.writeLoggedFlushedResponse("Usage: SHOW" + commandHelp + "INFO [processor] [#index]");
-            return null;
-        }
-        String processorName = argList[0];
-        if (!processorExists(processorName)) {
-            context.writeLoggedFlushedResponse("The list of valid processor names can be retrieved using command LISTPROCESSORS");
-            return null;
-        }
-        int index = -1;
-        try {
-            index = Integer.parseInt(argList[1]) - 1;
-        } catch (NumberFormatException e) {
-            // fall thru with -1
-        }
-        if (index < 0) {
-            context.writeLoggedFlushedResponse("The index parameter must be a positive number");
-            return null;
-        }
-        
-        return new Object[] {processorName, new Integer(index)};
-    }
-
-    @SuppressWarnings("unused")
-    private boolean doSHOWMAILETINFO(String argument, ProtocolContext context) {
-        ProcessorManagementService processorManagement = theConfigData.getProcessorManagement();
-        Object[] parameters = extractMailetInfoParameters(argument, "MAILET", context);
-        if (parameters == null) return true;
-        
-        // extract parsed parameters
-        String processorName = (String) parameters[0];
-        int index = ((Integer)parameters[1]).intValue();
-        
-        String[] mailetParameters = null; 
-        try {
-            mailetParameters = processorManagement.getMailetParameters(processorName, index);
-        } catch (RuntimeException e) {
-            // fall thru with NULL
-        }
-        if (mailetParameters == null) {
-            context.writeLoggedFlushedResponse("The index is not referring to an existing mailet");
-            return true;
-        }
-        context.writeLoggedResponse("Mailet parameters: " + mailetParameters.length);
-        for (int i = 0; i < mailetParameters.length; i++) {
-            String parameter = (String) mailetParameters[i];
-            context.writeLoggedResponse("\t" + parameter);
-         }
-        return true;
-    }
-
-    @SuppressWarnings("unused")
-    private boolean doSHOWMATCHERINFO(String argument, ProtocolContext context) {
-        ProcessorManagementService processorManagement = theConfigData.getProcessorManagement();
-        Object[] parameters = extractMailetInfoParameters(argument, "MATCHER", context);
-        if (parameters == null) return true;
-        
-        // extract parsed parameters
-        String processorName = (String) parameters[0];
-        int index = ((Integer)parameters[1]).intValue();
-        
-        String[] matcherParameters = null; 
-        try {
-            matcherParameters = processorManagement.getMatcherParameters(processorName, index);
-        } catch (RuntimeException e) {
-            // fall thru with NULL
-        }
-        if (matcherParameters == null) {
-            context.writeLoggedFlushedResponse("The index is not referring to an existing matcher");
-            return true;
-        }
-        context.writeLoggedResponse("Matcher parameters: " + matcherParameters.length);
-        for (int i = 0; i < matcherParameters.length; i++) {
-            String parameter = (String) matcherParameters[i];
-            context.writeLoggedResponse("\t" + parameter);
-         }
-        return true;
-    }
-    
-    @SuppressWarnings("unused")
-    private boolean doADDMAPPING(String argument, ProtocolContext context) {
-        String[] args = null;
-        
-        if (argument != null)
-            args = argument.split(" ");
-
-        // check if the command was called correct
-        if (argument == null || argument.trim().equals("") || args.length < 2 || args.length > 3) {
-            context.writeLoggedFlushedResponse("Usage: ADDMAPPING [table=table] user@domain mapping");
-            return true;
-        }
-        try {
-            context.getOutputWriter().println("Adding mapping successful: " + mappingAction(args,ADD_MAPPING_ACTION));
-            context.getOutputWriter().flush();
-        } catch (VirtualUserTableManagementException e) {
-            context.getLogger().error("Error on adding mapping: " + e);
-            context.getOutputWriter().println("Error on adding mapping: " + e);
-            context.getOutputWriter().flush();
-        } catch (IllegalArgumentException e) {
-            context.getLogger().error("Error on adding mapping: " + e);
-            context.getOutputWriter().println("Error on adding mapping: " + e);
-            context.getOutputWriter().flush();
-        }
-        return true;
-    }
-    
-    private boolean doREMOVEMAPPING(String argument, ProtocolContext context) {
-        String[] args = null;
-        
-        if (argument != null)
-            args = argument.split(" ");
-
-        // check if the command was called correct
-        if (argument == null || argument.trim().equals("") || args.length < 2 || args.length > 3) {
-            context.writeLoggedFlushedResponse("Usage: REMOVEMAPPING [table=table] user@domain mapping");
-            return true;
-        }
-        try {
-            context.getOutputWriter().println("Removing mapping successful: " + mappingAction(args,REMOVE_MAPPING_ACTION));
-            context.getOutputWriter().flush();
-        } catch (VirtualUserTableManagementException e) {
-            context.getLogger().error("Error on  removing mapping: " + e);
-            context.getOutputWriter().println("Error on removing mapping: " + e);
-            context.getOutputWriter().flush();
-        } catch (IllegalArgumentException e) {
-            context.getLogger().error("Error on removing mapping: " + e);
-            context.getOutputWriter().println("Error on removing mapping: " + e);
-            context.getOutputWriter().flush();
-        }
-        return true;
-    }
-
-    @SuppressWarnings("unused")
-    private boolean doLISTMAPPING(String argument, ProtocolContext context) {
-        String[] args = null;
-        String table = null;
-        String user = null;
-        String domain = null;
-
-        if (argument != null)
-            args = argument.split(" ");
-
-        // check if the command was called correct
-        if (argument == null || argument.trim().equals("") || args.length < 1 || args.length > 2) {
-            context.writeLoggedFlushedResponse("Usage: LISTMAPPING [table=table] user@domain");
-            return true;
-        }
-
-        if (args[0].startsWith("table=")) {
-            table = args[0].substring("table=".length());
-            if (args[1].indexOf("@") > 0) {
-                user = getMappingValue(args[1].split("@")[0]);
-                domain = getMappingValue(args[1].split("@")[1]);
-            } else {
-            context.writeLoggedFlushedResponse("Usage: LISTMAPPING [table=table] user@domain");
-                return true;
-            }
-        } else {
-            if (args[0].indexOf("@") > 0) {
-                user = getMappingValue(args[0].split("@")[0]);
-                domain = getMappingValue(args[0].split("@")[1]);
-            } else {
-            context.writeLoggedFlushedResponse("Usage: LISTMAPPING [table=table] user@domain");
-                return true;
-            }
-        }
-        
-        try {
-            Collection mappings = theConfigData.getVirtualUserTableManagement().getUserDomainMappings(table, user, domain);
-            if (mappings == null) {
-                context.getOutputWriter().println("No mappings found");
-                context.getOutputWriter().flush();
-            } else {
-                context.getOutputWriter().println("Mappings:");
-                
-                Iterator m = mappings.iterator();
-                while(m.hasNext()) {
-                    context.getOutputWriter().println(m.next());
-                }
-                context.getOutputWriter().flush();
-            }
-        } catch (VirtualUserTableManagementException e) {
-            context.getLogger().error("Error on listing mapping: " + e);
-            context.getOutputWriter().println("Error on listing mapping: " + e);
-            context.getOutputWriter().flush();
-        } catch (IllegalArgumentException e) {
-            context.getLogger().error("Error on listing mapping: " + e);
-            context.getOutputWriter().println("Error on listing mapping: " + e);
-            context.getOutputWriter().flush();
-        }
-        return true;
-    }
-    
-    @SuppressWarnings("unused")
-    private boolean doLISTALLMAPPINGS(String argument, ProtocolContext context) {
-        String[] args = null;
-        String table = null;
-
-        if (argument != null)
-            args = argument.split(" ");
-
-        // check if the command was called correct
-        if (args != null && args.length > 1) {
-            context.writeLoggedFlushedResponse("Usage: LISTALLMAPPINGS [table=table]");
-            return true;
-        }
-
-        if (args != null && args[0].startsWith("table=")) {
-            table = args[0].substring("table=".length());
-       
-        } 
-        
-        try {
-            Map mappings = theConfigData.getVirtualUserTableManagement().getAllMappings(table);
-            if (mappings == null) {
-                context.getOutputWriter().println("No mappings found");
-                context.getOutputWriter().flush();
-            } else {
-                context.getOutputWriter().println("Mappings:");
-                
-                Iterator m = mappings.keySet().iterator();
-                while(m.hasNext()) {
-                    String key = m.next().toString();
-                    context.getOutputWriter().println(key + "  -> " + mappings.get(key));
+            List<CharSequence> responseList = response.getLines();
+            if (responseList != null) {
+                for (int k = 0; k < responseList.size(); k++) {
+                    final CharSequence line = responseList.get(k);
+                    context.writeLoggedFlushedResponse(line.toString());
                 }
-                context.getOutputWriter().flush();
-            }
-        } catch (VirtualUserTableManagementException e) {
-            context.getLogger().error("Error on listing all mapping: " + e);
-            context.getOutputWriter().println("Error on listing all mapping: " + e);
-            context.getOutputWriter().flush();
-        } catch (IllegalArgumentException e) {
-            context.getLogger().error("Error on listing all mapping: " + e);
-            context.getOutputWriter().println("Error on listing all mapping: " + e);
-            context.getOutputWriter().flush();
-        }
-        return true;
-    }
-    
-    private String getMappingValue(String raw) {
-        if (raw.equals("*")) {
-            return null;
-        } else {
-            return raw;
-        }
-    }
-    
-    private boolean mappingAction(String[] args, String action) throws IllegalArgumentException, VirtualUserTableManagementException{ 
-        String table = null;
-        String user = null;
-        String domain = null;
-        String mapping = null;
-    
-        if (args[0].startsWith("table=")) {
-            table = args[0].substring("table=".length());
-            if (args[1].indexOf("@") > 0) {
-                user = getMappingValue(args[1].split("@")[0]);
-                domain = getMappingValue(args[1].split("@")[1]);
-            } else {
-                throw new IllegalArgumentException("Invalid usage.");
             }
-            mapping = args[2];
-        } else {
-            if (args[0].indexOf("@") > 0) {
-                user = getMappingValue(args[0].split("@")[0]);
-                domain = getMappingValue(args[0].split("@")[1]);
-            } else {
-                throw new IllegalArgumentException("Invalid usage.");
+           
+            if (response.isEndSession()) {
+                sessionEnded = true;
             }
-            mapping = args[1];
         }
-        
-        if (action.equals(ADD_MAPPING_ACTION)) {
-            return theConfigData.getVirtualUserTableManagement().addMapping(table, user, domain, mapping);
-        } else if (action.equals(REMOVE_MAPPING_ACTION)){
-            return theConfigData.getVirtualUserTableManagement().removeMapping(table, user, domain, mapping);
-        } else {
-            throw new IllegalArgumentException("Invalid action: " + action);
-        }   
-    }
-    
-    @SuppressWarnings("unused")
-    private boolean doLISTDOMAINS(String argument, ProtocolContext context) {
-        Collection domains = theConfigData.getDomainListManagement().getDomains();
-        if (domains == null) {
-            context.getOutputWriter().println("No domains found");
-            context.getOutputWriter().flush();
-        } else {
-            context.getOutputWriter().println("Domains:");
-                
-            Iterator d = domains.iterator();
-            while(d.hasNext()) {
-                context.getOutputWriter().println(d.next());
-            }
-            context.getOutputWriter().flush();
-        }   
-        return true;
     }
 
-    @SuppressWarnings("unused")
-    private boolean doADDDOMAIN(String argument, ProtocolContext context) {
 
-        // check if the command was called correct
-        if (argument == null) {
-            context.writeLoggedFlushedResponse("Usage: ADDDOMAIN domain");
-            return true;
-        }
-        
-        try {
-            if(theConfigData.getDomainListManagement().addDomain(argument)) {
-                context.getOutputWriter().println("Adding domain " + argument + " successful");
-                context.getOutputWriter().flush();
-            } else {
-                context.getOutputWriter().println("Adding domain " + argument + " fail");
-                context.getOutputWriter().flush();
-            }
-        } catch (DomainListManagementException e) {
-            context.getLogger().error("Error on adding domain: " + e);
-            context.getOutputWriter().println("Error on adding domain: " + e);
-            context.getOutputWriter().flush();
-        }
-        return true;
-    }
-    
-    @SuppressWarnings("unused")
-    private boolean doREMOVEDOMAIN(String argument, ProtocolContext context) {
-        // check if the command was called correct
-        if (argument == null) {
-            context.writeLoggedFlushedResponse("Usage: REMOVEDOMAIN domain");
-            return true;
-        }
-        
-        try {
-            if(theConfigData.getDomainListManagement().removeDomain(argument)) {
-                context.getOutputWriter().println("Removing domain " + argument + " successful");
-                context.getOutputWriter().flush();
-            } else {
-                context.getOutputWriter().println("Removing domain " + argument + " fail");
-                context.getOutputWriter().flush();
-            }
-        } catch (DomainListManagementException e) {
-            context.getLogger().error("Error on removing domain: " + e);
-            context.getOutputWriter().println("Error on removing domain: " + e);
-            context.getOutputWriter().flush();
-        }
-        return true;
-    }
-    
-    /**
-     * Return an ArrayList which contains all usernames for the given domain
-     * 
-     * @param domain the domain
-     * @return ArrayList which contains the users
-     */
-    private ArrayList getDomainUserList(String domain) {
-        ArrayList userList = new ArrayList();
-        
-        for (Iterator it = users.list(); it.hasNext();) {
-           String user = (String) it.next();
-           if (user.endsWith(domain)) {
-               userList.add(user);
-           }
-        }
-        
-        return userList;
-    }
 }

Added: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java?rev=821546&view=auto
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java (added)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java Sun Oct  4 15:10:49 2009
@@ -0,0 +1,61 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ ****************************************************************/
+
+package org.apache.james.remotemanager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.james.pop3server.POP3HandlerChain;
+import org.apache.james.remotemanager.core.CoreCmdLoaderService;
+import org.apache.james.socket.AbstractHandlerChain;
+import org.apache.james.socket.LogEnabled;
+
+public class RemoteManagerHandlerChain extends AbstractHandlerChain implements LogEnabled{
+
+
+    /** This log is the fall back shared by all instances */
+    private static final Log FALLBACK_LOG = LogFactory.getLog(POP3HandlerChain.class);
+    
+    /** Non context specific log should only be used when no context specific log is available */
+    private Log log  = FALLBACK_LOG;
+    
+
+    /**
+     * @see org.apache.james.socket.LogEnabled#setLog(org.apache.commons.logging.Log)
+     */
+    public void setLog(Log log) {
+        this.log = log;
+    } 
+
+    /**
+     * (non-Javadoc)
+     * @see org.apache.james.socket.AbstractHandlerChain#getCoreCmdHandlerLoader()
+     */
+    protected Class<?> getCoreCmdHandlerLoader() {
+        return CoreCmdLoaderService.class;
+    }
+
+    /**
+     * @see org.apache.james.socket.AbstractHandlerChain#getLog()
+     */
+    protected Log getLog() {
+        return log;
+    }
+
+}

Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java?rev=821546&r1=821545&r2=821546&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java Sun Oct  4 15:10:49 2009
@@ -21,17 +21,7 @@
 
 package org.apache.james.remotemanager;
 
-import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
-import org.apache.james.api.vut.management.VirtualUserTableManagementService;
-import org.apache.james.management.BayesianAnalyzerManagementService;
-import org.apache.james.management.DomainListManagementService;
-import org.apache.james.management.ProcessorManagementService;
-import org.apache.james.management.SpoolManagementService;
-import org.apache.james.services.MailServer;
-
-import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Provides a number of server-wide constant values to the
@@ -48,41 +38,13 @@
     String getHelloName();
 
     /**
-     * Returns the MailServer interface for this service.
-     *
-     * @return the MailServer interface for this service
-     */
-    MailServer getMailServer();
-
-    /**
-     * Returns the UsersRepository for this service.
-     *
-     * @return the local users repository
-     */
-    UsersRepository getUsersRepository();
-
-    /**
-     * Returns the UsersStore for this service.
-     *
-     * @return the local users store
-     */
-    UsersStore getUserStore();
-
-    /**
-     * Returns the SpoolManagement for this service.
-     *
-     * @return the spool manager
-     */
-    SpoolManagementService getSpoolManagement();
-
-    /**
      * Returns the Administrative Account Data
      *
      * TODO: Change the return type to make this immutable.
      *
      * @return the admin account data
      */
-    HashMap getAdministrativeAccountData();
+    Map<String,String> getAdministrativeAccountData();
 
     /**
      * Returns the prompt to be displayed when waiting for input. e.g. "james> ".
@@ -91,44 +53,4 @@
      */
     String getPrompt();
 
-    /**
-     * Returns the Store
-     * 
-     * @return the Store
-     */
-    Store getStore();
-
-    /**
-     * Returns the BayesianAnalyzerManagementService
-     * 
-     * @return the BayesianAnalyzerManagementService
-     */
-    BayesianAnalyzerManagementService getBayesianAnalyzerManagement();
-
-    /**
-     * Returns the ProcessorManagementService
-     * 
-     * @return the ProcessorManagementService
-     */
-    ProcessorManagementService getProcessorManagement();
-    
-    /**
-     * Return the VirtualUserTableManagementService
-     * 
-     * @return the VirtualUserTableManagementService
-     */
-    VirtualUserTableManagementService getVirtualUserTableManagement();
-    
-    /**
-     * Return the DomainListManagementService
-     * 
-     * @return the DomainListManagementService
-     */
-    DomainListManagementService getDomainListManagement();
-    
-    /**
-     * Gets avaliable commands.
-     * @return <code>Command</code>'s, not null possibly empty
-    */
-    Command[] getCommands();
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message