Author: olegk
Date: Wed Feb 3 20:25:01 2010
New Revision: 906222
URL: http://svn.apache.org/viewvc?rev=906222&view=rev
Log:
MIME4J-129, MIME4J-157: Moved MaximalBodyDescriptor and
MaximalBodyDescriptorFactory to 'message' package
Added:
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/message/MaximalBodyDescriptor.java
- copied, changed from r906174,
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/message/MaximalBodyDescriptorFactory.java
- copied, changed from r906202,
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorFactory.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/message/MaximalBodyDescriptorTest.java
- copied, changed from r906208,
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
Removed:
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorFactory.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
Copied:
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/message/MaximalBodyDescriptor.java
(from r906174,
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/message/MaximalBodyDescriptor.java?p2=james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/message/MaximalBodyDescriptor.java&p1=james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java&r1=906174&r2=906222&rev=906222&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java
(original)
+++
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/message/MaximalBodyDescriptor.java
Wed Feb 3 20:25:01 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.message;
import java.io.StringReader;
import java.util.Collections;
@@ -108,7 +108,7 @@
}
public MutableBodyDescriptor newChild() {
- return new MaximalBodyDescriptor(this);
+ return new MaximalBodyDescriptor(this);
}
@Override
@@ -148,13 +148,13 @@
final StringReader stringReader = new StringReader(value);
final StructuredFieldParser parser = new
StructuredFieldParser(stringReader);
try {
- // From RFC2017 3.1
- /*
- * Extraction of the URL string from the URL-parameter is even
simpler:
- * The enclosing quotes and any linear whitespace are removed
and the
- * remaining material is the URL string.
- * Read more:
http://www.faqs.org/rfcs/rfc2017.html#ixzz0aufO9nRL
- */
+ // From RFC2017 3.1
+ /*
+ * Extraction of the URL string from the URL-parameter is even
simpler:
+ * The enclosing quotes and any linear whitespace are removed
and the
+ * remaining material is the URL string.
+ * Read more:
http://www.faqs.org/rfcs/rfc2017.html#ixzz0aufO9nRL
+ */
contentLocation = parser.parse().replaceAll("\\s", "");
} catch (MimeException e) {
contentLocationParseException = e;
Copied:
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/message/MaximalBodyDescriptorFactory.java
(from r906202,
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorFactory.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/message/MaximalBodyDescriptorFactory.java?p2=james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/message/MaximalBodyDescriptorFactory.java&p1=james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorFactory.java&r1=906202&r2=906222&rev=906222&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorFactory.java
(original)
+++
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/message/MaximalBodyDescriptorFactory.java
Wed Feb 3 20:25:01 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.message;
import org.apache.james.mime4j.stream.MutableBodyDescriptor;
import org.apache.james.mime4j.stream.MutableBodyDescriptorFactory;
Copied:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/message/MaximalBodyDescriptorTest.java
(from r906208,
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/message/MaximalBodyDescriptorTest.java?p2=james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/message/MaximalBodyDescriptorTest.java&p1=james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java&r1=906208&r2=906222&rev=906222&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/message/MaximalBodyDescriptorTest.java
Wed Feb 3 20:25:01 2010
@@ -17,13 +17,14 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.message;
import java.io.ByteArrayInputStream;
import org.apache.james.mime4j.ExampleMail;
import org.apache.james.mime4j.dom.datetime.DateTime;
-import org.apache.james.mime4j.parser.MaximalBodyDescriptor;
+import org.apache.james.mime4j.message.MaximalBodyDescriptor;
+import org.apache.james.mime4j.message.MaximalBodyDescriptorFactory;
import org.apache.james.mime4j.stream.BaseTestForBodyDescriptors;
import org.apache.james.mime4j.stream.BodyDescriptor;
import org.apache.james.mime4j.stream.MimeEntityConfig;
