JAMES-2132 improve package structure

Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/bbc0bfad
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/bbc0bfad
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/bbc0bfad

Branch: refs/heads/master
Commit: bbc0bfad8572165d39f2cca776097ef1b0910902
Parents: 976a303
Author: benwa <btell...@linagora.com>
Authored: Mon Aug 28 10:49:20 2017 +0700
Committer: benwa <btell...@linagora.com>
Committed: Thu Aug 31 18:00:19 2017 +0700

----------------------------------------------------------------------
 .../apache/james/mdn/ActionModeAutomatic.java   | 42 -----------------
 .../org/apache/james/mdn/ActionModeManual.java  | 47 --------------------
 .../java/org/apache/james/mdn/Disposition.java  |  5 +++
 .../apache/james/mdn/DispositionActionMode.java | 29 ------------
 .../apache/james/mdn/DispositionModifier.java   | 29 ------------
 .../james/mdn/DispositionSendingMode.java       | 29 ------------
 .../org/apache/james/mdn/DispositionType.java   | 29 ------------
 .../org/apache/james/mdn/ModifierError.java     | 44 ------------------
 .../org/apache/james/mdn/ModifierExpired.java   | 45 -------------------
 .../org/apache/james/mdn/ModifierFailed.java    | 45 -------------------
 .../james/mdn/ModifierMailboxTerminated.java    | 45 -------------------
 .../apache/james/mdn/ModifierSuperseded.java    | 45 -------------------
 .../org/apache/james/mdn/ModifierWarning.java   | 45 -------------------
 .../apache/james/mdn/SendingModeAutomatic.java  | 45 -------------------
 .../org/apache/james/mdn/SendingModeManual.java | 45 -------------------
 .../java/org/apache/james/mdn/TypeDeleted.java  | 45 -------------------
 .../java/org/apache/james/mdn/TypeDenied.java   | 44 ------------------
 .../org/apache/james/mdn/TypeDispatched.java    | 43 ------------------
 .../org/apache/james/mdn/TypeDisplayed.java     | 44 ------------------
 .../java/org/apache/james/mdn/TypeFailed.java   | 44 ------------------
 .../org/apache/james/mdn/TypeProcessed.java     | 44 ------------------
 .../mdn/action/mode/ActionModeAutomatic.java    | 42 +++++++++++++++++
 .../james/mdn/action/mode/ActionModeManual.java | 47 ++++++++++++++++++++
 .../mdn/action/mode/DispositionActionMode.java  | 29 ++++++++++++
 .../james/mdn/modifier/DispositionModifier.java | 29 ++++++++++++
 .../james/mdn/modifier/ModifierError.java       | 44 ++++++++++++++++++
 .../james/mdn/modifier/ModifierExpired.java     | 45 +++++++++++++++++++
 .../james/mdn/modifier/ModifierFailed.java      | 45 +++++++++++++++++++
 .../mdn/modifier/ModifierMailboxTerminated.java | 45 +++++++++++++++++++
 .../james/mdn/modifier/ModifierSuperseded.java  | 45 +++++++++++++++++++
 .../james/mdn/modifier/ModifierWarning.java     | 45 +++++++++++++++++++
 .../sending/mode/DispositionSendingMode.java    | 29 ++++++++++++
 .../mdn/sending/mode/SendingModeAutomatic.java  | 45 +++++++++++++++++++
 .../mdn/sending/mode/SendingModeManual.java     | 45 +++++++++++++++++++
 .../apache/james/mdn/type/DispositionType.java  | 29 ++++++++++++
 .../org/apache/james/mdn/type/TypeDeleted.java  | 45 +++++++++++++++++++
 .../org/apache/james/mdn/type/TypeDenied.java   | 44 ++++++++++++++++++
 .../apache/james/mdn/type/TypeDispatched.java   | 43 ++++++++++++++++++
 .../apache/james/mdn/type/TypeDisplayed.java    | 44 ++++++++++++++++++
 .../org/apache/james/mdn/type/TypeFailed.java   | 44 ++++++++++++++++++
 .../apache/james/mdn/type/TypeProcessed.java    | 44 ++++++++++++++++++
 .../transport/mailets/jsieve/RejectAction.java  | 11 +++--
 42 files changed, 838 insertions(+), 834 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/ActionModeAutomatic.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/ActionModeAutomatic.java 
