You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by er...@apache.org on 2010/11/10 09:32:27 UTC

svn commit: r1033393 - /james/server/trunk/container-spring/src/main/config/james/mailetcontainer.xml

Author: eric
Date: Wed Nov 10 08:32:26 2010
New Revision: 1033393

URL: http://svn.apache.org/viewvc?rev=1033393&view=rev
Log:
Remove unneeded mailets (also the RemoteAddrNotInNetwork because we already have authorizedAddress and authRequired in smtpserver.xml).

Modified:
    james/server/trunk/container-spring/src/main/config/james/mailetcontainer.xml

Modified: james/server/trunk/container-spring/src/main/config/james/mailetcontainer.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/mailetcontainer.xml?rev=1033393&r1=1033392&r2=1033393&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/mailetcontainer.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/mailetcontainer.xml Wed Nov 10 08:32:26 2010
@@ -39,28 +39,18 @@
     <processor name="root">
        <mailet match="All" class="PostmasterAlias"/>
        <mailet match="RelayLimit=30" class="Null"/>
-       <mailet match="HasMailAttributeWithValue=org.apache.james.infected, true" class="ToProcessor">
-          <processor> virus </processor>
-       </mailet>
        <mailet match="SMTPAuthSuccessful" class="ToProcessor">
-          <processor> transport </processor>
+          <processor>transport</processor>
        </mailet>
-       <mailet match="InSpammerBlacklist=query.bondedsender.org."
-               class="ToProcessor">
-         <processor> transport </processor>
+       <mailet match="InSpammerBlacklist=query.bondedsender.org." class="ToProcessor">
+         <processor>transport</processor>
        </mailet>
        <mailet match="InSpammerBlacklist=dnsbl.njabl.org." class="ToProcessor">
-         <processor> spam </processor>
+         <processor>spam</processor>
          <notice>550 Requested action not taken: rejected - see http://njabl.org/ </notice>
        </mailet>
        <mailet match="All" class="ToProcessor">
-          <processor> transport </processor>
-       </mailet>
-    </processor>
-
-    <processor name="error">
-       <mailet match="All" class="ToRepository">
-          <repositoryPath> file://var/mail/error/</repositoryPath>
+          <processor>transport</processor>
        </mailet>
     </processor>
 
@@ -69,59 +59,45 @@
           <name>X-UserIsAuth</name>
           <value>true</value>
        </mailet>
-       <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
-          <name>X-WasSigned</name>
-          <value>true</value>
-       </mailet>
        <mailet match="All" class="VirtualUserTable">
            <virtualusertable>DefaultVirtualUserTable</virtualusertable>
        </mailet>
        <mailet match="RecipientIsLocal" class="LocalDelivery"/>
        <mailet match="HostIsLocal" class="ToProcessor">
-          <processor> local-address-error </processor>
+          <processor>local-address-error</processor>
           <notice>550 - Requested action not taken: no such user here</notice>
        </mailet>
-       <mailet match="RemoteAddrNotInNetwork=127.0.0.1" class="ToProcessor">
-          <processor> relay-denied </processor>
-          <notice>550 - Requested action not taken: relaying denied</notice>
-       </mailet>
        <mailet match="All" class="RemoteDelivery">
-          <outgoingQueue> outgoing</outgoingQueue>
-          <delayTime>  5 minutes </delayTime>
-          <delayTime> 10 minutes </delayTime>
-          <delayTime> 45 minutes </delayTime>
-          <delayTime>  2 hours </delayTime>
-          <delayTime>  3 hours </delayTime>
-          <delayTime>  6 hours </delayTime>
-          <maxRetries> 25 </maxRetries>
-          <maxDnsProblemRetries> 0 </maxDnsProblemRetries>
-          <deliveryThreads> 1 </deliveryThreads>
+          <outgoingQueue>outgoing</outgoingQueue>
+          <delayTime>5 minutes</delayTime>
+          <delayTime>10 minutes</delayTime>
+          <delayTime>45 minutes</delayTime>
+          <delayTime>2 hours</delayTime>
+          <delayTime>3 hours</delayTime>
+          <delayTime>6 hours</delayTime>
+          <maxRetries>25</maxRetries>
+          <maxDnsProblemRetries>0</maxDnsProblemRetries>
+          <deliveryThreads>1</deliveryThreads>
           <sendpartial>true</sendpartial>
           <bounceProcessor>bounces</bounceProcessor>
        </mailet>
     </processor>
 
-    <processor name="spam">
+    <processor name="error">
        <mailet match="All" class="ToRepository">
-          <repositoryPath>file://var/mail/spam/</repositoryPath>
+          <repositoryPath>file://var/mail/error/</repositoryPath>
        </mailet>
     </processor>
 
-    <processor name="virus">
-       <mailet match="All" class="SetMailAttribute">
-          <org.apache.james.infected>true, bouncing</org.apache.james.infected>
-       </mailet>
-       <mailet match="SMTPAuthSuccessful" class="Bounce">
-          <inline>heads</inline>
-          <attachment>none</attachment>
-          <notice> Warning: We were unable to deliver the message below because it was found infected by virus(es). </notice>
+    <processor name="spam">
+       <mailet match="All" class="ToRepository">
+          <repositoryPath>file://var/mail/spam/</repositoryPath>
        </mailet>
-       <mailet match="All" class="Null" />
     </processor>
 
     <processor name="local-address-error">
        <mailet match="All" class="ToRepository">
-          <repositoryPath> file://var/mail/address-error/</repositoryPath>
+          <repositoryPath>file://var/mail/address-error/</repositoryPath>
        </mailet>
     </processor>
 



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