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/29 12:46:57 UTC
svn commit: r904470 - in /james/server/trunk:
remotemanager-function/src/main/java/org/apache/james/remotemanager/core/
remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/filter/
socket-api/src/main/java/org/apache/james/api/proto...
Author: norman
Date: Fri Jan 29 11:46:54 2010
New Revision: 904470
URL: http://svn.apache.org/viewvc?rev=904470&view=rev
Log:
Remove java6 only constructor usage
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AuthorizationHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoteManagerCommandDispatcherLineHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/filter/RemoteManagerResponseFilter.java
james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/AbstractCommandDispatcher.java
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=904470&r1=904469&r2=904470&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 Fri Jan 29 11:46:54 2010
@@ -19,7 +19,7 @@
package org.apache.james.remotemanager.core;
-import java.nio.charset.Charset;
+import java.io.UnsupportedEncodingException;
import org.apache.james.api.protocol.ConnectHandler;
import org.apache.james.api.protocol.LineHandler;
@@ -33,7 +33,6 @@
private final static int PASSWORD_SUPPLIED = 2;
private final static String USERNAME = "USERNAME";
- private Charset charSet = Charset.forName("ISO-8859-1");
private final LineHandler<RemoteManagerSession> lineHandler = new AuthorizationLineHandler();
@@ -58,33 +57,40 @@
private final class AuthorizationLineHandler implements LineHandler<RemoteManagerSession> {
public void onLine(RemoteManagerSession session, byte[] byteLine) {
- String line = new String(byteLine, charSet).trim();
- 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.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());
+ try {
+ String line = new String(byteLine, "ISO-8859-1").trim();
+ 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.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);
+ } catch (UnsupportedEncodingException e) {
+ // Should never happen
+ e.printStackTrace();
+
}
+
}
}
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=904470&r1=904469&r2=904470&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 Fri Jan 29 11:46:54 2010
@@ -19,7 +19,6 @@
package org.apache.james.remotemanager.core;
-import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
@@ -61,7 +60,7 @@
}
@Override
- protected Charset getLineDecodingCharset() {
- return Charset.forName("ISO-8859-1");
+ protected String getLineDecodingCharset() {
+ return "ISO-8859-1";
}
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/filter/RemoteManagerResponseFilter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/filter/RemoteManagerResponseFilter.java?rev=904470&r1=904469&r2=904470&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/filter/RemoteManagerResponseFilter.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/filter/RemoteManagerResponseFilter.java Fri Jan 29 11:46:54 2010
@@ -19,44 +19,25 @@
package org.apache.james.remotemanager.mina.filter;
+import org.apache.james.api.protocol.Response;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.socket.mina.filter.AbstractResponseFilter;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.write.DefaultWriteRequest;
-import org.apache.mina.core.write.WriteRequest;
-
public class RemoteManagerResponseFilter extends AbstractResponseFilter{
public final static String NAME = "remoteManagerResponseFilter";
- private final static String CLOSE_ATTRIBUTE = RemoteManagerResponseFilter.class.getName() + ".closeAttribute";;
-
- @Override
- protected String getCloseAttribute() {
- return CLOSE_ATTRIBUTE;
- }
- /**
- * @see org.apache.mina.core.filterchain.IoFilterAdapter#filterWrite(org.apache.mina.core.filterchain.IoFilter.NextFilter,
- * org.apache.mina.core.session.IoSession,
- * org.apache.mina.core.write.WriteRequest)
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.socket.mina.filter.AbstractResponseFilter#processResponse(org.apache.mina.core.filterchain.IoFilter.NextFilter, org.apache.mina.core.session.IoSession, org.apache.james.api.protocol.Response)
*/
- public void filterWrite(NextFilter nextFilter, IoSession session, WriteRequest writeRequest) throws Exception {
-
- if (writeRequest.getMessage() instanceof RemoteManagerResponse) {
- RemoteManagerResponse response = (RemoteManagerResponse) writeRequest.getMessage();
- if (response != null) {
- for (int k = 0; k < response.getLines().size(); k++) {
- nextFilter.filterWrite(session, new DefaultWriteRequest(response.getLines().get(k)));
- }
-
- if (response.isEndSession()) {
- session.setAttribute(getCloseAttribute());
- }
+ protected void processResponse(NextFilter nextFilter, IoSession session, Response rawresponse) {
+ RemoteManagerResponse response = (RemoteManagerResponse) rawresponse;
+ for (int k = 0; k < response.getLines().size(); k++) {
+ writeResponse(nextFilter, session, response.getLines().get(k).toString());
}
- } else {
- super.filterWrite(nextFilter, session, writeRequest);
- }
-
+
}
+
}
Modified: james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/AbstractCommandDispatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/AbstractCommandDispatcher.java?rev=904470&r1=904469&r2=904470&view=diff
==============================================================================
--- james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/AbstractCommandDispatcher.java (original)
+++ james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/AbstractCommandDispatcher.java Fri Jan 29 11:46:54 2010
@@ -19,7 +19,7 @@
package org.apache.james.api.protocol;
-import java.nio.charset.Charset;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -121,40 +121,46 @@
String curCommandArgument = null;
String cmdString;
- cmdString = new String(line, getLineDecodingCharset()).trim();
+ try {
+ cmdString = new String(line, getLineDecodingCharset()).trim();
+ int spaceIndex = cmdString.indexOf(" ");
+ if (spaceIndex > 0) {
+ curCommandName = cmdString.substring(0, spaceIndex);
+ curCommandArgument = cmdString.substring(spaceIndex + 1);
+ } else {
+ curCommandName = cmdString;
+ }
+ curCommandName = curCommandName.toUpperCase(Locale.US);
- int spaceIndex = cmdString.indexOf(" ");
- if (spaceIndex > 0) {
- curCommandName = cmdString.substring(0, spaceIndex);
- curCommandArgument = cmdString.substring(spaceIndex + 1);
- } else {
- curCommandName = cmdString;
- }
- curCommandName = curCommandName.toUpperCase(Locale.US);
+ List<CommandHandler<Session>> commandHandlers = getCommandHandlers(curCommandName, session);
+ // fetch the command handlers registered to the command
+ int count = commandHandlers.size();
+ for (int i = 0; i < count; i++) {
+ Response response = commandHandlers.get(i).onCommand(session, new BaseRequest(curCommandName, curCommandArgument));
+ session.writeResponse(response);
+
+ // if the response is received, stop processing of command
+ // handlers
+ if (response != null) {
+ break;
+ }
- List<CommandHandler<Session>> commandHandlers = getCommandHandlers(curCommandName, session);
- // fetch the command handlers registered to the command
- int count = commandHandlers.size();
- for (int i = 0; i < count; i++) {
- Response response = commandHandlers.get(i).onCommand(session, new BaseRequest(curCommandName, curCommandArgument));
- session.writeResponse(response);
-
- // if the response is received, stop processing of command
- // handlers
- if (response != null) {
- break;
+ // NOTE we should never hit this line, otherwise we ended the
+ // CommandHandlers with
+ // no responses.
+ // (The note is valid for i == count-1)
}
- // NOTE we should never hit this line, otherwise we ended the
- // CommandHandlers with
- // no responses.
- // (The note is valid for i == count-1)
+ } catch (UnsupportedEncodingException e) {
+ // Should never happen
+ e.printStackTrace();
}
+
}
- protected Charset getLineDecodingCharset() {
- return Charset.forName("US-ASCII");
+ protected String getLineDecodingCharset() {
+ return "US-ASCII";
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org