Author: bago
Date: Thu Dec 29 02:03:28 2005
New Revision: 359768
URL: http://svn.apache.org/viewcvs?rev=359768&view=rev
Log:
Moved PostmasterAlias from code to james-confix.xml (Applied patch JAMES-363 by
Daniel Perry)
Modified:
james/server/trunk/src/conf/james-config.xml
james/server/trunk/src/java/org/apache/james/transport/JamesSpoolManager.java
Modified: james/server/trunk/src/conf/james-config.xml
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/conf/james-config.xml?rev=359768&r1=359767&r2=359768&view=diff
==============================================================================
--- james/server/trunk/src/conf/james-config.xml (original)
+++ james/server/trunk/src/conf/james-config.xml Thu Dec 29 02:03:28 2005
@@ -133,6 +133,12 @@
<!-- This configuration is a sample configuration for the root
processor. -->
<processor name="root">
+ <!-- This mailet redirects mail for the user 'postmaster' at any
local domain to -->
+ <!-- the postmaster address specified for the server. The postmaster
address -->
+ <!-- is required by rfc822. Do not remove this mailet unless you are
meeting -->
+ <!-- this requirement through other means (e.g. a
XML/JDBCVirtualUserTable mailet) -->
+ <mailet match="All" class="PostmasterAlias"/>
+
<!-- Checks that the email Sender is associated with a valid domain.
-->
<!-- Useful for detecting and eliminating spam. -->
<!-- For this block to function, the spam processor must be
configured. -->
Modified:
james/server/trunk/src/java/org/apache/james/transport/JamesSpoolManager.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/transport/JamesSpoolManager.java?rev=359768&r1=359767&r2=359768&view=diff
==============================================================================
---
james/server/trunk/src/java/org/apache/james/transport/JamesSpoolManager.java
(original)
+++
james/server/trunk/src/java/org/apache/james/transport/JamesSpoolManager.java
Thu Dec 29 02:03:28 2005
@@ -155,14 +155,6 @@
processor.initialize();
processors.put(processorName, processor);
- // If this is the root processor, add the PostmasterAlias
- // mailet silently to the top
- if (processorName.equals("root")) {
- Matcher matcher = matchLoader.getMatcher("All");
- Mailet mailet = mailetLoader.getMailet("PostmasterAlias",
null);
- processor.add(matcher, mailet);
- }
-
final Configuration[] mailetConfs
= processorConf.getChildren( "mailet" );
// Loop through the mailet configuration, load
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
