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/06 14:38:45 UTC

svn commit: r1032052 [2/2] - in /james/server/trunk/container-spring/src/main/config/james: ./ META-INF/

Modified: james/server/trunk/container-spring/src/main/config/james/mailstore.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/mailstore.xml?rev=1032052&r1=1032051&r2=1032052&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/mailstore.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/mailstore.xml Sat Nov  6 13:38:44 2010
@@ -17,113 +17,77 @@
   specific language governing permissions and limitations      
   under the License.                                           
  -->
-<!-- The Mailstore block -->
-<mailstore>
-    <repositories>
-        <!-- File based repositories.  These repositories store all message data -->
-        <!-- in the file system. -->
-        <repository class="org.apache.james.mailrepository.file.FileMailRepository">
-            <protocols>
-                <protocol>file</protocol>
-            </protocols>
-            <types>
-                <type>MAIL</type>
-            </types>
-            <!-- Set if the messages should be listed sorted. False by default -->
-            <config FIFO="false"/> 
-        </repository>
-
-        <!-- JDBC based repositories.  These repositories store all message data -->
-        <!-- in the database. -->
-        <repository class="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
-            <protocols>
-                <protocol>db</protocol>
-            </protocols>
-            <types>
-                <type>MAIL</type>
-            </types>
-            <config>
-                <sqlFile>file://conf/sqlResources.xml</sqlFile>
-                <!-- Set the size threshold for in memory handling of storing operations -->
-                <!-- Default is currently 409600000 due to a bug with mysql and binary stream -->
-                <!-- currently under investigation. Please change this only if you know what -->
-                <!-- you do. -->
-                <!--
-                <inMemorySizeLimit>4096</inMemorySizeLimit>
-                -->
-            </config>
-        </repository>
 
-        <!-- These repositories store message delivery and headers in the DB, and the body to the filesystem -->
-        <repository class="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
-            <protocols>
-                <protocol>dbfile</protocol>
-            </protocols>
-            <types>
-                <type>MAIL</type>
-            </types>
-            <config>
-                <sqlFile>file://conf/sqlResources.xml</sqlFile>
-                <filestore>file://var/dbmail</filestore>
-            </config>
-        </repository>
- 
-        <!-- The mbox repository is designed for MAIL only; SPOOL performance would be less than ideal-->
-        <repository class="org.apache.james.mailrepository.file.MBoxMailRepository">
-            <protocols>
-                <protocol>mbox</protocol>
-            </protocols>
-            <types>
-                <type>MAIL</type>
-            </types>
-            <!-- Set if the messages should be listed sorted. False by default -->
-            <config FIFO="false"/> 
-        </repository>
-        
-        <repository class="org.apache.james.filepair.FilePersistentObjectRepository">
-            <protocols>
-                <protocol>file</protocol>
-            </protocols>
-            <types>
-                <type>OBJECT</type>
-            </types>
-            <models>
-                <model>SYNCHRONOUS</model>
-                <model>ASYNCHRONOUS</model>
-                <model>CACHE</model>
-            </models>
-        </repository>
+<!-- See http://james.apache.org/server/3/config.html for usage -->
 
-        <repository class="org.apache.james.filepair.FilePersistentStreamRepository">
-            <protocols>
-                <protocol>file</protocol>
-            </protocols>
-            <types>
-                <type>STREAM</type>
-            </types>
-            <models>
-                <model>SYNCHRONOUS</model>
-                <model>ASYNCHRONOUS</model>
-                <model>CACHE</model>
-            </models>
-        </repository>
-        
-        <!-- If you enable this you need to make sure that embedded Jackrabbit instance is started as well. Check the container configuration -->  
-        <!--
-        <repository class="org.apache.james.mailrepository.jcr.JCRMailRepository">
-            <protocols>
-                <protocol>jcr</protocol>
-            </protocols>
-            <types>
-                <type>MAIL</type>
-            </types>
-            <config>
-                <repository>//localhost/jackrabbit.repository</repository>
-                <username>admin</username>
-                <password>admin</password>
-                <workspace>default</workspace>
-            </config>
-        </repository>
-        -->
-    </repositories>
-</mailstore>
\ No newline at end of file
+<mailstore>
+  <repositories>
+      <repository class="org.apache.james.mailrepository.file.FileMailRepository">
+          <protocols>
+              <protocol>file</protocol>
+          </protocols>
+          <types>
+              <type>MAIL</type>
+          </types>
+          <config FIFO="false"/> 
+      </repository>
+      <repository class="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
+          <protocols>
+              <protocol>db</protocol>
+          </protocols>
+          <types>
+              <type>MAIL</type>
+          </types>
+          <config>
+              <sqlFile>file://conf/sqlResources.xml</sqlFile>
+          </config>
+      </repository>
+      <repository class="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
+          <protocols>
+              <protocol>dbfile</protocol>
+          </protocols>
+          <types>
+              <type>MAIL</type>
+          </types>
+          <config>
+              <sqlFile>file://conf/sqlResources.xml</sqlFile>
+              <filestore>file://var/dbmail</filestore>
+          </config>
+      </repository>
+      <repository class="org.apache.james.mailrepository.file.MBoxMailRepository">
+          <protocols>
+              <protocol>mbox</protocol>
+          </protocols>
+          <types>
+              <type>MAIL</type>
+          </types>
+          <config FIFO="false"/> 
+      </repository>
+      <repository class="org.apache.james.filepair.FilePersistentObjectRepository">
+          <protocols>
+              <protocol>file</protocol>
+          </protocols>
+          <types>
+              <type>OBJECT</type>
+          </types>
+          <models>
+              <model>SYNCHRONOUS</model>
+              <model>ASYNCHRONOUS</model>
+              <model>CACHE</model>
+          </models>
+      </repository>
+      <repository class="org.apache.james.filepair.FilePersistentStreamRepository">
+          <protocols>
+              <protocol>file</protocol>
+          </protocols>
+          <types>
+              <type>STREAM</type>
+          </types>
+          <models>
+              <model>SYNCHRONOUS</model>
+              <model>ASYNCHRONOUS</model>
+              <model>CACHE</model>
+          </models>
+      </repository>
+  </repositories>
+</mailstore>

Modified: james/server/trunk/container-spring/src/main/config/james/miResources.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/miResources.xml?rev=1032052&r1=1032051&r2=1032052&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/miResources.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/miResources.xml Sat Nov  6 13:38:44 2010
@@ -16,12 +16,13 @@
   specific language governing permissions and limitations      
   under the License.                                           
  -->
- <!-- XML resources for mailing lists -->
+
+<!-- See http://james.apache.org/server/3/config.html for usage -->
+
 <resources>
   <matchers>
     <matcher for="custom" match="My Custom List"/>
   </matchers>
