pgoldstein    2002/09/30 10:21:14

  Modified:    src/conf james-assembly.xml james-server.xml
  Log:
  Adding explanatory comments to james-server.xml and james-assembly.xml.
  Rearranged and reformatted to clarify the file.
  Changed all default log levels to "INFO" as per outstanding todo item.
  
  Revision  Changes    Path
  1.10      +60 -47    jakarta-james/src/conf/james-assembly.xml
  
  Index: james-assembly.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/conf/james-assembly.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- james-assembly.xml        24 Sep 2002 15:38:40 -0000      1.9
  +++ james-assembly.xml        30 Sep 2002 17:21:14 -0000      1.10
  @@ -2,18 +2,28 @@
   
   <assembly>
   
  -<block class="org.apache.james.fetchpop.FetchScheduler" name="fetchpop">
  - 
  -    <provide name="scheduler"
  -        role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/> 
  -        <provide name="James" role="org.apache.james.services.MailServer"/>      
  -</block>
  +  <!-- The list of blocks being run in this Phoenix server. -->
  +  <!-- -->
  +  <!-- Each block element has a name attribute that is unique -->
  +  <!-- among the blocks. It also has a class attribute that -->
  +  <!-- specifies the class providing that block-->
  +  <!-- -->
  +  <!-- The block element may have one or more provide sub-elements. -->
  +  <!-- Each provide element represents another block on which this -->
  +  <!-- block depends.  Phoenix will calculate a dependency chain when it -->
  +  <!-- reads this file, and will load and start the blocks in the order -->
  +  <!-- specified by that chain.  Each provide element has a name attribute, -->
  +  <!-- which matches the name of a block defined in this file.  It also -->
  +  <!-- has a role attribute.  This attribute is the string by which the -->
  +  <!-- enclosing block will identify the required block. -->
  +  <!-- -->
  +
     <!-- The James block  -->
  -  <block class="org.apache.james.James" name="James" >
  +  <block name="James" class="org.apache.james.James" >
   
       <!-- Specify which components will provide the services required by this
       block. The roles are specified in the code and the .xinfo file. The names
  -    here must match the names specified for  a Block in this xml file.   -->
  +    here must match the names specified for a Block in this xml file.   -->
       <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
       <provide name="mailstore" role="org.apache.james.services.MailStore"/>
       <provide name="users-store" role="org.apache.james.services.UsersStore"/>
  @@ -28,79 +38,84 @@
     </block>
   
     <!-- The James Spool Manager block  -->
  -  <block class="org.apache.james.transport.JamesSpoolManager"
  -         name="spoolmanager" >
  +  <block name="spoolmanager" class="org.apache.james.transport.JamesSpoolManager" >
       <provide name="James" role="org.apache.mailet.MailetContext"/>
       <provide name="mailstore" role="org.apache.james.services.MailStore"/>
       <provide name="thread-manager"
                role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
     </block>
   
  -  <block class="org.apache.james.dnsserver.DNSServer" name="dnsserver"/>
  +  <block name="dnsserver" class="org.apache.james.dnsserver.DNSServer" />
   
  -  <block class="org.apache.james.remotemanager.RemoteManager" name="remotemanager" >
  +  <block name="remotemanager" class="org.apache.james.remotemanager.RemoteManager" >
       <provide name="mailstore" role="org.apache.james.services.MailStore"/>
       <provide name="users-store" role="org.apache.james.services.UsersStore"/>
       <provide name="sockets"
  -        role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
  +             role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
       <provide name="connections"
  -        role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
  +             
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
       <provide name="scheduler"
  -        role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  +             role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
       <provide name="James" role="org.apache.james.services.MailServer"/>
     </block>
   
     <!-- POP3 Server -->
  -  <block class="org.apache.james.pop3server.POP3Server" name="pop3server" >
  +  <block name="pop3server" class="org.apache.james.pop3server.POP3Server" >
       <provide name="mailstore" role="org.apache.james.services.MailStore"/>
       <provide name="users-store" role="org.apache.james.services.UsersStore"/>
       <provide name="sockets"
  -        role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
  +             role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
       <provide name="connections"
  -        role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
  +             
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
       <provide name="scheduler"
  -        role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  +             role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
       <provide name="James" role="org.apache.james.services.MailServer"/>
     </block>
   
     <!-- SMTP Server -->
  -  <block class="org.apache.james.smtpserver.SMTPServer" name="smtpserver" >
  +  <block name="smtpserver" class="org.apache.james.smtpserver.SMTPServer" >
       <provide name="James" role="org.apache.mailet.MailetContext"/>
       <provide name="mailstore" role="org.apache.james.services.MailStore"/>
       <provide name="users-store" role="org.apache.james.services.UsersStore"/>
       <provide name="sockets"
  -        role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
  +             role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
       <provide name="connections"
  -        role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
  +             
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
       <provide name="scheduler"
  -        role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  +             role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
       <provide name="James" role="org.apache.james.services.MailServer"/>
     </block>
   
     <!-- NNTP Server -->
  -  <block class="org.apache.james.nntpserver.NNTPServer" name="nntpserver" >
  +  <block name="nntpserver" class="org.apache.james.nntpserver.NNTPServer" >
       <provide name="nntpauth" role="org.apache.james.nntpserver.AuthService"/>
       <provide name="sockets"
  -        role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
  +             role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
       <provide name="connections"
  -        role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
  +             
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
       <provide name="scheduler"
  -        role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  +             role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
       <provide name="nntp-repository"
  -        role="org.apache.james.nntpserver.repository.NNTPRepository"/>
  +             role="org.apache.james.nntpserver.repository.NNTPRepository"/>
     </block>
   
     <!-- NNTP Authentication Service -->
  -  <block class="org.apache.james.nntpserver.AuthServiceImpl" name="nntpauth" >
  +  <block name="nntpauth" class="org.apache.james.nntpserver.AuthServiceImpl" >
       <provide name="users-store" role="org.apache.james.services.UsersStore"/>
     </block>
   
     <!-- NNTP Repository -->
  -  <block class="org.apache.james.nntpserver.repository.NNTPRepositoryImpl" 
