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 jo...@apache.org on 2006/11/17 15:32:35 UTC

svn commit: r476151 [1/2] - in /james/server/sandbox/mailbox-namespaces: ./ phoenix-bin/bin/ src/conf/ src/java/org/apache/james/ src/java/org/apache/james/core/ src/java/org/apache/james/dnsserver/ src/java/org/apache/james/imapserver/ src/java/org/ap...

Author: joachim
Date: Fri Nov 17 06:32:31 2006
New Revision: 476151

URL: http://svn.apache.org/viewvc?view=rev&rev=476151
Log:
merged in changes from trunk

Added:
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractJunkHandler.java
      - copied unchanged from r476143, james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractJunkHandler.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/JunkScoreHandler.java
      - copied unchanged from r476143, james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/JunkScoreHandler.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/util/connection/ConnectionPerIpMap.java
      - copied unchanged from r476143, james/server/trunk/src/java/org/apache/james/util/connection/ConnectionPerIpMap.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/util/junkscore/
      - copied from r476143, james/server/trunk/src/java/org/apache/james/util/junkscore/
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/util/junkscore/ComposedJunkScore.java
      - copied unchanged from r476143, james/server/trunk/src/java/org/apache/james/util/junkscore/ComposedJunkScore.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/util/junkscore/JunkScore.java
      - copied unchanged from r476143, james/server/trunk/src/java/org/apache/james/util/junkscore/JunkScore.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/util/junkscore/JunkScoreConfigUtil.java
      - copied unchanged from r476143, james/server/trunk/src/java/org/apache/james/util/junkscore/JunkScoreConfigUtil.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/util/junkscore/JunkScoreImpl.java
      - copied unchanged from r476143, james/server/trunk/src/java/org/apache/james/util/junkscore/JunkScoreImpl.java
    james/server/sandbox/mailbox-namespaces/src/site/xdoc/usingTLS.xml
      - copied unchanged from r476143, james/server/trunk/src/site/xdoc/usingTLS.xml
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/imapserver/client/StatusClientCommand.java
      - copied unchanged from r476143, james/server/trunk/src/test/org/apache/james/imapserver/client/StatusClientCommand.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/imapserver/handler/session/StatusSessionTest.java
      - copied unchanged from r476143, james/server/trunk/src/test/org/apache/james/imapserver/handler/session/StatusSessionTest.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/mailboxmanager/wrapper/SessionMailboxWrapperTest.java
      - copied unchanged from r476143, james/server/trunk/src/test/org/apache/james/mailboxmanager/wrapper/SessionMailboxWrapperTest.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/smtpserver/JunkScoreHandlerTest.java
      - copied unchanged from r476143, james/server/trunk/src/test/org/apache/james/smtpserver/JunkScoreHandlerTest.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/smtpserver/MaxRcptHandlerTest.java
      - copied unchanged from r476143, james/server/trunk/src/test/org/apache/james/smtpserver/MaxRcptHandlerTest.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/util/junkscore/
      - copied from r476143, james/server/trunk/src/test/org/apache/james/util/junkscore/
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/util/junkscore/ComposedJunkScoreTest.java
      - copied unchanged from r476143, james/server/trunk/src/test/org/apache/james/util/junkscore/ComposedJunkScoreTest.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/util/junkscore/JunkScoreConfigUtilTest.java
      - copied unchanged from r476143, james/server/trunk/src/test/org/apache/james/util/junkscore/JunkScoreConfigUtilTest.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/util/junkscore/JunkScoreImplTest.java
      - copied unchanged from r476143, james/server/trunk/src/test/org/apache/james/util/junkscore/JunkScoreImplTest.java
Modified:
    james/server/sandbox/mailbox-namespaces/STATUS
    james/server/sandbox/mailbox-namespaces/build.xml
    james/server/sandbox/mailbox-namespaces/default.properties
    james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/james-server.sh
    james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/phoenix.sh
    james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/run.bat
    james/server/sandbox/mailbox-namespaces/pom.xml
    james/server/sandbox/mailbox-namespaces/src/conf/james-config.xml
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/Constants.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/James.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/core/AbstractJamesService.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/dnsserver/DNSServer.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapHandler.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapRequestHandler.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapResponse.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapServer.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/commands/ImapCommandFactory.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/commands/StatusCommand.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/mailbox/GeneralMailbox.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/tracking/MailboxCache.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/tracking/MailboxTracker.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/wrapper/NumberStableSessionWrapper.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/wrapper/SessionMailboxWrapper.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/services/JamesConnectionManager.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/MaxRcptHandler.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/transport/mailets/AbstractRedirect.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/transport/mailets/DSNBounce.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/util/connection/ServerConnection.java
    james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/util/connection/SimpleConnectionManager.java
    james/server/sandbox/mailbox-namespaces/src/site/xdoc/changelog.xml
    james/server/sandbox/mailbox-namespaces/src/site/xdoc/installation_instructions.xml
    james/server/sandbox/mailbox-namespaces/src/site/xdoc/provided_mailets.xml
    james/server/sandbox/mailbox-namespaces/src/site/xdoc/summary.xml
    james/server/sandbox/mailbox-namespaces/src/site/xdoc/using_database.xml
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/JamesTest.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/imapserver/handler/commands/AbstractCommandTest.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/mailboxmanager/AbstractImapMailboxSelfTestCase.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/mailboxmanager/AbstractMailboxManagerSelfTestCase.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTestCase.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/smtpserver/SMTPServerTest.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
    james/server/sandbox/mailbox-namespaces/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java

Modified: james/server/sandbox/mailbox-namespaces/STATUS
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/STATUS?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/STATUS (original)
+++ james/server/sandbox/mailbox-namespaces/STATUS Fri Nov 17 06:32:31 2006
@@ -5,16 +5,21 @@
 
   * http://svn.apache.org/repos/asf/james/server/trunk/STATUS
 
-Stable:
-    Current:        x.x.x    	
-    Maintenance:    x.x.x   
-    Development:    x.x.x
-
-Next Release:
+Releases:
+    Stable:         2.3.0
     Maintenance:    2.3.1   
-		Will contain defect fixes and minor enhancements tracked in JIRA
-    Development:    2.4.0
-		Will contain new features and major enhancements not yet agreed.
+        Will contain defect fixes tracked in JIRA
+    Next-Minor:     probably 2.4.0
+        Based on v2.3 branch, will contain selected backports from trunk.
+        config.xml and storage compatible with v2.3
+        ETA: branch on Nov/Dec 2006, release on Dec/Jan 2007
+    Next-Major:     name to be defined (2.4.0 / 2.5.0 / 3.0.0)
+        Will contain new features and major enhancements not yet agreed.
+        config.xml and storage compatible with v2.3
+        ETA: branch on Dec 2006/Jan 2007, release on Mar 2007
+    Next-Greater:
+        Will be included as soon as Next-Major will be branched from trunk.
+        Will include major non backward compatible changes.
 
 Votes:
 	Open:
@@ -31,28 +36,57 @@
 
 	Resolved:
 	
+
+Branches:
+
+    branch_2_1_fcs
+        Description:
+        
+    imap-dev
+        Description:
+        
+    java_apache
+        Description:
+        
+    v2-0a2candidate1
+        Description:
+        
+    v2-1-pop3file
+        Description:
+        
+    v2.3
+        Description:
     
 Sandbox:
+
     mailet-refactorings
+        Goal: code first formulation of proposals for next version of Mailet API
         Status: active
         Owner: danny
         Update: 03-11-1006 API refactorings of interfaces from james to mailet are 90% complete
                             Refactor service location function to JNDI is 10% complete
     
