You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/09/13 17:43:33 UTC

cvs commit: jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/components Component1-info.xml Component1.java

donaldp     2002/09/13 08:43:33

  Modified:    containerkit/src/java/org/apache/excalibur/containerkit/demo/components
                        Component1-info.xml Component1.java
  Log:
  Upgrade the info format.
  
  Revision  Changes    Path
  1.4       +5 -4      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Component1-info.xml	8 Sep 2002 05:37:30 -0000	1.3
  +++ Component1-info.xml	13 Sep 2002 15:43:33 -0000	1.4
  @@ -2,7 +2,7 @@
   
   <!DOCTYPE component-info
         PUBLIC "-//AVALON/Component Info DTD Version 1.0//EN"
  -             "http://jakarta.apache.org/avalon/dtds/componentinfo_1_0.dtd" >
  +             "http://jakarta.apache.org/avalon/dtds/info/componentinfo_1_0.dtd" >
   
   <component-info>
       <component name="component1"
  @@ -16,9 +16,10 @@
   
       <services>
           <service type="org.apache.excalibur.containerkit.demo.components.Service1">
  -            <attributes>
  -                <attribute key="foo" value="bar"/>
  -            </attributes>
  +            <tag name="avalon.doc">
  +                <param name="display-name" value="Special Service"/>
  +                <param name="description-key" value="service1.desc"/>
  +            </tag>
           </service>
       </services>
   </component-info>
  
  
  
  1.4       +5 -4      jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/components/Component1.java
  
  Index: Component1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/components/Component1.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Component1.java	25 Aug 2002 12:53:31 -0000	1.3
  +++ Component1.java	13 Sep 2002 15:43:33 -0000	1.4
  @@ -21,15 +21,16 @@
   
   /**
    * @avalon.component lifestyle="alternative" version="1.4"
  - * @avalon.service interface="Service1" shareable="true"
  + * @avalon.service interface="Service1" shareable="true" doc.displayString="myDisplayString" doc.description="myDescription"
    * @avalon.service interface="Service1" shareable="true" version="2.0"
  + * @phoenix:mx-topic name="Deployer" displayString="" version="2.0"
    */
   public class Component1
       implements Service1, Contextualizable, Serviceable, Configurable, Initializable
   {
       /**
  -     * @avalon.context type="Context" anAttribute="f"
  -     * @avalon.entry key="foo" type="ClassLoader"
  +     * @avalon.context type="Context" anAttribute="f" doc.displayString="myDisplayString" doc.description="myDescription"
  +     * @avalon.entry key="foo" type="ClassLoader" doc.displayString="myDisplayString" doc.description="myDescription"
        * @avalon.entry key="bar" type="java.lang.Integer" attribute1="meep meep!" isOptional="false"
        */
       public void contextualize( final Context context )
  @@ -46,7 +47,7 @@
   
       /**
        * @avalon.dependency role="fred" interface="Service1" optional="true" shareable="true"
  -     * @avalon.dependency role="fred" interface="Service1" shareable="true"
  +     * @avalon.dependency role="fred" interface="Service1" shareable="true" doc.displayString="myDisplayString" doc.description="myDescription"
        */
       public void service( final ServiceManager manager )
           throws ServiceException
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>