Author: rdonkin
Date: Wed Sep 17 13:57:06 2008
New Revision: 696446
URL: http://svn.apache.org/viewvc?rev=696446&view=rev
Log:
Rationalise packaging
Added:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
- copied, changed from r696420,
james/server/trunk/imapserver-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
- copied, changed from r696420,
james/server/trunk/imapserver-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/PosterMailboxAdapter.java
(contents, props changed)
- copied, changed from r696420,
james/server/trunk/imapserver-function/src/main/java/org/apache/james/transport/mailets/sieve/PosterMailboxAdapter.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/torque/DefaultMailboxManagerProvider.java
- copied, changed from r696420,
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataService.java
(contents, props changed)
- copied, changed from r696420,
james/server/trunk/imapserver-function/src/main/java/org/apache/james/phoenix/user/FileUserMetaDataService.java
Removed:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/phoenix/user/FileUserMetaDataService.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/transport/mailets/sieve/PosterMailboxAdapter.java
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java?rev=696446&r1=696445&r2=696446&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java
Wed Sep 17 13:57:06 2008
@@ -29,7 +29,7 @@
import org.apache.james.imapserver.codec.encode.ImapEncoder;
import org.apache.james.imapserver.codec.encode.main.DefaultImapEncoderFactory;
import org.apache.james.imapserver.processor.main.DefaultImapProcessorFactory;
-import org.apache.james.mailboxmanager.impl.DefaultMailboxManagerProvider;
+import org.apache.james.mailboxmanager.torque.DefaultMailboxManagerProvider;
import org.apache.james.mailboxmanager.torque.DefaultMailboxManager;
import org.apache.james.mailboxmanager.torque.DefaultUserManager;
import org.apache.james.services.FileSystem;
Copied:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
(from r696420,
james/server/trunk/imapserver-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java?p2=james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java&p1=james/server/trunk/imapserver-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java&r1=696420&r2=696446&rev=696446&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
Wed Sep 17 13:57:06 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.experimental.imapserver;
+package org.apache.james.imapserver;
import java.io.IOException;
import java.net.Socket;
@@ -26,6 +26,8 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.Logger;
import org.apache.james.api.imap.process.ImapSession;
+import org.apache.james.experimental.imapserver.ImapRequestHandler;
+import org.apache.james.experimental.imapserver.ImapSessionImpl;
import
org.apache.james.experimental.imapserver.encode.writer.OutputStreamImapResponseWriter;
import org.apache.james.imapserver.codec.encode.ImapResponseComposer;
import org.apache.james.imapserver.codec.encode.base.ImapResponseComposerImpl;
Copied:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
(from r696420,
james/server/trunk/imapserver-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java?p2=james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java&p1=james/server/trunk/imapserver-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.java&r1=696420&r2=696446&rev=696446&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
Wed Sep 17 13:57:06 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.experimental.imapserver;
+package org.apache.james.imapserver;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -26,6 +26,7 @@
import org.apache.james.Constants;
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.api.user.UsersRepository;
+import org.apache.james.experimental.imapserver.ImapRequestHandler;
import org.apache.james.imapserver.DefaultImapFactory;
import org.apache.james.services.FileSystem;
import org.apache.james.socket.AbstractJamesService;
Copied:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/PosterMailboxAdapter.java
(from r696420,
james/server/trunk/imapserver-function/src/main/java/org/apache/james/transport/mailets/sieve/PosterMailboxAdapter.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/PosterMailboxAdapter.java?p2=james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/PosterMailboxAdapter.java&p1=james/server/trunk/imapserver-function/src/main/java/org/apache/james/transport/mailets/sieve/PosterMailboxAdapter.java&r1=696420&r2=696446&rev=696446&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/transport/mailets/sieve/PosterMailboxAdapter.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/PosterMailboxAdapter.java
Wed Sep 17 13:57:06 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.transport.mailets.sieve;
+package org.apache.james.imapserver.sieve;
import java.util.Date;
Propchange:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/PosterMailboxAdapter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/torque/DefaultMailboxManagerProvider.java
(from r696420,
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/torque/DefaultMailboxManagerProvider.java?p2=james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/torque/DefaultMailboxManagerProvider.java&p1=james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java&r1=696420&r2=696446&rev=696446&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/torque/DefaultMailboxManagerProvider.java
Wed Sep 17 13:57:06 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.impl;
+package org.apache.james.mailboxmanager.torque;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.manager.MailboxManager;
Copied:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataService.java
(from r696420,
james/server/trunk/imapserver-function/src/main/java/org/apache/james/phoenix/user/FileUserMetaDataService.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataService.java?p2=james/server/trunk/imapserver-function/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataService.java&p1=james/server/trunk/imapserver-function/src/main/java/org/apache/james/phoenix/user/FileUserMetaDataService.java&r1=696420&r2=696446&rev=696446&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/phoenix/user/FileUserMetaDataService.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataService.java
Wed Sep 17 13:57:06 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.phoenix.user;
+package org.apache.james.user.impl.file;
import java.io.Serializable;
Propchange:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataService.java
------------------------------------------------------------------------------
svn:mergeinfo =
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
