Author: btellier Date: Thu Dec 17 15:09:21 2015 New Revision: 1720593 URL: http://svn.apache.org/viewvc?rev=1720593&view=rev Log: JAMES-1618 Remove non RFC-5804 compliant GETACTIVE command
Removed: james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/commands/GetActive.java Modified: james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/commands/CoreCommands.java james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java james/project/trunk/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java Modified: james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/commands/CoreCommands.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/commands/CoreCommands.java?rev=1720593&r1=1720592&r2=1720593&view=diff ============================================================================== --- james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/commands/CoreCommands.java (original) +++ james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/commands/CoreCommands.java Thu Dec 17 15:09:21 2015 @@ -28,7 +28,7 @@ import org.apache.james.managesieve.api. * @see <a href=http://tools.ietf.org/html/rfc5804#section-2>RFC 5804 Commands</a> */ public interface CoreCommands extends Capability, CheckScript, DeleteScript, GetScript, HaveSpace, - ListScripts, PutScript, RenameScript, SetActive, GetActive, Noop, Unauthenticate, Logout, Authenticate, StartTLS, + ListScripts, PutScript, RenameScript, SetActive, Noop, Unauthenticate, Logout, Authenticate, StartTLS, CapabilityAdvertiser { } Modified: james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java?rev=1720593&r1=1720592&r2=1720593&view=diff ============================================================================== --- james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java (original) +++ james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java Thu Dec 17 15:09:21 2015 @@ -270,24 +270,6 @@ public class CoreProcessor implements Co } @Override - public String getActive(Session session) { - try { - authenticationCheck(session); - return IOUtils.toString(sieveRepository.getActive(session.getUser())) + "\r\nOK"; - } catch (AuthenticationRequiredException ex) { - return "NO"; - } catch (ScriptNotFoundException ex) { - return "NO (NONEXISTENT) \"" + ex.getMessage() + "\""; - } catch (StorageException ex) { - return "NO \"" + ex.getMessage() + "\""; - } catch (UserNotFoundException e) { - return "NO : User not found"; - } catch (IOException e) { - return "NO \"" + e.getMessage() + "\""; - } - } - - @Override public String noop(String tag) { if(Strings.isNullOrEmpty(tag)) { return "OK \"NOOP completed\""; Modified: james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java?rev=1720593&r1=1720592&r2=1720593&view=diff ============================================================================== --- james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java (original) +++ james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/transcode/ManageSieveProcessor.java Thu Dec 17 15:09:21 2015 @@ -92,8 +92,6 @@ public class ManageSieveProcessor { return argumentParser.checkScript(session, arguments); } else if (command.equals(DELETESCRIPT)) { return argumentParser.deleteScript(session, arguments); - } else if (command.equals(GETACTIVE)) { - return argumentParser.getActive(session, arguments); } else if (command.equals(GETSCRIPT)) { return argumentParser.getScript(session, arguments); } else if (command.equals(HAVESPACE)) { Modified: james/project/trunk/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java?rev=1720593&r1=1720592&r2=1720593&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java (original) +++ james/project/trunk/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java Thu Dec 17 15:09:21 2015 @@ -459,50 +459,6 @@ public class ManageSieveMailetTestCase { ensureResponse("Re: SETACTIVE", "NO \"Missing argument: script name\""); } - @Test - public final void testGetActiveUnauthorized() throws Exception { - MimeMessage message = prepareMimeMessage("GETACTIVE", USER, SIEVE_LOCALHOST); - Mail mail = new FakeMail(); - mail.setMessage(message); - mailet.service(mail); - ensureResponse("Re: GETACTIVE", message.getSender(), "NO"); - } - - @Test - public final void testGetActive() throws Exception { - when(sieveRepository.getActive(USER)).thenAnswer(new Answer<String>() { - public String answer(InvocationOnMock invocationOnMock) throws Throwable { - return SCRIPT_CONTENT; - } - }); - MimeMessage message = prepareMimeMessage("GETACTIVE", USER, SIEVE_LOCALHOST); - Mail mail = new FakeMail(); - mail.setMessage(message); - mail.setAttribute(ManageSieveMailet.SMTP_AUTH_USER_ATTRIBUTE_NAME, USER); - mailet.service(mail); - ensureResponse("Re: GETACTIVE", message.getSender(), SCRIPT_CONTENT + "\r\n" + "OK"); - } - - @Test - public final void testGetActiveExtraArgs() throws Exception { - MimeMessage message = prepareMimeMessage("GETACTIVE extra", USER, SIEVE_LOCALHOST); - Mail mail = new FakeMail(); - mail.setMessage(message); - message.setSubject("GETACTIVE extra"); - message.saveChanges(); - mailet.service(mail); - ensureResponse("Re: GETACTIVE extra", message.getSender(), "NO \"Too many arguments: extra\""); - } - - @Test - public final void testGetActiveDesactivated() throws Exception { - MimeMessage message = prepareMimeMessage("GETACTIVE", USER, SIEVE_LOCALHOST); - Mail mail = new FakeMail(); - mail.setMessage(message); - mailet.service(mail); - ensureResponse("Re: GETACTIVE", message.getSender(), "NO"); - } - private void initializeMailet() throws MessagingException { mailet = new ManageSieveMailet(); mailet.setSieveParser(sieveParser); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org