You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mime4j-dev@james.apache.org by ol...@apache.org on 2010/02/06 13:13:29 UTC
svn commit: r907205 - in /james/mime4j/trunk:
core/src/main/java/org/apache/james/mime4j/parser/
core/src/main/java/org/apache/james/mime4j/stream/ dom/
dom/src/main/appended-resources/
dom/src/main/java/org/apache/james/mime4j/field/ dom/src/main/java...
Author: olegk
Date: Sat Feb 6 12:13:28 2010
New Revision: 907205
URL: http://svn.apache.org/viewvc?rev=907205&view=rev
Log:
MIME4J-158: Moved LoggingMonitor to examples; DOM module no longer depends on Commons-Logging
Added:
james/mime4j/trunk/examples/src/main/java/org/apache/james/mime4j/samples/dom/LoggingMonitor.java
- copied, changed from r906951, james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/LoggingMonitor.java
Removed:
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/LoggingMonitor.java
Modified:
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/MimeTokenStream.java
james/mime4j/trunk/dom/pom.xml
james/mime4j/trunk/dom/src/main/appended-resources/supplemental-models.xml
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/AbstractField.java
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/DefaultFieldParser.java
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/Fields.java
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/HeaderImpl.java
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageImpl.java
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java
james/mime4j/trunk/examples/pom.xml
Modified: james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java?rev=907205&r1=907204&r2=907205&view=diff
==============================================================================
--- james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java (original)
+++ james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java Sat Feb 6 12:13:28 2010
@@ -63,9 +63,9 @@
public MimeStreamParser(
final MimeEntityConfig config,
boolean clone,
- final DecodeMonitor monitor,
- final MutableBodyDescriptorFactory bodyDescFactory) {
- this(new MimeTokenStream(clone ? config.clone() : config, monitor, bodyDescFactory));
+ final MutableBodyDescriptorFactory bodyDescFactory,
+ final DecodeMonitor monitor) {
+ this(new MimeTokenStream(clone ? config.clone() : config, bodyDescFactory, monitor));
}
public MimeStreamParser(final MimeEntityConfig config, boolean clone) {
@@ -74,10 +74,10 @@
public MimeStreamParser(
final MimeEntityConfig config,
- final DecodeMonitor monitor,
- final MutableBodyDescriptorFactory bodyDescFactory) {
+ final MutableBodyDescriptorFactory bodyDescFactory,
+ final DecodeMonitor monitor) {
this(config != null ? config : new MimeEntityConfig(), config != null,
- monitor, bodyDescFactory);
+ bodyDescFactory, monitor);
}
public MimeStreamParser(final MimeEntityConfig config) {
Modified: james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/MimeTokenStream.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/MimeTokenStream.java?rev=907205&r1=907204&r2=907205&view=diff
==============================================================================
--- james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/MimeTokenStream.java (original)
+++ james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/MimeTokenStream.java Sat Feb 6 12:13:28 2010
@@ -103,13 +103,13 @@
public MimeTokenStream(
final MimeEntityConfig config,
final MutableBodyDescriptorFactory bodyDescFactory) {
- this(config, null, bodyDescFactory);
+ this(config, bodyDescFactory, null);
}
public MimeTokenStream(
final MimeEntityConfig config,
- final DecodeMonitor monitor,
- final MutableBodyDescriptorFactory bodyDescFactory) {
+ final MutableBodyDescriptorFactory bodyDescFactory,
+ final DecodeMonitor monitor) {
super();
this.config = config;
this.monitor = monitor != null ? monitor :
Modified: james/mime4j/trunk/dom/pom.xml
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/dom/pom.xml?rev=907205&r1=907204&r2=907205&view=diff
==============================================================================
--- james/mime4j/trunk/dom/pom.xml (original)
+++ james/mime4j/trunk/dom/pom.xml Sat Feb 6 12:13:28 2010
@@ -66,11 +66,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
<version>${project.version}</version>
Modified: james/mime4j/trunk/dom/src/main/appended-resources/supplemental-models.xml
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/main/appended-resources/supplemental-models.xml?rev=907205&r1=907204&r2=907205&view=diff
==============================================================================
--- james/mime4j/trunk/dom/src/main/appended-resources/supplemental-models.xml (original)
+++ james/mime4j/trunk/dom/src/main/appended-resources/supplemental-models.xml Sat Feb 6 12:13:28 2010
@@ -20,25 +20,6 @@
-->
<supplement>
<project>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <name>Apache Commons Logging</name>
- <url>http://jakarta.apache.org/commons/logging/</url>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<name>Apache Commons IO</name>
@@ -58,31 +39,12 @@
</supplement>
<supplement>
<project>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <name>Apache Log4j</name>
- <url>http://logging.apache.org/log4j/</url>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<name>JUnit</name>
<url>http://www.junit.org/</url>
<organization>
- <name>Kent Beck, Erich Gamma, and David Saff</name>
+ <name>Kent Beck, Erich Gamma, and David Saff</name>
</organization>
<licenses>
<license>
Modified: james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/AbstractField.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/AbstractField.java?rev=907205&r1=907204&r2=907205&view=diff
==============================================================================
--- james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/AbstractField.java (original)
+++ james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/AbstractField.java Sat Feb 6 12:13:28 2010
@@ -37,11 +37,15 @@
private final ByteSequence raw;
protected DecodeMonitor monitor;
- protected AbstractField(final String name, final String body, final ByteSequence raw, DecodeMonitor monitor) {
+ protected AbstractField(
+ final String name,
+ final String body,
+ final ByteSequence raw,
+ final DecodeMonitor monitor) {
this.name = name;
this.body = body;
this.raw = raw;
- this.monitor = monitor;
+ this.monitor = monitor != null ? monitor : DecodeMonitor.SILENT;
}
/**
Modified: james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/DefaultFieldParser.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/DefaultFieldParser.java?rev=907205&r1=907204&r2=907205&view=diff
==============================================================================
--- james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/DefaultFieldParser.java (original)
+++ james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/DefaultFieldParser.java Sat Feb 6 12:13:28 2010
@@ -61,15 +61,13 @@
* @return a <code>ParsedField</code> instance.
* @throws MimeException if the raw string cannot be split into field name and body.
*/
- public static ParsedField parse(final ByteSequence raw, DecodeMonitor monitor) throws MimeException {
- RawField rawField = new RawField(raw);
+ public static ParsedField parse(
+ final ByteSequence raw,
+ final DecodeMonitor monitor) throws MimeException {
+ RawField rawField = new RawField(raw);
return PARSER.parse(rawField.getName(), rawField.getBody(), raw, monitor);
}
- public static ParsedField parse(final ByteSequence raw) throws MimeException {
- return parse(raw, LoggingMonitor.MONITOR);
- }
-
/**
* Parses the given string and returns an instance of the
* <code>Field</code> class. The type of the class returned depends on
@@ -91,11 +89,17 @@
* @return a <code>ParsedField</code> instance.
* @throws MimeException if the raw string cannot be split into field name and body.
*/
- public static ParsedField parse(final String rawStr) throws MimeException {
+ public static ParsedField parse(
+ final String rawStr,
+ final DecodeMonitor monitor) throws MimeException {
ByteSequence raw = ContentUtil.encode(rawStr);
- return parse(raw);
+ return parse(raw, monitor);
}
+ public static ParsedField parse(final String rawStr) throws MimeException {
+ ByteSequence raw = ContentUtil.encode(rawStr);
+ return parse(raw, DecodeMonitor.SILENT);
+ }
public DefaultFieldParser() {
setFieldParser(FieldName.CONTENT_TRANSFER_ENCODING,
Modified: james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/Fields.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/Fields.java?rev=907205&r1=907204&r2=907205&view=diff
==============================================================================
--- james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/Fields.java (original)
+++ james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/Fields.java Sat Feb 6 12:13:28 2010
@@ -27,6 +27,7 @@
import java.util.TimeZone;
import java.util.regex.Pattern;
+import org.apache.james.mime4j.codec.DecodeMonitor;
import org.apache.james.mime4j.codec.EncoderUtil;
import org.apache.james.mime4j.dom.address.Address;
import org.apache.james.mime4j.dom.address.Mailbox;
@@ -613,8 +614,9 @@
private static <F extends ParsedField> F parse(FieldParser<F> parser,
String fieldName, String fieldBody) {
- RawField rawField = new RawField(fieldName, fieldBody);
- return parser.parse(rawField.getName(), rawField.getBody(), rawField.getRaw(), LoggingMonitor.MONITOR);
+ RawField rawField = new RawField(fieldName, fieldBody);
+ return parser.parse(rawField.getName(), rawField.getBody(), rawField.getRaw(),
+ DecodeMonitor.SILENT);
}
private static String encodeAddresses(Iterable<? extends Address> addresses) {
Modified: james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/HeaderImpl.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/HeaderImpl.java?rev=907205&r1=907204&r2=907205&view=diff
==============================================================================
--- james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/HeaderImpl.java (original)
+++ james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/HeaderImpl.java Sat Feb 6 12:13:28 2010
@@ -24,6 +24,7 @@
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.MimeIOException;
+import org.apache.james.mime4j.codec.DecodeMonitor;
import org.apache.james.mime4j.dom.Header;
import org.apache.james.mime4j.dom.field.Field;
import org.apache.james.mime4j.field.DefaultFieldParser;
@@ -66,8 +67,9 @@
* @throws IOException on I/O errors.
* @throws MimeIOException on MIME protocol violations.
*/
- public HeaderImpl(InputStream is)
- throws IOException, MimeIOException {
+ public HeaderImpl(
+ final InputStream is,
+ final DecodeMonitor monitor) throws IOException, MimeIOException {
final MimeStreamParser parser = new MimeStreamParser();
parser.setContentHandler(new AbstractContentHandler() {
@Override
@@ -76,7 +78,7 @@
}
@Override
public void field(RawField field) throws MimeException {
- Field parsedField = DefaultFieldParser.parse(field.getRaw());
+ Field parsedField = DefaultFieldParser.parse(field.getRaw(), monitor);
addField(parsedField);
}
});
Modified: james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java?rev=907205&r1=907204&r2=907205&view=diff
==============================================================================
--- james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java (original)
+++ james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java Sat Feb 6 12:13:28 2010
@@ -32,7 +32,6 @@
import org.apache.james.mime4j.dom.Multipart;
import org.apache.james.mime4j.dom.field.Field;
import org.apache.james.mime4j.field.DefaultFieldParser;
-import org.apache.james.mime4j.field.LoggingMonitor;
import org.apache.james.mime4j.parser.ContentHandler;
import org.apache.james.mime4j.storage.StorageProvider;
import org.apache.james.mime4j.stream.BodyDescriptor;
@@ -52,11 +51,7 @@
private final DecodeMonitor monitor;
public MessageBuilder(Entity entity) {
- this(entity, null);
- }
-
- public MessageBuilder(Entity entity, StorageProvider storageProvider) {
- this(entity, storageProvider, LoggingMonitor.MONITOR);
+ this(entity, null, null);
}
public MessageBuilder(
@@ -65,7 +60,7 @@
final DecodeMonitor monitor) {
this.entity = entity;
this.stack = new Stack<Object>();
- this.monitor = monitor != null ? monitor : LoggingMonitor.MONITOR;
+ this.monitor = monitor != null ? monitor : DecodeMonitor.SILENT;
this.bodyFactory = new BodyFactory(storageProvider, this.monitor);
}
Modified: james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageImpl.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageImpl.java?rev=907205&r1=907204&r2=907205&view=diff
==============================================================================
--- james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageImpl.java (original)
+++ james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/MessageImpl.java Sat Feb 6 12:13:28 2010
@@ -49,7 +49,6 @@
import org.apache.james.mime4j.field.ContentTransferEncodingFieldImpl;
import org.apache.james.mime4j.field.ContentTypeFieldImpl;
import org.apache.james.mime4j.field.Fields;
-import org.apache.james.mime4j.field.LoggingMonitor;
import org.apache.james.mime4j.parser.MimeStreamParser;
import org.apache.james.mime4j.storage.DefaultStorageProvider;
import org.apache.james.mime4j.storage.StorageProvider;
@@ -157,12 +156,12 @@
final InputStream is,
final MimeEntityConfig config,
final StorageProvider storageProvider,
- final DecodeMonitor monitor,
- final MutableBodyDescriptorFactory bodyDescFactory) throws IOException, MimeIOException {
+ final MutableBodyDescriptorFactory bodyDescFactory,
+ final DecodeMonitor monitor) throws IOException, MimeIOException {
try {
- MimeStreamParser parser = new MimeStreamParser(config, monitor, bodyDescFactory);
+ this.monitor = monitor != null ? monitor : DecodeMonitor.SILENT;
+ MimeStreamParser parser = new MimeStreamParser(config, bodyDescFactory, this.monitor);
parser.setContentDecoding(true);
- this.monitor = monitor != null ? monitor : LoggingMonitor.MONITOR;
parser.setContentHandler(new MessageBuilder(this, storageProvider, this.monitor));
parser.parse(is);
} catch (MimeException e) {
@@ -175,14 +174,14 @@
final MimeEntityConfig config,
final StorageProvider storageProvider,
final MutableBodyDescriptorFactory bodyDescFactory) throws IOException, MimeIOException {
- this(is, config, storageProvider, LoggingMonitor.MONITOR, bodyDescFactory);
+ this(is, config, storageProvider, bodyDescFactory, null);
}
public MessageImpl(
final InputStream is,
final MimeEntityConfig config,
final StorageProvider storageProvider) throws IOException, MimeIOException {
- this(is, config, storageProvider, LoggingMonitor.MONITOR, null);
+ this(is, config, storageProvider, null, null);
}
/**
@@ -192,36 +191,36 @@
MessageWriter.DEFAULT.writeEntity(this, out);
}
- @Override
- protected String newUniqueBoundary() {
- return MimeUtil.createUniqueBoundary();
- }
-
- protected UnstructuredField newMessageId(String hostname) {
- return Fields.messageId(hostname);
- }
-
- protected DateTimeField newDate(Date date, TimeZone zone) {
- return Fields.date(FieldName.DATE, date, zone);
- }
-
- protected MailboxField newMailbox(String fieldName, Mailbox mailbox) {
- return Fields.mailbox(fieldName, mailbox);
- }
-
- protected MailboxListField newMailboxList(String fieldName,
- Collection<Mailbox> mailboxes) {
- return Fields.mailboxList(fieldName, mailboxes);
- }
-
- protected AddressListField newAddressList(String fieldName,
- Collection<Address> addresses) {
- return Fields.addressList(fieldName, addresses);
- }
-
- protected UnstructuredField newSubject(String subject) {
- return Fields.subject(subject);
- }
+ @Override
+ protected String newUniqueBoundary() {
+ return MimeUtil.createUniqueBoundary();
+ }
+
+ protected UnstructuredField newMessageId(String hostname) {
+ return Fields.messageId(hostname);
+ }
+
+ protected DateTimeField newDate(Date date, TimeZone zone) {
+ return Fields.date(FieldName.DATE, date, zone);
+ }
+
+ protected MailboxField newMailbox(String fieldName, Mailbox mailbox) {
+ return Fields.mailbox(fieldName, mailbox);
+ }
+
+ protected MailboxListField newMailboxList(String fieldName,
+ Collection<Mailbox> mailboxes) {
+ return Fields.mailboxList(fieldName, mailboxes);
+ }
+
+ protected AddressListField newAddressList(String fieldName,
+ Collection<Address> addresses) {
+ return Fields.addressList(fieldName, addresses);
+ }
+
+ protected UnstructuredField newSubject(String subject) {
+ return Fields.subject(subject);
+ }
protected ContentDispositionField newContentDisposition(
String dispositionType, String filename, long size,
Modified: james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java?rev=907205&r1=907204&r2=907205&view=diff
==============================================================================
--- james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java (original)
+++ james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java Sat Feb 6 12:13:28 2010
@@ -20,6 +20,7 @@
package org.apache.james.mime4j.message;
import org.apache.james.mime4j.MimeException;
+import org.apache.james.mime4j.codec.DecodeMonitor;
import org.apache.james.mime4j.dom.Header;
import org.apache.james.mime4j.dom.field.Field;
import org.apache.james.mime4j.field.DefaultFieldParser;
@@ -33,8 +34,19 @@
* Older versions of this class performed decoding of content streams.
* This can be now easily achieved by calling setContentDecoding(true) on the MimeStreamParser.
*/
-public abstract class SimpleContentHandler extends AbstractContentHandler {
+public abstract class SimpleContentHandler extends AbstractContentHandler {
+ private final DecodeMonitor monitor;
+
+ public SimpleContentHandler(final DecodeMonitor monitor) {
+ super();
+ this.monitor = monitor;
+ }
+
+ public SimpleContentHandler() {
+ this(null);
+ }
+
/**
* Called after headers are parsed.
*/
@@ -57,7 +69,7 @@
*/
@Override
public final void field(RawField field) throws MimeException {
- Field parsedField = DefaultFieldParser.parse(field.getRaw());
+ Field parsedField = DefaultFieldParser.parse(field.getRaw(), monitor);
currHeader.addField(parsedField);
}
Modified: james/mime4j/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/examples/pom.xml?rev=907205&r1=907204&r2=907205&view=diff
==============================================================================
--- james/mime4j/trunk/examples/pom.xml (original)
+++ james/mime4j/trunk/examples/pom.xml Sat Feb 6 12:13:28 2010
@@ -38,5 +38,10 @@
<artifactId>apache-mime4j-dom</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
Copied: james/mime4j/trunk/examples/src/main/java/org/apache/james/mime4j/samples/dom/LoggingMonitor.java (from r906951, james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/LoggingMonitor.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/examples/src/main/java/org/apache/james/mime4j/samples/dom/LoggingMonitor.java?p2=james/mime4j/trunk/examples/src/main/java/org/apache/james/mime4j/samples/dom/LoggingMonitor.java&p1=james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/LoggingMonitor.java&r1=906951&r2=907205&rev=907205&view=diff
==============================================================================
--- james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/field/LoggingMonitor.java (original)
+++ james/mime4j/trunk/examples/src/main/java/org/apache/james/mime4j/samples/dom/LoggingMonitor.java Sat Feb 6 12:13:28 2010
@@ -1,7 +1,23 @@
-/**
- *
- */
-package org.apache.james.mime4j.field;
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.mime4j.samples.dom;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;