Author: bago
Date: Thu Aug 7 01:23:22 2008
New Revision: 683543
URL: http://svn.apache.org/viewvc?rev=683543&view=rev
Log:
Created a message.storage package and moved 4 utility classes there (this is a
specific local package to message) (MIME4J-51).
We previously discussed about this, but I forgot to include it in the proposal.
Applying it in CTR because people agreed that removing from util is good.
Added:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/SimpleTempStorage.java
- copied, changed from r677844,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/SimpleTempStorage.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempFile.java
- copied, changed from r677844,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempFile.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempPath.java
- copied, changed from r677844,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempPath.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempStorage.java
- copied, changed from r677844,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempStorage.java
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/SimpleTempStorageTest.java
- copied, changed from r680968,
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/SimpleTempStorageTest.java
Removed:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/SimpleTempStorage.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempFile.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempPath.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempStorage.java
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/SimpleTempStorageTest.java
Modified:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileTextBody.java
Modified:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java?rev=683543&r1=683542&r2=683543&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java
Thu Aug 7 01:23:22 2008
@@ -20,9 +20,9 @@
package org.apache.james.mime4j.message;
import org.apache.james.mime4j.decoder.CodecUtil;
-import org.apache.james.mime4j.util.TempFile;
-import org.apache.james.mime4j.util.TempPath;
-import org.apache.james.mime4j.util.TempStorage;
+import org.apache.james.mime4j.message.storage.TempFile;
+import org.apache.james.mime4j.message.storage.TempPath;
+import org.apache.james.mime4j.message.storage.TempStorage;
import java.io.IOException;
import java.io.InputStream;
@@ -30,7 +30,7 @@
/**
- * Binary body backed by a [EMAIL PROTECTED]
org.apache.james.mime4j.util.TempFile}.
+ * Binary body backed by a [EMAIL PROTECTED]
org.apache.james.mime4j.message.storage.TempFile}.
*
*
* @version $Id: TempFileBinaryBody.java,v 1.2 2004/10/02 12:41:11 ntherning
Exp $
Modified:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileTextBody.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileTextBody.java?rev=683543&r1=683542&r2=683543&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileTextBody.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileTextBody.java
Thu Aug 7 01:23:22 2008
@@ -22,10 +22,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.mime4j.decoder.CodecUtil;
+import org.apache.james.mime4j.message.storage.TempFile;
+import org.apache.james.mime4j.message.storage.TempPath;
+import org.apache.james.mime4j.message.storage.TempStorage;
import org.apache.james.mime4j.util.CharsetUtil;
-import org.apache.james.mime4j.util.TempFile;
-import org.apache.james.mime4j.util.TempPath;
-import org.apache.james.mime4j.util.TempStorage;
import java.io.IOException;
import java.io.InputStream;
@@ -36,7 +36,7 @@
/**
- * Text body backed by a [EMAIL PROTECTED]
org.apache.james.mime4j.util.TempFile}.
+ * Text body backed by a [EMAIL PROTECTED]
org.apache.james.mime4j.message.storage.TempFile}.
*
*
* @version $Id: TempFileTextBody.java,v 1.3 2004/10/25 07:26:46 ntherning Exp
$
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/SimpleTempStorage.java
(from r677844,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/SimpleTempStorage.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/SimpleTempStorage.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/SimpleTempStorage.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/SimpleTempStorage.java&r1=677844&r2=683543&rev=683543&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/SimpleTempStorage.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/SimpleTempStorage.java
Thu Aug 7 01:23:22 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.util;
+package org.apache.james.mime4j.message.storage;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -110,7 +110,7 @@
}
/**
- * @see org.apache.james.mime4j.util.TempStorage#getRootTempPath()
+ * @see
org.apache.james.mime4j.message.storage.TempStorage#getRootTempPath()
*/
public TempPath getRootTempPath() {
return rootPath;
@@ -128,14 +128,14 @@
}
/**
- * @see org.apache.james.mime4j.util.TempPath#createTempFile()
+ * @see
org.apache.james.mime4j.message.storage.TempPath#createTempFile()
*/
public TempFile createTempFile() throws IOException {
return SimpleTempStorage.this.createTempFile(this, null, null);
}
/**
- * @see
org.apache.james.mime4j.util.TempPath#createTempFile(java.lang.String,
java.lang.String)
+ * @see
org.apache.james.mime4j.message.storage.TempPath#createTempFile(java.lang.String,
java.lang.String)
*/
public TempFile createTempFile(String prefix, String suffix)
throws IOException {
@@ -144,7 +144,7 @@
}
/**
- * @see
org.apache.james.mime4j.util.TempPath#createTempFile(java.lang.String,
java.lang.String, boolean)
+ * @see
org.apache.james.mime4j.message.storage.TempPath#createTempFile(java.lang.String,
java.lang.String, boolean)
*/
public TempFile createTempFile(String prefix, String suffix,
boolean allowInMemory)
@@ -154,7 +154,7 @@
}
/**
- * @see org.apache.james.mime4j.util.TempPath#getAbsolutePath()
+ * @see
org.apache.james.mime4j.message.storage.TempPath#getAbsolutePath()
*/
public String getAbsolutePath() {
return path.getAbsolutePath();
@@ -167,14 +167,14 @@
}
/**
- * @see org.apache.james.mime4j.util.TempPath#createTempPath()
+ * @see
org.apache.james.mime4j.message.storage.TempPath#createTempPath()
*/
public TempPath createTempPath() throws IOException {
return SimpleTempStorage.this.createTempPath(this, null);
}
/**
- * @see
org.apache.james.mime4j.util.TempPath#createTempPath(java.lang.String)
+ * @see
org.apache.james.mime4j.message.storage.TempPath#createTempPath(java.lang.String)
*/
public TempPath createTempPath(String prefix) throws IOException {
return SimpleTempStorage.this.createTempPath(this, prefix);
@@ -191,21 +191,21 @@
}
/**
- * @see org.apache.james.mime4j.util.TempFile#getInputStream()
+ * @see
org.apache.james.mime4j.message.storage.TempFile#getInputStream()
*/
public InputStream getInputStream() throws IOException {
return new BufferedInputStream(new FileInputStream(file));
}
/**
- * @see org.apache.james.mime4j.util.TempFile#getOutputStream()
+ * @see
org.apache.james.mime4j.message.storage.TempFile#getOutputStream()
*/
public OutputStream getOutputStream() throws IOException {
return new BufferedOutputStream(new FileOutputStream(file));
}
/**
- * @see org.apache.james.mime4j.util.TempFile#getAbsolutePath()
+ * @see
org.apache.james.mime4j.message.storage.TempFile#getAbsolutePath()
*/
public String getAbsolutePath() {
return file.getAbsolutePath();
@@ -219,14 +219,14 @@
}
/**
- * @see org.apache.james.mime4j.util.TempFile#isInMemory()
+ * @see org.apache.james.mime4j.message.storage.TempFile#isInMemory()
*/
public boolean isInMemory() {
return false;
}
/**
- * @see org.apache.james.mime4j.util.TempFile#length()
+ * @see org.apache.james.mime4j.message.storage.TempFile#length()
*/
public long length() {
return file.length();
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempFile.java
(from r677844,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempFile.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempFile.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempFile.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempFile.java&r1=677844&r2=683543&rev=683543&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempFile.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempFile.java
Thu Aug 7 01:23:22 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.util;
+package org.apache.james.mime4j.message.storage;
import java.io.IOException;
import java.io.InputStream;
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempPath.java
(from r677844,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempPath.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempPath.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempPath.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempPath.java&r1=677844&r2=683543&rev=683543&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempPath.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempPath.java
Thu Aug 7 01:23:22 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.util;
+package org.apache.james.mime4j.message.storage;
import java.io.IOException;
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempStorage.java
(from r677844,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempStorage.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempStorage.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempStorage.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempStorage.java&r1=677844&r2=683543&rev=683543&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/TempStorage.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempStorage.java
Thu Aug 7 01:23:22 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.util;
+package org.apache.james.mime4j.message.storage;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/SimpleTempStorageTest.java
(from r680968,
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/SimpleTempStorageTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/SimpleTempStorageTest.java?p2=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/SimpleTempStorageTest.java&p1=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/SimpleTempStorageTest.java&r1=680968&r2=683543&rev=683543&view=diff
==============================================================================
---
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/SimpleTempStorageTest.java
(original)
+++
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/SimpleTempStorageTest.java
Thu Aug 7 01:23:22 2008
@@ -17,16 +17,16 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.util;
+package org.apache.james.mime4j.message.storage;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.james.mime4j.util.SimpleTempStorage;
-import org.apache.james.mime4j.util.TempFile;
-import org.apache.james.mime4j.util.TempPath;
+import org.apache.james.mime4j.message.storage.SimpleTempStorage;
+import org.apache.james.mime4j.message.storage.TempFile;
+import org.apache.james.mime4j.message.storage.TempPath;
import junit.framework.TestCase;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
