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/06/13 20:05:03 UTC

svn commit: r954276 - in /james/server/trunk: core-function/src/main/java/org/apache/james/filepair/ core-function/src/main/java/org/apache/james/mailrepository/ core-function/src/main/java/org/apache/james/mailrepository/filepair/ core-function/src/te...

Author: norman
Date: Sun Jun 13 18:05:03 2010
New Revision: 954276

URL: http://svn.apache.org/viewvc?rev=954276&view=rev
Log:
Rename org.apache.james.mailrepository.filepair to org.apache.james.filepair cause the files in the package are not only used by mailrepositories

Added:
    james/server/trunk/core-function/src/main/java/org/apache/james/filepair/
      - copied from r954275, james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/filepair/
Removed:
    james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/filepair/
Modified:
    james/server/trunk/core-function/src/main/java/org/apache/james/filepair/AbstractFileRepository.java
    james/server/trunk/core-function/src/main/java/org/apache/james/filepair/File_Persistent_Object_Repository.java
    james/server/trunk/core-function/src/main/java/org/apache/james/filepair/File_Persistent_Stream_Repository.java
    james/server/trunk/core-function/src/main/java/org/apache/james/filepair/NumberedRepositoryFileFilter.java
    james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
    james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
    james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
    james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
    james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java

Modified: james/server/trunk/core-function/src/main/java/org/apache/james/filepair/AbstractFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/filepair/AbstractFileRepository.java?rev=954276&r1=954275&r2=954276&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/filepair/AbstractFileRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/filepair/AbstractFileRepository.java Sun Jun 13 18:05:03 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.mailrepository.filepair;
+package org.apache.james.filepair;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.HierarchicalConfiguration;

Modified: james/server/trunk/core-function/src/main/java/org/apache/james/filepair/File_Persistent_Object_Repository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/filepair/File_Persistent_Object_Repository.java?rev=954276&r1=954275&r2=954276&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/filepair/File_Persistent_Object_Repository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/filepair/File_Persistent_Object_Repository.java Sun Jun 13 18:05:03 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.mailrepository.filepair;
+package org.apache.james.filepair;
 
 import java.io.InputStream;
 import java.io.ObjectInputStream;
@@ -39,7 +39,7 @@ public class File_Persistent_Object_Repo
     implements ObjectRepository
 {
     /**
-     * @see org.apache.james.mailrepository.filepair.AbstractFileRepository#getExtensionDecorator()
+     * @see org.apache.james.filepair.AbstractFileRepository#getExtensionDecorator()
      */
     protected String getExtensionDecorator()
     {

Modified: james/server/trunk/core-function/src/main/java/org/apache/james/filepair/File_Persistent_Stream_Repository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/filepair/File_Persistent_Stream_Repository.java?rev=954276&r1=954275&r2=954276&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/filepair/File_Persistent_Stream_Repository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/filepair/File_Persistent_Stream_Repository.java Sun Jun 13 18:05:03 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.mailrepository.filepair;
+package org.apache.james.filepair;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -40,7 +40,7 @@ public class File_Persistent_Stream_Repo
 {
  
     /**
-     * @see org.apache.james.mailrepository.filepair.AbstractFileRepository#getExtensionDecorator()
+     * @see org.apache.james.filepair.AbstractFileRepository#getExtensionDecorator()
      */
     protected String getExtensionDecorator()
     {

Modified: james/server/trunk/core-function/src/main/java/org/apache/james/filepair/NumberedRepositoryFileFilter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/filepair/NumberedRepositoryFileFilter.java?rev=954276&r1=954275&r2=954276&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/filepair/NumberedRepositoryFileFilter.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/filepair/NumberedRepositoryFileFilter.java Sun Jun 13 18:05:03 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.mailrepository.filepair;
+package org.apache.james.filepair;
 
 import java.io.File;
 import java.io.FilenameFilter;

Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java?rev=954276&r1=954275&r2=954276&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java Sun Jun 13 18:05:03 2010
@@ -92,8 +92,8 @@ public class MimeMessageAvalonSource ext
      */
     public long getMessageSize() throws IOException {
         if (size == -1) {
-            if (sr instanceof org.apache.james.mailrepository.filepair.File_Persistent_Stream_Repository) {
-                size = ((org.apache.james.mailrepository.filepair.File_Persistent_Stream_Repository) sr).getSize(key);
+            if (sr instanceof org.apache.james.filepair.File_Persistent_Stream_Repository) {
+                size = ((org.apache.james.filepair.File_Persistent_Stream_Repository) sr).getSize(key);
             } else size = super.getMessageSize();
         }
         return size;

Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java?rev=954276&r1=954275&r2=954276&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java Sun Jun 13 18:05:03 2010
@@ -211,8 +211,8 @@ public class MimeMessageJDBCSource exten
             InputStream in = null;
             try {
                 if (sr != null) {
-                    if (sr instanceof org.apache.james.mailrepository.filepair.File_Persistent_Stream_Repository) {
-                        size += ((org.apache.james.mailrepository.filepair.File_Persistent_Stream_Repository) sr).getSize(key);
+                    if (sr instanceof org.apache.james.filepair.File_Persistent_Stream_Repository) {
+                        size += ((org.apache.james.filepair.File_Persistent_Stream_Repository) sr).getSize(key);
                     } else {
                         in = sr.get(key);
                         int len = 0;

Modified: james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java?rev=954276&r1=954275&r2=954276&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java Sun Jun 13 18:05:03 2010
@@ -22,8 +22,8 @@ package org.apache.james.mailrepository;
 
 import org.apache.commons.configuration.DefaultConfigurationBuilder;
 import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.mailrepository.filepair.File_Persistent_Object_Repository;
-import org.apache.james.mailrepository.filepair.File_Persistent_Stream_Repository;
+import org.apache.james.filepair.File_Persistent_Object_Repository;
+import org.apache.james.filepair.File_Persistent_Stream_Repository;
 import org.apache.james.services.MailRepository;
 import org.apache.james.test.mock.avalon.MockStore;
 import org.apache.james.test.mock.james.MockFileSystem;

Modified: james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java?rev=954276&r1=954275&r2=954276&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java Sun Jun 13 18:05:03 2010
@@ -22,7 +22,7 @@ package org.apache.james.mailrepository;
 
 import org.apache.commons.configuration.DefaultConfigurationBuilder;
 import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.mailrepository.filepair.File_Persistent_Stream_Repository;
+import org.apache.james.filepair.File_Persistent_Stream_Repository;
 import org.apache.james.services.DataSourceSelector;
 import org.apache.james.services.MailRepository;
 import org.apache.james.test.mock.avalon.MockStore;

Modified: james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java?rev=954276&r1=954275&r2=954276&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java Sun Jun 13 18:05:03 2010
@@ -32,8 +32,8 @@ import org.apache.commons.logging.impl.S
 import org.apache.james.api.user.JamesUser;
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.api.vut.VirtualUserTable;
+import org.apache.james.filepair.File_Persistent_Object_Repository;
 import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.mailrepository.filepair.File_Persistent_Object_Repository;
 import org.apache.james.services.FileSystem;
 import org.apache.james.test.mock.avalon.MockStore;
 import org.apache.mailet.MailAddress;



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