Author: eric
Date: Sat Aug 14 15:04:53 2010
New Revision: 985504
URL: http://svn.apache.org/viewvc?rev=985504&view=rev
Log:
XML/JDBCVirtualUserTable should not implement DomainList (JAMES-1035)
Modified:
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
james/server/trunk/user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
Modified:
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=985504&r1=985503&r2=985504&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Sat Aug 14 15:04:53 2010
@@ -272,15 +272,6 @@
<bean id="domainlist" class="org.apache.james.domain.JDBCDomainList"/>
-->
- <!-- JDBC VirtualUserTable implementation of the domainlist service -->
- <!--
- <bean id="domainlist" class="org.apache.james.vut.JDBCVirtualUserTable" />
- -->
-
- <!-- XML VirtualUserTable implementation of the domainlist service -->
- <!--
- <bean id="domainlist" class="org.apache.james.vut.XMLVirtualUserTable"/>
- -->
<!-- Poster -->
<bean id="poster" name="org.apache.jsieve.mailet.Poster"
class="org.apache.james.MailboxManagerPoster"/>
Modified:
james/server/trunk/user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java?rev=985504&r1=985503&r2=985504&view=diff
==============================================================================
---
james/server/trunk/user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
(original)
+++
james/server/trunk/user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
Sat Aug 14 15:04:53 2010
@@ -129,9 +129,6 @@ public class JDBCVirtualUserTable extend
sqlFileName = arg0.getString("sqlFile");
- setAutoDetect(arg0.getBoolean("autodetect",true));
- setAutoDetectIP(arg0.getBoolean("autodetectIP", true));
-
}
@PostConstruct
@@ -235,7 +232,7 @@ public class JDBCVirtualUserTable extend
/**
* @see
org.apache.james.impl.vut.AbstractVirtualUserTable#mapAddressInternal(java.lang.String,
java.lang.String)
*/
- public String mapAddressInternal(String user, String domain) {
+ protected String mapAddressInternal(String user, String domain) {
Connection conn = null;
PreparedStatement mappingStmt = null;
try {
@@ -485,75 +482,6 @@ public class JDBCVirtualUserTable extend
}
/**
- * @see
org.apache.james.impl.vut.AbstractVirtualUserTable#getDomainsInternal()
- */
- protected List<String> getDomainsInternal() {
- List<String> domains = new ArrayList<String>();
- Connection conn = null;
- PreparedStatement mappingStmt = null;
-
- try {
- conn = dataSourceComponent.getConnection();
- mappingStmt =
conn.prepareStatement(sqlQueries.getSqlString("selectDomains", true));
-
- ResultSet mappingRS = null;
- try {
- mappingRS = mappingStmt.executeQuery();
- while (mappingRS.next()) {
- String domain = mappingRS.getString(1).toLowerCase();
- if(domain.equals(WILDCARD) == false &&
domains.contains(domains) == false) {
- domains.add(domain);
- }
- }
- } finally {
- theJDBCUtil.closeJDBCResultSet(mappingRS);
- }
-
- } catch (SQLException sqle) {
- getLogger().error("Error accessing database", sqle);
- } finally {
- theJDBCUtil.closeJDBCStatement(mappingStmt);
- theJDBCUtil.closeJDBCConnection(conn);
- }
- if (domains.size() == 0) {
- return null;
- } else {
- return domains;
- }
- }
-
- /**
- * @see
org.apache.james.api.domainlist.DomainList#containsDomain(java.lang.String)
- */
- public boolean containsDomain(String domain) {
- Connection conn = null;
- PreparedStatement mappingStmt = null;
-
- try {
- conn = dataSourceComponent.getConnection();
- mappingStmt =
conn.prepareStatement(sqlQueries.getSqlString("selectDomain", true));
-
- ResultSet mappingRS = null;
- try {
- mappingStmt.setString(1, domain);
- mappingRS = mappingStmt.executeQuery();
- if (mappingRS.next()) {
- return true;
- }
- } finally {
- theJDBCUtil.closeJDBCResultSet(mappingRS);
- }
-
- } catch (SQLException sqle) {
- getLogger().error("Error accessing database", sqle);
- } finally {
- theJDBCUtil.closeJDBCStatement(mappingStmt);
- theJDBCUtil.closeJDBCConnection(conn);
- }
- return false;
- }
-
- /**
* @see
org.apache.james.impl.vut.AbstractVirtualUserTable#getAllMappingsInternal()
*/
public Map<String,Collection<String>> getAllMappingsInternal() {
Modified:
james/server/trunk/user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java?rev=985504&r1=985503&r2=985504&view=diff
==============================================================================
---
james/server/trunk/user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
(original)
+++
james/server/trunk/user-function/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
Sat Aug 14 15:04:53 2010
@@ -39,8 +39,6 @@ public class XMLVirtualUserTable extends
*/
private Map<String,String> mappings;
- private List<String> domains;
-
private final static String WILDCARD = "*";
/**
@@ -51,7 +49,6 @@ public class XMLVirtualUserTable extends
List<String> mapConf = arg0.getList("mapping");
mappings = new HashMap<String,String>();
- domains = new ArrayList<String>();
if (mapConf != null && mapConf.size() > 0) {
for (int i = 0; i < mapConf.size(); i ++) {
@@ -64,21 +61,6 @@ public class XMLVirtualUserTable extends
// Add domains of the mappings map to the domains List
Iterator<String> keys = mappings.keySet().iterator();
- while (keys.hasNext()) {
- String key = keys.next().toString();
-
- String[] args1 = key.split("@");
- if (args1 != null && args1.length > 1) {
- String domain = args1[1].toLowerCase();
- if (domains.contains(domain) == false &&
domain.equals(WILDCARD) == false) {
- domains.add(domain);
- }
- }
- }
-
- setAutoDetect(arg0.getBoolean("autodetect",true));
- setAutoDetectIP(arg0.getBoolean("autodetectIP", true));
-
}
/**
@@ -126,24 +108,6 @@ public class XMLVirtualUserTable extends
}
/**
- * @see
org.apache.james.impl.vut.AbstractVirtualUserTable#getDomainsInternal()
- */
- protected List<String> getDomainsInternal() {
- return domains;
- }
-
- /**
- * @see
org.apache.james.api.domainlist.DomainList#containsDomain(java.lang.String)
- */
- public boolean containsDomain(String domain) {
- if (domains == null) {
- return false;
- } else {
- return domains.contains(domain);
- }
- }
-
- /**
* @see
org.apache.james.impl.vut.AbstractVirtualUserTable#getAllMappingsInternal()
*/
public Map<String,Collection<String>> getAllMappingsInternal() {
Modified:
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java?rev=985504&r1=985503&r2=985504&view=diff
==============================================================================
---
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
(original)
+++
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
Sat Aug 14 15:04:53 2010
@@ -29,8 +29,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.mail.internet.ParseException;
@@ -38,7 +38,6 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.api.domainlist.DomainList;
import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.management.InvalidMappingException;
@@ -52,10 +51,8 @@ import org.apache.oro.text.regex.Perl5Co
/**
*
*/
-public abstract class AbstractVirtualUserTable implements VirtualUserTable,
VirtualUserTableManagement, DomainList, LogEnabled, Configurable {
+public abstract class AbstractVirtualUserTable implements VirtualUserTable,
VirtualUserTableManagement, LogEnabled, Configurable {
- private boolean autoDetect = true;
- private boolean autoDetectIP = true;
private DNSService dns;
// The maximum mappings which will process before throwing exception
@@ -335,48 +332,6 @@ public abstract class AbstractVirtualUse
/**
- * @see org.apache.james.api.domainlist.DomainList#getDomains()
- */
- public List<String> getDomains() {
- List<String> domains = getDomainsInternal();
- if (domains != null) {
-
- String hostName = null;
- try {
- hostName = dns.getHostName(dns.getLocalHost());
- } catch (UnknownHostException ue) {
- hostName = "localhost";
- }
-
- getLogger().info("Local host is: " + hostName);
-
- hostName = hostName.toLowerCase(Locale.US);
-
- if (autoDetect == true && hostName.equals("localhost") == false &&
domains.contains(hostName) == false) {
- domains.add(hostName);
- }
-
- if (autoDetectIP == true) {
- List<String> ipList = getDomainsIP(domains,dns,getLogger());
- for(int i = 0; i < ipList.size(); i++) {
- if (domains.contains(ipList.get(i)) == false) {
- domains.add(ipList.get(i));
- }
- }
- }
-
- if (getLogger().isInfoEnabled()) {
- for (Iterator<String> i = domains.iterator(); i.hasNext(); ) {
- getLogger().info("Handling mail for: " + i.next());
- }
- }
- return domains;
- } else {
- return null;
- }
- }
-
- /**
* Return a List which holds all ipAddress of the domains in the given List
*
* @param domains List of domains
@@ -423,22 +378,6 @@ public abstract class AbstractVirtualUse
public Collection<String> getUserDomainMappings(String user, String
domain) {
return getUserDomainMappingsInternal(user, domain);
}
-
- /**
- * @see org.apache.james.api.domainlist.DomainList#setAutoDetect(boolean)
- */
- public synchronized void setAutoDetect(boolean autoDetect) {
- getLogger().info("Set autodetect to: " + autoDetect);
- this.autoDetect = autoDetect;
- }
-
- /**
- * @see org.apache.james.api.domainlist.DomainList#setAutoDetectIP(boolean)
- */
- public synchronized void setAutoDetectIP(boolean autoDetectIP) {
- getLogger().info("Set autodetectIP to: " + autoDetectIP);
- this.autoDetectIP = autoDetectIP;
- }
/**
* @see
org.apache.james.api.vut.management.VirtualUserTableManagement#addAliasDomainMapping(java.lang.String,
java.lang.String)
@@ -518,13 +457,6 @@ public abstract class AbstractVirtualUse
protected abstract boolean removeMappingInternal(String user, String
domain, String mapping) throws InvalidMappingException;
/**
- * Return List of all domains for which email should accepted
- *
- * @return domains the domains
- */
- protected abstract List<String> getDomainsInternal();
-
- /**
* Return Collection of all mappings for the given username and domain
*
* @param user the user
Modified:
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java?rev=985504&r1=985503&r2=985504&view=diff
==============================================================================
---
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
(original)
+++
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
Sat Aug 14 15:04:53 2010
@@ -150,10 +150,6 @@ public abstract class AbstractVirtualUse
assertEquals("Two mappings",virtualUserTable.getMappings(user,
domain).size(), 2);
assertEquals("One
mappingline",virtualUserTable.getAllMappings().size(),1);
- // Test DomainList implementations!
- assertEquals("Three domains",virtualUserTable.getDomains().size(),
3);
- assertTrue("Contains
Domain",virtualUserTable.containsDomain(domain));
-
assertTrue("remove virtual mapping", removeMapping(user, domain,
regex, REGEX_TYPE));
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