-
   <group name="subscribeConfirm">
     <resource name="welcome.subscribe.address">Welcome to the ${LIST_NAME} mailing list</resource>
     <resource name="already.subscribed">You are already subscribed to the ${LIST_NAME} mailing list.</resource>

Modified: james/server/trunk/container-spring/src/main/config/james/pop3server.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/pop3server.xml?rev=1032052&r1=1032051&r2=1032052&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/pop3server.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/pop3server.xml Sat Nov  6 13:38:44 2010
@@ -17,55 +17,23 @@
   specific language governing permissions and limitations      
   under the License.                                           
  -->
-<!-- The POP3 server is enabled by default -->
-<!-- Disabling blocks will stop them from listening, -->
-<!-- but does not free as many resources as removing them would -->
-<pop3server enabled="true">
-    <!-- port 995 is the well-known/IANA registered port for POP3S  ie over SSL/TLS -->
-    <!-- port 110 is the well-known/IANA registered port for Standard POP3 -->
-    <port>110</port>
 
-    <!-- Uncomment this if you want to bind to a specific inetaddress -->
-    <!--
-    <bind> </bind>
-    -->
-    <connectionBacklog>200</connectionBacklog>
+<!-- See http://james.apache.org/server/3/config.html for usage -->
 
-      
-    <!-- Set to true to support STARTTLS or SSL for the Socket.
-         To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
-    -->
-    <tls socketTLS="false" startTLS="false">
-        <!-- To create a new keystore execute:
-             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-        -->
-        <keystore>file://conf/keystore</keystore>
-        <secret>yoursecret</secret>
-        <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-    </tls>
-      
-    <handler>
-        <!-- This is the name used by the server to identify itself in the POP3 -->
-        <!-- protocol.  If autodetect is TRUE, the server will discover its -->
-        <!-- own host name and use that in the protocol.  If discovery fails, -->
-        <!-- the value of 'localhost' is used.  If autodetect is FALSE, James -->
-        <!-- will use the specified value. -->
-        <!--
-        <helloName autodetect="true">myMailServer</helloName>
-        -->
-        <!-- connection timeout in secconds -->
-        <connectiontimeout>1200</connectiontimeout>
-      
-        <!-- Set the maximum simultaneous incoming connections for this service -->
-        <connectionLimit> 0 </connectionLimit>
-         
-        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
-        <connectionLimitPerIP> 0 </connectionLimitPerIP>
-         
-        <handlerchain>
-            <!-- This loads the core CommandHandlers. Only remove this if you really -->
-            <!-- know what you are doing -->
-            <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </handler>
-</pop3server>
\ No newline at end of file
+<pop3server enabled="true">
+  <port>110</port>
+  <connectionBacklog>200</connectionBacklog>
+  <tls socketTLS="false" startTLS="false">
+      <keystore>file://conf/keystore</keystore>
+      <secret>yoursecret</secret>
+      <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+  </tls>
+  <handler>
+      <connectiontimeout>1200</connectiontimeout>
+      <connectionLimit> 0 </connectionLimit>
+      <connectionLimitPerIP> 0 </connectionLimitPerIP>
+      <handlerchain>
+          <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
+      </handlerchain>
+  </handler>
+</pop3server>

Modified: james/server/trunk/container-spring/src/main/config/james/remotemanager.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/remotemanager.xml?rev=1032052&r1=1032051&r2=1032052&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/remotemanager.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/remotemanager.xml Sat Nov  6 13:38:44 2010
@@ -17,58 +17,26 @@
   specific language governing permissions and limitations      
   under the License.                                           
  -->
-<!-- The RemoteManager server is enabled by default -->
-<!-- Disabling blocks will stop them from listening, -->
-<!-- but does not free as many resources as removing them would -->
+
+<!-- See http://james.apache.org/server/3/config.html for usage -->
+
 <remotemanager enabled="true">
-    <port>4555</port>
-    <!--  Uncomment this if you want to bind to a specific inetaddress -->
-    <!--
-    <bind> </bind>
-    -->
-    
-    <connectionBacklog>10</connectionBacklog>
-     
-    <!-- Set to true to use TLS for the Socket.
-         To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
-    -->
-    <tls socketTLS="false">
-        <!-- To create a new keystore execute:
-             keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-        -->
-        <keystore>file://conf/keystore</keystore>
-        <secret>yoursecret</secret>
-        <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-    </tls>
-      
-    <handler>
-        <!-- This is the name used by the server to identify itself in the RemoteManager -->
-        <!-- protocol.  If autodetect is TRUE, the server will discover its -->
-        <!-- own host name and use that in the protocol.  If discovery fails, -->
-        <!-- the value of 'localhost' is used.  If autodetect is FALSE, James -->
-        <!-- will use the specified value. -->
-        <!--
-        <helloName autodetect="true">myMailServer</helloName>
-        -->
-        <administrator_accounts>
-            <!-- CHECKME! -->
-            <!-- Change the default login/password. -->
-            <account login="root" password="root"/>
-        </administrator_accounts>
-         
-        <!-- connection timeout in secconds -->
-        <connectiontimeout> 600 </connectiontimeout>
-         
-        <!-- Set the maximum simultaneous incoming connections for this service -->
-        <connectionLimit> 0 </connectionLimit>
-         
-        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
-        <connectionLimitPerIP> 0 </connectionLimitPerIP>
-  
-        <handlerchain>
-            <!-- This loads the core CommandHandlers. Only remove this if you really -->
-            <!-- know what you are doing -->
-            <handler class="org.apache.james.remotemanager.core.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </handler>
-</remotemanager>
\ No newline at end of file
+  <port>4555</port>
+  <connectionBacklog>10</connectionBacklog>
+  <tls socketTLS="false">
+      <keystore>file://conf/keystore</keystore>
+      <secret>yoursecret</secret>
+      <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+  </tls>
+  <handler>
+      <administrator_accounts>
+          <account login="root" password="root"/>
+      </administrator_accounts>
+      <connectiontimeout> 600 </connectiontimeout>
+      <connectionLimit> 0 </connectionLimit>
+      <connectionLimitPerIP> 0 </connectionLimitPerIP>
+      <handlerchain>
+          <handler class="org.apache.james.remotemanager.core.CoreCmdHandlerLoader"/>
+      </handlerchain>
+  </handler>
+</remotemanager>

Modified: james/server/trunk/container-spring/src/main/config/james/smtpserver.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/smtpserver.xml?rev=1032052&r1=1032051&r2=1032052&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/smtpserver.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/smtpserver.xml Sat Nov  6 13:38:44 2010
@@ -16,295 +16,24 @@
   specific language governing permissions and limitations      
   under the License.                                           
  -->
