You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/05/16 09:56:29 UTC

cvs commit: avalon-components/cornerstone/site/etc NOTICE.TXT

mcconnell    2004/05/16 00:56:29

  Modified:    cornerstone/connection/api project.xml
               cornerstone/connection/impl/conf block.xml
               cornerstone/connection/impl project.xml
               cornerstone/datasources/api project.xml
               cornerstone/datasources/impl/conf block.xml
               cornerstone/datasources/impl project.xml
               cornerstone maven.xml project.xml
               cornerstone/scheduler/api project.xml
               cornerstone/scheduler/impl/conf block.xml
               cornerstone/scheduler/impl project.xml
               cornerstone/site/xdocs/components connection.xml
                        datasource.xml index.xml scheduler.xml sockets.xml
                        store.xml threads.xml
               cornerstone/sockets/api project.xml
               cornerstone/sockets/impl/conf block.xml
               cornerstone/sockets/impl project.xml
               cornerstone/store/api project.xml
               cornerstone/store/impl/conf block.xml
               cornerstone/store/impl project.xml
               cornerstone/threads/api project.xml
               cornerstone/threads/impl/conf block.xml
               cornerstone/threads/impl project.xml
               cornerstone/threads/tutorial/conf block.xml demo.xml
               cornerstone/threads/tutorial project.xml
  Added:       cornerstone/site/etc NOTICE.TXT
  Log:
  Add common license and notice, and sync all versions with X.Y.Z notion.
  
  Revision  Changes    Path
  1.4       +3 -9      avalon-components/cornerstone/connection/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/connection/api/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	30 Apr 2004 14:04:30 -0000	1.3
  +++ project.xml	16 May 2004 07:56:27 -0000	1.4
  @@ -8,13 +8,7 @@
     <id>cornerstone-connection-api</id>
     <name>Cornerstone Connection API</name>
   
  -  <!-- 
  -  bump to SNAPSHOT in prep for a 2.0 relase because the API references 
  -  cornerstone threads SNAPSHOT which references excalibur thread SNAPSHOT
  -  which is bumped due to removal of deprecated interface references.
  -  -->
  -
  -  <currentVersion>2.0</currentVersion>
  +  <currentVersion>2.0.0</currentVersion>
     <package>org.apache.avalon.cornerstone.services.connection</package>
     <inceptionYear>2001</inceptionYear>
     <shortDescription>Cornerstone Connection API</shortDescription>
  @@ -45,12 +39,12 @@
       <dependency>
         <groupId>excalibur-pool</groupId>
         <artifactId>excalibur-pool-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>excalibur-thread</groupId>
         <artifactId>excalibur-thread-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.3       +6 -6      avalon-components/cornerstone/connection/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/connection/impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	30 Apr 2004 14:04:31 -0000	1.2
  +++ block.xml	16 May 2004 07:56:27 -0000	1.3
  @@ -15,12 +15,12 @@
        <classpath>
          <repository>
            <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
  -         <resource id="excalibur-thread:excalibur-thread-api" version="2.0"/>
  -         <resource id="excalibur-thread:excalibur-thread-impl" version="2.0"/>
  -         <resource id="cornerstone-threads:cornerstone-threads-api" version="2.0"/>
  -         <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0"/>
  -         <resource id="cornerstone-connection:cornerstone-connection-api" version="2.0"/>
  -         <resource id="cornerstone-connection:cornerstone-connection-impl" version="2.0"/>
  +         <resource id="excalibur-thread:excalibur-thread-api" version="2.0.0"/>
  +         <resource id="excalibur-thread:excalibur-thread-impl" version="2.0.0"/>
  +         <resource id="cornerstone-threads:cornerstone-threads-api" version="2.0.0"/>
  +         <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0.0"/>
  +         <resource id="cornerstone-connection:cornerstone-connection-api" version="2.0.0"/>
  +         <resource id="cornerstone-connection:cornerstone-connection-impl" version="2.0.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.4       +5 -5      avalon-components/cornerstone/connection/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/connection/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	30 Apr 2004 14:04:31 -0000	1.3
  +++ project.xml	16 May 2004 07:56:28 -0000	1.4
  @@ -14,7 +14,7 @@
     transfer of factory classes from the api to the implementation.
     -->
   
  -  <currentVersion>2.0</currentVersion>
  +  <currentVersion>2.0.0</currentVersion>
     <package>org.apache.avalon.cornerstone</package>
   
     <inceptionYear>2001</inceptionYear>
  @@ -27,19 +27,19 @@
       <dependency>
         <groupId>cornerstone-connection</groupId>
         <artifactId>cornerstone-connection-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
   
       <dependency>
         <groupId>cornerstone-sockets</groupId>
         <artifactId>cornerstone-sockets-api</artifactId>
  -      <version>1.0</version>
  +      <version>1.0.0</version>
       </dependency>
   
       <dependency>
         <groupId>cornerstone-threads</groupId>
         <artifactId>cornerstone-threads-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
   
       <!-- excalibur api dependencies -->
  @@ -47,7 +47,7 @@
       <dependency>
         <groupId>excalibur-thread</groupId>
         <artifactId>excalibur-thread-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
   
       <!-- avalon dependencies -->
  
  
  
  1.3       +1 -1      avalon-components/cornerstone/datasources/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/datasources/api/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	30 Apr 2004 14:04:31 -0000	1.2
  +++ project.xml	16 May 2004 07:56:28 -0000	1.3
  @@ -7,7 +7,7 @@
     <groupId>cornerstone-datasources</groupId>
     <id>cornerstone-datasources-api</id>
     <name>Cornerstone Datasources API</name>
  -  <currentVersion>1.0</currentVersion>
  +  <currentVersion>1.0.0</currentVersion>
     <package>org.apache.avalon.cornerstone.services.datasources</package>
     <inceptionYear>2001</inceptionYear>
     <shortDescription>Cornerstone Datasources API</shortDescription>
  
  
  
  1.3       +5 -5      avalon-components/cornerstone/datasources/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/datasources/impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	30 Apr 2004 14:04:31 -0000	1.2
  +++ block.xml	16 May 2004 07:56:28 -0000	1.3
  @@ -14,11 +14,11 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="excalibur-pool:excalibur-pool-api" version="2.0"/>
  -         <resource id="excalibur-pool:excalibur-pool-impl" version="2.0"/>
  -         <resource id="excalibur-datasource:excalibur-datasource" version="1.2"/>
  -         <resource id="cornerstone-datasources:cornerstone-datasources-api" version="1.0"/>
  -         <resource id="cornerstone-datasources:cornerstone-datasources-impl" version="2.0"/>
  +         <resource id="excalibur-pool:excalibur-pool-api" version="2.0.0"/>
  +         <resource id="excalibur-pool:excalibur-pool-impl" version="2.0.0"/>
  +         <resource id="excalibur-datasource:excalibur-datasource" version="1.2.0"/>
  +         <resource id="cornerstone-datasources:cornerstone-datasources-api" version="1.0.0"/>
  +         <resource id="cornerstone-datasources:cornerstone-datasources-impl" version="2.0.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.4       +5 -6      avalon-components/cornerstone/datasources/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/datasources/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	30 Apr 2004 14:04:31 -0000	1.3
  +++ project.xml	16 May 2004 07:56:28 -0000	1.4
  @@ -8,8 +8,7 @@
     <id>cornerstone-datasources-impl</id>
     <name>Cornerstone Datasource</name>
   
  -  <!-- candidate 2.0 due to excalibur dependencies -->
  -  <currentVersion>2.0</currentVersion>
  +  <currentVersion>2.0.0</currentVersion>
     <package>org.apache.avalon.cornerstone.blocks.datasources</package>
   
     <inceptionYear>2001</inceptionYear>
  @@ -22,7 +21,7 @@
       <dependency>
         <groupId>cornerstone-datasources</groupId>
         <artifactId>cornerstone-datasources-api</artifactId>
  -      <version>1.0</version>
  +      <version>1.0.0</version>
       </dependency>
   
       <!-- excalibur dependencies -->
  @@ -30,17 +29,17 @@
       <dependency>
         <groupId>excalibur-pool</groupId>
         <artifactId>excalibur-pool-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>excalibur-pool</groupId>
         <artifactId>excalibur-pool-impl</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>excalibur-datasource</groupId>
         <artifactId>excalibur-datasource</artifactId>
  -      <version>1.2</version>
  +      <version>1.2.0</version>
       </dependency>
   
       <!-- avalon dependencies -->
  
  
  
  1.6       +11 -5     avalon-components/cornerstone/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/maven.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- maven.xml	4 Apr 2004 15:19:18 -0000	1.5
  +++ maven.xml	16 May 2004 07:56:28 -0000	1.6
  @@ -6,7 +6,7 @@
     ==============================================================================
     -->
   
  -  <ant:property name="avalon.snapshot" value="true"/>
  +  <ant:property name="avalon.snapshot" value="false"/>
   
     <!--
     ==============================================================================
  @@ -21,7 +21,7 @@
     <ant:property name="maven.dist.src.archive.dir"
       value="${maven.dist.assembly.dir}/src"/>
     <ant:property name="maven.dist.bin.assembly.dir"
  -    value="${maven.dist.assembly.dir}/bin/avalon-${pom.currentVersion}"/>
  +    value="${maven.dist.assembly.dir}/bin/${pom.artifactId}"/>
     <ant:property name="maven.dist.src.assembly.dir"
       value="${maven.dist.assembly.dir}/src/${pom.artifactId}"/>
     <ant:property name="maven.dist.dir"
  @@ -33,7 +33,7 @@
     ==============================================================================
     -->
   
  -  <ant:property name="pom.specificationVersion" value="1.0"/>
  +  <ant:property name="pom.specificationVersion" value="2.0"/>
     <ant:property name="pom.organization.identifier" value="ASF"/>
     <ant:property file="project.properties"/>
   
  @@ -251,9 +251,12 @@
       </ant:echo>
       <ant:copy todir="${maven.dist.bin.assembly.dir}">
         <ant:fileset dir=".">
  -        <ant:include name="LICENSE*"/>
           <ant:include name="README*"/>
         </ant:fileset>
  +      <ant:fileset dir="${basedir}/site/etc">
  +        <ant:include name="LICENSE*"/>
  +        <ant:include name="NOTICE*"/>
  +      </ant:fileset>
       </ant:copy>
   
       <!-- Copy Jars -->
  @@ -286,10 +289,13 @@
   
       <ant:copy todir="${maven.dist.src.assembly.dir}">
         <ant:fileset dir=".">
  -        <ant:include name="LICENSE*"/>
           <ant:include name="project.properties"/>
           <ant:include name="maven.xml"/>
           <ant:include name="project.xml"/>
  +      </ant:fileset>
  +      <ant:fileset dir="${basedir}/site/etc">
  +        <ant:include name="LICENSE*"/>
  +        <ant:include name="NOTICE*"/>
         </ant:fileset>
       </ant:copy>
   
  
  
  
  1.4       +8 -1      avalon-components/cornerstone/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	30 Apr 2004 14:04:31 -0000	1.3
  +++ project.xml	16 May 2004 07:56:28 -0000	1.4
  @@ -6,7 +6,7 @@
     <groupId>cornerstone</groupId>
     <id>cornerstone</id>
     <name>Cornerstone Component Suite</name>
  -  <currentVersion>2.0-RC1</currentVersion>
  +  <currentVersion>2.0.0</currentVersion>
   
     <organization>
       <name>Apache Software Foundation</name>
  @@ -197,6 +197,13 @@
           <targetPath>BLOCK-INF</targetPath>
           <includes>
             <include>block.xml</include>
  +        </includes>
  +      </resource>
  +      <resource>
  +        <directory>${basedir}/../../site/etc</directory>
  +        <includes>
  +          <include>LICENSE*</include>
  +          <include>NOTICE*</include>
           </includes>
         </resource>
       </resources>
  
  
  
  1.3       +1 -1      avalon-components/cornerstone/scheduler/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/scheduler/api/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	30 Apr 2004 14:04:31 -0000	1.2
  +++ project.xml	16 May 2004 07:56:28 -0000	1.3
  @@ -7,7 +7,7 @@
     <groupId>cornerstone-scheduler</groupId>
     <id>cornerstone-scheduler-api</id>
     <name>Cornerstone Scheduler API</name>
  -  <currentVersion>1.0</currentVersion>
  +  <currentVersion>1.0.0</currentVersion>
     <package>org.apache.avalon.cornerstone.services.scheduler</package>
     <inceptionYear>2001</inceptionYear>
     <shortDescription>Cornerstone Scheduler API</shortDescription>
  
  
  
  1.3       +3 -3      avalon-components/cornerstone/scheduler/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/scheduler/impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	30 Apr 2004 14:04:31 -0000	1.2
  +++ block.xml	16 May 2004 07:56:28 -0000	1.3
  @@ -15,9 +15,9 @@
        <classpath>
          <repository>
            <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
  -         <resource id="cornerstone-scheduler:cornerstone-scheduler-api" version="1.0"/>
  -         <resource id="cornerstone-threads:cornerstone-threads-api" version="2.0"/>
  -         <resource id="excalibur-thread:excalibur-thread-api" version="2.0"/>
  +         <resource id="cornerstone-scheduler:cornerstone-scheduler-api" version="1.0.0"/>
  +         <resource id="cornerstone-threads:cornerstone-threads-api" version="2.0.0"/>
  +         <resource id="excalibur-thread:excalibur-thread-api" version="2.0.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.4       +4 -4      avalon-components/cornerstone/scheduler/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/scheduler/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	30 Apr 2004 14:04:31 -0000	1.3
  +++ project.xml	16 May 2004 07:56:28 -0000	1.4
  @@ -8,7 +8,7 @@
     <id>cornerstone-scheduler-impl</id>
     <name>Cornerstone Scheduler Implementation</name>
   
  -  <currentVersion>2.0</currentVersion> 
  +  <currentVersion>2.0.0</currentVersion> 
     <package>org.apache.avalon.cornerstone.blocks.scheduler</package>
   
     <inceptionYear>2001</inceptionYear>
  @@ -21,13 +21,13 @@
       <dependency>
         <groupId>cornerstone-scheduler</groupId>
         <artifactId>cornerstone-scheduler-api</artifactId>
  -      <version>1.0</version>
  +      <version>1.0.0</version>
       </dependency>
   
       <dependency>
         <groupId>cornerstone-threads</groupId>
         <artifactId>cornerstone-threads-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
   
       <!-- excalibur api dependencies -->
  @@ -35,7 +35,7 @@
       <dependency>
         <groupId>excalibur-thread</groupId>
         <artifactId>excalibur-thread-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
   
       <!-- avalon dependencies -->
  
  
  
  1.2       +1 -1      avalon-components/cornerstone/site/xdocs/components/connection.xml
  
  Index: connection.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/site/xdocs/components/connection.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- connection.xml	28 Mar 2004 08:13:03 -0000	1.1
  +++ connection.xml	16 May 2004 07:56:28 -0000	1.2
  @@ -21,7 +21,7 @@
         </subsection>
         <subsection name="Deployment Facts">
           <table>
  -          <tr><td>Containment</td><td>Avalon Framework 4.1.4</td>
  +          <tr><td>Containment</td><td>Avalon Framework 4.2.0</td>
             </tr>
             <tr><td>Lifestyle</td><td>singleton</td></tr>
             <tr><td>Lifecycle</td>
  
  
  
  1.2       +1 -1      avalon-components/cornerstone/site/xdocs/components/datasource.xml
  
  Index: datasource.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/site/xdocs/components/datasource.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- datasource.xml	28 Mar 2004 08:13:03 -0000	1.1
  +++ datasource.xml	16 May 2004 07:56:28 -0000	1.2
  @@ -21,7 +21,7 @@
         </subsection>
         <subsection name="Deployment Facts">
           <table>
  -          <tr><td>Containment</td><td>Avalon Framework 4.1.4</td>
  +          <tr><td>Containment</td><td>Avalon Framework 4.2.0</td>
             </tr>
             <tr><td>Lifestyle</td><td>singleton</td></tr>
             <tr><td>Lifecycle</td>
  
  
  
  1.2       +6 -6      avalon-components/cornerstone/site/xdocs/components/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/site/xdocs/components/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	28 Mar 2004 08:13:03 -0000	1.1
  +++ index.xml	16 May 2004 07:56:28 -0000	1.2
  @@ -30,7 +30,7 @@
               the same thread pool.
               </p>
             </td>
  -          <td>CANDIDATE</td>
  +          <td>FINAL</td>
             <td>[1]</td>
             <td>No</td>
             <td>No</td>
  @@ -44,7 +44,7 @@
               ready to use DataSourceComponents.
               </p>
             </td>
  -          <td>CANDIDATE</td>
  +          <td>FINAL</td>
             <td>[1]</td>
             <td>No</td>
             <td>No</td>
  @@ -60,7 +60,7 @@
              CronTimeTrigger and PeriodicTimeTigger.
              </p>
             </td>
  -          <td>CANDIDATE</td>
  +          <td>FINAL</td>
             <td>[1]</td>
             <td>No</td>
             <td>No</td>
  @@ -73,7 +73,7 @@
               DefaultSocketManager component.
               </p>
             </td>
  -          <td>CANDIDATE</td>
  +          <td>FINAL</td>
             <td>[1]</td>
             <td>No</td>
             <td>No</td>
  @@ -89,7 +89,7 @@
                 local file system for storage.
                 </p>
             </td>
  -          <td>CANDIDATE</td>
  +          <td>FINAL</td>
             <td>[1]</td>
             <td>No</td>
             <td>No</td>
  @@ -103,7 +103,7 @@
               the Excalibur implementations of ThreadPool.
               </p>
             </td>
  -          <td>CANDIDATE</td>
  +          <td>FINAL</td>
             <td>[1]</td>
             <td>No</td>
             <td>No</td>
  
  
  
  1.2       +1 -1      avalon-components/cornerstone/site/xdocs/components/scheduler.xml
  
  Index: scheduler.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/site/xdocs/components/scheduler.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- scheduler.xml	28 Mar 2004 08:13:03 -0000	1.1
  +++ scheduler.xml	16 May 2004 07:56:28 -0000	1.2
  @@ -21,7 +21,7 @@
         </subsection>
         <subsection name="Deployment Facts">
           <table>
  -          <tr><td>Containment</td><td>Avalon Framework 4.1.4</td>
  +          <tr><td>Containment</td><td>Avalon Framework 4.2.0</td>
             </tr>
             <tr><td>Lifestyle</td><td>singleton</td></tr>
             <tr><td>Lifecycle</td>
  
  
  
  1.2       +1 -1      avalon-components/cornerstone/site/xdocs/components/sockets.xml
  
  Index: sockets.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/site/xdocs/components/sockets.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sockets.xml	28 Mar 2004 08:13:03 -0000	1.1
  +++ sockets.xml	16 May 2004 07:56:28 -0000	1.2
  @@ -13,7 +13,7 @@
         </subsection>
         <subsection name="Deployment Facts">
           <table>
  -          <tr><td>Containment</td><td>Avalon Framework 4.1.4</td>
  +          <tr><td>Containment</td><td>Avalon Framework 4.2.0</td>
             </tr>
             <tr><td>Lifestyle</td><td>singleton</td></tr>
             <tr><td>Lifecycle</td>
  
  
  
  1.2       +1 -1      avalon-components/cornerstone/site/xdocs/components/store.xml
  
  Index: store.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/site/xdocs/components/store.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- store.xml	28 Mar 2004 08:13:03 -0000	1.1
  +++ store.xml	16 May 2004 07:56:28 -0000	1.2
  @@ -21,7 +21,7 @@
         </subsection>
         <subsection name="Deployment Facts">
           <table>
  -          <tr><td>Containment</td><td>Avalon Framework 4.1.4</td>
  +          <tr><td>Containment</td><td>Avalon Framework 4.2.0</td>
             </tr>
             <tr><td>Lifestyle</td><td>singleton</td></tr>
             <tr><td>Lifecycle</td>
  
  
  
  1.3       +1 -1      avalon-components/cornerstone/site/xdocs/components/threads.xml
  
  Index: threads.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/site/xdocs/components/threads.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- threads.xml	28 Mar 2004 09:22:51 -0000	1.2
  +++ threads.xml	16 May 2004 07:56:28 -0000	1.3
  @@ -19,7 +19,7 @@
         </subsection>
         <subsection name="Deployment Facts">
           <table>
  -          <tr><td>Containment</td><td>Classic Framework 4.</td>
  +          <tr><td>Containment</td><td>Avalon Framework 4.2.0</td>
             </tr>
             <tr><td>Lifestyle</td><td>singleton</td></tr>
             <tr><td>Lifecycle</td>
  
  
  
  1.2       +1 -1      avalon-components/cornerstone/sockets/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/sockets/api/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	15 Mar 2004 17:16:02 -0000	1.1
  +++ project.xml	16 May 2004 07:56:28 -0000	1.2
  @@ -7,7 +7,7 @@
     <groupId>cornerstone-sockets</groupId>
     <id>cornerstone-sockets-api</id>
     <name>Cornerstone Sockets API</name>
  -  <currentVersion>1.0</currentVersion>
  +  <currentVersion>1.0.0</currentVersion>
     <package>org.apache.avalon.cornerstone.services.sockets</package>
     <inceptionYear>2001</inceptionYear>
     <shortDescription>Cornerstone Sockets API</shortDescription>
  
  
  
  1.3       +2 -2      avalon-components/cornerstone/sockets/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/sockets/impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	30 Apr 2004 14:04:31 -0000	1.2
  +++ block.xml	16 May 2004 07:56:28 -0000	1.3
  @@ -15,8 +15,8 @@
        <classpath>
          <repository>
            <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
  -         <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0"/>
  -         <resource id="cornerstone-sockets:cornerstone-sockets-impl" version="1.1"/>
  +         <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0.0"/>
  +         <resource id="cornerstone-sockets:cornerstone-sockets-impl" version="1.1.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.4       +2 -2      avalon-components/cornerstone/sockets/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/sockets/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	30 Apr 2004 14:04:31 -0000	1.3
  +++ project.xml	16 May 2004 07:56:28 -0000	1.4
  @@ -7,7 +7,7 @@
     <groupId>cornerstone-sockets</groupId>
     <id>cornerstone-sockets-impl</id>
     <name>Cornerstone Socket Manager Implementation</name>
  -  <currentVersion>1.1</currentVersion> 
  +  <currentVersion>1.1.0</currentVersion> 
     <package>org.apache.avalon.cornerstone.blocks.sockets</package>
   
     <inceptionYear>2001</inceptionYear>
  @@ -20,7 +20,7 @@
       <dependency>
         <groupId>cornerstone-sockets</groupId>
         <artifactId>cornerstone-sockets-api</artifactId>
  -      <version>1.0</version>
  +      <version>1.0.0</version>
       </dependency>
   
       <!-- avalon dependencies -->
  
  
  
  1.3       +1 -1      avalon-components/cornerstone/store/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/store/api/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	30 Apr 2004 14:04:31 -0000	1.2
  +++ project.xml	16 May 2004 07:56:28 -0000	1.3
  @@ -7,7 +7,7 @@
     <groupId>cornerstone-store</groupId>
     <id>cornerstone-store-api</id>
     <name>Cornerstone Store API</name>
  -  <currentVersion>1.0</currentVersion>
  +  <currentVersion>1.0.0</currentVersion>
     <package>org.apache.avalon.cornerstone.services.store</package>
     <inceptionYear>2001</inceptionYear>
     <shortDescription>Cornerstone Store API</shortDescription>
  
  
  
  1.3       +2 -2      avalon-components/cornerstone/store/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/store/impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	30 Apr 2004 14:04:31 -0000	1.2
  +++ block.xml	16 May 2004 07:56:28 -0000	1.3
  @@ -15,8 +15,8 @@
        <classpath>
          <repository>
            <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
  -         <resource id="cornerstone-store:cornerstone-store-api" version="1.0"/>
  -         <resource id="cornerstone-store:cornerstone-store-impl" version="1.1"/>
  +         <resource id="cornerstone-store:cornerstone-store-api" version="1.0.0"/>
  +         <resource id="cornerstone-store:cornerstone-store-impl" version="1.1.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon-components/cornerstone/store/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/store/impl/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	30 Apr 2004 14:04:31 -0000	1.2
  +++ project.xml	16 May 2004 07:56:28 -0000	1.3
  @@ -7,7 +7,7 @@
     <groupId>cornerstone-store</groupId>
     <id>cornerstone-store-impl</id>
     <name>Cornerstone Store Implementation</name>
  -  <currentVersion>1.1</currentVersion>
  +  <currentVersion>1.1.0</currentVersion>
     <package>org.apache.avalon.cornerstone.blocks.masterstore</package>
   
     <inceptionYear>2001</inceptionYear>
  @@ -18,7 +18,7 @@
       <dependency>
         <groupId>cornerstone-store</groupId>
         <artifactId>cornerstone-store-api</artifactId>
  -      <version>1.0</version>
  +      <version>1.0.0</version>
       </dependency>
   
       <!-- avalon dependencies -->
  
  
  
  1.4       +2 -2      avalon-components/cornerstone/threads/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/threads/api/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	30 Apr 2004 14:04:31 -0000	1.3
  +++ project.xml	16 May 2004 07:56:28 -0000	1.4
  @@ -7,7 +7,7 @@
     <groupId>cornerstone-threads</groupId>
     <id>cornerstone-threads-api</id>
     <name>Cornerstone Threads API</name>
  -  <currentVersion>2.0</currentVersion>
  +  <currentVersion>2.0.0</currentVersion>
     <package>org.apache.avalon.cornerstone.services.threads</package>
     <inceptionYear>2001</inceptionYear>
     <shortDescription>Cornerstone Threads API</shortDescription>
  @@ -19,7 +19,7 @@
       <dependency>
         <groupId>excalibur-thread</groupId>
         <artifactId>excalibur-thread-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.3       +5 -5      avalon-components/cornerstone/threads/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/threads/impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	30 Apr 2004 14:04:31 -0000	1.2
  +++ block.xml	16 May 2004 07:56:28 -0000	1.3
  @@ -18,11 +18,11 @@
            <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
            <resource id="commons-collections:commons-collections" version="2.1"/>
            <resource id="concurrent:concurrent" version="1.3.1"/>
  -         <resource id="excalibur-pool:excalibur-pool-api" version="2.0"/>
  -         <resource id="excalibur-pool:excalibur-pool-impl" version="2.0"/>
  -         <resource id="excalibur-thread:excalibur-thread-api" version="2.0"/>
  -         <resource id="excalibur-thread:excalibur-thread-impl" version="2.0"/>
  -         <resource id="cornerstone-threads:cornerstone-threads-api" version="2.0"/>
  +         <resource id="excalibur-pool:excalibur-pool-api" version="2.0.0"/>
  +         <resource id="excalibur-pool:excalibur-pool-impl" version="2.0.0"/>
  +         <resource id="excalibur-thread:excalibur-thread-api" version="2.0.0"/>
  +         <resource id="excalibur-thread:excalibur-thread-impl" version="2.0.0"/>
  +         <resource id="cornerstone-threads:cornerstone-threads-api" version="2.0.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.4       +6 -6      avalon-components/cornerstone/threads/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/threads/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	30 Apr 2004 14:04:31 -0000	1.3
  +++ project.xml	16 May 2004 07:56:28 -0000	1.4
  @@ -7,7 +7,7 @@
     <groupId>cornerstone-threads</groupId>
     <id>cornerstone-threads-impl</id>
     <name>Cornerstone Thread Manager Implementation</name>
  -  <currentVersion>2.0</currentVersion>
  +  <currentVersion>2.0.0</currentVersion>
     <package>org.apache.avalon.cornerstone.blocks.threads</package>
   
     <inceptionYear>2001</inceptionYear>
  @@ -20,7 +20,7 @@
       <dependency>
         <groupId>cornerstone-threads</groupId>
         <artifactId>cornerstone-threads-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
   
       <!-- avalon dependencies -->
  @@ -33,22 +33,22 @@
       <dependency>
         <groupId>excalibur-thread</groupId>
         <artifactId>excalibur-thread-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>excalibur-thread</groupId>
         <artifactId>excalibur-thread-impl</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>excalibur-pool</groupId>
         <artifactId>excalibur-pool-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>excalibur-pool</groupId>
         <artifactId>excalibur-pool-impl</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>commons-collections</groupId>
  
  
  
  1.3       +5 -5      avalon-components/cornerstone/threads/tutorial/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/threads/tutorial/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	30 Apr 2004 14:04:31 -0000	1.2
  +++ block.xml	16 May 2004 07:56:28 -0000	1.3
  @@ -14,11 +14,11 @@
            <repository>
              <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
              <resource id="commons-collections:commons-collections" version="2.1"/>
  -           <resource id="excalibur-pool:excalibur-pool-api" version="2.0"/>
  -           <resource id="excalibur-pool:excalibur-pool-impl" version="2.0"/>
  -           <resource id="excalibur-thread:excalibur-thread-api" version="2.0"/>
  -           <resource id="excalibur-thread:excalibur-thread-impl" version="2.0"/>
  -           <resource id="cornerstone-threads:cornerstone-threads-api" version="2.0"/>
  +           <resource id="excalibur-pool:excalibur-pool-api" version="2.0.0"/>
  +           <resource id="excalibur-pool:excalibur-pool-impl" version="2.0.0"/>
  +           <resource id="excalibur-thread:excalibur-thread-api" version="2.0.0"/>
  +           <resource id="excalibur-thread:excalibur-thread-impl" version="2.0.0"/>
  +           <resource id="cornerstone-threads:cornerstone-threads-api" version="2.0.0"/>
            </repository>
          </classpath>
        </classloader>
  
  
  
  1.2       +6 -6      avalon-components/cornerstone/threads/tutorial/conf/demo.xml
  
  Index: demo.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/threads/tutorial/conf/demo.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- demo.xml	15 Mar 2004 13:06:46 -0000	1.1
  +++ demo.xml	16 May 2004 07:56:28 -0000	1.2
  @@ -12,18 +12,18 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  -         <resource id="excalibur-pool:excalibur-pool-api" version="SNAPSHOT"/>
  -         <resource id="excalibur-thread:excalibur-thread-api" version="SNAPSHOT"/>
  -         <resource id="cornerstone-threads:cornerstone-threads-api" version="SNAPSHOT"/>
  -         <resource id="cornerstone-threads:cornerstone-threads-tutorial" version="SNAPSHOT"/>
  +         <resource id="avalon-framework:avalon-framework-api" version="4.2.0"/>
  +         <resource id="excalibur-pool:excalibur-pool-api" version="2.0.0"/>
  +         <resource id="excalibur-thread:excalibur-thread-api" version="2.0.0"/>
  +         <resource id="cornerstone-threads:cornerstone-threads-api" version="2.0.0"/>
  +         <resource id="cornerstone-threads:cornerstone-threads-tutorial" version="2.0.0"/>
          </repository>
        </classpath>
      </classloader>
   
      <include name="threads" 
          id="cornerstone-threads:cornerstone-threads-impl" 
  -       version="SNAPSHOT"/>
  +       version="2.0.0"/>
   
      <component name="test" 
         class="org.apache.avalon.cornerstone.threads.tutorial.ThreadConsumer" />
  
  
  
  1.4       +3 -3      avalon-components/cornerstone/threads/tutorial/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/threads/tutorial/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	30 Apr 2004 14:04:31 -0000	1.3
  +++ project.xml	16 May 2004 07:56:28 -0000	1.4
  @@ -7,7 +7,7 @@
     <groupId>cornerstone-threads</groupId>
     <id>cornerstone-threads-tutorial</id>
     <name>Cornerstone Threads Tutorial</name>
  -  <currentVersion>2.0</currentVersion>
  +  <currentVersion>2.0.0</currentVersion>
     <package>org.apache.avalon.cornerstone.threads.tutorial</package>
   
     <inceptionYear>2001</inceptionYear>
  @@ -20,7 +20,7 @@
       <dependency>
         <groupId>cornerstone-threads</groupId>
         <artifactId>cornerstone-threads-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
   
       <!-- avalon dependencies -->
  @@ -41,7 +41,7 @@
       <dependency>
         <groupId>excalibur-thread</groupId>
         <artifactId>excalibur-thread-api</artifactId>
  -      <version>2.0</version>
  +      <version>2.0.0</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.1                  avalon-components/cornerstone/site/etc/NOTICE.TXT
  
  Index: NOTICE.TXT
  ===================================================================
     =========================================================================
     ==  NOTICE file corresponding to the section 4 d of                    ==
     ==  the Apache License, Version 2.0,                                   ==
     =========================================================================
  
     This product is developed by the Apache Avalon Project.
     http://avalon.apache.org
  
     The names "Avalon", "Merlin" and "Cornerstone" must not be used to 
     endorse or promote products derived from this software without prior 
     written permission. For written permission, please contact 
     pmc@avalon.apache.org.
  
  

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