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 10:28:00 UTC

svn commit: r1025881 - in /james/server/trunk: domainlist-jdbc/src/main/java/org/apache/james/domainlist/ domainlist-jdbc/src/main/java/org/apache/james/domainlist/jdbc/ domainlist-jdbc/src/test/java/org/apache/james/domainlist/ domainlist-jdbc/src/tes...

Author: eric
Date: Thu Oct 21 08:27:59 2010
New Revision: 1025881

URL: http://svn.apache.org/viewvc?rev=1025881&view=rev
Log:
Align packages hierarchy for domainlist service - Should be correct now, sorry for the mess (JAMES1074)

Added:
    james/server/trunk/domainlist-jdbc/src/main/java/org/apache/james/domainlist/jdbc/
    james/server/trunk/domainlist-jdbc/src/main/java/org/apache/james/domainlist/jdbc/JDBCDomainList.java
      - copied, changed from r1025877, james/server/trunk/domainlist-jdbc/src/main/java/org/apache/james/domainlist/JDBCDomainList.java
    james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/jdbc/
    james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/jdbc/JDBCDomainListTest.java
      - copied, changed from r1025877, james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/JDBCDomainListTest.java
    james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/
    james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
      - copied, changed from r1025879, james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/JPADomainList.java
    james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/model/
      - copied from r1025879, james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/model/
    james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/jpa/
    james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
      - copied, changed from r1025879, james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/JPADomainListTest.java
    james/server/trunk/domainlist-xml/src/main/java/org/apache/james/domainlist/
    james/server/trunk/domainlist-xml/src/main/java/org/apache/james/domainlist/xml/
      - copied from r1025862, james/server/trunk/domainlist-xml/src/main/java/org/apache/domainlist/james/
    james/server/trunk/domainlist-xml/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
      - copied, changed from r1025875, james/server/trunk/domainlist-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java
    james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/
    james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/xml/
      - copied from r1025862, james/server/trunk/domainlist-xml/src/test/java/org/apache/domainlist/james/
Removed:
    james/server/trunk/domainlist-jdbc/src/main/java/org/apache/james/domainlist/JDBCDomainList.java
    james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/JDBCDomainListTest.java
    james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/JPADomainList.java
    james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/model/
    james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/JPADomainListTest.java
    james/server/trunk/domainlist-xml/src/main/java/org/apache/domainlist/james/
    james/server/trunk/domainlist-xml/src/test/java/org/apache/domainlist/james/
Modified:
    james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java
    james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java

Copied: james/server/trunk/domainlist-jdbc/src/main/java/org/apache/james/domainlist/jdbc/JDBCDomainList.java (from r1025877, james/server/trunk/domainlist-jdbc/src/main/java/org/apache/james/domainlist/JDBCDomainList.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-jdbc/src/main/java/org/apache/james/domainlist/jdbc/JDBCDomainList.java?p2=james/server/trunk/domainlist-jdbc/src/main/java/org/apache/james/domainlist/jdbc/JDBCDomainList.java&p1=james/server/trunk/domainlist-jdbc/src/main/java/org/apache/james/domainlist/JDBCDomainList.java&r1=1025877&r2=1025881&rev=1025881&view=diff
==============================================================================
--- james/server/trunk/domainlist-jdbc/src/main/java/org/apache/james/domainlist/JDBCDomainList.java (original)
+++ james/server/trunk/domainlist-jdbc/src/main/java/org/apache/james/domainlist/jdbc/JDBCDomainList.java Thu Oct 21 08:27:59 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.domainlist;
+package org.apache.james.domainlist.jdbc;
 
 import java.io.InputStream;
 import java.sql.Connection;

Copied: james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/jdbc/JDBCDomainListTest.java (from r1025877, james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/JDBCDomainListTest.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/jdbc/JDBCDomainListTest.java?p2=james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/jdbc/JDBCDomainListTest.java&p1=james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/JDBCDomainListTest.java&r1=1025877&r2=1025881&rev=1025881&view=diff
==============================================================================
--- james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/JDBCDomainListTest.java (original)
+++ james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/jdbc/JDBCDomainListTest.java Thu Oct 21 08:27:59 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.domainlist;
+package org.apache.james.domainlist.jdbc;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -38,7 +38,7 @@ import org.apache.commons.configuration.
 import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.dnsservice.api.DNSService;
 import org.apache.james.dnsservice.api.MockDNSService;
-import org.apache.james.domainlist.JDBCDomainList;
+import org.apache.james.domainlist.jdbc.JDBCDomainList;
 import org.apache.james.services.MockFileSystem;
 import org.apache.james.util.TestUtil;
 import org.apache.james.util.sql.JDBCUtil;

Copied: james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java (from r1025879, james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/JPADomainList.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java?p2=james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java&p1=james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/JPADomainList.java&r1=1025879&r2=1025881&rev=1025881&view=diff
==============================================================================
--- james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/JPADomainList.java (original)
+++ james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java Thu Oct 21 08:27:59 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.domainlist;
+package org.apache.james.domainlist.jpa;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,8 +29,8 @@ import javax.persistence.PersistenceUnit
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.james.domainlist.jpa.model.JPADomain;
 import org.apache.james.domainlist.lib.AbstractDomainList;
-import org.apache.james.domainlist.model.JPADomain;
 import org.apache.james.lifecycle.Configurable;
 
 /**

Modified: james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java?rev=1025881&r1=1025879&r2=1025881&view=diff
==============================================================================
--- james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java (original)
+++ james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/jpa/model/JPADomain.java Thu Oct 21 08:27:59 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.domainlist.model;
+package org.apache.james.domainlist.jpa.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

Copied: james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java (from r1025879, james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/JPADomainListTest.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java?p2=james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java&p1=james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/JPADomainListTest.java&r1=1025879&r2=1025881&rev=1025881&view=diff
==============================================================================
--- james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/JPADomainListTest.java (original)
+++ james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java Thu Oct 21 08:27:59 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.domainlist;
+package org.apache.james.domainlist.jpa;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -27,8 +27,8 @@ import junit.framework.TestCase;
 import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.dnsservice.api.DNSService;
 import org.apache.james.dnsservice.api.MockDNSService;
-import org.apache.james.domainlist.JPADomainList;
-import org.apache.james.domainlist.model.JPADomain;
+import org.apache.james.domainlist.jpa.JPADomainList;
+import org.apache.james.domainlist.jpa.model.JPADomain;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 

Copied: james/server/trunk/domainlist-xml/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java (from r1025875, james/server/trunk/domainlist-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-xml/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java?p2=james/server/trunk/domainlist-xml/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java&p1=james/server/trunk/domainlist-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java&r1=1025875&r2=1025881&rev=1025881&view=diff
==============================================================================
--- james/server/trunk/domainlist-xml/src/main/java/org/apache/domainlist/james/XMLDomainList.java (original)
+++ james/server/trunk/domainlist-xml/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java Thu Oct 21 08:27:59 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.domainlist.james;
+package org.apache.james.domainlist.xml;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java?rev=1025881&r1=1025862&r2=1025881&view=diff
==============================================================================
--- james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java (original)
+++ james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java Thu Oct 21 08:27:59 2010
@@ -20,7 +20,7 @@
 
 
 
-package org.apache.domainlist.james;
+package org.apache.james.domainlist.xml;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -30,9 +30,9 @@ 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;
+import org.apache.james.domainlist.xml.XMLDomainList;
 
 import junit.framework.TestCase;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org