Author: norman
Date: Sat Sep 25 18:02:15 2010
New Revision: 1001290
URL: http://svn.apache.org/viewvc?rev=1001290&view=rev
Log:
Move JamesMailetContext to mailetcontainer-impl (JAMES-1051)
Added:
james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java
- copied, changed from r1000973,
james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailetContext.java
Removed:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailetContext.java
Modified:
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailProcessorList.java
james/server/trunk/mailetcontainer-impl/pom.xml
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
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=1001290&r1=1001289&r2=1001290&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
Sat Sep 25 18:02:15 2010
@@ -281,7 +281,7 @@ public class CamelMailProcessorList exte
/*
* (non-Javadoc)
- * @see org.apache.james.services.SpoolManager#getProcessorNames()
+ * @see
org.apache.james.mailetcontainer.MailProcessorList#getProcessorNames()
*/
public String[] getProcessorNames() {
return processors.keySet().toArray(new String[processors.size()]);
Modified: james/server/trunk/mailetcontainer-impl/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-impl/pom.xml?rev=1001290&r1=1001289&r2=1001290&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-impl/pom.xml (original)
+++ james/server/trunk/mailetcontainer-impl/pom.xml Sat Sep 25 18:02:15 2010
@@ -64,5 +64,22 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-library</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-domain-api</artifactId>
+ </dependency>
</dependencies>
</project>
Copied:
james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java
(from r1000973,
james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailetContext.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java?p2=james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java&p1=james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailetContext.java&r1=1000973&r2=1001290&rev=1001290&view=diff
==============================================================================
---
james/server/trunk/spoolmanager/src/main/java/org/apache/james/JamesMailetContext.java
(original)
+++
james/server/trunk/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/JamesMailetContext.java
Sat Sep 25 18:02:15 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james;
+package org.apache.james.mailetcontainer;
import java.util.ArrayList;
import java.util.Collection;
@@ -146,8 +146,8 @@ public class JamesMailetContext implemen
*/
public Iterator<String> getAttributeNames() {
Vector<String> names = new Vector<String>();
- for (Enumeration e = attributes.keys(); e.hasMoreElements();) {
- names.add(e.nextElement().toString());
+ for (Enumeration<String> e = attributes.keys(); e.hasMoreElements();) {
+ names.add(e.nextElement());
}
return names.iterator();
}
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=1001290&r1=1001289&r2=1001290&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
Sat Sep 25 18:02:15 2010
@@ -163,7 +163,7 @@
<!-- mailserver implementation which use activemq for spooling the mail -->
<bean id="mailserver" name="James"
class="org.apache.james.JamesMailServer"/>
- <bean id="mailetcontext" class="org.apache.james.JamesMailetContext"/>
+ <bean id="mailetcontext"
class="org.apache.james.mailetcontainer.JamesMailetContext"/>
<bean id="matcherpackages"
class="org.apache.james.mailetcontainer.JamesMatcherLoader" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
