Author: norman
Date: Mon Oct 16 06:13:41 2006
New Revision: 464476
URL: http://svn.apache.org/viewvc?view=rev&rev=464476
Log:
Fix formatting
Modified:
james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java
james/server/trunk/src/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/src/java/org/apache/james/vut/XMLVirtualUserTable.java
james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java
james/server/trunk/src/test/org/apache/james/vut/XMLVirtualUserTableTest.java
Modified:
james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java?view=diff&rev=464476&r1=464475&r2=464476
==============================================================================
---
james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java
(original)
+++
james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java
Mon Oct 16 06:13:41 2006
@@ -100,7 +100,7 @@
* @see
org.apache.james.services.VirtualUserTableManagement#addRegexMapping(java.lang.String,
java.lang.String, java.lang.String)
*/
public boolean addRegexMapping(String user, String domain, String regex)
throws InvalidMappingException {
- getLogger().info("Add regex mapping => " + regex + " for user: " + user
+ " domain: " + domain);
+ getLogger().info("Add regex mapping => " + regex + " for user: " +
user + " domain: " + domain);
try {
new Perl5Compiler().compile(regex);
} catch (MalformedPatternException e) {
@@ -115,7 +115,7 @@
* @see
org.apache.james.services.VirtualUserTableManagement#removeRegexMapping(java.lang.String,
java.lang.String, java.lang.String)
*/
public boolean removeRegexMapping(String user, String domain, String
regex) throws InvalidMappingException {
- getLogger().info("Add regex mapping => " + regex + " for user: " + user
+ " domain: " + domain);
+ getLogger().info("Add regex mapping => " + regex + " for user: " +
user + " domain: " + domain);
return removeMappingInternal(user,domain,"regex:" + regex);
}
@@ -153,8 +153,8 @@
* @throws InvalidMappingException
* @see
org.apache.james.services.VirtualUserTableManagement#addErrorMapping(java.lang.String,
java.lang.String, java.lang.String)
*/
- public boolean addErrorMapping(String user, String domain, String error)
throws InvalidMappingException {
- getLogger().info("Add error mapping => " + error + " for user: " + user
+ " domain: " + domain);
+ public boolean addErrorMapping(String user, String domain, String error)
throws InvalidMappingException {
+ getLogger().info("Add error mapping => " + error + " for user: " +
user + " domain: " + domain);
return addMappingInternal(user,domain, "error:" + error);
}
@@ -164,7 +164,7 @@
* @see
org.apache.james.services.VirtualUserTableManagement#removeErrorMapping(java.lang.String,
java.lang.String, java.lang.String)
*/
public boolean removeErrorMapping(String user, String domain, String
error) throws InvalidMappingException {
- getLogger().info("Add error mapping => " + error + " for user: " + user
+ " domain: " + domain);
+ getLogger().info("Add error mapping => " + error + " for user: " +
user + " domain: " + domain);
return removeMappingInternal(user,domain,"error:" + error);
}
Modified:
james/server/trunk/src/java/org/apache/james/vut/JDBCVirtualUserTable.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/vut/JDBCVirtualUserTable.java?view=diff&rev=464476&r1=464475&r2=464476
==============================================================================
--- james/server/trunk/src/java/org/apache/james/vut/JDBCVirtualUserTable.java
(original)
+++ james/server/trunk/src/java/org/apache/james/vut/JDBCVirtualUserTable.java
Mon Oct 16 06:13:41 2006
@@ -277,9 +277,9 @@
* @see
org.apache.james.vut.AbstractVirtualUserTable#removeRegexMappingInternal(java.lang.String,
java.lang.String, java.lang.String)
*/
public boolean removeMappingInternal(String user, String domain, String
mapping) throws InvalidMappingException {
- String newUser = getUserString(user);
- String newDomain = getDomainString(domain);
- Collection map = getUserDomainMappings(newUser,newDomain);
+ String newUser = getUserString(user);
+ String newDomain = getDomainString(domain);
+ Collection map = getUserDomainMappings(newUser,newDomain);
if (map != null && map.size() > 1) {
map.remove(mapping);
@@ -294,8 +294,8 @@
* @see
org.apache.james.vut.AbstractVirtualUserTable#addRegexMappingInternal(java.lang.String,
java.lang.String, java.lang.String)
*/
public boolean addMappingInternal(String user, String domain, String
regex) throws InvalidMappingException {
- String newUser = getUserString(user);
- String newDomain = getDomainString(domain);
+ String newUser = getUserString(user);
+ String newDomain = getDomainString(domain);
Collection map = getUserDomainMappings(newUser,newDomain);
if (map != null && map.size() != 0) {
@@ -466,7 +466,7 @@
* @see
org.apache.james.vut.AbstractVirtualUserTable#mapAddress(java.lang.String,
java.lang.String)
*/
public Collection getUserDomainMappings(String user, String domain) throws
InvalidMappingException {
- Connection conn = null;
+ Connection conn = null;
PreparedStatement mappingStmt = null;
try {
Modified:
james/server/trunk/src/java/org/apache/james/vut/XMLVirtualUserTable.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/vut/XMLVirtualUserTable.java?view=diff&rev=464476&r1=464475&r2=464476
==============================================================================
--- james/server/trunk/src/java/org/apache/james/vut/XMLVirtualUserTable.java
(original)
+++ james/server/trunk/src/java/org/apache/james/vut/XMLVirtualUserTable.java
Mon Oct 16 06:13:41 2006
@@ -77,8 +77,8 @@
* Not implemented
*/
public Collection getUserDomainMappings(String user, String domain) {
- // Not supported
- return null;
+ // Not supported
+ return null;
}
}
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=464476&r1=464475&r2=464476
==============================================================================
---
james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java
(original)
+++
james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java
Mon Oct 16 06:13:41 2006
@@ -35,7 +35,7 @@
}
public void testStoreAndRetrieveWildCardAddressMapping() throws
ErrorMappingException {
-
+
String user = "test";
String user2 = "test2";
String domain = "localhost";
Modified:
james/server/trunk/src/test/org/apache/james/vut/XMLVirtualUserTableTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/vut/XMLVirtualUserTableTest.java?view=diff&rev=464476&r1=464475&r2=464476
==============================================================================
---
james/server/trunk/src/test/org/apache/james/vut/XMLVirtualUserTableTest.java
(original)
+++
james/server/trunk/src/test/org/apache/james/vut/XMLVirtualUserTableTest.java
Mon Oct 16 06:13:41 2006
@@ -60,14 +60,14 @@
}
public void setUp() throws Exception {
- table = getVirtalUserTable();
+ table = getVirtalUserTable();
}
public void tearDown() {
- ContainerUtil.dispose(table);
+ ContainerUtil.dispose(table);
}
public void testGetMappings() throws ErrorMappingException {
- assertTrue("Found 2 mappings", table.getMappings(user, domain).size() ==
2);
+ assertTrue("Found 2 mappings", table.getMappings(user, domain).size()
== 2);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
