Author: eric
Date: Fri Mar  2 15:10:40 2012
New Revision: 1296240

URL: http://svn.apache.org/viewvc?rev=1296240&view=rev
Log:
Update the templates to reflect the latest changes on our server/containers 
(JAMES-1376)

Modified:
    james/app/trunk/src/main/resources/imapserver-template.conf
    james/app/trunk/src/main/resources/lmtpserver-template.conf
    james/app/trunk/src/main/resources/mailetcontainer-template.conf
    james/app/trunk/src/main/resources/pop3server-template.conf
    james/app/trunk/src/main/resources/smtpserver-template.conf

Modified: james/app/trunk/src/main/resources/imapserver-template.conf
URL: 
http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/imapserver-template.conf?rev=1296240&r1=1296239&r2=1296240&view=diff
==============================================================================
--- james/app/trunk/src/main/resources/imapserver-template.conf (original)
+++ james/app/trunk/src/main/resources/imapserver-template.conf Fri Mar  2 
15:10:40 2012
@@ -17,49 +17,56 @@
   specific language governing permissions and limitations      
   under the License.                                           
  -->
-<!-- IMAP server is enabled by default -->
-<!-- Disabling blocks will stop them from listening, -->
-<!-- but does not free as many resources as removing them would -->
-<imapserver enabled="true">
+<imapservers>
 
-    <!-- Configure this if you want to bind to a specific inetaddress -->
-    <!-- port 143 is the well-known/IANA registered port for IMAP -->
-    <!-- port 993 is the well-known/IANA registered port for IMAPS  ie over 
SSL/TLS -->
-    <!-- Please NOTE: you should add this IP also to your 
RemoteAddrNotInNetwork -->
-    <!-- in order to avoid relay check for locally generated bounces -->     
-    <bind>0.0.0.0:143</bind>
-    
-    <connectionBacklog>200</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" 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 is 30 minutes and can not be changed - See 
rfc2060 5.4 for details -->
-            
-        <!-- 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>
-         
-    </handler>
-</imapserver>
\ No newline at end of file
+       <!-- IMAP server is enabled by default -->
+       <!-- Disabling blocks will stop them from listening, -->
+       <!-- but does not free as many resources as removing them would -->
+       <imapserver enabled="true">
+       
+        <jmxName>imapserver</jmxName>
+
+           <!-- Configure this if you want to bind to a specific inetaddress 
-->
+           <!-- port 143 is the well-known/IANA registered port for IMAP -->
+           <!-- port 993 is the well-known/IANA registered port for IMAPS  ie 
over SSL/TLS -->
+           <!-- Please NOTE: you should add this IP also to your 
RemoteAddrNotInNetwork -->
+           <!-- in order to avoid relay check for locally generated bounces 
-->     
+           <bind>0.0.0.0:143</bind>
+           
+           <connectionBacklog>200</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" 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 is 30 minutes and can not be changed - 
See rfc2060 5.4 for details -->
+                   
+               <!-- 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>
+                
+           </handler>
+
+       </imapserver>
+
+</imapservers>

Modified: james/app/trunk/src/main/resources/lmtpserver-template.conf
URL: 
http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/lmtpserver-template.conf?rev=1296240&r1=1296239&r2=1296240&view=diff
==============================================================================
--- james/app/trunk/src/main/resources/lmtpserver-template.conf (original)
+++ james/app/trunk/src/main/resources/lmtpserver-template.conf Fri Mar  2 
15:10:40 2012
@@ -17,49 +17,56 @@
   specific language governing permissions and limitations      
   under the License.                                           
  -->
-<!-- The LMTP server is disabled by default -->
-<!-- Disabling blocks will stop them from listening, -->
-<!-- but does not free as many resources as removing them would -->
-<lmtpserver enabled="false">
+ 
+<lmtpservers>
+ 
+       <!-- The LMTP server is disabled by default -->
+       <!-- Disabling blocks will stop them from listening, -->
+       <!-- but does not free as many resources as removing them would -->
+       <lmtpserver enabled="false">
+       
+        <jmxName>lmtpserver</jmxName>
 
