avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-components/threads-tutorial/conf block.xml
Date Tue, 12 Aug 2003 11:57:58 GMT
mcconnell    2003/08/12 04:57:58

  Modified:    .        project.xml
               connection-impl/conf block.xml
               datasources-impl/conf block.xml
               scheduler-impl/conf block.xml
               sockets-impl/conf block.xml
               store-impl/conf block.xml
               threads-impl/conf block.xml
               threads-tutorial/conf block.xml
  Log:
  Remove project.xml reference to ${maven.conf.dir} which is not functioning nrmally in maven
beta-10.  Also, updated block descriptors to bring then up to 3.0 format.
  
  Revision  Changes    Path
  1.6       +1 -1      avalon-components/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	19 Jun 2003 23:53:34 -0000	1.5
  +++ project.xml	12 Aug 2003 11:57:58 -0000	1.6
  @@ -199,7 +199,7 @@
           </includes>
         </resource>
         <resource>
  -        <directory>${maven.conf.dir}</directory>
  +        <directory>${basedir}/conf</directory>
           <targetPath>BLOCK-INF</targetPath>
           <includes>
             <include>block.xml</include>
  
  
  
  1.4       +2 -2      avalon-components/connection-impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/connection-impl/conf/block.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- block.xml	17 Jul 2003 21:12:40 -0000	1.3
  +++ block.xml	12 Aug 2003 11:57:58 -0000	1.4
  @@ -21,7 +21,7 @@
   
      <implementation>
   
  -     <engine>
  +     <classloader>
          <classpath>
            <repository>
              <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
  @@ -31,7 +31,7 @@
              <resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
            </repository>
          </classpath>
  -     </engine>
  +     </classloader>
   
        <component name="manager" 
           class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager"

  
  
  
  1.5       +2 -2      avalon-components/datasources-impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/datasources-impl/conf/block.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- block.xml	17 Jul 2003 21:12:41 -0000	1.4
  +++ block.xml	12 Aug 2003 11:57:58 -0000	1.5
  @@ -17,7 +17,7 @@
   
      <implementation>
   
  -     <engine>
  +     <classloader>
          <classpath>
            <repository>
              <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
  @@ -27,7 +27,7 @@
              <resource id="cornerstone-datasources:cornerstone-datasources-impl" version="SNAPSHOT"/>
            </repository>
          </classpath>
  -     </engine>
  +     </classloader>
   
        <component name="manager" 
           class="org.apache.avalon.cornerstone.blocks.datasources.DefaultDataSourceSelector"

  
  
  
  1.4       +2 -2      avalon-components/scheduler-impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/scheduler-impl/conf/block.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- block.xml	17 Jul 2003 21:12:41 -0000	1.3
  +++ block.xml	12 Aug 2003 11:57:58 -0000	1.4
  @@ -21,7 +21,7 @@
   
      <implementation>
   
  -     <engine>
  +     <classloader>
          <classpath>
            <repository>
              <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
  @@ -30,7 +30,7 @@
              <resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
            </repository>
          </classpath>
  -     </engine>
  +     </classloader>
   
        <component name="manager" 
           class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler" 
  
  
  
  1.4       +2 -2      avalon-components/sockets-impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/sockets-impl/conf/block.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- block.xml	17 Jul 2003 21:12:41 -0000	1.3
  +++ block.xml	12 Aug 2003 11:57:58 -0000	1.4
  @@ -17,7 +17,7 @@
   
      <implementation>
   
  -     <engine>
  +     <classloader>
          <classpath>
            <repository>
              <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
  @@ -25,7 +25,7 @@
              <resource id="cornerstone-sockets:cornerstone-sockets-impl" version="SNAPSHOT"/>
            </repository>
          </classpath>
  -     </engine>
  +     </classloader>
   
        <component name="manager" 
           class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager" 
  
  
  
  1.3       +2 -2      avalon-components/store-impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/store-impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	17 Jul 2003 21:12:41 -0000	1.2
  +++ block.xml	12 Aug 2003 11:57:58 -0000	1.3
  @@ -17,7 +17,7 @@
   
      <implementation>
   
  -     <engine>
  +     <classloader>
          <classpath>
            <repository>
              <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
  @@ -25,7 +25,7 @@
              <resource id="cornerstone-store:cornerstone-store-impl" version="SNAPSHOT"/>
            </repository>
          </classpath>
  -     </engine>
  +     </classloader>
   
        <component name="manager" 
           class="org.apache.avalon.cornerstone.blocks.masterstore.RepositoryManager" 
  
  
  
  1.3       +3 -2      avalon-components/threads-impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/threads-impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	17 Jul 2003 21:12:41 -0000	1.2
  +++ block.xml	12 Aug 2003 11:57:58 -0000	1.3
  @@ -17,7 +17,7 @@
   
      <implementation>
   
  -     <engine>
  +     <classloader>
          <classpath>
            <repository>
              <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
  @@ -26,9 +26,10 @@
              <resource id="excalibur-event:excalibur-event" version="1.0.3"/>
              <resource id="cornerstone-threads:cornerstone-threads-api" version="SNAPSHOT"/>
              <resource id="cornerstone-threads:cornerstone-threads-impl" version="SNAPSHOT"/>
  +           <resource id="commons-collections:commons-collections" version="2.1"/>
            </repository>
          </classpath>
  -     </engine>
  +     </classloader>
   
        <component name="manager" 
           class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager" 
  
  
  
  1.4       +3 -5      avalon-components/threads-tutorial/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/threads-tutorial/conf/block.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- block.xml	17 Jul 2003 21:12:41 -0000	1.3
  +++ block.xml	12 Aug 2003 11:57:58 -0000	1.4
  @@ -11,7 +11,7 @@
   
      <implementation>
   
  -     <engine>
  +     <classloader>
          <classpath>
            <repository>
              <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
  @@ -20,11 +20,9 @@
              <resource id="excalibur-event:excalibur-event" version="1.0.3"/>
            </repository>
          </classpath>
  -     </engine>
  +     </classloader>
   
  -     <include name="threads">
  -       <resource id="cornerstone-threads:cornerstone-threads-impl" version="SNAPSHOT"/>
  -     </include>
  +     <include name="threads" id="cornerstone-threads:cornerstone-threads-impl" version="SNAPSHOT"/>
   
        <component name="test" 
           class="org.apache.avalon.cornerstone.threads.tutorial.ThreadConsumer" 
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message