serge       01/10/24 19:58:29

  Modified:    src/conf james-assembly.xml
  Log:
  Exposes excalibur datasource selector to JAMES block (so mailets can get to database 
connections defined in james)
  
  Revision  Changes    Path
  1.5       +21 -19    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- james-assembly.xml        2001/09/25 04:51:19     1.4
  +++ james-assembly.xml        2001/10/25 02:58:29     1.5
  @@ -13,18 +13,20 @@
       <provide name="users-store" role="org.apache.james.services.UsersStore"/>
       <provide name="sockets"
                role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
  -    <provide name="connections" 
  +    <provide name="connections"
                
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
       <provide name="scheduler"
                role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  +    <provide name="database-connections"
  +             
role="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector" />
     </block>
   
     <!-- The James Spool Manager block  -->
  -  <block class="org.apache.james.transport.JamesSpoolManager" 
  +  <block class="org.apache.james.transport.JamesSpoolManager"
            name="spoolmanager" >
       <provide name="James" role="org.apache.mailet.MailetContext"/>
       <provide name="mailstore" role="org.apache.james.services.MailStore"/>
  -    <provide name="thread-manager" 
  +    <provide name="thread-manager"
                role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
     </block>
   
  @@ -35,7 +37,7 @@
       <provide name="users-store" role="org.apache.james.services.UsersStore"/>
       <provide name="sockets"
           role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
  -    <provide name="connections" 
  +    <provide name="connections"
           role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
       <provide name="scheduler"
           role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  @@ -48,7 +50,7 @@
       <provide name="users-store" role="org.apache.james.services.UsersStore"/>
       <provide name="sockets"
           role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
  -    <provide name="connections" 
  +    <provide name="connections"
           role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
       <provide name="scheduler"
           role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  @@ -61,7 +63,7 @@
       <provide name="users-store" role="org.apache.james.services.UsersStore"/>
       <provide name="sockets"
           role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
  -    <provide name="connections" 
  +    <provide name="connections"
           role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
       <provide name="scheduler"
           role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  @@ -74,7 +76,7 @@
       <provide name="users-store" role="org.apache.james.services.UsersStore"/>
       <provide name="sockets"
           role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
  -    <provide name="connections" 
  +    <provide name="connections"
           role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
       <provide name="scheduler"
           role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  @@ -87,7 +89,7 @@
       <provide name="users-store" role="org.apache.james.services.UsersStore"/>
       <provide name="sockets"
           role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
  -    <provide name="connections" 
  +    <provide name="connections"
           role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
       <provide name="scheduler"
           role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  @@ -102,11 +104,11 @@
     <!-- The High Level Storage block -->
     <block class="org.apache.james.core.AvalonMailStore" name="mailstore" >
       <provide name="objectstorage"
  -             role="org.apache.avalon.cornerstone.services.store.Store"/> 
  +             role="org.apache.avalon.cornerstone.services.store.Store"/>
       <provide name="database-connections"
                
role="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector" />
     </block>
  -       
  +
     <!-- The User Storage block -->
     <block class="org.apache.james.core.AvalonUsersStore" name="users-store" >
       <!-- Configure file based user store here, defaults should be fine -->
  @@ -115,21 +117,21 @@
       <provide name="database-connections"
                
role="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector" />
     </block>
  -      
  +
   
     <!-- Configuration for Cornerstone Blocks only after here
          NOTHING BELOW THIS SHOULD NEED CHANGING,
          (unless you want secure sockets (TLS)) -->
   
     <!-- The Storage block -->
  -  <block class="org.apache.avalon.cornerstone.blocks.masterstore.RepositoryManager" 
  +  <block class="org.apache.avalon.cornerstone.blocks.masterstore.RepositoryManager"
            name="objectstorage">
     </block>
   
     <!-- The Connection Manager block -->
  -  <block 
class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager" 
  +  <block 
class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager"
              name="connections">
  -    <provide name="thread-manager" 
  +    <provide name="thread-manager"
                role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
     </block>
   
  @@ -138,18 +140,18 @@
            name="sockets"/>
   
     <!-- The Time Manager block -->
  -  <block 
class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler" 
  +  <block class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler"
            name="scheduler">
  -    <provide name="thread-manager" 
  +    <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" 
  +  <block 
class="org.apache.avalon.cornerstone.blocks.datasource.DefaultDataSourceSelector"
            name="database-connections"/>
   
     <!-- The ThreadManager block -->
  -  <block class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager" 
  +  <block class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager"
            name="thread-manager" />
   
   </assembly>
  
  
  

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

Reply via email to