-    <!-- LMTP should not be reachable from outside your network so bind it to 
loopback-->
-    <bind>127.0.0.1:24</bind>
-    
-    <connectionBacklog>200</connectionBacklog>
-      
-    <handler>
-        <!-- This is the name used by the server to identify itself in the 
LMTP -->
-        <!-- 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>
-         
-        <!--  This sets the maximum allowed message size (in kilobytes) for 
this -->
-        <!--  LMTP service. If unspecified, the value defaults to 0, which 
means no limit. -->
-        <maxmessagesize>0</maxmessagesize>
-         
-                 
-         <!-- This sets the LMTPGreeting which will be used when connect to 
the lmtpserver -->
-         <!-- If none is specified a default is generated -->
-         <!--
-         <smtpGreeting> JAMES LMTP Server </smtpGreeting>
-         -->
-         
-        <handlerchain>
-            <!-- This loads the core CommandHandlers. Only remove this if you 
really -->
-            <!-- know what you are doing -->
-            <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </handler>
-</lmtpserver>
\ No newline at end of file
+           <!-- LMTP should not be reachable from outside your network so bind 
it to loopback-->
+           <bind>127.0.0.1:24</bind>
+           
+           <connectionBacklog>200</connectionBacklog>
+             
+           <handler>
+               <!-- This is the name used by the server to identify itself in 
the LMTP -->
+               <!-- 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>
+                
+               <!--  This sets the maximum allowed message size (in kilobytes) 
for this -->
+               <!--  LMTP service. If unspecified, the value defaults to 0, 
which means no limit. -->
+               <maxmessagesize>0</maxmessagesize>
+                
+                        
+                <!-- This sets the LMTPGreeting which will be used when 
connect to the lmtpserver -->
+                <!-- If none is specified a default is generated -->
+                <!--
+                <smtpGreeting> JAMES LMTP Server </smtpGreeting>
+                -->
+                
+               <handlerchain>
+                   <!-- This loads the core CommandHandlers. Only remove this 
if you really -->
+                   <!-- know what you are doing -->
+                   <handler 
class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
+               </handlerchain>
+           </handler>
+       </lmtpserver>
+       
+</lmtpservers>

Modified: james/app/trunk/src/main/resources/mailetcontainer-template.conf
URL: 
http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/mailetcontainer-template.conf?rev=1296240&r1=1296239&r2=1296240&view=diff
==============================================================================
--- james/app/trunk/src/main/resources/mailetcontainer-template.conf (original)
+++ james/app/trunk/src/main/resources/mailetcontainer-template.conf Fri Mar  2 
15:10:40 2012
@@ -20,7 +20,7 @@
 
 <!-- This block is responsible for processing messages on the spool. -->
 
-<mailetcontainer>
+<mailetcontainer enableJmx="true">
  
      <!-- MailAddress used for PostMaster -->
      <postmaster>Postmaster@localhost</postmaster>
@@ -658,4 +658,5 @@ Regards, Postmaster XXX.YYY
             -->
          </mailet>
      </processor>
-  </mailetcontainer>
+
+</mailetcontainer>

Modified: james/app/trunk/src/main/resources/pop3server-template.conf
URL: 
http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/pop3server-template.conf?rev=1296240&r1=1296239&r2=1296240&view=diff
==============================================================================
--- james/app/trunk/src/main/resources/pop3server-template.conf (original)
+++ james/app/trunk/src/main/resources/pop3server-template.conf Fri Mar  2 
15:10:40 2012
@@ -17,52 +17,60 @@
   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">
+ 
+<pop3servers>
 
-    <!-- Configure this to bind to a specific inetaddress -->
-    <!-- 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 -->
-    <bind>0.0.0.0:110</bind>
-
-    <connectionBacklog>200</connectionBacklog>
-
-    <!-- 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
+       <!-- 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">
+       
+           <jmxName>pop3server</jmxName>
+       
+           <!-- Configure this to bind to a specific inetaddress -->
+           <!-- 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 -->
+           <bind>0.0.0.0:110</bind>
+       
+           <connectionBacklog>200</connectionBacklog>
+       
+           <!-- 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>
+       
+</pop3servers>

Modified: james/app/trunk/src/main/resources/smtpserver-template.conf
URL: 
http://svn.apache.org/viewvc/james/app/trunk/src/main/resources/smtpserver-template.conf?rev=1296240&r1=1296239&r2=1296240&view=diff
==============================================================================
--- james/app/trunk/src/main/resources/smtpserver-template.conf (original)
+++ james/app/trunk/src/main/resources/smtpserver-template.conf Fri Mar  2 
15:10:40 2012
@@ -17,11 +17,15 @@
   under the License.                                           
  -->
  
+<smtpservers>
+
     <!-- 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">
 
+      <jmxName>smtpserver</jmxName>
+
       <!-- Configure this 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 -->
@@ -306,5 +310,9 @@
              -->
          </handlerchain>            
     </handler>
-</smtpserver>
+  
+  </smtpserver>
+
+</smtpservers>
+
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to