- 
-    <!-- The SMTP server is enabled by default -->
-    <!-- Disabling blocks will stop them from listening, -->
-    <!-- but does not free as many resources as removing them would -->
-   <smtpserver enabled="true">
-      <!-- 
-            Port 25 is the well-known/IANA registered port for SMTP. 
-            Port 465 is the well-known/IANA registered port for SMTP over TLS.
-            -->
-      <port>25</port>
 
-      <!-- Uncomment this if you want to bind to a specific inetaddress -->
-      <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
-      <!-- in order to avoid relay check for locallly generated bounces -->
-      <!--
-      <bind> </bind>
-      -->
+<!-- See http://james.apache.org/server/3/config.html for usage -->
 
-      <connectionBacklog>200</connectionBacklog>
-
-      <!-- Set to true to support STARTTLS or TLS for the Socket.
-           To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
-      -->
-      <tls socketTLS="false" startTLS="false">
-        <!-- To create a new keystore execute:
-        keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-         -->
-        <keystore>file://conf/keystore</keystore>
-        <secret>yoursecret</secret>
-        <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-      </tls>
-      
-      <handler>
-         <!-- This is the name used by the server to identify itself in the SMTP -->
-         <!-- protocol.  If autodetect is TRUE, the server will discover its -->
-         <!-- own host name and use that in the protocol.  If discovery fails, -->
-         <!-- the value of 'localhost' is used.  If autodetect is FALSE, James -->
-         <!-- will use the specified value. -->
-         <!--
-         <helloName autodetect="true">myMailServer</helloName>
-         -->
-         
-         <!-- connection timeout in secconds -->
-         <connectiontimeout>360</connectiontimeout>
-
-         <!-- Set the maximum simultaneous incoming connections for this service -->
-         <connectionLimit> 0 </connectionLimit>
-         
-         <!-- Set the maximum simultaneous incoming connections per IP for this service -->
-         <connectionLimitPerIP> 0 </connectionLimitPerIP>
-         
-         <!--  Uncomment this if you want to require SMTP authentication.
-
-               supported values:
-               true: required but announced only to not authorizedAddresses
-               false: don't use AUTH
-               announce: like true, but always announce AUTH capability to clients
-
-               The correct behaviour per RFC value would be false or announce
-               but we still support true for backward compatibility and because
-               some webmail client fails when AUTH is announced but no authentication
-               information has been provided
-          -->
-         <!--
-         <authRequired>true</authRequired>
-         -->
-
-<!-- CHECKME! -->
-         <!--  Uncomment this if you want to authorize specific addresses/networks.
-               If you use SMTP AUTH, addresses that match those specified here will
-               be permitted to relay without SMTP AUTH.  If you do not use SMTP
-               AUTH, and you specify addreses here, then only addresses that match
-               those specified will be permitted to relay.
-
-               Addresses may be specified as a an IP address or domain name, with an
-               optional netmask, e.g.,
-
-               127.*, 127.0.0.0/8, 127.0.0.0/255.0.0.0, and localhost/8 are all the same
-
-               See also the RemoteAddrNotInNetwork matcher in the transport processor.
-               You would generally use one OR the other approach.
-         -->
-         <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
-
-         <!--  Uncomment this if you want to verify sender addresses, ensuring that -->
-         <!--  the sender address matches the user who has authenticated. -->
-         <!--  This prevents a user of your mail server from acting as someone else -->
-         <!--  If unspecified, default value is true -->
-         <!--
-         <verifyIdentity>true</verifyIdentity>
-         -->
-
-         <!--  This sets the maximum allowed message size (in kilobytes) for this -->
-         <!--  SMTP service. If unspecified, the value defaults to 0, which means no limit. -->
-         <maxmessagesize>0</maxmessagesize>
-         
-         <!--  This sets wether to enforce the use of HELO/EHLO salutation before a -->
-         <!--  MAIL command is accepted. If unspecified, the value defaults to true -->
-         <!-- 
-         <heloEhloEnforcement>true</heloEhloEnforcement>
-         -->
-         
-         <!-- WARNING: This is Non-RFC compliant (default value: true) -->
-         <!-- See: http://wiki.apache.org/james/StandardsComplianceStatement -->
-         <!-- TODO: CHANGE TO OFFICIAL URL LATER -->
-         <addressBracketsEnforcement>true</addressBracketsEnforcement>
-         
-         <!-- This sets the SMTPGreeting which will be used when connect to the smtpserver -->
-         <!-- If none is specified a default is generated -->
-         <!--
-         <smtpGreeting> JAMES SMTP Server </smtpGreeting>
-         -->
-         
-         <!-- The configuration handler chain -->
-         <handlerchain> 
-
-             <!-- This connect handler can be used to enable POP3 before SMTP support -->
-             <!-- Plz note that only the ip get stored to indentify an authenticated client -->
-             <!-- The expireTime is the time after which an ipAddress is handled as expired -->
-             <!--
-             <handler class="org.apache.james.smtpserver.POP3BeforeSMTPHandler">
-                 <expireTime> 1 hour </expireTime>
-             </handler>
-             -->
-            
-             <!-- This command handler check against RBL-Lists -->
-             <!-- If getDetail is set to true it try to retrieve information from TXT Record -->
-             <!-- why the ip was blocked. Default to false -->            
-             <!-- STOP - before you uncomment out the DNS RBL handler,
-                  please take a moment to review each block list.  We
-                  have included some that various JAMES committers use,
-                  but you must decide which, if any, are appropriate
-                  for your environment.  The mail servers hosting
-                  @apache.org mailing lists, for example, use a
-                  slightly different list than we have included below.
-                  And it is likely that most JAMES committes also have
-                  slightly different sets of lists.  The SpamAssassin
-                  user's list would be one good place to discuss the
-                  measured quality of various block lists.
-
-                  NOTA BENE: the domain names, below, are terminated
-                  with '.' to ensure that they are absolute names in
-                  DNS lookups.  Under some circumstances, names that
-                  are not explicitly absolute could be treated as
-                  relative names, leading to incorrect results.  This
-                  has been observed on *nix and MS-Windows platforms
-                  by users of multiple mail servers, and is not JAMES
-                  specific.  If you are unsure what this means for you,
-                  please speak with your local system/network admins.
-              -->
-             <!--
-             <handler class="org.apache.james.smtpserver.fastfail.DNSRBLHandler">
-                 <getDetail> false </getDetail>
-                 <rblservers>
-                     <whitelist> query.bondedsender.org. </whitelist>
-                     <blacklist> sbl-xbl.spamhaus.org. </blacklist>
-                     <blacklist> dul.dnsbl.sorbs.net. </blacklist>
-                     <blacklist> list.dsbl.org. </blacklist>
-                 </rblservers>
-             </handler>            
-             --> 
-     
-             <!-- This command handler can be used to reject emails with not match the SPF record of the sender domain --> 
-             <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
-             <!-- are allowed to relay. Default is false. -->  
-             <!--
-             <handler class="org.apache.james.smtpserver.fastfail.SPFHandler">
-                 <blockSoftFail> false </blockSoftFail>
-                 <blockPermError> true </blockPermError>
-             </handler>
-             -->    
-                 
-             <!-- checks for resolvable HELO/EHLO before accept the HELO/EHLO -->
-             <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
-             <!-- are allowed to relay. Default is false. -->
-             <!--
-             <handler class="org.apache.james.smtpserver.fastfail.ResolvableEhloHeloHandler"/>
-             -->
-            
-             <!-- Checks HELO/EHLO is equal the reverse of the connecting client before accept it -->
-             <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
-             <!-- are allowed to relay. Default is false. -->
-             <!--
-             <handler class="org.apache.james.smtpserver.fastfail.ReverseEqualsEhloHeloHandler"/>
-             -->
-            
-             <!-- If activated mail is only accepted if the sender contains -->
-             <!-- a resolvable domain having a valid MX Record or A Record associated! -->
-             <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
-             <!-- are allowed to relay. Default is false. -->
-             <!--
-             <handler class="org.apache.james.smtpserver.fastfail.ValidSenderDomainHandler"/>
-             -->
-         
-             <!-- With ValidRcptHandler, all email will get rejected which has no valid user -->
-             <!-- You need to add the recipient to the validRecipient list if you want -->
-             <!-- to accept email for a recipient which not exist on the server -->
-             <!-- If you want James to act as a spamtrap or honeypot, you may comment ValidRcptHandler -->
-             <!-- and implement the needed processors in spoolmanager.xml -->
-             <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            
-             <!-- If activated you can limit the maximal recipients -->
-             <!-- 
-             <handler class="org.apache.james.smtpserver.fastfail.MaxRcptHandler">
-                 <maxRcpt> 10 </maxRcpt>                
-             </handler>
-             -->
-            
-             <!-- If uncomment this block you can enable greylisting. For more infos-->
-             <!-- how greylisting work see: http://projects.puremagic.com/greylisting/whitepaper.html -->
-             <!--
-             <handler class="org.apache.james.smtpserver.fastfail.JDBCGreylistHandler">
-                 <repositoryPath> db://maildb </repositoryPath>
-                 <sqlFile>file://conf/sqlResources.xml</sqlFile>
-                 <tempBlockTime> 1 hour </tempBlockTime>
-                 <unseenLifeTime> 4 hours </unseenLifeTime>
-                 <autoWhiteListLifeTime> 36 days </autoWhiteListLifeTime>
-                 <whitelistedNetworks> 127.0.0.0/8 </whitelistedNetworks>
-             </handler>
-             -->
-            
-             <!-- Tarpitting is a method to insert a small sleep after each rcpt. For more -->
-             <!-- infos read this: http://www.palomine.net/qmail/tarpit.html . -->
-             <!-- Default is set to 0 (disabled). -->
-             <!-- You can also configure the time to sleep in milliseconds -->
-             <!--
-             <handler class="org.apache.james.smtpserver.fastfail.TarpitHandler">
-                 <tarpitRcptCount> 5 </tarpitRcptCount>
-                 <tarpitSleepTime> 5000 </tarpitSleepTime>
-             </handler>
-             -->
-         
-             <!-- This handler ignore duplicated recipients per session. So the email will get only send on time even -->
-             <!-- if the recipient is specified more then once -->
-             <!--
-             <handler class="org.apache.james.smtpserver.protocol.core.fastfail.SuppressDuplicateRcptHandler"/>
-             -->
-     
-             <!-- Load the core command handlers -->
-             <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>        
-           
-             <!-- This handler can add a hint to the mail which tells the MailQueue which email should get processed first -->
-             <!-- Normally the MailQueue will just handles Mails in FIFO manner -->
-             <!-- Valid priority values are 1,5,9 where 9 is the highest-->
-             <!-- 
-             <handler class="org.apache.james.smtpserver.MailPriortyHandler">
-                 <priorityEntries>
-                     <priorityEntry>
-                         <domain> yourdomain1 </domain>
-                         <priority> 1 </priority>
-                     </priorityEntry>
-                     <priorityEntry>
-                         <domain> yourdomain2 </domain>
-                         <priority> 9 </priority>
-                     </priorityEntry>
-                 <priorityEntries>
-             </handler>
-             -->
-             
-             <!-- This MessageHandler could be used to check message against spamd before -->
-             <!-- accept the email. So its possible to reject a message on smtplevel if a -->
-             <!-- configured hits amount is reached. -->
-             <!--
-             <handler class="org.apache.james.smtpserver.fastfail.SpamAssassinHandler">
-                 <spamdHost> 127.0.0.1 </spamdHost>
-                 <spamdPort> 783 </spamdPort>
-                 <spamdRejectionHits> 10 </spamdRejectionHits>
-             </handler>
-             -->
-     
-             <!-- This MessageHandler could be used to extract domain out of the message and check -->
-             <!-- this domains against uriRbllists. See http://www.surbl.org for more informations. -->
-             <!-- The message get rejected if a domain matched . -->
-             <!--
-             <handler class="org.apache.james.smtpserver.fastfail.URIRBLHandler">
-                 <action> reject </action>
-                 <getDetail> true </getDetail>
-                 <uriRblServers> 
-                     <server> multi.surbl.org</server>
-                 </uriRblServers>
-             </handler>     
-             -->
-             <!-- 
-             <handler class="org.apache.james.smtpserver.SetMimeHeaderHandler">
-                 <headername>SPF-test</headername>
-                 <headervalue>passed</headervalue>
-             </handler>
-             -->
-         </handlerchain>            
-    </handler>
+<smtpserver enabled="true">
+  <port>25</port>
+  <connectionBacklog>200</connectionBacklog>
+  <tls socketTLS="false" startTLS="false">
+  </tls>
+  <handler>
+     <connectiontimeout>360</connectiontimeout>
+     <connectionLimit> 0 </connectionLimit>
+     <connectionLimitPerIP> 0 </connectionLimitPerIP>
+     <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
+     <maxmessagesize>0</maxmessagesize>
+     <addressBracketsEnforcement>true</addressBracketsEnforcement>
+     <handlerchain>
+         <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
+         <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
+     </handlerchain>            
+  </handler>
 </smtpserver>
