Author: rdonkin
Date: Fri Mar 27 07:47:28 2009
New Revision: 759043
URL: http://svn.apache.org/viewvc?rev=759043&view=rev
Log:
Renamed files causing issues on windows
Added:
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
- copied, changed from r757818,
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/STATUSResponseEncoder.java
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/MailboxStatusResponse.java
- copied, changed from r757818,
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/STATUSResponse.java
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
- copied, changed from r757818,
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/STATUSResponseEncoderTest.java
Removed:
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/STATUSResponseEncoder.java
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/STATUSResponse.java
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/STATUSResponseEncoderTest.java
Modified:
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
Copied:
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
(from r757818,
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/STATUSResponseEncoder.java)
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/STATUSResponseEncoder.java&r1=757818&r2=759043&rev=759043&view=diff
==============================================================================
---
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/STATUSResponseEncoder.java
(original)
+++
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
Fri Mar 27 07:47:28 2009
@@ -24,20 +24,20 @@
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
-import org.apache.james.imap.message.response.STATUSResponse;
+import org.apache.james.imap.message.response.MailboxStatusResponse;
/**
* Encodes <code>STATUS</code> responses.
*/
-public class STATUSResponseEncoder extends AbstractChainedImapEncoder {
+public class MailboxStatusResponseEncoder extends AbstractChainedImapEncoder {
- public STATUSResponseEncoder(ImapEncoder next) {
+ public MailboxStatusResponseEncoder(ImapEncoder next) {
super(next);
}
protected void doEncode(ImapMessage acceptableMessage,
ImapResponseComposer composer, ImapSession session) throws
IOException {
- STATUSResponse response = (STATUSResponse) acceptableMessage;
+ MailboxStatusResponse response = (MailboxStatusResponse)
acceptableMessage;
composer.statusResponse(response.getMessages(), response.getRecent(),
response.getUidNext(), response.getUidValidity(), response
.getUnseen(), response.getMailbox());
@@ -45,7 +45,7 @@
}
protected boolean isAcceptable(ImapMessage message) {
- return message != null && message instanceof STATUSResponse;
+ return message != null && message instanceof MailboxStatusResponse;
}
}
Modified:
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java?rev=759043&r1=759042&r2=759043&view=diff
==============================================================================
---
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
(original)
+++
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
Fri Mar 27 07:47:28 2009
@@ -29,7 +29,7 @@
import org.apache.james.imap.encode.LSubResponseEncoder;
import org.apache.james.imap.encode.ListResponseEncoder;
import org.apache.james.imap.encode.RecentResponseEncoder;
-import org.apache.james.imap.encode.STATUSResponseEncoder;
+import org.apache.james.imap.encode.MailboxStatusResponseEncoder;
import org.apache.james.imap.encode.SearchResponseEncoder;
import org.apache.james.imap.encode.StatusResponseEncoder;
import org.apache.james.imap.encode.base.EndImapEncoder;
@@ -51,7 +51,7 @@
fetchResponseEncoder);
final ExistsResponseEncoder existsResponseEncoder = new
ExistsResponseEncoder(
expungeResponseEncoder);
- final STATUSResponseEncoder statusCommandResponseEncoder = new
STATUSResponseEncoder(
+ final MailboxStatusResponseEncoder statusCommandResponseEncoder = new
MailboxStatusResponseEncoder(
existsResponseEncoder);
final SearchResponseEncoder searchResponseEncoder = new
SearchResponseEncoder(
statusCommandResponseEncoder);
Copied:
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/MailboxStatusResponse.java
(from r757818,
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/STATUSResponse.java)
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/MailboxStatusResponse.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/MailboxStatusResponse.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/STATUSResponse.java&r1=757818&r2=759043&rev=759043&view=diff
==============================================================================
---
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/STATUSResponse.java
(original)
+++
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/MailboxStatusResponse.java
Fri Mar 27 07:47:28 2009
@@ -24,7 +24,7 @@
/**
* Represents a <code>STATUS</code> response. See <code>RFC3501 7.2.4</code>.
*/
-public class STATUSResponse implements ImapResponseMessage {
+public class MailboxStatusResponse implements ImapResponseMessage {
private final Long messages;
@@ -38,7 +38,7 @@
private final String mailbox;
- public STATUSResponse(final Long messages, final Long recent,
+ public MailboxStatusResponse(final Long messages, final Long recent,
final Long uidNext, final Long uidValidity, final Long unseen,
final String mailbox) {
super();
Copied:
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
(from r757818,
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/STATUSResponseEncoderTest.java)
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java?p2=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java&p1=james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/STATUSResponseEncoderTest.java&r1=757818&r2=759043&rev=759043&view=diff
==============================================================================
---
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/STATUSResponseEncoderTest.java
(original)
+++
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
Fri Mar 27 07:47:28 2009
@@ -22,14 +22,14 @@
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.encode.ImapEncoder;
import org.apache.james.imap.encode.ImapResponseComposer;
-import org.apache.james.imap.encode.STATUSResponseEncoder;
-import org.apache.james.imap.message.response.STATUSResponse;
+import org.apache.james.imap.encode.MailboxStatusResponseEncoder;
+import org.apache.james.imap.message.response.MailboxStatusResponse;
import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
-public class STATUSResponseEncoderTest extends MockObjectTestCase {
+public class MailboxStatusResponseEncoderTest extends MockObjectTestCase {
- STATUSResponseEncoder encoder;
+ MailboxStatusResponseEncoder encoder;
ImapEncoder mockNextEncoder;
@@ -39,7 +39,7 @@
super.setUp();
mockNextEncoder = mock(ImapEncoder.class);
composer = mock(ImapResponseComposer.class);
- encoder = new STATUSResponseEncoder(mockNextEncoder);
+ encoder = new MailboxStatusResponseEncoder(mockNextEncoder);
}
protected void tearDown() throws Exception {
@@ -47,7 +47,7 @@
}
public void testIsAcceptable() throws Exception {
- assertTrue(encoder.isAcceptable(new STATUSResponse(null, null, null,
+ assertTrue(encoder.isAcceptable(new MailboxStatusResponse(null, null,
null,
null, null, "mailbox")));
assertFalse(encoder.isAcceptable(mock(ImapMessage.class)));
assertFalse(encoder.isAcceptable(null));
@@ -71,7 +71,7 @@
);
}});
- encoder.encode(new STATUSResponse(messages, recent, uidNext,
+ encoder.encode(new MailboxStatusResponse(messages, recent, uidNext,
uidValidity, unseen, mailbox), composer, new
FakeImapSession());
}
}
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java?rev=759043&r1=759042&r2=759043&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
Fri Mar 27 07:47:28 2009
@@ -33,7 +33,7 @@
import org.apache.james.imap.mailbox.MailboxManagerProvider;
import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.message.request.StatusRequest;
-import org.apache.james.imap.message.response.STATUSResponse;
+import org.apache.james.imap.message.response.MailboxStatusResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
public class StatusProcessor extends AbstractMailboxProcessor {
@@ -77,7 +77,7 @@
mailboxSession, mailbox);
final Long unseen = unseen(statusDataItems, mailboxSession,
mailbox);
- final STATUSResponse response = new STATUSResponse(messages,
+ final MailboxStatusResponse response = new
MailboxStatusResponse(messages,
recent, uidNext, uidValidity, unseen, mailboxName);
responder.respond(response);
unsolicitedResponses(session, responder, false);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
