[prev in list] [next in list] [prev in thread] [next in thread]
List: james-dev
Subject: svn commit: r1224800 - in /james/protocols/trunk: ./ imap/
From: norman () apache ! org
Date: 2011-12-26 20:10:05
Message-ID: 20111226201005.D6081238899C () eris ! apache ! org
[Download RAW message or body]
Author: norman
Date: Mon Dec 26 20:10:05 2011
New Revision: 1224800
URL: http://svn.apache.org/viewvc?rev=1224800&view=rev
Log:
Cut down dependencies in IMAP. See PROTOCOLS-73
Modified:
james/protocols/trunk/imap/pom.xml
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
james/protocols/trunk/pom.xml
Modified: james/protocols/trunk/imap/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/pom.xml?rev=1224800&r1=1224799&r2=1224800&view=diff
==============================================================================
--- james/protocols/trunk/imap/pom.xml (original)
+++ james/protocols/trunk/imap/pom.xml Mon Dec 26 20:10:05 2011
@@ -72,21 +72,9 @@
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
<dependency>
<groupId>com.beetstra.jutf7</groupId>
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java?rev=1224800&r1=1224799&r2=1224800&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java \
(original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/EncoderUtils.java \
Mon Dec 26 20:10:05 2011 @@ -19,12 +19,12 @@
package org.apache.james.imap.encode;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
-import org.apache.commons.lang.time.FastDateFormat;
-
/**
* Utility methods for IMAP encoding.
*/
@@ -38,7 +38,8 @@ public class EncoderUtils {
* @return encoded IMAP <code>date-time</code>, not null
*/
public static String encodeDateTime(final Date date) {
- final FastDateFormat format = FastDateFormat.getInstance("dd-MMM-yyyy \
HH:mm:ss Z", TimeZone.getTimeZone("GMT"), Locale.US); + final DateFormat \
format = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss Z", Locale.US); + \
format.setTimeZone(TimeZone.getTimeZone("GMT")); final String result = \
format.format(date); return result;
}
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/ \
james/imap/decode/DecoderUtilsTest.java?rev=1224800&r1=1224799&r2=1224800&view=diff \
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java \
(original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java \
Mon Dec 26 20:10:05 2011 @@ -21,6 +21,8 @@ package org.apache.james.imap.decode;
import static org.junit.Assert.*;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
@@ -28,7 +30,6 @@ import java.util.TimeZone;
import javax.mail.Flags;
-import org.apache.commons.lang.time.FastDateFormat;
import org.junit.Test;
public class DecoderUtilsTest {
@@ -252,8 +253,9 @@ public class DecoderUtilsTest {
private String formatAsImap(Date date, TimeZone zone) {
assertNotNull(date);
- FastDateFormat format = FastDateFormat.getInstance(
- "dd-MMM-yyyy hh:mm:ss Z", zone, Locale.US);
+ DateFormat format = new SimpleDateFormat(
+ "dd-MMM-yyyy hh:mm:ss Z", Locale.US);
+ format.setTimeZone(zone);
String out = format.format(date);
if (out.charAt(0) == '0') {
out = ' ' + out.substring(1, out.length());
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/ \
james/imap/encode/base/ByteImapResponseWriter.java?rev=1224800&r1=1224799&r2=1224800&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java \
(original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java \
Mon Dec 26 20:10:05 2011 @@ -70,7 +70,10 @@ public class ByteImapResponseWriter impl
}
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.encode.ImapResponseWriter#write(byte[])
+ */
public void write(byte[] buffer) throws IOException {
out.write(buffer);
}
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/ \
james/imap/processor/base/MailboxEventAnalyserTest.java?rev=1224800&r1=1224799&r2=1224800&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java \
(original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java \
Mon Dec 26 20:10:05 2011 @@ -69,206 +69,206 @@ public class MailboxEventAnalyserTest \
{
private MailboxPath mailboxPath = new MailboxPath("namespace", "user", "name");
private final MailboxManager mockManager = new MailboxManager() {
- @Override
+
public void removeListener(MailboxPath mailboxPath, MailboxListener listner, \
MailboxSession session) throws MailboxException {
}
- @Override
+
public void removeGlobalListener(MailboxListener listner, MailboxSession \
session) throws MailboxException {
}
- @Override
+
public void addListener(MailboxPath mailboxPath, MailboxListener listener, \
MailboxSession session) throws MailboxException {
}
- @Override
+
public void addGlobalListener(MailboxListener listener, MailboxSession \
session) throws MailboxException {
}
- @Override
+
public void startProcessingRequest(MailboxSession session) {
}
- @Override
+
public void endProcessingRequest(MailboxSession session) {
}
- @Override
+
public List<MailboxMetaData> search(MailboxQuery expression, MailboxSession \
session) throws MailboxException { throw new UnsupportedOperationException("Not \
implemented");
}
- @Override
+
public void renameMailbox(MailboxPath from, MailboxPath to, MailboxSession \
session) throws MailboxException { throw new UnsupportedOperationException("Not \
implemented");
}
- @Override
+
public boolean mailboxExists(MailboxPath mailboxPath, MailboxSession \
session) throws MailboxException { throw new UnsupportedOperationException("Not \
implemented");
}
- @Override
+
public void logout(MailboxSession session, boolean force) throws \
MailboxException { throw new UnsupportedOperationException("Not implemented");
}
- @Override
+
public MailboxSession login(String userid, String passwd, Logger log) throws \
BadCredentialsException, MailboxException { throw new \
UnsupportedOperationException("Not implemented");
}
- @Override
+
public List<MailboxPath> list(MailboxSession session) throws \
MailboxException { throw new UnsupportedOperationException("Not implemented");
}
- @Override
+
public MessageManager getMailbox(MailboxPath mailboxPath, MailboxSession \
session) throws MailboxException { return new MessageManager() {
- @Override
+
public long getMessageCount(MailboxSession mailboxSession) throws \
MailboxException { return 1;
}
- @Override
+
public boolean isWriteable(MailboxSession session) {
return false;
}
- @Override
+
public boolean isModSeqPermanent(MailboxSession session) {
return false;
}
- @Override
+
public Iterator<Long> search(SearchQuery searchQuery, MailboxSession \
mailboxSession) throws MailboxException {
throw new UnsupportedOperationException("Not implemented");
}
- @Override
+
public Iterator<Long> expunge(MessageRange set, MailboxSession \
mailboxSession) throws MailboxException {
throw new UnsupportedOperationException("Not implemented");
}
- @Override
+
public Map<Long, Flags> setFlags(Flags flags, boolean value, boolean \
replace, MessageRange set, MailboxSession mailboxSession) throws \
MailboxException {
throw new UnsupportedOperationException("Not implemented");
}
- @Override
+
public long appendMessage(InputStream msgIn, Date internalDate, \
MailboxSession mailboxSession, boolean isRecent, Flags flags) throws MailboxException \
{
throw new UnsupportedOperationException("Not implemented");
}
- @Override
+
public MessageResultIterator getMessages(MessageRange set, \
FetchGroup fetchGroup, MailboxSession mailboxSession) throws MailboxException { \
return new MessageResultIterator() { boolean done = false;
- @Override
+
public void remove() {
throw new UnsupportedOperationException("Not \
implemented"); }
- @Override
+
public MessageResult next() {
done = true;
return new MessageResult() {
- @Override
+
public int compareTo(MessageResult o) {
return 0;
}
- @Override
+
public long getUid() {
return 1;
}
- @Override
+
public long getModSeq() {
return 0;
}
- @Override
+
public Flags getFlags() {
return new Flags();
}
- @Override
+
public long getSize() {
return 0;
}
- @Override
+
public Date getInternalDate() {
throw new UnsupportedOperationException("Not \
implemented");
}
- @Override
+
public MimeDescriptor getMimeDescriptor() throws \
MailboxException {
throw new UnsupportedOperationException("Not \
implemented"); }
- @Override
+
public Iterator<Header> iterateHeaders(MimePath \
path) throws MailboxException {
throw new UnsupportedOperationException("Not \
implemented");
}
- @Override
+
public Iterator<Header> iterateMimeHeaders(MimePath \
path) throws MailboxException {
throw new UnsupportedOperationException("Not \
implemented"); }
- @Override
+
public Content getFullContent() throws \
MailboxException, IOException {
throw new UnsupportedOperationException("Not \
implemented");
}
- @Override
+
public Content getFullContent(MimePath path) throws \
MailboxException {
throw new UnsupportedOperationException("Not \
implemented");
}
- @Override
+
public Content getBody() throws MailboxException, \
IOException {
throw new UnsupportedOperationException("Not \
implemented");
}
- @Override
+
public Content getBody(MimePath path) throws \
MailboxException {
throw new UnsupportedOperationException("Not \
implemented");
}
- @Override
+
public Content getMimeBody(MimePath path) throws \
MailboxException {
throw new UnsupportedOperationException("Not \
implemented");
}
- @Override
+
public Headers getHeaders() throws MailboxException \
{
throw new UnsupportedOperationException("Not \
implemented");
@@ -277,19 +277,19 @@ public class MailboxEventAnalyserTest {
};
}
- @Override
+
public boolean hasNext() {
return !done;
}
- @Override
+
public MailboxException getException() {
return null;
}
};
}
- @Override
+
public MetaData getMetaData(boolean resetRecent, MailboxSession \
mailboxSession, org.apache.james.mailbox.MessageManager.MetaData.FetchGroup \
fetchGroup) throws MailboxException {
throw new UnsupportedOperationException("Not implemented");
@@ -298,29 +298,29 @@ public class MailboxEventAnalyserTest {
};
}
- @Override
+
public char getDelimiter() {
return '.';
}
- @Override
+
public void deleteMailbox(MailboxPath mailboxPath, MailboxSession session) \
throws MailboxException { throw new UnsupportedOperationException("Not \
implemented");
}
- @Override
+
public MailboxSession createSystemSession(String userName, Logger log) \
throws BadCredentialsException, MailboxException { throw new \
UnsupportedOperationException("Not implemented"); }
- @Override
+
public void createMailbox(MailboxPath mailboxPath, MailboxSession \
mailboxSession) throws MailboxException { throw new \
UnsupportedOperationException("Not implemented");
}
- @Override
+
public List<MessageRange> copyMessages(MessageRange set, MailboxPath from, \
MailboxPath to, MailboxSession session) throws MailboxException { throw new \
UnsupportedOperationException("Not implemented");
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/ \
james/imap/processor/fetch/MessageResultUtilsTest.java?rev=1224800&r1=1224799&r2=1224800&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java \
(original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java \
Mon Dec 26 20:10:05 2011 @@ -66,7 +66,7 @@ public class MessageResultUtilsTest {
return value;
}
- @Override
+
public InputStream getInputStream() throws IOException {
return null;
}
Modified: james/protocols/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1224800&r1=1224799&r2=1224800&view=diff
==============================================================================
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Mon Dec 26 20:10:05 2011
@@ -153,28 +153,6 @@
<!--
END Mail
-->
-
- <!--
- Start Commons
- -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${version.commons-collections}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${version.commons-lang}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <!--
- END Commons
- -->
<dependency>
<groupId>com.beetstra.jutf7</groupId>
<artifactId>jutf7</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic