ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/manifest ant-descriptor.template
Date Fri, 01 Mar 2002 02:13:36 GMT
adammurdoch    02/02/28 18:13:36

  Modified:    proposal/myrmidon antlib.xml build.xml
               proposal/myrmidon/src/java/org/apache/antlib/selftest
                        ExtensionsTest.java PrimitiveTypesTest.java
               proposal/myrmidon/src/java/org/apache/aut/nativelib
                        ExecManager.java
               proposal/myrmidon/src/java/org/apache/aut/vfs
                        FileSystemManager.java
               proposal/myrmidon/src/java/org/apache/myrmidon/aspects
                        NoopAspectHandler.java
               proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
                        ATIProjectBuilder.java DefaultProjectBuilder.java
               proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
                        ClassicConfigurer.java DefaultConfigurer.java
               proposal/myrmidon/src/java/org/apache/myrmidon/framework
                        Pattern.java
               proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/aspect
                        AspectManager.java
               proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/configurer
                        Configurer.java
               proposal/myrmidon/src/java/org/apache/myrmidon/listeners
                        ClassicProjectListener.java
                        DefaultProjectListener.java
                        NoPrefixProjectListener.java
               proposal/myrmidon/src/manifest ant-descriptor.template
  Log:
  * Reorganised build to use new <antlib-descriptor> task.
  * The "builtin" and "selftest" descriptors are now generated.
  * Fixed ant-descriptor.template to handle @ant:type tag properly.
  
  Submitted by Darrell DeBoer [darrell@apache.org]
  
  Revision  Changes    Path
  1.5       +20 -20    jakarta-ant/proposal/myrmidon/antlib.xml
  
  Index: antlib.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/antlib.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- antlib.xml	20 Feb 2002 11:31:52 -0000	1.4
  +++ antlib.xml	1 Mar 2002 02:13:35 -0000	1.5
  @@ -27,7 +27,6 @@
     <property name="gen.dir" value="${build.dir}/gen"/>
   
     <property name="antlib.name" value="NONAME"/>
  -  <property name="antlib.include" value="org/apache/antlib/${antlib.name}/**"/>
     <property name="antlib.descriptor" value="${antlib.name}-ant-descriptor.xml"/>
     <property name="antlib.role.descriptor" value="${antlib.name}-ant-roles.xml"/>
   
  @@ -40,36 +39,37 @@
     </path>
   
     <!-- Main target -->
  -  <target name="main" depends="jar" />
  +  <target name="main" depends="antlib-jar" />
   
  -  <target name="check-uptodate">
  -    <uptodate property="xdoclet.uptodate" targetfile="${gen.dir}/${antlib.descriptor}"
