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/16 14:49:49 UTC
svn commit: r1049974 [2/3] - in /james/server/trunk: ./ container-spring/
container-spring/src/main/java/org/apache/james/container/spring/
container-spring/src/main/java/org/apache/james/container/spring/lifecycle/
core-api/src/main/java/org/apache/ja...
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=1049974&r1=1049973&r2=1049974&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 Dec 16 13:49:44 2010
@@ -43,8 +43,8 @@ import org.apache.camel.processor.aggreg
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailetcontainer.api.MailProcessor;
import org.apache.james.mailetcontainer.api.MailProcessorList;
import org.apache.james.mailetcontainer.api.MailetContainer;
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/DisposeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/DisposeProcessor.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/DisposeProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/DisposeProcessor.java Thu Dec 16 13:49:44 2010
@@ -21,7 +21,7 @@ package org.apache.james.mailetcontainer
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.mailet.Mail;
/**
Modified: james/server/trunk/mailetcontainer-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/pom.xml (original)
+++ james/server/trunk/mailetcontainer-library/pom.xml Thu Dec 16 13:49:44 2010
@@ -30,7 +30,11 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -89,7 +93,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
+ <artifactId>james-server-resolver-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractLoader.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractLoader.java (original)
+++ james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractLoader.java Thu Dec 16 13:49:44 2010
@@ -28,9 +28,9 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
-import org.apache.james.services.InstanceFactory;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
+import org.apache.james.resolver.api.InstanceFactory;
import org.apache.mailet.MailetContext;
import org.apache.mailet.MailetException;
Modified: james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java (original)
+++ james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java Thu Dec 16 13:49:44 2010
@@ -34,9 +34,9 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
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.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LifecycleUtil;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailetcontainer.api.MailProcessor;
import org.apache.james.mailetcontainer.api.MailProcessorList;
import org.apache.james.mailetcontainer.api.MailSpooler;
@@ -213,7 +213,7 @@ public class JamesMailSpooler implements
* This implementation shuts down the LinearProcessors managed by this
* JamesSpoolManager
*
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
+ * @see org.apache.james.lifecycle.api.avalon.framework.activity.Disposable#dispose()
*/
@PreDestroy
public void dispose() {
Modified: james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java (original)
+++ james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java Thu Dec 16 13:49:44 2010
@@ -46,9 +46,9 @@ import org.apache.james.core.MailImpl;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.TemporaryResolutionException;
import org.apache.james.domainlist.api.DomainList;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LifecycleUtil;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailetcontainer.api.MailProcessor;
import org.apache.james.user.api.UsersRepository;
import org.apache.mailet.HostAddress;
Modified: james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorManagement.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorManagement.java (original)
+++ james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorManagement.java Thu Dec 16 13:49:44 2010
@@ -33,7 +33,7 @@ import javax.management.ObjectName;
import javax.management.StandardMBean;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailetcontainer.api.MailProcessor;
import org.apache.james.mailetcontainer.api.MailProcessorList;
import org.apache.james.mailetcontainer.api.MailetContainer;
Modified: james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/JamesMailetLoaderTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/JamesMailetLoaderTest.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/JamesMailetLoaderTest.java (original)
+++ james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/JamesMailetLoaderTest.java Thu Dec 16 13:49:44 2010
@@ -29,7 +29,7 @@ import javax.mail.MessagingException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.services.MockJSR250Loader;
+import org.apache.james.resolver.api.mock.MockJSR250Loader;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetConfig;
Modified: james/server/trunk/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Thu Dec 16 13:49:44 2010
@@ -102,7 +102,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java Thu Dec 16 13:49:44 2010
@@ -34,7 +34,7 @@ import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.sql.DataSource;
-import org.apache.james.services.FileSystem;
+import org.apache.james.resolver.api.FileSystem;
import org.apache.james.util.bayesian.JDBCBayesianAnalyzer;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java Thu Dec 16 13:49:44 2010
@@ -33,7 +33,7 @@ import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.sql.DataSource;
-import org.apache.james.services.FileSystem;
+import org.apache.james.resolver.api.FileSystem;
import org.apache.james.util.bayesian.JDBCBayesianAnalyzer;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java Thu Dec 16 13:49:44 2010
@@ -22,7 +22,7 @@
package org.apache.james.transport.mailets;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
-import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.mailrepository.api.MailRepository;
import org.apache.james.mailstore.api.MailStore;
import org.apache.mailet.base.GenericMailet;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java Thu Dec 16 13:49:44 2010
@@ -24,7 +24,7 @@ package org.apache.james.transport.maile
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.TemporaryResolutionException;
import org.apache.james.domainlist.api.DomainList;
-import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.queue.api.MailQueue;
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.MailQueue.MailQueueException;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java Thu Dec 16 13:49:44 2010
@@ -35,7 +35,7 @@ import javax.annotation.Resource;
import javax.mail.MessagingException;
import javax.sql.DataSource;
-import org.apache.james.services.FileSystem;
+import org.apache.james.resolver.api.FileSystem;
import org.apache.james.transport.mailets.WhiteListManager;
import org.apache.james.user.api.JamesUser;
import org.apache.james.user.api.UsersRepository;
Modified: james/server/trunk/nio-netty/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/nio-netty/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/nio-netty/pom.xml (original)
+++ james/server/trunk/nio-netty/pom.xml Thu Dec 16 13:49:44 2010
@@ -65,10 +65,15 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-resolver-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-util</artifactId>
<exclusions>
<exclusion>
Modified: james/server/trunk/nio-netty/src/main/java/org/apache/james/server/JamesProtocolHandlerChain.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/main/java/org/apache/james/server/JamesProtocolHandlerChain.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/nio-netty/src/main/java/org/apache/james/server/JamesProtocolHandlerChain.java (original)
+++ james/server/trunk/nio-netty/src/main/java/org/apache/james/server/JamesProtocolHandlerChain.java Thu Dec 16 13:49:44 2010
@@ -29,13 +29,13 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.protocols.api.ExtensibleHandler;
import org.apache.james.protocols.api.HandlersPackage;
import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.api.WiringException;
-import org.apache.james.services.InstanceFactory;
+import org.apache.james.resolver.api.InstanceFactory;
/**
Modified: james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractCommandHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractCommandHandlerStats.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractCommandHandlerStats.java (original)
+++ james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractCommandHandlerStats.java Thu Dec 16 13:49:44 2010
@@ -29,7 +29,7 @@ import javax.management.NotCompliantMBea
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import org.apache.james.lifecycle.Disposable;
+import org.apache.james.lifecycle.api.Disposable;
import org.apache.james.protocols.api.CommandHandler;
import org.apache.james.protocols.api.Response;
Modified: james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractConnectHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractConnectHandlerResultJMXMonitor.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractConnectHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractConnectHandlerResultJMXMonitor.java Thu Dec 16 13:49:44 2010
@@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.protocols.api.ConnectHandler;
import org.apache.james.protocols.api.ConnectHandlerResultHandler;
import org.apache.james.protocols.api.ExtensibleHandler;
Modified: james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractLineHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractLineHandlerResultJMXMonitor.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractLineHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractLineHandlerResultJMXMonitor.java Thu Dec 16 13:49:44 2010
@@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.protocols.api.ExtensibleHandler;
import org.apache.james.protocols.api.LineHandler;
import org.apache.james.protocols.api.LineHandlerResultHandler;
Modified: james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/ConnectHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/ConnectHandlerStats.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/ConnectHandlerStats.java (original)
+++ james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/ConnectHandlerStats.java Thu Dec 16 13:49:44 2010
@@ -29,7 +29,7 @@ import javax.management.NotCompliantMBea
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import org.apache.james.lifecycle.Disposable;
+import org.apache.james.lifecycle.api.Disposable;
public class ConnectHandlerStats extends StandardMBean implements HandlerStatsMBean, Disposable{
Modified: james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/LineHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/LineHandlerStats.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/LineHandlerStats.java (original)
+++ james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/LineHandlerStats.java Thu Dec 16 13:49:44 2010
@@ -29,7 +29,7 @@ import javax.management.NotCompliantMBea
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import org.apache.james.lifecycle.Disposable;
+import org.apache.james.lifecycle.api.Disposable;
/**
* Gather stats for LineHandlers
Modified: james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java (original)
+++ james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java Thu Dec 16 13:49:44 2010
@@ -35,11 +35,11 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.protocols.impl.AbstractAsyncServer;
+import org.apache.james.resolver.api.FileSystem;
import org.apache.james.server.jmx.ServerMBean;
-import org.apache.james.services.FileSystem;
import org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutor;
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Dec 16 13:49:44 2010
@@ -34,7 +34,6 @@
<packaging>pom</packaging>
<modules>
<module>container-spring</module>
- <module>core-api</module>
<module>core-library</module>
<module>dnsservice-api</module>
<module>dnsservice-dnsjava</module>
@@ -46,6 +45,7 @@
<module>domainlist-jpa</module>
<module>domainlist-library</module>
<module>domainlist-xml</module>
+ <module>lifecycle-api</module>
<module>mailbox-adapter</module>
<module>mailetcontainer-api</module>
<module>mailetcontainer-library</module>
@@ -62,6 +62,7 @@
<module>remotemanager</module>
<module>repository-api</module>
<module>repository-file</module>
+ <module>resolver-api</module>
<module>smtpserver</module>
<module>queue-api</module>
<module>queue-jms</module>
@@ -308,6 +309,18 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-resolver-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-resolver-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -463,7 +476,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: james/server/trunk/pop3server/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Thu Dec 16 13:49:44 2010
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java Thu Dec 16 13:49:44 2010
@@ -22,7 +22,7 @@ import java.util.Collection;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.pop3server.POP3Response;
import org.apache.james.pop3server.POP3Session;
import org.apache.james.protocols.api.CommandHandler;
Modified: james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java (original)
+++ james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java Thu Dec 16 13:49:44 2010
@@ -37,9 +37,9 @@ import org.apache.commons.logging.impl.S
import org.apache.commons.net.pop3.POP3Client;
import org.apache.commons.net.pop3.POP3MessageInfo;
import org.apache.commons.net.pop3.POP3Reply;
+import org.apache.james.resolver.api.mock.MockFileSystem;
+import org.apache.james.resolver.api.mock.MockJSR250Loader;
import org.apache.james.server.JamesProtocolHandlerChain;
-import org.apache.james.services.MockJSR250Loader;
-import org.apache.james.services.MockFileSystem;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.MockDNSService;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
Modified: james/server/trunk/queue-activemq/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/pom.xml (original)
+++ james/server/trunk/queue-activemq/pom.xml Thu Dec 16 13:49:44 2010
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java (original)
+++ james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java Thu Dec 16 13:49:44 2010
@@ -35,7 +35,7 @@ import org.apache.activemq.blob.BlobDown
import org.apache.activemq.blob.BlobTransferPolicy;
import org.apache.activemq.blob.BlobUploadStrategy;
import org.apache.activemq.command.ActiveMQBlobMessage;
-import org.apache.james.services.FileSystem;
+import org.apache.james.resolver.api.FileSystem;
/**
* {@link BlobUploadStrategy} and {@link BlobDownloadStrategy} implementation which use the {@link FileSystem} to lookup the {@link File} for the {@link BlobMessage}
Modified: james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java (original)
+++ james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java Thu Dec 16 13:49:44 2010
@@ -23,7 +23,7 @@ import javax.annotation.Resource;
import org.apache.activemq.blob.BlobDownloadStrategy;
import org.apache.activemq.blob.BlobTransferPolicy;
import org.apache.activemq.blob.BlobUploadStrategy;
-import org.apache.james.services.FileSystem;
+import org.apache.james.resolver.api.FileSystem;
/**
* {@link BlobTransferPolicy} which use the {@link FileSystem} to download and upload data.
Modified: james/server/trunk/queue-jms/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/queue-jms/pom.xml (original)
+++ james/server/trunk/queue-jms/pom.xml Thu Dec 16 13:49:44 2010
@@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java (original)
+++ james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java Thu Dec 16 13:49:44 2010
@@ -33,8 +33,8 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.LifecycleUtil;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.queue.api.MailQueue;
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.MailQueueManagementMBean;
Modified: james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java (original)
+++ james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java Thu Dec 16 13:49:44 2010
@@ -26,8 +26,8 @@ import javax.jms.ObjectMessage;
import javax.mail.util.SharedByteArrayInputStream;
import org.apache.james.core.MimeMessageSource;
-import org.apache.james.lifecycle.Disposable;
-import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.lifecycle.api.Disposable;
+import org.apache.james.lifecycle.api.LifecycleUtil;
/**
* {@link MimeMessageSource} implementation which reads the data from the payload of an {@link ObjectMessage}.
Modified: james/server/trunk/remotemanager/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/remotemanager/pom.xml (original)
+++ james/server/trunk/remotemanager/pom.xml Thu Dec 16 13:49:44 2010
@@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java Thu Dec 16 13:49:44 2010
@@ -36,14 +36,14 @@ import junit.framework.TestCase;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.commons.net.telnet.TelnetClient;
+import org.apache.james.resolver.api.mock.MockFileSystem;
+import org.apache.james.resolver.api.mock.MockJSR250Loader;
import org.apache.james.server.JamesProtocolHandlerChain;
-import org.apache.james.services.MockJSR250Loader;
-import org.apache.james.services.MockFileSystem;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.MockDNSService;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.SimpleDomainList;
-import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.mailstore.MockMailStore;
import org.apache.james.user.lib.MockUsersRepository;
import org.apache.james.util.InternetPrintWriter;
Modified: james/server/trunk/repository-file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/repository-file/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/repository-file/pom.xml (original)
+++ james/server/trunk/repository-file/pom.xml Thu Dec 16 13:49:44 2010
@@ -64,7 +64,11 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java (original)
+++ james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java Thu Dec 16 13:49:44 2010
@@ -24,10 +24,10 @@ package org.apache.james.repository.file
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.repository.api.Repository;
-import org.apache.james.services.FileSystem;
+import org.apache.james.resolver.api.FileSystem;
import java.io.File;
import java.io.FileInputStream;
Added: james/server/trunk/resolver-api/LICENSE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/resolver-api/LICENSE.txt?rev=1049974&view=auto
==============================================================================
--- james/server/trunk/resolver-api/LICENSE.txt (added)
+++ james/server/trunk/resolver-api/LICENSE.txt Thu Dec 16 13:49:44 2010
@@ -0,0 +1,232 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+
+
+
+ THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
+ FOLLOWING LICENSES:
+
+
+
+ Concurrent, Public Domain
+ (see stage/concurrent/jars/concurrent.LICENSE)
+
+ BouncyCastle, MIT License
+ (see stage/org.bouncycastle/jars/BouncyCastle.LICENSE)
+ http://www.bouncycastle.org/licence.html
+
+ DnsJava, BSD License
+ (see stage/dnsjava/jars/dnsjava.LICENSE)
+ http://www.dnsjava.org/README
+
+ JavaBeans Activation Framework, CDDL License
+ http://glassfish.dev.java.net/public/CDDLv1.0.html
+
+ JavaMail, CDDL License
+ http://glassfish.dev.java.net/public/CDDLv1.0.html
+
+ QDox, ASL 1.1 License
+ (see phoenix-deployment/tools/lib/qdox.LICENSE)
+ http://qdox.codehaus.org/license.html
+
+ MX4J, ASL 1.1 License
+ (see phoenix-deployment/phoenix-bin/bin/lib/mx4j.LICENSE)
+
+ Spice, ASL 1.1 License
+ (see phoenix-deployment/phoenix-bin/bin/lib/spice.LICENSE)
+ http://spice.codehaus.org/license.html
+
+ Wrapper, MIT License
+ (see phoenix-deployment/phoenix-bin/bin/Wrapper.LICENSE)
+ http://wrapper.tanukisoftware.org/doc/english/license.html
+
+ ISO-Relax, MIT License
+ (see phoenix-deployment/phoenix-bin/tools/lib/isorelax.LICENSE)
+
+ MSV, BSD License
+ (see phoenix-deployment/phoenix-bin/tools/lib/msv.LICENSE)
+
+ RelaxNG-Datatype, BSD License
+ (see phoenix-deployment/phoenix-bin/tools/lib/relaxngDatatype.LICENSE)
+
+ XSDLib, BSD License
+ (see phoenix-deployment/phoenix-bin/tools/lib/xsdlib.LICENSE)
+
+ XStream, BSD License
+ (see stage/com.thoughtworks.xstream/jars/xstream.LICENSE)
+
\ No newline at end of file
Added: james/server/trunk/resolver-api/NOTICE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/resolver-api/NOTICE.txt?rev=1049974&view=auto
==============================================================================
--- james/server/trunk/resolver-api/NOTICE.txt (added)
+++ james/server/trunk/resolver-api/NOTICE.txt Thu Dec 16 13:49:44 2010
@@ -0,0 +1,11 @@
+
+=========================================================================
+== NOTICE file for use with the Apache License, Version 2.0, ==
+=========================================================================
+
+Apache JAMES
+Copyright 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
\ No newline at end of file
Added: james/server/trunk/resolver-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/resolver-api/pom.xml?rev=1049974&view=auto
==============================================================================
--- james/server/trunk/resolver-api/pom.xml (added)
+++ james/server/trunk/resolver-api/pom.xml Thu Dec 16 13:49:44 2010
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
+ <version>3.0-M3-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-resolver-api</artifactId>
+ <name>Apache James Server Resolver API</name>
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Copied: james/server/trunk/resolver-api/src/main/java/org/apache/james/resolver/api/FileSystem.java (from r1049797, james/server/trunk/core-api/src/main/java/org/apache/james/services/FileSystem.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/resolver-api/src/main/java/org/apache/james/resolver/api/FileSystem.java?p2=james/server/trunk/resolver-api/src/main/java/org/apache/james/resolver/api/FileSystem.java&p1=james/server/trunk/core-api/src/main/java/org/apache/james/services/FileSystem.java&r1=1049797&r2=1049974&rev=1049974&view=diff
==============================================================================
--- james/server/trunk/core-api/src/main/java/org/apache/james/services/FileSystem.java (original)
+++ james/server/trunk/resolver-api/src/main/java/org/apache/james/resolver/api/FileSystem.java Thu Dec 16 13:49:44 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.services;
+package org.apache.james.resolver.api;
import java.io.File;
import java.io.FileNotFoundException;
Copied: james/server/trunk/resolver-api/src/main/java/org/apache/james/resolver/api/InstanceFactory.java (from r1049797, james/server/trunk/core-api/src/main/java/org/apache/james/services/InstanceFactory.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/resolver-api/src/main/java/org/apache/james/resolver/api/InstanceFactory.java?p2=james/server/trunk/resolver-api/src/main/java/org/apache/james/resolver/api/InstanceFactory.java&p1=james/server/trunk/core-api/src/main/java/org/apache/james/services/InstanceFactory.java&r1=1049797&r2=1049974&rev=1049974&view=diff
==============================================================================
--- james/server/trunk/core-api/src/main/java/org/apache/james/services/InstanceFactory.java (original)
+++ james/server/trunk/resolver-api/src/main/java/org/apache/james/resolver/api/InstanceFactory.java Thu Dec 16 13:49:44 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.services;
+package org.apache.james.resolver.api;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
Copied: james/server/trunk/resolver-api/src/test/java/org/apache/james/resolver/api/mock/AbstractJSR250InstanceFactory.java (from r1049797, james/server/trunk/core-library/src/test/java/org/apache/james/services/AbstractJSR250InstanceFactory.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/resolver-api/src/test/java/org/apache/james/resolver/api/mock/AbstractJSR250InstanceFactory.java?p2=james/server/trunk/resolver-api/src/test/java/org/apache/james/resolver/api/mock/AbstractJSR250InstanceFactory.java&p1=james/server/trunk/core-library/src/test/java/org/apache/james/services/AbstractJSR250InstanceFactory.java&r1=1049797&r2=1049974&rev=1049974&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/services/AbstractJSR250InstanceFactory.java (original)
+++ james/server/trunk/resolver-api/src/test/java/org/apache/james/resolver/api/mock/AbstractJSR250InstanceFactory.java Thu Dec 16 13:49:44 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.services;
+package org.apache.james.resolver.api.mock;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -29,6 +29,8 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
+import org.apache.james.resolver.api.InstanceFactory;
+import org.apache.james.resolver.api.InstanceFactory.InstanceException;
/**
* Abstract base class which implements a JSR250 based LoaderService
Copied: james/server/trunk/resolver-api/src/test/java/org/apache/james/resolver/api/mock/MockFileSystem.java (from r1049797, james/server/trunk/core-library/src/test/java/org/apache/james/services/MockFileSystem.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/resolver-api/src/test/java/org/apache/james/resolver/api/mock/MockFileSystem.java?p2=james/server/trunk/resolver-api/src/test/java/org/apache/james/resolver/api/mock/MockFileSystem.java&p1=james/server/trunk/core-library/src/test/java/org/apache/james/services/MockFileSystem.java&r1=1049797&r2=1049974&rev=1049974&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/services/MockFileSystem.java (original)
+++ james/server/trunk/resolver-api/src/test/java/org/apache/james/resolver/api/mock/MockFileSystem.java Thu Dec 16 13:49:44 2010
@@ -17,9 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.services;
+package org.apache.james.resolver.api.mock;
-import org.apache.james.services.FileSystem;
+import org.apache.james.resolver.api.FileSystem;
import java.io.File;
import java.io.FileNotFoundException;
Copied: james/server/trunk/resolver-api/src/test/java/org/apache/james/resolver/api/mock/MockJSR250Loader.java (from r1049797, james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/resolver-api/src/test/java/org/apache/james/resolver/api/mock/MockJSR250Loader.java?p2=james/server/trunk/resolver-api/src/test/java/org/apache/james/resolver/api/mock/MockJSR250Loader.java&p1=james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java&r1=1049797&r2=1049974&rev=1049974&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java (original)
+++ james/server/trunk/resolver-api/src/test/java/org/apache/james/resolver/api/mock/MockJSR250Loader.java Thu Dec 16 13:49:44 2010
@@ -17,12 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.services;
+package org.apache.james.resolver.api.mock;
import java.util.HashMap;
import java.util.Map;
-import org.apache.james.services.AbstractJSR250InstanceFactory;
+import org.apache.james.resolver.api.mock.AbstractJSR250InstanceFactory;
public class MockJSR250Loader extends AbstractJSR250InstanceFactory {
Modified: james/server/trunk/smtpserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Thu Dec 16 13:49:44 2010
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java Thu Dec 16 13:49:44 2010
@@ -36,8 +36,8 @@ import org.apache.commons.logging.LogFac
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStreamSource;
-import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.LifecycleUtil;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.protocols.api.ExtensibleHandler;
import org.apache.james.protocols.api.LineHandler;
import org.apache.james.protocols.api.WiringException;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java Thu Dec 16 13:49:44 2010
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java Thu Dec 16 13:49:44 2010
@@ -22,7 +22,7 @@ package org.apache.james.smtpserver;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.protocols.api.ConnectHandler;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.util.POP3BeforeSMTPHelper;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java Thu Dec 16 13:49:44 2010
@@ -44,7 +44,7 @@ public class SetMimeHeaderHandler implem
/**
- * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(Configuration handlerConfiguration) throws ConfigurationException {
setHeaderName(handlerConfiguration.getString("headername"));
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java Thu Dec 16 13:49:44 2010
@@ -28,7 +28,7 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.smtpserver.SMTPServerDNSServiceAdapter;
public class DNSRBLHandler extends org.apache.james.protocols.smtp.core.fastfail.DNSRBLHandler implements Configurable{
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java Thu Dec 16 13:49:44 2010
@@ -42,13 +42,13 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
-import org.apache.james.services.FileSystem;
+import org.apache.james.resolver.api.FileSystem;
import org.apache.james.util.TimeConverter;
import org.apache.james.util.netmatcher.NetMatcher;
import org.apache.james.util.sql.JDBCUtil;
@@ -479,7 +479,7 @@ public class JDBCGreylistHandler extends
}
/**
- * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log)
+ * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.apache.commons.logging.Log)
*/
public void setLog(Log log) {
this.serviceLog = log;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java Thu Dec 16 13:49:44 2010
@@ -21,7 +21,7 @@ package org.apache.james.smtpserver.fast
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
public class MaxRcptHandler extends org.apache.james.protocols.smtp.core.fastfail.MaxRcptHandler implements Configurable{
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java Thu Dec 16 13:49:44 2010
@@ -29,8 +29,8 @@ import org.apache.james.jspf.core.except
import org.apache.james.jspf.executor.SPFResult;
import org.apache.james.jspf.impl.DefaultSPF;
import org.apache.james.jspf.impl.SPF;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.dsn.DSNStatus;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java Thu Dec 16 13:49:44 2010
@@ -27,7 +27,7 @@ import javax.mail.internet.MimeMessage;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java Thu Dec 16 13:49:44 2010
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
public class SpamTrapHandler extends org.apache.james.protocols.smtp.core.fastfail.SpamTrapHandler implements Configurable{
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/TarpitHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/TarpitHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/TarpitHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/TarpitHandler.java Thu Dec 16 13:49:44 2010
@@ -22,7 +22,7 @@ package org.apache.james.smtpserver.fast
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
public class TarpitHandler extends org.apache.james.protocols.smtp.core.fastfail.TarpitHandler implements Configurable{
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java Thu Dec 16 13:49:44 2010
@@ -41,8 +41,8 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java Thu Dec 16 13:49:44 2010
@@ -26,7 +26,7 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.domainlist.api.DomainList;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.fastfail.AbstractValidRcptHandler;
import org.apache.james.user.api.UsersRepository;
@@ -86,7 +86,7 @@ public class ValidRcptHandler extends Ab
}
/**
- * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
setVirtualUserTableSupport(config.getBoolean("enableVirtualUserTable",
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java Thu Dec 16 13:49:44 2010
@@ -33,8 +33,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.TemporaryResolutionException;
-import org.apache.james.lifecycle.Configurable;
-import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.lifecycle.api.Configurable;
+import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.dsn.DSNStatus;
@@ -90,7 +90,7 @@ public class ValidRcptMX implements LogE
}
/**
- * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.Configuration)
+ * @see org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
@SuppressWarnings("unchecked")
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java Thu Dec 16 13:49:44 2010
@@ -22,7 +22,7 @@ import java.util.Collection;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.protocols.api.CommandHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java Thu Dec 16 13:49:44 2010
@@ -28,7 +28,7 @@ import javax.annotation.PreDestroy;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.protocols.api.ExtensibleHandler;
import org.apache.james.protocols.api.WiringException;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java Thu Dec 16 13:49:44 2010
@@ -29,7 +29,7 @@ import javax.management.NotCompliantMBea
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import org.apache.james.lifecycle.Disposable;
+import org.apache.james.lifecycle.api.Disposable;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
/**
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java Thu Dec 16 13:49:44 2010
@@ -25,7 +25,7 @@ import javax.management.MBeanRegistratio
import javax.management.MalformedObjectNameException;
import javax.management.NotCompliantMBeanException;
-import org.apache.james.lifecycle.Disposable;
+import org.apache.james.lifecycle.api.Disposable;
import org.apache.james.protocols.api.CommandHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.server.jmx.AbstractCommandHandlerStats;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java Thu Dec 16 13:49:44 2010
@@ -22,7 +22,7 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import org.apache.commons.logging.Log;
-import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.protocols.impl.AbstractChannelUpstreamHandler;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java Thu Dec 16 13:49:44 2010
@@ -44,15 +44,14 @@ import org.apache.commons.net.smtp.SMTPC
import org.apache.commons.net.smtp.SMTPReply;
import org.apache.james.queue.api.MockMailQueue;
import org.apache.james.queue.api.MockMailQueueFactory;
+import org.apache.james.resolver.api.mock.MockFileSystem;
+import org.apache.james.resolver.api.mock.MockJSR250Loader;
import org.apache.james.server.JamesProtocolHandlerChain;
-import org.apache.james.services.MockJSR250Loader;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.SimpleDomainList;
-import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.mailstore.MockMailStore;
-import org.apache.james.services.MockFileSystem;
import org.apache.james.user.lib.MockUsersRepository;
-import org.apache.james.util.TestUtil;
import org.apache.james.util.codec.Base64;
import org.apache.james.vut.api.VirtualUserTable;
import org.apache.mailet.HostAddress;
@@ -154,7 +153,7 @@ public abstract class AbstractSMTPServer
public AbstractSMTPServerTest() {
super("AsyncSMTPServerTest");
- m_smtpListenerPort = TestUtil.getNonPrivilegedPort();
+ m_smtpListenerPort = Util.getNonPrivilegedPort();
}
protected void setUp() throws Exception {
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java Thu Dec 16 13:49:44 2010
@@ -103,7 +103,7 @@ public class SpamAssassinHandlerTest ext
public void testNonSpam() throws IOException, MessagingException {
- int port = TestUtil.getNonPrivilegedPort();
+ int port = Util.getNonPrivilegedPort();
MockSpamd spamd = new MockSpamd(port);
new Thread(spamd).start();
Modified: james/server/trunk/user-file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-file/pom.xml?rev=1049974&r1=1049973&r2=1049974&view=diff
==============================================================================
--- james/server/trunk/user-file/pom.xml (original)
+++ james/server/trunk/user-file/pom.xml Thu Dec 16 13:49:44 2010
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org