-
-Project Mission:
-
-Assets:
-    DNS:                james.apache.org
-
-    Mailing lists:      server-dev@james.apache.org
-                        server-user@james.apache.org
-						mailet-api@james.apache.org
-
-    Web site:           http://james.apache.org/
-	
-	Source repositories: svn.apache.org/repos/asf/james
+    spring-integration
+        Goal: run James Server using Spring Framework instead of Phoenix/Avalon
+        Status: completed prototype
+        Owner: berndf
     
-PMC Members
-
-Commiters
\ No newline at end of file
+    mailbox-namespaces
+        Goal:
+        Status: empty
+        Owner: joachim
+    
+    handlerapi2
+        Goal:
+        Status: 80% complete (stalled: last change 5 aug 2006)
+        Owner: noel, norman
+        
+    m2
+        Goal:
+        Status: unknown
+        Owner: adc (Alan D. Cabrera)
+        
+    osgi-experiments
+        Goal:
+        Status: unknown
+        Owner: joachim
\ No newline at end of file

Modified: james/server/sandbox/mailbox-namespaces/build.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/build.xml?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/build.xml (original)
+++ james/server/sandbox/mailbox-namespaces/build.xml Fri Nov 17 06:32:31 2006
@@ -441,7 +441,7 @@
                                   Build all distributions
     ===================================================================
     -->
-    <target name="dist" depends="dist-bin,dist-src,dist-mailet-SDK"/>
+    <target name="dist" depends="clean,run-unit-tests,dist-bin,dist-src,dist-mailet-SDK"/>
 
     <!--
     ===================================================================
@@ -467,7 +467,7 @@
                  excludes="org/apache/mailet/Mailet.class,org/apache/mailet/MailetConfig.class,org/apache/mailet/Mail.class,org/apache/mailet/MailetContext.class,org/apache/mailet/MailAddress.class,org/apache/mailet/MailRepository,org/apache/mailet/SpoolRepository,org/apache/mailet/UserRepository,org/apache/mailet/Datasource,org/apache/mailet/User,org/apache/mailet/MailetException"/>
        
         <!-- Make james jar-->
-        <echo message="Making James Jar (james-${version}.jar)"/>
+        <echo message="Making James Jar (${name}-${version}.jar)"/>
         <jar jarfile="${build.lib}/${name}-${version}.jar" basedir="${build.classes}" manifest="${src.dir}/Manifest.mf">
             <include name="org/apache/james/**"/>
             <include name="*.xml"/>
@@ -487,12 +487,12 @@
         <echo message="Making James Sarfile (james.sar)"/>
       
         <!-- Make sar file-->
-        <sar sarfile="${build.lib}/${name}.sar" config="${conf.dir}/james-config.xml"
+        <sar sarfile="${build.lib}/${sar-name}.sar" config="${conf.dir}/james-config.xml"
                environment="${conf.dir}/james-server.xml" assembly="${conf.dir}/james-assembly.xml">
             <lib dir="${build.lib}/">
                 <include name="mailet-api-${mailet-api-version}.jar"/>
                 <include name="mailet-${mailet-version}.jar"/>
-                <include name="james-${version}.jar"/>         
+                <include name="${name}-${version}.jar"/>         
             </lib>
             <lib dir="${lib.dir}">
                 <include name="${dns.jar}"/>
@@ -571,7 +571,7 @@
         <echo message="Installing James to ${dist.dir}"/>
       
         <!--installs sar into ./dist/ ready to test-->
-        <copy file="${build.lib}/${name}.sar" todir="${dist.dir}/apps"/>
+        <copy file="${build.lib}/${sar-name}.sar" todir="${dist.dir}/apps"/>
       
         <!-- Make mailet.jar-->
         <!-- jar jarfile="${build.lib}/mailet.jar"
@@ -623,7 +623,7 @@
         <property name="dist.binary.dir" value="${dist.dir}/downloads/bin"/>
         <mkdir dir="${dist.binary.dir}"/>
         <!-- Sar only-->
-        <copy file="${dist.dir}/apps/${name}.sar" todir="${dist.binary.dir}"/>
+        <copy file="${dist.dir}/apps/${sar-name}.sar" todir="${dist.binary.dir}"/>
     </target>
 
     <target name="dist-bin" depends="dist-bin-common,dist-bin-phoenix-warn,dist-bin-phoenix"/>
@@ -801,6 +801,31 @@
                 <exclude name="**/AllTests.java"/>
                 <exclude name="**/Abstract*.java"/>
               </fileset>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="ensure-test-name" unless="test">
+        <fail message="You must run this target with -Dtest=TestName"/>
+    </target>
+
+    <target name="run-unit-test" depends="compile-unit-tests, ensure-test-name">
+        <echo message="Running A Single James Unit Test"/>
+        <mkdir dir="${build.test}"/>
+        <mkdir dir="${build.test.reports}"/>
+        <junit printsummary="yes" haltonfailure="yes"  >
+            <classpath refid="unittest.class.path"/>
+            <classpath refid="project.class.path"/>
+            <classpath>
+              <pathelement location="${build.test.classes}"/>
+            </classpath>
+        
+            <formatter type="plain"/>
+        
+            <batchtest fork="yes" todir="${build.test.reports}">
+                <fileset dir="${junitjava.dir}">
+                    <include name="**/${test}.java"/>
+                </fileset>
             </batchtest>
         </junit>
     </target>

Modified: james/server/sandbox/mailbox-namespaces/default.properties
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/default.properties?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/default.properties (original)
+++ james/server/sandbox/mailbox-namespaces/default.properties Fri Nov 17 06:32:31 2006
@@ -6,11 +6,12 @@
 # Not user-editable; use ant.properties files instead
 # See also: include.properties
 
-name=james
+name=james-server
+sar-name=james
 Name=James Mail Server
-version=3.0-dev
-mailet-version=3.0
-mailet-api-version=3.0
+version=next-major
+mailet-version=2.4
+mailet-api-version=2.4
 #package-version=3.0a1
 year=1999-2006
 extension.name=org.apache.james

Modified: james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/james-server.sh
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/james-server.sh?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/james-server.sh (original)
+++ james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/james-server.sh Fri Nov 17 06:32:31 2006
@@ -137,6 +137,9 @@
   JVM_OPTS="$JVM_OPTS -Djava.security.manager"
 fi
 
+# Make sure we don't run with a never expiring cache for InetAddress
+PHOENIX_JVM_OPTS="$PHOENIX_JVM_OPTS -Dsun.net.inetaddr.ttl=10"
+
 # change to the bin directory
 cd $PHOENIX_HOME/bin
 

Modified: james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/phoenix.sh
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/phoenix.sh?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/phoenix.sh (original)
+++ james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/phoenix.sh Fri Nov 17 06:32:31 2006
@@ -133,6 +133,9 @@
   JVM_OPTS="$JVM_OPTS -Djava.security.manager"
 fi
 
+# Make sure we don't run with a never expiring cache for InetAddress
+PHOENIX_JVM_OPTS="$PHOENIX_JVM_OPTS -Dsun.net.inetaddr.ttl=10"
+
 # change to the bin directory
 cd $PHOENIX_HOME/bin
 

Modified: james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/run.bat
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/run.bat?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/run.bat (original)
+++ james/server/sandbox/mailbox-namespaces/phoenix-bin/bin/run.bat Fri Nov 17 06:32:31 2006
@@ -76,6 +76,10 @@
 
 :postSecure
 
+
+rem Make sure we don't run with a never expiring cache for InetAddress
+set PHOENIX_JVM_OPTS=%PHOENIX_JVM_OPTS% -Dsun.net.inetaddr.ttl=10
+
 rem
 rem -Djava.ext.dirs= is needed as some JVM vendors do foolish things
 rem like placing jaxp/jaas/xml-parser jars in ext dir

Modified: james/server/sandbox/mailbox-namespaces/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/pom.xml?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/pom.xml (original)
+++ james/server/sandbox/mailbox-namespaces/pom.xml Fri Nov 17 06:32:31 2006
@@ -403,6 +403,12 @@
     </dependency>
 
     <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j-jmx</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+
+    <dependency>
       <groupId>torque</groupId>
       <artifactId>torque</artifactId>
       <version>3.2</version>

Modified: james/server/sandbox/mailbox-namespaces/src/conf/james-config.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/conf/james-config.xml?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/conf/james-config.xml (original)
+++ james/server/sandbox/mailbox-namespaces/src/conf/james-config.xml Fri Nov 17 06:32:31 2006
@@ -155,6 +155,8 @@
   <!-- Experimental IMAP support -->
 	
    <imapserver enabled="true">
+      <!-- port 993 is the well-known/IANA registered port for IMAPs ie over SSL/TLS -->
+      <!-- port 143 is the well-known/IANA registered port for Standard IMAP4 -->
       <port>10143</port>
       <handler>
        <streamdump enabled="true" directory="../apps/james/streamdump" />

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/Constants.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/Constants.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/Constants.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/Constants.java Fri Nov 17 06:32:31 2006
@@ -58,5 +58,15 @@
      * Avalon aware Mailets.
      */
     public static final String AVALON_COMPONENT_MANAGER = "AVALON_COMP_MGR";
+    
+    /**
+     * Key used to store the hostaddress of the localhost
+     */
+    public static final String HOSTADDRESS = "LOCAL_HOSTADDRESS";
+    
+    /**
+     * Key used to store the hostname of localhost
+     */
+    public static final String HOSTNAME = "LOCAL_HOSTNAME";
 
 }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/James.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/James.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/James.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/James.java Fri Nov 17 06:32:31 2006
@@ -259,6 +259,14 @@
         java.io.File configDir = fileSystem.getFile("file://conf/");
         attributes.put("confDir", configDir.getCanonicalPath());
 
+        try {
+            attributes.put(Constants.HOSTADDRESS, lookupDNSServer().getLocalHost().getHostAddress());
+            attributes.put(Constants.HOSTNAME, lookupDNSServer().getLocalHost().getHostName());
+        } catch (java.net.UnknownHostException _) {
+            attributes.put(Constants.HOSTADDRESS, "127.0.0.1");
+            attributes.put(Constants.HOSTNAME, "localhost");
+        }
+        
         initializeLocalDeliveryMailet();
 
         System.out.println(SOFTWARE_NAME_VERSION);

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/core/AbstractJamesService.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/core/AbstractJamesService.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/core/AbstractJamesService.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/core/AbstractJamesService.java Fri Nov 17 06:32:31 2006
@@ -48,6 +48,7 @@
 import org.apache.james.util.watchdog.Watchdog;
 import org.apache.james.util.watchdog.WatchdogFactory;
 
+import java.net.BindException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.UnknownHostException;
@@ -181,6 +182,9 @@
      * The DNSServer
      */
     private DNSServer dnsServer = null;
+    
+    private boolean connPerIPConfigured = false;
+    private int connPerIP = 0;
 
     public void setConnectionManager(JamesConnectionManager connectionManager) {
         this.connectionManager = connectionManager;
@@ -310,6 +314,29 @@
             .append(connectionLimit.intValue())
             .append(" connections.");
         getLogger().info(infoBuffer.toString());
+        
+        String connectionLimitPerIP = conf.getChild("connectionLimitPerIP").getValue(null);
+        if (connectionLimitPerIP != null) {
+            try {
+            connPerIP = new Integer(connectionLimitPerIP).intValue();
+            connPerIPConfigured = true;
+            } catch (NumberFormatException nfe) {
+                getLogger().error("Connection limit per IP value is not properly formatted.", nfe);
+            }
+            if (connPerIP < 0) {
+                getLogger().error("Connection limit per IP value cannot be less than zero.");
+                throw new ConfigurationException("Connection limit value cannot be less than zero.");
+            }
+        } else {
+            connPerIP = connectionManager.getMaximumNumberOfOpenConnectionsPerIP();
+        }
+        infoBuffer = new StringBuffer(128)
+            .append(getServiceType())
+            .append(" will allow a maximum of ")
+            .append(connPerIP)
+            .append(" per IP connections for " +getServiceType());
+        getLogger().info(infoBuffer.toString());
+        
     }
 
     private void configureHelloName(Configuration handlerConfiguration) {
@@ -383,6 +410,41 @@
     }
 
     private void initializeServerSocket(SocketManager socketManager) throws Exception {
+        try {
+            initializeServerSocketWorker(socketManager);
+        } catch (BindException e) {
+            // handle a common exception and give detailed error message
+            String errorMessage = getBindingErrorMessage(e);
+            System.out.println("------------------------------");
+            System.out.println(errorMessage);
+            System.out.println("------------------------------");
+            getLogger().fatalError(errorMessage);
+            throw e;
+        }       
+    }
+     
+    private String getBindingErrorMessage(BindException e) {
+        // general info about binding error
+        StringBuffer errorMessage = new StringBuffer();
+        errorMessage.append("FATAL ERROR when starting service '").append(getServiceType()).append("'! ");
+        errorMessage.append("could not bind to ");
+        errorMessage.append(bindTo == null ? "0.0.0.0" : bindTo.toString());
+        errorMessage.append(":").append(port).append(". ");
+        
+        // try to deliver more specific information 
+        if (e.getMessage().indexOf("Address already in use") != -1) {
+            errorMessage.append("Port is already exclusively in use by another application.");
+        } else if (e.getMessage().indexOf("Permission denied") != -1) {
+            errorMessage.append("The user account James is running under has not enough privileges to bind to this ");
+            if (port < 1024) errorMessage.append("privileged ");
+            errorMessage.append("port.");
+        } else {
+            errorMessage.append(e.getMessage());
+        }
+        return errorMessage.toString();
+    }
+
+    private void initializeServerSocketWorker(SocketManager socketManager) throws Exception {
         ServerSocketFactory factory = socketManager.getServerSocketFactory(serverSocketType);
         ServerSocket serverSocket = factory.createServerSocket(port, backlog, bindTo);
 
@@ -401,15 +463,31 @@
 
         if ((connectionLimit != null)) {
             if (null != threadPool) {
+            if (connPerIPConfigured) {
+                    connectionManager.connect(connectionName, serverSocket, this, threadPool, connectionLimit.intValue(),connPerIP);
+            } else {
                 connectionManager.connect(connectionName, serverSocket, this, threadPool, connectionLimit.intValue());
+            }
             } else {
-                connectionManager.connect(connectionName, serverSocket, this, connectionLimit.intValue()); // default pool
+            if (connPerIPConfigured) {
+                    connectionManager.connect(connectionName, serverSocket, this, connectionLimit.intValue(),connPerIP); // default pool
+                } else {
+                    connectionManager.connect(connectionName, serverSocket, this, connectionLimit.intValue());
+                }
             }
         } else {
             if (null != threadPool) {
-                connectionManager.connect(connectionName, serverSocket, this, threadPool);
+            if (connPerIPConfigured) {
+                    connectionManager.connect(connectionName, serverSocket, this, threadPool);
+            } else {
+                connectionManager.connect(connectionName, serverSocket, this, threadPool, 0, connPerIP);
+            }
+            } else {
+            if (connPerIPConfigured) {
+                    connectionManager.connect(connectionName, serverSocket, this); // default pool
             } else {
-                connectionManager.connect(connectionName, serverSocket, this); // default pool
+                    connectionManager.connect(connectionName, serverSocket, this, 0, connPerIP);
+            }
             }
         }
     }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/dnsserver/DNSServer.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/dnsserver/DNSServer.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/dnsserver/DNSServer.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/dnsserver/DNSServer.java Fri Nov 17 06:32:31 2006
@@ -89,6 +89,11 @@
      * The DNS servers to be used by this service
      */
     private List dnsServers = new ArrayList();
+    
+    /**
+     * The search paths to be used
+     */
+    private Name[] searchPaths = null;
 
     /**
      * The MX Comparator used in the MX sort.
@@ -100,6 +105,12 @@
      * when looking up SMTPServers
      */
     private boolean singleIPPerMX;
+    
+    /**
+     * If true register this service as the default resolver/cache for DNSJava static
+     * calls
+     */
+    private boolean setAsDNSJavaDefault;
 
     /**
      * @see org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
@@ -110,6 +121,7 @@
         final boolean autodiscover =
             configuration.getChild( "autodiscover" ).getValueAsBoolean( true );
 
+        List sPaths = new ArrayList();
         if (autodiscover) {
             getLogger().info("Autodiscovery is enabled - trying to discover your system's DNS Servers");
             String[] serversArray = ResolverConfig.getCurrentConfig().servers();
@@ -119,9 +131,21 @@
                     getLogger().info("Adding autodiscovered server " + serversArray[i]);
                 }
             }
+            Name[] systemSearchPath = ResolverConfig.getCurrentConfig().searchPath();
+            if (systemSearchPath != null && systemSearchPath.length > 0) {
+                sPaths.addAll(Arrays.asList(systemSearchPath));
+            }
+            if (getLogger().isInfoEnabled()) {
+                for (Iterator i = sPaths.iterator(); i.hasNext();) {
+                    Name searchPath = (Name) i.next();
+                    getLogger().info("Adding autodiscovered search path " + searchPath.toString());
+                }
+            }
         }
 
         singleIPPerMX = configuration.getChild( "singleIPperMX" ).getValueAsBoolean( false ); 
+
+        setAsDNSJavaDefault = configuration.getChild( "setAsDNSJavaDefault" ).getValueAsBoolean( true );
         
         // Get the DNS servers that this service will use for lookups
         final Configuration serversConfiguration = configuration.getChild( "servers" );
@@ -132,6 +156,21 @@
             dnsServers.add( serverConfigurations[ i ].getValue() );
         }
 
+        // Get the DNS servers that this service will use for lookups
+        final Configuration searchPathsConfiguration = configuration.getChild( "searchpaths" );
+        final Configuration[] searchPathsConfigurations =
+            searchPathsConfiguration.getChildren( "searchpath" );
+
+        for ( int i = 0; i < searchPathsConfigurations.length; i++ ) {
+            try {
+                sPaths.add( Name.fromString(searchPathsConfigurations[ i ].getValue()) );
+            } catch (TextParseException e) {
+                throw new ConfigurationException("Unable to parse searchpath host: "+searchPathsConfigurations[ i ].getValue(),e);
+            }
+        }
+        
+        searchPaths = (Name[]) sPaths.toArray(new Name[0]);
+
         if (dnsServers.isEmpty()) {
             getLogger().info("No DNS servers have been specified or found by autodiscovery - adding 127.0.0.1");
             dnsServers.add("127.0.0.1");
@@ -174,7 +213,6 @@
 
         try {
             resolver = new ExtendedResolver( serversArray );
-            Lookup.setDefaultResolver(resolver);
         } catch (UnknownHostException uhe) {
             getLogger().fatalError("DNS service could not be initialized.  The DNS servers specified are not recognized hosts.", uhe);
             throw uhe;
@@ -182,7 +220,13 @@
 
         cache = new Cache (DClass.IN);
         cache.setMaxEntries(maxCacheSize);
-        Lookup.setDefaultCache(cache, DClass.IN);
+        
+        if (setAsDNSJavaDefault) {
+            Lookup.setDefaultResolver(resolver);
+            Lookup.setDefaultCache(cache, DClass.IN);
+            Lookup.setDefaultSearchPath(searchPaths);
+            getLogger().info("Registered cache, resolver and search paths as DNSJava defaults");
+        }
         
         getLogger().debug("DNSServer ...init end");
     }
@@ -196,6 +240,15 @@
         return (String[])dnsServers.toArray(new String[0]);
     }
 
+    /**
+     * <p>Return the list of DNS servers in use by this service</p>
+     *
+     * @return an array of DNS server names
+     */
+    public Name[] getSearchPaths() {
+        return searchPaths;
+    }
+
     
     /**
      * <p>Return a prioritized unmodifiable list of MX records
@@ -279,6 +332,7 @@
             l.setCache(cache);
             l.setResolver(resolver);
             l.setCredibility(dnsCredibility);
+            l.setSearchPath(searchPaths);
             return l.run();
             // return rawDNSLookup(name, false, type, typeDesc);
         } catch (TextParseException tpe) {
@@ -467,13 +521,16 @@
      * @see org.apache.james.services.DNSServer#getHostName(java.net.InetAddress)
      */
     public String getHostName(InetAddress addr){
+        String result = null;
         Name name = ReverseMap.fromAddress(addr);
         Record [] records = lookup(name.toString(), Type.PTR, "PTR");
         if (records == null) {
-            addr.getHostAddress();
+            result = addr.getHostAddress();
+        } else {
+            PTRRecord ptr = (PTRRecord) records[0];
+            result = ptr.getTarget().toString();
         }
-        PTRRecord ptr = (PTRRecord) records[0];
-        return ptr.getTarget().toString();
+        return result;
     }
 
     /**

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapHandler.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapHandler.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapHandler.java Fri Nov 17 06:32:31 2006
@@ -34,6 +34,7 @@
 import org.apache.avalon.excalibur.pool.Poolable;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.james.Constants;
 import org.apache.james.imapserver.debug.CopyInputStream;
 import org.apache.james.imapserver.debug.SplitOutputStream;
@@ -53,7 +54,7 @@
 {
 
     private String softwaretype = "JAMES IMAP4rev1 Server " + Constants.SOFTWARE_VERSION;
-    private ImapRequestHandler requestHandler = new ImapRequestHandler();
+    private final ImapRequestHandler requestHandler = new ImapRequestHandler();
     private ImapSession session;
 
     /**
@@ -104,6 +105,14 @@
     
     private boolean handlerIsUp=false;
 
+    /**
+     * @see org.apache.avalon.framework.logger.AbstractLogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
+     */
+    public void enableLogging(Logger logger) { 
+        super.enableLogging(logger); 
+        setupLogger(requestHandler); 
+    }
+    
     /**
      * Set the configuration data for the handler.
      *

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapRequestHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapRequestHandler.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapRequestHandler.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapRequestHandler.java Fri Nov 17 06:32:31 2006
@@ -22,6 +22,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.james.imapserver.commands.CommandParser;
 import org.apache.james.imapserver.commands.ImapCommand;
 import org.apache.james.imapserver.commands.ImapCommandFactory;
@@ -29,13 +31,21 @@
 /**
  * @version $Revision: 109034 $
  */
-public final class ImapRequestHandler
-{
-    private ImapCommandFactory imapCommands = new ImapCommandFactory();
+public final class ImapRequestHandler extends AbstractLogEnabled {
+    
+    private final ImapCommandFactory imapCommands = new ImapCommandFactory();
     private CommandParser parser = new CommandParser();
     private static final String REQUEST_SYNTAX = "Protocol Error: Was expecting <tag SPACE command [arguments]>";
 
     /**
+     * @see org.apache.avalon.framework.logger.AbstractLogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
+     */
+    public void enableLogging(Logger logger) { 
+        super.enableLogging(logger);
+        setupLogger(imapCommands);
+    }
+    
+    /**
      * This method parses POP3 commands read off the wire in handleConnection.
      * Actual processing of the command (possibly including additional back and
      * forth communication with the client) is delegated to one of a number of
@@ -59,6 +69,7 @@
         }
 
         ImapResponse response = new ImapResponse( output );
+        response.enableLogging(getLogger()); 
 
         doProcessRequest( request, response, session );
 
@@ -84,7 +95,11 @@
             return;
         }
 
-//        System.out.println( "Got <tag>: " + tag );
+        final Logger logger = getLogger(); 
+        if (logger.isDebugEnabled()) { 
+            logger.debug( "Got <tag>: " + tag );
+        }
+        
         response.setTag( tag );
         try {
             commandName = parser.atom( request );
@@ -94,7 +109,10 @@
             return;
         }
 
-//        System.out.println( "Got <command>: " + commandName );
+        if (logger.isDebugEnabled()) { 
+            logger.debug( "Got <command>: " + commandName); 
+        }
+        
         ImapCommand command = imapCommands.getCommand( commandName );
         if ( command == null )
         {

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapResponse.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapResponse.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapResponse.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapResponse.java Fri Nov 17 06:32:31 2006
@@ -24,6 +24,8 @@
 
 import javax.mail.Flags;
 
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.james.imapserver.commands.ImapCommand;
 import org.apache.james.imapserver.store.MessageFlags;
 import org.apache.james.util.InternetPrintWriter;
@@ -32,8 +34,8 @@
  * Class providing methods to send response messages from the server
  * to the client.
  */
-public class ImapResponse implements ImapConstants
-{
+public class ImapResponse  extends AbstractLogEnabled implements ImapConstants {
+    
     private PrintWriter writer;
     private String tag = UNTAGGED;
 
@@ -113,6 +115,10 @@
         message( "failed." );
         message( reason );
         end();
+        final Logger logger = getLogger();
+        if (logger.isInfoEnabled()) {
+            logger.info("COMMAND FAILED [" + responseCode + "] - " + reason);
+        }
     }
 
     /**
@@ -129,6 +135,10 @@
         message( BAD );
         message( message );
         end();
+        final Logger logger = getLogger();
+        if (logger.isInfoEnabled()) {
+            logger.info("ERROR - " + message); 
+        }
     }
 
     /**
@@ -140,6 +150,10 @@
         message( BAD );
         message( message );
         end();
+        final Logger logger = getLogger(); 
+        if (logger.isInfoEnabled()) { 
+            logger.info("BAD - " + message); 
+        }
     }
 
     /**

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapServer.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapServer.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapServer.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/ImapServer.java Fri Nov 17 06:32:31 2006
@@ -21,11 +21,11 @@
 
 import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
 import org.apache.avalon.excalibur.pool.ObjectFactory;
-import org.apache.avalon.excalibur.pool.Pool;
 import org.apache.avalon.excalibur.pool.Poolable;
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.core.AbstractJamesService;
@@ -173,7 +173,11 @@
          */
         public Object newInstance() throws Exception
         {
-            return new ImapHandler();
+            final ImapHandler imapHandler = new ImapHandler(); 
+            final Logger logger = getLogger(); 
+            logger.debug("Create handler instance"); 
+            setupLogger(imapHandler); 
+            return imapHandler; 
         }
 
         /**

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/commands/ImapCommandFactory.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/commands/ImapCommandFactory.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/commands/ImapCommandFactory.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/commands/ImapCommandFactory.java Fri Nov 17 06:32:31 2006
@@ -24,7 +24,7 @@
 
 import org.apache.avalon.framework.CascadingRuntimeException;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 
 /**
  * A factory for ImapCommand instances, provided based on the command name.
@@ -103,10 +103,12 @@
 
     private ImapCommand createCommand( Class commandClass )
     {
+        final Logger logger = getLogger(); 
         try {
             ImapCommand cmd = ( ImapCommand ) commandClass.newInstance();
-            if ( cmd instanceof LogEnabled ) {
-                ( ( LogEnabled ) cmd ).enableLogging( getLogger() );
+            setupLogger(cmd);
+            if (logger.isDebugEnabled()) {
+                logger.debug("Created command " + commandClass); 
             }
             if ( cmd instanceof UidCommand ) {
                 ( ( UidCommand) cmd ).setCommandFactory( this );
@@ -114,6 +116,9 @@
             return cmd;
         }
         catch ( Exception e ) {
+            if (logger.isWarnEnabled()) {
+                logger.warn("Create command instance failed: ", e);
+            }
             throw new CascadingRuntimeException( "Could not create command instance: " + commandClass.getName(), e );
         }
     }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/commands/StatusCommand.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/commands/StatusCommand.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/commands/StatusCommand.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/imapserver/commands/StatusCommand.java Fri Nov 17 06:32:31 2006
@@ -19,6 +19,7 @@
 
 package org.apache.james.imapserver.commands;
 
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.james.imapserver.ImapRequestLineReader;
 import org.apache.james.imapserver.ImapResponse;
 import org.apache.james.imapserver.ImapSession;
@@ -55,12 +56,20 @@
         StatusDataItems statusDataItems = parser.statusDataItems( request );
         parser.endLine( request );
 
-        ImapMailboxSession mailbox = session.getSelected().getMailbox();
+        final Logger logger = getLogger(); 
 
         StringBuffer buffer = new StringBuffer( mailboxName );
         buffer.append( SP );
         buffer.append( "(" );
         try {
+            String fullMailboxName= session.buildFullName(mailboxName);
+            
+            if (logger.isDebugEnabled()) { 
+                logger.debug("Status called on mailbox named " + mailboxName + " (" + fullMailboxName + ")"); 
+            }
+            
+            ImapMailboxSession mailbox = session.getMailboxManager().getImapMailboxSession(fullMailboxName);
+            
             if (statusDataItems.messages) {
                 buffer.append(MESSAGES);
                 buffer.append(SP);
@@ -98,6 +107,9 @@
                 buffer.append(SP);
             }
         } catch (MailboxManagerException e) {
+            if (logger.isDebugEnabled()) { 
+                logger.debug("STATUS command failed: ", e); 
+            }
             throw new MailboxException(e);
         }
         if ( buffer.charAt( buffer.length() - 1 ) == ' ' ) {

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java Fri Nov 17 06:32:31 2006
@@ -19,6 +19,8 @@
 
 package org.apache.james.mailboxmanager.impl;
 
+import java.util.Map;
+
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
@@ -130,6 +132,11 @@
     public void initialize() throws Exception {
         ContainerUtil.service(mailboxManagerFactory, serviceManager);
         ContainerUtil.initialize(mailboxManagerFactory);
+    }
+
+    public Map getOpenMailboxSessionCountMap() {
+        // TODO Auto-generated method stub
+        return null;
     }
 
 }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/mailbox/GeneralMailbox.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/mailbox/GeneralMailbox.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/mailbox/GeneralMailbox.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/mailbox/GeneralMailbox.java Fri Nov 17 06:32:31 2006
@@ -27,7 +27,7 @@
 import org.apache.james.mailboxmanager.MailboxManagerException;
 import org.apache.james.mailboxmanager.MessageResult;
 
-public interface GeneralMailbox extends Mailbox {
+public interface GeneralMailbox extends Mailbox, EventTriggerMailbox {
     
     /**
      * 

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java Fri Nov 17 06:32:31 2006
@@ -19,6 +19,8 @@
 
 package org.apache.james.mailboxmanager.manager;
 
+import java.util.Map;
+
 import org.apache.james.mailboxmanager.MailboxManagerException;
 import org.apache.james.mailboxmanager.Namespace;
 import org.apache.james.mailboxmanager.Namespaces;
@@ -39,9 +41,11 @@
     
     MailboxSession getInboxSession(User user) throws MailboxManagerException;
 
-    /** @param authUser the authorized User for checking credentials 
-        @param mailboxName a logical/hierarchical mailbox name *
-     * @throws MailboxManagerException */ 
+    /** 
+     *  @param authUser the authorized User for checking credentials 
+     *  @param mailboxName a logical/hierarchical mailbox name *
+     *  @throws MailboxManagerException 
+     */ 
 
     MailboxSession getMailboxSession(
          User authUser, String mailboxName) throws MailboxManagerException;
@@ -76,5 +80,13 @@
      */
     Namespace getPersonalDefaultNamespace(User forUser);
 
-
+    /**
+     * key: <b>String</b> - mailbox name <br />
+     * value: <b>Integer</b> - count of open sessions <br />
+     * <br />
+     * useful for testing
+     * @return Map of mailbox name/open session count
+     */
+    
+    Map getOpenMailboxSessionCountMap();
 }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java Fri Nov 17 06:32:31 2006
@@ -483,8 +483,9 @@
     public synchronized long getUidNext() throws MailboxManagerException {
         checkAccess();
         try {
-            MailboxRow myMailboxRow = MailboxRowPeer.retrieveByPK(mailboxRow.getLastUid());
+            MailboxRow myMailboxRow = MailboxRowPeer.retrieveByPK(mailboxRow.getPrimaryKey());
             if (myMailboxRow != null) {
+                mailboxRow=myMailboxRow;
                 getUidChangeTracker().foundLastUid(mailboxRow.getLastUid());
                 return getUidChangeTracker().getLastUid() + 1;
             } else {
@@ -531,8 +532,13 @@
     }
 
     public MessageResult[] search(GeneralMessageSet set, SearchTerm searchTerm, int result) {
-        // TODO Auto-generated method stub
-        return null;
+        final Log log = getLog();
+        // TODO implementation
+        if (log.isWarnEnabled()) {
+            log.warn("Search is not yet implemented. Sorry.");
+        }
+        MessageResult[] results = {};
+        return results;
     }
 
 }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java Fri Nov 17 06:32:31 2006
@@ -305,9 +305,4 @@
         return log;
     }
 
-    public void addMountPoint(String attribute) {
-        // TODO Auto-generated method stub
-        
-    }
-
 }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/tracking/MailboxCache.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/tracking/MailboxCache.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/tracking/MailboxCache.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/tracking/MailboxCache.java Fri Nov 17 06:32:31 2006
@@ -1,6 +1,26 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ ****************************************************************/
+
 package org.apache.james.mailboxmanager.tracking;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 
@@ -46,6 +66,17 @@
             tracker.signalRename(newName);
         }
         notFound(origName);
