Return-Path: 
 <cvs-return-15587-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 83990 invoked by uid 500); 5 Apr 2003 11:21:08 -0000
Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:cvs-unsubscribe@avalon.apache.org>
List-Subscribe: <mailto:cvs-subscribe@avalon.apache.org>
List-Help: <mailto:cvs-help@avalon.apache.org>
List-Post: <mailto:cvs@avalon.apache.org>
List-Id: "Avalon CVS List" <cvs.avalon.apache.org>
Reply-To: "Avalon Developers List" <dev@avalon.apache.org>
Delivered-To: mailing list cvs@avalon.apache.org
Received: (qmail 83979 invoked by uid 500); 5 Apr 2003 11:21:08 -0000
Received: (qmail 83976 invoked from network); 5 Apr 2003 11:21:07 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 5 Apr 2003 11:21:07 -0000
Received: (qmail 73858 invoked by uid 1195); 5 Apr 2003 11:21:11 -0000
Date: 5 Apr 2003 11:21:11 -0000
Message-ID: <20030405112111.73857.qmail@icarus.apache.org>
From: donaldp@apache.org
To: avalon-phoenix-cvs@apache.org
Subject: cvs commit:
 avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test
 assembly1.xml assembly2.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

donaldp     2003/04/05 03:21:11

  Modified:    .        build.xml
               src/java/org/apache/avalon/phoenix/components/deployer
                        DefaultDeployer.java
               src/java/org/apache/avalon/phoenix/components/manager
                        MBeanInfoBuilder.java
               src/java/org/apache/avalon/phoenix/framework/tools/infobuilder
                        LegacyBlockInfoReader.java XMLInfoReader.java
               src/java/org/apache/avalon/phoenix/tools/configuration
                        ConfigurationBuilder.java
               src/schema assembly.dtd blockinfo.dtd catalog.xml
                        componentinfo.dtd
               src/test/org/apache/avalon/phoenix/framework/tools/infobuilder/test/data
                        component2.xinfo
               src/test/org/apache/avalon/phoenix/test
                        AbstractContainerTestCase.java
               src/test/org/apache/avalon/phoenix/tools/assembler/test
                        assembly1.xml assembly2.xml
  Log:
  First cut at validation of configuration files. Validates assembly, blockinfo and mxinfo atm. In the future partial validation of kernel.xml and environment.xml will occur.
  
  Revision  Changes    Path
  1.238     +5 -3      avalon-phoenix/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/build.xml,v
  retrieving revision 1.237
  retrieving revision 1.238
  diff -u -r1.237 -r1.238
  --- build.xml	5 Apr 2003 04:27:01 -0000	1.237
  +++ build.xml	5 Apr 2003 11:21:09 -0000	1.238
  @@ -106,8 +106,8 @@
       <property name="cli.jar" value="${repo.dir}/cli/cli-1.0/cli-1.0.jar"/>
   
       <!-- Invoke ant get-configkit' to get these -->
  -    <property name="configkit.jar" value="${repo.dir}/spice-configkit/spice-configkit-1.1/spice-configkit-1.1.jar"/>
  -    <fileset id="configkit.fileset" dir="${repo.dir}/spice-configkit/spice-configkit-1.1/lib"/>
  +    <property name="configkit.jar" value="${repo.dir}/spice-configkit/spice-configkit-1.1.1/spice-configkit-1.1.1.jar"/>
  +    <fileset id="configkit.fileset" dir="${repo.dir}/spice-configkit/spice-configkit-1.1.1/lib"/>
   
       <path id="project.class.path">
           <pathelement location="${xerces.jar}"/>
  @@ -142,6 +142,7 @@
           <pathelement location="${target.testclasses}"/>
           <pathelement location="${junit.jar}"/>
           <path refid="project.class.path"/>
  +        <fileset refid="configkit.fileset"/>
       </path>
   
       <!-- =================================================================== -->
  @@ -459,7 +460,7 @@
       <!-- Get the jars from the configkit project. -->
       <target name="get-configkit" description="Get the Spice ConfigKit distribution from SourceForge.">
           <mkdir dir="${repo.dir}/spice-configkit"/>
  -        <get src="http://osdn.dl.sourceforge.net/sourceforge/spice/spice-configkit-1.1.tar.gz"
  +        <get src="http://osdn.dl.sourceforge.net/sourceforge/spice/spice-configkit-1.1.1.tar.gz"
               dest="${repo.dir}/spice-configkit/spice-configkit.tar.gz"
               verbose="true"
               usetimestamp="true"/>
  @@ -616,6 +617,7 @@
                   <exclude name="**/*.java"/>
               </fileset>
           </copy>
  +        <copy file="src/schema/catalog.xml" tofile="${target.testclasses}/META-INF/spice/catalog.xml"/>
   
           <mkdir dir="${target.tests}"/>
   
  
  
  
  1.78      +10 -5     avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
  
  Index: DefaultDeployer.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- DefaultDeployer.java	5 Apr 2003 04:25:42 -0000	1.77
  +++ DefaultDeployer.java	5 Apr 2003 11:21:09 -0000	1.78
  @@ -290,9 +290,14 @@
               //m_baseWorkDirectory
               installation = m_installer.install( name, location );
   
  -            final Configuration config = getConfigurationFor( installation, ContainerConstants.INSTALL_CONFIG );
  -            final Configuration environment = getConfigurationFor( installation, ContainerConstants.INSTALL_ENVIRONMENT );
  -            final Configuration assembly = getConfigurationFor( installation, ContainerConstants.INSTALL_ASSEMBLY );
  +            final Configuration config =
  +                getConfigurationFor( installation, ContainerConstants.INSTALL_CONFIG, null );
  +            final Configuration environment =
  +                getConfigurationFor( installation, ContainerConstants.INSTALL_ENVIRONMENT, null );
  +            final Configuration assembly =
  +                getConfigurationFor( installation,
  +                                     ContainerConstants.INSTALL_ASSEMBLY,
  +                                     ConfigurationBuilder.ASSEMBLY_SCHEMA );
   
               final File homeDirectory =
                   (File)installation.get( ContainerConstants.INSTALL_HOME );
  @@ -482,13 +487,13 @@
        * @return the Configuration
        * @throws DeploymentException if an error occurs
        */
  -    private Configuration getConfigurationFor( final Map install, final String key )
  +    private Configuration getConfigurationFor( final Map install, final String key, final String schema )
           throws DeploymentException
       {
           final String location = (String)install.get( key );
           try
           {
  -            return ConfigurationBuilder.build( new InputSource( location ), false );
  +            return ConfigurationBuilder.build( new InputSource( location ), schema, getLogger() );
           }
           catch( final Exception e )
           {
  
  
  
  1.9       +2 -2      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MBeanInfoBuilder.java
  
  Index: MBeanInfoBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MBeanInfoBuilder.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MBeanInfoBuilder.java	22 Mar 2003 12:07:10 -0000	1.8
  +++ MBeanInfoBuilder.java	5 Apr 2003 11:21:09 -0000	1.9
  @@ -574,7 +574,7 @@
               final InputSource source = new InputSource( stream );
   
               // build with validation against DTD
  -            return ConfigurationBuilder.build( source, true );
  +            return ConfigurationBuilder.build( source, ConfigurationBuilder.MXINFO_SCHEMA, getLogger() );
           }
           catch( Exception e )
           {
  
  
  
  1.7       +2 -2      avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/LegacyBlockInfoReader.java
  
  Index: LegacyBlockInfoReader.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/LegacyBlockInfoReader.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LegacyBlockInfoReader.java	5 Apr 2003 04:25:43 -0000	1.6
  +++ LegacyBlockInfoReader.java	5 Apr 2003 11:21:10 -0000	1.7
  @@ -97,7 +97,7 @@
           throws Exception
       {
           final InputSource input = new InputSource( inputStream );
  -        final Configuration configuration = ConfigurationBuilder.build( input, false );
  +        final Configuration configuration = ConfigurationBuilder.build( input, ConfigurationBuilder.BLOCKINFO_SCHEMA, getLogger() );
           return build( implementationKey, configuration );
       }
   
  
  
  
  1.7       +2 -2      avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/XMLInfoReader.java
  
  Index: XMLInfoReader.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/framework/tools/infobuilder/XMLInfoReader.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XMLInfoReader.java	5 Apr 2003 04:25:43 -0000	1.6
  +++ XMLInfoReader.java	5 Apr 2003 11:21:10 -0000	1.7
  @@ -99,7 +99,7 @@
           throws Exception
       {
           final InputSource input = new InputSource( inputStream );
  -        final Configuration configuration = ConfigurationBuilder.build( input, false );
  +        final Configuration configuration = ConfigurationBuilder.build( input, ConfigurationBuilder.COMPONENTINFO_SCHEMA, getLogger() );
           return buildComponentInfo( implementationKey, configuration );
       }
   
  
  
  
  1.17      +68 -25    avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/ConfigurationBuilder.java
  
  Index: ConfigurationBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/ConfigurationBuilder.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ConfigurationBuilder.java	5 Apr 2003 04:25:44 -0000	1.16
  +++ ConfigurationBuilder.java	5 Apr 2003 11:21:10 -0000	1.17
  @@ -56,11 +56,18 @@
   import javax.xml.parsers.SAXParserFactory;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
  +import org.apache.avalon.framework.logger.Logger;
   import org.realityforge.configkit.ResolverFactory;
  +import org.realityforge.configkit.ConfigValidatorFactory;
  +import org.realityforge.configkit.ConfigValidator;
  +import org.realityforge.configkit.ValidationResult;
  +import org.realityforge.configkit.ValidationIssue;
  +import org.realityforge.configkit.ValidateException;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   import org.xml.sax.XMLReader;
  +import org.xml.sax.ContentHandler;
   
   /**
    * Utility class used to load Configuration trees from XML files.
  @@ -70,6 +77,11 @@
    */
   public class ConfigurationBuilder
   {
  +    public static final String COMPONENTINFO_SCHEMA = "-//AVALON/Component Info DTD Version 1.0//EN";
  +    public static final String BLOCKINFO_SCHEMA = "-//PHOENIX/Block Info DTD Version 1.0//EN";
  +    public static final String MXINFO_SCHEMA = "-//PHOENIX/Mx Info DTD Version 1.0//EN";
  +    public static final String ASSEMBLY_SCHEMA = "-//PHOENIX/Assembly DTD Version 1.0//EN";
  +
       /**
        * The resolver that builder uses.
        */
  @@ -79,40 +91,71 @@
        * Build a configuration object using an XML InputSource object, and
        * optionally validate the xml against the DTD.
        */
  -    public static Configuration build( final InputSource input, final boolean validate )
  -        throws SAXException, ParserConfigurationException, IOException
  +    public static Configuration build( final InputSource input,
  +                                       final String publicId,
  +                                       final Logger logger )
  +        throws Exception
       {
  -        final SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
  -        saxParserFactory.setNamespaceAware( false );
  -        final SAXParser saxParser = saxParserFactory.newSAXParser();
  -        final XMLReader reader = saxParser.getXMLReader();
  +        setupResolver();
           final SAXConfigurationHandler handler = new SAXConfigurationHandler();
  -        setupXMLReader( reader, handler, validate );
  -        reader.parse( input );
  +        if( null == publicId )
  +        {
  +            final SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
  +            saxParserFactory.setNamespaceAware( false );
  +            final SAXParser saxParser = saxParserFactory.newSAXParser();
  +            final XMLReader reader = saxParser.getXMLReader();
  +            reader.setEntityResolver( c_resolver );
  +            reader.setContentHandler( handler );
  +            reader.setErrorHandler( handler );
  +            reader.parse( input );
  +        }
  +        else
  +        {
  +            final InputSource inputSource = c_resolver.resolveEntity( publicId, null );
  +            if( null == inputSource )
  +            {
  +                final String message = "Unable to locate schema with publicID=" + publicId;
  +                throw new IllegalStateException( message );
  +            }
  +
  +            final ConfigValidator validator =
  +                ConfigValidatorFactory.create( inputSource, c_resolver );
  +            final ValidationResult result = validator.validate( input, (ContentHandler)handler );
  +            if( !result.isValid() )
  +            {
  +                final ValidationIssue[] issues = result.getIssues();
  +                for( int i = 0; i < issues.length; i++ )
  +                {
  +                    final ValidationIssue issue = issues[ i ];
  +                    final String message = issue.getException().getMessage();
  +                    if( issue.isWarning() )
  +                    {
  +                        logger.info( message );
  +                    }
  +                    else if( issue.isError() )
  +                    {
  +                        logger.warn( message );
  +                    }
  +                    else if( issue.isFatalError() )
  +                    {
  +                        logger.error( message );
  +                    }
  +                }
  +                final ValidateException exception = result.getException();
  +                throw new Exception( exception.getMessage(), exception );
  +            }
  +        }
           return handler.getConfiguration();
       }
   
  -    /**
  -     * Internally sets up the XMLReader
  -     */
  -    private static void setupXMLReader( final XMLReader reader,
  -                                        final SAXConfigurationHandler handler,
  -                                        final boolean validate )
  -        throws SAXException, IOException, ParserConfigurationException
  +    private static void setupResolver()
  +        throws ParserConfigurationException, SAXException, IOException
       {
           if( null == c_resolver )
           {
               c_resolver =
                   ResolverFactory.createResolver( ConfigurationBuilder.class.getClassLoader() );
           }
  -        reader.setEntityResolver( c_resolver );
  -        reader.setContentHandler( handler );
  -        reader.setErrorHandler( handler );
  -
  -        if( validate )
  -        {
  -            // Request validation
  -            reader.setFeature( "http://xml.org/sax/features/validation", true );
  -        }
       }
  +
   }
  
  
  
  1.8       +1 -2      avalon-phoenix/src/schema/assembly.dtd
  
  Index: assembly.dtd
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/schema/assembly.dtd,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- assembly.dtd	5 Apr 2003 02:46:46 -0000	1.7
  +++ assembly.dtd	5 Apr 2003 11:21:10 -0000	1.8
  @@ -23,8 +23,7 @@
   block-listener  a listener that exists in the application
   -->
   <!ELEMENT assembly (block|block-listener|listener)*>
  -<!ATTLIST assembly id ID #IMPLIED
  -          xmlns CDATA #FIXED "http://avalon.apache.org/dtds/phoenix/assembly_1_0.dtd" >
  +<!ATTLIST assembly id ID #IMPLIED>
   
   <!--
   The block element declares a block exists in the application.
  
  
  
  1.16      +1 -2      avalon-phoenix/src/schema/blockinfo.dtd
  
  Index: blockinfo.dtd
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/schema/blockinfo.dtd,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- blockinfo.dtd	5 Apr 2003 02:44:59 -0000	1.15
  +++ blockinfo.dtd	5 Apr 2003 11:21:10 -0000	1.16
  @@ -26,8 +26,7 @@
   dependencies the services that this block require to operate
   -->
   <!ELEMENT blockinfo (block?, services?, management-access-points?, dependencies?)>
  -<!ATTLIST blockinfo id ID #IMPLIED
  -          xmlns CDATA #FIXED "http://avalon.apache.org/dtds/phoenix/blockinfo_1_0.dtd" >
  +<!ATTLIST blockinfo id ID #IMPLIED>
   
   <!--
   The block element describes the block, it defines:
  
  
  
  1.4       +5 -46     avalon-phoenix/src/schema/catalog.xml
  
  Index: catalog.xml
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/schema/catalog.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- catalog.xml	5 Apr 2003 07:28:12 -0000	1.3
  +++ catalog.xml	5 Apr 2003 11:21:10 -0000	1.4
  @@ -1,58 +1,17 @@
   <catalog version="1.0">
       <entity
  -        publicId="-//PHOENIX/Assembly DTD Version 1.0//EN"
  -        systemId="http://jakarta.apache.org/phoenix/assembly_1_0.dtd"
  -        resource="org/apache/avalon/phoenix/tools/assembly.dtd"/>
  -    <entity
  -        publicId="-//PHOENIX/Mx Info DTD Version 1.0//EN"
  -        systemId="http://jakarta.apache.org/phoenix/mxinfo_1_0.dtd"
  -        resource="org/apache/avalon/phoenix/tools/mxinfo.dtd"/>
  -    <entity
  -        publicId="-//PHOENIX/Assembly DTD Version 1.1//EN"
  -        systemId="http://jakarta.apache.org/phoenix/assembly_1.1.dtd"
  -        resource="org/apache/avalon/phoenix/tools/assembly.dtd"/>
  -    <entity
  -        publicId="-//PHOENIX/Mx Info DTD Version 1.0//EN"
  -        systemId="http://jakarta.apache.org/avalon/dtds/phoenix/mxinfo_1.0.dtd"
  -        resource="org/apache/avalon/phoenix/tools/mxinfo.dtd"/>
  -    <entity
  -        publicId="-//PHOENIX/Assembly DTD Version 1.0//EN"
  -        systemId="http://jakarta.apache.org/avalon/dtds/phoenix/assembly_1.0.dtd"
  -        resource="org/apache/avalon/phoenix/tools/assembly.dtd"/>
  +        publicId="-//PHOENIX/Block Info DTD Version 1.0//EN"
  +        resource="org/apache/avalon/phoenix/tools/blockinfo.dtd"/>
       <entity
  -        publicId="-//PHOENIX/Mx Info DTD Version 1.0//EN"
  -        systemId="http://jakarta.apache.org/phoenix/mxinfo_1.0.dtd"
  -        resource="org/apache/avalon/phoenix/tools/mxinfo.dtd"/>
  +        publicId="-//AVALON/Component Info DTD Version 1.0//EN"
  +        resource="org/apache/avalon/phoenix/tools/componentinfo.dtd"/>
       <entity
           publicId="-//PHOENIX/Assembly DTD Version 1.0//EN"
  -        systemId="http://jakarta.apache.org/phoenix/assembly_1.0.dtd"
           resource="org/apache/avalon/phoenix/tools/assembly.dtd"/>
       <entity
           publicId="-//PHOENIX/Mx Info DTD Version 1.0//EN"
  -        systemId="http://jakarta.apache.org/avalon/dtds/phoenix/mxinfo_1_0.dtd"
           resource="org/apache/avalon/phoenix/tools/mxinfo.dtd"/>
       <entity
  -        publicId="-//PHOENIX/Assembly DTD Version 1.0//EN"
  -        systemId="http://jakarta.apache.org/avalon/dtds/phoenix/assembly_1_0.dtd"
  +        publicId="-//PHOENIX/Assembly DTD Version 1.1//EN"
           resource="org/apache/avalon/phoenix/tools/assembly.dtd"/>
  -    <entity
  -        publicId="-//AVALON/Component Info DTD Version 1.0//EN"
  -        systemId="http://avalon.apache.org/dtds/info/componentinfo_1_0.dtd"
  -        resource="org/apache/avalon/phoenix/tools/componentinfo.dtd"/>
  -    <entity
  -        publicId="-//PHOENIX/Block Info DTD Version 1.0//EN"
  -        systemId="http://jakarta.apache.org/phoenix/blockinfo_1.0.dtd"
  -        resource="org/apache/avalon/phoenix/tools/blockinfo.dtd"/>
  -    <entity
  -        publicId="-//PHOENIX/Block Info DTD Version 1.0//EN"
  -        systemId="http://jakarta.apache.org/phoenix/blockinfo_1_0.dtd"
  -        resource="org/apache/avalon/phoenix/tools/blockinfo.dtd"/>
  -    <entity
  -        publicId="-//PHOENIX/Block Info DTD Version 1.0//EN"
  -        systemId="http://jakarta.apache.org/avalon/dtds/phoenix/blockinfo_1_0.dtd"
  -        resource="org/apache/avalon/phoenix/tools/blockinfo.dtd"/>
  -    <entity
  -        publicId="-//PHOENIX/Block Info DTD Version 1.0//EN"
  -        systemId="http://jakarta.apache.org/avalon/dtds/phoenix/blockinfo_1.0.dtd"
  -        resource="org/apache/avalon/phoenix/tools/blockinfo.dtd"/>
   </catalog>
  
  
  
  1.2       +1 -2      avalon-phoenix/src/schema/componentinfo.dtd
  
  Index: componentinfo.dtd
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/schema/componentinfo.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- componentinfo.dtd	5 Apr 2003 04:21:47 -0000	1.1
  +++ componentinfo.dtd	5 Apr 2003 11:21:10 -0000	1.2
  @@ -30,8 +30,7 @@
                validates against
   -->
   <!ELEMENT component-info (component, loggers?, context?, services?, dependencies?, configuration-schema?, parameters-schema?)>
  -<!ATTLIST component-info id ID #IMPLIED
  -          xmlns CDATA #FIXED "http://jakarta.apache.org/avalon/dtds/info/componentinfo_1_0.dtd">
  +<!ATTLIST component-info id ID #IMPLIED>
   
   <!--
   The service-info is the document root for service info file, it defines:
  
  
  
  1.2       +22 -21    avalon-phoenix/src/test/org/apache/avalon/phoenix/framework/tools/infobuilder/test/data/component2.xinfo
  
  Index: component2.xinfo
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/framework/tools/infobuilder/test/data/component2.xinfo,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- component2.xinfo	1 Mar 2003 04:20:14 -0000	1.1
  +++ component2.xinfo	5 Apr 2003 11:21:10 -0000	1.2
  @@ -1,29 +1,30 @@
   <?xml version="1.0"?>
  -<!DOCTYPE blockinfo PUBLIC "-//PHOENIX/Block Info DTD Version 1.0//EN"
  -                  "http://avalon.apache.org/dtds/phoenix/blockinfo_1.0.dtd">
  +<!DOCTYPE blockinfo
  +         PUBLIC "-//PHOENIX/Block Info DTD Version 1.0//EN"
  +         "http://avalon.apache.org/dtds/phoenix/blockinfo_1.0s.dtd">
   
   <blockinfo>
   
  -  <!-- section to describe block -->
  -  <block>
  -    <version>1.0</version>
  -      <schema-type>relax-ng</schema-type>
  -  </block>
  +    <!-- section to describe block -->
  +    <block>
  +        <version>1.0</version>
  +        <schema-type>relax-ng</schema-type>
  +    </block>
   
  -  <!-- services that are offered by this block -->
  -  <services>
  -    <service name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  -  </services>
  +    <!-- services that are offered by this block -->
  +    <services>
  +        <service name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
  +    </services>
   
  -  <!-- interfaces that may be exported to manange this block -->
  -  <management-access-points>
  -      <service name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler2"/>
  -  </management-access-points>
  +    <!-- interfaces that may be exported to manange this block -->
  +    <management-access-points>
  +        <service name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler2"/>
  +    </management-access-points>
   
  -  <!-- services that are required by this block -->
  -  <dependencies>
  -    <dependency>
  -      <service name="org.apache.avalon.cornerstone.services.threads.ThreadManager"/>
  -    </dependency>
  -  </dependencies>
  +    <!-- services that are required by this block -->
  +    <dependencies>
  +        <dependency>
  +            <service name="org.apache.avalon.cornerstone.services.threads.ThreadManager"/>
  +        </dependency>
  +    </dependencies>
   </blockinfo>
  
  
  
  1.11      +5 -2      avalon-phoenix/src/test/org/apache/avalon/phoenix/test/AbstractContainerTestCase.java
  
  Index: AbstractContainerTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/test/AbstractContainerTestCase.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- AbstractContainerTestCase.java	5 Apr 2003 04:25:45 -0000	1.10
  +++ AbstractContainerTestCase.java	5 Apr 2003 11:21:10 -0000	1.11
  @@ -83,7 +83,10 @@
           assembler.enableLogging( new ConsoleLogger() );
           final URL resource = getClass().getResource( config );
           assertNotNull( "Config resource: " + config, resource );
  -        final Configuration assembly = ConfigurationBuilder.build( new InputSource( resource.toExternalForm() ), true );
  +        final Configuration assembly =
  +            ConfigurationBuilder.build( new InputSource( resource.toExternalForm() ),
  +                                        ConfigurationBuilder.ASSEMBLY_SCHEMA,
  +                                        new ConsoleLogger() );
           final Map parameters = new HashMap();
           parameters.put( ContainerConstants.ASSEMBLY_NAME, "test" );
           parameters.put( ContainerConstants.ASSEMBLY_CONFIG, assembly );
  
  
  
  1.6       +1 -1      avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/assembly1.xml
  
  Index: assembly1.xml
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/assembly1.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- assembly1.xml	1 Oct 2002 07:44:01 -0000	1.5
  +++ assembly1.xml	5 Apr 2003 11:21:10 -0000	1.6
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   <!DOCTYPE assembly PUBLIC "-//PHOENIX/Assembly DTD Version 1.0//EN"
  -                  "http://jakarta.apache.org/avalon/dtds/phoenix/assembly_1.1.dtd">
  +                  "http://jakarta.apache.org/phoenix/assembly_1_0.dtd">
   
   <assembly>
   
  
  
  
  1.4       +1 -1      avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/assembly2.xml
  
  Index: assembly2.xml
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/assembly2.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- assembly2.xml	1 Oct 2002 07:44:01 -0000	1.3
  +++ assembly2.xml	5 Apr 2003 11:21:10 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   <!DOCTYPE assembly PUBLIC "-//PHOENIX/Assembly DTD Version 1.0//EN"
  -                  "http://jakarta.apache.org/avalon/dtds/phoenix/assembly_1.1.dtd">
  +                  "http://jakarta.apache.org/phoenix/assembly_1_0.dtd">
   
   <assembly>
   
  
  
  

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