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 no...@apache.org on 2010/12/23 14:53:51 UTC
svn commit: r1052270 - in /james/server/trunk:
mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/
mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/
mailetcontainer-library/src/main/java/org/apache/jame...
Author: norman
Date: Thu Dec 23 13:53:50 2010
New Revision: 1052270
URL: http://svn.apache.org/viewvc?rev=1052270&view=rev
Log:
Only naming cleanup
Added:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailProcessorManagementMBean.java
- copied, changed from r1051470, james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailProcessingMBean.java
Removed:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailProcessingMBean.java
Modified:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailetManagementMBean.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MatcherManagementMBean.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailetProcessor.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MailProcessorManagement.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MailetManagement.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MatcherManagement.java
Copied: james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailProcessorManagementMBean.java (from r1051470, james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailProcessingMBean.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailProcessorManagementMBean.java?p2=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailProcessorManagementMBean.java&p1=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailProcessingMBean.java&r1=1051470&r2=1052270&rev=1052270&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailProcessingMBean.java (original)
+++ james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailProcessorManagementMBean.java Thu Dec 23 13:53:50 2010
@@ -19,16 +19,53 @@
package org.apache.james.mailetcontainer.api.jmx;
-public interface MailProcessingMBean {
+/**
+ *
+ * MBean for Mail processing components
+ *
+ */
+public interface MailProcessorManagementMBean {
+ /**
+ * Return the count of handled mail
+ *
+ * @return handledCount
+ */
public long getHandledMailCount();
+ /**
+ * Return the time in ms of the fastest processing
+ *
+ * @return fastest
+ */
public long getFastestProcessing();
+ /**
+ * Return the time in ms of the slowest processing
+ *
+ * @return slowest
+ */
public long getSlowestProcessing();
+ /**
+ * Return the count of how many time the processing was done without and error
+ *
+ * @return successCount
+ */
public long getSuccessCount();
+ /**
+ * Return the count of how many times an error was detected while processing
+ *
+ * @return errorCount
+ */
public long getErrorCount();
+ /**
+ * Return the time in ms of the last processing
+ *
+ * @return last
+ */
+ public long getLastProcessing();
+
}
Modified: james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailetManagementMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailetManagementMBean.java?rev=1052270&r1=1052269&r2=1052270&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailetManagementMBean.java (original)
+++ james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailetManagementMBean.java Thu Dec 23 13:53:50 2010
@@ -22,9 +22,19 @@ package org.apache.james.mailetcontainer
/**
* management interface for one Mailet instance
*/
-public interface MailetManagementMBean extends MailProcessingMBean{
+public interface MailetManagementMBean extends MailProcessorManagementMBean{
+ /**
+ * Return the name of the mailet
+ *
+ * @return mailet
+ */
public String getMailetName();
+ /**
+ * Return the parameters which are configured for the mailet
+ *
+ * @return params
+ */
public String[] getMailetParameters();
}
Modified: james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MatcherManagementMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MatcherManagementMBean.java?rev=1052270&r1=1052269&r2=1052270&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MatcherManagementMBean.java (original)
+++ james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MatcherManagementMBean.java Thu Dec 23 13:53:50 2010
@@ -22,14 +22,34 @@ package org.apache.james.mailetcontainer
/**
* management interface for one Matcher instance
*/
-public interface MatcherManagementMBean extends MailProcessingMBean{
+public interface MatcherManagementMBean extends MailProcessorManagementMBean{
+ /**
+ * Return the name of the Matcher
+ *
+ * @return name
+ */
public String getMatcherName();
+ /**
+ * Return the matcher condition
+ *
+ * @return condition
+ */
public String getMatcherCondition();
- public long getMatchedRecipientCount();
+ /**
+ * Return the count of how many times the Matcher matched
+ *
+ * @return matched
+ */
+ public long getMatchedCount();
- public long getNotMatchedRecipientCount();
+ /**
+ * Return the count of how many times the Matcher not matches
+ *
+ * @return notmatched
+ */
+ public long getNotMatchedCount();
}
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailetProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailetProcessor.java?rev=1052270&r1=1052269&r2=1052270&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailetProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailetProcessor.java Thu Dec 23 13:53:50 2010
@@ -225,7 +225,7 @@ public class CamelMailetProcessor extend
public void process(Exchange arg0) throws Exception {
Mail mail = arg0.getIn().getBody(Mail.class);
- mailetContext.sendMail(mail);
+ toProcessor(mail);
}
Modified: james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java?rev=1052270&r1=1052269&r2=1052270&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java (original)
+++ james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java Thu Dec 23 13:53:50 2010
@@ -57,7 +57,7 @@ import org.apache.mailet.base.MatcherInv
*/
public abstract class AbstractStateMailetProcessor implements MailProcessor, Configurable, LogEnabled{
- protected MailetContext mailetContext;
+ private MailetContext mailetContext;
private MatcherLoader matcherLoader;
private List<MailetProcessorListener> listeners = Collections.synchronizedList(new ArrayList<MailetProcessorListener>());
private JMXStateMailetProcessorListener jmxListener;
@@ -153,6 +153,15 @@ public abstract class AbstractStateMaile
}
}
+ /**
+ * Hand the mail over to another processor
+ *
+ * @param mail
+ * @throws MessagingException
+ */
+ protected void toProcessor(Mail mail) throws MessagingException{
+ mailetContext.sendMail(mail);
+ }
protected Log getLogger() {
return logger;
Modified: james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MailProcessorManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MailProcessorManagement.java?rev=1052270&r1=1052269&r2=1052270&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MailProcessorManagement.java (original)
+++ james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MailProcessorManagement.java Thu Dec 23 13:53:50 2010
@@ -38,6 +38,8 @@ public class MailProcessorManagement ext
private AtomicLong successCount = new AtomicLong(0);
private AtomicLong fastestProcessing = new AtomicLong(-1);
private AtomicLong slowestProcessing = new AtomicLong(-1);
+ private AtomicLong lastProcessing = new AtomicLong(-1);
+
public MailProcessorManagement(String processorName) throws NotCompliantMBeanException {
@@ -45,9 +47,12 @@ public class MailProcessorManagement ext
this.processorName = processorName;
}
- /*
- * (non-Javadoc)
- * @see org.apache.james.mailetcontainer.api.MailProcessor#service(org.apache.mailet.Mail)
+
+ /**
+ * Update the stats
+ *
+ * @param processTime
+ * @param success
*/
public void update(long processTime, boolean success) {
long fastest = fastestProcessing.get();
@@ -65,6 +70,9 @@ public class MailProcessorManagement ext
} else {
errorCount.incrementAndGet();
}
+
+ lastProcessing.set(processTime);
+
}
@@ -119,4 +127,12 @@ public class MailProcessorManagement ext
return successCount.get();
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#getLastProcessing()
+ */
+ public long getLastProcessing() {
+ return lastProcessing.get();
+ }
+
}
Modified: james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MailetManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MailetManagement.java?rev=1052270&r1=1052269&r2=1052270&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MailetManagement.java (original)
+++ james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MailetManagement.java Thu Dec 23 13:53:50 2010
@@ -35,6 +35,8 @@ public final class MailetManagement exte
private AtomicLong successCount = new AtomicLong(0);
private AtomicLong fastestProcessing = new AtomicLong(-1);
private AtomicLong slowestProcessing = new AtomicLong(-1);
+ private AtomicLong lastProcessing = new AtomicLong(-1);
+
private final MailetConfig config;
public MailetManagement(MailetConfig config) throws NotCompliantMBeanException {
@@ -59,17 +61,20 @@ public final class MailetManagement exte
} else {
errorCount.incrementAndGet();
}
+ lastProcessing.set(processTime);
}
+
/*
* (non-Javadoc)
- * @see org.apache.james.mailetcontainer.MailetManagementMBean#getMailetName()
+ * @see org.apache.james.mailetcontainer.api.jmx.MailetManagementMBean#getMailetName()
*/
public String getMailetName() {
return config.getMailetName();
}
/*
- *
+ * (non-Javadoc)
+ * @see org.apache.james.mailetcontainer.api.jmx.MailetManagementMBean#getMailetParameters()
*/
@SuppressWarnings("unchecked")
public String[] getMailetParameters() {
@@ -84,25 +89,28 @@ public final class MailetManagement exte
return result;
}
+
/*
* (non-Javadoc)
- * @see org.apache.james.mailetcontainer.MailetManagementMBean#getErrorCount()
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#getErrorCount()
*/
public long getErrorCount() {
return errorCount.get();
}
+
/*
* (non-Javadoc)
- * @see org.apache.james.mailetcontainer.MailetManagementMBean#getFastestProcessing()
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#getFastestProcessing()
*/
public long getFastestProcessing() {
return fastestProcessing.get();
}
+
/*
* (non-Javadoc)
- * @see org.apache.james.mailetcontainer.MailetManagementMBean#getHandledMailCount()
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#getHandledMailCount()
*/
public long getHandledMailCount() {
return getErrorCount() + getSuccessCount();
@@ -110,7 +118,7 @@ public final class MailetManagement exte
/*
* (non-Javadoc)
- * @see org.apache.james.mailetcontainer.MailetManagementMBean#getSlowestProcessing()
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#getSlowestProcessing()
*/
public long getSlowestProcessing() {
return slowestProcessing.get();
@@ -124,4 +132,13 @@ public final class MailetManagement exte
return successCount.get();
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#getLastProcessing()
+ */
+ public long getLastProcessing() {
+ return lastProcessing.get();
+ }
+
}
Modified: james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MatcherManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MatcherManagement.java?rev=1052270&r1=1052269&r2=1052270&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MatcherManagement.java (original)
+++ james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/MatcherManagement.java Thu Dec 23 13:53:50 2010
@@ -35,6 +35,7 @@ public final class MatcherManagement ext
private AtomicLong slowestProcessing = new AtomicLong(-1);
private AtomicLong matchedCount = new AtomicLong(0);
private AtomicLong notMatchedCount = new AtomicLong(0);
+ private AtomicLong lastProcessing = new AtomicLong(-1);
public MatcherManagement(MatcherConfig matcherConfig) throws NotCompliantMBeanException {
super(MatcherManagementMBean.class);
@@ -64,6 +65,8 @@ public final class MatcherManagement ext
notMatchedCount.incrementAndGet();
}
+ lastProcessing.set(processTime);
+
}
@@ -126,21 +129,29 @@ public final class MatcherManagement ext
return successCount.get();
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.mailetcontainer.MatcherManagementMBean#getMatchedRecipientCount()
+ * @see org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getMatchedCount()
*/
- public long getMatchedRecipientCount() {
+ public long getMatchedCount() {
return matchedCount.get();
}
/*
* (non-Javadoc)
- * @see org.apache.james.mailetcontainer.MatcherManagementMBean#getNotMatchedRecipientCount()
+ * @see org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getNotMatchedCount()
*/
- public long getNotMatchedRecipientCount() {
+ public long getNotMatchedCount() {
return notMatchedCount.get();
}
+
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#getLastProcessing()
+ */
+ public long getLastProcessing() {
+ return lastProcessing.get();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org