Author: bago
Date: Sun Aug 10 08:39:37 2008
New Revision: 684523
URL: http://svn.apache.org/viewvc?rev=684523&view=rev
Log:
Repackaging utils.
moved core-library/util.io to common-util.
moved core-library/util stream handling classes to the stream subpackage.
Added:
james/server/trunk/common-util/src/main/java/org/apache/james/util/io/
- copied from r684501,
james/server/trunk/core-library/src/main/java/org/apache/james/util/io/
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CRLFOutputStream.java
(contents, props changed)
- copied, changed from r684501,
james/server/trunk/core-library/src/main/java/org/apache/james/util/CRLFOutputStream.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CharTerminatedInputStream.java
(contents, props changed)
- copied, changed from r684501,
james/server/trunk/core-library/src/main/java/org/apache/james/util/CharTerminatedInputStream.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DebugInputStream.java
(contents, props changed)
- copied, changed from r684501,
james/server/trunk/core-library/src/main/java/org/apache/james/util/DebugInputStream.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DotStuffingInputStream.java
(contents, props changed)
- copied, changed from r684501,
james/server/trunk/core-library/src/main/java/org/apache/james/util/DotStuffingInputStream.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/ExtraDotOutputStream.java
(contents, props changed)
- copied, changed from r684501,
james/server/trunk/core-library/src/main/java/org/apache/james/util/ExtraDotOutputStream.java
Removed:
james/server/trunk/core-library/src/main/java/org/apache/james/util/CRLFOutputStream.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/CharTerminatedInputStream.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/DebugInputStream.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/DotStuffingInputStream.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/ExtraDotOutputStream.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/io/
james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java
james/server/trunk/core-library/src/test/java/org/apache/james/util/CRLFOutputStreamTest.java
james/server/trunk/core-library/src/test/java/org/apache/james/util/ExtraDotOutputStreamTest.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/util/MessageGenerator.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/TestUtil.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/redundant/AbstractMailRepositoryTestCase.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java?rev=684523&r1=684522&r2=684523&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java
Sun Aug 10 08:39:37 2008
@@ -40,7 +40,7 @@
import org.apache.james.core.MailImpl;
import
org.apache.james.mailrepository.javamail.HashJavamailStoreMailRepository.KeyToMsgMap.MsgObj;
-import org.apache.james.util.CRLFOutputStream;
+import org.apache.james.util.stream.CRLFOutputStream;
import org.apache.mailet.Mail;
/**
Copied:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CRLFOutputStream.java
(from r684501,
james/server/trunk/core-library/src/main/java/org/apache/james/util/CRLFOutputStream.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CRLFOutputStream.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CRLFOutputStream.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/CRLFOutputStream.java&r1=684501&r2=684523&rev=684523&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/util/CRLFOutputStream.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CRLFOutputStream.java
Sun Aug 10 08:39:37 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.util;
+package org.apache.james.util.stream;
import java.io.FilterOutputStream;
import java.io.IOException;
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CRLFOutputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CRLFOutputStream.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CharTerminatedInputStream.java
(from r684501,
james/server/trunk/core-library/src/main/java/org/apache/james/util/CharTerminatedInputStream.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CharTerminatedInputStream.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CharTerminatedInputStream.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/CharTerminatedInputStream.java&r1=684501&r2=684523&rev=684523&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/util/CharTerminatedInputStream.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CharTerminatedInputStream.java
Sun Aug 10 08:39:37 2008
@@ -19,7 +19,7 @@
-package org.apache.james.util;
+package org.apache.james.util.stream;
import java.io.IOException;
import java.io.InputStream;
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CharTerminatedInputStream.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2.4.4
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CharTerminatedInputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/CharTerminatedInputStream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DebugInputStream.java
(from r684501,
james/server/trunk/core-library/src/main/java/org/apache/james/util/DebugInputStream.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DebugInputStream.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DebugInputStream.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/DebugInputStream.java&r1=684501&r2=684523&rev=684523&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/util/DebugInputStream.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DebugInputStream.java
Sun Aug 10 08:39:37 2008
@@ -19,7 +19,7 @@
-package org.apache.james.util;
+package org.apache.james.util.stream;
import java.io.IOException;
import java.io.InputStream;
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DebugInputStream.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.4.4.3
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DebugInputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DebugInputStream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DotStuffingInputStream.java
(from r684501,
james/server/trunk/core-library/src/main/java/org/apache/james/util/DotStuffingInputStream.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DotStuffingInputStream.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DotStuffingInputStream.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/DotStuffingInputStream.java&r1=684501&r2=684523&rev=684523&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/util/DotStuffingInputStream.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DotStuffingInputStream.java
Sun Aug 10 08:39:37 2008
@@ -19,7 +19,7 @@
-package org.apache.james.util;
+package org.apache.james.util.stream;
import java.io.FilterInputStream;
import java.io.IOException;
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DotStuffingInputStream.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1.2.2
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DotStuffingInputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DotStuffingInputStream.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/DotStuffingInputStream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/ExtraDotOutputStream.java
(from r684501,
james/server/trunk/core-library/src/main/java/org/apache/james/util/ExtraDotOutputStream.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/ExtraDotOutputStream.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/ExtraDotOutputStream.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/ExtraDotOutputStream.java&r1=684501&r2=684523&rev=684523&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/util/ExtraDotOutputStream.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/ExtraDotOutputStream.java
Sun Aug 10 08:39:37 2008
@@ -19,7 +19,7 @@
-package org.apache.james.util;
+package org.apache.james.util.stream;
import java.io.IOException;
import java.io.OutputStream;
@@ -43,7 +43,7 @@
* Overrides super writeChunk in order to add a "." if the previous chunk
ended with
* a new line and a new chunk starts with "."
*
- * @see org.apache.james.util.CRLFOutputStream#writeChunk(byte[], int, int)
+ * @see org.apache.james.util.stream.CRLFOutputStream#writeChunk(byte[],
int, int)
*/
protected void writeChunk(byte buffer[], int offset, int length) throws
IOException {
if (length > 0 && buffer[offset] == '.' && startOfLine) {
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/ExtraDotOutputStream.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2.4.5
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/ExtraDotOutputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/core-library/src/main/java/org/apache/james/util/stream/ExtraDotOutputStream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
james/server/trunk/core-library/src/test/java/org/apache/james/util/CRLFOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/util/CRLFOutputStreamTest.java?rev=684523&r1=684522&r2=684523&view=diff
==============================================================================
---
james/server/trunk/core-library/src/test/java/org/apache/james/util/CRLFOutputStreamTest.java
(original)
+++
james/server/trunk/core-library/src/test/java/org/apache/james/util/CRLFOutputStreamTest.java
Sun Aug 10 08:39:37 2008
@@ -19,6 +19,8 @@
package org.apache.james.util;
+import org.apache.james.util.stream.CRLFOutputStream;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
Modified:
james/server/trunk/core-library/src/test/java/org/apache/james/util/ExtraDotOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/util/ExtraDotOutputStreamTest.java?rev=684523&r1=684522&r2=684523&view=diff
==============================================================================
---
james/server/trunk/core-library/src/test/java/org/apache/james/util/ExtraDotOutputStreamTest.java
(original)
+++
james/server/trunk/core-library/src/test/java/org/apache/james/util/ExtraDotOutputStreamTest.java
Sun Aug 10 08:39:37 2008
@@ -19,6 +19,8 @@
package org.apache.james.util;
+import org.apache.james.util.stream.ExtraDotOutputStream;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
Modified:
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java?rev=684523&r1=684522&r2=684523&view=diff
==============================================================================
---
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
(original)
+++
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
Sun Aug 10 08:39:37 2008
@@ -25,9 +25,9 @@
import org.apache.james.core.MailHeaders;
import org.apache.james.nntpserver.repository.NNTPArticle;
import org.apache.james.nntpserver.repository.NNTPGroup;
-import org.apache.james.util.CharTerminatedInputStream;
-import org.apache.james.util.DotStuffingInputStream;
-import org.apache.james.util.ExtraDotOutputStream;
+import org.apache.james.util.stream.CharTerminatedInputStream;
+import org.apache.james.util.stream.DotStuffingInputStream;
+import org.apache.james.util.stream.ExtraDotOutputStream;
import org.apache.mailet.dates.RFC2980DateFormat;
import org.apache.mailet.dates.RFC977DateFormat;
import org.apache.mailet.dates.SimplifiedDateFormat;
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/util/MessageGenerator.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/util/MessageGenerator.java?rev=684523&r1=684522&r2=684523&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/util/MessageGenerator.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/util/MessageGenerator.java
Sun Aug 10 08:39:37 2008
@@ -19,7 +19,7 @@
package org.apache.james.imapserver.util;
-import org.apache.james.util.CRLFOutputStream;
+import org.apache.james.util.stream.CRLFOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/TestUtil.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/TestUtil.java?rev=684523&r1=684522&r2=684523&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/TestUtil.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/TestUtil.java
Sun Aug 10 08:39:37 2008
@@ -20,7 +20,7 @@
package org.apache.james.mailboxmanager;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.james.util.CRLFOutputStream;
+import org.apache.james.util.stream.CRLFOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/redundant/AbstractMailRepositoryTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/redundant/AbstractMailRepositoryTestCase.java?rev=684523&r1=684522&r2=684523&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/redundant/AbstractMailRepositoryTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/redundant/AbstractMailRepositoryTestCase.java
Sun Aug 10 08:39:37 2008
@@ -38,7 +38,7 @@
import org.apache.james.core.MailImpl;
import
org.apache.james.mailrepository.javamail.HashJavamailStoreMailRepository;
import org.apache.james.services.MailRepository;
-import org.apache.james.util.CRLFOutputStream;
+import org.apache.james.util.stream.CRLFOutputStream;
import org.apache.mailet.Mail;
public abstract class AbstractMailRepositoryTestCase extends TestCase {
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java?rev=684523&r1=684522&r2=684523&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java
Sun Aug 10 08:39:37 2008
@@ -21,7 +21,7 @@
package org.apache.james.pop3server;
-import org.apache.james.util.ExtraDotOutputStream;
+import org.apache.james.util.stream.ExtraDotOutputStream;
import org.apache.james.util.watchdog.BytesWrittenResetOutputStream;
import org.apache.mailet.Mail;
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java?rev=684523&r1=684522&r2=684523&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java
Sun Aug 10 08:39:37 2008
@@ -21,7 +21,7 @@
package org.apache.james.pop3server;
-import org.apache.james.util.ExtraDotOutputStream;
+import org.apache.james.util.stream.ExtraDotOutputStream;
import org.apache.james.util.watchdog.BytesWrittenResetOutputStream;
import org.apache.mailet.Mail;
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java?rev=684523&r1=684522&r2=684523&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
Sun Aug 10 08:39:37 2008
@@ -30,9 +30,9 @@
import org.apache.james.smtpserver.MessageSizeException;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.smtpserver.SizeLimitedInputStream;
-import org.apache.james.util.CharTerminatedInputStream;
-import org.apache.james.util.DotStuffingInputStream;
import org.apache.james.util.mail.dsn.DSNStatus;
+import org.apache.james.util.stream.CharTerminatedInputStream;
+import org.apache.james.util.stream.DotStuffingInputStream;
import org.apache.james.util.watchdog.BytesReadResetInputStream;
import org.apache.mailet.MailAddress;
import org.apache.mailet.RFC2822Headers;
Modified:
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=684523&r1=684522&r2=684523&view=diff
==============================================================================
---
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
(original)
+++
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
Sun Aug 10 08:39:37 2008
@@ -62,7 +62,7 @@
import org.apache.james.mailboxmanager.torque.om.MessageRowPeer;
import org.apache.james.mailboxmanager.util.UidChangeTracker;
import org.apache.james.mailboxmanager.util.UidRange;
-import org.apache.james.util.CRLFOutputStream;
+import org.apache.james.util.stream.CRLFOutputStream;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
