Author: ieugen
Date: Tue Mar 19 23:07:20 2013
New Revision: 1458563
URL: http://svn.apache.org/r1458563
Log:
JAMES-1491 Fixes some imports related to mailets packages
Modified:
james/server/trunk/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/BaseMatchersTest.java
james/server/trunk/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
Modified:
james/server/trunk/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/BaseMatchersTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/BaseMatchersTest.java?rev=1458563&r1=1458562&r2=1458563&view=diff
==============================================================================
---
james/server/trunk/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/BaseMatchersTest.java
(original)
+++
james/server/trunk/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/BaseMatchersTest.java
Tue Mar 19 23:07:20 2013
@@ -19,12 +19,8 @@
package org.apache.james.mailetcontainer.impl.matchers;
-import java.util.Arrays;
-
-import javax.mail.MessagingException;
-
-import org.apache.james.transport.matchers.All;
-import org.apache.james.transport.matchers.RecipientIs;
+import org.apache.james.mailet.standard.matchers.All;
+import org.apache.james.mailet.standard.matchers.RecipientIs;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
import org.apache.mailet.base.test.FakeMail;
@@ -32,6 +28,9 @@ import org.apache.mailet.base.test.FakeM
import org.apache.mailet.base.test.FakeMatcherConfig;
import org.junit.Before;
+import javax.mail.MessagingException;
+import java.util.Arrays;
+
public class BaseMatchersTest {
protected FakeMailContext context;
Modified:
james/server/trunk/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=1458563&r1=1458562&r2=1458563&view=diff
==============================================================================
---
james/server/trunk/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
(original)
+++
james/server/trunk/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
Tue Mar 19 23:07:20 2013
@@ -19,13 +19,6 @@
package org.apache.james.transport.matchers;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import javax.inject.Inject;
-import javax.mail.MessagingException;
-
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
@@ -37,6 +30,7 @@ import org.apache.james.mailbox.model.Ma
import org.apache.james.mailbox.model.MailboxQuery;
import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailet.standard.matchers.AbstractQuotaMatcher;
import org.apache.james.transport.util.MailetContextLog;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
@@ -44,6 +38,12 @@ import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
+import javax.inject.Inject;
+import javax.mail.MessagingException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
/**
* <p>
* Experimental: Abstract matcher checking whether a recipient has exceeded a
@@ -59,7 +59,7 @@ import org.apache.mailet.MailetContext;
* can slow down things if there are many mails in the mailbox. Some users also
* report big problems with the matcher if a JDBC based mailrepository is used.
* </p>
- *
+ *
* @since 2.2.0
*/
abstract public class AbstractStorageQuota extends AbstractQuotaMatcher {
@@ -90,9 +90,8 @@ abstract public class AbstractStorageQuo
* recipient is a known user in the local server.<br>
* If a subclass overrides this method it should "and"
* <code>super.isRecipientChecked</code> to its check.
- *
- * @param recipient
- * the recipient to check
+ *
+ * @param recipient the recipient to check
*/
protected boolean isRecipientChecked(MailAddress recipient) throws
MessagingException {
MailetContext mailetContext = getMailetContext();
@@ -109,10 +108,10 @@ abstract public class AbstractStorageQuo
/**
* Gets the storage used in the recipient's inbox.
- *
- * @param recipient
- * the recipient to check
+ *
+ * @param recipient the recipient to check
*/
+ @Override
protected long getUsed(MailAddress recipient, Mail _) throws
MessagingException {
long size = 0;
MailboxSession session;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
