avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From leosim...@apache.org
Subject cvs commit: avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/tools/ant MetaTask.java
Date Wed, 16 Apr 2003 14:19:43 GMT
leosimons    2003/04/16 07:19:43

  Modified:    merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder
                        DefaultServiceBuilder.java DefaultTypeBuilder.java
                        SerializedServiceWriter.java
                        SerializedTypeWriter.java ServiceWriter.java
                        TypeWriter.java XMLServiceWriter.java
                        XMLTypeWriter.java
               merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags
                        AbstractTag.java AttributeTag.java ContextTag.java
                        DependencyTag.java ExtensionTag.java
                        LifestyleTag.java LoggerTag.java NameTag.java
                        ServicesTag.java StageTag.java VersionTag.java
               merlin/meta-tools/src/java/org/apache/avalon/meta/tools/ant
                        MetaTask.java
  Log:
  optimize imports, remove unused stuff.
  
  Revision  Changes    Path
  1.3       +6 -4      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/DefaultServiceBuilder.java
  
  Index: DefaultServiceBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/DefaultServiceBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultServiceBuilder.java	29 Mar 2003 10:13:35 -0000	1.2
  +++ DefaultServiceBuilder.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -50,17 +50,19 @@
   package org.apache.avalon.meta.info.builder;
   
   import java.util.Properties;
  -import com.thoughtworks.qdox.model.JavaClass;
  +
   import org.apache.avalon.framework.Version;
  -import org.apache.avalon.meta.info.Service;
   import org.apache.avalon.meta.info.ReferenceDescriptor;
  +import org.apache.avalon.meta.info.Service;
   import org.apache.avalon.meta.info.builder.tags.AttributeTag;
   import org.apache.avalon.meta.info.builder.tags.VersionTag;
   
  +import com.thoughtworks.qdox.model.JavaClass;
  +
   /**
    * This is a utility class that is used to build a Service descriptor
    * from QDoxs JavaClass object model. This involves interpreting
  - * the version and attribute javadoc tags present in supplied JavaClass 
  + * the version and attribute javadoc tags present in supplied JavaClass
    * object model.
    *
    * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
  
  
  
  1.3       +14 -12    avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/DefaultTypeBuilder.java
  
  Index: DefaultTypeBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/DefaultTypeBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultTypeBuilder.java	29 Mar 2003 10:13:35 -0000	1.2
  +++ DefaultTypeBuilder.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -50,26 +50,28 @@
   package org.apache.avalon.meta.info.builder;
   
   import java.util.Properties;
  -import com.thoughtworks.qdox.model.JavaClass;
  +
   import org.apache.avalon.framework.Version;
  -import org.apache.avalon.meta.info.InfoDescriptor;
  -import org.apache.avalon.meta.info.Type;
   import org.apache.avalon.meta.info.ContextDescriptor;
   import org.apache.avalon.meta.info.DependencyDescriptor;
  +import org.apache.avalon.meta.info.ExtensionDescriptor;
  +import org.apache.avalon.meta.info.InfoDescriptor;
   import org.apache.avalon.meta.info.LoggerDescriptor;
   import org.apache.avalon.meta.info.ServiceDescriptor;
   import org.apache.avalon.meta.info.StageDescriptor;
  -import org.apache.avalon.meta.info.ExtensionDescriptor;
  -import org.apache.avalon.meta.info.builder.tags.NameTag;
  -import org.apache.avalon.meta.info.builder.tags.VersionTag;
  -import org.apache.avalon.meta.info.builder.tags.LifestyleTag;
  +import org.apache.avalon.meta.info.Type;
   import org.apache.avalon.meta.info.builder.tags.AttributeTag;
  -import org.apache.avalon.meta.info.builder.tags.ServicesTag;
  -import org.apache.avalon.meta.info.builder.tags.LoggerTag;
  +import org.apache.avalon.meta.info.builder.tags.ContextTag;
   import org.apache.avalon.meta.info.builder.tags.DependencyTag;
  -import org.apache.avalon.meta.info.builder.tags.StageTag;
   import org.apache.avalon.meta.info.builder.tags.ExtensionTag;
  -import org.apache.avalon.meta.info.builder.tags.ContextTag;
  +import org.apache.avalon.meta.info.builder.tags.LifestyleTag;
  +import org.apache.avalon.meta.info.builder.tags.LoggerTag;
  +import org.apache.avalon.meta.info.builder.tags.NameTag;
  +import org.apache.avalon.meta.info.builder.tags.ServicesTag;
  +import org.apache.avalon.meta.info.builder.tags.StageTag;
  +import org.apache.avalon.meta.info.builder.tags.VersionTag;
  +
  +import com.thoughtworks.qdox.model.JavaClass;
   
   /**
    * This is a utility class that is used to build a Type object
  
  
  
  1.2       +3 -2      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/SerializedServiceWriter.java
  
  Index: SerializedServiceWriter.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/SerializedServiceWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SerializedServiceWriter.java	29 Mar 2003 03:12:59 -0000	1.1
  +++ SerializedServiceWriter.java	16 Apr 2003 14:19:42 -0000	1.2
  @@ -51,6 +51,7 @@
   
   import java.io.ObjectOutputStream;
   import java.io.OutputStream;
  +
   import org.apache.avalon.meta.info.Service;
   
   /**
  @@ -72,7 +73,7 @@
       public void writeService( final Service service, final OutputStream stream )
           throws Exception
       {
  -        final ObjectOutputStream output = 
  +        final ObjectOutputStream output =
             new ObjectOutputStream( stream );
           output.writeObject( service );
           output.flush();
  
  
  
  1.2       +3 -2      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/SerializedTypeWriter.java
  
  Index: SerializedTypeWriter.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/SerializedTypeWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SerializedTypeWriter.java	29 Mar 2003 03:12:59 -0000	1.1
  +++ SerializedTypeWriter.java	16 Apr 2003 14:19:42 -0000	1.2
  @@ -51,6 +51,7 @@
   
   import java.io.ObjectOutputStream;
   import java.io.OutputStream;
  +
   import org.apache.avalon.meta.info.Type;
   
   /**
  @@ -72,7 +73,7 @@
       public void writeType( final Type type, final OutputStream stream )
           throws Exception
       {
  -        final ObjectOutputStream output = 
  +        final ObjectOutputStream output =
             new ObjectOutputStream( stream );
           output.writeObject( type );
           output.flush();
  
  
  
  1.2       +2 -1      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/ServiceWriter.java
  
  Index: ServiceWriter.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/ServiceWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServiceWriter.java	29 Mar 2003 03:12:59 -0000	1.1
  +++ ServiceWriter.java	16 Apr 2003 14:19:42 -0000	1.2
  @@ -50,6 +50,7 @@
   package org.apache.avalon.meta.info.builder;
   
   import java.io.OutputStream;
  +
   import org.apache.avalon.meta.info.Service;
   
   /**
  
  
  
  1.2       +2 -1      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/TypeWriter.java
  
  Index: TypeWriter.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/TypeWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TypeWriter.java	29 Mar 2003 03:12:59 -0000	1.1
  +++ TypeWriter.java	16 Apr 2003 14:19:42 -0000	1.2
  @@ -50,6 +50,7 @@
   package org.apache.avalon.meta.info.builder;
   
   import java.io.OutputStream;
  +
   import org.apache.avalon.meta.info.Type;
   
   /**
  
  
  
  1.3       +6 -5      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/XMLServiceWriter.java
  
  Index: XMLServiceWriter.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/XMLServiceWriter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLServiceWriter.java	29 Mar 2003 10:13:35 -0000	1.2
  +++ XMLServiceWriter.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -49,12 +49,13 @@
   
   package org.apache.avalon.meta.info.builder;
   
  -import java.io.OutputStream;
   import java.io.IOException;
  -import java.io.Writer;
  +import java.io.OutputStream;
   import java.io.OutputStreamWriter;
  -import org.apache.avalon.meta.info.Service;
  +import java.io.Writer;
  +
   import org.apache.avalon.meta.info.Descriptor;
  +import org.apache.avalon.meta.info.Service;
   
   /**
    * Write {@link Service} objects to a stream as xml documents.
  @@ -94,7 +95,7 @@
       * Write the XML header.
       * @param writer the writer
        * @throws IOException if unable to write xml
  -    */ 
  +    */
       private void writeHeader( final Writer writer )
           throws IOException
       {
  
  
  
  1.3       +12 -11    avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/XMLTypeWriter.java
  
  Index: XMLTypeWriter.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/XMLTypeWriter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLTypeWriter.java	29 Mar 2003 10:13:35 -0000	1.2
  +++ XMLTypeWriter.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -49,18 +49,19 @@
   
   package org.apache.avalon.meta.info.builder;
   
  -import java.io.OutputStream;
   import java.io.IOException;
  -import java.io.Writer;
  +import java.io.OutputStream;
   import java.io.OutputStreamWriter;
  -import org.apache.avalon.meta.info.Type;
  -import org.apache.avalon.meta.info.InfoDescriptor;
  -import org.apache.avalon.meta.info.LoggerDescriptor;
  +import java.io.Writer;
  +
   import org.apache.avalon.meta.info.ContextDescriptor;
  -import org.apache.avalon.meta.info.EntryDescriptor;
  -import org.apache.avalon.meta.info.ServiceDescriptor;
   import org.apache.avalon.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.Descriptor;
  +import org.apache.avalon.meta.info.EntryDescriptor;
  +import org.apache.avalon.meta.info.InfoDescriptor;
  +import org.apache.avalon.meta.info.LoggerDescriptor;
  +import org.apache.avalon.meta.info.ServiceDescriptor;
  +import org.apache.avalon.meta.info.Type;
   
   /**
    * Write {@link Type} objects to a stream as xml documents.
  @@ -73,7 +74,7 @@
   public class XMLTypeWriter
       implements TypeWriter
   {
  -    private static final String CONTEXT_CLASS = 
  +    private static final String CONTEXT_CLASS =
         "org.apache.avalon.framework.context.Context";
   
       /**
  @@ -104,7 +105,7 @@
       * Write the XML header.
       * @param writer the writer
        * @throws IOException if unable to write xml
  -    */ 
  +    */
       private void writeHeader( final Writer writer )
           throws IOException
       {
  @@ -224,7 +225,7 @@
           final EntryDescriptor[] entrys = context.getEntries();
           final int count = context.getAttributeNames().length;
   
  -        if( CONTEXT_CLASS.equals( type ) 
  +        if( CONTEXT_CLASS.equals( type )
               && 0 == count
               && 0 == entrys.length )
           {
  
  
  
  1.3       +13 -13    avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/AbstractTag.java
  
  Index: AbstractTag.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/AbstractTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractTag.java	29 Mar 2003 10:13:36 -0000	1.2
  +++ AbstractTag.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -49,10 +49,11 @@
   
   package org.apache.avalon.meta.info.builder.tags;
   
  +import org.apache.avalon.framework.Version;
  +
  +import com.thoughtworks.qdox.model.DocletTag;
   import com.thoughtworks.qdox.model.JavaClass;
   import com.thoughtworks.qdox.model.JavaMethod;
  -import com.thoughtworks.qdox.model.DocletTag;
  -import org.apache.avalon.framework.Version;
   import com.thoughtworks.qdox.model.Type;
   
   /**
  @@ -86,10 +87,10 @@
   
      /**
       * Return the user defined namespace for avalon tags. The value returned is established
  -    * by the javadoc tag 'avalon.namespace [namespace-value]' where 
  +    * by the javadoc tag 'avalon.namespace [namespace-value]' where
       * [namespace-value] is a string representing the namespace identifier.
       * @return the namespace tag used to represent the avalon.meta tag space
  -    * @exception IllegalArgumentException if the namespace tag is declared by does not

  +    * @exception IllegalArgumentException if the namespace tag is declared by does not
       *   contain a value
       */
       public String getNS() throws IllegalArgumentException
  @@ -104,7 +105,7 @@
               }
               else
               {
  -                final String error = 
  +                final String error =
                     "Tag " + Tags.NAMESPACE_TAG + " must contain a value.";
                   throw new IllegalArgumentException( error );
               }
  @@ -116,13 +117,13 @@
       }
   
      /**
  -    * Return the user defined namespace for avalon tags including the 
  +    * Return the user defined namespace for avalon tags including the
       * standard namespace delimiter.  The value returned is established
  -    * by the javadoc tag 'avalon.namespace [namespace-value]' where 
  +    * by the javadoc tag 'avalon.namespace [namespace-value]' where
       * [namespace-value] is a string representing the namespace identifier
       * with the namespace delimiter appended.
       * @return the namespace tag with delimeter
  -    * @exception IllegalArgumentException if the namespace tag is declared by does not

  +    * @exception IllegalArgumentException if the namespace tag is declared by does not
       *   contain a value
       */
       public String getNSD() throws IllegalArgumentException
  @@ -206,7 +207,6 @@
        */
       protected String resolveType( final String type )
       {
  -        String result = null;
           if( type.indexOf(":") > -1 )
           {
               return getJavaClass().getParentSource().resolveType( type.substring( 0, type.indexOf(":")
) );
  @@ -229,9 +229,9 @@
           for( int i = 0; i < methods.length; i++ )
           {
               final JavaMethod method = methods[ i ];
  -            if( methodName.equals( method.getName() ) 
  -                && method.getReturns().equals( new Type( "void", 0 ) ) 
  -                && method.getParameters().length == 1 
  +            if( methodName.equals( method.getName() )
  +                && method.getReturns().equals( new Type( "void", 0 ) )
  +                && method.getParameters().length == 1
                   && method.getParameters()[ 0 ].getType().getValue().equals( parameterType
) )
               {
                   return method;
  
  
  
  1.3       +4 -3      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/AttributeTag.java
  
  Index: AttributeTag.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/AttributeTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AttributeTag.java	29 Mar 2003 10:13:36 -0000	1.2
  +++ AttributeTag.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -49,9 +49,10 @@
   
   package org.apache.avalon.meta.info.builder.tags;
   
  -import com.thoughtworks.qdox.model.JavaClass;
  -import com.thoughtworks.qdox.model.DocletTag;
   import java.util.Properties;
  +
  +import com.thoughtworks.qdox.model.DocletTag;
  +import com.thoughtworks.qdox.model.JavaClass;
   
   /**
    * A doclet tag representing the set of attributes associated with the class.
  
  
  
  1.3       +10 -11    avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/ContextTag.java
  
  Index: ContextTag.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/ContextTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContextTag.java	29 Mar 2003 10:13:36 -0000	1.2
  +++ ContextTag.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -51,14 +51,14 @@
   
   import java.util.ArrayList;
   
  -import com.thoughtworks.qdox.model.JavaClass;
  -import com.thoughtworks.qdox.model.JavaMethod;
  -import com.thoughtworks.qdox.model.DocletTag;
  -
   import org.apache.avalon.meta.info.ContextDescriptor;
   import org.apache.avalon.meta.info.EntryDescriptor;
   import org.apache.avalon.meta.info.ReferenceDescriptor;
   
  +import com.thoughtworks.qdox.model.DocletTag;
  +import com.thoughtworks.qdox.model.JavaClass;
  +import com.thoughtworks.qdox.model.JavaMethod;
  +
   /**
    * A doclet tag handler for the 'extension' tag.
    *
  @@ -70,7 +70,7 @@
      /**
       * The default context class.
       */
  -    protected static final String CONTEXT_CLASS = 
  +    protected static final String CONTEXT_CLASS =
           "org.apache.avalon.framework.context.Context";
   
      /**
  @@ -122,8 +122,8 @@
               getLifecycleMethod( "contextualize", CONTEXT_CLASS );
           if( null == method )
           {
  -            return new ContextDescriptor( 
  -              new ReferenceDescriptor( CONTEXT_CLASS  ), 
  +            return new ContextDescriptor(
  +              new ReferenceDescriptor( CONTEXT_CLASS  ),
                 new EntryDescriptor[0], null );
           }
           else
  @@ -145,17 +145,16 @@
   
               final EntryDescriptor[] entries =
                   (EntryDescriptor[])list.toArray( new EntryDescriptor[ list.size() ] );
  -            return new ContextDescriptor( 
  +            return new ContextDescriptor(
                 new ReferenceDescriptor( type ), entries, null );
           }
       }
   
       private EntryDescriptor getEntry( DocletTag tag )
  -    {        
  +    {
           final String key = getNamedParameter( tag, KEY_PARAM );
           final String entryType = getNamedParameter( tag, TYPE_PARAM );
           final String optional = getNamedParameter( tag, OPTIONAL_PARAM, "false" );
  -        final String alias = getNamedParameter( tag, ALIAS_PARAM, "false" );
           final boolean isOptional = "true".equals( optional );
           return new EntryDescriptor( key, entryType, isOptional );
       }
  
  
  
  1.3       +6 -6      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/DependencyTag.java
  
  Index: DependencyTag.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/DependencyTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DependencyTag.java	29 Mar 2003 10:13:36 -0000	1.2
  +++ DependencyTag.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -51,14 +51,14 @@
   
   import java.util.ArrayList;
   
  -import com.thoughtworks.qdox.model.JavaClass;
  -import com.thoughtworks.qdox.model.DocletTag;
  -import com.thoughtworks.qdox.model.JavaMethod;
  -
   import org.apache.avalon.framework.Version;
   import org.apache.avalon.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.ReferenceDescriptor;
   
  +import com.thoughtworks.qdox.model.DocletTag;
  +import com.thoughtworks.qdox.model.JavaClass;
  +import com.thoughtworks.qdox.model.JavaMethod;
  +
   /**
    * A doclet tag representing the lifestyle assigned to the Type.
    *
  @@ -113,7 +113,7 @@
       }
   
      /**
  -    * Return the array of dependency descriptors based on the set of 
  +    * Return the array of dependency descriptors based on the set of
       * 'dependency' tags associated with the components compose or service method.
       * @return the set of dependencies
       */
  
  
  
  1.3       +4 -4      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/ExtensionTag.java
  
  Index: ExtensionTag.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/ExtensionTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExtensionTag.java	29 Mar 2003 10:13:36 -0000	1.2
  +++ ExtensionTag.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -51,10 +51,10 @@
   
   import java.util.ArrayList;
   
  -import com.thoughtworks.qdox.model.JavaClass;
  -import com.thoughtworks.qdox.model.DocletTag;
  -
   import org.apache.avalon.meta.info.ExtensionDescriptor;
  +
  +import com.thoughtworks.qdox.model.DocletTag;
  +import com.thoughtworks.qdox.model.JavaClass;
   
   /**
    * A doclet tag handler for the 'extension' tag.
  
  
  
  1.3       +3 -3      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/LifestyleTag.java
  
  Index: LifestyleTag.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/LifestyleTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LifestyleTag.java	29 Mar 2003 10:13:36 -0000	1.2
  +++ LifestyleTag.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -49,8 +49,8 @@
   
   package org.apache.avalon.meta.info.builder.tags;
   
  -import com.thoughtworks.qdox.model.JavaClass;
   import com.thoughtworks.qdox.model.DocletTag;
  +import com.thoughtworks.qdox.model.JavaClass;
   
   /**
    * A doclet tag representing the lifestyle assigned to the Type.
  @@ -92,7 +92,7 @@
               }
               else
               {
  -                final String error = 
  +                final String error =
                     "Tag " + getNS() + Tags.DELIMITER + KEY + "' does not contain a value.";
                   throw new IllegalArgumentException( error );
               }
  
  
  
  1.3       +5 -5      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/LoggerTag.java
  
  Index: LoggerTag.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/LoggerTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LoggerTag.java	29 Mar 2003 10:13:36 -0000	1.2
  +++ LoggerTag.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -51,12 +51,12 @@
   
   import java.util.ArrayList;
   
  -import com.thoughtworks.qdox.model.JavaClass;
  +import org.apache.avalon.meta.info.LoggerDescriptor;
  +
   import com.thoughtworks.qdox.model.DocletTag;
  +import com.thoughtworks.qdox.model.JavaClass;
   import com.thoughtworks.qdox.model.JavaMethod;
   
  -import org.apache.avalon.meta.info.LoggerDescriptor;
  -
   /**
    * A doclet tag handler supporting 'logger' tags.
    *
  @@ -91,7 +91,7 @@
       }
   
      /**
  -    * Return an array of logger descriptors relative to the 'logger' tags declared under
the 
  +    * Return an array of logger descriptors relative to the 'logger' tags declared under
the
       * LogEnabled interface.
       * @return the set of logger descriptos
       */
  
  
  
  1.3       +3 -4      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/NameTag.java
  
  Index: NameTag.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/NameTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NameTag.java	29 Mar 2003 10:13:36 -0000	1.2
  +++ NameTag.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -49,8 +49,8 @@
   
   package org.apache.avalon.meta.info.builder.tags;
   
  -import com.thoughtworks.qdox.model.JavaClass;
   import com.thoughtworks.qdox.model.DocletTag;
  +import com.thoughtworks.qdox.model.JavaClass;
   
   /**
    * A doclet tag representing the name of the Type.
  @@ -82,7 +82,6 @@
       public String getName()
       {
           final DocletTag tag = getJavaClass().getTagByName( getNS() + Tags.DELIMITER + KEY
);
  -        String name = null;
           if( null != tag )
           {
               final String value = tag.getValue();
  @@ -92,7 +91,7 @@
               }
               else
               {
  -                final String error = 
  +                final String error =
                     "Tag " + getNS() + Tags.DELIMITER + KEY + "' does not contain a value.";
                   throw new IllegalArgumentException( error );
               }
  
  
  
  1.3       +5 -5      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/ServicesTag.java
  
  Index: ServicesTag.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/ServicesTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServicesTag.java	29 Mar 2003 10:13:36 -0000	1.2
  +++ ServicesTag.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -51,12 +51,12 @@
   
   import java.util.ArrayList;
   
  -import com.thoughtworks.qdox.model.JavaClass;
  -import com.thoughtworks.qdox.model.DocletTag;
  -
   import org.apache.avalon.framework.Version;
  -import org.apache.avalon.meta.info.ServiceDescriptor;
   import org.apache.avalon.meta.info.ReferenceDescriptor;
  +import org.apache.avalon.meta.info.ServiceDescriptor;
  +
  +import com.thoughtworks.qdox.model.DocletTag;
  +import com.thoughtworks.qdox.model.JavaClass;
   
   /**
    * A doclet tag representing services exported by a type.
  
  
  
  1.3       +4 -3      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/StageTag.java
  
  Index: StageTag.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/StageTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StageTag.java	29 Mar 2003 10:13:36 -0000	1.2
  +++ StageTag.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -51,9 +51,10 @@
   
   import java.util.ArrayList;
   
  -import com.thoughtworks.qdox.model.JavaClass;
  -import com.thoughtworks.qdox.model.DocletTag;
   import org.apache.avalon.meta.info.StageDescriptor;
  +
  +import com.thoughtworks.qdox.model.DocletTag;
  +import com.thoughtworks.qdox.model.JavaClass;
   
   /**
    * A doclet tag handler for the 'stage' tag.
  
  
  
  1.3       +5 -5      avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/VersionTag.java
  
  Index: VersionTag.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/VersionTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VersionTag.java	29 Mar 2003 10:13:36 -0000	1.2
  +++ VersionTag.java	16 Apr 2003 14:19:42 -0000	1.3
  @@ -49,10 +49,11 @@
   
   package org.apache.avalon.meta.info.builder.tags;
   
  -import com.thoughtworks.qdox.model.JavaClass;
  -import com.thoughtworks.qdox.model.DocletTag;
   import org.apache.avalon.framework.Version;
   
  +import com.thoughtworks.qdox.model.DocletTag;
  +import com.thoughtworks.qdox.model.JavaClass;
  +
   /**
    * A doclet tag representing the lifestyle assigned to the Type.
    *
  @@ -95,7 +96,6 @@
       public Version getVersion( boolean create )
       {
           final DocletTag tag = getJavaClass().getTagByName( getNS() + Tags.DELIMITER + KEY
);
  -        Version version = null;
           if( null != tag )
           {
               final String value = tag.getValue();
  @@ -105,7 +105,7 @@
               }
               else
               {
  -                final String error = 
  +                final String error =
                     "Tag " + getNS() + Tags.DELIMITER + KEY + "' does not contain a value.";
                   throw new IllegalArgumentException( error );
               }
  
  
  
  1.3       +23 -21    avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/tools/ant/MetaTask.java
  
  Index: MetaTask.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/tools/ant/MetaTask.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MetaTask.java	29 Mar 2003 10:13:36 -0000	1.2
  +++ MetaTask.java	16 Apr 2003 14:19:43 -0000	1.3
  @@ -49,25 +49,27 @@
   
   package org.apache.avalon.meta.tools.ant;
   
  -import com.thoughtworks.qdox.ant.AbstractQdoxTask;
  -import com.thoughtworks.qdox.model.JavaClass;
   import java.io.File;
  +import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.OutputStream;
  -import java.io.FileOutputStream;
  -import org.apache.avalon.meta.info.Type;
  +
   import org.apache.avalon.meta.info.Service;
  -import org.apache.avalon.meta.info.builder.TypeWriter;
  +import org.apache.avalon.meta.info.Type;
  +import org.apache.avalon.meta.info.builder.DefaultServiceBuilder;
  +import org.apache.avalon.meta.info.builder.DefaultTypeBuilder;
  +import org.apache.avalon.meta.info.builder.SerializedServiceWriter;
  +import org.apache.avalon.meta.info.builder.SerializedTypeWriter;
   import org.apache.avalon.meta.info.builder.ServiceWriter;
  -import org.apache.avalon.meta.info.builder.XMLTypeWriter;
  +import org.apache.avalon.meta.info.builder.TypeWriter;
   import org.apache.avalon.meta.info.builder.XMLServiceWriter;
  -import org.apache.avalon.meta.info.builder.SerializedTypeWriter;
  -import org.apache.avalon.meta.info.builder.SerializedServiceWriter;
  -import org.apache.avalon.meta.info.builder.DefaultTypeBuilder;
  -import org.apache.avalon.meta.info.builder.DefaultServiceBuilder;
  +import org.apache.avalon.meta.info.builder.XMLTypeWriter;
   import org.apache.avalon.meta.info.builder.tags.VersionTag;
   import org.apache.tools.ant.BuildException;
   
  +import com.thoughtworks.qdox.ant.AbstractQdoxTask;
  +import com.thoughtworks.qdox.model.JavaClass;
  +
   /**
    * Generate a meta info model from javadoc tags.
    *
  @@ -165,8 +167,8 @@
           validate();
   
           final String message =
  -          "Writing descriptors using '" 
  -          + getOutputDescription() 
  +          "Writing descriptors using '"
  +          + getOutputDescription()
             + "' format.";
           log( message );
   
  @@ -177,7 +179,7 @@
               Counter counter = writeMetaData();
               final String update =
                 "Processed " + counter.getTypes() + " Types and "
  -              + counter.getServices() + " Services from a total of " 
  +              + counter.getServices() + " Services from a total of "
                 + counter.getCount() + " classes.";
               log( update );
           }
  @@ -253,7 +255,7 @@
                   services++;
   
                   //
  -                // it is a service so we can fo ahead annd build a 
  +                // it is a service so we can fo ahead annd build a
                   // a service descriptor
                   //
   
  @@ -265,7 +267,7 @@
   
                   if( !m_force )
                   {
  -                    if( dest.exists() 
  +                    if( dest.exists()
                         && dest.lastModified() >= source.lastModified() )
                       {
                           continue;
  @@ -288,7 +290,7 @@
                   types++;
   
                   //
  -                // it is a type implementation so we can fo ahead and build a 
  +                // it is a type implementation so we can fo ahead and build a
                   // a type descriptor
                   //
   
  @@ -300,7 +302,7 @@
   
                   if( !m_force )
                   {
  -                    if( dest.exists() 
  +                    if( dest.exists()
                         && dest.lastModified() >= source.lastModified() )
                       {
                           continue;
  @@ -376,7 +378,7 @@
   
       /**
        * Return the correct info writer depending on
  -     * what format the info will be output as.  The 
  +     * what format the info will be output as.  The
        * implementation will return either a servialized
        * wtiter or an xml writer based on the format
        * established by the client.
  @@ -398,7 +400,7 @@
   
       /**
        * Return the correct service writer depending on
  -     * what format the service will be output as.  The 
  +     * what format the service will be output as.  The
        * implementation will return either a serial
        * wtiter or an xml writer based on the format
        * established by the client.
  @@ -497,7 +499,7 @@
       }
   
      /**
  -    * Internal utility class that aggregates the number of services, the  
  +    * Internal utility class that aggregates the number of services, the
       * number of types, and the total component count.
       */
       private class Counter
  
  
  

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


Mime
View raw message