-

Modified: james/server/trunk/container-spring/src/main/config/james/spring-beans.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/spring-beans.xml?rev=1032052&r1=1032051&r2=1032052&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/spring-beans.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/spring-beans.xml Sat Nov  6 13:38:44 2010
@@ -32,8 +32,6 @@
         <property name="location" value="file://conf/jmx.properties"/>
     </bean>
 
-    <!-- Make sure we can bind jmx sockets to a specific ipaddress -->
-    <!-- https://issues.apache.org/jira/browse/JAMES-1104 -->
     <bean id="restrictedRmiSocketFactory" class="org.apache.james.container.spring.RestrictingRMISocketFactory">
         <constructor-arg value="${jmx.address}"/>
     </bean>   
@@ -69,14 +67,15 @@
           <entry key="org.apache.james:type=component,name=usermanagement" value-ref="usermanagement"/>
           <entry key="org.apache.james:type=component,name=fetchmail" value-ref="fetchmail"/>
           <entry key="org.apache.james:type=component,name=mailboxmanagement" value-ref="mailboxmanagermanagement"/>
-         
         </map>
       </property>
+      
       <property name="assembler">
           <bean class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
             <property name="managedInterfaces" value="org.apache.james.smtpserver.netty.SMTPServerMBean,org.apache.james.remotemanager.netty.RemoteManagerMBean,org.apache.james.pop3server.netty.POP3ServerMBean,org.apache.james.imapserver.netty.IMAPServerMBean,org.apache.james.fetchmail.FetchSchedulerMBean,org.apache.james.domainlist.api.DomainListManagementMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.mailetcontainer.api.ProcessorManagementMBean,org.apache.james.vut.api.VirtualUserTableManagementMBean,org.apache.james.user.api.UserManagementMBean,org.apache.james.adapter.mailbox.MailboxManagerManagementMBean"/>
           </bean>
       </property>
