danny 2003/01/06 04:41:01
Modified: src/java/org/apache/james/transport/mailets
ToRepository.java RemoteDelivery.java
Log:
removing avalon dependance in mailets.
Step three removing avalon dependance for access to Mail repositories from standard
mailets
Revision Changes Path
1.9 +14 -18
jakarta-james/src/java/org/apache/james/transport/mailets/ToRepository.java
Index: ToRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/ToRepository.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ToRepository.java 14 Sep 2002 09:00:58 -0000 1.8
+++ ToRepository.java 6 Jan 2003 12:41:01 -0000 1.9
@@ -7,15 +7,17 @@
*/
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.configuration.DefaultConfiguration;
+//import org.apache.avalon.framework.component.ComponentException;
+//import org.apache.avalon.framework.component.ComponentManager;
+//import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import javax.mail.MessagingException;
+
import org.apache.james.Constants;
import org.apache.james.core.MailImpl;
-import org.apache.james.services.MailRepository;
import org.apache.james.services.MailStore;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
+import org.apache.mailet.MailRepository;
/**
* Stores incoming Mail in the specified Repository.
@@ -55,19 +57,13 @@
// Ignore exception, default to false
}
- ComponentManager compMgr =
(ComponentManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
- try {
- MailStore mailstore = (MailStore)
compMgr.lookup("org.apache.james.services.MailStore");
- DefaultConfiguration mailConf
- = new DefaultConfiguration("repository", "generated:ToRepository");
- mailConf.setAttribute("destinationURL", repositoryPath);
- mailConf.setAttribute("type", "MAIL");
- repository = (MailRepository) mailstore.select(mailConf);
- } catch (ComponentException cnfe) {
- log("Failed to retrieve Store component:" + cnfe.getMessage());
- } catch (Exception e) {
- log("Failed to retrieve Store component:" + e.getMessage());
- }
+
+ try {
+ repository = getMailetContext().getMailRepository(repositoryPath);
+ } catch (MessagingException e) {
+ log("Initialisation failed can't get repository "+repositoryPath);
+ }
+
}
1.34 +8 -25
jakarta-james/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
Index: RemoteDelivery.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/RemoteDelivery.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- RemoteDelivery.java 14 Dec 2002 03:30:11 -0000 1.33
+++ RemoteDelivery.java 6 Jan 2003 12:41:01 -0000 1.34
@@ -7,17 +7,17 @@
*/
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.configuration.DefaultConfiguration;
+//import org.apache.avalon.framework.component.ComponentException;
+//import org.apache.avalon.framework.component.ComponentManager;
+//import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.james.Constants;
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailServer;
import org.apache.james.services.MailStore;
-import org.apache.james.services.SpoolRepository;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.SpoolRepository;
import javax.mail.*;
import javax.mail.internet.AddressException;
@@ -101,26 +101,9 @@
}
gatewayServer = getInitParameter("gateway");
gatewayPort = getInitParameter("gatewayPort");
- ComponentManager compMgr =
(ComponentManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
- String outgoingPath = getInitParameter("outgoing");
- if (outgoingPath == null) {
- outgoingPath = "file:///../var/mail/outgoing";
- }
-
- try {
- // Instantiate the a MailRepository for outgoing mails
- MailStore mailstore = (MailStore)
compMgr.lookup("org.apache.james.services.MailStore");
-
- DefaultConfiguration spoolConf
- = new DefaultConfiguration("repository",
"generated:RemoteDelivery.java");
- spoolConf.setAttribute("destinationURL", outgoingPath);
- spoolConf.setAttribute("type", "SPOOL");
- outgoing = (SpoolRepository) mailstore.select(spoolConf);
- } catch (ComponentException cnfe) {
- log("Failed to retrieve Store component:" + cnfe.getMessage());
- } catch (Exception e) {
- log("Failed to retrieve Store component:" + e.getMessage());
- }
+
+
+ outgoing = getMailetContext().getMailSpool(getInitParameter("outgoing"));
//Start up a number of threads
try {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
