Author: norman
Date: Tue Dec 27 20:29:56 2011
New Revision: 1225005
URL: http://svn.apache.org/viewvc?rev=1225005&view=rev
Log:
move util classes to new package. See PROTOCOLS-73
Added:
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/EolInputStream.java
- copied, changed from r1224780,
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/base/EolInputStream.java
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/FastByteArrayOutputStream.java
- copied, changed from r1224780,
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/utils/io/FastByteArrayOutputStream.java
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java
- copied, changed from r1224780,
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/base/FixedLengthInputStream.java
Removed:
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/base/EolInputStream.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/base/FixedLengthInputStream.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/utils/io/FastByteArrayOutputStream.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/encode/base/InternetPrintWriter.java
Modified:
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/ImapSession.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequestLineReader.java
Modified:
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/ImapSession.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/ImapSession.java?rev=1225005&r1=1225004&r2=1225005&view=diff
==============================================================================
---
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/ImapSession.java
(original)
+++
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/ImapSession.java
Tue Dec 27 20:29:56 2011
@@ -149,19 +149,6 @@ public interface ImapSession {
public boolean startCompression();
/**
- * Push in a new {@link ImapLineHandler} which is called for the next line
received
- *
- * @param lineHandler
- */
- public void pushLineHandler(ImapLineHandler lineHandler);
-
- /**
- * Pop the current {@link ImapLineHandler}
- *
- */
- public void popLineHandler();
-
- /**
* Return true if multiple namespaces are supported
*
* @return multipleNamespaces
@@ -175,5 +162,20 @@ public interface ImapSession {
* @return plainDisallowed
*/
public boolean isPlainAuthDisallowed();
+
+ /**
+ * Push in a new {@link ImapLineHandler} which is called for the next line
received
+ *
+ * @param lineHandler
+ */
+ public void pushLineHandler(ImapLineHandler lineHandler);
+
+ /**
+ * Pop the current {@link ImapLineHandler}
+ *
+ */
+ public void popLineHandler();
+
+
}
Modified:
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java?rev=1225005&r1=1225004&r2=1225005&view=diff
==============================================================================
---
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
(original)
+++
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
Tue Dec 27 20:29:56 2011
@@ -43,7 +43,7 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.message.request.DayMonthYear;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.SearchResUtil;
-import org.apache.james.imap.utils.io.FastByteArrayOutputStream;
+import org.apache.james.protocols.imap.utils.FastByteArrayOutputStream;
/**
* Wraps the client input reader with a bunch of convenience methods, allowing
Modified:
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java?rev=1225005&r1=1225004&r2=1225005&view=diff
==============================================================================
---
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java
(original)
+++
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/ImapRequestStreamLineReader.java
Tue Dec 27 20:29:56 2011
@@ -24,8 +24,8 @@ import java.io.InputStream;
import java.io.OutputStream;
import org.apache.james.imap.api.display.HumanReadableText;
-import org.apache.james.imap.decode.base.EolInputStream;
-import org.apache.james.imap.decode.base.FixedLengthInputStream;
+import org.apache.james.protocols.imap.utils.EolInputStream;
+import org.apache.james.protocols.imap.utils.FixedLengthInputStream;
/**
* {@link ImapRequestLineReader} which use normal IO Streaming
Modified:
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java?rev=1225005&r1=1225004&r2=1225005&view=diff
==============================================================================
---
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
(original)
+++
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
Tue Dec 27 20:29:56 2011
@@ -30,7 +30,7 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.encode.ImapResponseComposer;
import org.apache.james.imap.encode.ImapResponseWriter;
import org.apache.james.imap.message.response.Literal;
-import org.apache.james.imap.utils.io.FastByteArrayOutputStream;
+import org.apache.james.protocols.imap.utils.FastByteArrayOutputStream;
/**
* Class providing methods to send response messages from the server to the
Modified:
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequestLineReader.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequestLineReader.java?rev=1225005&r1=1225004&r2=1225005&view=diff
==============================================================================
---
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequestLineReader.java
(original)
+++
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequestLineReader.java
Tue Dec 27 20:29:56 2011
@@ -27,8 +27,8 @@ import java.util.Iterator;
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.decode.DecodingException;
import org.apache.james.imap.decode.ImapRequestLineReader;
-import org.apache.james.imap.decode.base.EolInputStream;
-import org.apache.james.imap.decode.base.FixedLengthInputStream;
+import org.apache.james.protocols.imap.utils.EolInputStream;
+import org.apache.james.protocols.imap.utils.FixedLengthInputStream;
public class IMAPRequestLineReader extends ImapRequestLineReader{
Copied:
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/EolInputStream.java
(from r1224780,
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/base/EolInputStream.java)
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/EolInputStream.java?p2=james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/EolInputStream.java&p1=james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/base/EolInputStream.java&r1=1224780&r2=1225005&rev=1225005&view=diff
==============================================================================
---
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/base/EolInputStream.java
(original)
+++
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/EolInputStream.java
Tue Dec 27 20:29:56 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.decode.base;
+package org.apache.james.protocols.imap.utils;
import java.io.FileInputStream;
import java.io.FilterInputStream;
Copied:
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/FastByteArrayOutputStream.java
(from r1224780,
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/utils/io/FastByteArrayOutputStream.java)
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/FastByteArrayOutputStream.java?p2=james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/FastByteArrayOutputStream.java&p1=james/protocols/trunk/imap/src/main/java/org/apache/james/imap/utils/io/FastByteArrayOutputStream.java&r1=1224780&r2=1225005&rev=1225005&view=diff
==============================================================================
---
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/utils/io/FastByteArrayOutputStream.java
(original)
+++
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/FastByteArrayOutputStream.java
Tue Dec 27 20:29:56 2011
@@ -1,4 +1,4 @@
-package org.apache.james.imap.utils.io;
+package org.apache.james.protocols.imap.utils;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied:
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java
(from r1224780,
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/base/FixedLengthInputStream.java)
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java?p2=james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java&p1=james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/base/FixedLengthInputStream.java&r1=1224780&r2=1225005&rev=1225005&view=diff
==============================================================================
---
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/decode/base/FixedLengthInputStream.java
(original)
+++
james/protocols/trunk/imap/src/main/java/org/apache/james/protocols/imap/utils/FixedLengthInputStream.java
Tue Dec 27 20:29:56 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.decode.base;
+package org.apache.james.protocols.imap.utils;
import java.io.FilterInputStream;
import java.io.IOException;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