+      
     </bean>
     
     <bean id="processormanagement" class="org.apache.james.mailetcontainer.lib.ProcessorManagement"/>
@@ -110,7 +109,6 @@
         </property>
     </bean>
 
-    <!-- Take care of resolve filesystem= property values -->
     <bean class="org.apache.james.container.spring.FileSystemResolver">
         <property name="fileSystem" ref="filesystem" />
     </bean>
@@ -147,19 +145,13 @@
 
     <bean id="instanceFactory" class="org.apache.james.container.spring.SpringInstanceFactory"/>
 
-    <!-- Add support for Persistence annotations -->
     <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor"/>
 
-    <!-- Change trace to true for debugging purposes -->
     <camel:camelContext id="jamesCamelContext" trace="false" >
         <camel:jmxAgent id="agent" disabled="false" createConnector="false" serviceUrlPath="/jmxrmi/jamescamel"/>
         <camel:template id="producerTemplate"/>   
     </camel:camelContext>
 
-
-
-    <!-- lets create an embedded ActiveMQ Broker -->
-    <!-- disable schedulerSupport for workaround AMQ-2935-->
     <amq:broker useJmx="true" persistent="true" brokerName="james" dataDirectory="filesystem=file://var/activemq-data/" useShutdownHook="false" schedulerSupport="false" id="broker">
         <amq:destinationPolicy>
             <amq:policyMap>
@@ -173,7 +165,6 @@
         <amq:managementContext>
             <amq:managementContext createConnector="false"/>
         </amq:managementContext>
-        <!-- use amq persistence adapter for workaround AMQ-2935-->
         <amq:persistenceAdapter>
             <amq:amqPersistenceAdapter/>
         </amq:persistenceAdapter>
@@ -190,31 +181,23 @@
         <property name="defaultUploadUrl" value="file://var/queue"/>
     </bean>
 
-    <!-- IMPORTANT: if you use not the ActiveMQMailQueueFactory you prolly need to set cacheConsumers to false -->
     <bean id="jmsConnectionFactory" class="org.springframework.jms.connection.CachingConnectionFactory">
        <property name="targetConnectionFactory" ref="amqConnectionFactory"/>
        <property name="sessionCacheSize" value="10"/>
-       <!-- Don't cache consumers as we need to use message selectors for delayed messages -->
-       <!-- When caching consumers the selector will not work. -->
-       <!-- This is needed because we can not make use of the scheduler. Thats only a workaround till activemq 5.4.2 was released -->
-       <!-- See AMQ-2935 -->
        <property name="cacheConsumers" value="false"/>
        <property name="cacheProducers" value="true"/>
     </bean>
 
-    <!-- setup spring jms TX manager -->
     <bean id="jmsTransactionManager" class="org.springframework.jms.connection.JmsTransactionManager">
         <property name="connectionFactory" ref="jmsConnectionFactory"/>
     </bean>
 
     <bean id="mailQueueFactory" class="org.apache.james.queue.activemq.ActiveMQMailQueueFactory" depends-on="broker"/>
         
-    <!-- Build the camelroute from the spoolmanager.xml -->
     <bean id="mailProcessor" name="processorRoute" class="org.apache.james.mailetcontainer.camel.CamelMailProcessorList"/>
 
     <bean id="spoolmanager" class="org.apache.james.transport.JamesSpoolManager"/>
     
-    <!-- mailserver implementation which use activemq for spooling the mail -->
     <bean id="mailserver" class="org.apache.james.JamesMailServer"/>
 
     <bean id="mailetcontext" class="org.apache.james.mailetcontainer.lib.JamesMailetContext"/>
@@ -225,7 +208,6 @@
 
     <bean id="dnsservice" class="org.apache.james.dnsservice.dnsjava.DNSJavaService" />
 
-    <!-- Async RemoteManager -->
     <bean id="remotemanager" class="org.apache.james.remotemanager.netty.RemoteManager" >
         <property name="protocolHandlerChain" ref="remoteProtocolHandlerChain"/>
     </bean>
@@ -234,7 +216,6 @@
         <property name="coreHandlersPackage" value="org.apache.james.remotemanager.core.CoreCmdHandlerLoader"/>
     </bean>
 
-    <!-- Async POP3 Server -->
     <bean id="pop3server"  class="org.apache.james.pop3server.netty.POP3Server" >
         <property name="protocolHandlerChain" ref="pop3ProtocolHandlerChain"/>
     </bean>
@@ -243,7 +224,6 @@
         <property name="coreHandlersPackage" value="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
     </bean>
 
-    <!-- Async SMTP Server -->
     <bean id="smtpserver" class="org.apache.james.smtpserver.netty.SMTPServer">
         <property name="protocolHandlerChain" ref="smtpProtocolHandlerChain"/>
     </bean>
