avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-plugin plugin.jelly plugin.properties
Date Mon, 16 Jun 2003 08:32:04 GMT
mcconnell    2003/06/16 01:32:04

  Modified:    merlin/merlin-plugin plugin.jelly plugin.properties
  Log:
  Update ant task classpath defintion.
  
  Revision  Changes    Path
  1.10      +5 -5      avalon-sandbox/merlin/merlin-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/plugin.jelly,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- plugin.jelly	15 Jun 2003 18:30:51 -0000	1.9
  +++ plugin.jelly	16 Jun 2003 08:32:03 -0000	1.10
  @@ -17,11 +17,11 @@
   
     <taskdef name="meta" classname="org.apache.avalon.meta.tools.ant.MetaTask">
       <classpath>
  +      <pathelement path="${plugin.getDependencyPath('qdox:qdox')}"/>
  +      <pathelement path="${plugin.getDependencyPath('avalon-framework:avalon-framework')}"/>
         <pathelement path="${plugin.getDependencyPath('avalon:avalon-meta-tools')}"/>
         <pathelement path="${plugin.getDependencyPath('avalon:avalon-meta-spi')}"/>
         <pathelement path="${plugin.getDependencyPath('avalon:avalon-meta')}"/>
  -      <pathelement path="${plugin.getDependencyPath('avalon:avalon-framework')}"/>
  -      <pathelement path="${plugin.getDependencyPath('qdox:qdox')}"/>
       </classpath>
     </taskdef>
   
  @@ -35,12 +35,12 @@
   
     <goal name="merlin:meta" 
       description="Generate meta info descriptors based on meta tags declared in Java source
files for inclusion in a jar file.">
  -    <echo>meta source dir: ${maven.src.dir}</echo>
  -    <echo>meta dest dir: ${maven.build.dest}</echo>
       <mkdir dir="${maven.build.dest}"/>
       <meta destDir="${maven.build.dest}" 
           format="${merlin.meta.format}" 
  -        force="${merlin.meta.force}">
  +        force="${merlin.meta.force}"
  +        postfix="${merlin.meta.type.postfix}"
  +        >
         <fileset dir="${maven.src.dir}/java">
           <include name="**/*.java"/>
         </fileset>
  
  
  
  1.3       +9 -1      avalon-sandbox/merlin/merlin-plugin/plugin.properties
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/plugin.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.properties	8 May 2003 03:02:40 -0000	1.2
  +++ plugin.properties	16 Jun 2003 08:32:03 -0000	1.3
  @@ -6,7 +6,7 @@
   
   #
   # Policy controlling the regeneration of meta descriptors independently
  -# of the descriptor data.  This value default to false.  
  +# of the descriptor data.  This value defaults to false.  
   #
   merlin.meta.force=false
   
  @@ -18,6 +18,14 @@
   # default XML format is more portable.
   #
   merlin.meta.format=xml
  +
  +#
  +# When generating type descriptors, Merlin recognizes both <classname>.xinfo
  +# and <classname>.xtype. The .xtype postfix is used in situations where 
  +# developers want to generate both Merlin and Phoenix descriptors. The 
  +# value default to xinfo.
  +#
  +merlin.meta.type.postfix=xinfo
   
   
   
  
  
  

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


Mime
View raw message