Author: norman
Date: Tue Sep 27 18:50:53 2011
New Revision: 1176523
URL: http://svn.apache.org/viewvc?rev=1176523&view=rev
Log:
Add more code for providing a working LMTP-Server (nearly complete). See
PROTOCOLS-1
Added:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPDataLineMessageHookHandler.java
(with props)
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
Added:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPDataLineMessageHookHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPDataLineMessageHookHandler.java?rev=1176523&view=auto
==============================================================================
---
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPDataLineMessageHookHandler.java
(added)
+++
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPDataLineMessageHookHandler.java
Tue Sep 27 18:50:53 2011
@@ -0,0 +1,86 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.protocols.lmtp;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.WiringException;
+import org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook;
+import org.apache.james.protocols.smtp.MailEnvelopeImpl;
+import org.apache.james.protocols.smtp.SMTPResponse;
+import org.apache.james.protocols.smtp.SMTPRetCode;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler;
+import org.apache.james.protocols.smtp.core.DataLineMessageHookHandler;
+import org.apache.james.protocols.smtp.dsn.DSNStatus;
+import org.apache.mailet.MailAddress;
+
+public class LMTPDataLineMessageHookHandler extends DataLineMessageHookHandler{
+
+ private final List<DeliverToRecipientHook> handlers = new
ArrayList<DeliverToRecipientHook>();
+
+
+ @Override
+ protected Response processExtensions(SMTPSession session, MailEnvelopeImpl
mail) {
+ LMTPMultiResponse mResponse = null;
+
+ Iterator<MailAddress> recipients = mail.getRecipients().iterator();
+
+ while (recipients.hasNext()) {
+ MailAddress recipient = recipients.next();
+ Response response = null;
+ for (DeliverToRecipientHook handler: handlers) {
+ response =
AbstractHookableCmdHandler.calcDefaultSMTPResponse(handler.deliver(session,
recipient, mail));
+ if (response != null) {
+ break;
+ }
+ }
+ if (response == null) {
+ // Add some default response for not handled responses
+ response = new SMTPResponse(SMTPRetCode.LOCAL_ERROR,
DSNStatus.getStatus(DSNStatus.TRANSIENT, DSNStatus.UNDEFINED_STATUS) +
"Temporary error deliver message to " + recipient);
+ }
+ if (mResponse == null) {
+ mResponse = new LMTPMultiResponse(response);
+ } else {
+ mResponse.addResponse(response);
+ }
+ }
+ return mResponse;
+ }
+
+ @Override
+ public List<Class<?>> getMarkerInterfaces() {
+ List<Class<?>> markers = new ArrayList<Class<?>>();
+ markers.add(DeliverToRecipientHook.class);
+ return markers;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void wireExtensions(Class interfaceName, List extension) throws
WiringException {
+ if (interfaceName.equals(DeliverToRecipientHook.class)) {
+ handlers.addAll((Collection<? extends DeliverToRecipientHook>)
extension);
+ }
+ }
+
+}
Propchange:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPDataLineMessageHookHandler.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java?rev=1176523&r1=1176522&r2=1176523&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
Tue Sep 27 18:50:53 2011
@@ -28,6 +28,7 @@ import java.util.List;
import org.apache.james.protocols.api.FutureResponse;
import org.apache.james.protocols.api.FutureResponse.ResponseListener;
+import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.handler.ExtensibleHandler;
import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.api.handler.WiringException;
@@ -58,7 +59,7 @@ public class DataLineMessageHookHandler
* (non-Javadoc)
* @see
org.apache.james.smtpserver.protocol.core.DataLineFilter#onLine(org.apache.james.smtpserver.protocol.SMTPSession,
byte[], org.apache.james.api.protocol.LineHandler)
*/
- public SMTPResponse onLine(final SMTPSession session, byte[] line,
LineHandler<SMTPSession> next) {
+ public Response onLine(final SMTPSession session, byte[] line,
LineHandler<SMTPSession> next) {
MailEnvelopeImpl env = (MailEnvelopeImpl)
session.getState().get(DataCmdHandler.MAILENV);
OutputStream out = env.getMessageOutputStream();
try {
@@ -68,7 +69,7 @@ public class DataLineMessageHookHandler
out.flush();
out.close();
- SMTPResponse response = processExtensions(session, env);
+ Response response = processExtensions(session, env);
if (response instanceof FutureResponse) {
((FutureResponse) response).addListener(new
ResponseListener() {
@@ -109,7 +110,7 @@ public class DataLineMessageHookHandler
/**
* @param session
*/
- protected SMTPResponse processExtensions(SMTPSession session,
MailEnvelopeImpl mail) {
+ protected Response processExtensions(SMTPSession session, MailEnvelopeImpl
mail) {
try {
if (mail != null && messageHandlers != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
