Author: eric
Date: Thu Oct 21 08:09:32 2010
New Revision: 1025875
URL: http://svn.apache.org/viewvc?rev=1025875&view=rev
Log:
Align packages hierarchy for domainlist and mailetcontainer service (JAMES-1074)
Added:
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/
- copied from r1025862,
james/server/trunk/domainlist-library/src/main/java/org/apache/domainlist/james/
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessingMBean.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessingMBean.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessor.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessor.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessorList.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessorList.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetContainer.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetContainer.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetLoader.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetManagementMBean.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetManagementMBean.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MatcherLoader.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherManagementMBean.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MatcherManagementMBean.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorDetailMBean.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/ProcessorDetailMBean.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorManagementMBean.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/ProcessorManagementMBean.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractLoader.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/AbstractLoader.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetLoader.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMailetLoader.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMatcherLoader.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMatcherLoader.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MailetConfigImpl.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetManagement.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MailetManagement.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MatcherConfigImpl.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MatcherConfigImpl.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MatcherManagement.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MatcherManagement.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorDetail.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/ProcessorDetail.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorManagement.java
- copied, changed from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/ProcessorManagement.java
Removed:
james/server/trunk/domainlist-library/src/main/java/org/apache/domainlist/james/
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessingMBean.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessor.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessorList.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetContainer.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetLoader.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetManagementMBean.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MatcherLoader.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MatcherManagementMBean.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/ProcessorDetailMBean.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/ProcessorManagementMBean.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/AbstractLoader.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMailetLoader.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMatcherLoader.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MailetConfigImpl.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MailetManagement.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MatcherConfigImpl.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MatcherManagement.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/ProcessorDetail.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/ProcessorManagement.java
Modified:
james/server/trunk/core-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java
james/server/trunk/domainlist-jdbc/src/main/java/org/apache/domainlist/james/JDBCDomainList.java
james/server/trunk/domainlist-jpa/src/main/java/org/apache/domainlist/james/JPADomainList.java
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/JamesDomainList.java
james/server/trunk/domainlist-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailProcessorList.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MailetProcessor.java
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Modified:
james/server/trunk/core-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java?rev=1025875&r1=1025874&r2=1025875&view=diff
==============================================================================
---
james/server/trunk/core-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java
(original)
+++
james/server/trunk/core-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java
Thu Oct 21 08:09:32 2010
@@ -37,9 +37,9 @@ import org.apache.commons.logging.Log;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.lifecycle.LogEnabled;
-import org.apache.james.mailetcontainer.MailProcessor;
-import org.apache.james.mailetcontainer.MailProcessorList;
-import org.apache.james.mailetcontainer.MailetContainer;
+import org.apache.james.mailetcontainer.api.MailProcessor;
+import org.apache.james.mailetcontainer.api.MailProcessorList;
+import org.apache.james.mailetcontainer.api.MailetContainer;
import org.apache.james.queue.MailQueue;
import org.apache.james.queue.MailQueueFactory;
import org.apache.james.queue.MailQueue.MailQueueItem;
Modified:
james/server/trunk/domainlist-jdbc/src/main/java/org/apache/domainlist/james/JDBCDomainList.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/domainlist-jdbc/src/main/java/org/apache/domainlist/james/JDBCDomainList.java?rev=1025875&r1=1025874&r2=1025875&view=diff
==============================================================================
---
james/server/trunk/domainlist-jdbc/src/main/java/org/apache/domainlist/james/JDBCDomainList.java
(original)
+++
james/server/trunk/domainlist-jdbc/src/main/java/org/apache/domainlist/james/JDBCDomainList.java
Thu Oct 21 08:09:32 2010
@@ -38,7 +38,7 @@ import javax.sql.DataSource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.domainlist.james.AbstractDomainList;
+import org.apache.james.domainlist.lib.AbstractDomainList;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.services.FileSystem;
import org.apache.james.util.sql.JDBCUtil;
@@ -226,7 +226,7 @@ public class JDBCDomainList extends Abst
};
/**
- * @see
org.apache.domainlist.james.AbstractDomainList#getDomainListInternal()
+ * @see
org.apache.james.domainlist.lib.AbstractDomainList#getDomainListInternal()
*/
protected List<String> getDomainListInternal() {
List<String> domains = new ArrayList<String>();
@@ -295,7 +295,7 @@ public class JDBCDomainList extends Abst
}
/**
- * @see
org.apache.domainlist.james.AbstractDomainList#addDomainInternal(java.lang.String)
+ * @see
org.apache.james.domainlist.lib.AbstractDomainList#addDomainInternal(java.lang.String)
*/
protected boolean addDomainInternal(String domain) {
Connection conn = null;
@@ -324,7 +324,7 @@ public class JDBCDomainList extends Abst
}
/**
- * @see
org.apache.domainlist.james.AbstractDomainList#removeDomainInternal(java.lang.String)
+ * @see
org.apache.james.domainlist.lib.AbstractDomainList#removeDomainInternal(java.lang.String)
*/
protected boolean removeDomainInternal(String domain) {
Connection conn = null;
Modified:
james/server/trunk/domainlist-jpa/src/main/java/org/apache/domainlist/james/JPADomainList.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/domainlist-jpa/src/main/java/org/apache/domainlist/james/JPADomainList.java?rev=1025875&r1=1025874&r2=1025875&view=diff
==============================================================================
---
james/server/trunk/domainlist-jpa/src/main/java/org/apache/domainlist/james/JPADomainList.java
(original)
+++
james/server/trunk/domainlist-jpa/src/main/java/org/apache/domainlist/james/JPADomainList.java
Thu Oct 21 08:09:32 2010
@@ -29,8 +29,8 @@ import javax.persistence.PersistenceUnit
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.domainlist.james.AbstractDomainList;
import org.apache.domainlist.james.model.JPADomain;
+import org.apache.james.domainlist.lib.AbstractDomainList;
import org.apache.james.lifecycle.Configurable;
/**
@@ -67,7 +67,7 @@ public class JPADomainList extends Abstr
}
/**
- * @see
org.apache.domainlist.james.AbstractDomainList#getDomainListInternal()
+ * @see
org.apache.james.domainlist.lib.AbstractDomainList#getDomainListInternal()
*/
protected List<String> getDomainListInternal() {
List<String> domains = new ArrayList<String>();
@@ -115,7 +115,7 @@ public class JPADomainList extends Abstr
}
/**
- * @see
org.apache.domainlist.james.AbstractDomainList#addDomainInternal(java.lang.String)
+ * @see
org.apache.james.domainlist.lib.AbstractDomainList#addDomainInternal(java.lang.String)
*/
protected boolean addDomainInternal(String domain) {
EntityManager entityManager =
entityManagerFactory.createEntityManager();
@@ -138,7 +138,7 @@ public class JPADomainList extends Abstr
}
/**
- * @see
org.apache.domainlist.james.AbstractDomainList#removeDomainInternal(java.lang.String)
+ * @see
org.apache.james.domainlist.lib.AbstractDomainList#removeDomainInternal(java.lang.String)
*/
protected boolean removeDomainInternal(String domain) {
EntityManager entityManager =
entityManagerFactory.createEntityManager();
Modified:
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java?rev=1025875&r1=1025862&r2=1025875&view=diff
==============================================================================
---
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
(original)
+++
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
Thu Oct 21 08:09:32 2010
@@ -19,7 +19,7 @@
-package org.apache.domainlist.james;
+package org.apache.james.domainlist.lib;
import java.net.InetAddress;
import java.net.UnknownHostException;
Modified:
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/JamesDomainList.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/JamesDomainList.java?rev=1025875&r1=1025862&r2=1025875&view=diff
==============================================================================
---
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/JamesDomainList.java
(original)
+++
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/JamesDomainList.java
Thu Oct 21 08:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.domainlist.james;
+package org.apache.james.domainlist.lib;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
Modified:
james/server/trunk/domainlist-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/domainlist-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java?rev=1025875&r1=1025874&r2=1025875&view=diff
==============================================================================
---
james/server/trunk/domainlist-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java
(original)
+++
james/server/trunk/domainlist-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java
Thu Oct 21 08:09:32 2010
@@ -27,7 +27,7 @@ import java.util.Locale;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.domainlist.james.AbstractDomainList;
+import org.apache.james.domainlist.lib.AbstractDomainList;
import org.apache.james.lifecycle.Configurable;
@@ -59,7 +59,7 @@ public class XMLDomainList extends Abstr
/**
- * @see
org.apache.domainlist.james.AbstractDomainList#getDomainListInternal()
+ * @see
org.apache.james.domainlist.lib.AbstractDomainList#getDomainListInternal()
*/
protected List<String> getDomainListInternal() {
// TODO: Remove temporary fix!
@@ -79,7 +79,7 @@ public class XMLDomainList extends Abstr
/**
* The added domains will only added in memory!
*
- * @see
org.apache.domainlist.james.AbstractDomainList#addDomainInternal(java.lang.String)
+ * @see
org.apache.james.domainlist.lib.AbstractDomainList#addDomainInternal(java.lang.String)
*/
protected boolean addDomainInternal(String domain) {
// TODO: Remove later. Temporary fix to get sure no domains can be
added to the XMLDomainList
@@ -95,7 +95,7 @@ public class XMLDomainList extends Abstr
}
/**
- * @see
org.apache.domainlist.james.AbstractDomainList#removeDomainInternal(java.lang.String)
+ * @see
org.apache.james.domainlist.lib.AbstractDomainList#removeDomainInternal(java.lang.String)
*/
protected boolean removeDomainInternal(String domain) {
// TODO: Remove later. Temporary fix to get sure no domains can be
added to the XMLDomainList
Copied:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessingMBean.java
(from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessingMBean.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessingMBean.java?p2=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessingMBean.java&p1=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessingMBean.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessingMBean.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessingMBean.java
Thu Oct 21 08:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.api;
public interface MailProcessingMBean {
Copied:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessor.java
(from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessor.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessor.java?p2=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessor.java&p1=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessor.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessor.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessor.java
Thu Oct 21 08:09:32 2010
@@ -19,7 +19,7 @@
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.api;
import org.apache.mailet.Mail;
Copied:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessorList.java
(from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessorList.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessorList.java?p2=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessorList.java&p1=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessorList.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailProcessorList.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailProcessorList.java
Thu Oct 21 08:09:32 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.api;
/**
Copied:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetContainer.java
(from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetContainer.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetContainer.java?p2=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetContainer.java&p1=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetContainer.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetContainer.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetContainer.java
Thu Oct 21 08:09:32 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.api;
import java.util.List;
Copied:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java
(from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetLoader.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java?p2=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java&p1=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetLoader.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetLoader.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java
Thu Oct 21 08:09:32 2010
@@ -19,7 +19,7 @@
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.api;
import org.apache.commons.configuration.Configuration;
import org.apache.mailet.Mailet;
Copied:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetManagementMBean.java
(from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetManagementMBean.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetManagementMBean.java?p2=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetManagementMBean.java&p1=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetManagementMBean.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MailetManagementMBean.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetManagementMBean.java
Thu Oct 21 08:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.api;
/**
* management interface for one Mailet instance
Copied:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java
(from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MatcherLoader.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java?p2=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java&p1=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MatcherLoader.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MatcherLoader.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java
Thu Oct 21 08:09:32 2010
@@ -19,7 +19,7 @@
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.api;
import org.apache.mailet.Matcher;
Copied:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherManagementMBean.java
(from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MatcherManagementMBean.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherManagementMBean.java?p2=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherManagementMBean.java&p1=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MatcherManagementMBean.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/MatcherManagementMBean.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherManagementMBean.java
Thu Oct 21 08:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.api;
/**
* management interface for one Matcher instance
Copied:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorDetailMBean.java
(from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/ProcessorDetailMBean.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorDetailMBean.java?p2=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorDetailMBean.java&p1=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/ProcessorDetailMBean.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/ProcessorDetailMBean.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorDetailMBean.java
Thu Oct 21 08:09:32 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.api;
/**
Copied:
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorManagementMBean.java
(from r1025861,
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/ProcessorManagementMBean.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorManagementMBean.java?p2=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorManagementMBean.java&p1=james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/ProcessorManagementMBean.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/ProcessorManagementMBean.java
(original)
+++
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/ProcessorManagementMBean.java
Thu Oct 21 08:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.api;
/**
* Expose processor management functionality through JMX.
Modified:
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailProcessorList.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailProcessorList.java?rev=1025875&r1=1025874&r2=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailProcessorList.java
(original)
+++
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailProcessorList.java
Thu Oct 21 08:09:32 2010
@@ -44,16 +44,16 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
-import org.apache.james.mailetcontainer.MailProcessor;
-import org.apache.james.mailetcontainer.MailProcessorList;
-import org.apache.james.mailetcontainer.MailetConfigImpl;
-import org.apache.james.mailetcontainer.MailetContainer;
-import org.apache.james.mailetcontainer.MailetLoader;
-import org.apache.james.mailetcontainer.MailetManagement;
-import org.apache.james.mailetcontainer.MatcherLoader;
-import org.apache.james.mailetcontainer.MatcherManagement;
-import org.apache.james.mailetcontainer.ProcessorDetail;
-import org.apache.james.mailetcontainer.ProcessorManagementMBean;
+import org.apache.james.mailetcontainer.api.MailProcessor;
+import org.apache.james.mailetcontainer.api.MailProcessorList;
+import org.apache.james.mailetcontainer.api.MailetContainer;
+import org.apache.james.mailetcontainer.api.MailetLoader;
+import org.apache.james.mailetcontainer.api.MatcherLoader;
+import org.apache.james.mailetcontainer.api.ProcessorManagementMBean;
+import org.apache.james.mailetcontainer.lib.MailetConfigImpl;
+import org.apache.james.mailetcontainer.lib.MailetManagement;
+import org.apache.james.mailetcontainer.lib.MatcherManagement;
+import org.apache.james.mailetcontainer.lib.ProcessorDetail;
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/MailetProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MailetProcessor.java?rev=1025875&r1=1025874&r2=1025875&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 08:09:32 2010
@@ -25,7 +25,7 @@ import javax.mail.MessagingException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.commons.logging.Log;
-import org.apache.james.mailetcontainer.MailetConfigImpl;
+import org.apache.james.mailetcontainer.lib.MailetConfigImpl;
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetConfig;
Copied:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractLoader.java
(from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/AbstractLoader.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractLoader.java?p2=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractLoader.java&p1=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/AbstractLoader.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/AbstractLoader.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractLoader.java
Thu Oct 21 08:09:32 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.lib;
import java.util.List;
import java.util.Vector;
Copied:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java
(from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java?p2=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java&p1=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java
Thu Oct 21 08:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.lib;
import java.util.ArrayList;
import java.util.Collection;
Copied:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetLoader.java
(from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMailetLoader.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetLoader.java?p2=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetLoader.java&p1=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMailetLoader.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMailetLoader.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetLoader.java
Thu Oct 21 08:09:32 2010
@@ -18,13 +18,13 @@
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.lib;
import javax.mail.MessagingException;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.mailetcontainer.MailetLoader;
+import org.apache.james.mailetcontainer.api.MailetLoader;
import org.apache.mailet.Mailet;
/**
* Loads Mailets for use inside James.
@@ -47,7 +47,7 @@ public class JamesMailetLoader extends A
/**
* (non-Javadoc)
- * @see
org.apache.james.mailetcontainer.MailetLoader#getMailet(java.lang.String,
org.apache.commons.configuration.Configuration)
+ * @see
org.apache.james.mailetcontainer.api.MailetLoader#getMailet(java.lang.String,
org.apache.commons.configuration.Configuration)
*/
public Mailet getMailet(final String mailetName, final Configuration
configuration) throws MessagingException {
try {
Copied:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMatcherLoader.java
(from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMatcherLoader.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMatcherLoader.java?p2=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMatcherLoader.java&p1=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMatcherLoader.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/JamesMatcherLoader.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMatcherLoader.java
Thu Oct 21 08:09:32 2010
@@ -19,12 +19,12 @@
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.lib;
import javax.mail.MessagingException;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.mailetcontainer.MatcherLoader;
+import org.apache.james.mailetcontainer.api.MatcherLoader;
import org.apache.mailet.Matcher;
/**
* Loads Matchers for use inside James.
@@ -44,7 +44,7 @@ public class JamesMatcherLoader extends
}
/**
- * @see
org.apache.james.mailetcontainer.MatcherLoader#getMatcher(java.lang.String)
+ * @see
org.apache.james.mailetcontainer.api.MatcherLoader#getMatcher(java.lang.String)
*/
public Matcher getMatcher(String matchName) throws MessagingException {
try {
Copied:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java
(from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MailetConfigImpl.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java?p2=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java&p1=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MailetConfigImpl.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MailetConfigImpl.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java
Thu Oct 21 08:09:32 2010
@@ -19,7 +19,7 @@
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.lib;
import org.apache.commons.configuration.Configuration;
import org.apache.mailet.MailetConfig;
Copied:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetManagement.java
(from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MailetManagement.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetManagement.java?p2=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetManagement.java&p1=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MailetManagement.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MailetManagement.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetManagement.java
Thu Oct 21 08:09:32 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.lib;
import java.util.ArrayList;
import java.util.Iterator;
@@ -26,6 +26,7 @@ import javax.mail.MessagingException;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
+import org.apache.james.mailetcontainer.api.MailetManagementMBean;
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetConfig;
Copied:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MatcherConfigImpl.java
(from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MatcherConfigImpl.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MatcherConfigImpl.java?p2=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MatcherConfigImpl.java&p1=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MatcherConfigImpl.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MatcherConfigImpl.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MatcherConfigImpl.java
Thu Oct 21 08:09:32 2010
@@ -19,7 +19,7 @@
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.lib;
import org.apache.mailet.MailetContext;
import org.apache.mailet.MatcherConfig;
Copied:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MatcherManagement.java
(from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MatcherManagement.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MatcherManagement.java?p2=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MatcherManagement.java&p1=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MatcherManagement.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/MatcherManagement.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MatcherManagement.java
Thu Oct 21 08:09:32 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.lib;
import java.util.Collection;
@@ -24,6 +24,7 @@ import javax.mail.MessagingException;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
+import org.apache.james.mailetcontainer.api.MatcherManagementMBean;
import org.apache.mailet.Mail;
import org.apache.mailet.Matcher;
import org.apache.mailet.MatcherConfig;
Copied:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorDetail.java
(from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/ProcessorDetail.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorDetail.java?p2=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorDetail.java&p1=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/ProcessorDetail.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/ProcessorDetail.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorDetail.java
Thu Oct 21 08:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.lib;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +26,9 @@ import javax.mail.MessagingException;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
+import org.apache.james.mailetcontainer.api.MailProcessor;
+import org.apache.james.mailetcontainer.api.MailetContainer;
+import org.apache.james.mailetcontainer.api.ProcessorDetailMBean;
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
import org.apache.mailet.Matcher;
Copied:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorManagement.java
(from r1025861,
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/ProcessorManagement.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorManagement.java?p2=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorManagement.java&p1=james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/ProcessorManagement.java&r1=1025861&r2=1025875&rev=1025875&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/ProcessorManagement.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorManagement.java
Thu Oct 21 08:09:32 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailetcontainer;
+package org.apache.james.mailetcontainer.lib;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
@@ -33,6 +33,10 @@ import javax.management.StandardMBean;
import org.apache.commons.logging.Log;
import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.mailetcontainer.api.MailProcessor;
+import org.apache.james.mailetcontainer.api.MailProcessorList;
+import org.apache.james.mailetcontainer.api.MailetContainer;
+import org.apache.james.mailetcontainer.api.ProcessorManagementMBean;
import org.apache.mailet.Mailet;
import org.apache.mailet.Matcher;
Modified:
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=1025875&r1=1025874&r2=1025875&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Thu Oct 21 08:09:32 2010
@@ -51,7 +51,7 @@
</property>
<property name="assembler">
<bean
class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
- <property name="managedInterfaces"
value="org.apache.james.smtpserver.SMTPServerMBean,org.apache.james.socket.ServerMBean,org.apache.james.api.domainlist.DomainListMBean,org.apache.james.api.domainlist.ManageableDomainListMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.mailetcontainer.ProcessorManagementMBean,org.apache.james.api.vut.management.VirtualUserTableManagementMBean,org.apache.james.api.user.management.UserManagementMBean"/>
+ <property name="managedInterfaces"
value="org.apache.james.smtpserver.SMTPServerMBean,org.apache.james.socket.ServerMBean,org.apache.james.domainlist.api.DomainListMBean,org.apache.james.domainlist.api.ManageableDomainListMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.mailetcontainer.api.ProcessorManagementMBean,org.apache.james.api.vut.management.VirtualUserTableManagementMBean,org.apache.james.api.user.management.UserManagementMBean"/>
</bean>
</property>
</bean>
@@ -69,8 +69,7 @@
<property name="serviceUrl"
value="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/jamesmailserver" />
</bean>
- <bean id="processormanagement"
class="org.apache.james.mailetcontainer.ProcessorManagement"/>
-
+ <bean id="processormanagement"
class="org.apache.james.mailetcontainer.lib.ProcessorManagement"/>
<bean id="usermanagement"
class="org.apache.james.impl.user.UserManagement" />
@@ -185,11 +184,11 @@
<!-- mailserver implementation which use activemq for spooling the mail -->
<bean id="mailserver" class="org.apache.james.JamesMailServer"/>
- <bean id="mailetcontext"
class="org.apache.james.mailetcontainer.JamesMailetContext"/>
+ <bean id="mailetcontext"
class="org.apache.james.mailetcontainer.lib.JamesMailetContext"/>
- <bean id="matcherloader"
class="org.apache.james.mailetcontainer.JamesMatcherLoader" />
+ <bean id="matcherloader"
class="org.apache.james.mailetcontainer.lib.JamesMatcherLoader" />
- <bean id="mailetloader"
class="org.apache.james.mailetcontainer.JamesMailetLoader" />
+ <bean id="mailetloader"
class="org.apache.james.mailetcontainer.lib.JamesMailetLoader" />
<bean id="dnsservice"
class="org.apache.james.dnsservice.dnsjava.DNSJavaService" />
@@ -262,7 +261,7 @@
<bean id="virtualusertable" name="manageablevirtualusertable"
class="org.apache.james.impl.vut.JamesVirtualUserTable" />
<!-- The context domainlist implementation -->
- <bean id="domainlist" name="domainlistmanagement"
class="org.apache.james.domain.JamesDomainList" />
+ <bean id="domainlist" name="domainlistmanagement"
class="org.apache.james.domainlist.list.JamesDomainList" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