@@ -252,7 +232,6 @@
         <property name="coreHandlersPackage" value="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
     </bean>
 
-    <!-- Async LMTP Server -->
     <bean id="lmtpserver" class="org.apache.james.lmtpserver.netty.LMTPServer">
         <property name="protocolHandlerChain" ref="lmtpProtocolHandlerChain"/>
     </bean>
@@ -261,40 +240,22 @@
         <property name="coreHandlersPackage" value="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
     </bean>
     
-    <!-- FetchMail Service -->
     <bean id="fetchmail" class="org.apache.james.fetchmail.FetchScheduler" />
 
-    <!-- The High Level Storage block -->
     <bean id="mailstore" class="org.apache.james.mailstore.lib.JamesMailStore" />
 
-    <!-- The User Storage block -->
     <bean id="usersstore" class="org.apache.james.user.lib.JamesUsersStore" >
         <property name="defaultRepository" value="LocalUsers"/>
     </bean>
 
-    <!-- This is needed to link the smtpserver to the local user repository
-        LocalJamesUsersRepository is used for backward compatibility with
-        org.apache.james.user.lib.LocalJamesUsersRepository can be used for
-        backward compatibility with James 2.3.0
-        If backward compatibility is not needed, org.apache.james.user.lib.LocalUsersRepository
-        implementation is used by default.
-    -->
-
-    <!-- uncomment this for james 2.3.0 backward compatibility
-    <bean id="localusersrepository" class="org.apache.james.user.lib.LocalJamesUsersRepository" />
-    -->
-    <!-- this is the default implementation for the localusersrepository - not james 2.3.0 backward compatible -->
     <bean id="localusersrepository" class="org.apache.james.user.lib.LocalUsersRepository" />
 
-    <!-- The context FileSystem implementation -->
     <bean id="filesystem" class="org.apache.james.container.spring.SpringFileSystem" />
 
     <bean id="virtualusertable" class="org.apache.james.vut.lib.JamesVirtualUserTable" />
 
-    <!-- The context domainlist implementation -->
     <bean id="domainlist" class="org.apache.james.domainlist.lib.JamesDomainList" />
 
-    <!-- IMAP server Beans -->
     <bean id="imapserver" class="org.apache.james.imapserver.netty.IMAPServer">
         <property name="imapDecoder" ref="imapDecoder"/>
         <property name="imapEncoder" ref="imapEncoder"/>    
@@ -315,7 +276,6 @@
 
     <bean id="authenticator" class="org.apache.james.adapter.mailbox.store.UserRepositoryAuthenticator"/>
 
-    <!-- JPA implementation of IMAP Storage-->
     <bean id="sessionMapperFactory" class="org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory">
         <constructor-arg index="0" ref="entityManagerFactory"/>
     </bean>
@@ -330,74 +290,10 @@
         <constructor-arg index="2" value="${openjpa.streaming}"/>
     </bean>
 
-    <!-- Maildir implementation of IMAP Storage -->
-    <!-- WARNING: Maildir does only work on UNIX like operation systems -->
-    <!-- 
-    <bean id="sessionMapperFactory" class="org.apache.james.adapter.mailbox.maildir.MaildirMailboxSessionMapperFactoryUtil" factory-method="create">        
-        <constructor-arg index="0" ref="filesystem"/>
-        <constructor-arg index="1" ref="mailserver"/>
-        <constructor-arg index="2" value="file://var/mail/maildir/"/>
-    </bean>
-    <bean id ="subscriptionManager" class="org.apache.james.mailbox.maildir.MaildirSubscriptionManager">
-        <constructor-arg index="0" ref="sessionMapperFactory"/>
-    </bean>
-
-    <bean id="mailboxmanager" class="org.apache.james.mailbox.maildir.MaildirMailboxManager">
-        <constructor-arg index="0" ref="sessionMapperFactory"/>
-        <constructor-arg index="1" ref="authenticator"/>
-    </bean>
-    -->
-
-    <!-- JCR implementation of IMAP Storage-->
-    <!-- Make sure that Jackrabbit is configured as well -->
-    <!--  
-    <bean id="imapCndLoader" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-        <property name="targetObject"><ref local="jcrUtils"/></property>
-        <property name="targetMethod"><value>registerCnd</value></property>
-        <property name="arguments">
-            <list>
-                <ref local="jcrRepository"/>
-                <value>james</value>
-                <value>james</value>
-                <value>james</value>
-            </list>
-        </property>
-    </bean>
-
-    <bean id="jcrUtils" class="org.apache.james.mailbox.jcr.JCRUtils"/>    
-
-    <bean id ="sessionJcrRepository"    class="org.apache.james.mailbox.jcr.GlobalMailboxSessionJCRRepository" depends-on="imapCndLoader">
-        <constructor-arg index="0" ref="jcrRepository"/>
-        <constructor-arg index="1" value="james"/>
-        <constructor-arg index="2" value="james"/>
-        <constructor-arg index="3" value="james"/>
-    </bean>
-  
-    <bean id="nodeLocker" class="org.apache.james.mailbox.jcr.JCRVmNodeLocker"/>
-
-
-    <bean id="sessionMapperFactory" class="org.apache.james.mailbox.jcr.JCRMailboxSessionMapperFactory">
-        <constructor-arg index="0" ref="sessionJcrRepository"/>
-        <constructor-arg index="1" ref="nodeLocker"/>
-    </bean>
-
-    <bean id ="subscriptionManager" class="org.apache.james.mailbox.jcr.JCRSubscriptionManager">
-        <constructor-arg index="0" ref="sessionMapperFactory"/>
-    </bean>
-
-    <bean id="mailboxmanager" class="org.apache.james.mailbox.jcr.JCRMailboxManager">
-        <constructor-arg index="0" ref="sessionMapperFactory"/>
-        <constructor-arg index="1" ref="authenticator"/>
-        <constructor-arg index="2" ref="nodeLocker"/>
-    </bean>
-    -->
-
-    <!-- The Time Scheduler block -->
     <bean id="scheduler" class="java.util.concurrent.Executors" factory-method="newScheduledThreadPool">
         <constructor-arg value="20"/>
     </bean>
     
-    <!-- Database related beans  -->
     <bean id="datasource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
         <property name="driverClassName" value="${database.driverClassName}" />
         <property name="url" value="${database.url}" />
@@ -416,16 +312,4 @@
         <property name="showSql" value="false"/>
     </bean>
 
-    <!-- Jackrabbit JCR Repository -->
-    <!-- 
-    <bean id="jcrRepository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown">
-        <constructor-arg index="0" ref="config" />
-    </bean>
-    
-    <bean id="config" class="org.apache.jackrabbit.core.config.RepositoryConfig" factory-method="create">
-        <constructor-arg index="0" value="filesystem=file://conf/jcr-repository.xml"/>
-        <constructor-arg index="1" value="filesystem=file://var/jackrabbit" />
-    </bean>
-    -->
-
 </beans>

