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 2011/04/06 17:47:52 UTC
svn commit: r1089503 - in /james/server/trunk:
data-api/src/main/java/org/apache/james/user/api/model/
data-library/src/main/java/org/apache/james/rrt/lib/
data-library/src/main/java/org/apache/james/user/lib/
data-library/src/test/java/org/apache/jame...
Author: eric
Date: Wed Apr 6 15:47:51 2011
New Revision: 1089503
URL: http://svn.apache.org/viewvc?rev=1089503&view=rev
Log:
Update java classes content class/package naming change + Rename 3 mailets (JAMES-1218)
Added:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
- copied, changed from r1089492, james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTableMailet.java
- copied, changed from r1089471, james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java
- copied, changed from r1089492, james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java
- copied, changed from r1089496, james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
- copied, changed from r1089492, james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java
Removed:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java
Modified:
james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/JamesUser.java
james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java
james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
james/server/trunk/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
james/server/trunk/file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
james/server/trunk/file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
james/server/trunk/jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
james/server/trunk/jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
james/server/trunk/jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java
james/server/trunk/jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/trunk/src/site/xdoc/config-mailetcontainer.xml
james/server/trunk/src/site/xdoc/config-smtp-lmtp.xml
james/server/trunk/src/site/xdoc/dev-build.xml
james/server/trunk/src/site/xdoc/dev.xml
james/server/trunk/src/site/xdoc/index.xml
james/server/trunk/src/site/xdoc/manage.xml
james/server/trunk/src/site/xdoc/monitor-jmx.xml
james/server/trunk/src/site/xdoc/monitor-logging.xml
Modified: james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/JamesUser.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/JamesUser.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/JamesUser.java (original)
+++ james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/JamesUser.java Wed Apr 6 15:47:51 2011
@@ -25,7 +25,7 @@ import org.apache.mailet.MailAddress;
* Interface for objects representing users of an email/ messaging system.
*
* @deprecated Just use the User interface for Users. Forwarding and Aliasing
- * should get done via VirtualUserTable
+ * should get done via RecipientRewriteTable
*/
@Deprecated
public interface JamesUser extends User {
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java Wed Apr 6 15:47:51 2011
@@ -200,7 +200,7 @@ public abstract class AbstractRecipientR
}
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#addRegexMapping(java.lang.String,
+ * @see org.apache.james.rrt.api.ManageableRecipientRewriteTable#addRegexMapping(java.lang.String,
* java.lang.String, java.lang.String)
*/
public void addRegexMapping(String user, String domain, String regex) throws RecipientRewriteTableException {
@@ -217,7 +217,7 @@ public abstract class AbstractRecipientR
}
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeRegexMapping(java.lang.String,
+ * @see org.apache.james.rrt.api.ManageableRecipientRewriteTable#removeRegexMapping(java.lang.String,
* java.lang.String, java.lang.String)
*/
public void removeRegexMapping(String user, String domain, String regex) throws RecipientRewriteTableException {
@@ -226,7 +226,7 @@ public abstract class AbstractRecipientR
}
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#addAddressMapping(java.lang.String,
+ * @see org.apache.james.rrt.api.ManageableRecipientRewriteTable#addAddressMapping(java.lang.String,
* java.lang.String, java.lang.String)
*/
public void addAddressMapping(String user, String domain, String address) throws RecipientRewriteTableException {
@@ -249,7 +249,7 @@ public abstract class AbstractRecipientR
}
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeAddressMapping(java.lang.String,
+ * @see org.apache.james.rrt.api.ManageableRecipientRewriteTable#removeAddressMapping(java.lang.String,
* java.lang.String, java.lang.String)
*/
public void removeAddressMapping(String user, String domain, String address) throws RecipientRewriteTableException {
@@ -265,7 +265,7 @@ public abstract class AbstractRecipientR
}
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#addErrorMapping(java.lang.String,
+ * @see org.apache.james.rrt.api.ManageableRecipientRewriteTable#addErrorMapping(java.lang.String,
* java.lang.String, java.lang.String)
*/
public void addErrorMapping(String user, String domain, String error) throws RecipientRewriteTableException {
@@ -276,7 +276,7 @@ public abstract class AbstractRecipientR
}
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeErrorMapping(java.lang.String,
+ * @see org.apache.james.rrt.api.ManageableRecipientRewriteTable#removeErrorMapping(java.lang.String,
* java.lang.String, java.lang.String)
*/
public void removeErrorMapping(String user, String domain, String error) throws RecipientRewriteTableException {
@@ -285,7 +285,7 @@ public abstract class AbstractRecipientR
}
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#addMapping(java.lang.String,
+ * @see org.apache.james.rrt.api.ManageableRecipientRewriteTable#addMapping(java.lang.String,
* java.lang.String, java.lang.String)
*/
public void addMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
@@ -307,7 +307,7 @@ public abstract class AbstractRecipientR
}
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeMapping(java.lang.String,
+ * @see org.apache.james.rrt.api.ManageableRecipientRewriteTable#removeMapping(java.lang.String,
* java.lang.String, java.lang.String)
*/
public void removeMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
@@ -329,7 +329,7 @@ public abstract class AbstractRecipientR
}
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#getAllMappings()
+ * @see org.apache.james.rrt.api.ManageableRecipientRewriteTable#getAllMappings()
*/
public Map<String, Collection<String>> getAllMappings() throws RecipientRewriteTableException {
int count = 0;
@@ -343,7 +343,7 @@ public abstract class AbstractRecipientR
}
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#getUserDomainMappings(java.lang.String,
+ * @see org.apache.james.rrt.api.ManageableRecipientRewriteTable#getUserDomainMappings(java.lang.String,
* java.lang.String)
*/
public Collection<String> getUserDomainMappings(String user, String domain) throws RecipientRewriteTableException {
@@ -351,7 +351,7 @@ public abstract class AbstractRecipientR
}
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#addAliasDomainMapping(java.lang.String,
+ * @see org.apache.james.rrt.api.ManageableRecipientRewriteTable#addAliasDomainMapping(java.lang.String,
* java.lang.String)
*/
public void addAliasDomainMapping(String aliasDomain, String realDomain) throws RecipientRewriteTableException {
@@ -361,7 +361,7 @@ public abstract class AbstractRecipientR
/**
* @return
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeAliasDomainMapping(java.lang.String,
+ * @see org.apache.james.rrt.api.ManageableRecipientRewriteTable#removeAliasDomainMapping(java.lang.String,
* java.lang.String)
*/
public void removeAliasDomainMapping(String aliasDomain, String realDomain) throws RecipientRewriteTableException {
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java Wed Apr 6 15:47:51 2011
@@ -31,7 +31,7 @@ import org.apache.james.rrt.api.Recipien
import org.apache.james.rrt.api.RecipientRewriteTableManagementMBean;
/**
- * Management for VirtualUserTables
+ * Management for RecipientRewriteTables
*/
public class RecipientRewriteTableManagement extends StandardMBean implements RecipientRewriteTableManagementMBean {
@@ -42,7 +42,7 @@ public class RecipientRewriteTableManage
private RecipientRewriteTable vut;
@Resource(name = "recipientrewritetable")
- public void setManageableVirtualUserTable(RecipientRewriteTable vut) {
+ public void setManageableRecipientRewriteTable(RecipientRewriteTable vut) {
this.vut = vut;
}
@@ -50,7 +50,7 @@ public class RecipientRewriteTableManage
* (non-Javadoc)
*
* @see
- * org.apache.james.vut.api.VirtualUserTableManagementMBean#addRegexMapping
+ * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#addRegexMapping
* (java.lang.String, java.lang.String, java.lang.String)
*/
public void addRegexMapping(String user, String domain, String regex) throws Exception {
@@ -65,7 +65,7 @@ public class RecipientRewriteTableManage
* (non-Javadoc)
*
* @see
- * org.apache.james.vut.api.VirtualUserTableManagementMBean#removeRegexMapping
+ * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#removeRegexMapping
* (java.lang.String, java.lang.String, java.lang.String)
*/
public void removeRegexMapping(String user, String domain, String regex) throws Exception {
@@ -81,7 +81,7 @@ public class RecipientRewriteTableManage
* (non-Javadoc)
*
* @see
- * org.apache.james.vut.api.VirtualUserTableManagementMBean#addAddressMapping
+ * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#addAddressMapping
* (java.lang.String, java.lang.String, java.lang.String)
*/
public void addAddressMapping(String user, String domain, String address) throws Exception {
@@ -97,7 +97,7 @@ public class RecipientRewriteTableManage
* (non-Javadoc)
*
* @see
- * org.apache.james.vut.api.VirtualUserTableManagementMBean#removeAddressMapping
+ * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#removeAddressMapping
* (java.lang.String, java.lang.String, java.lang.String)
*/
public void removeAddressMapping(String user, String domain, String address) throws Exception {
@@ -113,7 +113,7 @@ public class RecipientRewriteTableManage
* (non-Javadoc)
*
* @see
- * org.apache.james.vut.api.VirtualUserTableManagementMBean#addErrorMapping
+ * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#addErrorMapping
* (java.lang.String, java.lang.String, java.lang.String)
*/
public void addErrorMapping(String user, String domain, String error) throws Exception {
@@ -129,7 +129,7 @@ public class RecipientRewriteTableManage
* (non-Javadoc)
*
* @see
- * org.apache.james.vut.api.VirtualUserTableManagementMBean#removeErrorMapping
+ * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#removeErrorMapping
* (java.lang.String, java.lang.String, java.lang.String)
*/
public void removeErrorMapping(String user, String domain, String error) throws Exception {
@@ -144,7 +144,7 @@ public class RecipientRewriteTableManage
/*
* (non-Javadoc)
*
- * @see org.apache.james.vut.api.VirtualUserTableManagementMBean#
+ * @see org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#
* getUserDomainMappings(java.lang.String, java.lang.String)
*/
public Collection<String> getUserDomainMappings(String user, String domain) throws Exception {
@@ -160,7 +160,7 @@ public class RecipientRewriteTableManage
* (non-Javadoc)
*
* @see
- * org.apache.james.vut.api.VirtualUserTableManagementMBean#addMapping(java
+ * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#addMapping(java
* .lang.String, java.lang.String, java.lang.String)
*/
public void addMapping(String user, String domain, String mapping) throws Exception {
@@ -176,7 +176,7 @@ public class RecipientRewriteTableManage
* (non-Javadoc)
*
* @see
- * org.apache.james.vut.api.VirtualUserTableManagementMBean#removeMapping
+ * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#removeMapping
* (java.lang.String, java.lang.String, java.lang.String)
*/
public void removeMapping(String user, String domain, String mapping) throws Exception {
@@ -192,7 +192,7 @@ public class RecipientRewriteTableManage
* (non-Javadoc)
*
* @see
- * org.apache.james.vut.api.VirtualUserTableManagementMBean#getAllMappings()
+ * org.apache.james.rrt.api.RecipientRewriteTableManagementMBean#getAllMappings()
*/
public Map<String, Collection<String>> getAllMappings() throws Exception {
try {
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java Wed Apr 6 15:47:51 2011
@@ -32,7 +32,7 @@ import org.apache.james.rrt.api.Recipien
import org.apache.mailet.MailAddress;
/**
- * This helper class contains methods for the VirtualUserTable implementations
+ * This helper class contains methods for the RecipientRewriteTable implementations
*/
public class RecipientRewriteTableUtil {
@@ -41,7 +41,7 @@ public class RecipientRewriteTableUtil {
// @deprecated QUERY is deprecated - SQL queries are now located in
// sqlResources.xml
- public static String QUERY = "select VirtualUserTable.target_address from VirtualUserTable, VirtualUserTable as VUTDomains where (VirtualUserTable.user like ? or VirtualUserTable.user like '\\%') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain like '%*%' and VUTDomains.domain like ?)) order by concat(VirtualUserTable.user,'@',VirtualUserTable.domain) desc limit 1";
+ public static String QUERY = "select RecipientRewriteTable.target_address from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where (RecipientRewriteTable.user like ? or RecipientRewriteTable.user like '\\%') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain like '%*%' and VUTDomains.domain like ?)) order by concat(RecipientRewriteTable.user,'@',RecipientRewriteTable.domain) desc limit 1";
/**
* Processes regex virtual user mapping
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java Wed Apr 6 15:47:51 2011
@@ -184,7 +184,7 @@ public abstract class AbstractJamesUsers
/*
* (non-Javadoc)
*
- * @see org.apache.james.vut.api.VirtualUserTable#getAllMappings()
+ * @see org.apache.james.rrt.api.RecipientRewriteTable#getAllMappings()
*/
public Map<String, Collection<String>> getAllMappings() throws RecipientRewriteTableException {
Map<String, Collection<String>> mappings = new HashMap<String, Collection<String>>();
@@ -221,7 +221,7 @@ public abstract class AbstractJamesUsers
* (non-Javadoc)
*
* @see
- * org.apache.james.vut.api.VirtualUserTable#getUserDomainMappings(java.
+ * org.apache.james.rrt.api.RecipientRewriteTable#getUserDomainMappings(java.
* lang.String, java.lang.String)
*/
public Collection<String> getUserDomainMappings(String user, String domain) throws RecipientRewriteTableException {
@@ -229,51 +229,51 @@ public abstract class AbstractJamesUsers
}
public void addRegexMapping(String user, String domain, String regex) throws RecipientRewriteTableException {
- throw new RecipientRewriteTableException("Read-Only VirtualUserTable");
+ throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
}
public void removeRegexMapping(String user, String domain, String regex) throws RecipientRewriteTableException {
- throw new RecipientRewriteTableException("Read-Only VirtualUserTable");
+ throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
}
public void addAddressMapping(String user, String domain, String address) throws RecipientRewriteTableException {
- throw new RecipientRewriteTableException("Read-Only VirtualUserTable");
+ throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
}
public void removeAddressMapping(String user, String domain, String address) throws RecipientRewriteTableException {
- throw new RecipientRewriteTableException("Read-Only VirtualUserTable");
+ throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
}
public void addErrorMapping(String user, String domain, String error) throws RecipientRewriteTableException {
- throw new RecipientRewriteTableException("Read-Only VirtualUserTable");
+ throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
}
public void removeErrorMapping(String user, String domain, String error) throws RecipientRewriteTableException {
- throw new RecipientRewriteTableException("Read-Only VirtualUserTable");
+ throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
}
public void addMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
- throw new RecipientRewriteTableException("Read-Only VirtualUserTable");
+ throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
}
public void removeMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
- throw new RecipientRewriteTableException("Read-Only VirtualUserTable");
+ throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
}
public void addAliasDomainMapping(String aliasDomain, String realDomain) throws RecipientRewriteTableException {
- throw new RecipientRewriteTableException("Read-Only VirtualUserTable");
+ throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
}
public void removeAliasDomainMapping(String aliasDomain, String realDomain) throws RecipientRewriteTableException {
- throw new RecipientRewriteTableException("Read-Only VirtualUserTable");
+ throw new RecipientRewriteTableException("Read-Only RecipientRewriteTable");
}
Modified: james/server/trunk/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java (original)
+++ james/server/trunk/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java Wed Apr 6 15:47:51 2011
@@ -45,7 +45,7 @@ public abstract class AbstractRecipientR
protected final static int ALIASDOMAIN_TYPE = 3;
protected void setUp() throws Exception {
- virtualUserTable = getVirtualUserTable();
+ virtualUserTable = getRecipientRewriteTable();
}
protected void tearDown() throws Exception {
@@ -142,7 +142,7 @@ public abstract class AbstractRecipientR
/*
* TEMPORARILY REMOVE JDBC specific test String invalidAddress=
* ".*@localhost2:"; boolean catched = false; if (virtualUserTable
- * instanceof JDBCVirtualUserTable) { try {
+ * instanceof JDBCRecipientRewriteTable) { try {
* assertTrue("Added virtual mapping", addMapping(user, domain,
* invalidAddress, ADDRESS_TYPE)); } catch (InvalidMappingException
* e) { catched = true; }
@@ -283,7 +283,7 @@ public abstract class AbstractRecipientR
}
- protected abstract AbstractRecipientRewriteTable getVirtualUserTable() throws Exception;
+ protected abstract AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception;
protected abstract boolean addMapping(String user, String domain, String mapping, int type) throws RecipientRewriteTableException;
Modified: james/server/trunk/file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java (original)
+++ james/server/trunk/file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java Wed Apr 6 15:47:51 2011
@@ -44,7 +44,7 @@ public class XMLRecipientRewriteTableTes
super.setUp();
}
- protected AbstractRecipientRewriteTable getVirtualUserTable() throws Exception {
+ protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
XMLRecipientRewriteTable virtualUserTable = new XMLRecipientRewriteTable();
virtualUserTable.setLog(LoggerFactory.getLogger("MockLog"));
return virtualUserTable;
Modified: james/server/trunk/file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java (original)
+++ james/server/trunk/file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java Wed Apr 6 15:47:51 2011
@@ -89,7 +89,7 @@ public class UsersFileRepositoryTest ext
}
}
- public void testVirtualUserTableImpl() throws Exception {
+ public void testRecipientRewriteTableImpl() throws Exception {
String username = "test";
String password = "pass";
String alias = "alias";
Modified: james/server/trunk/jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java (original)
+++ james/server/trunk/jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java Wed Apr 6 15:47:51 2011
@@ -55,7 +55,7 @@ public class JDBCRecipientRewriteTable e
private DataSource dataSource = null;
private String dataSourceName = null;
- private String tableName = "VirtualUserTable";
+ private String tableName = "RecipientRewriteTable";
/**
* Contains all of the sql strings for this component.
@@ -75,7 +75,7 @@ public class JDBCRecipientRewriteTable e
*/
private final JDBCUtil theJDBCUtil = new JDBCUtil() {
protected void delegatedLog(String logString) {
- getLogger().debug("JDBCVirtualUserTable: " + logString);
+ getLogger().debug("JDBCRecipientRewriteTable: " + logString);
}
};
Modified: james/server/trunk/jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java (original)
+++ james/server/trunk/jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java Wed Apr 6 15:47:51 2011
@@ -34,15 +34,15 @@ import org.slf4j.LoggerFactory;
public class JDBCRecipientRewriteTableTest extends AbstractRecipientRewriteTableTest {
/**
- * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest#getVirtualUserTable()
+ * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest#getRecipientRewriteTable()
*/
- protected AbstractRecipientRewriteTable getVirtualUserTable() throws Exception {
+ protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
JDBCRecipientRewriteTable virtualUserTable = new JDBCRecipientRewriteTable();
virtualUserTable.setLog(LoggerFactory.getLogger("MockLog"));
virtualUserTable.setDataSource(getDataSource());
virtualUserTable.setFileSystem(new MockFileSystem());
DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder();
- defaultConfiguration.addProperty("[@destinationURL]", "db://maildb/VirtualUserTable");
+ defaultConfiguration.addProperty("[@destinationURL]", "db://maildb/RecipientRewriteTable");
defaultConfiguration.addProperty("sqlFile", "file://conf/sqlResources.xml");
virtualUserTable.configure(defaultConfiguration);
virtualUserTable.init();
Modified: james/server/trunk/jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java Wed Apr 6 15:47:51 2011
@@ -100,7 +100,7 @@ public class JamesUsersJdbcRepositoryTes
LifecycleUtil.dispose(this.usersRepository);
}
- public void testVirtualUserTableImpl() throws Exception {
+ public void testRecipientRewriteTableImpl() throws Exception {
String username = "test";
String password = "pass";
String alias = "alias";
Modified: james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java (original)
+++ james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java Wed Apr 6 15:47:51 2011
@@ -259,8 +259,8 @@ public class JPARecipientRewriteTable ex
final EntityTransaction transaction = entityManager.getTransaction();
try {
transaction.begin();
- JPARecipientRewrite jpaVirtualUser = new JPARecipientRewrite(user, domain, mapping);
- entityManager.persist(jpaVirtualUser);
+ JPARecipientRewrite jpaRecipientRewrite = new JPARecipientRewrite(user, domain, mapping);
+ entityManager.persist(jpaRecipientRewrite);
transaction.commit();
} catch (PersistenceException e) {
getLogger().debug("Failed to save virtual user", e);
Modified: james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java
URL: http://svn.apache.org/viewvc/james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java (original)
+++ james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java Wed Apr 6 15:47:51 2011
@@ -29,19 +29,19 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
/**
- * VirtualUserTable class for the James Virtual User Table to be used for JPA
+ * RecipientRewriteTable class for the James Virtual User Table to be used for JPA
* persistence.
*/
-@Entity(name = "JamesVirtualUserTable")
+@Entity(name = "JamesRecipientRewriteTable")
@Table(name = "JAMES_VIRTUAL_USER_TABLE")
-@NamedQueries({ @NamedQuery(name = "selectMappings", query = "SELECT vut FROM JamesVirtualUserTable vut WHERE (vut.user LIKE :user OR vut.user='*') and (vut.domain like :domain or vut.domain='*') ORDER BY vut.domain DESC"),
- @NamedQuery(name = "selectUserDomainMapping", query = "SELECT vut FROM JamesVirtualUserTable vut WHERE vut.user=:user AND vut.domain=:domain"), @NamedQuery(name = "selectAllMappings", query = "SELECT vut FROM JamesVirtualUserTable vut"),
- @NamedQuery(name = "deleteMapping", query = "DELETE FROM JamesVirtualUserTable vut WHERE vut.user=:user AND vut.domain=:domain AND vut.targetAddress=:targetAddress"),
- @NamedQuery(name = "updateMapping", query = "UPDATE JamesVirtualUserTable vut SET vut.targetAddress=:targetAddress WHERE vut.user=:user AND vut.domain=:domain") })
-@IdClass(JPARecipientRewrite.VirtualUserTableId.class)
+@NamedQueries({ @NamedQuery(name = "selectMappings", query = "SELECT vut FROM JamesRecipientRewriteTable vut WHERE (vut.user LIKE :user OR vut.user='*') and (vut.domain like :domain or vut.domain='*') ORDER BY vut.domain DESC"),
+ @NamedQuery(name = "selectUserDomainMapping", query = "SELECT vut FROM JamesRecipientRewriteTable vut WHERE vut.user=:user AND vut.domain=:domain"), @NamedQuery(name = "selectAllMappings", query = "SELECT vut FROM JamesRecipientRewriteTable vut"),
+ @NamedQuery(name = "deleteMapping", query = "DELETE FROM JamesRecipientRewriteTable vut WHERE vut.user=:user AND vut.domain=:domain AND vut.targetAddress=:targetAddress"),
+ @NamedQuery(name = "updateMapping", query = "UPDATE JamesRecipientRewriteTable vut SET vut.targetAddress=:targetAddress WHERE vut.user=:user AND vut.domain=:domain") })
+@IdClass(JPARecipientRewrite.RecipientRewriteTableId.class)
public class JPARecipientRewrite {
- public static class VirtualUserTableId implements Serializable {
+ public static class RecipientRewriteTableId implements Serializable {
private static final long serialVersionUID = 1L;
@@ -49,7 +49,7 @@ public class JPARecipientRewrite {
private String domain;
- public VirtualUserTableId() {
+ public RecipientRewriteTableId() {
}
@Override
@@ -69,7 +69,7 @@ public class JPARecipientRewrite {
return false;
if (getClass() != obj.getClass())
return false;
- final VirtualUserTableId other = (VirtualUserTableId) obj;
+ final RecipientRewriteTableId other = (RecipientRewriteTableId) obj;
if (!user.equals(other.user))
return false;
if (!domain.equals(other.domain))
@@ -87,7 +87,7 @@ public class JPARecipientRewrite {
/**
* The name of the domain. Column name is chosen to be compatible with the
- * JDBCVirtualUserTableList.
+ * JDBCRecipientRewriteTableList.
*/
@Id
@Column(name = "DOMAIN_NAME", nullable = false, length = 100)
@@ -95,13 +95,13 @@ public class JPARecipientRewrite {
/**
* The target address. column name is chosen to be compatible with the
- * JDBCVirtualUserTableList.
+ * JDBCRecipientRewriteTableList.
*/
@Column(name = "TARGET_ADDRESS", nullable = false, length = 100)
private String targetAddress = "";
/**
- * Use this simple constructor to create a new VirtualUserTable.
+ * Use this simple constructor to create a new RecipientRewriteTable.
*
* @param user
* , domain and their associated targetAddress
Modified: james/server/trunk/jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java (original)
+++ james/server/trunk/jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java Wed Apr 6 15:47:51 2011
@@ -64,9 +64,9 @@ public class JPARecipientRewriteTableTes
}
/**
- * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest#getVirtualUserTable()
+ * @see org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest#getRecipientRewriteTable()
*/
- protected AbstractRecipientRewriteTable getVirtualUserTable() throws Exception {
+ protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
JPARecipientRewriteTable virtualUserTable = new JPARecipientRewriteTable();
virtualUserTable.setLog(LoggerFactory.getLogger("MockLog"));
virtualUserTable.setEntityManagerFactory(factory);
Copied: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java (from r1089492, james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java&p1=james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java&r1=1089492&r2=1089503&rev=1089503&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java Wed Apr 6 15:47:51 2011
@@ -50,8 +50,8 @@ import org.apache.mailet.base.GenericMai
* @deprecated use the definitions in virtualusertable-store.xml instead
*/
@Deprecated
-public abstract class AbstractVirtualUserTable extends GenericMailet {
- static private final String MARKER = "org.apache.james.transport.mailets.AbstractVirtualUserTable.mapped";
+public abstract class AbstractRecipientRewriteTable extends GenericMailet {
+ static private final String MARKER = "org.apache.james.transport.mailets.AbstractRecipientRewriteTable.mapped";
private DNSService dns;
private DomainList domainList;
Copied: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTableMailet.java (from r1089471, james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTableMailet.java?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTableMailet.java&p1=james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java&r1=1089471&r2=1089503&rev=1089503&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTableMailet.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTableMailet.java Wed Apr 6 15:47:51 2011
@@ -38,9 +38,9 @@ import org.apache.mailet.base.RFC2822Hea
/**
* Abstract base class which should get extended by classes which handle mapping
- * operations based on VirtualUserTable implementations
+ * operations based on RecipientRewriteTable implementations
*/
-public abstract class AbstractVirtualUserTableMailet extends GenericMailet {
+public abstract class AbstractRecipientRewriteTableMailet extends GenericMailet {
private DomainList domainList;
Copied: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java (from r1089492, james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java&p1=james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java&r1=1089492&r2=1089503&rev=1089503&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java Wed Apr 6 15:47:51 2011
@@ -46,14 +46,14 @@ import java.util.Map;
* forwarding.
* </p>
* <p>
- * JDBCVirtualUserTable does not provide any administation tools. You'll have to
- * create the VirtualUserTable yourself. The standard configuration is as
+ * JDBCRecipientRewriteTable does not provide any administation tools. You'll have to
+ * create the RecipientRewriteTable yourself. The standard configuration is as
* follows:
* </p>
* <p>
*
* <pre>
- * CREATE TABLE VirtualUserTable
+ * CREATE TABLE RecipientRewriteTable
* (
* user varchar(64) NOT NULL default '',
* domain varchar(255) NOT NULL default '',
@@ -71,14 +71,14 @@ import java.util.Map;
* specified in a list separated by commas, semi-colons or colons.
* </p>
* <p>
- * The standard query used with VirtualUserTable is:
+ * The standard query used with RecipientRewriteTable is:
*
* <pre>
- * select VirtualUserTable.target_address from VirtualUserTable, VirtualUserTable as VUTDomains
- * where (VirtualUserTable.user like ? or VirtualUserTable.user like "\%")
- * and (VirtualUserTable.domain like ?
- * or (VirtualUserTable.domain like "\%" and VUTDomains.domain like ?))
- * order by concat(VirtualUserTable.user,'@',VirtualUserTable.domain) desc limit 1
+ * select RecipientRewriteTable.target_address from RecipientRewriteTable, RecipientRewriteTable as VUTDomains
+ * where (RecipientRewriteTable.user like ? or RecipientRewriteTable.user like "\%")
+ * and (RecipientRewriteTable.domain like ?
+ * or (RecipientRewriteTable.domain like "\%" and VUTDomains.domain like ?))
+ * order by concat(RecipientRewriteTable.user,'@',RecipientRewriteTable.domain) desc limit 1
* </pre>
*
* </p>
@@ -98,8 +98,8 @@ import java.util.Map;
* where in the query to replace parameters. [TODO]
*
* <pre>
- * <mailet match="All" class="JDBCVirtualUserTable">
- * <table>db://maildb/VirtualUserTable</table>
+ * <mailet match="All" class="JDBCRecipientRewriteTable">
+ * <table>db://maildb/RecipientRewriteTable</table>
* <sqlquery>sqlquery</sqlquery>
* </mailet>
* </pre>
@@ -109,7 +109,7 @@ import java.util.Map;
* @deprecated use the definitions in virtualusertable-store.xml instead
*/
@Deprecated
-public class JDBCVirtualUserTable extends AbstractVirtualUserTable {
+public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
protected DataSource datasource;
/**
@@ -122,7 +122,7 @@ public class JDBCVirtualUserTable extend
*/
private final JDBCUtil theJDBCUtil = new JDBCUtil() {
protected void delegatedLog(String logString) {
- log("JDBCVirtualUserTable: " + logString);
+ log("JDBCRecipientRewriteTable: " + logString);
}
};
@@ -136,7 +136,7 @@ public class JDBCVirtualUserTable extend
*/
public void init() throws MessagingException {
if (getInitParameter("table") == null) {
- throw new MailetException("Table location not specified for JDBCVirtualUserTable");
+ throw new MailetException("Table location not specified for JDBCRecipientRewriteTable");
}
String tableURL = getInitParameter("table");
@@ -165,7 +165,7 @@ public class JDBCVirtualUserTable extend
} catch (MailetException me) {
throw me;
} catch (Exception e) {
- throw new MessagingException("Error initializing JDBCVirtualUserTable", e);
+ throw new MessagingException("Error initializing JDBCRecipientRewriteTable", e);
} finally {
theJDBCUtil.closeJDBCConnection(conn);
}
Copied: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java (from r1089496, james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java&p1=james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java&r1=1089496&r2=1089503&rev=1089503&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java Wed Apr 6 15:47:51 2011
@@ -31,10 +31,10 @@ import org.apache.james.rrt.api.Recipien
import org.apache.mailet.MailAddress;
/**
- * Mailet which should get used when using VirtualUserTable-Store to
+ * Mailet which should get used when using RecipientRewriteTable-Store to
* implementations for mappings of forwards and aliases.
*/
-public class VirtualUserTable extends AbstractVirtualUserTableMailet {
+public class RecipientRewriteTable extends AbstractRecipientRewriteTableMailet {
private org.apache.james.rrt.api.RecipientRewriteTable vut;
/**
@@ -44,12 +44,12 @@ public class VirtualUserTable extends Ab
* the vutStore to set, possibly null
*/
@Resource(name = "recipientrewritetable")
- public final void setVirtualUserTable(org.apache.james.rrt.api.RecipientRewriteTable vut) {
+ public final void setRecipientRewriteTable(org.apache.james.rrt.api.RecipientRewriteTable vut) {
this.vut = vut;
}
/**
- * @see org.apache.james.transport.mailets.AbstractVirtualUserTable#processMail(org.apache.mailet.MailAddress,
+ * @see org.apache.james.transport.mailets.AbstractRecipientRewriteTable#processMail(org.apache.mailet.MailAddress,
* org.apache.mailet.MailAddress, javax.mail.internet.MimeMessage)
*/
public Collection<MailAddress> processMail(MailAddress sender, MailAddress recipient, MimeMessage message) throws MessagingException {
@@ -63,7 +63,7 @@ public class VirtualUserTable extends Ab
StringBuilder errorBuffer = new StringBuilder(128).append("A problem as occoured trying to alias and forward user ").append(recipient).append(": ").append(e.getMessage());
throw new MessagingException(errorBuffer.toString());
} catch (RecipientRewriteTableException e) {
- throw new MessagingException("Unable to access VirtualUserTable", e);
+ throw new MessagingException("Unable to access RecipientRewriteTable", e);
}
Collection<MailAddress> rcpts = new ArrayList<MailAddress>();
@@ -75,7 +75,7 @@ public class VirtualUserTable extends Ab
* @see org.apache.mailet.base.GenericMailet#getMailetInfo()
*/
public String getMailetInfo() {
- return "VirtualUserTable Mailet";
+ return "RecipientRewriteTable Mailet";
}
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java Wed Apr 6 15:47:51 2011
@@ -45,10 +45,10 @@ import org.apache.mailet.MailAddress;
* the forwarding. Default to false.
*
*
- * @deprecated use org.apache.james.transport.mailets.VirtualUserTable
+ * @deprecated use org.apache.james.transport.mailets.RecipientRewriteTable
*/
@Deprecated
-public class UsersRepositoryAliasingForwarding extends AbstractVirtualUserTableMailet {
+public class UsersRepositoryAliasingForwarding extends AbstractRecipientRewriteTableMailet {
/**
* The user repository for this mail server. Contains all the users with
Copied: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java (from r1089492, james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java&p1=james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java&r1=1089492&r2=1089503&rev=1089503&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java Wed Apr 6 15:47:51 2011
@@ -33,7 +33,7 @@ import org.apache.mailet.MailAddress;
* <p>
* Implements a Virtual User Table to translate virtual users to real users.
* This implementation has the same functionality as
- * <code>JDBCVirtualUserTable</code>, but is configured in the JAMES
+ * <code>JDBCRecipientRewriteTable</code>, but is configured in the JAMES
* configuration and is thus probably most suitable for smaller and less dynamic
* mapping requirements.
* </p>
@@ -41,7 +41,7 @@ import org.apache.mailet.MailAddress;
* The configuration is specified in the form:
*
* <pre>
- * <mailet match="All" class="XMLVirtualUserTable">
+ * <mailet match="All" class="XMLRecipientRewriteTable">
* <mapping>virtualuser@xxx=realuser[@yyy][;anotherrealuser[@zzz]]</mapping>
* <mapping>virtualuser2@*=realuser2[@yyy][;anotherrealuser2[@zzz]]</mapping>
* ...
@@ -73,7 +73,7 @@ import org.apache.mailet.MailAddress;
*
*/
@Deprecated
-public class XMLVirtualUserTable extends AbstractVirtualUserTable {
+public class XMLRecipientRewriteTable extends AbstractRecipientRewriteTable {
/**
* Holds the configured mappings
*/
Modified: james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java (original)
+++ james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java Wed Apr 6 15:47:51 2011
@@ -40,12 +40,12 @@ import org.apache.mailet.base.test.FakeM
public class RecipientRewriteTableTest extends TestCase {
- private org.apache.james.transport.mailets.VirtualUserTable table;
+ private org.apache.james.transport.mailets.RecipientRewriteTable table;
@Override
protected void setUp() throws Exception {
- table = new org.apache.james.transport.mailets.VirtualUserTable();
+ table = new org.apache.james.transport.mailets.RecipientRewriteTable();
final FakeMailContext mockMailetContext = new FakeMailContext() {
@Override
@@ -61,7 +61,7 @@ public class RecipientRewriteTableTest e
FakeMailetConfig mockMailetConfig = new FakeMailetConfig("vut", mockMailetContext, new Properties());
// mockMailetConfig.put("recipientrewritetable", "vut");
- table.setVirtualUserTable(new org.apache.james.rrt.api.RecipientRewriteTable() {
+ table.setRecipientRewriteTable(new org.apache.james.rrt.api.RecipientRewriteTable() {
public Collection<String> getMappings(String user, String domain) throws ErrorMappingException, RecipientRewriteTableException {
if (user.equals("test") && domain.equals("localhost"))
return Arrays.asList(new String[] { "whatever@localhost", "blah@localhost" });
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java Wed Apr 6 15:47:51 2011
@@ -366,7 +366,7 @@ public class JDBCGreylistHandler extends
*/
private final JDBCUtil theJDBCUtil = new JDBCUtil() {
protected void delegatedLog(String logString) {
- serviceLog.debug("JDBCVirtualUserTable: " + logString);
+ serviceLog.debug("JDBCRecipientRewriteTable: " + logString);
}
};
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java Wed Apr 6 15:47:51 2011
@@ -77,7 +77,7 @@ public class ValidRcptHandler extends Ab
* the tableStore to set
*/
@Resource(name = "recipientrewritetable")
- public final void setVirtualUserTable(RecipientRewriteTable vut) {
+ public final void setRecipientRewriteTable(RecipientRewriteTable vut) {
this.vut = vut;
}
@@ -90,10 +90,10 @@ public class ValidRcptHandler extends Ab
* @see org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.Configuration)
*/
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
- setVirtualUserTableSupport(config.getBoolean("enableVirtualUserTable", true));
+ setRecipientRewriteTableSupport(config.getBoolean("enableRecipientRewriteTable", true));
}
- public void setVirtualUserTableSupport(boolean useVut) {
+ public void setRecipientRewriteTableSupport(boolean useVut) {
this.useVut = useVut;
}
@@ -125,7 +125,7 @@ public class ValidRcptHandler extends Ab
} catch (ErrorMappingException e) {
return false;
} catch (RecipientRewriteTableException e) {
- session.getLogger().info("Unable to access VirtualUserTable", e);
+ session.getLogger().info("Unable to access RecipientRewriteTable", e);
return false;
}
}
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Wed Apr 6 15:47:51 2011
@@ -55,7 +55,7 @@ public class ValidRcptHandlerTest extend
users.addUser(VALID_USER, "xxx");
handler = new ValidRcptHandler();
handler.setUsers(users);
- handler.setVirtualUserTable(setUpVirtualUserTable());
+ handler.setRecipientRewriteTable(setUpRecipientRewriteTable());
handler.setDomainList(new SimpleDomainList() {
@@ -81,7 +81,7 @@ public class ValidRcptHandlerTest extend
return session;
}
- private RecipientRewriteTable setUpVirtualUserTable() {
+ private RecipientRewriteTable setUpRecipientRewriteTable() {
final RecipientRewriteTable table = new RecipientRewriteTable() {
public Collection<String> getMappings(String user, String domain) throws ErrorMappingException, RecipientRewriteTableException {
Modified: james/server/trunk/src/site/xdoc/config-mailetcontainer.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-mailetcontainer.xml?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-mailetcontainer.xml (original)
+++ james/server/trunk/src/site/xdoc/config-mailetcontainer.xml Wed Apr 6 15:47:51 2011
@@ -1,3 +1,16 @@
+ - no more mailetpackage specification in mailetcontainer.xml
+ - exactly one standard package, hard-coded in source code
+ - standard package applied to mailet classnames without package prefix
+ - all custom mailets must be specified with full package prefix
+ - package prefixed custom mailet names will be searched across the entire applicable class path
+
+This feature is only supported in current trunk. It would be look like:
+<matcher name="anyname" match="org.apache.james.mailetcontainer.lib.matcher.And">
+<matcher match="SenderIs...."/>
+<matcher match="SubjectStartsWith...."/>
+</matcher>
+<mailet match="anyname" class="MailetX"/>
+
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
Modified: james/server/trunk/src/site/xdoc/config-smtp-lmtp.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/config-smtp-lmtp.xml?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/config-smtp-lmtp.xml (original)
+++ james/server/trunk/src/site/xdoc/config-smtp-lmtp.xml Wed Apr 6 15:47:51 2011
@@ -1,3 +1,6 @@
+<!-- + smtp_ssl.xml-->
+Support multiple port configurations per protocol
+
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
Modified: james/server/trunk/src/site/xdoc/dev-build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/dev-build.xml?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/dev-build.xml (original)
+++ james/server/trunk/src/site/xdoc/dev-build.xml Wed Apr 6 15:47:51 2011
@@ -1,3 +1,7 @@
+maven 3.0
+<!--Run mvn package to change jpa or use run option -javaagent:your_home_folder\.m2\repository\org\apache\openjpa\openjpa\2.0.1\openjpa-2.0.1.ja -->
+download all source from 'current' module
+
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
Modified: james/server/trunk/src/site/xdoc/dev.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/dev.xml?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/dev.xml (original)
+++ james/server/trunk/src/site/xdoc/dev.xml Wed Apr 6 15:47:51 2011
@@ -1,3 +1,8 @@
+<!--api: they does not include implementation details, they do not have dependencies (or at most they have very common dependencies like mailet-api, javamail, commons-logging).-->
+<!--library: they only depends on apis or external jars. They don't depend on other internal libraries. These libraries should be shared by functions (no need to have a library when it is used only by a function)-->
+<!--functions: everything else. It is harder to see a case of "direct" reuse of a function jar. Most times we'll only have code reuse. I would prefer to limit function to function dependencies (i prefer to merge them instead). -->
+<!--LogEnabled interface as the preferred way, except for non-server code and classes that have no bean definition.-->
+<!--LogEnabled should be used whereever logging is needed and no "session-scoped" Log is provided. -->
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
Modified: james/server/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/index.xml?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/index.xml (original)
+++ james/server/trunk/src/site/xdoc/index.xml Wed Apr 6 15:47:51 2011
@@ -20,7 +20,7 @@
<document>
<properties>
- <title>James 3 - Index</title>
+ <title>Index</title>
</properties>
<head>
Modified: james/server/trunk/src/site/xdoc/manage.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/manage.xml?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/manage.xml (original)
+++ james/server/trunk/src/site/xdoc/manage.xml Wed Apr 6 15:47:51 2011
@@ -1,3 +1,5 @@
+<!--./james-cli.sh --host mail.debian-made.de -p 9999 listusers -->
+
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
Modified: james/server/trunk/src/site/xdoc/monitor-jmx.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/monitor-jmx.xml?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/monitor-jmx.xml (original)
+++ james/server/trunk/src/site/xdoc/monitor-jmx.xml Wed Apr 6 15:47:51 2011
@@ -1,3 +1,24 @@
+<!--what you mean with how I see permanent erros ?-->
+<!--[12:30:05] Norman Maurer: unknow users are in ValidRcptHandler-->
+<!--[12:30:29] Norman Maurer: but if someone whould just ignore the 5xx return code on rcpt and suply the data it would return a permanent error-->
+<!--[12:30:36] Norman Maurer: so yes it could be in there too-->
+<!--[12:33:57] Norman Maurer: maybe we should only count the first 5xx in a transaction-->
+<!--[12:33:59] Norman Maurer: wdyt ?-->
+<!--[12:35:24] Eric Charles: I use the defafult smtp logging level. I don't see much in the logs (not smpt codes,..)-->
+<!--[12:36:11] Eric Charles: what must I do to see the 4xx codez?-->
+<!--[12:36:32] Norman Maurer: debug will show themnot sure if-->
+<!--[12:36:36] Norman Maurer: we need to improve logging-->
+<!--[12:39:10] Eric Charles: I will update log level-->
+<!--[12:39:18] Eric Charles: for the rejected message, I would except to be counted as ok in the stats-->
+<!--[12:39:27] Norman Maurer: why-->
+<!--[12:40:02] Eric Charles: it's not an smtp protocol error-->
+<!--[12:40:29] Norman Maurer: 5xx is an error-->
+<!--[12:40:36] Norman Maurer: thats the whole point of the stats-->
+<!--[12:40:54] Norman Maurer: to see how many messages are rejected via permanent error and how many via temporary error-->
+<!--[12:41:00] Eric Charles: what's the difference between permanet and temporrary ?-->
+<!--[12:41:19] Norman Maurer: temporary will get try to redelivered later-->
+<!--[12:41:26] Norman Maurer: like greylisting is temporary-->
+
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -55,14 +76,25 @@
Configure for example smtpserver.xml with</p>
<source>
-<handler class="org.apache.james.smtpserver.jmx.HookResultJMXMonitor"/>
<handler class="org.apache.james.smtpserver.jmx.ConnectHandlerResultJMXMonitor"/>
<handler class="org.apache.james.smtpserver.jmx.LineHandlerResultJMXMonitor"/>
<handler class="org.apache.james.smtpserver.jmx.CommandHandlerResultJMXMonitor"/>
+<handler class="org.apache.james.smtpserver.jmx.HookResultJMXMonitor"/> (only for smtp)
</source>
+ <p><img src="images/jmx-monitoring/jmx-org.apache.james.smtpserver.JamesDataCmdHandler.png"/></p>
+
</section>
+ <section name="Statistics via JMX">
+
+ <p>You can enable satistics collection for SMTP/LMPT/POP3 Servers via JMX.
+ Configure for example smtpserver.xml with</p>
+
+ <p><img src="images/jmx-monitoring/jmx-org.apache.james.smtpserver.JamesDataCmdHandler.png"/></p>
+
+ </section>
+
<section name="JMX Remote Access">
<p>If you want a remote access, you can install a web application management tool such as jmanage.
Modified: james/server/trunk/src/site/xdoc/monitor-logging.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/xdoc/monitor-logging.xml?rev=1089503&r1=1089502&r2=1089503&view=diff
==============================================================================
--- james/server/trunk/src/site/xdoc/monitor-logging.xml (original)
+++ james/server/trunk/src/site/xdoc/monitor-logging.xml Wed Apr 6 15:47:51 2011
@@ -1,3 +1,112 @@
+<!--log4j.logger.james.smtpserver=DEBUG, SMTPSERVER-->
+
+<!--EBUG 16:16:06,705 | james.smtpserver | 250 Lookup command handler for command: EHLO-->
+<!--DEBUG 16:16:06,706 | james.smtpserver | 250 org.apache.james.protocols.smtp.core.esmtp.EhloCmdHandler: 250 [noname. Hello test.de (localhost [127.0.0.1]), PIPELINING, ENHANCEDSTATUSCODES, 8BITMIME]-->
+<!--DEBUG 16:16:11,098 | james.smtpserver | 250 Lookup command handler for command: MAIL-->
+<!--ERROR 16:16:11,108 | james.smtpserver | 250 Error parsing sender address: <gdgwewe: did not start and end with < >-->
+<!--INFO 16:16:11,110 | james.smtpserver | 250 org.apache.james.smtpserver.JamesMailCmdHandler: 501 [5.1.7 Syntax error in MAIL command]-->
+<!--DEBUG 16:16:14,442 | james.smtpserver | 250 Lookup command handler for command: MAIL-->
+<!--DEBUG 16:16:14,442 | james.smtpserver | 250 org.apache.james.smtpserver.JamesMailCmdHandler: 250 [2.1.0 Sender <te...@localhost> OK]-->
+<!--DEBUG 16:16:22,385 | james.smtpserver | 250 Lookup command handler for command: RCPT-->
+<!--DEBUG 16:16:22,386 | james.smtpserver | 250 executing hook org.apache.james.smtpserver.AuthRequiredToRelayRcptHook-->
+<!--DEBUG 16:16:22,386 | james.smtpserver | 250 executing hook org.apache.james.smtpserver.SenderAuthIdentifyVerificationRcptHook-->
+<!--DEBUG 16:16:22,485 | james.smtpserver | 250 executing hook org.apache.james.protocols.smtp.core.PostmasterAbuseRcptHook-->
+<!--DEBUG 16:16:22,485 | james.smtpserver | 250 executing hook org.apache.james.smtpserver.fastfail.ValidRcptHandler-->
+<!--DEBUG 16:16:22,485 | james.smtpserver | 250 Sender allowed-->
+<!--DEBUG 16:16:22,485 | james.smtpserver | 250 org.apache.james.smtpserver.JamesRcptCmdHandler: 250 [2.1.5 Recipient <go...@localhost> OK]-->
+<!--DEBUG 16:16:30,008 | james.smtpserver | 250 Lookup command handler for command: RCPT-->
+<!--ERROR 16:16:30,009 | james.smtpserver | 250 Error parsing recipient address: Address did not start and end with < > [to:<d] [from:test@localhost]-->
+<!--INFO 16:16:30,009 | james.smtpserver | 250 org.apache.james.smtpserver.JamesRcptCmdHandler: 501 [5.5.2 Syntax error in parameters or arguments]-->
+<!--DEBUG 16:16:33,424 | james.smtpserver | 250 Lookup command handler for command: RCPT-->
+<!--DEBUG 16:16:33,424 | james.smtpserver | 250 executing hook org.apache.james.smtpserver.AuthRequiredToRelayRcptHook-->
+<!--DEBUG 16:16:33,424 | james.smtpserver | 250 executing hook org.apache.james.smtpserver.SenderAuthIdentifyVerificationRcptHook-->
+<!--DEBUG 16:16:33,425 | james.smtpserver | 250 executing hook org.apache.james.protocols.smtp.core.PostmasterAbuseRcptHook-->
+<!--DEBUG 16:16:33,425 | james.smtpserver | 250 executing hook org.apache.james.smtpserver.fastfail.ValidRcptHandler-->
+<!--DEBUG 16:16:33,425 | james.smtpserver | 250 Sender allowed-->
+<!--DEBUG 16:16:33,425 | james.smtpserver | 250 org.apache.james.smtpserver.JamesRcptCmdHandler: 250 [2.1.5 Recipient <g...@localhost> OK]-->
+<!--DEBUG 16:16:35,072 | james.smtpserver | 250 Lookup command handler for command: DATA-->
+<!--DEBUG 16:16:35,076 | james.smtpserver | 250 org.apache.james.smtpserver.JamesDataCmdHandler: 354 [Ok Send data ending with <CRLF>.<CRLF>]-->
+<!--DEBUG 16:16:39,205 | james.smtpserver | 250 executing james message handler org.apache.james.protocols.smtp.core.esmtp.MailSizeEsmtpExtension@4b25ee49-->
+<!--DEBUG 16:16:39,206 | james.smtpserver | 250 executing james message handler org.apache.james.smtpserver.AddDefaultAttributesMessageHook@6c408893-->
+<!--DEBUG 16:16:39,206 | james.smtpserver | 250 executing james message handler org.apache.james.smtpserver.SendMailHandler@5636bc0a-->
+<!--DEBUG 16:16:39,206 | james.smtpserver | 250 sending mail-->
+<!--INFO 16:16:39,223 | james.smtpserver | 250 Successfully spooled mail Mail1291907799185-4af99ab3-9dd2-4d04-b8c9-37c12dd94686 from test@localhost on 127.0.0.1 for [go@localhost, g@localhost]-->
+<!--INFO 16:16:40,230 | james.mailetcontext | Storing mail Mail1291907799185-4af99ab3-9dd2-4d04-b8c9-37c12dd94686 in file://var/mail/address-error/-->
+<!--[16:17:15] Norman Maurer: the 250 in front of it is the session id.. so you can now see the whole transaction flow-->
+<!--[16:17:23] Norman Maurer: even if you have many stuff currently going on-->
+<!--[16:17:59] Eric Charles: excellent. and the 400/500 smtp return codes ?-->
+<!--[16:18:02] Norman Maurer: as you see 5xx and 4xx stuff is logged with INFO .. the rest with DEBUG-->
+<!--[16:18:08] Norman Maurer: INFO Â 16:16:30,009 | james.smtpserver | 250 org.apache.james.smtpserver.JamesRcptCmdHandler: 501 [5.5.2 Syntax error in parameters or arguments]-->
+
+<!--DEBUG 16:41:42,174 | james.smtpserver | 167 org.apache.james.smtpserver.JamesWelcomeMessageHandler disconnect=false-->
+<!--DEBUG 16:41:44,207 | james.smtpserver | 167 Lookup command handler for command: EHLO-->
+<!--DEBUG 16:41:44,209 | james.smtpserver | 167 org.apache.james.protocols.smtp.core.esmtp.EhloCmdHandler: 250 [noname. Hello test (localhost [127.0.0.1]), PIPELINING, ENHANCEDSTATUSCODES, 8BITMIME]-->
+<!--DEBUG 16:41:44,214 | james.smtpserver | 167 org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler disconnect=false-->
+<!--DEBUG 16:42:12,720 | james.smtpserver | 167 Lookup command handler for command: EHLO-->
+<!--DEBUG 16:42:12,720 | james.smtpserver | 167 org.apache.james.protocols.smtp.core.esmtp.EhloCmdHandler: 250 [noname. Hello t (localhost [127.0.0.1]), PIPELINING, ENHANCEDSTATUSCODES, 8BITMIME]-->
+<!--DEBUG 16:42:12,721 | james.smtpserver | 167 org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler disconnect=false-->
+<!--DEBUG 16:42:15,008 | james.smtpserver | 167 Lookup command handler for command: MAIL-->
+<!--INFO 16:42:15,010 | james.smtpserver | 167 org.apache.james.smtpserver.JamesMailCmdHandler: 501 [5.5.4 Usage: MAIL FROM:<sender>]-->
+<!--DEBUG 16:42:15,010 | james.smtpserver | 167 org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler disconnect=false-->
+<!--DEBUG 16:42:17,048 | james.smtpserver | 167 Lookup command handler for command: MAIL-->
+<!--DEBUG 16:42:17,048 | james.smtpserver | 167 org.apache.james.smtpserver.JamesMailCmdHandler: 250 [2.1.0 Sender <> OK]-->
+<!--DEBUG 16:42:17,048 | james.smtpserver | 167 org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler disconnect=false-->
+<!--DEBUG 16:42:19,088 | james.smtpserver | 167 Lookup command handler for command: RCPT-->
+<!--DEBUG 16:42:19,088 | james.smtpserver | 167 executing hook org.apache.james.smtpserver.AuthRequiredToRelayRcptHook-->
+<!--DEBUG 16:42:19,089 | james.smtpserver | 167 executing hook org.apache.james.smtpserver.SenderAuthIdentifyVerificationRcptHook-->
+<!--DEBUG 16:42:19,089 | james.smtpserver | 167 executing hook org.apache.james.protocols.smtp.core.PostmasterAbuseRcptHook-->
+<!--DEBUG 16:42:19,089 | james.smtpserver | 167 executing hook org.apache.james.smtpserver.fastfail.ValidRcptHandler-->
+<!--DEBUG 16:42:19,089 | james.smtpserver | 167 Sender allowed-->
+<!--DEBUG 16:42:19,089 | james.smtpserver | 167 org.apache.james.smtpserver.JamesRcptCmdHandler: 250 [2.1.5 Recipient <nm...@localhost> OK]-->
+<!--DEBUG 16:42:19,090 | james.smtpserver | 167 org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler disconnect=false-->
+<!--DEBUG 16:42:19,767 | james.smtpserver | 167 Lookup command handler for command: DATA-->
+<!--DEBUG 16:42:19,774 | james.smtpserver | 167 org.apache.james.smtpserver.JamesDataCmdHandler: 354 [Ok Send data ending with <CRLF>.<CRLF>]-->
+<!--DEBUG 16:42:19,775 | james.smtpserver | 167 org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler disconnect=false-->
+<!--DEBUG 16:42:22,950 | james.smtpserver | 167 executing james message handler org.apache.james.protocols.smtp.core.esmtp.MailSizeEsmtpExtension@5585c0de-->
+<!--DEBUG 16:42:22,952 | james.smtpserver | 167 executing james message handler org.apache.james.smtpserver.AddDefaultAttributesMessageHook@2827f394-->
+<!--DEBUG 16:42:22,952 | james.smtpserver | 167 executing james message handler org.apache.james.smtpserver.SendMailHandler@3f81d405-->
+<!--DEBUG 16:42:22,952 | james.smtpserver | 167 sending mail-->
+<!--INFO 16:42:22,977 | james.smtpserver | 167 Successfully spooled mail Mail1291909342936-99263c11-c287-42e9-93a5-4f3468842d9f from null on 127.0.0.1 for [nm@localhost]-->
+<!---->
+<!--DEBUG 17:23:42,297 | james.smtpserver | 262 org.apache.james.smtpserver.JamesWelcomeMessageHandler disconnect=false-->
+<!--DEBUG 17:23:46,091 | james.smtpserver | 262 Lookup command handler for command: EHLO-->
+<!--DEBUG 17:23:46,093 | james.smtpserver | 262 org.apache.james.protocols.smtp.core.esmtp.EhloCmdHandler: 250 [noname. Hello test (fileserver [192.168.0.254]), AUTH LOGIN PLAIN, AUTH=LOGIN PLAIN, PIPELINING, ENHANCEDSTATUSCODES, 8BITMIME]-->
+<!--DEBUG 17:23:46,098 | james.smtpserver | 262 org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler disconnect=false-->
+<!--DEBUG 17:23:54,029 | james.smtpserver | 262 Lookup command handler for command: MAIL-->
+<!--DEBUG 17:23:54,031 | james.smtpserver | 262 org.apache.james.smtpserver.JamesMailCmdHandler: 250 [2.1.0 Sender <> OK]-->
+<!--DEBUG 17:23:54,032 | james.smtpserver | 262 org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler disconnect=false-->
+<!--DEBUG 17:24:00,775 | james.smtpserver | 262 Lookup command handler for command: RCPT-->
+<!--DEBUG 17:24:00,776 | james.smtpserver | 262 executing hook org.apache.james.smtpserver.AuthRequiredToRelayRcptHook-->
+<!--DEBUG 17:24:00,777 | james.smtpserver | 262 executing hook org.apache.james.smtpserver.log.HookResultLogger@2a36bb87-->
+<!--INFO 17:24:00,777 | james.smtpserver | 262 org.apache.james.smtpserver.AuthRequiredToRelayRcptHook: result=2 (DENY)-->
+<!--INFO 17:24:00,777 | james.smtpserver | 262 org.apache.james.smtpserver.JamesRcptCmdHandler: 530 [5.7.1 Authentication Required]-->
+<!--DEBUG 17:24:00,778 | james.smtpserver | 262 org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler disconnect=false-->
+<!--DEBUG 17:24:17,828 | james.smtpserver | 262 Lookup command handler for command: RCPT-->
+<!--DEBUG 17:24:17,828 | james.smtpserver | 262 executing hook org.apache.james.smtpserver.AuthRequiredToRelayRcptHook-->
+<!--DEBUG 17:24:17,828 | james.smtpserver | 262 executing hook org.apache.james.smtpserver.log.HookResultLogger@2a36bb87-->
+<!--DEBUG 17:24:17,829 | james.smtpserver | 262 org.apache.james.smtpserver.AuthRequiredToRelayRcptHook: result=8 (DECLINED)-->
+<!--DEBUG 17:24:17,829 | james.smtpserver | 262 executing hook org.apache.james.smtpserver.SenderAuthIdentifyVerificationRcptHook-->
+<!--DEBUG 17:24:17,829 | james.smtpserver | 262 executing hook org.apache.james.smtpserver.log.HookResultLogger@2a36bb87-->
+<!--DEBUG 17:24:17,829 | james.smtpserver | 262 org.apache.james.smtpserver.SenderAuthIdentifyVerificationRcptHook: result=8 (DECLINED)-->
+<!--DEBUG 17:24:17,830 | james.smtpserver | 262 executing hook org.apache.james.protocols.smtp.core.PostmasterAbuseRcptHook-->
+<!--DEBUG 17:24:17,830 | james.smtpserver | 262 executing hook org.apache.james.smtpserver.log.HookResultLogger@2a36bb87-->
+<!--DEBUG 17:24:17,830 | james.smtpserver | 262 org.apache.james.protocols.smtp.core.PostmasterAbuseRcptHook: result=8 (DECLINED)-->
+<!--DEBUG 17:24:17,830 | james.smtpserver | 262 executing hook org.apache.james.smtpserver.fastfail.ValidRcptHandler-->
+<!--DEBUG 17:24:18,670 | james.smtpserver | 262 Unknown user nm check if its an alias-->
+<!--INFO 17:24:18,724 | james.smtpserver | 262 Rejected message. Unknown user: nm@localhost-->
+<!--DEBUG 17:24:18,725 | james.smtpserver | 262 executing hook org.apache.james.smtpserver.log.HookResultLogger@2a36bb87-->
+<!--INFO 17:24:18,726 | james.smtpserver | 262 org.apache.james.smtpserver.fastfail.ValidRcptHandler: result=2 (DENY)-->
+<!--INFO 17:24:18,726 | james.smtpserver | 262 org.apache.james.smtpserver.JamesRcptCmdHandler: 550 [5.1.1 Unknown user: nm@localhost]-->
+<!--DEBUG 17:24:18,727 | james.smtpserver | 262 org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler disconnect=false-->
+<!--DEBUG 17:24:23,843 | james.smtpserver | 262 Lookup command handler for command: QUIT-->
+<!--DEBUG 17:24:23,843 | james.smtpserver | 262 org.apache.james.protocols.smtp.core.QuitCmdHandler: 221 [2.0.0 noname. Service closing transmission channel]-->
+<!--DEBUG 17:24:23,844 | james.smtpserver | Dispose objects while closing channel 1431702401-->
+<!--DEBUG 17:24:23,845 | james.smtpserver | 262 org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler disconnect=false-->
+<!--[17:24:59] Norman Maurer: INFO Â 17:24:00,777 | james.smtpserver | 262 org.apache.james.smtpserver.AuthRequiredToRelayRcptHook: result=2 (DENY)-->
+<!--[17:25:04] Norman Maurer: INFO Â 17:24:18,726 | james.smtpserver | 262 org.apache.james.smtpserver.fastfail.ValidRcptHandler: result=2 (DENY)-->
+<!--[17:25:09] Norman Maurer: DEBUG 17:24:17,829 | james.smtpserver | 262 org.apache.james.smtpserver.SenderAuthIdentifyVerificationRcptHook: result=8 (DECLINED)-->
+
+
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org