name="nntp-repository" >
  +  <block name="nntp-repository" 
class="org.apache.james.nntpserver.repository.NNTPRepositoryImpl" />
  +
  +  <!-- FetchPOP Service -->
  +  <block name="fetchpop" class="org.apache.james.fetchpop.FetchScheduler" >
  +    <provide name="scheduler"
  +             
role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/> 
  +    <provide name="James" role="org.apache.james.services.MailServer"/>      
     </block>
   
     <!-- The High Level Storage block -->
  -  <block class="org.apache.james.core.AvalonMailStore" name="mailstore" >
  +  <block name="mailstore" class="org.apache.james.core.AvalonMailStore" >
       <provide name="objectstorage"
                role="org.apache.avalon.cornerstone.services.store.Store"/>
       <provide name="database-connections"
  @@ -108,7 +123,7 @@
     </block>
   
     <!-- The User Storage block -->
  -  <block class="org.apache.james.core.AvalonUsersStore" name="users-store" >
  +  <block name="users-store" class="org.apache.james.core.AvalonUsersStore" >
       <!-- Configure file based user store here, defaults should be fine -->
       <provide name="objectstorage"
                role="org.apache.avalon.cornerstone.services.store.Store"/>
  @@ -122,35 +137,33 @@
          (unless you want secure sockets (TLS)) -->
   
     <!-- The Storage block -->
  -  <block class="org.apache.avalon.cornerstone.blocks.masterstore.RepositoryManager"
  -         name="objectstorage">
  -  </block>
  +  <block name="objectstorage"
  +         class="org.apache.avalon.cornerstone.blocks.masterstore.RepositoryManager" 
/>
   
     <!-- The Connection Manager block -->
  -  <block 
class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager"
  -           name="connections">
  +  <block name="connections"
  +         
class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager" >
       <provide name="thread-manager"
                role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
     </block>
   
     <!-- The Socket Manager block -->
  -  <block class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager"
  -         name="sockets"/>
  +  <block name="sockets"
  +         class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager"/>
   
  -  <!-- The Time Manager block -->
  -  <block class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler"
  -         name="scheduler">
  +  <!-- The Time Scheduler block -->
  +  <block name="scheduler"
  +         
class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler" >
       <provide name="thread-manager"
                role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
     </block>
   
     <!-- The DataSourceSelector block -->
  -  <block 
class="org.apache.avalon.cornerstone.blocks.datasource.DefaultDataSourceSelector"
  -         name="database-connections"/>
  +  <block name="database-connections"
  +         
class="org.apache.avalon.cornerstone.blocks.datasource.DefaultDataSourceSelector" />
   
     <!-- The ThreadManager block -->
  -  <block class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager"
  -         name="thread-manager" />
  +  <block name="thread-manager"
  +         class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager" 
/>
   
   </assembly>
  -
  
  
  
  1.9       +47 -16    jakarta-james/src/conf/james-server.xml
  
  Index: james-server.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/conf/james-server.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- james-server.xml  24 Sep 2002 15:38:40 -0000      1.8
  +++ james-server.xml  30 Sep 2002 17:21:14 -0000      1.9
  @@ -7,53 +7,71 @@
         <factory type="file" 
