svn commit: r884283 - in /james/server/trunk: imapserver-function/src/main/java/org/apache/james/imapserver/ nntpserver-function/src/main/java/org/apache/james/nntpserver/ socket-api/src/main/java/org

[norman]

Author: norman
Date: Wed Nov 25 21:37:45 2009
New Revision: 884283

URL: http://svn.apache.org/viewvc?rev=884283&view=rev
Log:
move implementation to other module and fix m2 dependency

Added:
    
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandlerFactory.java
      - copied, changed from r884278, 
james/server/trunk/socket-api/src/main/java/org/apache/james/socket/api/AbstractProtocolHandlerFactory.java
Removed:
    
james/server/trunk/socket-api/src/main/java/org/apache/james/socket/api/AbstractProtocolHandlerFactory.java
Modified:
    
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
    
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServerProtocolHandlerFactory.java
    james/server/trunk/socket-shared-library/pom.xml
    
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractSupportLoaderProtocolHandlerFactory.java

Modified: 
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java?rev=884283&r1=884282&r2=884283&view=diff
==============================================================================
--- 
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
 (original)
+++ 
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
 Wed Nov 25 21:37:45 2009
@@ -38,8 +38,8 @@
 import org.apache.james.imap.mailbox.MailboxSession;
 import org.apache.james.imap.main.ImapRequestHandler;
 import org.apache.james.services.FileSystem;
-import org.apache.james.socket.api.AbstractProtocolHandlerFactory;
 import org.apache.james.socket.api.ProtocolHandler;
+import org.apache.james.socket.shared.AbstractProtocolHandlerFactory;
 import org.apache.jsieve.mailet.Poster;
 
 /**

Modified: 
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServerProtocolHandlerFactory.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServerProtocolHandlerFactory.java?rev=884283&r1=884282&r2=884283&view=diff
==============================================================================
--- 
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServerProtocolHandlerFactory.java
 (original)
+++ 
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServerProtocolHandlerFactory.java
 Wed Nov 25 21:37:45 2009
@@ -29,8 +29,8 @@
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.nntpserver.repository.NNTPRepository;
 import org.apache.james.services.MailServer;
-import org.apache.james.socket.api.AbstractProtocolHandlerFactory;
 import org.apache.james.socket.api.ProtocolHandler;
+import org.apache.james.socket.shared.AbstractProtocolHandlerFactory;
 
 /**
  * NNTP Server

Modified: james/server/trunk/socket-shared-library/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/pom.xml?rev=884283&r1=884282&r2=884283&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/pom.xml (original)
+++ james/server/trunk/socket-shared-library/pom.xml Wed Nov 25 21:37:45 2009
@@ -37,6 +37,10 @@
       <artifactId>james-server-socket-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-domain-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
     </dependency>

Copied: 
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandlerFactory.java
 (from r884278, 
james/server/trunk/socket-api/src/main/java/org/apache/james/socket/api/AbstractProtocolHandlerFactory.java)
URL: 
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandlerFactory.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandlerFactory.java&p1=james/server/trunk/socket-api/src/main/java/org/apache/james/socket/api/AbstractProtocolHandlerFactory.java&r1=884278&r2=884283&rev=884283&view=diff
==============================================================================
--- 
james/server/trunk/socket-api/src/main/java/org/apache/james/socket/api/AbstractProtocolHandlerFactory.java
 (original)
+++ 
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandlerFactory.java
 Wed Nov 25 21:37:45 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.socket.api;
+package org.apache.james.socket.shared;
 
 import java.net.UnknownHostException;
 
@@ -27,6 +27,7 @@
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.commons.logging.Log;
 import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.socket.api.ProtocolHandlerFactory;
 
 /**
  * Abstract base class which ProtocolHandlerFactory implementation should 
extend

Modified: 
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractSupportLoaderProtocolHandlerFactory.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractSupportLoaderProtocolHandlerFactory.java?rev=884283&r1=884282&r2=884283&view=diff
==============================================================================
--- 
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractSupportLoaderProtocolHandlerFactory.java
 (original)
+++ 
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractSupportLoaderProtocolHandlerFactory.java
 Wed Nov 25 21:37:45 2009
@@ -6,7 +6,6 @@
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.james.api.kernel.LoaderService;
 import org.apache.james.api.protocol.ProtocolHandlerChain;
-import org.apache.james.socket.api.AbstractProtocolHandlerFactory;
 
 /**
  * Abstract base class which ProtocolHandlerFactory implementations should 
extend when they use a HandlerChain



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org