avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: avalon-phoenix/src/schema componentinfo.dtd catalog.xml
Date Sat, 05 Apr 2003 04:21:47 GMT
donaldp     2003/04/04 20:21:47

  Modified:    src/java/org/apache/avalon/phoenix/framework/tools/infobuilder
                        LegacyBlockInfoReader.java XMLInfoReader.java
               src/schema catalog.xml
  Added:       src/schema componentinfo.dtd
  Removed:     src/java/org/apache/avalon/phoenix/framework/tools/infobuilder
                        ConfigurationBuilder.java DTDInfo.java
                        DTDResolver.java blockinfo.dtd componentinfo.dtd
  Log:
  Use the same ConfigurationBuilder throughout all of Phoenix.
  
  Revision  Changes    Path
  1.5       +3 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LegacyBlockInfoReader.java	4 Apr 2003 10:56:25 -0000	1.4
  +++ LegacyBlockInfoReader.java	5 Apr 2003 04:21:47 -0000	1.5
  @@ -63,6 +63,7 @@
   import org.apache.avalon.phoenix.framework.info.LoggerDescriptor;
   import org.apache.avalon.phoenix.framework.info.SchemaDescriptor;
   import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
  +import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.xml.sax.InputSource;
   
  @@ -96,7 +97,7 @@
           throws Exception
       {
           final InputSource input = new InputSource( inputStream );
  -        final Configuration configuration = ConfigurationBuilder.build( input );
  +        final Configuration configuration = ConfigurationBuilder.build( input, false );
           return build( implementationKey, configuration );
       }
   
  
  
  
  1.5       +3 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLInfoReader.java	22 Mar 2003 12:07:13 -0000	1.4
  +++ XMLInfoReader.java	5 Apr 2003 04:21:47 -0000	1.5
  @@ -68,6 +68,7 @@
   import org.apache.avalon.phoenix.framework.info.LoggerDescriptor;
   import org.apache.avalon.phoenix.framework.info.SchemaDescriptor;
   import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
  +import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
   import org.xml.sax.InputSource;
   
   /**
  @@ -99,7 +100,7 @@
           throws Exception
       {
           final InputSource input = new InputSource( inputStream );
  -        final Configuration configuration = ConfigurationBuilder.build( input );
  +        final Configuration configuration = ConfigurationBuilder.build( input, false );
           return buildComponentInfo( implementationKey, configuration );
       }
   
  
  
  
  1.2       +4 -0      avalon-phoenix/src/schema/catalog.xml
  
  Index: catalog.xml
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/schema/catalog.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- catalog.xml	5 Apr 2003 03:41:02 -0000	1.1
  +++ catalog.xml	5 Apr 2003 04:21:47 -0000	1.2
  @@ -35,4 +35,8 @@
           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"/>
  +    <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"/>
   </catalog>
  
  
  
  1.1                  avalon-phoenix/src/schema/componentinfo.dtd
  
  Index: componentinfo.dtd
  ===================================================================
  <!--
  
     This is the DTD defining the Avalon ComponentInfo 1.0
     descriptor (XML) file format/syntax.
  
     Author: Peter Donald <peter at apache.org>
  
     A BlockInfo is an XML file used to describe Components and located side-by-side with
     the Component .class file. It describes the services the Component requires to operate,
     the services the Component is capable of offerring other Component, the context entrys
     that Component requires and other support meta data.
  
     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.
  
    -->
  
  <!--
  The component-info is the document root, it defines:
  
  component    the specifc details about this component
  loggers      the loggers used by this component
  context      the context required by this component
  services     the services offered by this component
  dependencies the services that this component require to operate
  schema       the configuration/parameters schema that this component
               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">
  
  <!--
  The service-info is the document root for service info file, it defines:
  
  service    the specifc details about this service
  methods      the methods declared by this service
  -->
  <!ELEMENT service-info (service, methods?)>
  
  <!--
  The component element describes the component, it defines:
  
  name	        the human readable name of component type. Must be a string
               containing alphanumeric characters, '.', '_' and starting
               with a letter.
  -->
  <!ELEMENT component      (attribute*)>
    <!ATTLIST component type CDATA #REQUIRED >
  
  <!--
  The schema element defines the configuration schema for the component, it defines:
  
  location       the location of the schema relative the the component
  -->
  <!ELEMENT configuration-schema      (attribute*)>
    <!ATTLIST configuration-schema location CDATA #IMPLIED >
    <!ATTLIST configuration-schema type CDATA #IMPLIED >
  
  <!--
  The schema element defines the parameters schema for the component, it defines:
  
  location       the location of the schema relative the the component
  -->
  <!ELEMENT parameters-schema      (attribute*)>
    <!ATTLIST parameters-schema location CDATA #IMPLIED >
    <!ATTLIST parameters-schema type CDATA #IMPLIED >
  
  <!--
  The logger element defines the loggers that are available to component.
  The element has one attribute specifying name of Logger. It contains:
  
  attribute	  Optional attributes about logger
  -->
  <!ELEMENT logger   (attribute*) >
    <!ATTLIST logger name CDATA #IMPLIED >
  
  <!--
  The context element defines what values and type of context
  is available to component.
  It contains:
  
  entrys    	  Key value pairs that component uses
  attribute	        Optional attributes about service
  -->
  <!ELEMENT context   (entry*,attribute*) >
    <!ATTLIST context type CDATA #IMPLIED >
  
  <!--
  The service element defines a service that the component
  can provide to other component.
  
  type         the name of the service. This is usually equal to the class
               name of the interface that defines the service.
  
  It contains:
  
  attribute	  Optional attributes about service
  -->
  <!ELEMENT service   (attribute*) >
    <!ATTLIST service type CDATA #REQUIRED >
  
  <!--
  The service dependency describes a service that the component
  requires. It defines:
  
  key          the key used to lookup service. If not provided it defaults
               to the value specified in the name attribute of service element
  -->
  <!ELEMENT dependency  (attribute*) >
    <!ATTLIST dependency
         key CDATA #IMPLIED
         type CDATA #REQUIRED
         optional CDATA #IMPLIED >
  
  <!--
  The loggers element contains a list of loggers that component uses.
  -->
  <!ELEMENT loggers    (logger*)>
  
  <!--
  The services element contains a list of services that this component supports.
  It contains service elements.
  -->
  <!ELEMENT services    (service*)>
  
  <!--
  The dependencies element contains a list of services that this component requires.
  It contains dependency elements.
  -->
  <!ELEMENT dependencies    (dependency*)>
  
  <!--
  The methods element contains a list of methods declared by service.
  -->
  <!ELEMENT methods    (method*)>
  
  <!--
  The entry element defines entry in context.
  It defines:
  
  key          the key for entry.
  value  	     the value of entry.
  optional     is entry optional
  -->
  <!ELEMENT entry   (attribute*) >
    <!ATTLIST entry
         key CDATA #REQUIRED
         type CDATA #REQUIRED
         optional CDATA #IMPLIED
    >
  
  <!ELEMENT method (parameter*,attribute*) >
    <!ATTLIST method
         name CDATA #REQUIRED
         return-type CDATA #REQUIRED >
  
  <!ELEMENT parameter (attribute*) >
    <!ATTLIST parameter type CDATA #REQUIRED >
  
  <!--
  The method element defines a method.
  It defines:
  
  key          the key for entry.
  value  	     the value of entry.
  optional     is entry optional
  -->
  <!ELEMENT attribute   (param*) >
    <!ATTLIST attribute name CDATA #REQUIRED >
  
  <!--
  The param element defines an parameter to a attribute.
  It defines:
  
  name         the name of attribute.
  value  	     the value of attribute.
  -->
  <!ELEMENT param   EMPTY >
    <!ATTLIST param
         name CDATA #REQUIRED
         value CDATA #REQUIRED
    >
  
  
  

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


Mime
View raw message