You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2006/05/26 10:35:30 UTC
svn commit: r409588 - in /james/server/trunk/src: java/org/apache/james/
java/org/apache/james/transport/matchers/ java/org/apache/mailet/
test/org/apache/james/test/mock/mailet/
Author: bago
Date: Fri May 26 01:35:29 2006
New Revision: 409588
URL: http://svn.apache.org/viewvc?rev=409588&view=rev
Log:
Renamed MailetContext.isLocalUser(MailAddress) to isLocalEmail (JAMES-508)
Modified:
james/server/trunk/src/java/org/apache/james/James.java
james/server/trunk/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
james/server/trunk/src/java/org/apache/james/transport/matchers/RecipientIsLocal.java
james/server/trunk/src/java/org/apache/mailet/MailetContext.java
james/server/trunk/src/test/org/apache/james/test/mock/mailet/MockMailContext.java
Modified: james/server/trunk/src/java/org/apache/james/James.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/James.java?rev=409588&r1=409587&r2=409588&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/James.java (original)
+++ james/server/trunk/src/java/org/apache/james/James.java Fri May 26 01:35:29 2006
@@ -715,9 +715,9 @@
}
try {
if (name.indexOf("@") == -1) {
- return isLocalUser(new MailAddress(name,"localhost"));
+ return isLocalEmail(new MailAddress(name,"localhost"));
} else {
- return isLocalUser(new MailAddress(name));
+ return isLocalEmail(new MailAddress(name));
}
} catch (ParseException e) {
log("Error checking isLocalUser for user "+name);
@@ -726,9 +726,9 @@
}
/**
- * @see org.apache.mailet.MailetContext#isLocalUser(org.apache.mailet.MailAddress)
+ * @see org.apache.mailet.MailetContext#isLocalEmail(org.apache.mailet.MailAddress)
*/
- public boolean isLocalUser(MailAddress mailAddress) {
+ public boolean isLocalEmail(MailAddress mailAddress) {
if (!isLocalServer(mailAddress.getHost())) {
return false;
}
Modified: james/server/trunk/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=409588&r1=409587&r2=409588&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java (original)
+++ james/server/trunk/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java Fri May 26 01:35:29 2006
@@ -81,7 +81,7 @@
*/
protected boolean isRecipientChecked(MailAddress recipient) throws MessagingException {
MailetContext mailetContext = getMailetContext();
- return super.isRecipientChecked(recipient) && (mailetContext.isLocalUser(recipient));
+ return super.isRecipientChecked(recipient) && (mailetContext.isLocalEmail(recipient));
}
/**
Modified: james/server/trunk/src/java/org/apache/james/transport/matchers/RecipientIsLocal.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/matchers/RecipientIsLocal.java?rev=409588&r1=409587&r2=409588&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/transport/matchers/RecipientIsLocal.java (original)
+++ james/server/trunk/src/java/org/apache/james/transport/matchers/RecipientIsLocal.java Fri May 26 01:35:29 2006
@@ -29,6 +29,6 @@
public boolean matchRecipient(MailAddress recipient) {
MailetContext mailetContext = getMailetContext();
//This might change after startup
- return mailetContext.isLocalUser(recipient);
+ return mailetContext.isLocalEmail(recipient);
}
}
Modified: james/server/trunk/src/java/org/apache/mailet/MailetContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/mailet/MailetContext.java?rev=409588&r1=409587&r2=409588&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/mailet/MailetContext.java (original)
+++ james/server/trunk/src/java/org/apache/mailet/MailetContext.java Fri May 26 01:35:29 2006
@@ -147,7 +147,7 @@
* @param userAccount - user identifier.
* @return true if the acount is a local account
*
- * @deprecated use isLocalUser(MailAddress) instead
+ * @deprecated use isLocalEmail(MailAddress) instead
*
* @since James 2.4.0 this method expect to receive also the domain
* name within the userAccount string (user\@domain).
@@ -163,7 +163,7 @@
*
* @since James 2.4.0
*/
- boolean isLocalUser(MailAddress mailAddress);
+ boolean isLocalEmail(MailAddress mailAddress);
/**
* Writes the specified message to a mailet log file, usually an event
Modified: james/server/trunk/src/test/org/apache/james/test/mock/mailet/MockMailContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/test/mock/mailet/MockMailContext.java?rev=409588&r1=409587&r2=409588&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/test/mock/mailet/MockMailContext.java (original)
+++ james/server/trunk/src/test/org/apache/james/test/mock/mailet/MockMailContext.java Fri May 26 01:35:29 2006
@@ -74,7 +74,7 @@
return false; // trivial implementation
}
- public boolean isLocalUser(MailAddress mailAddress) {
+ public boolean isLocalEmail(MailAddress mailAddress) {
return false; // trivial implementation
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org