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/01/04 19:06:29 UTC
svn commit: r895730 - in /james/server/sandbox/active/pure_spring_deployment:
core-library/src/main/java/org/apache/james/mailrepository/filepair/
spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/
Author: norman
Date: Mon Jan 4 18:06:29 2010
New Revision: 895730
URL: http://svn.apache.org/viewvc?rev=895730&view=rev
Log:
Fix getBaseDir of FileSystem implementation
Use the right dir for FileRepositories implementations
Modified:
james/server/sandbox/active/pure_spring_deployment/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java
Modified: james/server/sandbox/active/pure_spring_deployment/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java?rev=895730&r1=895729&r2=895730&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java (original)
+++ james/server/sandbox/active/pure_spring_deployment/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java Mon Jan 4 18:06:29 2010
@@ -109,17 +109,41 @@
m_baseDirectory = fileSystem.getBasedir();
} catch (FileNotFoundException e) {
getLogger().error("Cannot find the base directory of the application",e);
- throw new FileNotFoundException("Cannot find the base directory of the application");
+ throw new ConfigurationException("Cannot find the base directory of the application");
}
+ File directory;
+
+ // Check for absolute path
+ if( m_path.startsWith( "/" ) )
+ {
+ directory = new File( m_path );
+ }
+ else
+ {
+ directory = new File( m_baseDirectory, m_path );
+ }
+
+ try
+ {
+ directory = directory.getCanonicalFile();
+ }
+ catch( final IOException ioe )
+ {
+ throw new ConfigurationException( "Unable to form canonical representation of " +
+ directory );
+ }
+
+ m_path = directory.toString();
+
+
m_name = "Repository";
String m_postfix = getExtensionDecorator();
m_extension = "." + m_name + m_postfix;
m_filter = new ExtensionFileFilter(m_extension);
//m_filter = new NumberedRepositoryFileFilter(getExtensionDecorator());
- final File directory = new File( m_path );
directory.mkdirs();
getLogger().info( getClass().getName() + " opened in " + m_path );
@@ -173,33 +197,10 @@
throw new ConfigurationException( "cannot handle destination " + destination );
}
+
m_path = destination.substring( HANDLED_URL.length() );
-
- File directory;
-
- // Check for absolute path
- if( m_path.startsWith( "/" ) )
- {
- directory = new File( m_path );
- }
- else
- {
- directory = new File( m_baseDirectory, m_path );
- }
-
- try
- {
- directory = directory.getCanonicalFile();
- }
- catch( final IOException ioe )
- {
- throw new ConfigurationException( "Unable to form canonical representation of " +
- directory );
- }
-
- m_path = directory.toString();
-
m_destination = destination;
+
}
/**
Modified: james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java?rev=895730&r1=895729&r2=895730&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java (original)
+++ james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java Mon Jan 4 18:06:29 2010
@@ -30,7 +30,7 @@
public class FileSystemBridge implements FileSystem, ResourceLoaderAware {
public File getBasedir() throws FileNotFoundException {
- return new File(".");
+ return new File("./../");
}
private ResourceLoader resourceLoader = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org