Modified: james/server/trunk/container-spring/src/main/config/james/sqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/sqlResources.xml?rev=1032052&r1=1032051&r2=1032052&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/sqlResources.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/sqlResources.xml Sat Nov  6 13:38:44 2010
@@ -16,23 +16,11 @@
   specific language governing permissions and limitations      
   under the License.                                           
  -->
-<!-- SQL Statements used by James for database access. -->
+
+<!-- See http://james.apache.org/server/3/config.html for usage -->
+
 <sqlResources>
 
-<!--
-     This section provided configuration to determine the determine the
-     database product which is being used for storage. Different database
-     products may require different SQL syntax.
-
-     The jdbc database connection is examined to see if it matches with the
-     regular expressions specified in any of the defined matchers. The matchers
-     are processed in the over provided here, with the first successful match
-     defining the "db" value for this connection.
-
-     This value is then used to choose between different definitions for various
-     named sql statements, defined below. If no match is found,
-     the default sql statements are used.
--->
 <dbMatchers>
     <dbMatcher db="mssql" databaseProductName="microsoft sql server"/>
     <dbMatcher db="oracle" databaseProductName="oracle.*"/>
@@ -46,32 +34,6 @@
     <dbMatcher db="ingres" databaseProductName="ingres.*"/>
 </dbMatchers>
 
-<!--
-    With the following section it is possible to associate several name/value pairs
-        of options to a database product, identified by the "db" XML attribute name.
-    
-    An element without a "db" attribute, if used for an option name, will become a default value for such option.
-    Each option may have a "default default", i.e. a default that applies if no element with an empty
-        "db" attribute (default element) exists as said above;
-        such default default must be documented for such option below.
-    
-    The order of the XML elements is meaningless.
-    
-    Here only "getBody" and "getAttributes" option names are set, but others could be used in the future.
-    Option names:
-        "getBody" - a string (case insensitive) telling which JDBC ResultSet method will be used to
-            get the message body field for a database product.
-            The default default value is "useBytes"..
-            Values (case insensitive):
-                "useBytes"  - use getBytes(int).
-                "useBlob"   - use getBlob(int).
-        "getAttributes" - a string (case insensitive) telling which JDBC ResultSet method will be used to
-            get the message attributes field for a database product.
-           The default default value is "useBytes"..
-            Values (case insensitive):
-                "useBytes"  - use getBytes(int).
-                "useBlob"   - use getBlob(int).
--->
 <dbOptions>
     <dbOption name="getBody" value="useBytes"/>
     <dbOption name="getAttributes" value="useBytes"/>
@@ -97,19 +59,6 @@
     <dbOption db="ingres" name="getAttributes" value="useBytes"/>
 </dbOptions>
 
-<!-- SQL statements to use for various components. -->
-<!-- -->
-<!-- Parameter definitions ${param} are replaced with parameter values -->
-<!-- read from the configuration file. -->
-<!-- -->
-<!-- If a named statement has a definition defined for the current database product, -->
-<!-- then that statement is used. Otherwise the default statement is used. -->
-
-<!-- SQL statements for the JamesUsersJdbcRepository -->
-<!-- -->
-<!-- The JamesUsersJdbcRepository allows James to use a JDBC compliant database -->
-<!-- to hold user related data.  This includes aliases, forward addresses, -->
-<!-- and password data.  The last is stored as an irreversible hash. -->
 <sqlDefs name="org.apache.james.user.jdbc.JamesUsersJdbcRepository">
     <sql name="tableName">${table}</sql>
 
@@ -159,12 +108,6 @@
     -->
 </sqlDefs>
 
-<!-- SQL statements for the DefaultUsersJdbcRepository -->
-<!-- -->
-<!-- The DefaultUsersJdbcRepository allows James to use a JDBC compliant database -->
-<!-- to hold user ids and password data. The password is stored as an irreversible hash. -->
-<!-- Unlike the JamesUsersJdbcRepository, this repository implementation doesn't support -->
-<!-- aliases or forwards. -->
 <sqlDefs name="org.apache.james.user.jdbc.DefaultUsersJdbcRepository">
     <sql name="tableName">${table}</sql>
 
@@ -193,10 +136,6 @@
     <sql name="createTable">CREATE TABLE ${table} (username VARCHAR(64) NOT NULL, pwdHash VARCHAR(50), pwdAlgorithm VARCHAR(20), PRIMARY KEY(username))</sql>
 </sqlDefs>
 
-<!-- SQL statements for the ListUsersJdbcRepository -->
-<!-- -->
-<!-- This class is used for basic list management.  The database table can -->
-<!-- be used to store subscriber data for mulitple lists.  -->
 <sqlDefs name="org.apache.james.user.jdbc.ListUsersJdbcRepository">
     <!-- An example of defining "default" parameters within the definition file.
          This is used if no key parameter is specified in config. -->
@@ -232,7 +171,6 @@
     <sql name="createTable">CREATE TABLE ${table} (listName VARCHAR(64) NOT NULL, listSubscriber VARCHAR(255) NOT NULL, PRIMARY KEY(listName, listSubscriber))</sql>
 </sqlDefs>
 
-<!-- SQL statements for the JdbcMailRepository  -->
 <sqlDefs name="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
 
     <!-- Statements used to check whether a particular message exists in this repository. -->
@@ -442,9 +380,6 @@
     </sql>
 </sqlDefs>
 
-
-<!-- SQL statements to support the BayesianAnalysis and the BayesianAnalysisFeeder mailets -->
-<!-- -->
 <sqlDefs name="org.apache.james.util.bayesian.JDBCBayesianAnalyzer">
 
     <sql name="hamTableName">bayesiananalysis_ham</sql>
@@ -578,8 +513,6 @@
     </sql>
 </sqlDefs>
 
-<!-- SQL statements to support the WhiteListManager mailet and the IsInWhiteList matcher -->
-<!-- -->
 <sqlDefs name="WhiteList">
 
     <sql name="whiteListTableName">whitelist</sql>
@@ -769,8 +702,7 @@
     </sql>
 
 </sqlDefs>
-<!-- SQL statements to support the GreyList Handler-->
-<!-- -->
+
 <sqlDefs name="GreyList">
 
     <sql name="greyListTableName">greylist</sql>
@@ -893,7 +825,6 @@
     </sql>
 </sqlDefs>
 