+    }
+    
+    public synchronized Map getOpenMailboxSessionCountMap() {
+        Map countMap = new HashMap();
+        for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext();) {
+            Map.Entry entry = (Map.Entry) iter.next();
+            String name = (String) entry.getKey();
+            MailboxTracker tracker = (MailboxTracker) entry.getValue();
+            countMap.put(name,new Integer(tracker.getSessionCount()));
+        }
+        return countMap;
     }
 
 }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/tracking/MailboxTracker.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/tracking/MailboxTracker.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/tracking/MailboxTracker.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/tracking/MailboxTracker.java Fri Nov 17 06:32:31 2006
@@ -1,3 +1,22 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ ****************************************************************/
+
 package org.apache.james.mailboxmanager.tracking;
 
 import org.apache.james.mailboxmanager.MailboxListener;
@@ -50,6 +69,10 @@
     public void signalRename(String newName) {
         eventDispatcher.mailboxRenamed(mailboxName, newName);
         mailboxName=newName;
+    }
+    
+    public int getSessionCount() {
+        return eventDispatcher.size();
     }
 
 }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/wrapper/NumberStableSessionWrapper.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/wrapper/NumberStableSessionWrapper.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/wrapper/NumberStableSessionWrapper.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/wrapper/NumberStableSessionWrapper.java Fri Nov 17 06:32:31 2006
@@ -35,7 +35,6 @@
 import org.apache.james.mailboxmanager.impl.MessageResultImpl;
 import org.apache.james.mailboxmanager.mailbox.AbstractGeneralMailbox;
 import org.apache.james.mailboxmanager.mailbox.EventQueueingSessionMailbox;
-import org.apache.james.mailboxmanager.mailbox.EventTriggerMailbox;
 import org.apache.james.mailboxmanager.mailbox.GeneralMailbox;
 
 public abstract class NumberStableSessionWrapper extends AbstractGeneralMailbox implements EventQueueingSessionMailbox,
@@ -51,11 +50,23 @@
 
     private MailboxEventDispatcher eventDispatcher = new MailboxEventDispatcher();
     
+    
+    public NumberStableSessionWrapper() {
+    }
+    
     public NumberStableSessionWrapper(GeneralMailbox generalMailbox) throws MailboxManagerException {
+        setMailbox(generalMailbox);
+        init();
+    }
+    
+    public void setMailbox(GeneralMailbox generalMailbox) {
         this.mailbox=generalMailbox;
-        ((EventTriggerMailbox)mailbox).addListener(eventDispatcher, MessageResult.UID);
+    }
+
+    public void init() throws MailboxManagerException {
+        mailbox.addListener(eventDispatcher, MessageResult.UID);
         getNumberCache();
-        eventDispatcher.addMailboxListener(this);
+        eventDispatcher.addMailboxListener(this);        
     }
 
     protected UidToMsnBidiMap getNumberCache() throws MailboxManagerException {
@@ -182,6 +193,20 @@
 
     public void removeListener(MailboxListener listener) {
         eventDispatcher.removeMailboxListener(listener);
+    }
+    
+    public void close() {
+        mailbox.removeListener(eventDispatcher);
+        mailbox=null;
+    }
+    
+    /**
+     * for testing
+     * @return the listener this class uses to subscribe to Mailbox events
+     */
+    
+    MailboxListener getListenerObject() {
+        return eventDispatcher;
     }
 
 }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/wrapper/SessionMailboxWrapper.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/wrapper/SessionMailboxWrapper.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/wrapper/SessionMailboxWrapper.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/mailboxmanager/wrapper/SessionMailboxWrapper.java Fri Nov 17 06:32:31 2006
@@ -1,3 +1,22 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ ****************************************************************/
+
 package org.apache.james.mailboxmanager.wrapper;
 
 import java.util.Date;
