dion        2003/03/30 15:29:45

  Modified:    src/plugins-build/jellydoc plugin.jelly
  Log:
  Explicity use ant name space. In prep for removal of jeez etc
  
  Revision  Changes    Path
  1.11      +21 -21    maven/src/plugins-build/jellydoc/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/jellydoc/plugin.jelly,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- plugin.jelly      30 Mar 2003 23:26:12 -0000      1.10
  +++ plugin.jelly      30 Mar 2003 23:29:45 -0000      1.11
  @@ -1,6 +1,7 @@
   <?xml version="1.0"?>
   
   <project
  +  xmlns:ant="jelly:ant"
     xmlns:j="jelly:core"
     xmlns:doc="doc">
   
  @@ -26,7 +27,7 @@
     <goal name="jellydoc" prereqs="jellydoc:doclet"
       description="Generates the tag documentation">
   
  -    <mkdir dir="${genDocs}"/>
  +    <ant:mkdir dir="${genDocs}"/>
   
       <j:file name="${genDocs}/tags.xml">
   
  @@ -51,35 +52,35 @@
         <j:set var="maven.jellydoc.packages" value="${pom.package}.*"/>
       </j:if>
   
  -    <echo>Generating jellydoc for packages ${maven.jellydoc.packages}</echo>
  +    <ant:echo>Generating jellydoc for packages ${maven.jellydoc.packages}</ant:echo>
   
  -    <mkdir dir="target"/>
  +    <ant:mkdir dir="target"/>
   
  -    <echo>Source directory is ${basedir}/${pom.build.sourceDirectory}</echo>
  +    <ant:echo>Source directory is ${basedir}/${pom.build.sourceDirectory}</ant:echo>
   
  -    <javadoc
  +    <ant:javadoc
         sourcepath="${basedir}/${pom.build.sourceDirectory}"
         packagenames="${maven.jellydoc.packages}"
         classpathref="doclet.classpath"
         docletpathref="doclet.classpath"
         doclet="org.apache.maven.jellydoc.TagXMLDoclet">
  -    </javadoc>
  +    </ant:javadoc>
   
       <!-- if ran inside the reactor then lets copy the generated file -->
  -    <copy tofile="${genDocs}/taglib.xml" file="${user.dir}/target/taglib.xml"/>
  +    <ant:copy tofile="${genDocs}/taglib.xml" file="${user.dir}/target/taglib.xml"/>
     </goal>
   
     <!-- runs the XML doclet -->
     <goal name="jellydoc:xml-doclet" prereqs="jellydoc:init"
       description="Creates an XML representation of the doclet information">
   
  -    <javadoc
  +    <ant:javadoc
         sourcepath="${basedir}/${pom.build.sourceDirectory}"
         packagenames="${pom.package}.*"
         classpathref="doclet.classpath"
         docletpathref="doclet.classpath"
         doclet="org.apache.maven.jellydoc.XMLDoclet">
  -    </javadoc>
  +    </ant:javadoc>
   
     </goal>
   
  @@ -91,19 +92,18 @@
         
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
   
       <!-- just in case this is ran before a compile -->
  -    <mkdir dir="${genDocs}"/>
  +    <ant:mkdir dir="${genDocs}"/>
   
  -    <path id="doclet.classpath">
  -      <path refid="maven.dependency.classpath"/>
  -      <pathelement path="${plugin.dir}"/>
  -      <pathelement path="${plugin.getDependencyPath('javadoc')}"/>
  -      <pathelement path="${plugin.getDependencyPath('nekohtml')}"/>
  -      <pathelement path="${plugin.getDependencyPath('dom4j')}"/>
  -      <pathelement path="${plugin.getDependencyPath('xerces')}"/>
  -      <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
  -      <pathelement path="${plugin.getDependencyPath('commons-jelly')}"/>
  -    </path>
  +    <ant:path id="doclet.classpath">
  +      <ant:path refid="maven.dependency.classpath"/>
  +      <ant:pathelement path="${plugin.dir}"/>
  +      <ant:pathelement path="${plugin.getDependencyPath('javadoc')}"/>
  +      <ant:pathelement path="${plugin.getDependencyPath('nekohtml')}"/>
  +      <ant:pathelement path="${plugin.getDependencyPath('dom4j')}"/>
  +      <ant:pathelement path="${plugin.getDependencyPath('xerces')}"/>
  +      <ant:pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
  +      <ant:pathelement path="${plugin.getDependencyPath('commons-jelly')}"/>
  +    </ant:path>
     </goal>
  -
   
   </project>
  
  
  

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

Reply via email to