b/mdn/src/main/java/org/apache/james/mdn/ActionModeAutomatic.java
deleted file mode 100644
index 31bdf91..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/ActionModeAutomatic.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>ActionModeAutomatic</code>
- */
-public class ActionModeAutomatic implements DispositionActionMode {
-
-    /**
-     * Default Constructor
-     */
-    public ActionModeAutomatic() {
-        super();
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString() {
-        return "automatic-action";
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/ActionModeManual.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/ActionModeManual.java 
b/mdn/src/main/java/org/apache/james/mdn/ActionModeManual.java
deleted file mode 100644
index ab71030..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/ActionModeManual.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>ActionModeManual</code>
- */
-public class ActionModeManual
-        implements
-            DispositionActionMode
-{
-
-    /**
-     * Default Constructor
-     */
-    public ActionModeManual()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "manual-action";
-    }         
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/Disposition.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/Disposition.java 
b/mdn/src/main/java/org/apache/james/mdn/Disposition.java
index b74ef4d..9fcc8a5 100644
--- a/mdn/src/main/java/org/apache/james/mdn/Disposition.java
+++ b/mdn/src/main/java/org/apache/james/mdn/Disposition.java
@@ -19,6 +19,11 @@
 
 package org.apache.james.mdn;
 
+import org.apache.james.mdn.action.mode.DispositionActionMode;
+import org.apache.james.mdn.modifier.DispositionModifier;
+import org.apache.james.mdn.sending.mode.DispositionSendingMode;
+import org.apache.james.mdn.type.DispositionType;
+
 /**
  * Class <code>Disposition</code> encapsulating
  * disposition information as defined by RFC 2298.

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/DispositionActionMode.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/DispositionActionMode.java 
b/mdn/src/main/java/org/apache/james/mdn/DispositionActionMode.java
deleted file mode 100644
index 969f31f..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/DispositionActionMode.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-/**
- * Interface <code>DispositionActionMode</code> marks a type encapsulating
- * disposition action mode information as defined by RFC 2298.
- */
-public interface DispositionActionMode
-{
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/DispositionModifier.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/DispositionModifier.java 
b/mdn/src/main/java/org/apache/james/mdn/DispositionModifier.java
deleted file mode 100644
index 041b525..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/DispositionModifier.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-/**
- * Interface <code>DispositionModifier</code> marks a type encapsulating
- * disposition modifier information as defined by RFC 2298.
- */
-public interface DispositionModifier
-{
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/DispositionSendingMode.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/DispositionSendingMode.java 
b/mdn/src/main/java/org/apache/james/mdn/DispositionSendingMode.java
deleted file mode 100644
index 2f3e815..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/DispositionSendingMode.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-/**
- * Interface <code>DispositionSendingMode</code> marks a type encapsulating
- * disposition sending mode information as defined by RFC 2298.
- */
-public interface DispositionSendingMode
-{
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/DispositionType.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/DispositionType.java 
b/mdn/src/main/java/org/apache/james/mdn/DispositionType.java
deleted file mode 100644
index af2dacd..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/DispositionType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-/**
- * Interface <code>DispositionType</code> marks a type encapsulating
- * disposition type information as defined by RFC 2298.
- */
-public interface DispositionType
-{
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/ModifierError.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/ModifierError.java 
b/mdn/src/main/java/org/apache/james/mdn/ModifierError.java
deleted file mode 100644
index b1692f8..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/ModifierError.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>ModifierError</code>
- */
-public class ModifierError implements DispositionModifier
-{
-
-    /**
-     * Default Constructor
-     */
-    public ModifierError()
-    {
-        super();
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "error";
-    }
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/ModifierExpired.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/ModifierExpired.java 
b/mdn/src/main/java/org/apache/james/mdn/ModifierExpired.java
deleted file mode 100644
index 9d7c678..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/ModifierExpired.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>ModifierExpired</code>
- */    
-public class ModifierExpired implements DispositionModifier
-{
-
-    /**
-     * Default Constructor
-     */
-    public ModifierExpired()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "expired";
-    }        
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/ModifierFailed.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/ModifierFailed.java 
b/mdn/src/main/java/org/apache/james/mdn/ModifierFailed.java
deleted file mode 100644
index b2a7fe0..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/ModifierFailed.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>ModifierFailed</code>
- */    
-public class ModifierFailed implements DispositionModifier
-{
-
-    /**
-     * Default Constructor
-     */
-    public ModifierFailed()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "failed";
-    }        
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/ModifierMailboxTerminated.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/ModifierMailboxTerminated.java 
b/mdn/src/main/java/org/apache/james/mdn/ModifierMailboxTerminated.java
deleted file mode 100644
index 0c0d10d..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/ModifierMailboxTerminated.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>ModifierMailboxTerminated</code>
- */    
-public class ModifierMailboxTerminated implements DispositionModifier
-{
-
-    /**
-     * Default Constructor
-     */
-    public ModifierMailboxTerminated()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "mailbox-terminated";
-    }        
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/ModifierSuperseded.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/ModifierSuperseded.java 
b/mdn/src/main/java/org/apache/james/mdn/ModifierSuperseded.java
deleted file mode 100644
index dfeabfb..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/ModifierSuperseded.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>ModifierSuperseded</code>
- */    
-public class ModifierSuperseded implements DispositionModifier
-{
-
-    /**
-     * Default Constructor
-     */
-    public ModifierSuperseded()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "superseded";
-    }        
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/ModifierWarning.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/ModifierWarning.java 
b/mdn/src/main/java/org/apache/james/mdn/ModifierWarning.java
deleted file mode 100644
index 95cbe4f..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/ModifierWarning.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>ModifierWarning</code>
- */    
-public class ModifierWarning implements DispositionModifier
-{
-
-    /**
-     * Default Constructor
-     */
-    public ModifierWarning()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "warning";
-    }        
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/SendingModeAutomatic.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/SendingModeAutomatic.java 
b/mdn/src/main/java/org/apache/james/mdn/SendingModeAutomatic.java
deleted file mode 100644
index c716628..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/SendingModeAutomatic.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>SendingModeAutomatic</code>
- */
-public class SendingModeAutomatic implements DispositionSendingMode
-{
-
-    /**
-     * Default Constructor
-     */
-    public SendingModeAutomatic()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "MDN-sent-automatically";
-    }        
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/SendingModeManual.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/SendingModeManual.java 
b/mdn/src/main/java/org/apache/james/mdn/SendingModeManual.java
deleted file mode 100644
index a86a71e..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/SendingModeManual.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>SendingModeManual</code>
- */
-public class SendingModeManual implements DispositionSendingMode
-{
-
-    /**
-     * Default Constructor
-     */
-    public SendingModeManual()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "MDN-sent-manually";
-    }         
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/TypeDeleted.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/TypeDeleted.java 
b/mdn/src/main/java/org/apache/james/mdn/TypeDeleted.java
deleted file mode 100644
index 4c6d30a..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/TypeDeleted.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>TypeDeleted</code>
- */
-public class TypeDeleted implements DispositionType
-{
-
-    /**
-     * Default Constructor
-     */
-    public TypeDeleted()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "deleted";
-    }         
-
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/TypeDenied.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/TypeDenied.java 
b/mdn/src/main/java/org/apache/james/mdn/TypeDenied.java
deleted file mode 100644
index eddab50..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/TypeDenied.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>TypeDenied</code>
- */    
-public class TypeDenied implements DispositionType
-{
-
-    /**
-     * Default Constructor
-     */
-    public TypeDenied()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "denied";
-    }         
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/TypeDispatched.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/TypeDispatched.java 
b/mdn/src/main/java/org/apache/james/mdn/TypeDispatched.java
deleted file mode 100644
index a814c24..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/TypeDispatched.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>TypeDispatched</code>
- */
-public class TypeDispatched implements DispositionType
-{
-    /**
-     * Default Constructor
-     */
-    public TypeDispatched()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "dispatched";
-    }         
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/TypeDisplayed.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/TypeDisplayed.java 
b/mdn/src/main/java/org/apache/james/mdn/TypeDisplayed.java
deleted file mode 100644
index d82589e..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/TypeDisplayed.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>TypeDisplayed</code>
- */
-public class TypeDisplayed implements DispositionType
-{
-
-    /**
-     * Default Constructor
-     */
-    public TypeDisplayed()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "displayed";
-    }         
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/TypeFailed.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/TypeFailed.java 
b/mdn/src/main/java/org/apache/james/mdn/TypeFailed.java
deleted file mode 100644
index 8d6ba3d..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/TypeFailed.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>TypeFailed</code>
- */    
-public class TypeFailed implements DispositionType
-{
-
-    /**
-     * Default Constructor
-     */
-    public TypeFailed()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "failed";
-    }         
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/TypeProcessed.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/TypeProcessed.java 
b/mdn/src/main/java/org/apache/james/mdn/TypeProcessed.java
deleted file mode 100644
index b377c86..0000000
--- a/mdn/src/main/java/org/apache/james/mdn/TypeProcessed.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************
- * 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.mdn;
-
-
-/**
- * Class <code>TypeProcessed</code>
- */    
-public class TypeProcessed implements DispositionType
-{
-
-    /**
-     * Default Constructor
-     */
-    public TypeProcessed()
-    {
-        super();
-    }
-    
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "processed";
-    }         
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/action/mode/ActionModeAutomatic.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/action/mode/ActionModeAutomatic.java 
b/mdn/src/main/java/org/apache/james/mdn/action/mode/ActionModeAutomatic.java
new file mode 100644
index 0000000..d4b4459
--- /dev/null
+++ 
b/mdn/src/main/java/org/apache/james/mdn/action/mode/ActionModeAutomatic.java
@@ -0,0 +1,42 @@
+/****************************************************************
+ * 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.mdn.action.mode;
+
+
+/**
+ * Class <code>ActionModeAutomatic</code>
+ */
+public class ActionModeAutomatic implements DispositionActionMode {
+
+    /**
+     * Default Constructor
+     */
+    public ActionModeAutomatic() {
+        super();
+    }
+
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString() {
+        return "automatic-action";
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/action/mode/ActionModeManual.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/action/mode/ActionModeManual.java 
b/mdn/src/main/java/org/apache/james/mdn/action/mode/ActionModeManual.java
new file mode 100644
index 0000000..1a2a7b7
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/action/mode/ActionModeManual.java
@@ -0,0 +1,47 @@
+/****************************************************************
+ * 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.mdn.action.mode;
+
+
+/**
+ * Class <code>ActionModeManual</code>
+ */
+public class ActionModeManual
+        implements
+            DispositionActionMode
+{
+
+    /**
+     * Default Constructor
+     */
+    public ActionModeManual()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "manual-action";
+    }         
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/action/mode/DispositionActionMode.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/action/mode/DispositionActionMode.java 
b/mdn/src/main/java/org/apache/james/mdn/action/mode/DispositionActionMode.java
new file mode 100644
index 0000000..b855e08
--- /dev/null
+++ 
b/mdn/src/main/java/org/apache/james/mdn/action/mode/DispositionActionMode.java
@@ -0,0 +1,29 @@
+/****************************************************************
+ * 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.mdn.action.mode;
+
+/**
+ * Interface <code>DispositionActionMode</code> marks a type encapsulating
+ * disposition action mode information as defined by RFC 2298.
+ */
+public interface DispositionActionMode
+{
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/modifier/DispositionModifier.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/modifier/DispositionModifier.java 
b/mdn/src/main/java/org/apache/james/mdn/modifier/DispositionModifier.java
new file mode 100644
index 0000000..66ab46a
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/modifier/DispositionModifier.java
@@ -0,0 +1,29 @@
+/****************************************************************
+ * 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.mdn.modifier;
+
+/**
+ * Interface <code>DispositionModifier</code> marks a type encapsulating
+ * disposition modifier information as defined by RFC 2298.
+ */
+public interface DispositionModifier
+{
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierError.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierError.java 
b/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierError.java
new file mode 100644
index 0000000..2a6feed
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierError.java
@@ -0,0 +1,44 @@
+/****************************************************************
+ * 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.mdn.modifier;
+
+
+/**
+ * Class <code>ModifierError</code>
+ */
+public class ModifierError implements DispositionModifier
+{
+
+    /**
+     * Default Constructor
+     */
+    public ModifierError()
+    {
+        super();
+    }
+
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "error";
+    }
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierExpired.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierExpired.java 
b/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierExpired.java
new file mode 100644
index 0000000..9a73b0e
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierExpired.java
@@ -0,0 +1,45 @@
+/****************************************************************
+ * 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.mdn.modifier;
+
+
+/**
+ * Class <code>ModifierExpired</code>
+ */    
+public class ModifierExpired implements DispositionModifier
+{
+
+    /**
+     * Default Constructor
+     */
+    public ModifierExpired()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "expired";
+    }        
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierFailed.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierFailed.java 
b/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierFailed.java
new file mode 100644
index 0000000..53edbe2
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierFailed.java
@@ -0,0 +1,45 @@
+/****************************************************************
+ * 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.mdn.modifier;
+
+
+/**
+ * Class <code>ModifierFailed</code>
+ */    
+public class ModifierFailed implements DispositionModifier
+{
+
+    /**
+     * Default Constructor
+     */
+    public ModifierFailed()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "failed";
+    }        
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierMailboxTerminated.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierMailboxTerminated.java
 
b/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierMailboxTerminated.java
new file mode 100644
index 0000000..b2c6ade
--- /dev/null
+++ 
b/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierMailboxTerminated.java
@@ -0,0 +1,45 @@
+/****************************************************************
+ * 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.mdn.modifier;
+
+
+/**
+ * Class <code>ModifierMailboxTerminated</code>
+ */    
+public class ModifierMailboxTerminated implements DispositionModifier
+{
+
+    /**
+     * Default Constructor
+     */
+    public ModifierMailboxTerminated()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "mailbox-terminated";
+    }        
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierSuperseded.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierSuperseded.java 
b/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierSuperseded.java
new file mode 100644
index 0000000..11786f9
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierSuperseded.java
@@ -0,0 +1,45 @@
+/****************************************************************
+ * 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.mdn.modifier;
+
+
+/**
+ * Class <code>ModifierSuperseded</code>
+ */    
+public class ModifierSuperseded implements DispositionModifier
+{
+
+    /**
+     * Default Constructor
+     */
+    public ModifierSuperseded()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "superseded";
+    }        
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierWarning.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierWarning.java 
b/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierWarning.java
new file mode 100644
index 0000000..de8d1c6
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/modifier/ModifierWarning.java
@@ -0,0 +1,45 @@
+/****************************************************************
+ * 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.mdn.modifier;
+
+
+/**
+ * Class <code>ModifierWarning</code>
+ */    
+public class ModifierWarning implements DispositionModifier
+{
+
+    /**
+     * Default Constructor
+     */
+    public ModifierWarning()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "warning";
+    }        
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/sending/mode/DispositionSendingMode.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/sending/mode/DispositionSendingMode.java
 
b/mdn/src/main/java/org/apache/james/mdn/sending/mode/DispositionSendingMode.java
new file mode 100644
index 0000000..741c661
--- /dev/null
+++ 
b/mdn/src/main/java/org/apache/james/mdn/sending/mode/DispositionSendingMode.java
@@ -0,0 +1,29 @@
+/****************************************************************
+ * 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.mdn.sending.mode;
+
+/**
+ * Interface <code>DispositionSendingMode</code> marks a type encapsulating
+ * disposition sending mode information as defined by RFC 2298.
+ */
+public interface DispositionSendingMode
+{
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/sending/mode/SendingModeAutomatic.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/sending/mode/SendingModeAutomatic.java 
b/mdn/src/main/java/org/apache/james/mdn/sending/mode/SendingModeAutomatic.java
new file mode 100644
index 0000000..f847007
--- /dev/null
+++ 
b/mdn/src/main/java/org/apache/james/mdn/sending/mode/SendingModeAutomatic.java
@@ -0,0 +1,45 @@
+/****************************************************************
+ * 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.mdn.sending.mode;
+
+
+/**
+ * Class <code>SendingModeAutomatic</code>
+ */
+public class SendingModeAutomatic implements DispositionSendingMode
+{
+
+    /**
+     * Default Constructor
+     */
+    public SendingModeAutomatic()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "MDN-sent-automatically";
+    }        
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/sending/mode/SendingModeManual.java
----------------------------------------------------------------------
diff --git 
a/mdn/src/main/java/org/apache/james/mdn/sending/mode/SendingModeManual.java 
b/mdn/src/main/java/org/apache/james/mdn/sending/mode/SendingModeManual.java
new file mode 100644
index 0000000..1087082
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/sending/mode/SendingModeManual.java
@@ -0,0 +1,45 @@
+/****************************************************************
+ * 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.mdn.sending.mode;
+
+
+/**
+ * Class <code>SendingModeManual</code>
+ */
+public class SendingModeManual implements DispositionSendingMode
+{
+
+    /**
+     * Default Constructor
+     */
+    public SendingModeManual()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "MDN-sent-manually";
+    }         
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/type/DispositionType.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/type/DispositionType.java 
b/mdn/src/main/java/org/apache/james/mdn/type/DispositionType.java
new file mode 100644
index 0000000..c02ba2e
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/type/DispositionType.java
@@ -0,0 +1,29 @@
+/****************************************************************
+ * 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.mdn.type;
+
+/**
+ * Interface <code>DispositionType</code> marks a type encapsulating
+ * disposition type information as defined by RFC 2298.
+ */
+public interface DispositionType
+{
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/type/TypeDeleted.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/type/TypeDeleted.java 
b/mdn/src/main/java/org/apache/james/mdn/type/TypeDeleted.java
new file mode 100644
index 0000000..028e644
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/type/TypeDeleted.java
@@ -0,0 +1,45 @@
+/****************************************************************
+ * 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.mdn.type;
+
+
+/**
+ * Class <code>TypeDeleted</code>
+ */
+public class TypeDeleted implements DispositionType
+{
+
+    /**
+     * Default Constructor
+     */
+    public TypeDeleted()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "deleted";
+    }         
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/type/TypeDenied.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/type/TypeDenied.java 
b/mdn/src/main/java/org/apache/james/mdn/type/TypeDenied.java
new file mode 100644
index 0000000..3430f65
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/type/TypeDenied.java
@@ -0,0 +1,44 @@
+/****************************************************************
+ * 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.mdn.type;
+
+
+/**
+ * Class <code>TypeDenied</code>
+ */    
+public class TypeDenied implements DispositionType
+{
+
+    /**
+     * Default Constructor
+     */
+    public TypeDenied()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "denied";
+    }         
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/type/TypeDispatched.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/type/TypeDispatched.java 
b/mdn/src/main/java/org/apache/james/mdn/type/TypeDispatched.java
new file mode 100644
index 0000000..5bf9190
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/type/TypeDispatched.java
@@ -0,0 +1,43 @@
+/****************************************************************
+ * 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.mdn.type;
+
+
+/**
+ * Class <code>TypeDispatched</code>
+ */
+public class TypeDispatched implements DispositionType
+{
+    /**
+     * Default Constructor
+     */
+    public TypeDispatched()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "dispatched";
+    }         
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/type/TypeDisplayed.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/type/TypeDisplayed.java 
b/mdn/src/main/java/org/apache/james/mdn/type/TypeDisplayed.java
new file mode 100644
index 0000000..48e9323
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/type/TypeDisplayed.java
@@ -0,0 +1,44 @@
+/****************************************************************
+ * 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.mdn.type;
+
+
+/**
+ * Class <code>TypeDisplayed</code>
+ */
+public class TypeDisplayed implements DispositionType
+{
+
+    /**
+     * Default Constructor
+     */
+    public TypeDisplayed()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "displayed";
+    }         
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/type/TypeFailed.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/type/TypeFailed.java 
b/mdn/src/main/java/org/apache/james/mdn/type/TypeFailed.java
new file mode 100644
index 0000000..067c892
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/type/TypeFailed.java
@@ -0,0 +1,44 @@
+/****************************************************************
+ * 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.mdn.type;
+
+
+/**
+ * Class <code>TypeFailed</code>
+ */    
+public class TypeFailed implements DispositionType
+{
+
+    /**
+     * Default Constructor
+     */
+    public TypeFailed()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "failed";
+    }         
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/mdn/src/main/java/org/apache/james/mdn/type/TypeProcessed.java
----------------------------------------------------------------------
diff --git a/mdn/src/main/java/org/apache/james/mdn/type/TypeProcessed.java 
b/mdn/src/main/java/org/apache/james/mdn/type/TypeProcessed.java
new file mode 100644
index 0000000..ed1895b
--- /dev/null
+++ b/mdn/src/main/java/org/apache/james/mdn/type/TypeProcessed.java
@@ -0,0 +1,44 @@
+/****************************************************************
+ * 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.mdn.type;
+
+
+/**
+ * Class <code>TypeProcessed</code>
+ */    
+public class TypeProcessed implements DispositionType
+{
+
+    /**
+     * Default Constructor
+     */
+    public TypeProcessed()
+    {
+        super();
+    }
+    
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        return "processed";
+    }         
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/bbc0bfad/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
----------------------------------------------------------------------
diff --git 
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
 
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
index 460f9f7..c2ee308 100644
--- 
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
+++ 
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
@@ -29,14 +29,13 @@ import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
 
-
-import org.apache.james.mdn.ActionModeAutomatic;
 import org.apache.james.mdn.Disposition;
-import org.apache.james.mdn.DispositionModifier;
 import org.apache.james.mdn.MDNFactory;
-import org.apache.james.mdn.ModifierError;
-import org.apache.james.mdn.SendingModeAutomatic;
-import org.apache.james.mdn.TypeDeleted;
+import org.apache.james.mdn.action.mode.ActionModeAutomatic;
+import org.apache.james.mdn.modifier.DispositionModifier;
+import org.apache.james.mdn.modifier.ModifierError;
+import org.apache.james.mdn.sending.mode.SendingModeAutomatic;
+import org.apache.james.mdn.type.TypeDeleted;
 import org.apache.jsieve.mail.Action;
 import org.apache.jsieve.mail.ActionReject;
 import org.apache.mailet.Mail;


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to