@@ -7,12 +26,14 @@
 import org.apache.james.mailboxmanager.GeneralMessageSet;
 import org.apache.james.mailboxmanager.MailboxManagerException;
 import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.mailbox.FlaggedMailbox;
 import org.apache.james.mailboxmanager.mailbox.GeneralMailbox;
 import org.apache.james.mailboxmanager.mailbox.MailboxSession;
 
 public class SessionMailboxWrapper extends NumberStableSessionWrapper implements MailboxSession {
 
+    public SessionMailboxWrapper() {
+    }
+    
     public SessionMailboxWrapper(GeneralMailbox generalMailbox) throws MailboxManagerException {
         super(generalMailbox);
     }
@@ -46,10 +67,6 @@
 
     public MessageResult updateMessage(GeneralMessageSet messageSet, MimeMessage message, int result) throws MailboxManagerException {
         return addMsnResult(mailbox.updateMessage(toUidSet(messageSet), message, noMsnResult(result)),result);
-    }
-
-    public void close() {
-        // TODO Auto-generated method stub
     }
 
     public boolean isWriteable() {

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/services/JamesConnectionManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/services/JamesConnectionManager.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/services/JamesConnectionManager.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/services/JamesConnectionManager.java Fri Nov 17 06:32:31 2006
@@ -114,5 +114,51 @@
                   ConnectionHandlerFactory handlerFactory )
         throws Exception;
     
+    /**
+     * Start managing a connection.
+     * Management involves accepting connections and farming them out to threads
+     * from pool to be handled.
+     *
+     * @param name the name of connection
+     * @param socket the ServerSocket from which to
+     * @param handlerFactory the factory from which to acquire handlers
+     * @param threadPool the thread pool to use
+     * @param maxOpenConnections the maximum number of open connections allowed for this server socket.
+     * @param maxOpenConnectionsPerIP the maximum number of open connections per IP allowed for this server socket.
+     * @throws Exception
+     */
+    void connect( String name,
+            ServerSocket socket,
+            ConnectionHandlerFactory handlerFactory,
+            ThreadPool threadPool,
+            int maxOpenConnections,
+            int maxOpenConnectionsPerIP)
+            throws Exception;
 
+    /**
+     * Start managing a connection.
+     * Management involves accepting connections and farming them out to threads
+     * from pool to be handled.
+     *
+     * @param name the name of connection
+     * @param socket the ServerSocket from which to
+     * @param handlerFactory the factory from which to acquire handlers
+     * @param maxOpenConnections the maximum number of open connections allowed for this server socket.
+     * @param maxOpenConnectionsPerIP the maximum number of open connections per IP allowed for this server socket.
+     * @throws Exception
+     */
+    void connect( String name,
+            ServerSocket socket,
+            ConnectionHandlerFactory handlerFactory,
+            int maxOpenConnections,
+            int maxOpenConnectionsPerIP)
+            throws Exception;
+    
+    /**
+     * Returns the default maximum number of open connections per IP supported by this
+     * SimpleConnectionManager
+     *
+     * @return the maximum number of connections
+     */
+    int getMaximumNumberOfOpenConnectionsPerIP();
 }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java Fri Nov 17 06:32:31 2006
@@ -21,7 +21,6 @@
 
 package org.apache.james.smtpserver.core.filter.fastfail;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
@@ -32,6 +31,7 @@
 import org.apache.james.smtpserver.CommandHandler;
 import org.apache.james.smtpserver.ConnectHandler;
 import org.apache.james.smtpserver.SMTPSession;
+import org.apache.james.util.junkscore.JunkScore;
 import org.apache.james.util.mail.dsn.DSNStatus;
 import org.apache.mailet.MailAddress;
 
@@ -43,7 +43,7 @@
   * Connect handler for DNSRBL processing
   */
 public class DNSRBLHandler
-    extends AbstractLogEnabled
+    extends AbstractJunkHandler
     implements ConnectHandler, CommandHandler, Configurable, Serviceable {
     /**
      * The lists of rbl servers to be checked to limit spam
@@ -111,6 +111,8 @@
         if(configuration != null) {
            getDetail = configuration.getValueAsBoolean();
         }
+        
+        super.configure(handlerConfiguration);
 
     }
 
@@ -255,36 +257,68 @@
      * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
      */
     public void onCommand(SMTPSession session) {
-        String responseString = null;
+        doProcessing(session);       
+    }
+
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#check(org.apache.james.smtpserver.SMTPSession)
+     */
+    protected boolean check(SMTPSession session) {
         String blocklisted = (String) session.getConnectionState().get(RBL_BLOCKLISTED_MAIL_ATTRIBUTE_NAME);
         MailAddress recipientAddress = (MailAddress) session.getState().get(
                 SMTPSession.CURRENT_RECIPIENT);
 
-        if (blocklisted != null && // was found in the RBL
-                !(session.isAuthRequired() && session
-                        .getUser() != null) && // Not (SMTP AUTH is enabled and
-                                                // not authenticated)
-                !(recipientAddress.getUser().equalsIgnoreCase("postmaster") || recipientAddress
-                        .getUser().equalsIgnoreCase("abuse"))) {
-
-            // trying to send e-mail to other than postmaster or abuse
-            if (blocklistedDetail != null) {
-                responseString = "530 "
-                        + DSNStatus.getStatus(DSNStatus.PERMANENT,
-                                DSNStatus.SECURITY_AUTH) + " "
-                        + blocklistedDetail;
-            } else {
-                responseString = "530 "
-                        + DSNStatus.getStatus(DSNStatus.PERMANENT,
-                                DSNStatus.SECURITY_AUTH)
-                        + " Rejected: unauthenticated e-mail from "
-                        + session.getRemoteIPAddress()
-                        + " is restricted.  Contact the postmaster for details.";
-            }
-            session.writeResponse(responseString);
+        return (blocklisted != null && // was found in the RBL
+                !(session.isAuthRequired() && session.getUser() != null) && // Not (SMTP AUTH is enabled and not authenticated)
+                !(recipientAddress.getUser().equalsIgnoreCase("postmaster") || recipientAddress.getUser().equalsIgnoreCase("abuse")));
+    }
 
-            // After this filter match we should not call any other handler!
-            session.setStopHandlerProcessing(true);
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getJunkScore(org.apache.james.smtpserver.SMTPSession)
+     */
+    protected JunkScore getJunkScore(SMTPSession session) {
+        return (JunkScore) session.getConnectionState().get(JunkScore.JUNK_SCORE_SESSION);
+    }
+    
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getJunkScoreLogString(org.apache.james.smtpserver.SMTPSession)
+     */
+    protected String getJunkScoreLogString(SMTPSession session) {
+        return "Ipaddress " + session.getRemoteIPAddress() + " listed on RBL. Add junkScore: " + getScore();
+    }
+
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getRejectLogString(org.apache.james.smtpserver.SMTPSession)
+     */
+    protected String getRejectLogString(SMTPSession session) {
+        return "ipaddress " + session.getRemoteIPAddress() + " listed on RBL. Reject email";
+    }
+
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getResponseString(org.apache.james.smtpserver.SMTPSession)
+     */
+    protected String getResponseString(SMTPSession session) {
+        String responseString;
+        if (blocklistedDetail != null) {
+            responseString = "530 "
+                    + DSNStatus.getStatus(DSNStatus.PERMANENT,
+                            DSNStatus.SECURITY_AUTH) + " "
+                    + blocklistedDetail;
+        } else {
+            responseString = "530 "
+                    + DSNStatus.getStatus(DSNStatus.PERMANENT,
+                            DSNStatus.SECURITY_AUTH)
+                    + " Rejected: unauthenticated e-mail from "
+                    + session.getRemoteIPAddress()
+                    + " is restricted.  Contact the postmaster for details.";
         }
+        return responseString;
+    }
+
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getScoreName()
+     */
+    protected String getScoreName() {
+        return "DNSRBLCheck";
     }
 }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/MaxRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/MaxRcptHandler.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/MaxRcptHandler.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/MaxRcptHandler.java Fri Nov 17 06:32:31 2006
@@ -27,12 +27,12 @@
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.james.smtpserver.CommandHandler;
 import org.apache.james.smtpserver.SMTPSession;
+import org.apache.james.util.junkscore.JunkScore;
 import org.apache.james.util.mail.dsn.DSNStatus;
 
-public class MaxRcptHandler extends AbstractLogEnabled implements
+public class MaxRcptHandler extends AbstractJunkHandler implements
         CommandHandler, Configurable {
 
     private int maxRcpt = 0;
@@ -50,6 +50,8 @@
             throw new ConfigurationException(
                     "Please set the maxRcpt configuration value");
         }
+        
+        super.configure(handlerConfiguration);
     }
 
     /**
@@ -66,23 +68,7 @@
      * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
      */
     public void onCommand(SMTPSession session) {
-        String responseString = null;
-        int rcptCount = 0;
-
-        rcptCount = session.getRcptCount() + 1;
-
-        // check if the max recipients has reached
-        if (rcptCount > maxRcpt) {
-            responseString = "452 "
-                    + DSNStatus.getStatus(DSNStatus.NETWORK,
-                            DSNStatus.DELIVERY_TOO_MANY_REC)
-                    + " Requested action not taken: max recipients reached";
-            session.writeResponse(responseString);
-            getLogger().error(responseString);
-
-            // After this filter match we should not call any other handler!
-            session.setStopHandlerProcessing(true);
-        }
+        doProcessing(session);
     }
     
     /**
@@ -95,4 +81,43 @@
         return implCommands;
     }
 
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#check(org.apache.james.smtpserver.SMTPSession)
+     */
+    protected boolean check(SMTPSession session) {
+        // check if the max recipients has reached
+        return ((session.getRcptCount() + 1) > maxRcpt);
+    }
+
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getJunkScoreLogString(org.apache.james.smtpserver.SMTPSession)
+     */
+    protected String getJunkScoreLogString(SMTPSession session) {
+        return "Maximum recipients of " + maxRcpt + " reached. Add JunkScore: " +getScore();
+    }
+
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getRejectLogString(org.apache.james.smtpserver.SMTPSession)
+     */
+    protected String getRejectLogString(SMTPSession session) {
+        return getResponseString(session);
+    }
+
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getResponseString(org.apache.james.smtpserver.SMTPSession)
+     */
+    protected String getResponseString(SMTPSession session) {
+        String responseString = "452 "
+            + DSNStatus.getStatus(DSNStatus.NETWORK,
+                    DSNStatus.DELIVERY_TOO_MANY_REC)
+            + " Requested action not taken: max recipients reached";
+        return responseString;
+    }
+    
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getScoreName()
+     */
+    protected String getScoreName() {
+        return "MaxRcptCheck";
+    }
 }

