hammant     2002/11/05 14:29:17

  Modified:    demo     build.xml
  Log:
  xdoclet got rid of
  
  Revision  Changes    Path
  1.71      +20 -63    jakarta-avalon-apps/demo/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/demo/build.xml,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- build.xml 5 Nov 2002 22:13:02 -0000       1.70
  +++ build.xml 5 Nov 2002 22:29:17 -0000       1.71
  @@ -22,7 +22,7 @@
     <!-- Set the properties for intermediate directory -->
     <property name="build.dir" value="build"/>
     <property name="build.lib" value="${build.dir}/lib"/>
  -  <property name="build.xdoclet" value="${build.dir}/xdoclet"/>
  +  <property name="build.metagenerate" value="${build.dir}/metagenerate"/>
     <property name="build.src" value="${build.dir}/src"/>
     <property name="build.classes" value="${build.dir}/classes"/>
     <property name="build.javadocs" value="${build.dir}/javadocs"/>
  @@ -124,69 +124,26 @@
     </target>
   
     <!-- Make .xinfo and manifest automatically for blocks -->
  -  <target name="phoenix-xdoclet" depends="compile">
  +  <target name="phoenix-metagenerate" depends="compile">
     
  -    <mkdir dir="${build.xdoclet}"/>
  +    <mkdir dir="${build.metagenerate}"/>
     
  -    <taskdef name="phoenix-blocks"
  -             
classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet"
  -             classpathref="project.class.path"/>
  -
  -    <phoenix-blocks
  -        destdir="${build.xdoclet}"
  -        classpathref="project.class.path">
  -      <fileset dir="${java.dir}">
  -        <include name="org/apache/avalon/apps/demos/helloworldserver/*" />
  -      </fileset>
  -      <blockinfo/>
  -      <mxinfo/>
  -    </phoenix-blocks>
  -
  -    <phoenix-blocks
  -        destdir="${build.xdoclet}"
  -        classpathref="project.class.path">
  -      <fileset dir="${java.dir}">
  -        <include name="org/apache/avalon/apps/demos/soaphelloworldserver/*" 
/>
  -      </fileset>
  -      <blockinfo/>
  -      <mxinfo/>
  -    </phoenix-blocks>
  -    
  -    <phoenix-blocks
  -        destdir="${build.xdoclet}"
  -        classpathref="project.class.path">
  -      <fileset dir="${java.dir}">
  -        <include name="org/apache/avalon/apps/demos/rmihelloworldserver/*" />
  -      </fileset>
  -      <blockinfo/>
  -      <mxinfo/>
  -    </phoenix-blocks>
  -    
  -    <phoenix-blocks
  -        destdir="${build.xdoclet}"
  -        classpathref="project.class.path">
  -      <fileset dir="${java.dir}">
  -        <include 
name="org/apache/avalon/apps/demos/altrmihelloworldserver/*" />
  -      </fileset>
  -      <blockinfo/>
  -      <mxinfo/>
  -    </phoenix-blocks>
  -
  -    <phoenix-blocks
  -        destdir="${build.xdoclet}"
  -        classpathref="project.class.path">
  +    <taskdef name="generatemeta" 
classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
  +      <classpath refid="project.class.path" />
  +    </taskdef>
  +
  +    <mkdir dir="${build.metagenerate}"/>
  +
  +    <generatemeta dest="${build.metagenerate}">
         <fileset dir="${java.dir}">
  -        <include name="org/apache/avalon/apps/demos/lifecycledemo/*" />
  +        <include name="**/*.java" />
         </fileset>
  -      <blockinfo/>
  -      <mxinfo/>
  -    </phoenix-blocks>
  -
  +    </generatemeta>
       
     </target>
   
     <!-- Jars up project -->
  -  <target name="jars" depends="phoenix-xdoclet">
  +  <target name="jars" depends="phoenix-metagenerate">
   
       <mkdir dir="${build.lib}"/>
   
  @@ -194,7 +151,7 @@
            basedir="${build.classes}">
   
         <include name="org/apache/avalon/apps/demos/helloworldserver/*"/>
  -      <fileset dir="${build.xdoclet}">
  +      <fileset dir="${build.metagenerate}">
           <include 
name="org/apache/avalon/apps/demos/helloworldserver/*.xinfo"/>
           <include 
name="org/apache/avalon/apps/demos/helloworldserver/*.mxinfo"/>
         </fileset>
  @@ -203,7 +160,7 @@
       <jar jarfile="${build.lib}/demo-soaphelloworld.jar"
            basedir="${build.classes}">
         <include name="org/apache/avalon/apps/demos/soaphelloworldserver/*"/>
  -      <fileset dir="${build.xdoclet}">
  +      <fileset dir="${build.metagenerate}">
           <include 
name="org/apache/avalon/apps/demos/soaphelloworldserver/*.xinfo"/>
           <include 
name="org/apache/avalon/apps/demos/soaphelloworldserver/*.mxinfo"/>
         </fileset>
  @@ -212,7 +169,7 @@
       <jar jarfile="${build.lib}/demo-rmihelloworld.jar"
            basedir="${build.classes}">
         <include name="org/apache/avalon/apps/demos/rmihelloworldserver/*"/>
  -      <fileset dir="${build.xdoclet}">
  +      <fileset dir="${build.metagenerate}">
           <include 
name="org/apache/avalon/apps/demos/rmihelloworldserver/*.xinfo"/>
           <include 
name="org/apache/avalon/apps/demos/rmihelloworldserver/*.mxinfo"/>
         </fileset>
  @@ -223,7 +180,7 @@
         <fileset dir="${build.classes}">
           <include 
name="org/apache/avalon/apps/demos/altrmihelloworldserver/*"/>
         </fileset>
  -      <fileset dir="${build.xdoclet}">
  +      <fileset dir="${build.metagenerate}">
           <include 
name="org/apache/avalon/apps/demos/altrmihelloworldserver/*.xinfo"/>
           <include 
name="org/apache/avalon/apps/demos/altrmihelloworldserver/*.mxinfo"/>
         </fileset>
  @@ -240,7 +197,7 @@
            basedir="${build.classes}">
   
         <include name="org/apache/avalon/apps/demos/lifecycledemo/*"/>
  -      <fileset dir="${build.xdoclet}">
  +      <fileset dir="${build.metagenerate}">
           <include name="org/apache/avalon/apps/demos/lifecycledemo/*.xinfo"/>
           <include name="org/apache/avalon/apps/demos/lifecycledemo/*.mxinfo"/>
         </fileset>
  @@ -544,8 +501,8 @@
         <fileset dir="${src.dir}"/>
       </copy>
   
  -    <zip zipfile="${src.dist.src}/generated-by-xdoclet.zip"
  -         basedir="${build.xdoclet}"/>
  +    <zip zipfile="${src.dist.src}/generated-by-metagenerate.zip"
  +         basedir="${build.metagenerate}"/>
   
       <copy todir="${src.dist.dir}">
         <fileset dir=".">
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to