avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-platform/examples/james/conf james.xml
Date Fri, 18 Jul 2003 02:48:34 GMT
mcconnell    2003/07/17 19:48:34

  Modified:    merlin/composition/src/test/conf data-test.xml
               merlin/composition/src/test/org/apache/avalon/composition/data
                        DataTestCase.java
               merlin/merlin-platform/examples/james/conf james.xml
  Log:
  Correct test-case data.
  
  Revision  Changes    Path
  1.2       +1 -1      avalon-sandbox/merlin/composition/src/test/conf/data-test.xml
  
  Index: data-test.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/src/test/conf/data-test.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- data-test.xml	17 Jul 2003 21:21:58 -0000	1.1
  +++ data-test.xml	18 Jul 2003 02:48:33 -0000	1.2
  @@ -2,7 +2,7 @@
   <container name="test">
   
      <services>
  -     <service type="org.apache.playground.SomeComponent">
  +     <service type="org.apache.playground.SomeComponent" version="1.0.0">
          <source>comp</source>
        </service>
      </services>
  
  
  
  1.2       +8 -1      avalon-sandbox/merlin/composition/src/test/org/apache/avalon/composition/data/DataTestCase.java
  
  Index: DataTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/src/test/org/apache/avalon/composition/data/DataTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DataTestCase.java	17 Jul 2003 21:21:58 -0000	1.1
  +++ DataTestCase.java	18 Jul 2003 02:48:33 -0000	1.2
  @@ -68,7 +68,12 @@
       {
           Configuration source = loadConfiguration( m_source );
           Configuration test = loadConfiguration( m_xml );
  -        assertTrue( "equality", compare( source, test ) );
  +        boolean equality = compare( source, test );
  +        if( !equality )
  +        {
  +            System.out.println( "PROBLEM: " + source.getName() );
  +        }
  +        assertTrue( "equality", equality );
       }
   
       public boolean compare( Configuration a, Configuration b ) throws Exception
  @@ -88,6 +93,8 @@
                   if( !compare( aa, bb ) )
                   {
                       System.out.println( "CONFIG " + aa.getName() + " != " + bb.getName()
);
  +                    System.out.println( ConfigurationUtil.list( aa ) );
  +                    System.out.println( ConfigurationUtil.list( bb ) );
                       return false;
                   }
               }
  
  
  
  1.5       +13 -13    avalon-sandbox/merlin/merlin-platform/examples/james/conf/james.xml
  
  Index: james.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/examples/james/conf/james.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- james.xml	27 Jun 2003 23:10:00 -0000	1.4
  +++ james.xml	18 Jul 2003 02:48:33 -0000	1.5
  @@ -28,16 +28,16 @@
            <repository>
   
              <!-- apis for cornerstone service imports -->
  -           <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-dev"/>
  -           <resource id="cornerstone-threads:cornerstone-threads-api" version="1.0"/>
  -           <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0"/>
  -           <resource id="cornerstone-connection:cornerstone-connection-api" version="1.0"/>
  -           <resource id="cornerstone-scheduler:cornerstone-scheduler-api" version="1.0"/>
  -           <resource id="cornerstone-datasources:cornerstone-datasources-api" version="1.0"/>
  -           <resource id="cornerstone-store:cornerstone-store-api" version="1.0"/>
  +           <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
  +           <resource id="cornerstone-threads:cornerstone-threads-api" version="SNAPSHOT"/>
  +           <resource id="cornerstone-sockets:cornerstone-sockets-api" version="SNAPSHOT"/>
  +           <resource id="cornerstone-connection:cornerstone-connection-api" version="SNAPSHOT"/>
  +           <resource id="cornerstone-scheduler:cornerstone-scheduler-api" version="SNAPSHOT"/>
  +           <resource id="cornerstone-datasources:cornerstone-datasources-api" version="SNAPSHOT"/>
  +           <resource id="cornerstone-store:cornerstone-store-api" version="SNAPSHOT"/>
   
              <!-- james implementation dependencies -->
  -           <resource id="cornerstone-connection:cornerstone-connection-impl" version="1.0"/>
  +           <resource id="cornerstone-connection:cornerstone-connection-impl" version="SNAPSHOT"/>
              <resource id="excalibur:excalibur-io" version="1.1"/>
              <resource id="excalibur:excalibur-collections" version="1.0"/>
              <resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
  @@ -53,23 +53,23 @@
        </classloader>
   
        <include name="threads">
  -       <resource id="cornerstone-threads:cornerstone-threads-impl" version="1.0"/>
  +       <resource id="cornerstone-threads:cornerstone-threads-impl" version="SNAPSHOT"/>
        </include>
   
        <include name="sockets">
  -       <resource id="cornerstone-sockets:cornerstone-sockets-impl" version="1.0"/>
  +       <resource id="cornerstone-sockets:cornerstone-sockets-impl" version="SNAPSHOT"/>
        </include>
   
        <include name="scheduler">
  -       <resource id="cornerstone-scheduler:cornerstone-scheduler-impl" version="1.0"/>
  +       <resource id="cornerstone-scheduler:cornerstone-scheduler-impl" version="SNAPSHOT"/>
        </include>
   
        <include name="datasources">
  -       <resource id="cornerstone-datasources:cornerstone-datasources-impl" version="1.0"/>
  +       <resource id="cornerstone-datasources:cornerstone-datasources-impl" version="SNAPSHOT"/>
        </include>
   
        <include name="store">
  -       <resource id="cornerstone-store:cornerstone-store-impl" version="1.0"/>
  +       <resource id="cornerstone-store:cornerstone-store-impl" version="SNAPSHOT"/>
          <targets>
            <target path="/manager">
              <configuration>
  
  
  

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


Mime
View raw message