svn commit: r726788 - in /james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets: AbstractVirtualUserTable.java AbstractVirtualUserTableMailet.java UsersRepositoryAliasingForwarding.java VirtualUserTable.java

[rd...@apache.org]

Author: rdonkin
Date: Mon Dec 15 12:03:52 2008
New Revision: 726788

URL: http://svn.apache.org/viewvc?rev=726788&view=rev
Log:
Renamed due to name conflict with existing mailet

Added:
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java   (contents, props changed)
      - copied, changed from r726772, james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
Removed:
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
Modified:
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java

Copied: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java (from r726772, james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java?p2=james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java&p1=james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java&r1=726772&r2=726788&rev=726788&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java Mon Dec 15 12:03:52 2008
@@ -40,7 +40,7 @@
  * 
  *
  */
-public abstract class AbstractVirtualUserTable extends GenericMailet{
+public abstract class AbstractVirtualUserTableMailet extends GenericMailet{
     
     /*
      * (non-Javadoc)

Propchange: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

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=726788&r1=726787&r2=726788&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 Mon Dec 15 12:03:52 2008
@@ -21,6 +21,12 @@
 
 package org.apache.james.transport.mailets;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.Constants;
@@ -28,19 +34,7 @@
 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.base.GenericMailet;
-import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
-import org.apache.mailet.base.RFC2822Headers;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Vector;
 
 /**
  * Receives a Mail from JamesSpoolManager and takes care of delivery of the
@@ -57,7 +51,7 @@
  * <usersRepository>LocalAdmins</usersRepository>: specific users repository
  * name. Default to empty. If empty does lookup the default userRepository.
  */
-public class UsersRepositoryAliasingForwarding extends AbstractVirtualUserTable {
+public class UsersRepositoryAliasingForwarding extends AbstractVirtualUserTableMailet {
 
     /**
      * The user repository for this mail server. Contains all the users with

Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java?rev=726788&r1=726787&r2=726788&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java Mon Dec 15 12:03:52 2008
@@ -42,7 +42,7 @@
  * eg. <virtualusertable>DefaultVirtualUserTable</virtualusertable>
  *
  */
-public class VirtualUserTable extends AbstractVirtualUserTable {
+public class VirtualUserTable extends AbstractVirtualUserTableMailet {
     private org.apache.james.api.vut.VirtualUserTable vut;
 
     /*



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