>
  -      <srcfiles dir= "${java.dir}" includes="${antlib.include}/*.java"/>
  -    </uptodate>
  +  <!-- Define the pattern which specifies file to include/exclude
  +       in this antlib. -->
  +  <target name="antlib-definition">
  +      <patternset id="antlib.include">
  +        <include name="org/apache/antlib/${antlib.name}/**"/>
  +      </patternset>
     </target>
   
     <!-- runs xdoclet if need be -->
  -  <target name="xdoclet" depends="check-uptodate" unless="xdoclet.uptodate">
  -    <taskdef name="xdoclet" classname="xdoclet.DocletTask" classpathref="project.class.path"/>
  -
  -    <xdoclet sourcepath="${java.dir}" destdir="${gen.dir}" classpathref="project.class.path">
  +  <target name="antlib-descriptors"
  +          depends="antlib-definition"
  +          unless="antlib-descriptors.omit">
  +    <antlib-descriptor libName="${antlib.name}"
  +                       destdir="${gen.dir}"
  +                       classpathref="project.class.path">
         <fileset dir="${java.dir}">
  -        <include name="${antlib.include}/*.java" />
  +        <patternset refid="antlib.include"/>
         </fileset>
  -      <template templateFile="${manifest.dir}/ant-descriptor.template"
  -                destinationfile="${antlib.descriptor}"/>
  -      <template templateFile="${manifest.dir}/ant-roles.template"
  -                destinationfile="${antlib.role.descriptor}"/>
  -    </xdoclet>
  +    </antlib-descriptor>
     </target>
   
  -  <!-- Creates the jars file -->
  -  <target name="jar" depends="xdoclet">
  +  <!-- Generate an "atl" jar file for this antlib. -->
  +  <target name="antlib-jar" depends="antlib-descriptors">
       <antlib-jar jarfile="${build.lib}/${antlib.name}.atl"
  -                basedir="${build.classes}"
                   descriptor="${gen.dir}/${antlib.descriptor}"
                   rolesDescriptor="${gen.dir}/${antlib.role.descriptor}">
  -      <include name="${antlib.include}" />
  +      <fileset dir="${build.classes}">
  +        <patternset refid="antlib.include"/>
  +      </fileset>
       </antlib-jar>
     </target>
   
  
  
  
  1.65      +109 -58   jakarta-ant/proposal/myrmidon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/build.xml,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- build.xml	1 Mar 2002 01:44:04 -0000	1.64
  +++ build.xml	1 Mar 2002 02:13:35 -0000	1.65
  @@ -184,14 +184,24 @@
   
     <!-- Compiles and installs the custom build tasks -->
     <target name="custom-tasks">
  -      <property name="custom-tasks-dir" value="${build.dir}/tasks"/>
  -      <mkdir dir="${custom-tasks-dir}"/>
  -      <javac srcdir="src/make" destdir="${custom-tasks-dir}">
  -          <classpath refid="project.class.path"/>
  -      </javac>
  -      <taskdef name="antlib-jar" classname="org.apache.myrmidon.build.AntlibJarTask">
  -          <classpath location="${custom-tasks-dir}"/>
  -      </taskdef>
  +    <property name="custom-tasks-dir" value="${build.dir}/tasks"/>
  +    <mkdir dir="${custom-tasks-dir}"/>
  +    <javac srcdir="src/make" destdir="${custom-tasks-dir}">
  +      <classpath refid="project.class.path"/>
  +    </javac>
  +    <copy file="${manifest.dir}/ant-descriptor.template" todir="${build.dir}/tasks"/>
  +    <copy file="${manifest.dir}/ant-roles.template" todir="${build.dir}/tasks"/>
  +
  +    <taskdef name="antlib-jar" classname="org.apache.myrmidon.build.AntlibJarTask">
  +      <classpath location="${custom-tasks-dir}"/>
  +    </taskdef>
  +
  +    <taskdef name="antlib-descriptor" classname="org.apache.myrmidon.build.AntlibDescriptorTask">
  +      <classpath>
  +        <pathelement location="${custom-tasks-dir}"/>
  +        <path refid="project.class.path"/>
  +      </classpath>
  +    </taskdef>
     </target>
   
     <!-- Compiles the source code -->
  @@ -302,23 +312,15 @@
   
     </target>
   
  -  <!-- Creates the jars file -->
  -  <target name="jars" depends="custom-tasks, compile">
  -
  +  <target name="jar-prepare" depends="custom-tasks, compile">
       <mkdir dir="${build.lib}"/>
   
  -    <jar jarfile="${build.lib}/myrmidon-launcher.jar"
  -         basedir="${build.classes}"
  -         manifest="${manifest.dir}/myrmidon-launcher.mf">
  +    <!-- Define the packaging for the various jars -->
  +    <patternset id="myrmidon-launcher.include">
         <include name="org/apache/myrmidon/launcher/*" />
  -    </jar>
  +    </patternset>
   
  -    <antlib-jar jarfile="${build.lib}/myrmidon-api.jar"
  -                basedir="${build.classes}"
  -                manifest="${manifest.dir}/myrmidon-api.mf"
  -                rolesDescriptor="${manifest.dir}/builtin-ant-roles.xml"
  -                descriptor="${manifest.dir}/builtin-ant-descriptor.xml"
  -                servicesDescriptor="${manifest.dir}/core-services.xml" >
  +    <patternset id="myrmidon-api.include">
         <include name="org/apache/myrmidon/api/*" />
         <include name="org/apache/myrmidon/aspects/*" />
         <include name="org/apache/myrmidon/converter/*" />
  @@ -327,34 +329,91 @@
         <include name="org/apache/myrmidon/framework/**" />
         <include name="org/apache/aut/**" />
         <include name="org/apache/tools/**" />
  -<!--      <include name="org/apache/myrmidon/*" />
  -      <include name="org/apache/myrmidon/components/**"/>
  -      <include name="org/apache/myrmidon/frontends/*" /> -->
  -    </antlib-jar>
  +    </patternset>
  +    
  +    <patternset id="myrmidon-container.include">
  +      <include name="org/apache/myrmidon/components/**" />
  +      <include name="org/apache/myrmidon/frontends/*" />
  +      <include name="org/apache/myrmidon/*" />
  +    </patternset>
   
  -<!--
  -    <jar jarfile="${build.lib}/myrmidon-framework.jar"
  -         basedir="${build.classes}"
  -         manifest="${manifest.dir}/myrmidon-framework.mf">
  -      <include name="org/apache/myrmidon/framework/**" />
  +    <patternset id="selftest.include">
  +      <include name="org/apache/antlib/selftest/**" />
  +      <exclude name="org/apache/antlib/selftest/extension1/**" />
  +    </patternset>
   
  -      <zipfileset dir="${manifest.dir}" fullpath="META-INF/ant-roles.xml">
  -        <include name="builtin-ant-roles.xml"/>
  -      </zipfileset>
  -
  -      <zipfileset dir="${manifest.dir}" fullpath="META-INF/ant-descriptor.xml">
  -        <include name="builtin-ant-descriptor.xml"/>
  -      </zipfileset>
  +    <patternset id="selftest-extension1.include">
  +       <include name="org/apache/antlib/selftest/extension1/**" />
  +    </patternset>
  +  </target>
  +
  +  <!-- The generation of the descriptor is kept separated from the packaging
  +       of the jars, since jarring is fast and XDoclet is pretty slow.-->
  +  <target name="antlib-descriptors"
  +          depends="jar-prepare"
  +          unless="antlib-descriptors.omit"
  +          description="Generates Antlib descriptors using XDoclet.">
  +
  +    <!-- The "builtin" descriptors include metainfo for both
  +         myrmidon-api and myrmidon-container jars.
  +         (Packaged with myrmidon-api.jar). -->
  +    <antlib-descriptor libName="builtin"
  +                       destdir="${gen.dir}"
  +                       classpathref="project.class.path">
  +      <fileset dir="${java.dir}">
  +        <patternset refid="myrmidon-api.include"/>
  +        <patternset refid="myrmidon-container.include"/>
  +      </fileset>
  +    </antlib-descriptor>
  +
  +    <antlib-descriptor libName="selftest"
  +                       destdir="${gen.dir}"
  +                       classpathref="project.class.path">
  +      <fileset dir="${java.dir}">
  +        <patternset refid="selftest.include"/>
  +      </fileset>
  +    </antlib-descriptor>
  +  </target>
  +
  +  <!-- Package the jar files -->
  +  <target name="jars" depends="antlib-descriptors">
  +
  +    <jar jarfile="${build.lib}/myrmidon-launcher.jar"
  +         basedir="${build.classes}"
  +         manifest="${manifest.dir}/myrmidon-launcher.mf">
  +        <patternset refid="myrmidon-launcher.include"/>
       </jar>
  --->
  +
       <jar jarfile="${build.lib}/myrmidon-container.jar"
            basedir="${build.classes}"
            manifest="${manifest.dir}/myrmidon-container.mf">
  -      <include name="org/apache/myrmidon/components/**" />
  -      <include name="org/apache/myrmidon/frontends/*" />
  -      <include name="org/apache/myrmidon/*" />
  +        <patternset refid="myrmidon-container.include"/>
  +    </jar>
  +
  +    <antlib-jar jarfile="${build.lib}/myrmidon-api.jar"
  +                basedir="${build.classes}"
  +                manifest="${manifest.dir}/myrmidon-api.mf"
  +                rolesDescriptor="${gen.dir}/builtin-ant-roles.xml"
  +                descriptor="${gen.dir}/builtin-ant-descriptor.xml"
  +                servicesDescriptor="${manifest.dir}/core-services.xml" >
  +      <patternset refid="myrmidon-api.include"/>
  +    </antlib-jar>
  +
  +    <antlib-jar jarfile="${build.lib}/selftest.atl"
  +                basedir="${build.classes}"
  +                manifest="${manifest.dir}/selftest.mf"
  +                descriptor="${gen.dir}/selftest-ant-descriptor.xml"
  +                rolesDescriptor="${gen.dir}/selftest-ant-roles.xml">
  +      <patternset refid="selftest.include"/>
  +    </antlib-jar>
  +
  +    <jar jarfile="${build.lib}/selftest-extension1.jar"
  +         basedir="${build.classes}"
  +         manifest="${manifest.dir}/selftest-extension1.mf">
  +      <patternset refid="selftest-extension1.include" />
       </jar>
   
  +    <!-- Simple cases handled by antlib.xml -->
       <ant antfile="antlib.xml">
         <property name="antlib.name" value="core"/>
       </ant>
  @@ -390,22 +449,6 @@
       <ant antfile="antlib.xml">
         <property name="antlib.name" value="vfile"/>
       </ant>
  -
  -    <antlib-jar jarfile="${build.lib}/selftest.atl"
  -         basedir="${build.classes}"
  -         manifest="${manifest.dir}/selftest.mf"
  -         descriptor="${manifest.dir}/selftest-ant-descriptor.xml"
  -         rolesDescriptor="${manifest.dir}/empty-roles.xml">
  -      <include name="org/apache/antlib/selftest/**" />
  -      <exclude name="org/apache/antlib/selftest/extension1/**" />
  -    </antlib-jar>
  -
  -    <jar jarfile="${build.lib}/selftest-extension1.jar"
  -         basedir="${build.classes}"
  -         manifest="${manifest.dir}/selftest-extension1.mf">
  -      <include name="org/apache/antlib/selftest/extension1/**" />
  -    </jar>
  -
     </target>
   
     <!-- Compiles and runs the unit tests -->
  @@ -487,7 +530,9 @@
     </target>
   
     <!-- Creates the distribution -->
  -  <target name="dist-lite" depends="jars">
  +  <target name="dist-lite" 
  +          depends="jars"
  +          description="Generates a minimal working distribution.">
   
       <mkdir dir="${dist.bin}"/>
       <mkdir dir="${dist.lib}"/>
  @@ -527,6 +572,12 @@
       <fixcrlf srcdir="${dist.bin}" eol="lf" includes="**/*.sh" />
       <fixcrlf srcdir="${dist.bin}" eol="lf" includes="ant" />
   
  +  </target>
  +
  +  <target name="dist-extralite" 
  +          description="A faster version of dist-lite (no XDoclet).">
  +      <property name="antlib-descriptors.omit" value="true"/>
  +      <antcall target="dist-lite"/>
     </target>
   
     <!-- Creates the distribution -->
  
  
  
  1.5       +1 -0      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/selftest/ExtensionsTest.java
  
  Index: ExtensionsTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/selftest/ExtensionsTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExtensionsTest.java	7 Feb 2002 11:51:32 -0000	1.4
  +++ ExtensionsTest.java	1 Mar 2002 02:13:35 -0000	1.5
  @@ -15,6 +15,7 @@
    * This is to test whether extension is loaded.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  + * @ant:task name="extensions-test"
    */
   public class ExtensionsTest
       extends AbstractTask
  
  
  
  1.3       +1 -0      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java
  
  Index: PrimitiveTypesTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PrimitiveTypesTest.java	23 Dec 2001 06:24:52 -0000	1.2
  +++ PrimitiveTypesTest.java	1 Mar 2002 02:13:35 -0000	1.3
  @@ -14,6 +14,7 @@
    * Test conversion of all the primitive types.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  + * @ant:task name="prim-test"
    */
   public class PrimitiveTypesTest
       extends AbstractTask
  
  
  
  1.3       +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecManager.java
  
  Index: ExecManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExecManager.java	2 Feb 2002 06:38:07 -0000	1.2
  +++ ExecManager.java	1 Mar 2002 02:13:35 -0000	1.3
  @@ -27,7 +27,8 @@
    * </ul>
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.2 $ $Date: 2002/02/02 06:38:07 $
  + * @version $Revision: 1.3 $ $Date: 2002/03/01 02:13:35 $
  + * @ant:role shorthand="exec-manager"
    */
   public interface ExecManager
   {
  
  
  
  1.5       +1 -0      jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/FileSystemManager.java
  
  Index: FileSystemManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/FileSystemManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FileSystemManager.java	21 Feb 2002 11:06:42 -0000	1.4
  +++ FileSystemManager.java	1 Mar 2002 02:13:35 -0000	1.5
  @@ -50,6 +50,7 @@
    * </ul>
    *
    * @author Adam Murdoch
  + * @ant:role shorthand="file-system-manager"
    */
   public interface FileSystemManager
   {
  
  
  
  1.5       +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/aspects/NoopAspectHandler.java
  
  Index: NoopAspectHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/aspects/NoopAspectHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NoopAspectHandler.java	7 Feb 2002 13:02:31 -0000	1.4
  +++ NoopAspectHandler.java	1 Mar 2002 02:13:35 -0000	1.5
  @@ -11,7 +11,8 @@
    * A Noop aspect handler that does nothing.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.4 $ $Date: 2002/02/07 13:02:31 $
  + * @version $Revision: 1.5 $ $Date: 2002/03/01 02:13:35 $
  + * @ant:type type="aspect" name="noop"
    */
   public class NoopAspectHandler
       extends AbstractAspectHandler
  
  
  
  1.11      +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java
  
  Index: ATIProjectBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ATIProjectBuilder.java	7 Feb 2002 13:02:19 -0000	1.10
  +++ ATIProjectBuilder.java	1 Mar 2002 02:13:35 -0000	1.11
  @@ -28,7 +28,8 @@
    * Default implementation to construct project from a build file.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.10 $ $Date: 2002/02/07 13:02:19 $
  + * @version $Revision: 1.11 $ $Date: 2002/03/01 02:13:35 $
  + * @ant:type type="project-builder" name="ati"
    */
   public class ATIProjectBuilder
       extends DefaultProjectBuilder
  
  
  
  1.33      +3 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
  
  Index: DefaultProjectBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- DefaultProjectBuilder.java	18 Feb 2002 09:02:10 -0000	1.32
  +++ DefaultProjectBuilder.java	1 Mar 2002 02:13:35 -0000	1.33
  @@ -34,7 +34,9 @@
    * Default implementation to construct project from a build file.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.32 $ $Date: 2002/02/18 09:02:10 $
  + * @version $Revision: 1.33 $ $Date: 2002/03/01 02:13:35 $
  + * @ant:type type="project-builder" name="xml"
  + * @ant:type type="project-builder" name="ant"
    */
   public class DefaultProjectBuilder
       extends AbstractLogEnabled
  
  
  
  1.7       +1 -0      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java
  
  Index: ClassicConfigurer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ClassicConfigurer.java	25 Feb 2002 10:42:43 -0000	1.6
  +++ ClassicConfigurer.java	1 Mar 2002 02:13:35 -0000	1.7
  @@ -30,6 +30,7 @@
    * Class used to configure tasks.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  + * @ant:type type="configurer" name="classic"
    */
   public class ClassicConfigurer
       extends AbstractLogEnabled
  
  
  
  1.33      +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
  
  Index: DefaultConfigurer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- DefaultConfigurer.java	25 Feb 2002 10:42:43 -0000	1.32
  +++ DefaultConfigurer.java	1 Mar 2002 02:13:35 -0000	1.33
  @@ -33,7 +33,8 @@
    * Class used to configure tasks.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.32 $ $Date: 2002/02/25 10:42:43 $
  + * @version $Revision: 1.33 $ $Date: 2002/03/01 02:13:35 $
  + * @ant:type type="configurer" name="default"
    */
   public class DefaultConfigurer
       extends AbstractLogEnabled
  
  
  
  1.16      +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
  
  Index: Pattern.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Pattern.java	7 Feb 2002 13:01:02 -0000	1.15
  +++ Pattern.java	1 Mar 2002 02:13:35 -0000	1.16
  @@ -16,7 +16,8 @@
    * Basic data type for holding patterns.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.15 $ $Date: 2002/02/07 13:01:02 $
  + * @version $Revision: 1.16 $ $Date: 2002/03/01 02:13:35 $
  + * @ant:data-type name="pattern"
    */
   public class Pattern
       implements DataType
  
  
  
  1.7       +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/aspect/AspectManager.java
  
  Index: AspectManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/aspect/AspectManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AspectManager.java	21 Feb 2002 11:06:40 -0000	1.6
  +++ AspectManager.java	1 Mar 2002 02:13:36 -0000	1.7
  @@ -13,10 +13,10 @@
   import org.apache.myrmidon.aspects.AspectHandler;
   
   /**
  - * Manage and propogate Aspects.
  + * Manage and propogate Aspects..
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.6 $ $Date: 2002/02/21 11:06:40 $
  + * @version $Revision: 1.7 $ $Date: 2002/03/01 02:13:36 $
    */
   public interface AspectManager
       extends AspectHandler
  
  
  
  1.8       +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/configurer/Configurer.java
  
  Index: Configurer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/configurer/Configurer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Configurer.java	25 Feb 2002 10:42:44 -0000	1.7
  +++ Configurer.java	1 Mar 2002 02:13:36 -0000	1.8
  @@ -15,7 +15,8 @@
    * Class used to configure tasks.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.7 $ $Date: 2002/02/25 10:42:44 $
  + * @version $Revision: 1.8 $ $Date: 2002/03/01 02:13:36 $
  + * @ant:role shorthand="configurer"
    */
   public interface Configurer
   {
  
  
  
  1.9       +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ClassicProjectListener.java
  
  Index: ClassicProjectListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ClassicProjectListener.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ClassicProjectListener.java	14 Feb 2002 10:53:54 -0000	1.8
  +++ ClassicProjectListener.java	1 Mar 2002 02:13:36 -0000	1.9
  @@ -14,7 +14,8 @@
    * Classic listener that emulates the default ant1.x listener.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.8 $ $Date: 2002/02/14 10:53:54 $
  + * @version $Revision: 1.9 $ $Date: 2002/03/01 02:13:36 $
  + * @ant:type type="listener" name="classic"
    */
   public class ClassicProjectListener
       extends AbstractProjectListener
  
  
  
  1.12      +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java
  
  Index: DefaultProjectListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultProjectListener.java	14 Feb 2002 10:53:54 -0000	1.11
  +++ DefaultProjectListener.java	1 Mar 2002 02:13:36 -0000	1.12
  @@ -11,7 +11,8 @@
    * Default listener that emulates the Ant 1.x no banner listener.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.11 $ $Date: 2002/02/14 10:53:54 $
  + * @version $Revision: 1.12 $ $Date: 2002/03/01 02:13:36 $
  + * @ant:type type="listener" name="default"
    */
   public class DefaultProjectListener
       extends ClassicProjectListener
  
  
  
  1.3       +3 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java
  
  Index: NoPrefixProjectListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NoPrefixProjectListener.java	14 Feb 2002 10:53:54 -0000	1.2
  +++ NoPrefixProjectListener.java	1 Mar 2002 02:13:36 -0000	1.3
  @@ -11,8 +11,9 @@
    * A project listener that emulated the Ant 1.x -emacs mode.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.2 $ $Date: 2002/02/14 10:53:54 $
  - */
  + * @version $Revision: 1.3 $ $Date: 2002/03/01 02:13:36 $
  + * @ant:type type="listener" name="noprefix"
  +  */
   public class NoPrefixProjectListener
       extends DefaultProjectListener
   {
  
  
  
  1.4       +4 -4      jakarta-ant/proposal/myrmidon/src/manifest/ant-descriptor.template
  
  Index: ant-descriptor.template
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/manifest/ant-descriptor.template,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ant-descriptor.template	27 Feb 2002 11:38:35 -0000	1.3
  +++ ant-descriptor.template	1 Mar 2002 02:13:36 -0000	1.4
  @@ -18,10 +18,10 @@
         </XDtClass:ifHasClassTag>
       </XDtClass:forAllClasses>
   
  -    <XDtClass:forAllClasses>
  -      <XDtClass:forAllClassTags tagName="ant:type">
  -        <<XDtClass:classTagValue tagName="ant:type" paramName="type"/>
  -          name="<XDtClass:classTagValue tagName="ant:type" paramName="name"/>"
  +    <XDtClass:forAllClasses extent="concrete-type">
  +      <XDtClass:forAllClassTags tagName="ant:type" superclasses="false">
  +        <<XDtClass:classTagValue tagName="ant:type" paramName="type" superclasses="false"/>
  +          name="<XDtClass:classTagValue tagName="ant:type" paramName="name" superclasses="false"/>"
             classname="<XDtClass:fullClassName/>" />
         </XDtClass:forAllClassTags>
       </XDtClass:forAllClasses>
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message