avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data Component1.java Component1.xinfo Component2.java Component2.xinfo Component3.java Component3.xinfo Service1.java Service2.java
Date Mon, 30 Sep 2002 23:51:30 GMT
donaldp     2002/09/30 16:51:30

  Modified:    src/test/org/apache/avalon/phoenix/tools/assembler/test
                        AssemblerTestCase.java assembly1.xml assembly2.xml
  Added:       src/test/org/apache/avalon/phoenix/test/data Component1.java
                        Component1.xinfo Component2.java Component2.xinfo
                        Component3.java Component3.xinfo Service1.java
                        Service2.java
  Removed:     src/test/org/apache/avalon/phoenix/tools/assembler/test/data
                        Component1.java Component1.xinfo Component2.java
                        Component2.xinfo Component3.java Component3.xinfo
                        Service1.java Service2.java
  Log:
  Move test data around a little.
  
  Revision  Changes    Path
  1.4       +5 -5      jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/AssemblerTestCase.java
  
  Index: AssemblerTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/AssemblerTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AssemblerTestCase.java	30 Sep 2002 23:45:23 -0000	1.3
  +++ AssemblerTestCase.java	30 Sep 2002 23:51:30 -0000	1.4
  @@ -16,10 +16,10 @@
   import org.apache.avalon.phoenix.metadata.BlockMetaData;
   import org.apache.avalon.phoenix.metadata.DependencyMetaData;
   import org.apache.avalon.phoenix.tools.assembler.Assembler;
  -import org.apache.avalon.phoenix.tools.assembler.test.data.Component1;
  -import org.apache.avalon.phoenix.tools.assembler.test.data.Service2;
  -import org.apache.avalon.phoenix.tools.assembler.test.data.Component2;
  -import org.apache.avalon.phoenix.tools.assembler.test.data.Component3;
  +import org.apache.avalon.phoenix.test.data.Component1;
  +import org.apache.avalon.phoenix.test.data.Service2;
  +import org.apache.avalon.phoenix.test.data.Component2;
  +import org.apache.avalon.phoenix.test.data.Component3;
   import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
   
   /**
  
  
  
  1.4       +3 -3      jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/assembly1.xml
  
  Index: assembly1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/assembly1.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- assembly1.xml	30 Sep 2002 23:28:57 -0000	1.3
  +++ assembly1.xml	30 Sep 2002 23:51:30 -0000	1.4
  @@ -4,13 +4,13 @@
   
   <assembly>
   
  -    <block class="org.apache.avalon.phoenix.tools.assembler.test.data.Component1"
  +    <block class="org.apache.avalon.phoenix.test.data.Component1"
           name="c1">
           <provide name="c2"
  -            role="org.apache.avalon.phoenix.tools.assembler.test.data.Service2"/>
  +            role="org.apache.avalon.phoenix.test.data.Service2"/>
       </block>
   
  -    <block class="org.apache.avalon.phoenix.tools.assembler.test.data.Component2"
  +    <block class="org.apache.avalon.phoenix.test.data.Component2"
           name="c2">
           <proxy disable="true"/>
       </block>
  
  
  
  1.2       +7 -7      jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/assembly2.xml
  
  Index: assembly2.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/assembly2.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- assembly2.xml	30 Sep 2002 23:45:23 -0000	1.1
  +++ assembly2.xml	30 Sep 2002 23:51:30 -0000	1.2
  @@ -4,23 +4,23 @@
   
   <assembly>
   
  -    <block class="org.apache.avalon.phoenix.tools.assembler.test.data.Component2"
  +    <block class="org.apache.avalon.phoenix.test.data.Component2"
           name="c2a"/>
   
  -    <block class="org.apache.avalon.phoenix.tools.assembler.test.data.Component2"
  +    <block class="org.apache.avalon.phoenix.test.data.Component2"
           name="c2b"/>
   
  -    <block class="org.apache.avalon.phoenix.tools.assembler.test.data.Component2"
  +    <block class="org.apache.avalon.phoenix.test.data.Component2"
           name="c2c"/>
   
  -    <block class="org.apache.avalon.phoenix.tools.assembler.test.data.Component3"
  +    <block class="org.apache.avalon.phoenix.test.data.Component3"
           name="c3">
           <provide name="c2a"
  -            role="org.apache.avalon.phoenix.tools.assembler.test.data.Service2"/>
  +            role="org.apache.avalon.phoenix.test.data.Service2"/>
           <provide name="c2b"
  -            role="org.apache.avalon.phoenix.tools.assembler.test.data.Service2"/>
  +            role="org.apache.avalon.phoenix.test.data.Service2"/>
           <provide name="c2c"
  -            role="org.apache.avalon.phoenix.tools.assembler.test.data.Service2"/>
  +            role="org.apache.avalon.phoenix.test.data.Service2"/>
       </block>
   
   </assembly>
  
  
  
  1.1                  jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component1.java
  
  Index: Component1.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.avalon.phoenix.test.data;
  
  import org.apache.avalon.framework.service.Serviceable;
  import org.apache.avalon.framework.service.ServiceManager;
  import org.apache.avalon.framework.service.ServiceException;
  
  /**
   * A test component.
   *
   * @author <a href="mailto:peter at apache.org">Peter Donald</a>
   * @version $Revision: 1.1 $ $Date: 2002/09/30 23:51:30 $
   */
  public class Component1
      implements Serviceable, Service1
  {
      public void service( final ServiceManager manager )
          throws ServiceException
      {
      }
  }
  
  
  
  1.1                  jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component1.xinfo
  
  Index: Component1.xinfo
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE blockinfo PUBLIC "-//PHOENIX/Block Info DTD Version 1.0//EN"
                    "http://jakarta.apache.org/avalon/dtds/phoenix/blockinfo_1.0.dtd">
  
  <blockinfo>
  
    <!-- section to describe block -->
    <block>
      <version>1.0</version>
    </block>
  
    <!-- services that are offered by this block -->
    <services>
      <service name="org.apache.avalon.phoenix.test.data.Service1"/>
    </services>
  
    <!-- services that are required by this block -->
    <dependencies>
      <dependency>
        <service name="org.apache.avalon.phoenix.test.data.Service2"/>
      </dependency>
    </dependencies>
  </blockinfo>
  
  
  
  1.1                  jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component2.java
  
  Index: Component2.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.avalon.phoenix.test.data;
  
  /**
   *
   * @author <a href="mailto:peter at apache.org">Peter Donald</a>
   * @version $Revision: 1.1 $ $Date: 2002/09/30 23:51:30 $
   */
  public class Component2
      implements Service2
  {
  }
  
  
  
  1.1                  jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component2.xinfo
  
  Index: Component2.xinfo
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE blockinfo PUBLIC "-//PHOENIX/Block Info DTD Version 1.0//EN"
                    "http://jakarta.apache.org/avalon/dtds/phoenix/blockinfo_1.0.dtd">
  
  <blockinfo>
  
    <!-- section to describe block -->
    <block>
      <version>1.0</version>
    </block>
  
    <!-- services that are offered by this block -->
    <services>
      <service name="org.apache.avalon.phoenix.test.data.Service2"/>
    </services>
  </blockinfo>
  
  
  
  1.1                  jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component3.java
  
  Index: Component3.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.avalon.phoenix.test.data;
  
  import org.apache.avalon.framework.service.Serviceable;
  import org.apache.avalon.framework.service.ServiceManager;
  import org.apache.avalon.framework.service.ServiceException;
  
  /**
   * A test component.
   *
   * @author <a href="mailto:peter at apache.org">Peter Donald</a>
   * @version $Revision: 1.1 $ $Date: 2002/09/30 23:51:30 $
   */
  public class Component3
      implements Serviceable
  {
      public void service( final ServiceManager manager )
          throws ServiceException
      {
      }
  }
  
  
  
  1.1                  jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component3.xinfo
  
  Index: Component3.xinfo
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE blockinfo PUBLIC "-//PHOENIX/Block Info DTD Version 1.0//EN"
                    "http://jakarta.apache.org/avalon/dtds/phoenix/blockinfo_1.0.dtd">
  
  <blockinfo>
  
    <!-- section to describe block -->
    <block>
      <version>1.0</version>
    </block>
  
    <!-- services that are required by this block -->
    <dependencies>
      <dependency>
        <service name="org.apache.avalon.phoenix.test.data.Service2[]"/>
      </dependency>
    </dependencies>
  </blockinfo>
  
  
  
  1.1                  jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Service1.java
  
  Index: Service1.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.avalon.phoenix.test.data;
  
  /**
   * A test service.
   *
   * @author <a href="mailto:peter at apache.org">Peter Donald</a>
   * @version $Revision: 1.1 $ $Date: 2002/09/30 23:51:30 $
   */
  public interface Service1
  {
  }
  
  
  
  1.1                  jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Service2.java
  
  Index: Service2.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.avalon.phoenix.test.data;
  
  /**
   * A test service.
   *
   * @author <a href="mailto:peter at apache.org">Peter Donald</a>
   * @version $Revision: 1.1 $ $Date: 2002/09/30 23:51:30 $
   */
  public interface Service2
  {
  }
  
  
  

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


Mime
View raw message