Author: bago
Date: Mon Aug 11 07:39:09 2008
New Revision: 684760
URL: http://svn.apache.org/viewvc?rev=684760&view=rev
Log:
Moved core-library/o.a.j.services.(Mailet|Matcher)Loader interfaces to the
spoolmanager-function/o.a.j.transport package.
It is the only implementor and the only user of this service.
Added:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java
(contents, props changed)
- copied, changed from r684545,
james/server/trunk/core-library/src/main/java/org/apache/james/services/MailetLoader.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MatcherLoader.java
(contents, props changed)
- copied, changed from r684545,
james/server/trunk/core-library/src/main/java/org/apache/james/services/MatcherLoader.java
Removed:
james/server/trunk/core-library/src/main/java/org/apache/james/services/MailetLoader.java
james/server/trunk/core-library/src/main/java/org/apache/james/services/MatcherLoader.java
Modified:
james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesMailetLoader.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesMatcherLoader.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetContainer.java
james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesMailetLoader.xinfo
james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesMatcherLoader.xinfo
james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesSpoolManager.xinfo
james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
Modified: james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml?rev=684760&r1=684759&r2=684760&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml Mon Aug
11 07:39:09 2008
@@ -66,8 +66,8 @@
<!-- The James Spool Manager block -->
<block name="spoolmanager"
class="org.apache.james.transport.JamesSpoolManager" >
<provide name="spoolrepository"
role="org.apache.james.services.SpoolRepository"/>
- <provide name="matcherpackages"
role="org.apache.james.services.MatcherLoader"/>
- <provide name="mailetpackages"
role="org.apache.james.services.MailetLoader"/>
+ <provide name="matcherpackages"
role="org.apache.james.transport.MatcherLoader"/>
+ <provide name="mailetpackages"
role="org.apache.james.transport.MailetLoader"/>
</block>
<block name="matcherpackages"
class="org.apache.james.transport.JamesMatcherLoader" >
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesMailetLoader.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesMailetLoader.java?rev=684760&r1=684759&r2=684760&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesMailetLoader.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesMailetLoader.java
Mon Aug 11 07:39:09 2008
@@ -23,7 +23,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.services.MailetLoader;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetException;
/**
@@ -39,7 +38,7 @@
}
/**
- * @see org.apache.james.services.MailetLoader#getMailet(java.lang.String,
org.apache.avalon.framework.configuration.Configuration)
+ * @see
org.apache.james.transport.MailetLoader#getMailet(java.lang.String,
org.apache.avalon.framework.configuration.Configuration)
*/
public Mailet getMailet(String mailetName, Configuration configuration)
throws MessagingException {
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesMatcherLoader.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesMatcherLoader.java?rev=684760&r1=684759&r2=684760&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesMatcherLoader.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesMatcherLoader.java
Mon Aug 11 07:39:09 2008
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.services.MatcherLoader;
import org.apache.mailet.MailetException;
import org.apache.mailet.Matcher;
/**
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java?rev=684760&r1=684759&r2=684760&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java
Mon Aug 11 07:39:09 2008
@@ -32,8 +32,6 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailProcessor;
-import org.apache.james.services.MailetLoader;
-import org.apache.james.services.MatcherLoader;
import org.apache.james.services.SpoolRepository;
import org.apache.james.util.mailet.MatcherInverter;
import org.apache.mailet.GenericMailet;
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetContainer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetContainer.java?rev=684760&r1=684759&r2=684760&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetContainer.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetContainer.java
Mon Aug 11 07:39:09 2008
@@ -20,8 +20,6 @@
import java.util.List;
-import org.apache.james.services.MailetLoader;
-import org.apache.james.services.MatcherLoader;
/**
* interface for mailet/matcher-containing processors.
Copied:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java
(from r684545,
james/server/trunk/core-library/src/main/java/org/apache/james/services/MailetLoader.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java?p2=james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/services/MailetLoader.java&r1=684545&r2=684760&rev=684760&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/services/MailetLoader.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java
Mon Aug 11 07:39:09 2008
@@ -19,7 +19,7 @@
-package org.apache.james.services;
+package org.apache.james.transport;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.mailet.Mailet;
Propchange:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.7.4.4
Propchange:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MailetLoader.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MatcherLoader.java
(from r684545,
james/server/trunk/core-library/src/main/java/org/apache/james/services/MatcherLoader.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MatcherLoader.java?p2=james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MatcherLoader.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/services/MatcherLoader.java&r1=684545&r2=684760&rev=684760&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/services/MatcherLoader.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MatcherLoader.java
Mon Aug 11 07:39:09 2008
@@ -19,7 +19,7 @@
-package org.apache.james.services;
+package org.apache.james.transport;
import org.apache.mailet.Matcher;
Propchange:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/MatcherLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesMailetLoader.xinfo
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesMailetLoader.xinfo?rev=684760&r1=684759&r2=684760&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesMailetLoader.xinfo
(original)
+++
james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesMailetLoader.xinfo
Mon Aug 11 07:39:09 2008
@@ -26,7 +26,7 @@
<!-- services that are offered by this block -->
<services>
- <service name="org.apache.james.services.MailetLoader" version="1.0" />
+ <service name="org.apache.james.transport.MailetLoader" version="1.0" />
</services>
<dependencies>
Modified:
james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesMatcherLoader.xinfo
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesMatcherLoader.xinfo?rev=684760&r1=684759&r2=684760&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesMatcherLoader.xinfo
(original)
+++
james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesMatcherLoader.xinfo
Mon Aug 11 07:39:09 2008
@@ -26,7 +26,7 @@
<!-- services that are offered by this block -->
<services>
- <service name="org.apache.james.services.MatcherLoader" version="1.0" />
+ <service name="org.apache.james.transport.MatcherLoader" version="1.0" />
</services>
<dependencies>
Modified:
james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesSpoolManager.xinfo
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesSpoolManager.xinfo?rev=684760&r1=684759&r2=684760&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesSpoolManager.xinfo
(original)
+++
james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/JamesSpoolManager.xinfo
Mon Aug 11 07:39:09 2008
@@ -33,10 +33,10 @@
<service name="org.apache.james.services.SpoolRepository" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.MailetLoader" version="1.0"/>
+ <service name="org.apache.james.transport.MailetLoader" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.MatcherLoader" version="1.0"/>
+ <service name="org.apache.james.transport.MatcherLoader" version="1.0"/>
</dependency>
</dependencies>
Modified:
james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml?rev=684760&r1=684759&r2=684760&view=diff
==============================================================================
---
james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
(original)
+++
james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
Mon Aug 11 07:39:09 2008
@@ -66,8 +66,8 @@
<!-- The James Spool Manager block -->
<block name="spoolmanager"
class="org.apache.james.transport.JamesSpoolManager" >
<provide name="spoolrepository"
role="org.apache.james.services.SpoolRepository"/>
- <provide name="matcherpackages"
role="org.apache.james.services.MatcherLoader"/>
- <provide name="mailetpackages"
role="org.apache.james.services.MailetLoader"/>
+ <provide name="matcherpackages"
role="org.apache.james.transport.MatcherLoader"/>
+ <provide name="mailetpackages"
role="org.apache.james.transport.MailetLoader"/>
</block>
<block name="matcherpackages"
class="org.apache.james.transport.JamesMatcherLoader" >
Modified:
james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml?rev=684760&r1=684759&r2=684760&view=diff
==============================================================================
---
james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
(original)
+++
james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
Mon Aug 11 07:39:09 2008
@@ -81,8 +81,8 @@
<!-- The James Spool Manager block -->
<block name="spoolmanager"
class="org.apache.james.transport.JamesSpoolManager" >
<provide name="spoolrepository"
role="org.apache.james.services.SpoolRepository"/>
- <provide name="matcherpackages"
role="org.apache.james.services.MatcherLoader"/>
- <provide name="mailetpackages"
role="org.apache.james.services.MailetLoader"/>
+ <provide name="matcherpackages"
role="org.apache.james.transport.MatcherLoader"/>
+ <provide name="mailetpackages"
role="org.apache.james.transport.MailetLoader"/>
</block>
<block name="matcherpackages"
class="org.apache.james.transport.JamesMatcherLoader" >
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
