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 2006/10/13 17:43:00 UTC
svn commit: r463715 - in /james/server/trunk/src:
java/org/apache/james/util/VirtualUserTableUtil.java
test/org/apache/james/vut/AbstractVirtualUserTableTest.java
test/org/apache/james/vut/JDBCVirtualUserTableTest.java
Author: norman
Date: Fri Oct 13 08:42:59 2006
New Revision: 463715
URL: http://svn.apache.org/viewvc?view=rev&rev=463715
Log:
Fix regex mapping removing. See JAMES-582
Modified:
james/server/trunk/src/java/org/apache/james/util/VirtualUserTableUtil.java
james/server/trunk/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java
james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java
Modified: james/server/trunk/src/java/org/apache/james/util/VirtualUserTableUtil.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/util/VirtualUserTableUtil.java?view=diff&rev=463715&r1=463714&r2=463715
==============================================================================
--- james/server/trunk/src/java/org/apache/james/util/VirtualUserTableUtil.java (original)
+++ james/server/trunk/src/java/org/apache/james/util/VirtualUserTableUtil.java Fri Oct 13 08:42:59 2006
@@ -124,8 +124,7 @@
*/
public static String getSeparator(String targetString) {
return (targetString.indexOf(',') > -1 ? "," : (targetString
- .indexOf(';') > -1 ? ";"
- : (targetString.indexOf("regex:") > -1 ? "" : ":")));
+ .indexOf(';') > -1 ? ";" : ((targetString.indexOf("regex:") > -1 || targetString.indexOf("error:") > -1)? "" : ":")));
}
/**
Modified: james/server/trunk/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java?view=diff&rev=463715&r1=463714&r2=463715
==============================================================================
--- james/server/trunk/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java Fri Oct 13 08:42:59 2006
@@ -32,12 +32,7 @@
protected VirtualUserTableManagement virtualUserTable;
protected void setUp() throws Exception {
- try {
- virtualUserTable = getVirtalUserTable();
- } catch (Exception e) {
- tearDown();
- throw new Exception(e);
- }
+ virtualUserTable = getVirtalUserTable();
}
protected void tearDown() throws Exception {
@@ -74,6 +69,7 @@
assertTrue("Invalid Mapping throw exception" , catched);
assertTrue("remove virtual mapping", virtualUserTable.removeRegexMapping(user, domain, regex2));
+ assertTrue("No mapping",virtualUserTable.getMappings(user, domain).isEmpty());
} catch (InvalidMappingException e) {
fail("Storing failed");
}
@@ -107,6 +103,7 @@
assertTrue("Invalid Mapping throw exception" , catched);
assertTrue("remove virtual mapping", virtualUserTable.removeAddressMapping(user, domain, address2));
+ assertTrue("No mapping",virtualUserTable.getMappings(user, domain).isEmpty());
} catch (InvalidMappingException e) {
fail("Storing failed");
}
@@ -133,6 +130,7 @@
assertTrue("Error Mapping throw exception" , catched);
assertTrue("remove virtual mapping", virtualUserTable.removeErrorMapping(user, domain, error));
+ assertTrue("No mapping",virtualUserTable.getMappings(user, domain).isEmpty());
} catch (InvalidMappingException e) {
fail("Storing failed");
}
Modified: james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java?view=diff&rev=463715&r1=463714&r2=463715
==============================================================================
--- james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java Fri Oct 13 08:42:59 2006
@@ -28,7 +28,6 @@
DefaultConfiguration defaultConfiguration = new DefaultConfiguration("ReposConf");
defaultConfiguration.setAttribute("destinationURL","db://maildb/virtualusertable");
defaultConfiguration.addChild(new AttrValConfiguration("sqlFile","file://conf/sqlResources.xml"));
- //defaultConfiguration.setAttribute("type","MAIL");
mr.service(serviceManager);
mr.configure(defaultConfiguration);
mr.initialize();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org