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 ba...@apache.org on 2008/08/10 15:20:43 UTC
svn commit: r684495 - in /james/server/trunk:
avalon-user-function/src/main/java/org/apache/james/vut/
avalon-user-function/src/test/java/org/apache/james/vut/
basic-user-function/src/test/java/org/apache/james/vut/
smtpserver-function/src/main/java/or...
Author: bago
Date: Sun Aug 10 06:20:41 2008
New Revision: 684495
URL: http://svn.apache.org/viewvc?rev=684495&view=rev
Log:
Repackaging for the user api/library code, in progress.
Moved vut exceptions from api.user to api.vut and api.vut.management (were in user by mistake)
Added:
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ErrorMappingException.java (contents, props changed)
- copied, changed from r684466, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/ErrorMappingException.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/InvalidMappingException.java (contents, props changed)
- copied, changed from r684466, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/InvalidMappingException.java
Removed:
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/ErrorMappingException.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/InvalidMappingException.java
Modified:
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementService.java
james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalJamesUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java
james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java Sun Aug 10 06:20:41 2008
@@ -43,7 +43,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.api.user.InvalidMappingException;
+import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.services.FileSystem;
import org.apache.james.util.JDBCUtil;
import org.apache.james.util.SqlResources;
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java Sun Aug 10 06:20:41 2008
@@ -27,7 +27,7 @@
import org.apache.avalon.framework.service.DefaultServiceManager;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.james.api.user.InvalidMappingException;
+import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.services.DNSServer;
import org.apache.james.services.FileSystem;
Modified: james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java (original)
+++ james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java Sun Aug 10 06:20:41 2008
@@ -30,8 +30,8 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.DefaultServiceManager;
-import org.apache.james.api.user.InvalidMappingException;
import org.apache.james.api.vut.VirtualUserTable;
+import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.services.DNSServer;
import org.apache.james.services.FileSystem;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java Sun Aug 10 06:20:41 2008
@@ -34,7 +34,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.api.user.ErrorMappingException;
+import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.VirtualUserTableStore;
import org.apache.james.smtpserver.CommandHandler;
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Sun Aug 10 06:20:41 2008
@@ -28,8 +28,8 @@
import java.util.Map;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.james.api.user.ErrorMappingException;
import org.apache.james.api.user.UsersRepository;
+import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.core.filter.fastfail.ValidRcptHandler;
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java Sun Aug 10 06:20:41 2008
@@ -24,9 +24,9 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.api.user.ErrorMappingException;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
+import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ErrorMappingException.java (from r684466, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/ErrorMappingException.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ErrorMappingException.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ErrorMappingException.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/api/user/ErrorMappingException.java&r1=684466&r2=684495&rev=684495&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/user/ErrorMappingException.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ErrorMappingException.java Sun Aug 10 06:20:41 2008
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.api.user;
+package org.apache.james.api.vut;
public class ErrorMappingException extends Exception {
Propchange: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ErrorMappingException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java Sun Aug 10 06:20:41 2008
@@ -23,7 +23,6 @@
import java.util.Collection;
-import org.apache.james.api.user.ErrorMappingException;
/**
* Interface which should be implemented of classes which map recipients
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/InvalidMappingException.java (from r684466, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/InvalidMappingException.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/InvalidMappingException.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/InvalidMappingException.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/api/user/InvalidMappingException.java&r1=684466&r2=684495&rev=684495&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/user/InvalidMappingException.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/InvalidMappingException.java Sun Aug 10 06:20:41 2008
@@ -19,7 +19,7 @@
-package org.apache.james.api.user;
+package org.apache.james.api.vut.management;
public class InvalidMappingException extends Exception {
Propchange: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/InvalidMappingException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java Sun Aug 10 06:20:41 2008
@@ -24,7 +24,6 @@
import java.util.Collection;
import java.util.Map;
-import org.apache.james.api.user.InvalidMappingException;
import org.apache.james.api.vut.VirtualUserTable;
public interface VirtualUserTableManagement extends VirtualUserTable{
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementService.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementService.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementService.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementService.java Sun Aug 10 06:20:41 2008
@@ -24,7 +24,6 @@
import java.util.Collection;
import java.util.Map;
-import org.apache.james.api.user.InvalidMappingException;
public interface VirtualUserTableManagementService {
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagement.java Sun Aug 10 06:20:41 2008
@@ -27,9 +27,9 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.api.user.InvalidMappingException;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.VirtualUserTableStore;
+import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.api.vut.management.VirtualUserTableManagementMBean;
import org.apache.james.api.vut.management.VirtualUserTableManagementService;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java Sun Aug 10 06:20:41 2008
@@ -25,9 +25,9 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.james.api.user.ErrorMappingException;
import org.apache.james.api.user.JamesUser;
import org.apache.james.api.user.User;
+import org.apache.james.api.vut.ErrorMappingException;
import java.util.ArrayList;
import java.util.Collection;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultVirtualUserTable.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultVirtualUserTable.java Sun Aug 10 06:20:41 2008
@@ -28,9 +28,9 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.api.user.ErrorMappingException;
-import org.apache.james.api.user.InvalidMappingException;
+import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTableStore;
+import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.api.vut.management.VirtualUserTableManagement;
/**
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalJamesUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalJamesUsersRepository.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalJamesUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/LocalJamesUsersRepository.java Sun Aug 10 06:20:41 2008
@@ -19,7 +19,7 @@
package org.apache.james.userrepository;
-import org.apache.james.api.user.ErrorMappingException;
+import org.apache.james.api.vut.ErrorMappingException;
import java.util.Collection;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/vut/AbstractVirtualUserTable.java Sun Aug 10 06:20:41 2008
@@ -38,9 +38,9 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.api.user.ErrorMappingException;
-import org.apache.james.api.user.InvalidMappingException;
+import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
+import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.api.vut.management.VirtualUserTableManagement;
import org.apache.james.services.DNSServer;
import org.apache.james.services.DomainList;
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java?rev=684495&r1=684494&r2=684495&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java Sun Aug 10 06:20:41 2008
@@ -24,9 +24,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.james.api.user.ErrorMappingException;
-import org.apache.james.api.user.InvalidMappingException;
+import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
+import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.api.vut.management.VirtualUserTableManagement;
import org.apache.james.vut.VirtualUserTableUtil;
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=684495&r1=684494&r2=684495&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 Sun Aug 10 06:20:41 2008
@@ -28,9 +28,9 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.james.api.user.ErrorMappingException;
-import org.apache.james.api.user.InvalidMappingException;
+import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
+import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.dnsserver.TemporaryResolutionException;
import org.apache.james.services.DNSServer;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org