Author: rdonkin
Date: Thu Apr 12 01:16:16 2007
New Revision: 527829
URL: http://svn.apache.org/viewvc?view=rev&rev=527829
Log:
Fixed inconsistent command naming.
Added:
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/CheckCommandMessage.java
- copied, changed from r526862,
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/CompleteCommandMessage.java
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/ExamineCommandMessage.java
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/LsubCommandMessage.java
- copied, changed from r526862,
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/LsubListCommandMessage.java
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/NoopCommandMessage.java
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/SearchCommandMessage.java
- copied, changed from r526862,
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/SearchImapCommandMessage.java
Removed:
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/CompleteCommandMessage.java
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/LsubListCommandMessage.java
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/SearchImapCommandMessage.java
Modified:
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/decode/CheckCommandParser.java
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/decode/NoopCommandParser.java
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/BaseImapMessageFactory.java
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/ImapMessageFactory.java
Modified:
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/decode/CheckCommandParser.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/decode/CheckCommandParser.java?view=diff&rev=527829&r1=527828&r2=527829
==============================================================================
---
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/decode/CheckCommandParser.java
(original)
+++
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/decode/CheckCommandParser.java
Thu Apr 12 01:16:16 2007
@@ -40,7 +40,7 @@
protected ImapCommandMessage decode(ImapCommand command,
ImapRequestLineReader request, String tag) throws ProtocolException {
endLine( request );
- final ImapCommandMessage result =
getMessageFactory().createCompleteMessage(command, false, tag);
+ final ImapCommandMessage result =
getMessageFactory().createCheckMessage(command, tag);
return result;
}
Modified:
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/decode/NoopCommandParser.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/decode/NoopCommandParser.java?view=diff&rev=527829&r1=527828&r2=527829
==============================================================================
---
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/decode/NoopCommandParser.java
(original)
+++
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/decode/NoopCommandParser.java
Thu Apr 12 01:16:16 2007
@@ -40,7 +40,7 @@
protected ImapCommandMessage decode(ImapCommand command,
ImapRequestLineReader request, String tag) throws ProtocolException {
endLine( request );
- final ImapCommandMessage result =
getMessageFactory().createCompleteMessage(command, false, tag);
+ final ImapCommandMessage result =
getMessageFactory().createNoopMessage(command, tag);
return result;
}
Modified:
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/BaseImapMessageFactory.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/BaseImapMessageFactory.java?view=diff&rev=527829&r1=527828&r2=527829
==============================================================================
---
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/BaseImapMessageFactory.java
(original)
+++
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/BaseImapMessageFactory.java
Thu Apr 12 01:16:16 2007
@@ -48,8 +48,8 @@
return new CapabilityCommandMessage(command, tag);
}
- public ImapCommandMessage createCompleteMessage(ImapCommand command,
boolean useUids, String tag) {
- return new CompleteCommandMessage(command, useUids, tag);
+ public ImapCommandMessage createNoopMessage(ImapCommand command, String
tag) {
+ return new NoopCommandMessage(command, tag);
}
public ImapCommandMessage createCloseMessage(ImapCommand command, String
tag) {
@@ -69,7 +69,7 @@
}
public ImapCommandMessage createExamineMessage(ImapCommand command, String
mailboxName, String tag) {
- return new SelectCommandMessage(command, mailboxName, true, tag);
+ return new ExamineCommandMessage(command, mailboxName, tag);
}
public ImapCommandMessage createExpungeMessage(ImapCommand command, String
tag) {
@@ -93,7 +93,7 @@
}
public ImapCommandMessage createLsubMessage(ImapCommand command, String
referenceName, String mailboxPattern, String tag) {
- return new LsubListCommandMessage(command, referenceName,
mailboxPattern, tag);
+ return new LsubCommandMessage(command, referenceName, mailboxPattern,
tag);
}
public ImapCommandMessage createRenameMessage(ImapCommand command, String
existingName, String newName, String tag) {
@@ -101,7 +101,7 @@
}
public ImapCommandMessage createSearchImapMessage(ImapCommand command,
SearchTerm searchTerm, boolean useUids, String tag) {
- return new SearchImapCommandMessage(command, searchTerm, useUids, tag);
+ return new SearchCommandMessage(command, searchTerm, useUids, tag);
}
public ImapCommandMessage createSelectMessage(ImapCommand command, String
mailboxName, String tag) {
@@ -126,6 +126,10 @@
public ImapCommandMessage createBadRequestMessage(String message) {
return new BadResponseMessage(message);
+ }
+
+ public ImapCommandMessage createCheckMessage(ImapCommand command, String
tag) {
+ return new CheckCommandMessage(command, tag);
}
Copied:
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/CheckCommandMessage.java
(from r526862,
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/CompleteCommandMessage.java)
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/CheckCommandMessage.java?view=diff&rev=527829&p1=james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/CompleteCommandMessage.java&r1=526862&p2=james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/CheckCommandMessage.java&r2=527829
==============================================================================
---
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/CompleteCommandMessage.java
(original)
+++
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/CheckCommandMessage.java
Thu Apr 12 01:16:16 2007
@@ -24,17 +24,14 @@
import org.apache.james.imapserver.commands.ImapCommand;
import org.apache.james.imapserver.store.MailboxException;
-class CompleteCommandMessage extends AbstractImapCommandMessage {
-
- private final boolean useUids;
+class CheckCommandMessage extends AbstractImapCommandMessage {
- public CompleteCommandMessage(final ImapCommand command, final boolean
useUids, final String tag) {
+ public CheckCommandMessage(final ImapCommand command, final String tag) {
super(tag, command);
- this.useUids = useUids;
}
protected ImapResponseMessage doProcess(ImapSession session, String tag,
ImapCommand command) throws MailboxException, AuthorizationException,
ProtocolException {
- final CommandCompleteResponseMessage result = new
CommandCompleteResponseMessage(useUids, command, tag);
+ final CommandCompleteResponseMessage result = new
CommandCompleteResponseMessage(false, command, tag);
return result;
}
Added:
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/ExamineCommandMessage.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/ExamineCommandMessage.java?view=auto&rev=527829
==============================================================================
---
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/ExamineCommandMessage.java
(added)
+++
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/ExamineCommandMessage.java
Thu Apr 12 01:16:16 2007
@@ -0,0 +1,28 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.imapserver.message;
+
+import org.apache.james.imapserver.commands.ImapCommand;
+
+class ExamineCommandMessage extends SelectCommandMessage {
+
+ public ExamineCommandMessage(final ImapCommand command, final String
mailboxName, final String tag) {
+ super(command, mailboxName, true, tag);
+ }
+}
Modified:
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/ImapMessageFactory.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/ImapMessageFactory.java?view=diff&rev=527829&r1=527828&r2=527829
==============================================================================
---
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/ImapMessageFactory.java
(original)
+++
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/ImapMessageFactory.java
Thu Apr 12 01:16:16 2007
@@ -44,8 +44,10 @@
public ImapCommandMessage createCapabilityMessage(final ImapCommand
command, final String tag);
- public ImapCommandMessage createCompleteMessage(final ImapCommand
command, final boolean useUids, final String tag);
+ public ImapCommandMessage createCheckMessage(final ImapCommand command,
final String tag);
+ public ImapCommandMessage createNoopMessage(final ImapCommand command,
final String tag);
+
public ImapCommandMessage createCloseMessage(final ImapCommand command,
final String tag);
public ImapCommandMessage createCopyMessage(final ImapCommand command,
final IdRange[] idSet, final String mailboxName,
Copied:
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/LsubCommandMessage.java
(from r526862,
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/LsubListCommandMessage.java)
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/LsubCommandMessage.java?view=diff&rev=527829&p1=james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/LsubListCommandMessage.java&r1=526862&p2=james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/LsubCommandMessage.java&r2=527829
==============================================================================
---
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/LsubListCommandMessage.java
(original)
+++
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/LsubCommandMessage.java
Thu Apr 12 01:16:16 2007
@@ -23,9 +23,9 @@
import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.mailboxmanager.ListResult;
-class LsubListCommandMessage extends ListCommandMessage
+class LsubCommandMessage extends ListCommandMessage
{
- public LsubListCommandMessage(ImapCommand command, String referenceName,
String mailboxPattern, String tag) {
+ public LsubCommandMessage(ImapCommand command, String referenceName,
String mailboxPattern, String tag) {
super(command, referenceName, mailboxPattern, tag);
}
Added:
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/NoopCommandMessage.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/NoopCommandMessage.java?view=auto&rev=527829
==============================================================================
---
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/NoopCommandMessage.java
(added)
+++
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/NoopCommandMessage.java
Thu Apr 12 01:16:16 2007
@@ -0,0 +1,38 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.imapserver.message;
+
+import org.apache.james.imapserver.AuthorizationException;
+import org.apache.james.imapserver.ImapSession;
+import org.apache.james.imapserver.ProtocolException;
+import org.apache.james.imapserver.commands.ImapCommand;
+import org.apache.james.imapserver.store.MailboxException;
+
+class NoopCommandMessage extends AbstractImapCommandMessage {
+
+ public NoopCommandMessage(final ImapCommand command, final String tag) {
+ super(tag, command);
+ }
+
+ protected ImapResponseMessage doProcess(ImapSession session, String tag,
ImapCommand command) throws MailboxException, AuthorizationException,
ProtocolException {
+ final CommandCompleteResponseMessage result = new
CommandCompleteResponseMessage(false, command, tag);
+ return result;
+ }
+
+}
Copied:
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/SearchCommandMessage.java
(from r526862,
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/SearchImapCommandMessage.java)
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/SearchCommandMessage.java?view=diff&rev=527829&p1=james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/SearchImapCommandMessage.java&r1=526862&p2=james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/SearchCommandMessage.java&r2=527829
==============================================================================
---
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/SearchImapCommandMessage.java
(original)
+++
james/server/sandbox/seda-imap/src/java/org/apache/james/imapserver/message/SearchCommandMessage.java
Thu Apr 12 01:16:16 2007
@@ -31,11 +31,11 @@
import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
import org.apache.james.mailboxmanager.mailbox.ImapMailboxSession;
-class SearchImapCommandMessage extends AbstractImapCommandMessage {
+class SearchCommandMessage extends AbstractImapCommandMessage {
private final SearchTerm searchTerm;
private final boolean useUids;
- public SearchImapCommandMessage(final ImapCommand command, final
SearchTerm searchTerm, final boolean useUids,
+ public SearchCommandMessage(final ImapCommand command, final SearchTerm
searchTerm, final boolean useUids,
final String tag) {
super(tag, command);
this.searchTerm = searchTerm;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
