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-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/components Component1-info.xml
Date Wed, 28 Aug 2002 11:50:59 GMT
donaldp     2002/08/28 04:50:59

  Modified:    containerkit/src/java/org/apache/excalibur/containerkit/tools/infobuilder
                        componentinfo.dtd XMLInfoCreator.java
               containerkit/src/java/org/apache/excalibur/containerkit/demo/components
                        Component1-info.xml
  Log:
  Allow attributes to have their data specified as content rather than as value of an attribute.
  
  Revision  Changes    Path
  1.2       +2 -2      jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/tools/infobuilder/componentinfo.dtd
  
  Index: componentinfo.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/tools/infobuilder/componentinfo.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- componentinfo.dtd	18 Aug 2002 06:39:00 -0000	1.1
  +++ componentinfo.dtd	28 Aug 2002 11:50:58 -0000	1.2
  @@ -133,10 +133,10 @@
   key          the key for attribute.
   value  	     the value of attribute.
   -->
  -<!ELEMENT attribute   EMPTY >
  +<!ELEMENT attribute   (#PCDATA) >
     <!ATTLIST attribute
          key CDATA #REQUIRED
  -       value CDATA #REQUIRED
  +       value CDATA #IMPLIED
     >
   
   <!--
  
  
  
  1.2       +6 -2      jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/tools/infobuilder/XMLInfoCreator.java
  
  Index: XMLInfoCreator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/tools/infobuilder/XMLInfoCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLInfoCreator.java	18 Aug 2002 06:39:00 -0000	1.1
  +++ XMLInfoCreator.java	28 Aug 2002 11:50:58 -0000	1.2
  @@ -371,7 +371,11 @@
           {
               Configuration child = children[ i ];
               final String key = child.getAttribute( "key" );
  -            final String value = child.getAttribute( "value" );
  +            String value = child.getAttribute( "value", null );
  +            if( null == value )
  +            {
  +                value = child.getValue();
  +            }
               attributes.setProperty( key, value );
           }
           return attributes;
  
  
  
  1.2       +6 -0      jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/components/Component1-info.xml
  
  Index: Component1-info.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/components/Component1-info.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Component1-info.xml	23 Aug 2002 08:51:15 -0000	1.1
  +++ Component1-info.xml	28 Aug 2002 11:50:59 -0000	1.2
  @@ -18,6 +18,12 @@
       <services>
           <service>
               <service-ref type="org.apache.excalibur.containerkit.demo.components.Service1"/>
  +            <attributes>
  +                <attribute key="foo" value="bar"/>
  +                <attribute key="foo2">
  +                    blah blah blah
  +                </attribute>
  +            </attributes>
           </service>
       </services>
   </component-info>
  
  
  

--
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