Author: eric
Date: Tue Sep 21 16:04:23 2010
New Revision: 999478
URL: http://svn.apache.org/viewvc?rev=999478&view=rev
Log:
Finally move Store interface to mailbox-api and Repository interfaces to
repository package (JAMES-1048)
Added:
james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/
james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/Store.java
- copied unchanged from r999288,
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/Store.java
james/server/trunk/core-api/src/main/java/org/apache/james/repository/
james/server/trunk/core-api/src/main/java/org/apache/james/repository/ObjectRepository.java
- copied, changed from r999288,
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/ObjectRepository.java
james/server/trunk/core-api/src/main/java/org/apache/james/repository/Repository.java
- copied, changed from r999288,
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/Repository.java
james/server/trunk/core-api/src/main/java/org/apache/james/repository/StreamRepository.java
- copied, changed from r999288,
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/StreamRepository.java
Removed:
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/ObjectRepository.java
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/Repository.java
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/Store.java
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/StreamRepository.java
Modified:
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/MessageInputStream.java
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/AbstractFileRepository.java
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Object_Repository.java
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Stream_Repository.java
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
Modified:
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java?rev=999478&r1=999477&r2=999478&view=diff
==============================================================================
---
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
(original)
+++
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
Tue Sep 21 16:04:23 2010
@@ -26,9 +26,9 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageWrapper;
-import org.apache.james.services.store.ObjectRepository;
+import org.apache.james.repository.ObjectRepository;
+import org.apache.james.repository.StreamRepository;
import org.apache.james.services.store.Store;
-import org.apache.james.services.store.StreamRepository;
import org.apache.mailet.Mail;
import javax.annotation.PostConstruct;
Modified:
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java?rev=999478&r1=999477&r2=999478&view=diff
==============================================================================
---
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
(original)
+++
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
Tue Sep 21 16:04:23 2010
@@ -22,7 +22,7 @@
package org.apache.james.mailrepository;
import org.apache.james.core.MimeMessageSource;
-import org.apache.james.services.store.StreamRepository;
+import org.apache.james.repository.StreamRepository;
import java.io.IOException;
import java.io.InputStream;
Modified:
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java?rev=999478&r1=999477&r2=999478&view=diff
==============================================================================
---
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
(original)
+++
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
Tue Sep 21 16:04:23 2010
@@ -27,9 +27,9 @@ import org.apache.commons.configuration.
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageWrapper;
+import org.apache.james.repository.StreamRepository;
import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.FileSystem;
-import org.apache.james.services.store.StreamRepository;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
import org.apache.mailet.Mail;
Modified:
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/MessageInputStream.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/MessageInputStream.java?rev=999478&r1=999477&r2=999478&view=diff
==============================================================================
---
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/MessageInputStream.java
(original)
+++
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/MessageInputStream.java
Tue Sep 21 16:04:23 2010
@@ -20,7 +20,7 @@
package org.apache.james.mailrepository;
import org.apache.james.core.MimeMessageUtil;
-import org.apache.james.services.store.StreamRepository;
+import org.apache.james.repository.StreamRepository;
import org.apache.mailet.Mail;
import javax.mail.MessagingException;
Modified:
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java?rev=999478&r1=999477&r2=999478&view=diff
==============================================================================
---
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
(original)
+++
james/imap/trunk/jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
Tue Sep 21 16:04:23 2010
@@ -22,7 +22,7 @@
package org.apache.james.mailrepository;
import org.apache.james.core.MimeMessageSource;
-import org.apache.james.services.store.StreamRepository;
+import org.apache.james.repository.StreamRepository;
import org.apache.james.util.sql.JDBCUtil;
import java.io.ByteArrayInputStream;
Copied:
james/server/trunk/core-api/src/main/java/org/apache/james/repository/ObjectRepository.java
(from r999288,
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/ObjectRepository.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/repository/ObjectRepository.java?p2=james/server/trunk/core-api/src/main/java/org/apache/james/repository/ObjectRepository.java&p1=james/server/trunk/core-api/src/main/java/org/apache/james/services/store/ObjectRepository.java&r1=999288&r2=999478&rev=999478&view=diff
==============================================================================
---
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/ObjectRepository.java
(original)
+++
james/server/trunk/core-api/src/main/java/org/apache/james/repository/ObjectRepository.java
Tue Sep 21 16:04:23 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.services.store;
+package org.apache.james.repository;
import java.util.Iterator;
Copied:
james/server/trunk/core-api/src/main/java/org/apache/james/repository/Repository.java
(from r999288,
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/Repository.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/repository/Repository.java?p2=james/server/trunk/core-api/src/main/java/org/apache/james/repository/Repository.java&p1=james/server/trunk/core-api/src/main/java/org/apache/james/services/store/Repository.java&r1=999288&r2=999478&rev=999478&view=diff
==============================================================================
---
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/Repository.java
(original)
+++
james/server/trunk/core-api/src/main/java/org/apache/james/repository/Repository.java
Tue Sep 21 16:04:23 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.services.store;
+package org.apache.james.repository;
public interface Repository {
Copied:
james/server/trunk/core-api/src/main/java/org/apache/james/repository/StreamRepository.java
(from r999288,
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/StreamRepository.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/repository/StreamRepository.java?p2=james/server/trunk/core-api/src/main/java/org/apache/james/repository/StreamRepository.java&p1=james/server/trunk/core-api/src/main/java/org/apache/james/services/store/StreamRepository.java&r1=999288&r2=999478&rev=999478&view=diff
==============================================================================
---
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/StreamRepository.java
(original)
+++
james/server/trunk/core-api/src/main/java/org/apache/james/repository/StreamRepository.java
Tue Sep 21 16:04:23 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.services.store;
+package org.apache.james.repository;
import java.io.InputStream;
import java.io.OutputStream;
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/AbstractFileRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/filepair/AbstractFileRepository.java?rev=999478&r1=999477&r2=999478&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/AbstractFileRepository.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/AbstractFileRepository.java
Tue Sep 21 16:04:23 2010
@@ -26,8 +26,8 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.repository.Repository;
import org.apache.james.services.FileSystem;
-import org.apache.james.services.store.Repository;
import org.apache.james.util.io.ExtensionFileFilter;
import java.io.File;
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Object_Repository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Object_Repository.java?rev=999478&r1=999477&r2=999478&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Object_Repository.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Object_Repository.java
Tue Sep 21 16:04:23 2010
@@ -26,7 +26,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
-import org.apache.james.services.store.ObjectRepository;
+import org.apache.james.repository.ObjectRepository;
import org.apache.james.util.io.ClassLoaderObjectInputStream;
/**
@@ -47,7 +47,7 @@ public class File_Persistent_Object_Repo
}
/**
- * @see
org.apache.avalon.cornerstone.services.store.ObjectRepository#get(String)
+ * @see
org.apache.james.repository.avalon.cornerstone.services.store.ObjectRepository#get(String)
*/
public synchronized Object get( final String key )
{
@@ -84,7 +84,7 @@ public class File_Persistent_Object_Repo
}
/**
- * @see
org.apache.avalon.cornerstone.services.store.ObjectRepository#get(String,
ClassLoader)
+ * @see
org.apache.james.repository.avalon.cornerstone.services.store.ObjectRepository#get(String,
ClassLoader)
*/
public synchronized Object get( final String key, final ClassLoader
classLoader )
{
@@ -125,7 +125,7 @@ public class File_Persistent_Object_Repo
/**
* Store the given object and associates it to the given key
*
- * @see
org.apache.avalon.cornerstone.services.store.ObjectRepository#put(String,
Object)
+ * @see
org.apache.james.repository.avalon.cornerstone.services.store.ObjectRepository#put(String,
Object)
*/
public synchronized void put( final String key, final Object value )
{
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Stream_Repository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Stream_Repository.java?rev=999478&r1=999477&r2=999478&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Stream_Repository.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Stream_Repository.java
Tue Sep 21 16:04:23 2010
@@ -26,7 +26,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.james.services.store.StreamRepository;
+import org.apache.james.repository.StreamRepository;
/**
* Implementation of a StreamRepository to a File.
@@ -50,7 +50,7 @@ public class File_Persistent_Stream_Repo
/**
* Get the object associated to the given unique key.
*
- * @see
org.apache.avalon.cornerstone.services.store.StreamRepository#get(String)
+ * @see
org.apache.james.repository.avalon.cornerstone.services.store.StreamRepository#get(String)
*/
public synchronized InputStream get( final String key )
{
@@ -69,7 +69,7 @@ public class File_Persistent_Stream_Repo
/**
* Store the given object and associates it to the given key
*
- * @see
org.apache.avalon.cornerstone.services.store.StreamRepository#put(String)
+ * @see
org.apache.james.repository.avalon.cornerstone.services.store.StreamRepository#put(String)
*/
public synchronized OutputStream put( final String key )
{
Modified:
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java?rev=999478&r1=999477&r2=999478&view=diff
==============================================================================
---
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
(original)
+++
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
Tue Sep 21 16:04:23 2010
@@ -27,7 +27,7 @@ import org.apache.commons.configuration.
import org.apache.james.api.user.User;
import org.apache.james.impl.jamesuser.AbstractUsersRepository;
import org.apache.james.impl.user.DefaultJamesUser;
-import org.apache.james.services.store.ObjectRepository;
+import org.apache.james.repository.ObjectRepository;
import org.apache.james.services.store.Store;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
