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/26 07:16:10 UTC
svn commit: r903094 -
/james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
Author: norman
Date: Tue Jan 26 06:16:10 2010
New Revision: 903094
URL: http://svn.apache.org/viewvc?rev=903094&view=rev
Log:
Fix broken test I introduced while refactoring the Test
Modified:
james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
Modified: james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java?rev=903094&r1=903093&r2=903094&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java (original)
+++ james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java Tue Jan 26 06:16:10 2010
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
+import java.util.List;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
@@ -67,7 +67,7 @@
if (mappings == null) {
mappings = new ArrayList<String>();
} else {
- removeMappings(user,domain,mappings);
+ removeMappingsFromConfig(user,domain,mappings);
}
if (type == ERROR_TYPE) {
@@ -109,7 +109,7 @@
return false;
}
- removeMappings(user,domain, mappings);
+ removeMappingsFromConfig(user,domain, mappings);
if (type == ERROR_TYPE) {
mappings.remove(VirtualUserTable.ERROR_PREFIX + mapping);
@@ -139,23 +139,24 @@
@SuppressWarnings("unchecked")
- private void removeMappings(String user, String domain, Collection<String> mappings) {
- Iterator<String> conf = defaultConfiguration.getKeys();
-
- while(conf.hasNext()) {
- String c = conf.next();
- try {
- String mapping = user + "@" + domain + "=" + VirtualUserTableUtil.CollectionToMapping(mappings);
-
- System.out.println("M=" + mapping);
-
- if (defaultConfiguration.getProperty(c).toString().equalsIgnoreCase(mapping)){
- defaultConfiguration.clearProperty(c);
- }
- } catch (Exception e) {
- e.printStackTrace();
+ private void removeMappingsFromConfig(String user, String domain, Collection<String> mappings) {
+ List<String> confs = defaultConfiguration.getList("mapping");
+ List<String> stored = new ArrayList<String>();
+ for (int i = 0; i < confs.size(); i++) {
+ String c = confs.get(i);
+ String mapping = user + "@" + domain + "=" + VirtualUserTableUtil.CollectionToMapping(mappings);
+
+ if (!c.equalsIgnoreCase(mapping)){
+ stored.add(c);
}
}
+ // clear old values
+ defaultConfiguration.clear();
+
+ // add stored mappings
+ for (int i = 0; i < stored.size(); i++) {
+ defaultConfiguration.addProperty("mapping", stored.get(i));
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org