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 da...@apache.org on 2003/01/06 16:56:24 UTC
cvs commit: jakarta-james/src/java/org/apache/james/transport/mailets AvalonListserv.java AvalonListservManager.java
danny 2003/01/06 07:56:24
Modified: src/java/org/apache/james/transport/mailets
AvalonListserv.java AvalonListservManager.java
Log:
removing avalon dependance in mailets.
Step six remove avalon dependance from standard mailets
Revision Changes Path
1.8 +12 -15 jakarta-james/src/java/org/apache/james/transport/mailets/AvalonListserv.java
Index: AvalonListserv.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/AvalonListserv.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AvalonListserv.java 2 Dec 2002 22:03:21 -0000 1.7
+++ AvalonListserv.java 6 Jan 2003 15:56:24 -0000 1.8
@@ -7,13 +7,14 @@
*/
package org.apache.james.transport.mailets;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
+//import org.apache.avalon.framework.component.ComponentException;
+//import org.apache.avalon.framework.component.ComponentManager;
import org.apache.james.Constants;
-import org.apache.james.services.UsersRepository;
-import org.apache.james.services.UsersStore;
+//import org.apache.james.services.UsersStore;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
+import javax.mail.MessagingException;
import javax.mail.internet.ParseException;
import java.util.Collection;
import java.util.Iterator;
@@ -114,17 +115,13 @@
// Ignore any exceptions, default to true
}
- ComponentManager compMgr = (ComponentManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
- try {
- UsersStore usersStore = (UsersStore)compMgr.lookup("org.apache.james.services.UsersStore");
- String repName = getInitParameter("repositoryName");
- members = (UsersRepository)usersStore.getRepository( repName );
- } catch (ComponentException cnfe) {
- log("Failed to retrieve Store component:" + cnfe.getMessage());
- } catch (Exception e) {
- log("Failed to retrieve Store component:" + e.getMessage());
- }
+ try {
+ members = getMailetContext().getUserRepository(getInitParameter("repositoryName"));
+ } catch (MessagingException e) {
+ log("init failed cannot access users repository "+getInitParameter("repositoryName"), e);
+ }
+
}
public Collection getMembers() throws ParseException {
1.7 +12 -15 jakarta-james/src/java/org/apache/james/transport/mailets/AvalonListservManager.java
Index: AvalonListservManager.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/AvalonListservManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AvalonListservManager.java 14 Sep 2002 09:00:58 -0000 1.6
+++ AvalonListservManager.java 6 Jan 2003 15:56:24 -0000 1.7
@@ -7,12 +7,14 @@
*/
package org.apache.james.transport.mailets;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
+//import org.apache.avalon.framework.component.ComponentException;
+//import org.apache.avalon.framework.component.ComponentManager;
+import javax.mail.MessagingException;
+
import org.apache.james.Constants;
-import org.apache.james.services.UsersRepository;
-import org.apache.james.services.UsersStore;
+//import org.apache.james.services.UsersStore;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
/**
* Adds or removes an email address to a listserv.
@@ -33,17 +35,12 @@
* Initialize the mailet
*/
public void init() {
- ComponentManager compMgr = (ComponentManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
- try {
- UsersStore usersStore = (UsersStore) compMgr.lookup("org.apache.james.services.UsersStore");
- String repName = getInitParameter("repositoryName");
+ try {
+ members = getMailetContext().getUserRepository(getInitParameter("repositoryName"));
+ } catch (MessagingException e) {
+ log("init failed cannot access users repository "+getInitParameter("repositoryName"), e);
+ }
- members = (UsersRepository) usersStore.getRepository(repName);
- } catch (ComponentException cnfe) {
- log("Failed to retrieve Store component:" + cnfe.getMessage());
- } catch (Exception e) {
- log("Failed to retrieve Store component:" + e.getMessage());
- }
}
/**
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>