Author: bago
Date: Sun Sep 17 08:02:57 2006
New Revision: 447073
URL: http://svn.apache.org/viewvc?view=rev&rev=447073
Log:
Changed WhiteListManager and IsInWhiteList to depend on UsersRepository.ROLE
(by default the "LocalUsers" user repository) instead of depending on
Store.ROLE and looking up "LocalUsers" the hardcoded way (I already did this
for the other mailets in past). Also expanded imports.
Modified:
james/server/trunk/src/java/org/apache/james/transport/mailets/WhiteListManager.java
james/server/trunk/src/java/org/apache/james/transport/matchers/IsInWhiteList.java
Modified:
james/server/trunk/src/java/org/apache/james/transport/mailets/WhiteListManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/mailets/WhiteListManager.java?view=diff&rev=447073&r1=447072&r2=447073
==============================================================================
---
james/server/trunk/src/java/org/apache/james/transport/mailets/WhiteListManager.java
(original)
+++
james/server/trunk/src/java/org/apache/james/transport/mailets/WhiteListManager.java
Sun Sep 17 08:02:57 2006
@@ -21,23 +21,45 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.*;
+import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.james.Constants;
+import org.apache.james.services.JamesUser;
+import org.apache.james.services.UsersRepository;
+import org.apache.james.util.JDBCUtil;
+import org.apache.james.util.SqlResources;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.RFC2822Headers;
import org.apache.mailet.dates.RFC822DateFormat;
-import org.apache.avalon.cornerstone.services.datasources.*;
-import org.apache.avalon.excalibur.datasource.*;
-import org.apache.avalon.framework.service.*;
-
-import org.apache.james.*;
-import org.apache.james.services.*;
-import org.apache.james.util.*;
-
-import javax.mail.*;
-import javax.mail.internet.*;
-
-import java.sql.*;
-import java.util.*;
-import java.io.*;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
/** <P>Manages for each local user a "white list" of remote addresses whose
messages
* should never be blocked as spam.</P>
@@ -106,9 +128,6 @@
private RFC822DateFormat rfc822DateFormat = new RFC822DateFormat();
private DataSourceComponent datasource;
-
- /** The store containing the local user repository. */
- private UsersStore usersStore;
/** The user repository for this mail server. Contains all the users with
inboxes
* on this server.
@@ -218,8 +237,7 @@
try {
// Get the UsersRepository
- usersStore = (UsersStore)serviceManager.lookup(UsersStore.ROLE);
- localusers =
(UsersRepository)usersStore.getRepository("LocalUsers");
+ localusers =
(UsersRepository)serviceManager.lookup(UsersRepository.ROLE);
} catch (Exception e) {
throw new MessagingException("Can't get the local users
repository", e);
}
Modified:
james/server/trunk/src/java/org/apache/james/transport/matchers/IsInWhiteList.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/matchers/IsInWhiteList.java?view=diff&rev=447073&r1=447072&r2=447073
==============================================================================
---
james/server/trunk/src/java/org/apache/james/transport/matchers/IsInWhiteList.java
(original)
+++
james/server/trunk/src/java/org/apache/james/transport/matchers/IsInWhiteList.java
Sun Sep 17 08:02:57 2006
@@ -21,25 +21,33 @@
package org.apache.james.transport.matchers;
-import org.apache.mailet.*;
-
-import org.apache.avalon.cornerstone.services.datasources.*;
-import org.apache.avalon.excalibur.datasource.*;
-import org.apache.avalon.framework.service.*;
-
-import org.apache.james.*;
-import org.apache.james.services.*;
-import org.apache.james.util.*;
-
-import javax.mail.*;
-
+import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.james.Constants;
+import org.apache.james.services.JamesUser;
+import org.apache.james.services.UsersRepository;
+import org.apache.james.transport.mailets.WhiteListManager;
+import org.apache.james.util.JDBCUtil;
+import org.apache.james.util.SqlResources;
+import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.MessagingException;
+
+import java.io.File;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
import java.util.StringTokenizer;
-import java.sql.*;
-import java.util.*;
-import java.io.*;
-
/**
* <P>Matches recipients having the mail sender in the recipient's private
whitelist .</P>
* <P> The recipient name is always converted to its primary name (handling
aliases).</P>
@@ -60,9 +68,6 @@
private DataSourceComponent datasource;
- /** The store containing the local user repository. */
- private UsersStore usersStore;
-
/** The user repository for this mail server. Contains all the users with
inboxes
* on this server.
*/
@@ -132,8 +137,7 @@
try {
// Get the UsersRepository
- usersStore = (UsersStore)serviceManager.lookup(UsersStore.ROLE);
- localusers =
(UsersRepository)usersStore.getRepository("LocalUsers");
+ localusers =
(UsersRepository)serviceManager.lookup(UsersRepository.ROLE);
} catch (Exception e) {
throw new MessagingException("Can't get the local users
repository", e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
