You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/01/19 12:35:02 UTC
svn commit: r900731 [2/4] - in /james/server/trunk:
mina-socket-library/src/main/java/org/apache/james/socket/mina/
mina-socket-library/src/main/java/org/apache/james/socket/mina/filter/
pop3server-function/src/main/java/org/apache/james/pop3server/ po...
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -23,20 +23,22 @@
import java.util.Collection;
import java.util.List;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
public class AddMappingCmdHandler extends AbstractMappingCmdHandler {
private CommandHelp help = new CommandHelp("addmapping ([table=virtualusertablename]) [toUser@toDomain] [fromMapping]","add mapping for the given emailaddress");
- /**
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession,
- * java.lang.String, java.lang.String)
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = null;
String[] args = null;
String parameters = request.getArgument();
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -25,11 +25,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.management.BayesianAnalyzerManagementException;
import org.apache.james.management.BayesianAnalyzerManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -62,9 +63,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String [] args = null;
String parameters = request.getArgument();
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -26,12 +26,13 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.management.DomainListManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
import org.apache.james.services.MailServer;
@@ -80,9 +81,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = null;
String parameters = request.getArgument();
int breakIndex = -1;
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AuthorizationHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AuthorizationHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AuthorizationHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AuthorizationHandler.java Tue Jan 19 11:34:58 2010
@@ -19,12 +19,12 @@
package org.apache.james.remotemanager.core;
-import org.apache.james.remotemanager.ConnectHandler;
-import org.apache.james.remotemanager.LineHandler;
+import org.apache.james.api.protocol.ConnectHandler;
+import org.apache.james.api.protocol.LineHandler;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
-public class AuthorizationHandler implements ConnectHandler {
+public class AuthorizationHandler implements ConnectHandler<RemoteManagerSession> {
private final static String AUTHORIZATION_STATE = "AUTHORIZATION_STATE";
private final static int LOGIN_SUPPLIED = 1;
@@ -32,7 +32,7 @@
private final static String USERNAME = "USERNAME";
- private final LineHandler lineHandler = new AuthorizationLineHandler();
+ private final LineHandler<RemoteManagerSession> lineHandler = new AuthorizationLineHandler();
/*
* (non-Javadoc)
@@ -47,47 +47,41 @@
response.appendLine("Please enter your login and password");
response.appendLine("Login id:");
- session.writeRemoteManagerResponse(response);
+ session.writeResponse(response);
session.pushLineHandler(lineHandler);
session.getState().put(AUTHORIZATION_STATE, LOGIN_SUPPLIED);
}
- private final class AuthorizationLineHandler implements LineHandler {
+ private final class AuthorizationLineHandler implements LineHandler<RemoteManagerSession> {
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.remotemanager.LineHandler#onLine(org.apache.james
- * .remotemanager.RemoteManagerSession, java.lang.String)
- */
- public void onLine(RemoteManagerSession session, String line) {
- int state = (Integer) session.getState().get(AUTHORIZATION_STATE);
+ public void onLine(RemoteManagerSession session, String line) {
+ int state = (Integer) session.getState().get(AUTHORIZATION_STATE);
- if (state == LOGIN_SUPPLIED) {
- session.getState().put(USERNAME, line);
- session.getState().put(AUTHORIZATION_STATE, PASSWORD_SUPPLIED);
-
- session.writeRemoteManagerResponse(new RemoteManagerResponse("Password:"));
- } else if (state == PASSWORD_SUPPLIED) {
- String password = line;
- String username = (String) session.getState().get(USERNAME);
-
- if (!password.equals(session.getAdministrativeAccountData().get(username)) || password.length() == 0) {
- final String message = "Login failed for " + username;
- session.writeRemoteManagerResponse(new RemoteManagerResponse(message));
- session.writeRemoteManagerResponse(new RemoteManagerResponse("Login id:"));
- } else {
- StringBuilder messageBuffer = new StringBuilder(64).append("Welcome ").append(username).append(". HELP for a list of commands");
- session.writeRemoteManagerResponse(new RemoteManagerResponse(messageBuffer.toString()));
- if (session.getLogger().isInfoEnabled()) {
- StringBuilder infoBuffer = new StringBuilder(128).append("Login for ").append(username).append(" successful");
- session.getLogger().info(infoBuffer.toString());
+ if (state == LOGIN_SUPPLIED) {
+ session.getState().put(USERNAME, line);
+ session.getState().put(AUTHORIZATION_STATE, PASSWORD_SUPPLIED);
+
+ session.writeResponse(new RemoteManagerResponse("Password:"));
+ } else if (state == PASSWORD_SUPPLIED) {
+ String password = line;
+ String username = (String) session.getState().get(USERNAME);
+
+ if (!password.equals(session.getAdministrativeAccountData().get(username)) || password.length() == 0) {
+ final String message = "Login failed for " + username;
+ session.writeResponse(new RemoteManagerResponse(message));
+ session.writeResponse(new RemoteManagerResponse("Login id:"));
+ } else {
+ StringBuilder messageBuffer = new StringBuilder(64).append("Welcome ").append(username).append(". HELP for a list of commands");
+ session.writeResponse(new RemoteManagerResponse(messageBuffer.toString()));
+ if (session.getLogger().isInfoEnabled()) {
+ StringBuilder infoBuffer = new StringBuilder(128).append("Login for ").append(username).append(" successful");
+ session.getLogger().info(infoBuffer.toString());
+ }
+ session.popLineHandler();
}
- session.popLineHandler();
+ session.getState().remove(USERNAME);
}
- session.getState().remove(USERNAME);
}
}
- }
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -23,9 +23,10 @@
import java.util.Collection;
import java.util.List;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -47,8 +48,7 @@
}
@Override
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
- RemoteManagerResponse response;
+ public Response onCommand(RemoteManagerSession session, Request request) { RemoteManagerResponse response;
String parameters = request.getArgument();
UsersRepository users = uStore.getRepository(((String) session.getState().get(RemoteManagerSession.CURRENT_USERREPOSITORY)));
if (parameters == null) {
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -26,11 +26,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -65,9 +66,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String user = request.getArgument();
if ((user == null) || (user.equals(""))) {
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -26,11 +26,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.management.SpoolFilter;
import org.apache.james.management.SpoolManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -66,9 +67,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = null;
String[] args = null;
String parameters = request.getArgument();
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -25,11 +25,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.management.BayesianAnalyzerManagementException;
import org.apache.james.management.BayesianAnalyzerManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -56,10 +57,11 @@
return help;
}
- /**
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, java.lang.String, java.lang.String)
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
// check if the command was called correct
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -25,11 +25,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.management.SpoolFilter;
import org.apache.james.management.SpoolManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -63,9 +64,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
int count = 0;
String parameters = request.getArgument();
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -24,10 +24,11 @@
import java.util.List;
import org.apache.james.api.protocol.ExtensibleHandler;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.protocol.WiringException;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -47,9 +48,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = null;
for (int i = 0; i < extensions.size(); i++) {
CommandHandler cmd = extensions.get(i);
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -25,11 +25,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.management.BayesianAnalyzerManagementException;
import org.apache.james.management.BayesianAnalyzerManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -55,11 +56,12 @@
public CommandHelp getHelp() {
return help;
}
-
- /**
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, java.lang.String, java.lang.String)
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
// check if the command was called correct
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -27,11 +27,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.api.vut.management.VirtualUserTableManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -49,9 +50,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String[] args = null;
String table = null;
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -26,10 +26,11 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.management.DomainListManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -55,10 +56,11 @@
return help;
}
- /**
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, java.lang.String, java.lang.String)
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = null;
Collection<String> domains = domService.getDomains();
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMailetsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMailetsCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMailetsCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMailetsCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -23,8 +23,9 @@
import java.util.Collection;
import java.util.List;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -46,8 +47,7 @@
}
@Override
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
- RemoteManagerResponse response = null;
+ public Response onCommand(RemoteManagerSession session, Request request) { RemoteManagerResponse response = null;
String params = request.getArgument();
if (params == null || !processorExists(params)) {
response = new RemoteManagerResponse("Usage: " + getHelp().getSyntax());
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -24,9 +24,10 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -37,9 +38,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
String[] args = null;
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMatchersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMatchersCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMatchersCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMatchersCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -23,8 +23,9 @@
import java.util.Collection;
import java.util.List;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -46,8 +47,7 @@
}
@Override
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
- RemoteManagerResponse response = null;
+ public Response onCommand(RemoteManagerSession session, Request request) { RemoteManagerResponse response = null;
String params = request.getArgument();
if (params == null || !processorExists(params)) {
response = new RemoteManagerResponse("Usage: " + getHelp().getSyntax());
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -6,10 +6,11 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.management.ProcessorManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -40,9 +41,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = null;
String[] processorNames = processorManagementService.getProcessorNames();
response = new RemoteManagerResponse("Existing processors: " + processorNames.length);
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -26,11 +26,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.management.SpoolFilter;
import org.apache.james.management.SpoolManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -65,9 +66,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
int count = 0;
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -26,11 +26,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
import org.apache.james.services.MailServer;
@@ -73,9 +74,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
UsersRepository users = uStore.getRepository(((String) session.getState().get(RemoteManagerSession.CURRENT_USERREPOSITORY)));
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/MemStatCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/MemStatCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/MemStatCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/MemStatCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -4,9 +4,10 @@
import java.util.Collection;
import java.util.List;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -21,9 +22,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = new RemoteManagerResponse("Current memory statistics:");
response.appendLine("\tFree Memory: " + Runtime.getRuntime().freeMemory());
response.appendLine("\tTotal Memory: " + Runtime.getRuntime().totalMemory());
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/MoveMailsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/MoveMailsCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/MoveMailsCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/MoveMailsCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -25,11 +25,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.management.SpoolFilter;
import org.apache.james.management.SpoolManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -64,9 +65,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
String parameters = request.getArgument();
RemoteManagerResponse response;
String[] args = null;
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/QuitCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/QuitCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/QuitCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/QuitCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -23,9 +23,10 @@
import java.util.Collection;
import java.util.List;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -35,9 +36,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = new RemoteManagerResponse("Bye");
response.setEndSession(true);
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoteManagerCommandDispatcherLineHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoteManagerCommandDispatcherLineHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoteManagerCommandDispatcherLineHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoteManagerCommandDispatcherLineHandler.java Tue Jan 19 11:34:58 2010
@@ -26,14 +26,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.api.protocol.AbstractCommandDispatcher;
+import org.apache.james.api.protocol.LineHandler;
+import org.apache.james.api.protocol.Response;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.remotemanager.CommandHandler;
-import org.apache.james.remotemanager.LineHandler;
import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
-public class RemoteManagerCommandDispatcherLineHandler extends AbstractCommandDispatcher<CommandHandler> implements LineHandler, LogEnabled{
+public class RemoteManagerCommandDispatcherLineHandler extends AbstractCommandDispatcher<RemoteManagerSession> implements LineHandler<RemoteManagerSession>, LogEnabled{
/** This log is the fall back shared by all instances */
private static final Log FALLBACK_LOG = LogFactory
.getLog(RemoteManagerCommandDispatcherLineHandler.class);
@@ -113,20 +114,20 @@
}
// fetch the command handlers registered to the command
- List<CommandHandler> commandHandlers = getCommandHandlers(
+ List<org.apache.james.api.protocol.CommandHandler<RemoteManagerSession>> commandHandlers = getCommandHandlers(
curCommandName, session);
if (commandHandlers == null) {
// end the session
RemoteManagerResponse resp = new RemoteManagerResponse( "Local configuration error: unable to find a command handler.");
resp.setEndSession(true);
- session.writeRemoteManagerResponse(resp);
+ session.writeResponse(resp);
} else {
int count = commandHandlers.size();
for (int i = 0; i < count; i++) {
- RemoteManagerResponse response = commandHandlers.get(i).onCommand(
+ Response response = commandHandlers.get(i).onCommand(
session, new RemoteManagerRequest(curCommandName, curCommandArgument));
if (response != null) {
- session.writeRemoteManagerResponse(response);
+ session.writeResponse(response);
break;
}
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -26,11 +26,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.management.DomainListManagementException;
import org.apache.james.management.DomainListManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -59,9 +60,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = null;
String parameters = request.getArgument();
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -23,9 +23,10 @@
import java.util.Collection;
import java.util.List;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -34,9 +35,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
String[] args = null;
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ResetBayesianDataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ResetBayesianDataCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ResetBayesianDataCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ResetBayesianDataCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -25,11 +25,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.management.BayesianAnalyzerManagementException;
import org.apache.james.management.BayesianAnalyzerManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -58,9 +59,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
try {
// stop watchdog cause feeding can take some time
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetAliasCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetAliasCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetAliasCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetAliasCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -25,13 +25,14 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
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.user.UsersStore;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -65,9 +66,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
int breakIndex = -1;
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetForwardingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetForwardingCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetForwardingCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetForwardingCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -7,13 +7,14 @@
import javax.annotation.Resource;
import javax.mail.internet.ParseException;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
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.user.UsersStore;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
import org.apache.mailet.MailAddress;
@@ -47,10 +48,11 @@
return help;
}
- /**
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, java.lang.String, java.lang.String)
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
int breakIndex = -1;
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -26,12 +26,13 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.user.User;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -66,9 +67,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = null;
String parameters = request.getArgument();
int breakIndex = -1;
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -25,13 +25,14 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
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.user.UsersStore;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -66,9 +67,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
if ( parameters == null || parameters.equals("") ) {
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -25,13 +25,14 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
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.user.UsersStore;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
import org.apache.mailet.MailAddress;
@@ -65,7 +66,11 @@
return help;
}
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+ */
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
if ( parameters == null || parameters.equals("") ) {
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMailetInfoCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMailetInfoCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMailetInfoCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMailetInfoCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -23,8 +23,9 @@
import java.util.Collection;
import java.util.List;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -46,8 +47,7 @@
}
@Override
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
- RemoteManagerResponse response = null;
+ public Response onCommand(RemoteManagerSession session, Request request) { RemoteManagerResponse response = null;
String params = request.getArgument();
Object[] parameters = extractMailetInfoParameters(session,params, "MAILET");
if (parameters == null) return response;
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -27,10 +27,11 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.management.ProcessorManagementService;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -61,9 +62,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = null;
String params = request.getArgument();
Object[] parameters = extractMailetInfoParameters(session, params, "MATCHER");
@@ -95,12 +96,12 @@
String[] argList = argument.split(" ");
boolean argListOK = argument != null && argList != null && argList.length == 2;
if (!argListOK) {
- session.writeRemoteManagerResponse(new RemoteManagerResponse("Usage: " + getHelp().getSyntax()));
+ session.writeResponse(new RemoteManagerResponse("Usage: " + getHelp().getSyntax()));
return null;
}
String processorName = argList[0];
if (!processorExists(processorName)) {
- session.writeRemoteManagerResponse(new RemoteManagerResponse("The list of valid processor names can be retrieved using command LISTPROCESSORS"));;
+ session.writeResponse(new RemoteManagerResponse("The list of valid processor names can be retrieved using command LISTPROCESSORS"));;
return null;
}
int index = -1;
@@ -110,7 +111,7 @@
// fall thru with -1
}
if (index < 0) {
- session.writeRemoteManagerResponse(new RemoteManagerResponse("The index parameter must be a positive number"));
+ session.writeResponse(new RemoteManagerResponse("The index parameter must be a positive number"));
return null;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShutdownCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShutdownCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShutdownCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShutdownCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -23,9 +23,10 @@
import java.util.Collection;
import java.util.List;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -39,10 +40,10 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
- session.writeRemoteManagerResponse(new RemoteManagerResponse("Shutting down, bye bye"));
+ public Response onCommand(RemoteManagerSession session, Request request) {
+ session.writeResponse(new RemoteManagerResponse("Shutting down, bye bye"));
System.exit(0);
return null;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnknownCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnknownCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnknownCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnknownCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -23,9 +23,10 @@
import java.util.Collection;
import java.util.List;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -46,9 +47,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = new RemoteManagerResponse("Unknown command " + request.getCommand());
return response;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -25,12 +25,13 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.user.JamesUser;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -63,9 +64,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -25,12 +25,13 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.user.JamesUser;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -64,9 +65,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
if ((parameters == null) || (parameters.equals(""))) {
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -7,11 +7,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -43,9 +44,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String parameters = request.getArgument();
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java Tue Jan 19 11:34:58 2010
@@ -25,11 +25,12 @@
import javax.annotation.Resource;
+import org.apache.james.api.protocol.Request;
+import org.apache.james.api.protocol.Response;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
-import org.apache.james.remotemanager.RemoteManagerRequest;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -62,9 +63,9 @@
/*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.CommandHandler#onCommand(org.apache.james.remotemanager.RemoteManagerSession, org.apache.james.remotemanager.RemoteManagerRequest)
+ * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
- public RemoteManagerResponse onCommand(RemoteManagerSession session, RemoteManagerRequest request) {
+ public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response = null;
String user = request.getArgument();
if (user == null || user.equals("")) {
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/AsyncRemoteManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/AsyncRemoteManager.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/AsyncRemoteManager.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/AsyncRemoteManager.java Tue Jan 19 11:34:58 2010
@@ -27,10 +27,11 @@
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.remotemanager.RemoteManagerHandlerConfigurationData;
import org.apache.james.remotemanager.RemoteManagerMBean;
+import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.core.CoreCmdHandlerLoader;
import org.apache.james.remotemanager.mina.filter.RemoteManagerResponseFilter;
-import org.apache.james.remotemanager.mina.filter.RemoteManagerValidationFilter;
import org.apache.james.socket.mina.AbstractAsyncServer;
+import org.apache.james.socket.mina.filter.ResponseValidationFilter;
import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.core.service.IoHandler;
@@ -80,7 +81,7 @@
// response and validation filter to the chain
builder.addLast(RemoteManagerResponseFilter.NAME, new RemoteManagerResponseFilter());
- builder.addLast("requestValidationFilter", new RemoteManagerValidationFilter(getLogger()));
+ builder.addLast("requestValidationFilter", new ResponseValidationFilter<RemoteManagerResponse>(getLogger(),RemoteManagerResponse.class));
return builder;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/RemoteManagerIoHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/RemoteManagerIoHandler.java?rev=900731&r1=900730&r2=900731&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/RemoteManagerIoHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/RemoteManagerIoHandler.java Tue Jan 19 11:34:58 2010
@@ -19,46 +19,24 @@
package org.apache.james.remotemanager.mina;
-import java.util.LinkedList;
-import java.util.List;
-
import org.apache.commons.logging.Log;
+import org.apache.james.api.protocol.ProtocolSession;
import org.apache.james.api.protocol.ProtocolHandlerChain;
-import org.apache.james.remotemanager.ConnectHandler;
-import org.apache.james.remotemanager.LineHandler;
import org.apache.james.remotemanager.RemoteManagerHandlerConfigurationData;
import org.apache.james.remotemanager.RemoteManagerSession;
-import org.apache.mina.core.service.IoHandlerAdapter;
-import org.apache.mina.core.session.IdleStatus;
+import org.apache.james.socket.mina.AbstractIoHandler;
import org.apache.mina.core.session.IoSession;
-public class RemoteManagerIoHandler extends IoHandlerAdapter{
+public class RemoteManagerIoHandler extends AbstractIoHandler{
private Log logger;
- private ProtocolHandlerChain chain;
-
private RemoteManagerHandlerConfigurationData config;
public RemoteManagerIoHandler(RemoteManagerHandlerConfigurationData config, ProtocolHandlerChain chain, Log logger) {
- this.chain = chain;
+ super(chain);
this.logger = logger;
this.config = config;
}
-
-
- /**
- * @see org.apache.mina.core.service.IoHandlerAdapter#messageReceived(org.apache.mina.core.session.IoSession, java.lang.Object)
- */
- public void messageReceived(IoSession session, Object message)
- throws Exception {
- RemoteManagerSession rSession = (RemoteManagerSession) session.getAttribute(RemoteManagerSessionImpl.REMOTEMANAGER_SESSION);
- LinkedList<LineHandler> lineHandlers = chain.getHandlers(LineHandler.class);
- if (lineHandlers.size() > 0) {
- // thats not really optimal but it allow us to keep things as generic as possible
- // Will prolly get refactored later
- ((LineHandler) lineHandlers.getLast()).onLine(rSession, (String) message);
- }
- }
/**
* @see org.apache.mina.core.service.IoHandler#exceptionCaught(org.apache.mina.core.session.IoSession,
@@ -68,44 +46,18 @@
throws Exception {
logger.error("Caught exception: " + session.getCurrentWriteMessage(),
exception);
- // just close session
- session.close(true);
}
- /**
- * @see org.apache.mina.core.service.IoHandler#sessionCreated(org.apache.mina.core.session.IoSession)
- */
- public void sessionCreated(IoSession session) throws Exception {
+ @Override
+ protected ProtocolSession createSession(IoSession session) throws Exception {
RemoteManagerSession rSession = new RemoteManagerSessionImpl(config, logger, session);
rSession.getState().put(RemoteManagerSession.CURRENT_USERREPOSITORY, "LocalUsers");
-
- // Add attribute
- session.setAttribute(RemoteManagerSessionImpl.REMOTEMANAGER_SESSION,rSession);
-
+ return rSession;
}
- /**
- * @see org.apache.mina.core.service.IoHandler#sessionIdle(org.apache.mina.core.session.IoSession,
- * org.apache.mina.core.session.IdleStatus)
- */
- public void sessionIdle(IoSession session, IdleStatus status)
- throws Exception {
- logger.debug("Connection timed out");
- session.write("Connection timeout");
+ @Override
+ protected String getSessionKey() {
+ return RemoteManagerSessionImpl.REMOTEMANAGER_SESSION;
}
- /**
- * @see org.apache.mina.core.service.IoHandler#sessionOpened(org.apache.mina.core.session.IoSession)
- */
- public void sessionOpened(IoSession session) throws Exception {
- List<ConnectHandler> connectHandlers = chain
- .getHandlers(ConnectHandler.class);
-
- if (connectHandlers != null) {
- for (int i = 0; i < connectHandlers.size(); i++) {
- connectHandlers.get(i).onConnect(
- (RemoteManagerSession) session.getAttribute(RemoteManagerSessionImpl.REMOTEMANAGER_SESSION));
- }
- }
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org