-<!-- SQL statements for the JdbcVirtualUserTable  -->
 <sqlDefs name="org.apache.james.vut.jdbc.JDBCVirtualUserTable">
 
     <!-- Statements used to check whether a particular message exists in this repository. -->
@@ -998,7 +929,6 @@
     </sql>
 </sqlDefs>
 
-<!-- SQL statements for the JDBCDomainList  -->
 <sqlDefs name="org.apache.james.domainlist.jdbc.JDBCDomainList">
     <sql name="selectDomains">select distinct domain from ${table} </sql>
     
@@ -1060,5 +990,6 @@
         )
     </sql>
 </sqlDefs>
+
 </sqlResources>
 

Modified: james/server/trunk/container-spring/src/main/config/james/usersrepository.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/usersrepository.xml?rev=1032052&r1=1032051&r2=1032052&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/usersrepository.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/usersrepository.xml Sat Nov  6 13:38:44 2010
@@ -18,76 +18,10 @@
   under the License.                                           
  -->
 
-<usersrepository>
-
-    <!-- Configure User Repositories here. -->
-
-    <!-- -->
-    <!-- User repositories are required for the following purposes: -->
-    <!--    - storing James user information and authentication data. -->
-    <!-- Note: One user repository is required for James: -->
-    <!--   LocalUsers - the users for whom you are providing POP3, IMAP, or SMTP service -->
-    <!-- -->
-
-    
-    <!-- Read-Only LDAP based UsersRepository -->
-    <!--
-    <repository name="LocalUsers" class="org.apache.james.user.ldap.ReadOnlyUsersLDAPRepository" ldapHost="ldap://myldapserver:389" 
-    	principal="uid=ldapUser,ou=system" credentials="password" userBase="ou=People,o=myorg.com,ou=system" userIdAttribute="uid"/>;
-    -->
-    
-    
-    <!-- JPA based backend. Support password algorithm are:
-         MD5, SHA-256, SHA-512, NONE
-     -->
-    <repository name="LocalUsers" class="org.apache.james.user.jpa.JPAUsersRepository">
-        <algorithm>MD5</algorithm>
-    </repository>
+<!-- See http://james.apache.org/server/3/config.html for usage -->
 
-
-    <!-- The UsersRepository implementations below are DEPRECATED and will get removed in the next release -->
-    <!-- They are just listed here for backward-compatibility-->
-    
-    <!-- File-based user repositories  Use these configurations to store user info in the filesystem  -->
-    <!-- The LocalUsers repository, for storing James' User info. -->
-    <!-- DEPRECATED: This implementation will get removed in the next release -->
-    <!--
-    <repository name="LocalUsers" class="org.apache.james.user.file.UsersFileRepository">
-        <destination URL="file://var/users/"/>
-        <ignoreCase>true</ignoreCase>
-        <enableAliases>true</enableAliases>
-        <enableForwarding>true</enableForwarding>
-    </repository>
-    -->
-
-    <!-- Database backed user repositories -->
-    <!-- -->
-    <!-- Use these configurations to store user info in a database. -->
-    <!-- Note: The <data-source> element must refer to a connection configured -->
-    <!--       in the <database-connections> configuration section. -->
-    <!-- The LocalUsers repository, for storing James' User info. -->
-    <!-- DEPRECATED: This implementation will get removed in the next release -->
-    <!--             Use JPAUsersRepository if you want to store the Users in a database -->
-    <!-- 
-    <repository name="LocalUsers" class="org.apache.james.user.jdbc.JamesUsersJdbcRepository" destinationURL="db://maildb/users">
-        <sqlFile>file://conf/sqlResources.xml</sqlFile>
-        <ignoreCase>true</ignoreCase>
-        <enableAliases>true</enableAliases>
-        <enableForwarding>true</enableForwarding>
-    </repository>
-    -->
-        
-    <!-- This is an example configuration including configuration for a list server. -->
-    <!-- CHECKME: before uncommenting this, edit the configuration file's contents   -->
-    <!-- -->
-    <!-- Mailing list repositories  -->
-    <!-- Add a user repository for each list -->
-    <!-- TODO: add more examples  -->    
-    <!-- DEPRECATED: This implementation will get removed in the next release -->
-    <!--       
-    <repository name="list-test" class="org.apache.james.user.file.UsersFileRepository">
-       <destination URL="file://var/lists/list-test/"/>
-    </repository>
-    -->
-    
+<usersrepository>
+  <repository name="LocalUsers" class="org.apache.james.user.jpa.JPAUsersRepository">
+      <algorithm>MD5</algorithm>
+  </repository>
 </usersrepository>

Modified: james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml?rev=1032052&r1=1032051&r2=1032052&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/virtualusertable.xml Sat Nov  6 13:38:44 2010
@@ -17,40 +17,12 @@
   specific language governing permissions and limitations      
   under the License.                                           
  -->
-<!-- The VirtualUserTable block -->
-<virtualusertable>
-    <!-- Configure VirtualUserTable here. -->
-    <!-- Only one table can be active -->
-    
-    <!-- -->
-    <!-- If set recursiveMapping false only the first mapping will get processed. -->
-    <!-- Default true. -->
-    <!-- By setting the mappingLimit you can specify how much mapping will get processed -->
-    <!-- before a bounce will send. This avoid infinity loops. Default 10.  -->
-    <!--
-    <table  class="org.apache.james.vut.xml.XMLVirtualUserTable">
-        <recursiveMapping> true </recursiveMapping>
-        <mappingLimit> 10 </mappingLimit>
-         
-        <mapping> some@domain=someuser </mapping>
-    </table>
-    -->
 
-    <!-- Database backed VirtualUsertable -->
-    <!-- -->
-    <!-- Use these configurations to store the VirtualUserTable in a database. -->
-    <!-- 
-    <table class="org.apache.james.vut.jdbc.JDBCVirtualUserTable" destinationURL="db://maildb/VirtualUserTable">
-        <recursiveMapping> true </recursiveMapping>
-        <mappingLimit> 10 </mappingLimit>
-        <sqlFile>file://conf/sqlResources.xml</sqlFile>
-    </table>
-    -->
-    
-    <!-- The default table for storing James' VirtualUserTable mappings. -->
-    <table class="org.apache.james.vut.jpa.JPAVirtualUserTable">
-        <recursiveMapping> true </recursiveMapping>
-        <mappingLimit> 10 </mappingLimit>
-    </table>
+<!-- See http://james.apache.org/server/3/config.html for usage -->
 
+<virtualusertable>
+  <table class="org.apache.james.vut.jpa.JPAVirtualUserTable">
+      <recursiveMapping> true </recursiveMapping>
+      <mappingLimit> 10 </mappingLimit>
+  </table>
 </virtualusertable>



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