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 er...@apache.org on 2010/10/21 09:09:57 UTC
svn commit: r1025860 - in /james/server/trunk:
core-function/src/main/java/org/apache/james/
domain-api/src/main/java/org/apache/james/api/domainlist/
domain-api/src/main/java/org/apache/james/domainlist/
domain-api/src/main/java/org/apache/james/domai...
Author: eric
Date: Thu Oct 21 07:09:55 2010
New Revision: 1025860
URL: http://svn.apache.org/viewvc?rev=1025860&view=rev
Log:
Align package hierarchy for domainlist service (JAMES-1074)
Added:
james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/
james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/
- copied from r1025851, james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/
james/server/trunk/domain-api/src/test/java/org/apache/james/domainlist/
james/server/trunk/domain-api/src/test/java/org/apache/james/domainlist/api/
- copied from r1025851, james/server/trunk/domain-api/src/test/java/org/apache/james/api/domainlist/
james/server/trunk/domain-jdbc/src/main/java/org/apache/domainlist/
james/server/trunk/domain-jdbc/src/main/java/org/apache/domainlist/james/
- copied from r1025851, james/server/trunk/domain-jdbc/src/main/java/org/apache/james/domain/
james/server/trunk/domain-jdbc/src/test/java/org/apache/domainlist/
james/server/trunk/domain-jdbc/src/test/java/org/apache/domainlist/james/
- copied from r1025851, james/server/trunk/domain-jdbc/src/test/java/org/apache/james/domain/
james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/
james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/james/
james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/james/JPADomainList.java
- copied, changed from r1025851, james/server/trunk/domain-jpa/src/main/java/org/apache/james/domain/JPADomainList.java
james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/james/model/
- copied from r1025851, james/server/trunk/domain-jpa/src/main/java/org/apache/james/domain/model/
james/server/trunk/domain-jpa/src/test/java/org/apache/domainlist/
james/server/trunk/domain-jpa/src/test/java/org/apache/domainlist/james/
- copied from r1025851, james/server/trunk/domain-jpa/src/test/java/org/apache/james/domain/
james/server/trunk/domain-library/src/main/java/org/apache/domainlist/
james/server/trunk/domain-library/src/main/java/org/apache/domainlist/james/
- copied from r1025851, james/server/trunk/domain-library/src/main/java/org/apache/james/domain/
james/server/trunk/domain-xml/src/main/java/org/apache/domainlist/
james/server/trunk/domain-xml/src/main/java/org/apache/domainlist/james/
- copied from r1025851, james/server/trunk/domain-xml/src/main/java/org/apache/james/domain/
james/server/trunk/domain-xml/src/test/java/org/apache/domainlist/
james/server/trunk/domain-xml/src/test/java/org/apache/domainlist/james/
- copied from r1025851, james/server/trunk/domain-xml/src/test/java/org/apache/james/domain/
Removed:
james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/
james/server/trunk/domain-api/src/test/java/org/apache/james/api/domainlist/
james/server/trunk/domain-jdbc/src/main/java/org/apache/james/domain/
james/server/trunk/domain-jdbc/src/test/java/org/apache/james/domain/
james/server/trunk/domain-jpa/src/main/java/org/apache/james/domain/JPADomainList.java
james/server/trunk/domain-jpa/src/main/java/org/apache/james/domain/model/
james/server/trunk/domain-jpa/src/test/java/org/apache/james/domain/
james/server/trunk/domain-library/src/main/java/org/apache/james/domain/
james/server/trunk/domain-xml/src/main/java/org/apache/james/domain/
james/server/trunk/domain-xml/src/test/java/org/apache/james/domain/
Modified:
james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java
james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/DomainList.java
james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/DomainListMBean.java
james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/ManageableDomainList.java
james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/ManageableDomainListMBean.java
james/server/trunk/domain-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java
james/server/trunk/domain-jdbc/src/main/java/org/apache/domainlist/james/JDBCDomainList.java
james/server/trunk/domain-jdbc/src/test/java/org/apache/domainlist/james/JDBCDomainListTest.java
james/server/trunk/domain-jpa/pom.xml
james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/james/model/JPADomain.java
james/server/trunk/domain-jpa/src/test/java/org/apache/domainlist/james/JPADomainListTest.java
james/server/trunk/domain-library/src/main/java/org/apache/domainlist/james/AbstractDomainList.java
james/server/trunk/domain-library/src/main/java/org/apache/domainlist/james/JamesDomainList.java
james/server/trunk/domain-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java
james/server/trunk/domain-xml/src/test/java/org/apache/domainlist/james/XMLDomainListTest.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java
james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml
james/server/trunk/spring-deployment/src/main/config/james/domainlist.xml
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java?rev=1025860&r1=1025859&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/JamesMailServer.java Thu Oct 21 07:09:55 2010
@@ -32,9 +32,9 @@ import javax.mail.internet.ParseExceptio
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.domainlist.DomainList;
-import org.apache.james.api.domainlist.ManageableDomainList;
import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.domainlist.api.DomainList;
+import org.apache.james.domainlist.api.ManageableDomainList;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.lifecycle.LogEnabled;
Modified: james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/DomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/DomainList.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/DomainList.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/DomainList.java Thu Oct 21 07:09:55 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.domainlist;
+package org.apache.james.domainlist.api;
/**
Modified: james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/DomainListMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/DomainListMBean.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/DomainListMBean.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/DomainListMBean.java Thu Oct 21 07:09:55 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.domainlist;
+package org.apache.james.domainlist.api;
/**
* JMX MBean for DomainList
Modified: james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/ManageableDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/ManageableDomainList.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/ManageableDomainList.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/ManageableDomainList.java Thu Oct 21 07:09:55 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.domainlist;
+package org.apache.james.domainlist.api;
/**
* Services which allow to manage the DomainList should implement this interface.
Modified: james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/ManageableDomainListMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/ManageableDomainListMBean.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/ManageableDomainListMBean.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/domainlist/api/ManageableDomainListMBean.java Thu Oct 21 07:09:55 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.domainlist;
+package org.apache.james.domainlist.api;
/**
* JMX MBean for manage {@link ManageableDomainList}
Modified: james/server/trunk/domain-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java (original)
+++ james/server/trunk/domain-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java Thu Oct 21 07:09:55 2010
@@ -18,12 +18,14 @@
****************************************************************/
-package org.apache.james.api.domainlist;
+package org.apache.james.domainlist.api;
import java.util.LinkedList;
import java.util.List;
+import org.apache.james.domainlist.api.ManageableDomainList;
+
/**
* Simplest implementation for ManageableDomainList
*/
Modified: james/server/trunk/domain-jdbc/src/main/java/org/apache/domainlist/james/JDBCDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-jdbc/src/main/java/org/apache/domainlist/james/JDBCDomainList.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-jdbc/src/main/java/org/apache/domainlist/james/JDBCDomainList.java (original)
+++ james/server/trunk/domain-jdbc/src/main/java/org/apache/domainlist/james/JDBCDomainList.java Thu Oct 21 07:09:55 2010
@@ -19,7 +19,7 @@
-package org.apache.james.domain;
+package org.apache.domainlist.james;
import java.io.InputStream;
import java.sql.Connection;
@@ -38,6 +38,7 @@ import javax.sql.DataSource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.domainlist.james.AbstractDomainList;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.services.FileSystem;
import org.apache.james.util.sql.JDBCUtil;
@@ -225,7 +226,7 @@ public class JDBCDomainList extends Abst
};
/**
- * @see org.apache.james.domain.AbstractDomainList#getDomainListInternal()
+ * @see org.apache.domainlist.james.AbstractDomainList#getDomainListInternal()
*/
protected List<String> getDomainListInternal() {
List<String> domains = new ArrayList<String>();
@@ -263,7 +264,7 @@ public class JDBCDomainList extends Abst
}
/**
- * @see org.apache.james.api.domainlist.DomainList#containsDomain(java.lang.String)
+ * @see org.apache.james.domainlist.api.DomainList#containsDomain(java.lang.String)
*/
public boolean containsDomain(String domain) {
Connection conn = null;
@@ -294,7 +295,7 @@ public class JDBCDomainList extends Abst
}
/**
- * @see org.apache.james.domain.AbstractDomainList#addDomainInternal(java.lang.String)
+ * @see org.apache.domainlist.james.AbstractDomainList#addDomainInternal(java.lang.String)
*/
protected boolean addDomainInternal(String domain) {
Connection conn = null;
@@ -323,7 +324,7 @@ public class JDBCDomainList extends Abst
}
/**
- * @see org.apache.james.domain.AbstractDomainList#removeDomainInternal(java.lang.String)
+ * @see org.apache.domainlist.james.AbstractDomainList#removeDomainInternal(java.lang.String)
*/
protected boolean removeDomainInternal(String domain) {
Connection conn = null;
Modified: james/server/trunk/domain-jdbc/src/test/java/org/apache/domainlist/james/JDBCDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-jdbc/src/test/java/org/apache/domainlist/james/JDBCDomainListTest.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-jdbc/src/test/java/org/apache/domainlist/james/JDBCDomainListTest.java (original)
+++ james/server/trunk/domain-jdbc/src/test/java/org/apache/domainlist/james/JDBCDomainListTest.java Thu Oct 21 07:09:55 2010
@@ -19,7 +19,7 @@
-package org.apache.james.domain;
+package org.apache.domainlist.james;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -36,6 +36,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.impl.SimpleLog;
+import org.apache.domainlist.james.JDBCDomainList;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.MockDNSService;
import org.apache.james.services.MockFileSystem;
Modified: james/server/trunk/domain-jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-jpa/pom.xml?rev=1025860&r1=1025859&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-jpa/pom.xml (original)
+++ james/server/trunk/domain-jpa/pom.xml Thu Oct 21 07:09:55 2010
@@ -110,7 +110,7 @@
</property>
<property>
<name>metaDataFactory</name>
- <value>jpa(Types=org.apache.james.domain.model.JPADomain)</value>
+ <value>jpa(Types=org.apache.james.domainlist.model.JPADomain)</value>
</property>
</toolProperties>
</configuration>
Copied: james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/james/JPADomainList.java (from r1025851, james/server/trunk/domain-jpa/src/main/java/org/apache/james/domain/JPADomainList.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/james/JPADomainList.java?p2=james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/james/JPADomainList.java&p1=james/server/trunk/domain-jpa/src/main/java/org/apache/james/domain/JPADomainList.java&r1=1025851&r2=1025860&rev=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-jpa/src/main/java/org/apache/james/domain/JPADomainList.java (original)
+++ james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/james/JPADomainList.java Thu Oct 21 07:09:55 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.domain;
+package org.apache.domainlist.james;
import java.util.ArrayList;
import java.util.List;
@@ -29,7 +29,8 @@ import javax.persistence.PersistenceUnit
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.domain.model.JPADomain;
+import org.apache.domainlist.james.AbstractDomainList;
+import org.apache.domainlist.james.model.JPADomain;
import org.apache.james.lifecycle.Configurable;
/**
@@ -66,7 +67,7 @@ public class JPADomainList extends Abstr
}
/**
- * @see org.apache.james.domain.AbstractDomainList#getDomainListInternal()
+ * @see org.apache.domainlist.james.AbstractDomainList#getDomainListInternal()
*/
protected List<String> getDomainListInternal() {
List<String> domains = new ArrayList<String>();
@@ -92,7 +93,7 @@ public class JPADomainList extends Abstr
}
/**
- * @see org.apache.james.api.domainlist.DomainList#containsDomain(java.lang.String)
+ * @see org.apache.james.domainlist.api.DomainList#containsDomain(java.lang.String)
*/
public boolean containsDomain(String domain) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
@@ -114,7 +115,7 @@ public class JPADomainList extends Abstr
}
/**
- * @see org.apache.james.domain.AbstractDomainList#addDomainInternal(java.lang.String)
+ * @see org.apache.domainlist.james.AbstractDomainList#addDomainInternal(java.lang.String)
*/
protected boolean addDomainInternal(String domain) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
@@ -137,7 +138,7 @@ public class JPADomainList extends Abstr
}
/**
- * @see org.apache.james.domain.AbstractDomainList#removeDomainInternal(java.lang.String)
+ * @see org.apache.domainlist.james.AbstractDomainList#removeDomainInternal(java.lang.String)
*/
protected boolean removeDomainInternal(String domain) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
Modified: james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/james/model/JPADomain.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/james/model/JPADomain.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/james/model/JPADomain.java (original)
+++ james/server/trunk/domain-jpa/src/main/java/org/apache/domainlist/james/model/JPADomain.java Thu Oct 21 07:09:55 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.domain.model;
+package org.apache.domainlist.james.model;
import javax.persistence.Column;
import javax.persistence.Entity;
Modified: james/server/trunk/domain-jpa/src/test/java/org/apache/domainlist/james/JPADomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-jpa/src/test/java/org/apache/domainlist/james/JPADomainListTest.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-jpa/src/test/java/org/apache/domainlist/james/JPADomainListTest.java (original)
+++ james/server/trunk/domain-jpa/src/test/java/org/apache/domainlist/james/JPADomainListTest.java Thu Oct 21 07:09:55 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.domain;
+package org.apache.domainlist.james;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -25,9 +25,10 @@ import java.util.HashMap;
import junit.framework.TestCase;
import org.apache.commons.logging.impl.SimpleLog;
+import org.apache.domainlist.james.JPADomainList;
+import org.apache.domainlist.james.model.JPADomain;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.MockDNSService;
-import org.apache.james.domain.model.JPADomain;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
import org.apache.openjpa.persistence.OpenJPAPersistence;
Modified: james/server/trunk/domain-library/src/main/java/org/apache/domainlist/james/AbstractDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-library/src/main/java/org/apache/domainlist/james/AbstractDomainList.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-library/src/main/java/org/apache/domainlist/james/AbstractDomainList.java (original)
+++ james/server/trunk/domain-library/src/main/java/org/apache/domainlist/james/AbstractDomainList.java Thu Oct 21 07:09:55 2010
@@ -19,7 +19,7 @@
-package org.apache.james.domain;
+package org.apache.domainlist.james;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -31,9 +31,9 @@ import java.util.Locale;
import javax.annotation.Resource;
import org.apache.commons.logging.Log;
-import org.apache.james.api.domainlist.ManageableDomainList;
-import org.apache.james.api.domainlist.ManageableDomainListMBean;
import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.domainlist.api.ManageableDomainList;
+import org.apache.james.domainlist.api.ManageableDomainListMBean;
import org.apache.james.lifecycle.LogEnabled;
/**
@@ -145,7 +145,7 @@ public abstract class AbstractDomainList
}
/**
- * @see org.apache.james.api.domainlist.ManageableDomainList#addDomain(java.lang.String)
+ * @see org.apache.james.domainlist.api.ManageableDomainList#addDomain(java.lang.String)
*/
public synchronized boolean addDomain(String domain) {
getLogger().info("Add domain " + domain + " to DomainList");
@@ -155,7 +155,7 @@ public abstract class AbstractDomainList
}
/**
- * @see org.apache.james.api.domainlist.ManageableDomainList#removeDomain(java.lang.String)
+ * @see org.apache.james.domainlist.api.ManageableDomainList#removeDomain(java.lang.String)
*/
public synchronized boolean removeDomain(String domain) {
getLogger().info("Remove domain " + domain + " from DomainList");
Modified: james/server/trunk/domain-library/src/main/java/org/apache/domainlist/james/JamesDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-library/src/main/java/org/apache/domainlist/james/JamesDomainList.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-library/src/main/java/org/apache/domainlist/james/JamesDomainList.java (original)
+++ james/server/trunk/domain-library/src/main/java/org/apache/domainlist/james/JamesDomainList.java Thu Oct 21 07:09:55 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.domain;
+package org.apache.domainlist.james;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -26,9 +26,9 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.domainlist.DomainList;
-import org.apache.james.api.domainlist.ManageableDomainList;
-import org.apache.james.api.domainlist.ManageableDomainListMBean;
+import org.apache.james.domainlist.api.DomainList;
+import org.apache.james.domainlist.api.ManageableDomainList;
+import org.apache.james.domainlist.api.ManageableDomainListMBean;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.Disposable;
import org.apache.james.lifecycle.LogEnabled;
Modified: james/server/trunk/domain-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java (original)
+++ james/server/trunk/domain-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java Thu Oct 21 07:09:55 2010
@@ -19,7 +19,7 @@
-package org.apache.james.domain;
+package org.apache.domainlist.james;
import java.util.ArrayList;
import java.util.List;
@@ -27,6 +27,7 @@ import java.util.Locale;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.domainlist.james.AbstractDomainList;
import org.apache.james.lifecycle.Configurable;
@@ -58,7 +59,7 @@ public class XMLDomainList extends Abstr
/**
- * @see org.apache.james.domain.AbstractDomainList#getDomainListInternal()
+ * @see org.apache.domainlist.james.AbstractDomainList#getDomainListInternal()
*/
protected List<String> getDomainListInternal() {
// TODO: Remove temporary fix!
@@ -69,7 +70,7 @@ public class XMLDomainList extends Abstr
}
/**
- * @see org.apache.james.api.domainlist.DomainList#containsDomain(java.lang.String)
+ * @see org.apache.james.domainlist.api.DomainList#containsDomain(java.lang.String)
*/
public boolean containsDomain(String domains) {
return domainNames.contains(domains);
@@ -78,7 +79,7 @@ public class XMLDomainList extends Abstr
/**
* The added domains will only added in memory!
*
- * @see org.apache.james.domain.AbstractDomainList#addDomainInternal(java.lang.String)
+ * @see org.apache.domainlist.james.AbstractDomainList#addDomainInternal(java.lang.String)
*/
protected boolean addDomainInternal(String domain) {
// TODO: Remove later. Temporary fix to get sure no domains can be added to the XMLDomainList
@@ -94,7 +95,7 @@ public class XMLDomainList extends Abstr
}
/**
- * @see org.apache.james.domain.AbstractDomainList#removeDomainInternal(java.lang.String)
+ * @see org.apache.domainlist.james.AbstractDomainList#removeDomainInternal(java.lang.String)
*/
protected boolean removeDomainInternal(String domain) {
// TODO: Remove later. Temporary fix to get sure no domains can be added to the XMLDomainList
Modified: james/server/trunk/domain-xml/src/test/java/org/apache/domainlist/james/XMLDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-xml/src/test/java/org/apache/domainlist/james/XMLDomainListTest.java?rev=1025860&r1=1025851&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/domain-xml/src/test/java/org/apache/domainlist/james/XMLDomainListTest.java (original)
+++ james/server/trunk/domain-xml/src/test/java/org/apache/domainlist/james/XMLDomainListTest.java Thu Oct 21 07:09:55 2010
@@ -20,7 +20,7 @@
-package org.apache.james.domain;
+package org.apache.domainlist.james;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -30,6 +30,7 @@ import java.util.List;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.impl.SimpleLog;
+import org.apache.domainlist.james.XMLDomainList;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.MockDNSService;
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java?rev=1025860&r1=1025859&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java Thu Oct 21 07:09:55 2010
@@ -25,7 +25,7 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.domainlist.ManageableDomainList;
+import org.apache.james.domainlist.api.ManageableDomainList;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java?rev=1025860&r1=1025859&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java Thu Oct 21 07:09:55 2010
@@ -26,9 +26,9 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.domainlist.ManageableDomainList;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
+import org.apache.james.domainlist.api.ManageableDomainList;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java?rev=1025860&r1=1025859&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java Thu Oct 21 07:09:55 2010
@@ -25,7 +25,7 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.domainlist.ManageableDomainList;
+import org.apache.james.domainlist.api.ManageableDomainList;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java?rev=1025860&r1=1025859&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java Thu Oct 21 07:09:55 2010
@@ -26,7 +26,7 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.domainlist.ManageableDomainList;
+import org.apache.james.domainlist.api.ManageableDomainList;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
Modified: james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java?rev=1025860&r1=1025859&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java Thu Oct 21 07:09:55 2010
@@ -36,13 +36,13 @@ import junit.framework.TestCase;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.commons.net.telnet.TelnetClient;
-import org.apache.james.api.domainlist.ManageableDomainList;
-import org.apache.james.api.domainlist.SimpleDomainList;
import org.apache.james.services.MockJSR250Loader;
import org.apache.james.services.MockFileSystem;
import org.apache.james.services.MockMailServer;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.MockDNSService;
+import org.apache.james.domainlist.api.ManageableDomainList;
+import org.apache.james.domainlist.api.SimpleDomainList;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.mailstore.MockMailStore;
import org.apache.james.management.MockVirtualUserTableManagementImpl;
Modified: james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml?rev=1025860&r1=1025859&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/META-INF/persistence.xml Thu Oct 21 07:09:55 2010
@@ -48,7 +48,7 @@
<class>org.apache.james.userrepository.model.JPAUser</class>
<!-- DomainList -->
- <class>org.apache.james.domain.model.JPADomain</class>
+ <class>org.apache.james.domainlist.model.JPADomain</class>
<!-- VirtualUser -->
<class>org.apache.james.vut.model.JPAVirtualUser</class>
Modified: james/server/trunk/spring-deployment/src/main/config/james/domainlist.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/domainlist.xml?rev=1025860&r1=1025859&r2=1025860&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/domainlist.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/domainlist.xml Thu Oct 21 07:09:55 2010
@@ -39,7 +39,7 @@
<domainlists>
<!-- XML based DomainList implementation -->
- <domainlist class="org.apache.james.domain.XMLDomainList">
+ <domainlist class="org.apache.james.domainlist.XMLDomainList">
<domainnames>
<domainname>localhost</domainname>
</domainnames>
@@ -49,7 +49,7 @@
<!-- JPA implementation for DomainList -->
<!--
- <domainlist class="org.apache.james.domain.JPADomainList">
+ <domainlist class="org.apache.james.domainlist.JPADomainList">
<autodetect>true</autodetect>
<autodetectIP>true</autodetectIP>
</domainlist>
@@ -58,7 +58,7 @@
<!-- JDBC implementation for DomainList. This is deprecated and should not be used. -->
<!-- Use JPADomainList if you need a db backend DomainList -->
<!--
- <domainlist class="org.apache.james.domain.JDBCDomainList">
+ <domainlist class="org.apache.james.domainlist.JDBCDomainList">
<repositoryPath>db://maildb/domain</repositoryPath>
<sqlFile>file://conf/sqlResources.xml</sqlFile>
<autodetect>true</autodetect>
@@ -66,4 +66,3 @@
</domainlist>
-->
</domainlists>
-
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org