http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirEvents.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirEvents.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirEvents.java
index d8784dd..db447ac 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirEvents.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirEvents.java
@@ -29,6 +29,7 @@ public class MaildirEvents extends Events {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirExpunge.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirExpunge.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirExpunge.java
index 86b22a9..c9abdd4 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirExpunge.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirExpunge.java
@@ -29,6 +29,7 @@ public class MaildirExpunge extends Expunge {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetch.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetch.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetch.java
index 5fb37f0..bc50801 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetch.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetch.java
@@ -29,6 +29,7 @@ public class MaildirFetch extends Fetch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodySection.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodySection.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodySection.java
index 8c505c0..042634d 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodySection.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodySection.java
@@ -29,6 +29,7 @@ public class MaildirFetchBodySection extends FetchBodySection 
{
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodyStructure.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodyStructure.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodyStructure.java
index 2d07b73..c210769 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodyStructure.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchBodyStructure.java
@@ -29,6 +29,7 @@ public class MaildirFetchBodyStructure extends 
FetchBodyStructure {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchHeaders.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchHeaders.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchHeaders.java
index 0209729..bb3d23b 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchHeaders.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirFetchHeaders.java
@@ -29,6 +29,7 @@ public class MaildirFetchHeaders extends FetchHeaders {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirListing.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirListing.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirListing.java
index 00bbd1d..9996800 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirListing.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirListing.java
@@ -29,6 +29,7 @@ public class MaildirListing extends Listing {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxAnnotation.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxAnnotation.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxAnnotation.java
index 0398fd7..fa9c598 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxAnnotation.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxAnnotation.java
@@ -29,6 +29,7 @@ public class MaildirMailboxAnnotation extends 
MailboxAnnotation {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxWithLongNameError.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxWithLongNameError.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxWithLongNameError.java
index 9355b75..872bc23 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxWithLongNameError.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxWithLongNameError.java
@@ -31,6 +31,7 @@ public class MaildirMailboxWithLongNameError extends 
MailboxWithLongNameError {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMove.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMove.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMove.java
index 823aed4..3f1143c 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMove.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMove.java
@@ -29,6 +29,7 @@ public class MaildirMove extends Move {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirNonAuthenticatedState.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirNonAuthenticatedState.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirNonAuthenticatedState.java
index cb67c08..fc20ad8 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirNonAuthenticatedState.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirNonAuthenticatedState.java
@@ -29,6 +29,7 @@ public class MaildirNonAuthenticatedState extends 
NonAuthenticatedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirPartialFetch.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirPartialFetch.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirPartialFetch.java
index 58082c6..ca67774 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirPartialFetch.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirPartialFetch.java
@@ -29,6 +29,7 @@ public class MaildirPartialFetch extends PartialFetch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirQuotaTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirQuotaTest.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirQuotaTest.java
index c69718b..28afd21 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirQuotaTest.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirQuotaTest.java
@@ -29,6 +29,7 @@ public class MaildirQuotaTest extends QuotaTest {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();
@@ -40,6 +41,7 @@ public class MaildirQuotaTest extends QuotaTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirRename.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirRename.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirRename.java
index e631cf5..97ab5a3 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirRename.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirRename.java
@@ -29,6 +29,7 @@ public class MaildirRename extends Rename {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSearch.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSearch.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSearch.java
index ea0e61d..79b90c3 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSearch.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSearch.java
@@ -29,6 +29,7 @@ public class MaildirSearch extends Search {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSecurity.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSecurity.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSecurity.java
index 7a06c07..ab2c5d5 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSecurity.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSecurity.java
@@ -29,6 +29,7 @@ public class MaildirSecurity extends Security {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelect.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelect.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelect.java
index 9c0bc7b..852296d 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelect.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelect.java
@@ -29,6 +29,7 @@ public class MaildirSelect extends Select {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedInbox.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedInbox.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedInbox.java
index 46c655b..797d933 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedInbox.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedInbox.java
@@ -29,6 +29,7 @@ public class MaildirSelectedInbox extends SelectedInbox {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedState.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedState.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedState.java
index 4021469..6a21b83 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedState.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirSelectedState.java
@@ -29,6 +29,7 @@ public class MaildirSelectedState extends SelectedState {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearch.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearch.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearch.java
index 3dd23de..7bdcd6e 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearch.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearch.java
@@ -29,6 +29,7 @@ public class MaildirUidSearch extends UidSearch {
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearchOnIndex.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearchOnIndex.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearchOnIndex.java
index fd26238..7487bfa 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearchOnIndex.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUidSearchOnIndex.java
@@ -29,6 +29,7 @@ public class MaildirUidSearchOnIndex extends UidSearchOnIndex 
{
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUserFlagsSupport.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUserFlagsSupport.java
 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUserFlagsSupport.java
index 01b567a..f65800c 100644
--- 
a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUserFlagsSupport.java
+++ 
b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirUserFlagsSupport.java
@@ -29,6 +29,7 @@ public class MaildirUserFlagsSupport extends UserFlagsSupport 
{
 
     private ImapHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         system = new MaildirHostSystem();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
index ae45946..38b8af9 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
@@ -35,6 +35,7 @@ public class CassandraAuthenticateTest extends 
AuthenticateTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraAuthenticateTest extends 
AuthenticateTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
index 802e685..e9fc00a 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
@@ -35,6 +35,7 @@ public class CassandraCapabilityTest extends CapabilityTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraCapabilityTest extends CapabilityTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
index a137f79..ad0362c 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
@@ -35,6 +35,7 @@ public class CassandraCheckScriptTest extends CheckScriptTest 
{
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraCheckScriptTest extends CheckScriptTest 
{
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
index 24f02ee..27fe710 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
@@ -35,6 +35,7 @@ public class CassandraDeleteScriptTest extends 
DeleteScriptTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraDeleteScriptTest extends 
DeleteScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
index 7b9caac..cb2387f 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
@@ -35,6 +35,7 @@ public class CassandraGetScriptTest extends GetScriptTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraGetScriptTest extends GetScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
index 0571979..13361b3 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
@@ -35,6 +35,7 @@ public class CassandraHaveSpaceTest extends HaveSpaceTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraHaveSpaceTest extends HaveSpaceTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
index 92292a6..dc8f7c4 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
@@ -35,6 +35,7 @@ public abstract class CassandraListScriptsTest extends 
ListScriptsTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public abstract class CassandraListScriptsTest extends 
ListScriptsTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
index c3b6512..3b9058f 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
@@ -35,6 +35,7 @@ public class CassandraLogoutTest extends LogoutTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraLogoutTest extends LogoutTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
index 1663e8b..cf4b4f0 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
@@ -35,6 +35,7 @@ public class CassandraNoopTest extends NoopTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraNoopTest extends NoopTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
index 9ba8908..6df620a 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
@@ -35,6 +35,7 @@ public class CassandraPutScriptTest extends PutScriptTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraPutScriptTest extends PutScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
index 2ae6162..6972ecf 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
@@ -35,6 +35,7 @@ public class CassandraRenameScriptTest extends 
RenameScriptTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraRenameScriptTest extends 
RenameScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
index f47b3c6..17fa268 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
@@ -35,6 +35,7 @@ public class CassandraSetActiveTest extends SetActiveTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraSetActiveTest extends SetActiveTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
index e4506d1..94db175 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
@@ -35,6 +35,7 @@ public class CassandraStartTlsTest extends StartTlsTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraStartTlsTest extends StartTlsTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
index bf3a509..36bfca0 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
@@ -35,6 +35,7 @@ public class CassandraUnauthenticatedTest extends 
UnauthenticatedTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new 
CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
@@ -48,6 +49,7 @@ public class CassandraUnauthenticatedTest extends 
UnauthenticatedTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java
 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java
index 28c89df..4532781 100644
--- 
a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java
+++ 
b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java
@@ -53,6 +53,7 @@ public class CassandraHostSystem extends 
JamesManageSieveHostSystem {
         super.beforeTest();
     }
 
+    @Override
     protected SieveRepository createSieveRepository() throws Exception {
         return new CassandraSieveRepository(
             new CassandraSieveDAO(cassandra.getConf()),
@@ -60,6 +61,7 @@ public class CassandraHostSystem extends 
JamesManageSieveHostSystem {
             new CassandraActiveScriptDAO(cassandra.getConf()));
     }
 
+    @Override
     protected UsersRepository createUsersRepository() {
         CassandraUsersRepository cassandraUsersRepository = new 
CassandraUsersRepository(cassandra.getConf(), 
CassandraUtils.WITH_DEFAULT_CONFIGURATION);
         cassandraUsersRepository.setEnableVirtualHosting(false);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileAuthenticateTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileAuthenticateTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileAuthenticateTest.java
index 3c4050a..56057b2 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileAuthenticateTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileAuthenticateTest.java
@@ -31,6 +31,7 @@ public class FileAuthenticateTest extends AuthenticateTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileAuthenticateTest extends AuthenticateTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCapabilityTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCapabilityTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCapabilityTest.java
index 26541d7..4a5f614 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCapabilityTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCapabilityTest.java
@@ -31,6 +31,7 @@ public class FileCapabilityTest extends CapabilityTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileCapabilityTest extends CapabilityTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCheckScriptTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCheckScriptTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCheckScriptTest.java
index 68d96ee..a5fada9 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCheckScriptTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileCheckScriptTest.java
@@ -31,6 +31,7 @@ public class FileCheckScriptTest extends CheckScriptTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileCheckScriptTest extends CheckScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileDeleteScriptTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileDeleteScriptTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileDeleteScriptTest.java
index ed93212..af59e0c 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileDeleteScriptTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileDeleteScriptTest.java
@@ -31,6 +31,7 @@ public class FileDeleteScriptTest extends DeleteScriptTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileDeleteScriptTest extends DeleteScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileGetScriptTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileGetScriptTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileGetScriptTest.java
index 563f9ba..2ea659e 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileGetScriptTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileGetScriptTest.java
@@ -31,6 +31,7 @@ public class FileGetScriptTest extends GetScriptTest {
     
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileGetScriptTest extends GetScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileHaveSpaceTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileHaveSpaceTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileHaveSpaceTest.java
index 4bb2739..3dfd7e1 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileHaveSpaceTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileHaveSpaceTest.java
@@ -31,6 +31,7 @@ public class FileHaveSpaceTest extends HaveSpaceTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileHaveSpaceTest extends HaveSpaceTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileListScriptsTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileListScriptsTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileListScriptsTest.java
index 497e186..2dfe67b 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileListScriptsTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileListScriptsTest.java
@@ -31,6 +31,7 @@ public abstract class FileListScriptsTest extends 
ListScriptsTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public abstract class FileListScriptsTest extends 
ListScriptsTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileLogoutTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileLogoutTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileLogoutTest.java
index 2adc4c5..866eb52 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileLogoutTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileLogoutTest.java
@@ -30,6 +30,7 @@ import com.google.inject.Injector;
 public class FileLogoutTest extends LogoutTest {
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -43,6 +44,7 @@ public class FileLogoutTest extends LogoutTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileNoopTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileNoopTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileNoopTest.java
index 1dc4571..1432cc8 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileNoopTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileNoopTest.java
@@ -31,6 +31,7 @@ public class FileNoopTest extends NoopTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileNoopTest extends NoopTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FilePutScriptTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FilePutScriptTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FilePutScriptTest.java
index 50a72bc..0594fc0 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FilePutScriptTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FilePutScriptTest.java
@@ -31,6 +31,7 @@ public class FilePutScriptTest extends PutScriptTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FilePutScriptTest extends PutScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileRenameScriptTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileRenameScriptTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileRenameScriptTest.java
index 35bf256..8624ae3 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileRenameScriptTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileRenameScriptTest.java
@@ -31,6 +31,7 @@ public class FileRenameScriptTest extends RenameScriptTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileRenameScriptTest extends RenameScriptTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileSetActiveTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileSetActiveTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileSetActiveTest.java
index 3ec799a..e847e0c 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileSetActiveTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileSetActiveTest.java
@@ -31,6 +31,7 @@ public class FileSetActiveTest extends SetActiveTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileSetActiveTest extends SetActiveTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileStartTlsTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileStartTlsTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileStartTlsTest.java
index d37365f..408794d 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileStartTlsTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileStartTlsTest.java
@@ -31,6 +31,7 @@ public class FileStartTlsTest extends StartTlsTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileStartTlsTest extends StartTlsTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileUnauthenticatedTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileUnauthenticatedTest.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileUnauthenticatedTest.java
index 1f6eeab..c8d0d3d 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileUnauthenticatedTest.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/FileUnauthenticatedTest.java
@@ -31,6 +31,7 @@ public class FileUnauthenticatedTest extends 
UnauthenticatedTest {
 
     private ManageSieveHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(new FileModule());
@@ -44,6 +45,7 @@ public class FileUnauthenticatedTest extends 
UnauthenticatedTest {
         return system;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         system.afterTest();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
index 7847e99..384c454 100644
--- 
a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
+++ 
b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java
@@ -40,14 +40,17 @@ public class FileHostSystem extends 
JamesManageSieveHostSystem {
 
     private static FileSystem getFileSystem() {
         return new FileSystem() {
+            @Override
             public File getBasedir() throws FileNotFoundException {
                 return new File(System.getProperty("java.io.tmpdir"));
             }
             
+            @Override
             public InputStream getResource(String url) throws IOException {
                 return new FileInputStream(getFile(url));
             }
             
+            @Override
             public File getFile(String fileURL) throws FileNotFoundException {
                 return new File(getBasedir(), 
fileURL.substring(FileSystem.FILE_PROTOCOL.length()));
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
 
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
index 0adbeb0..fdadf26 100644
--- 
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
+++ 
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
@@ -33,6 +33,7 @@ public class CassandraForwardSmtpTest extends ForwardSmtpTest 
{
     
     private SmtpHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
 
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
index 5fa2d7a..d448f42 100644
--- 
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
+++ 
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
@@ -33,6 +33,7 @@ public class CassandraSmtpStarttlsCommandTest extends 
SmtpStarttlsCommandTest {
     
     private SmtpHostSystem system;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         Injector injector = Guice.createInjector(

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
----------------------------------------------------------------------
diff --git 
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
 
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
index 3556014..51c942a 100644
--- 
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
+++ 
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
@@ -96,6 +96,7 @@ public class CassandraJamesSmtpHostSystem extends 
ExternalSessionFactory impleme
         folder.delete();
     }
 
+    @Override
     public InMemoryDNSService getInMemoryDnsService() {
         return inMemoryDNSService;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java
----------------------------------------------------------------------
diff --git 
a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java
 
b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java
index 1190a5d..a9a6eb5 100644
--- 
a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java
+++ 
b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java
@@ -162,29 +162,20 @@ public class MailProtocolTest implements Monitor {
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mpt.Monitor#debug(char)
-     */
+    @Override
     public void debug(char character) {
         //getLog().debug("'" + character + "'");
         // do nothing by default
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mpt.Monitor#debug(java.lang.String)
-     */
+    @Override
     public void debug(String message) {
         //getLog().debug(message);
         // do nothing by default
 
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.mpt.Monitor#note(java.lang.String)
-     */
+    @Override
     public void note(String message) {
         //getLog().debug(message);
         System.out.println(message);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java
----------------------------------------------------------------------
diff --git 
a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java
 
b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java
index c2ce668..f6ae11a 100644
--- 
a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java
+++ 
b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java
@@ -38,6 +38,7 @@ public class MailProtocolTestMojo extends AbstractMojo {
      */
     private MailProtocolTest[] mailProtocolTests;
 
+    @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         for (MailProtocolTest test : mailProtocolTests) {
             test.execute();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
index e5723ff..8b814bb 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
@@ -44,9 +44,7 @@ public abstract class AbstractProtocolTransport implements 
ProtocolTransport {
     private final Queue<Response> responses = new LinkedBlockingQueue<>();
     private volatile boolean isAsync = false;
     
-    /**
-     * @see 
org.apache.james.protocols.api.ProtocolTransport#writeResponse(org.apache.james.protocols.api.Response,
 org.apache.james.protocols.api.ProtocolSession)
-     */
+    @Override
     public final void writeResponse(Response response, ProtocolSession 
session) {
         // if we already in asynchrnous mode we simply enqueue the response
         // we do this synchronously because we may have a dequeuer thread 
working on

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
index 0878d79..a607cad 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java
@@ -69,6 +69,7 @@ public abstract class AbstractResponse implements Response {
      * 
      * @return the SMTPCode
      */
+    @Override
     public String getRetCode() {
         return retCode;
     }
@@ -88,6 +89,7 @@ public abstract class AbstractResponse implements Response {
      * 
      * @return true if session is ended
      */
+    @Override
     public boolean isEndSession() {
         return endSession;
     }
@@ -116,14 +118,17 @@ public abstract class AbstractResponse implements 
Response {
     public Response immutable() {
         return new Response() {
             
+            @Override
             public boolean isEndSession() {
                 return AbstractResponse.this.isEndSession();
             }
             
+            @Override
             public String getRetCode() {
                 return AbstractResponse.this.getRetCode();
             }
             
+            @Override
             public List<CharSequence> getLines() {
                 return AbstractResponse.this.getLines();
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java 
b/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java
index 4d7d6f3..8b1ed75 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java
@@ -34,16 +34,12 @@ public class BaseRequest implements Request {
         
     }
     
-    /**
-     * @see org.apache.james.protocols.api.Request#getArgument()
-     */
+    @Override
     public String getArgument() {
         return argument;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.Request#getCommand()
-     */
+    @Override
     public String getCommand() {
         return command;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
index 156d865..31bbc71 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java
@@ -40,10 +40,7 @@ public class CombinedInputStream extends SequenceInputStream 
implements Iterable
         streams = new InputStream[] {s1, s2};
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.lang.Iterable#iterator()
-     */
+    @Override
     public Iterator<InputStream> iterator() {
         return new Iterator<InputStream>() {
             private int count = 0;
@@ -52,6 +49,7 @@ public class CombinedInputStream extends SequenceInputStream 
implements Iterable
              * (non-Javadoc)
              * @see java.util.Iterator#hasNext()
              */
+            @Override
             public boolean hasNext() {
                 return count < streams.length;
             }
@@ -60,6 +58,7 @@ public class CombinedInputStream extends SequenceInputStream 
implements Iterable
              * (non-Javadoc)
              * @see java.util.Iterator#next()
              */
+            @Override
             public InputStream next() {
                 if (hasNext())  {
                     return streams[count++];
@@ -71,6 +70,7 @@ public class CombinedInputStream extends SequenceInputStream 
implements Iterable
             /**
              * Read-Only
              */
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException("Read-Only");
             }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolConfigurationImpl.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolConfigurationImpl.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolConfigurationImpl.java
index 6911178..9cbf4cb 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolConfigurationImpl.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolConfigurationImpl.java
@@ -47,12 +47,7 @@ public class ProtocolConfigurationImpl implements 
ProtocolConfiguration {
         DEFAULT_HELLO_NAME = hName;
     }
     
-    /*
-     * 
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.protocols.pop3.POP3Configuration#getHelloName()
-     */
+    @Override
     public String getHelloName() {
         if (helloName == null) {
             return DEFAULT_HELLO_NAME;
@@ -64,10 +59,7 @@ public class ProtocolConfigurationImpl implements 
ProtocolConfiguration {
         this.helloName = helloName;
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolConfiguration#getGreeting()
-     */
+    @Override
     public String getGreeting() {
         return greeting;
     }
@@ -76,10 +68,7 @@ public class ProtocolConfigurationImpl implements 
ProtocolConfiguration {
         this.greeting = greeting;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see 
org.apache.james.protocols.api.ProtocolConfiguration#getSoftwareName()
-     */
+    @Override
     public String getSoftwareName() {
         return softwareName;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java 
b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
index de2d74b..962019e 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
@@ -34,26 +34,17 @@ public abstract class ProtocolImpl implements Protocol {
         this.config = config;
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Protocol#getProtocolChain()
-     */
+    @Override
     public ProtocolHandlerChain getProtocolChain() {
         return chain;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see 
org.apache.james.protocols.api.Protocol#newSession(org.apache.james.protocols.api.ProtocolTransport)
-     */
+    @Override
     public ProtocolSession newSession(ProtocolTransport transport) {
         return new ProtocolSessionImpl(transport, config);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Protocol#getConfiguration()
-     */
+    @Override
     public ProtocolConfiguration getConfiguration() {
         return config;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
index 0d07b76..5aec3ee 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java
@@ -47,32 +47,22 @@ public class ProtocolSessionImpl implements ProtocolSession 
{
         this.config = config;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolSession#getLocalAddress()
-     */
+    @Override
     public InetSocketAddress getLocalAddress() {
         return transport.getLocalAddress();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolSession#getRemoteAddress()
-     */
+    @Override
     public InetSocketAddress getRemoteAddress() {
         return transport.getRemoteAddress();
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#getUser()
-     */
+    @Override
     public String getUser() {
         return user;
     }
 
-    /**
-     * @see 
org.apache.james.protocols.api.ProtocolSession#setUser(java.lang.String)
-     */
+    @Override
     public void setUser(String user) {
         this.user = user;
     }
@@ -86,38 +76,28 @@ public class ProtocolSessionImpl implements ProtocolSession 
{
         return transport;
     }
 
-    /**
-     * @see 
org.apache.james.protocols.api.ProtocolSession#isStartTLSSupported()
-     */
+    @Override
     public boolean isStartTLSSupported() {
         return transport.isStartTLSSupported();
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#isTLSStarted()
-     */
+    @Override
     public boolean isTLSStarted() {
         return transport.isTLSStarted();
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#getSessionID()
-     */
+    @Override
     public String getSessionID() {
         return transport.getId();
     }
     
     
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#getConnectionState()
-     */
+    @Override
     public Map<String, Object> getConnectionState() {
         return connectionState;
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#getState()
-     */
+    @Override
     public Map<String, Object> getState() {
         return sessionState;
     }
@@ -126,6 +106,7 @@ public class ProtocolSessionImpl implements ProtocolSession 
{
      * This implementation just returns <code>null</code>. Sub-classes should
      * overwrite this if needed
      */
+    @Override
     public Response newLineTooLongResponse() {
         return null;
     }
@@ -134,6 +115,7 @@ public class ProtocolSessionImpl implements ProtocolSession 
{
      * This implementation just returns <code>null</code>. Sub-classes should
      * overwrite this if needed
      */
+    @Override
     public Response newFatalErrorResponse() {
         return null;
     }
@@ -142,21 +124,17 @@ public class ProtocolSessionImpl implements 
ProtocolSession {
      * This implementation just clears the sessions state. Sub-classes should
      * overwrite this if needed
      */
+    @Override
     public void resetState() {
         sessionState.clear();
     }
 
-    /**
-     * @see org.apache.james.protocols.api.ProtocolSession#getConfiguration()
-     */
+    @Override
     public ProtocolConfiguration getConfiguration() {
         return config;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see 
org.apache.james.protocols.api.ProtocolSession#setAttachment(java.lang.String, 
java.lang.Object, org.apache.james.protocols.api.ProtocolSession.State)
-     */
+    @Override
     public Object setAttachment(String key, Object value, State state) {
         if (state == State.Connection) {
             if (value == null) {
@@ -173,10 +151,7 @@ public class ProtocolSessionImpl implements 
ProtocolSession {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see 
org.apache.james.protocols.api.ProtocolSession#getAttachment(java.lang.String, 
org.apache.james.protocols.api.ProtocolSession.State)
-     */
+    @Override
     public Object getAttachment(String key, State state) {
         if (state == State.Connection) {
             return connectionState.get(key);
@@ -188,6 +163,7 @@ public class ProtocolSessionImpl implements ProtocolSession 
{
     /**
      * Returns a Charset for US-ASCII
      */
+    @Override
     public Charset getCharset() {
         return CHARSET;
     }
@@ -195,30 +171,22 @@ public class ProtocolSessionImpl implements 
ProtocolSession {
     /**
      * Returns "\r\n";
      */
+    @Override
     public String getLineDelimiter() {
         return DELIMITER;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.ProtocolSession#popLineHandler()
-     */
+    @Override
     public void popLineHandler() {
         transport.popLineHandler();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see 
org.apache.james.protocols.api.ProtocolSession#getPushedLineHandlerCount()
-     */
+    @Override
     public int getPushedLineHandlerCount() {
         return transport.getPushedLineHandlerCount();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see 
org.apache.james.protocols.api.ProtocolSession#pushLineHandler(org.apache.james.protocols.api.handler.LineHandler)
-     */
+    @Override
     public <T extends ProtocolSession> void pushLineHandler(LineHandler<T> 
overrideCommandHandler) {
         transport.pushLineHandler(overrideCommandHandler, this);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java 
b/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java
index 58283a8..48e5d3c 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/Response.java
@@ -34,15 +34,18 @@ public interface Response {
      */
     Response DISCONNECT = new Response() {
 
+        @Override
         public String getRetCode() {
             return "";
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public List<CharSequence> getLines() {
             return Collections.EMPTY_LIST;
         }
 
+        @Override
         public boolean isEndSession() {
             return true;
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
index 577cd4c..eed41c6 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
@@ -61,6 +61,7 @@ public class FutureResponseImpl implements FutureResponse {
         }
     }
 
+    @Override
     public synchronized void addListener(ResponseListener listener) {
         if (isReady()) {
             listener.onResponse(this);
@@ -72,10 +73,7 @@ public class FutureResponseImpl implements FutureResponse {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see 
org.apache.james.protocols.api.FutureResponse#removeListener(org.apache.james.protocols.api.FutureResponse.ResponseListener)
-     */
+    @Override
     public synchronized void removeListener(ResponseListener listener) {
         if (!isReady()) {
             if (listeners != null) {
@@ -84,38 +82,26 @@ public class FutureResponseImpl implements FutureResponse {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.FutureResponse#isReady()
-     */
+    @Override
     public synchronized boolean isReady() {
         return response != null;
     }
     
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Response#getLines()
-     */
+    @Override
     public List<CharSequence> getLines() {
         checkReady();
         return response.getLines();
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Response#getRetCode()
-     */
+    @Override
     public String getRetCode() {
         checkReady();
         return response.getRetCode();
     }
 
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.Response#isEndSession()
-     */
+    @Override
     public boolean isEndSession() {
         checkReady();
         return response.isEndSession();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java
index d09388e..211ecde 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureStreamResponseImpl.java
@@ -44,10 +44,7 @@ public class FutureStreamResponseImpl extends 
FutureResponseImpl implements Stre
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.apache.james.protocols.api.StreamResponse#getStream()
-     */
+    @Override
     public InputStream getStream() {
         checkReady();
         return ((StreamResponse) response).getStream();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
index 14ea246..0b1803f 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
@@ -37,9 +37,7 @@ public abstract class AbstractProtocolHandlerChain implements 
ProtocolHandlerCha
      */
     protected abstract List<ProtocolHandler> getHandlers();
 
-    /**
-     * @see 
org.apache.james.protocols.api.handler.ProtocolHandlerChain#getHandlers(java.lang.Class)
-     */
+    @Override
     @SuppressWarnings("unchecked")
     public <T> LinkedList<T> getHandlers(Class<T> type) {
         List<ProtocolHandler> handlers = getHandlers();
@@ -70,10 +68,7 @@ public abstract class AbstractProtocolHandlerChain 
implements ProtocolHandlerCha
     }
     
 
-    /*
-     * (non-Javadoc)
-     * @see 
org.apache.james.protocols.api.handler.ProtocolHandlerChain#destroy()
-     */
+    @Override
     public void destroy() {
         List<ProtocolHandler> handlers = getHandlers(ProtocolHandler.class);
         for (ProtocolHandler handler: handlers) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
index 13d5a90..da59a3a 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
@@ -110,10 +110,7 @@ public class CommandDispatcher<SessionT extends 
ProtocolSession> implements Exte
         return handlers;
     }
 
-    /**
-     * @throws WiringException 
-     * @see 
org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class,
 java.util.List)
-     */
+    @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void wireExtensions(Class interfaceName, List extensions) throws 
WiringException {
         if (interfaceName.equals(ProtocolHandlerResultHandler.class)) {
@@ -143,10 +140,7 @@ public class CommandDispatcher<SessionT extends 
ProtocolSession> implements Exte
 
     }
     
-    /*
-     * (non-Javadoc)
-     * @see 
org.apache.james.protocols.api.handler.LineHandler#onLine(org.apache.james.protocols.api.ProtocolSession,
 java.nio.ByteBuffer)
-     */
+    @Override
     public Response onLine(SessionT session, ByteBuffer line) {
         
         try {
@@ -254,9 +248,7 @@ public class CommandDispatcher<SessionT extends 
ProtocolSession> implements Exte
 
     }
    
-    /**
-     * @see 
org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
-     */
+    @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public List<Class<?>> getMarkerInterfaces() {
         List res = new LinkedList();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f209526e/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
----------------------------------------------------------------------
diff --git 
a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
 
b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
index 123bafe..c2283de 100644
--- 
a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
+++ 
b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
@@ -34,6 +34,7 @@ public class CommandHandlerResultLogger implements 
ProtocolHandlerResultHandler<
 
     private static final Logger LOGGER = 
LoggerFactory.getLogger(CommandHandlerResultLogger.class);
 
+    @Override
     public Response onResponse(ProtocolSession session, Response response, 
long executionTime, ProtocolHandler handler) {
         if (handler instanceof CommandHandler) {
             LOGGER.debug("{}: {}", handler.getClass().getName(), response);


---------------------------------------------------------------------
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