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 er...@apache.org on 2010/09/22 12:13:25 UTC
svn commit: r999855 - in /james/server/trunk:
core-library/src/main/java/org/apache/james/filepair/
mail-file/src/main/java/org/apache/james/mailrepository/
mail-file/src/test/java/org/apache/james/mailrepository/
mail-jdbc/src/main/java/org/apache/jam...
Author: eric
Date: Wed Sep 22 10:13:25 2010
New Revision: 999855
URL: http://svn.apache.org/viewvc?rev=999855&view=rev
Log:
Remove underscore in class names - Align mailstore.xml to new repository class names - Format a bit some code.
Added:
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentObjectRepository.java
- copied, changed from r999819, 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/FilePersistentStreamRepository.java
- copied, changed from r999819, james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Stream_Repository.java
Removed:
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
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/filepair/AbstractFileRepository.java
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
james/server/trunk/spring-deployment/src/main/config/james/mailstore.xml
james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
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=999855&r1=999854&r2=999855&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 Wed Sep 22 10:13:25 2010
@@ -51,17 +51,21 @@ import javax.annotation.Resource;
*/
public abstract class AbstractFileRepository
implements Repository, Configurable, LogEnabled {
+
protected static final boolean DEBUG = false;
protected static final int BYTE_MASK = 0x0f;
- protected static final char[] HEX_DIGITS = new char[]
- {
+
+ protected static final char[] HEX_DIGITS = new char[] {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
};
protected String m_extension;
+
protected String m_name;
+
protected FilenameFilter m_filter;
+
protected File m_baseDirectory;
private FileSystem fileSystem;
@@ -74,13 +78,11 @@ public abstract class AbstractFileReposi
}
-
@Resource(name="filesystem")
public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
-
public void setLog(Log logger) {
this.logger = logger;
}
@@ -88,11 +90,9 @@ public abstract class AbstractFileReposi
protected Log getLogger() {
return logger;
}
-
protected abstract String getExtensionDecorator();
-
@PostConstruct
public void init()
throws Exception
@@ -165,14 +165,12 @@ public abstract class AbstractFileReposi
* @throws ConfigurationException get thrown on invalid destintion syntax
*/
protected void setDestination( final String destination )
- throws ConfigurationException
- {
- if( !destination.startsWith( FileSystem.FILE_PROTOCOL ) )
- {
+ throws ConfigurationException {
+
+ if( !destination.startsWith( FileSystem.FILE_PROTOCOL ) ){
throw new ConfigurationException( "cannot handle destination " + destination);
}
-
try {
m_baseDirectory = fileSystem.getFile(destination);
} catch (FileNotFoundException e) {
Copied: james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentObjectRepository.java (from r999819, 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/FilePersistentObjectRepository.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentObjectRepository.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Object_Repository.java&r1=999819&r2=999855&rev=999855&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/FilePersistentObjectRepository.java Wed Sep 22 10:13:25 2010
@@ -34,7 +34,7 @@ import org.apache.james.util.io.ClassLoa
* object serialization on the file system.
*
*/
-public class File_Persistent_Object_Repository
+public class FilePersistentObjectRepository
extends AbstractFileRepository
implements ObjectRepository
{
Copied: james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentStreamRepository.java (from r999819, 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/FilePersistentStreamRepository.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentStreamRepository.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/filepair/File_Persistent_Stream_Repository.java&r1=999819&r2=999855&rev=999855&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/FilePersistentStreamRepository.java Wed Sep 22 10:13:25 2010
@@ -34,7 +34,7 @@ import org.apache.james.repository.Strea
* mark and reset methods. (working not like BufferedInputStream!!!)
*
*/
-public class File_Persistent_Stream_Repository
+public class FilePersistentStreamRepository
extends AbstractFileRepository
implements StreamRepository
{
Modified: james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java?rev=999855&r1=999854&r2=999855&view=diff
==============================================================================
--- james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java (original)
+++ james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java Wed Sep 22 10:13:25 2010
@@ -92,8 +92,8 @@ public class MimeMessageAvalonSource ext
*/
public long getMessageSize() throws IOException {
if (size == -1) {
- if (sr instanceof org.apache.james.filepair.File_Persistent_Stream_Repository) {
- size = ((org.apache.james.filepair.File_Persistent_Stream_Repository) sr).getSize(key);
+ if (sr instanceof org.apache.james.filepair.FilePersistentStreamRepository) {
+ size = ((org.apache.james.filepair.FilePersistentStreamRepository) sr).getSize(key);
} else size = super.getMessageSize();
}
return size;
Modified: james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java?rev=999855&r1=999854&r2=999855&view=diff
==============================================================================
--- james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java (original)
+++ james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java Wed Sep 22 10:13:25 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.filepair.File_Persistent_Object_Repository;
-import org.apache.james.filepair.File_Persistent_Stream_Repository;
+import org.apache.james.filepair.FilePersistentObjectRepository;
+import org.apache.james.filepair.FilePersistentStreamRepository;
import org.apache.james.test.mock.avalon.MockStore;
import org.apache.james.test.mock.james.MockFileSystem;
@@ -39,7 +39,7 @@ public class FileMailRepositoryTest exte
MockFileSystem fs = new MockFileSystem();
FileMailRepository mr = new FileMailRepository();
MockStore mockStore = new MockStore();
- File_Persistent_Stream_Repository file_Persistent_Stream_Repository = new File_Persistent_Stream_Repository();
+ FilePersistentStreamRepository file_Persistent_Stream_Repository = new FilePersistentStreamRepository();
file_Persistent_Stream_Repository.setFileSystem(fs);
file_Persistent_Stream_Repository.setLog(new SimpleLog("MockLog"));
@@ -49,7 +49,7 @@ public class FileMailRepositoryTest exte
file_Persistent_Stream_Repository.init();
mockStore.add("STREAM.mr", file_Persistent_Stream_Repository);
- File_Persistent_Object_Repository file_Persistent_Object_Repository = new File_Persistent_Object_Repository();
+ FilePersistentObjectRepository file_Persistent_Object_Repository = new FilePersistentObjectRepository();
file_Persistent_Object_Repository.setFileSystem(fs);
file_Persistent_Object_Repository.setLog(new SimpleLog("MockLog"));
DefaultConfigurationBuilder defaultConfiguration22 = new DefaultConfigurationBuilder();
Modified: james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java?rev=999855&r1=999854&r2=999855&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java (original)
+++ james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java Wed Sep 22 10:13:25 2010
@@ -211,8 +211,8 @@ public class MimeMessageJDBCSource exten
InputStream in = null;
try {
if (sr != null) {
- if (sr instanceof org.apache.james.filepair.File_Persistent_Stream_Repository) {
- size += ((org.apache.james.filepair.File_Persistent_Stream_Repository) sr).getSize(key);
+ if (sr instanceof org.apache.james.filepair.FilePersistentStreamRepository) {
+ size += ((org.apache.james.filepair.FilePersistentStreamRepository) sr).getSize(key);
} else {
in = sr.get(key);
int len = 0;
Modified: james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java?rev=999855&r1=999854&r2=999855&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java (original)
+++ james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java Wed Sep 22 10:13:25 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.filepair.File_Persistent_Stream_Repository;
+import org.apache.james.filepair.FilePersistentStreamRepository;
import org.apache.james.services.DataSourceSelector;
import org.apache.james.test.mock.avalon.MockStore;
import org.apache.james.test.mock.james.MockFileSystem;
@@ -43,7 +43,7 @@ public class JDBCMailRepositoryTest exte
// only used for dbfile
MockStore mockStore = new MockStore();
- File_Persistent_Stream_Repository file_Persistent_Stream_Repository = new File_Persistent_Stream_Repository();
+ FilePersistentStreamRepository file_Persistent_Stream_Repository = new FilePersistentStreamRepository();
file_Persistent_Stream_Repository.setFileSystem(fs);
file_Persistent_Stream_Repository.setLog(new SimpleLog("MockLog"));
DefaultConfigurationBuilder defaultConfiguration2 = new DefaultConfigurationBuilder();
Modified: james/server/trunk/spring-deployment/src/main/config/james/mailstore.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/mailstore.xml?rev=999855&r1=999854&r2=999855&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/mailstore.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/mailstore.xml Wed Sep 22 10:13:25 2010
@@ -80,7 +80,7 @@
<config FIFO="false"/>
</repository>
- <repository class="org.apache.james.filepair.File_Persistent_Object_Repository">
+ <repository class="org.apache.james.filepair.FilePersistentObjectRepository">
<protocols>
<protocol>file</protocol>
</protocols>
@@ -94,7 +94,7 @@
</models>
</repository>
- <repository class="org.apache.james.filepair.File_Persistent_Stream_Repository">
+ <repository class="org.apache.james.filepair.FilePersistentStreamRepository">
<protocols>
<protocol>file</protocol>
</protocols>
@@ -108,7 +108,7 @@
</models>
</repository>
- <repository class="org.apache.james.jcr.AvalonJCRMailRepository">
+ <repository class="org.apache.james.mailrepository.JCRMailRepository">
<protocols>
<protocol>jcr</protocol>
</protocols>
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=999855&r1=999854&r2=999855&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 Wed Sep 22 10:13:25 2010
@@ -32,7 +32,7 @@ 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.filepair.FilePersistentObjectRepository;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.FileSystem;
import org.apache.james.test.mock.avalon.MockStore;
@@ -50,9 +50,9 @@ public class UsersFileRepositoryTest ext
* @throws Exception
*/
protected UsersRepository getUsersRepository() throws Exception {
+
UsersFileRepository res = new UsersFileRepository();
-
FileSystem fs = new FileSystem() {
public File getBasedir() throws FileNotFoundException {
@@ -69,15 +69,15 @@ public class UsersFileRepositoryTest ext
};
MockStore mockStore = new MockStore();
- File_Persistent_Object_Repository file_Persistent_Object_Repository = new File_Persistent_Object_Repository();
- file_Persistent_Object_Repository.setFileSystem(fs);
- file_Persistent_Object_Repository.setLog(new SimpleLog("MockLog"));
+ FilePersistentObjectRepository filePersistentObjectRepository = new FilePersistentObjectRepository();
+ filePersistentObjectRepository.setFileSystem(fs);
+ filePersistentObjectRepository.setLog(new SimpleLog("MockLog"));
DefaultConfigurationBuilder defaultConfiguration22 = new DefaultConfigurationBuilder();
defaultConfiguration22.addProperty("[@destinationURL]", "file://target/var/users");
- file_Persistent_Object_Repository.configure(defaultConfiguration22);
- file_Persistent_Object_Repository.init();
+ filePersistentObjectRepository.configure(defaultConfiguration22);
+ filePersistentObjectRepository.init();
- mockStore.add("OBJECT.users", file_Persistent_Object_Repository);
+ mockStore.add("OBJECT.users", filePersistentObjectRepository);
res.setStore(mockStore);
DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder("test");
configuration.addProperty("destination.[@URL]", "file://target/var/users");
@@ -139,5 +139,4 @@ public class UsersFileRepositoryTest ext
assertEquals("Forward found", mappings.next().toString(), forward);
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org