Author: norman
Date: Thu Oct 21 11:05:56 2010
New Revision: 1025946
URL: http://svn.apache.org/viewvc?rev=1025946&view=rev
Log:
Move ProcessorUtil to mailetcontainer-library and remove the ROLE stuff from
interface
Added:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java
- copied, changed from r1025902,
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/ProcessorUtil.java
Removed:
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/ProcessorUtil.java
Modified:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorManagementMBean.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MailetProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MatcherSplitter.java
Modified:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java?rev=1025946&r1=1025945&r2=1025946&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java
Thu Oct 21 11:05:56 2010
@@ -27,12 +27,7 @@ import org.apache.mailet.Mailet;
import javax.mail.MessagingException;
public interface MailetLoader {
-
- /**
- * The component role used by components implementing this service
- */
- String ROLE = "org.apache.james.transport.MailetLoader";
-
+
/**
* Get a new Mailet with the specified name acting
* in the specified context.
Modified:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java?rev=1025946&r1=1025945&r2=1025946&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java
Thu Oct 21 11:05:56 2010
@@ -28,11 +28,6 @@ import javax.mail.MessagingException;
public interface MatcherLoader {
/**
- * The component role used by components implementing this service
- */
- String ROLE = "org.apache.james.transport.MatcherLoader";
-
- /**
* Get a new Matcher with the specified name acting
* in the specified context.
*
Modified:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorManagementMBean.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorManagementMBean.java?rev=1025946&r1=1025945&r2=1025946&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorManagementMBean.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorManagementMBean.java
Thu Oct 21 11:05:56 2010
@@ -22,15 +22,12 @@ package org.apache.james.mailetcontainer
/**
* Expose processor management functionality through JMX.
*
- * @phoenix:mx-topic name="ProcessorAdministration"
*/
public interface ProcessorManagementMBean {
/**
* Retrieves all existing processors
*
- * @phoenix:mx-operation
- * @phoenix:mx-description Retrieves all existing processors
*
* @return names of all configured processors
*/
Modified:
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MailetProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MailetProcessor.java?rev=1025946&r1=1025945&r2=1025946&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MailetProcessor.java
(original)
+++
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MailetProcessor.java
Thu Oct 21 11:05:56 2010
@@ -26,6 +26,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.commons.logging.Log;
import org.apache.james.mailetcontainer.lib.MailetConfigImpl;
+import org.apache.james.mailetcontainer.lib.ProcessorUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetConfig;
Modified:
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MatcherSplitter.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MatcherSplitter.java?rev=1025946&r1=1025945&r2=1025946&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MatcherSplitter.java
(original)
+++
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MatcherSplitter.java
Thu Oct 21 11:05:56 2010
@@ -33,6 +33,7 @@ import org.apache.camel.InOnly;
import org.apache.camel.Property;
import org.apache.commons.logging.Log;
import org.apache.james.core.MailImpl;
+import org.apache.james.mailetcontainer.lib.ProcessorUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
Copied:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java
(from r1025902,
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/ProcessorUtil.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java?p2=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java&p1=james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/ProcessorUtil.java&r1=1025902&r2=1025946&rev=1025946&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/ProcessorUtil.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java
Thu Oct 21 11:05:56 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.mailetcontainer.camel;
+package org.apache.james.mailetcontainer.lib;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -45,7 +45,6 @@ public class ProcessorUtil {
* @throws MessagingException thrown always, rethrowing the passed in
exception
*/
public static void handleException(MessagingException me, Mail mail,
String offendersName, String nextState, Log logger) throws MessagingException {
- System.err.println("exception! " + me);
mail.setState(nextState);
StringWriter sout = new StringWriter();
PrintWriter out = new PrintWriter(sout, true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
