donaldp     2002/10/01 22:57:14

  Modified:    docs/dtds/info componentinfo_1_0.dtd
  Log:
  Update dtd.
  
  Revision  Changes    Path
  1.2       +52 -42    jakarta-avalon-site/docs/dtds/info/componentinfo_1_0.dtd
  
  Index: componentinfo_1_0.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-site/docs/dtds/info/componentinfo_1_0.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- componentinfo_1_0.dtd     13 Sep 2002 08:39:52 -0000      1.1
  +++ componentinfo_1_0.dtd     2 Oct 2002 05:57:14 -0000       1.2
  @@ -34,17 +34,23 @@
    -->
   
   <!--
  +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.
  -version           the version of the component in (in the format #.#.#, #.# or # 
where
  -             # is a integer
   -->
  -<!ELEMENT component      (name?,version,attributes?)>
  -  <!ELEMENT name         (#PCDATA) >
  -  <!ELEMENT version      (#PCDATA) >
  +<!ELEMENT component      (attributes?)>
  +  <!ATTLIST component name CDATA #REQUIRED
  +                      type CDATA #REQUIRED >
   
   <!--
   The logger element defines the loggers that are available to component.
  @@ -52,7 +58,7 @@
   
   attributes     Optional attributes about logger
   -->
  -<!ELEMENT logger   (attributes?) >
  +<!ELEMENT logger   (attribute*) >
     <!ATTLIST logger name CDATA #IMPLIED >
   
   <!--
  @@ -61,48 +67,37 @@
   It contains:
   
   entrys         Key value pairs that component uses
  -attributes     Optional attributes about service
  +attributes           Optional attributes about service
   -->
  -<!ELEMENT context   (entry*,attributes?) >
  +<!ELEMENT context   (entry*,attribute*) >
     <!ATTLIST context type CDATA #IMPLIED >
   
   <!--
   The service element defines a service that the component
   can provide to other component.
  -It contains:
   
  -service-ref  the reference to service.
  -attributes     Optional attributes about service
  --->
  -<!ELEMENT service   (service-ref,attributes?) >
  +type         the name of the service. This is usually equal to the class
  +             name of the interface that defines the service.
   
  -<!--
  -The service element defines a reference to a service that the component
  -can provide to other component, or this component depends upon.
  -It defines:
  +It contains:
   
  -type         the name of the service. This must be equal to the class name of the
  -             interface that defines the service.
  -version           the version of the block in (in the format #.#.#, #.# or # where
  -             # is a integer
  +attribute      Optional attributes about service
   -->
  -<!ELEMENT service-ref   EMPTY >
  -  <!ATTLIST service-ref
  -       type CDATA #REQUIRED
  -       version CDATA #IMPLIED >
  +<!ELEMENT service   (attribute*) >
  +  <!ATTLIST service type CDATA #REQUIRED >
   
   <!--
   The service dependency describes a service that the component
   requires. It defines:
   
  -role         the role of the service. This is the value that is used to lookup the
  -             service in the ComponentManager. If not provided it defaults to the
  -             value specified in the name attribute of service element
  -service-ref  the service that is required
  --->
  -<!ELEMENT dependency  (role?,service-ref,attributes?) >
  -  <!ATTLIST dependency optional CDATA #IMPLIED >
  -  <!ELEMENT role        (#PCDATA) >
  +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.
  @@ -122,21 +117,21 @@
   <!ELEMENT dependencies    (dependency*)>
   
   <!--
  -The attributes element contains a list of attributes for feature.
  +The methods element contains a list of methods declared by service.
   -->
  -<!ELEMENT attributes    (attribute*)>
  +<!ELEMENT methods    (method*)>
   
   <!--
  -The attribute element defines an attribute (an opaque key-value pair for a feature).
  +The param element defines an parameter to a attribute.
   It defines:
   
  -key          the key for attribute.
  +name         the name of attribute.
   value             the value of attribute.
   -->
  -<!ELEMENT attribute   (#PCDATA) >
  -  <!ATTLIST attribute
  -       key CDATA #REQUIRED
  -       value CDATA #IMPLIED
  +<!ELEMENT param   (#PCDATA) >
  +  <!ATTLIST param
  +       name CDATA #REQUIRED
  +       value CDATA #REQUIRED
     >
   
   <!--
  @@ -147,7 +142,22 @@
   value             the value of entry.
   optional     is entry optional
   -->
  -<!ELEMENT entry   EMPTY >
  +<!ELEMENT entry   (attribute*) >
  +  <!ATTLIST entry
  +       key CDATA #REQUIRED
  +       type CDATA #REQUIRED
  +       optional CDATA #IMPLIED
  +  >
  +
  +<!--
  +The method element defines a method.
  +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
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to