svn commit: r453953 - in /james/server/trunk/src: java/org/apache/james/userrepository/UsersFileRepository.java test/org/apache/james/userrepository/UsersFileRepositoryTest.java

[bago]

Author: bago
Date: Sat Oct  7 09:20:33 2006
New Revision: 453953

URL: http://svn.apache.org/viewvc?view=rev&rev=453953
Log:
UsersFileRepository: I don't understand why it was adding a File.separator at 
the end of the destination url considering that out destinationUrl always use 
"/" and not OS specific slashes.
I updated the UsersFileRepository to always add "/" and the test to not add it, 
so it should work botn on windows and unix.

Modified:
    
james/server/trunk/src/java/org/apache/james/userrepository/UsersFileRepository.java
    
james/server/trunk/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java

Modified: 
james/server/trunk/src/java/org/apache/james/userrepository/UsersFileRepository.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/userrepository/UsersFileRepository.java?view=diff&rev=453953&r1=453952&r2=453953
==============================================================================
--- 
james/server/trunk/src/java/org/apache/james/userrepository/UsersFileRepository.java
 (original)
+++ 
james/server/trunk/src/java/org/apache/james/userrepository/UsersFileRepository.java
 Sat Oct  7 09:20:33 2006
@@ -35,7 +35,6 @@
 import org.apache.james.services.User;
 import org.apache.james.services.UsersRepository;
 
-import java.io.File;
 import java.util.Iterator;
 
 /**
@@ -62,6 +61,7 @@
 
     private Store store;
     private ObjectRepository objectRepository;
+    private static String urlSeparator = "/"; 
 
     /**
      * The destination URL used to define the repository.
@@ -100,8 +100,8 @@
 
         destination = configuration.getChild( "destination" ).getAttribute( 
"URL" );
 
-        if (!destination.endsWith(File.separator)) {
-            destination += File.separator;
+        if (!destination.endsWith(urlSeparator)) {
+            destination += urlSeparator;
         }
     }
 

Modified: 
james/server/trunk/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java?view=diff&rev=453953&r1=453952&r2=453953
==============================================================================
--- 
james/server/trunk/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java
 (original)
+++ 
james/server/trunk/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java
 Sat Oct  7 09:20:33 2006
@@ -63,14 +63,14 @@
         file_Persistent_Object_Repository.service(serviceManager);
         file_Persistent_Object_Repository.enableLogging(new MockLogger());
         DefaultConfiguration defaultConfiguration22 = new 
DefaultConfiguration("conf");
-        defaultConfiguration22.setAttribute("destinationURL", 
"file://var/users"+File.separator);
+        defaultConfiguration22.setAttribute("destinationURL", 
"file://var/users");
         file_Persistent_Object_Repository.configure(defaultConfiguration22);
         file_Persistent_Object_Repository.initialize();
-        mockStore.add("OBJECT.users"+File.separator, 
file_Persistent_Object_Repository);
+        mockStore.add("OBJECT.users", file_Persistent_Object_Repository);
         res.setStore(mockStore);
         DefaultConfiguration configuration = new DefaultConfiguration("test");
         DefaultConfiguration destinationConf = new 
DefaultConfiguration("destination");
-        destinationConf.setAttribute("URL", "file://var/users"+File.separator);
+        destinationConf.setAttribute("URL", "file://var/users");
         configuration.addChild(destinationConf);
         res.enableLogging(new ConsoleLogger());
         res.configure(configuration );



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]