Modified: james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java?view=diff&rev=476151&r1=476150&r2=476151
==============================================================================
--- james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java (original)
+++ james/server/sandbox/mailbox-namespaces/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java Fri Nov 17 06:32:31 2006
@@ -22,13 +22,13 @@
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.james.services.DNSServer;
 import org.apache.james.smtpserver.CommandHandler;
 import org.apache.james.smtpserver.SMTPSession;
+import org.apache.james.util.junkscore.JunkScore;
 import org.apache.james.util.mail.dsn.DSNStatus;
 import org.apache.mailet.MailAddress;
 
@@ -39,16 +39,16 @@
 /**
  * This CommandHandler can be used to reject not resolvable EHLO/HELO
  */
-public class ResolvableEhloHeloHandler extends AbstractLogEnabled implements
+public class ResolvableEhloHeloHandler extends AbstractJunkHandler implements
         CommandHandler, Configurable, Serviceable {
 
     public final static String BAD_EHLO_HELO = "BAD_EHLO_HELO";
 
-    private boolean checkAuthNetworks = false;
+    protected boolean checkAuthNetworks = false;
 
     private boolean checkAuthUsers = false;
 
-    private DNSServer dnsServer = null;
+    protected DNSServer dnsServer = null;
 
     /**
      * @see org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
@@ -66,6 +66,8 @@
         if (configAuthUser != null) {
             setCheckAuthUsers(configAuthUser.getValueAsBoolean(false));
         }
+        
+        super.configure(handlerConfiguration);
     }
 
     /**
@@ -115,7 +117,7 @@
                 || command.equals("EHLO")) {
             checkEhloHelo(session, argument);
         } else if (command.equals("RCPT")) {
-            reject(session, argument);
+            doProcessing(session);
         }
     }
 
@@ -127,7 +129,7 @@
      * @param argument
      *            The argument
      */
-    private void checkEhloHelo(SMTPSession session, String argument) {
+    protected void checkEhloHelo(SMTPSession session, String argument) {
         /**
          * don't check if the ip address is allowed to relay. Only check if it
          * is set in the config.
@@ -143,15 +145,24 @@
         }
     }
 
+
     /**
-     * Reject on invalid EHLO/HELO
-     * 
-     * @param session
-     *            The SMTPSession
-     * @param argument
-     *            The argument
+     * @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
+     */
+    public Collection getImplCommands() {
+        Collection implCommands = new ArrayList();
+        implCommands.add("EHLO");
+        implCommands.add("HELO");
+        implCommands.add("RCPT");
+
+        return implCommands;
+    }
+
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#check(org.apache.james.smtpserver.SMTPSession)
      */
-    private void reject(SMTPSession session, String argument) {
+    protected boolean check(SMTPSession session) {
+    
         MailAddress rcpt = (MailAddress) session.getState().get(
                 SMTPSession.CURRENT_RECIPIENT);
 
@@ -159,32 +170,52 @@
         if (session.getState().get(BAD_EHLO_HELO) == null
                 || rcpt.getUser().equalsIgnoreCase("postmaster")
                 || rcpt.getUser().equalsIgnoreCase("abuse"))
-            return;
+            return false;
 
         // Check if the client was authenticated
         if (!(session.isAuthRequired() && session.getUser() != null && !checkAuthUsers)) {
-            String responseString = "501 "
-                    + DSNStatus.getStatus(DSNStatus.PERMANENT,
-                            DSNStatus.DELIVERY_INVALID_ARG)
-                    + " Provided EHLO/HELO " + session.getState().get(SMTPSession.CURRENT_HELO_NAME) + " can not resolved";
-            session.writeResponse(responseString);
-            getLogger().info(responseString);
-
-            // After this filter match we should not call any other handler!
-            session.setStopHandlerProcessing(true);
+            return true;
         }
+        return false;
     }
 
     /**
-     * @see org.apache.james.smtpserver.CommandHandler#getImplCommands()
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getJunkScoreLogString(org.apache.james.smtpserver.SMTPSession)
      */
-    public Collection getImplCommands() {
-        Collection implCommands = new ArrayList();
-        implCommands.add("EHLO");
-        implCommands.add("HELO");
-        implCommands.add("RCPT");
+    protected String getJunkScoreLogString(SMTPSession session) {
+        return "Provided EHLO/HELO " + session.getState().get(SMTPSession.CURRENT_HELO_NAME) + " can not resolved. Add junkScore: " + getScore();
+    }
 
-        return implCommands;
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getRejectLogString(org.apache.james.smtpserver.SMTPSession)
+     */
+    protected String getRejectLogString(SMTPSession session) {
+        return getResponseString(session);
+    }
+
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getResponseString(org.apache.james.smtpserver.SMTPSession)
+     */
+    protected String getResponseString(SMTPSession session) {
+        String responseString = "501 "
+            + DSNStatus.getStatus(DSNStatus.PERMANENT,
+                    DSNStatus.DELIVERY_INVALID_ARG)
+            + " Provided EHLO/HELO " + session.getState().get(SMTPSession.CURRENT_HELO_NAME) + " can not resolved";
+        return responseString;
+    }
+
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getScoreName()
+     */
+    protected String getScoreName() {
+        return "ResolvableEhloHeloCheck";
+    }
+    
+    /**
+     * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getJunkScore(org.apache.james.smtpserver.SMTPSession)
+     */
+    protected JunkScore getJunkScore(SMTPSession session) {
+        return (JunkScore) session.getConnectionState().get(JunkScore.JUNK_SCORE_SESSION);
     }
 
 }



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