avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags AbstractTag.java
Date Wed, 14 Jan 2004 12:47:33 GMT
mcconnell    2004/01/14 04:47:33

  Modified:    meta     README.TXT maven.xml platform.xml project.xml
               meta/plugin project.xml
               meta/tools project.xml
               meta/tools/src/java/org/apache/avalon/meta/info/ant
                        MetaTask.java
               meta/tools/src/java/org/apache/avalon/meta/info/builder/tags
                        AbstractTag.java
  Log:
  Apply patch from ronald@innovation.ch that adds support for inner class meta info generation.
 Bumped package version to 1.3.2, tools version to 1.3.1, and added updated release status
note.
  
  Revision  Changes    Path
  1.4       +8 -1      avalon/meta/README.TXT
  
  Index: README.TXT
  ===================================================================
  RCS file: /home/cvs/avalon/meta/README.TXT,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- README.TXT	17 Oct 2003 01:48:35 -0000	1.3
  +++ README.TXT	14 Jan 2004 12:47:32 -0000	1.4
  @@ -12,6 +12,13 @@
      For more detailed information, visit the online documentation at:
      http://avalon.apache.org/avalon/meta
   
  +Status
  +------
  +
  +   Avalon Meta 1.2 released and published.
  +   Avalon Meta 1.3.1 has been released and is pending a vote to publish by the PMC
  +   Avalon Meta 1.3.2 has not been released
  +
   Structure:
   ----------
   
  @@ -22,7 +29,7 @@
      /impl ..................... meta info builders, writers, serializers, readers
      /tools .................... ant plugin and javadoc tag related content
      /plugin ................... maven plugin
  -   /site .................... project documetation
  +   /site ..................... project documetation
   
   Installation
   ------------
  
  
  
  1.11      +2 -2      avalon/meta/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/maven.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- maven.xml	18 Dec 2003 01:10:32 -0000	1.10
  +++ maven.xml	14 Jan 2004 12:47:32 -0000	1.11
  @@ -1,6 +1,6 @@
   <project default="avalon:build"  xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
   
  -  <ant:property name="meta.plugin.version" value="1.3"/>
  +  <ant:property name="meta.plugin.version" value="1.3.2"/>
     <ant:property name="meta.plugin.groupId" value="avalon-meta"/>   
     <ant:property name="meta.plugin.artifactId" value="avalon-meta-plugin"/>   
     <ant:property name="meta.plugin.jar" 
  @@ -32,7 +32,7 @@
         includes="*/project.xml"
         goals="clean"
         banner="Cleaning:"
  -      ignoreFailures="false"/>
  +      ignoreFailures="true"/>
     </goal>
   
     <goal name="avalon:build">
  
  
  
  1.3       +2 -2      avalon/meta/platform.xml
  
  Index: platform.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/platform.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- platform.xml	18 Dec 2003 01:10:32 -0000	1.2
  +++ platform.xml	14 Jan 2004 12:47:32 -0000	1.3
  @@ -37,7 +37,7 @@
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-tools</artifactId>
  -      <version>1.3</version>
  +      <version>1.3.1</version>
       </dependency>
   
       <dependency>
  @@ -57,7 +57,7 @@
   
       <dependency>
         <id>qdox</id>
  -      <version>1.1</version>
  +      <version>1.3</version>
       </dependency>
   
       <!-- pre JDK 1.4 dependencies -->
  
  
  
  1.11      +1 -1      avalon/meta/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/project.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- project.xml	1 Jan 2004 21:48:36 -0000	1.10
  +++ project.xml	14 Jan 2004 12:47:32 -0000	1.11
  @@ -5,7 +5,7 @@
     <name>Avalon Meta</name>
     <groupId>avalon-meta</groupId>
     <id>avalon-meta</id>
  -  <currentVersion>1.3.1</currentVersion>
  +  <currentVersion>1.3.2</currentVersion>
     <inceptionYear>2000</inceptionYear>
   
     <organization>
  
  
  
  1.10      +3 -3      avalon/meta/plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/plugin/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	1 Jan 2004 21:48:37 -0000	1.9
  +++ project.xml	14 Jan 2004 12:47:32 -0000	1.10
  @@ -5,7 +5,7 @@
     <pomVersion>3</pomVersion>
     <id>avalon-meta-plugin</id>
     <name>Avalon Meta Model Plugin</name>
  -  <currentVersion>1.3.1</currentVersion>
  +  <currentVersion>1.3.2</currentVersion>
     <description>Avalon Plugin for Maven</description>
     <shortDescription>Avalon Plugin for Maven</shortDescription>
     <package>org.apache.avalon</package>
  @@ -41,7 +41,7 @@
       <dependency>
         <groupId>avalon-meta</groupId>
         <artifactId>avalon-meta-tools</artifactId>
  -      <version>1.3</version>
  +      <version>1.3.1</version>
       </dependency>
   
       <dependency>
  @@ -51,7 +51,7 @@
   
       <dependency>
         <id>qdox</id>
  -      <version>1.1</version>
  +      <version>1.3</version>
       </dependency>
   
       <!-- pre JDK 1.4 dependencies -->
  
  
  
  1.8       +2 -2      avalon/meta/tools/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/tools/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	1 Jan 2004 21:48:37 -0000	1.7
  +++ project.xml	14 Jan 2004 12:47:32 -0000	1.8
  @@ -6,7 +6,7 @@
     <name>Avalon Meta Model Toolkit</name>
     <package>org.apache.avalon.meta</package>
   
  -  <currentVersion>1.3</currentVersion>
  +  <currentVersion>1.3.1</currentVersion>
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Avalon Meta Model Toolkit</shortDescription>
     
  @@ -64,7 +64,7 @@
   
       <dependency>
         <id>qdox</id>
  -      <version>1.1</version>
  +      <version>1.3</version>
       </dependency>
   
       <!-- pre JDK 1.4 dependencies -->
  
  
  
  1.2       +31 -2     avalon/meta/tools/src/java/org/apache/avalon/meta/info/ant/MetaTask.java
  
  Index: MetaTask.java
  ===================================================================
  RCS file: /home/cvs/avalon/meta/tools/src/java/org/apache/avalon/meta/info/ant/MetaTask.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MetaTask.java	24 Sep 2003 08:16:12 -0000	1.1
  +++ MetaTask.java	14 Jan 2004 12:47:33 -0000	1.2
  @@ -4,7 +4,7 @@
                      The Apache Software License, Version 1.1
    ============================================================================
   
  - Copyright (C) 2002-2003 The Apache Software Foundation. All rights reserved.
  + Copyright (C) 2002-2004 The Apache Software Foundation. All rights reserved.
   
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  @@ -53,6 +53,7 @@
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.OutputStream;
  +import java.util.ArrayList;
   
   import org.apache.avalon.meta.info.Service;
   import org.apache.avalon.meta.info.Type;
  @@ -201,6 +202,7 @@
           log( message );
   
           super.execute();
  +        addInnerClasses();
   
           try
           {
  @@ -216,6 +218,33 @@
               throw new BuildException( e.toString(), e );
           }
       }
  +
  +    /**
  +     * allClasses contains only non-inner classes, so here we (recursively) extract out
all inner
  +     * classes and explictly add them.
  +     */
  +    private void addInnerClasses()
  +    {
  +        ArrayList expList = new ArrayList();
  +        for( int i = 0; i < allClasses.size(); i++ )
  +        {
  +            addWithInnerClasses( expList, (JavaClass)allClasses.get( i ) );
  +        }
  +        allClasses = expList;
  +    }
  +
  +    private void addWithInnerClasses( ArrayList list, JavaClass javaClass )
  +    {
  +        list.add( javaClass );
  +
  +        final JavaClass[] innerClasses = javaClass.getInnerClasses();
  +        for( int i = 0; i < innerClasses.length; i++ )
  +        {
  +            addWithInnerClasses( list, innerClasses[i] );
  +        }
  +    }
  +
  +
   
       /**
        * Validate that the parameters are valid.
  
  
  
  1.2       +4 -9      avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/AbstractTag.java
  
  Index: AbstractTag.java
  ===================================================================
  RCS file: /home/cvs/avalon/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/AbstractTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractTag.java	24 Sep 2003 08:16:14 -0000	1.1
  +++ AbstractTag.java	14 Jan 2004 12:47:33 -0000	1.2
  @@ -254,8 +254,7 @@
           {
               return resolvedType;
           }
  -        else if( clazz.getSuperJavaClass() == null 
  -          || JavaClass.OBJECT.equals( clazz.getSuperClass() ) )
  +        else if( clazz.getSuperJavaClass() == null )
           {
               return null;
           }
  @@ -301,9 +300,7 @@
               }
           }
   
  -        if( 
  -            clazz.getSuperJavaClass() != null 
  -            && !JavaClass.OBJECT.equals( clazz.getSuperClass() ) )
  +        if( clazz.getSuperJavaClass() != null )
           {
               this.findLifecycleMethod( 
                 result, clazz.getSuperJavaClass(), methodName, parameterType );
  @@ -327,9 +324,7 @@
               if( tag != null ) list.add( method );
           }
   
  -        if( 
  -            clazz.getSuperJavaClass() != null 
  -            && !JavaClass.OBJECT.equals( clazz.getSuperClass() ) )
  +        if( clazz.getSuperJavaClass() != null )
           {
               return this.findTaggedMethods( clazz.getSuperJavaClass(), key, list );
           }
  
  
  

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


Mime
View raw message