class="org.apache.avalon.excalibur.logger.factory.FileTargetFactory"/>
       </factories>
   
  +    <!-- Logger categories -->
  +    <!-- -->
  +    <!-- The categories element contains zero or more category elements. -->
  +    <!-- -->
  +    <!-- Each category element has a name attribute that should be unique -->
  +    <!-- among the category elements. It also has a log-level attribute. -->
  +    <!-- This attribute can be set to any of the values FATALERROR, ERROR, -->
  +    <!-- WARN, INFO, or DEBUG.  This value determines what log messages -->
  +    <!-- are recorded in the log file.  In addition, each category element -->
  +    <!-- can have zero or more category subelements. -->
  +    <!-- -->
  +    <!-- Each category element has a single log-target sub-element.  Each of -->
  +    <!-- these elements has an id-ref attribute that must match the id attribute -->
  +    <!-- of a file subelement of the targets element that can be found in this -->
  +    <!-- file. -->
  +    <!-- -->
  +    <!-- In addition, each category element can have zero or more category 
subelements. -->
  +    <!-- -->
       <categories>
  -      <category name="" log-level="DEBUG">
  +      <category name="" log-level="INFO">
           <log-target id-ref="default"/>
         </category>
  -      <category name="James.Mailet" log-level="DEBUG">
  +      <category name="James.Mailet" log-level="INFO">
           <log-target id-ref="James-Mailet-target"/>
         </category>
  -      <category name="James" log-level="DEBUG">
  +      <category name="James" log-level="INFO">
           <log-target id-ref="James-target"/>
         </category>
  -      <category name="spoolmanager" log-level="DEBUG">
  +      <category name="spoolmanager" log-level="INFO">
           <log-target id-ref="spoolmanager-target"/>
         </category>
  -      <category name="dnsserver" log-level="DEBUG">
  +      <category name="dnsserver" log-level="INFO">
           <log-target id-ref="dnsserver-target"/>
         </category>
  -      <category name="remotemanager" log-level="DEBUG">
  +      <category name="remotemanager" log-level="INFO">
           <log-target id-ref="remotemanager-target"/>
         </category>
  -      <category name="pop3server" log-level="DEBUG">
  +      <category name="pop3server" log-level="INFO">
           <log-target id-ref="pop3server-target"/>
         </category>
  -      <category name="smtpserver" log-level="DEBUG">
  +      <category name="smtpserver" log-level="INFO">
           <log-target id-ref="smtpserver-target"/>
         </category>
  -      <category name="nntpserver" log-level="DEBUG">
  +      <category name="nntpserver" log-level="INFO">
           <log-target id-ref="nntpserver-target"/>
         </category>
  -      <category name="nntp-repository" log-level="DEBUG">
  +      <category name="nntp-repository" log-level="INFO">
           <log-target id-ref="nntp-repository-target"/>
         </category>
  -      <category name="mailstore" log-level="DEBUG">
  +      <category name="mailstore" log-level="INFO">
           <log-target id-ref="mailstore-target"/>
         </category>
  -      <category name="users-store" log-level="DEBUG">
  +      <category name="users-store" log-level="INFO">
           <log-target id-ref="users-store-target"/>
         </category>
  -      <category name="objectstorage" log-level="DEBUG">
  +      <category name="objectstorage" log-level="INFO">
           <log-target id-ref="objectstorage-target"/>
         </category>
  -      <category name="connections" log-level="DEBUG">
  +      <category name="connections" log-level="INFO">
           <log-target id-ref="connections-target"/>
         </category>
  -      <category name="sockets" log-level="DEBUG">
  +      <category name="sockets" log-level="INFO">
           <log-target id-ref="sockets-target"/>
         </category>
  -      <category name="scheduler" log-level="DEBUG">
  +      <category name="scheduler" log-level="INFO">
           <log-target id-ref="scheduler-target"/>
         </category>
         <category name="fetchpop" log-level="INFO">
  @@ -61,6 +79,19 @@
         </category>      
       </categories>
   
  +    <!-- Logger targets -->
  +    <!-- -->
  +    <!-- The targets element contains zero or more file elements. -->
  +    <!-- -->
  +    <!-- Each file element has an id attribute that should be unique -->
  +    <!-- among the file elements.  -->
  +    <!-- -->
  +    <!-- Each file element has three sub-elements.  The filename element -->
  +    <!-- specifies the file associated with this log target.   The format -->
  +    <!-- element describes the format for each line in the log.  The append -->
  +    <!-- element is a boolean value that determines whether James appends -->
  +    <!-- to old logs on restart.  -->
  +    <!-- -->
       <targets>
         <file id="default">
           <filename>${app.home}/logs/default.log</filename>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to