commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject cvs commit: jakarta-commons-sandbox/jelly maven.xml
Date Mon, 22 Jul 2002 11:15:52 GMT
jstrachan    2002/07/22 04:15:51

  Modified:    jelly/src/java/org/apache/commons/jelly Jelly.java
               jelly/src/script makeTagDoc.jelly
               jelly    maven.xml
  Log:
  patched the tag generation mechanism so that the HTML documentation in the javadoc appears
nicely in the generated tag reference.
  
  Revision  Changes    Path
  1.12      +13 -16    jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java
  
  Index: Jelly.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Jelly.java	23 May 2002 23:53:42 -0000	1.11
  +++ Jelly.java	22 Jul 2002 11:15:51 -0000	1.12
  @@ -108,17 +108,14 @@
           
           Jelly jelly = new Jelly();
           jelly.setScript(args[0]);
  -        /*
  -                // later we might wanna add some command line arguments 
  -                // checking stuff using commons-cli to specify the output file
  -                // and input file via command line arguments
  -          
  -                Writer writer = ( args.length > 1 ) 
  -                    ? new FileWriter( args[1] ) 
  -                    : new OutputStreamWriter( System.out );
  -                BufferedWriter output = new BufferedWriter( writer );
  -        */
  -        Writer writer = new BufferedWriter(new OutputStreamWriter(System.out));
  +
  +        // later we might wanna add some command line arguments 
  +        // checking stuff using commons-cli to specify the output file
  +        // and input file via command line arguments
  +        Writer writer = ( args.length > 1 ) 
  +            ? new FileWriter( args[1] ) 
  +            : new OutputStreamWriter( System.out );
  +        
           Script script = jelly.compileScript();
           XMLOutput output = XMLOutput.createXMLOutput(writer);
           
  
  
  
  1.5       +7 -0      jakarta-commons-sandbox/jelly/src/script/makeTagDoc.jelly
  
  Index: makeTagDoc.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/script/makeTagDoc.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- makeTagDoc.jelly	22 Jul 2002 08:29:05 -0000	1.4
  +++ makeTagDoc.jelly	22 Jul 2002 11:15:51 -0000	1.5
  @@ -21,6 +21,13 @@
     <jsl:template match="versiontag"/>
   
     <!-- let other text and elements pass through via default rules-->
  +  <jsl:template match="*">
  +    <jsl:copy>
  +      <jsl:applyTemplates/>
  +    </jsl:copy>
  +  </jsl:template>
  +  
  +  <jsl:template match="@*"/>
   </jsl:stylesheet>
   
   <document>
  
  
  
  1.18      +11 -4     jakarta-commons-sandbox/jelly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/maven.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- maven.xml	22 Jul 2002 10:47:23 -0000	1.17
  +++ maven.xml	22 Jul 2002 11:15:51 -0000	1.18
  @@ -17,7 +17,7 @@
     </goal>
   
     <!-- runs the XML doclet -->  
  -  <goal name="xml-doclet" prereqs="java:compile">
  +  <goal name="doclet:xml" prereqs="java:compile">
       <path id="doclet.classpath">
         <pathelement path="${maven.build.dest}"/>
         <path refid="maven.dependency.classpath"/>
  @@ -32,7 +32,7 @@
     </goal>
   
     <!-- runs the Tag doclet -->  
  -  <goal name="tag-doclet" prereqs="java:compile">
  +  <goal name="doclet:tag" prereqs="java:compile">
       <path id="doclet.classpath">
         <pathelement path="target/classes"/>
         <pathelement path="${maven.build.dest}"/>
  @@ -48,13 +48,20 @@
     </goal>
   	
     <!-- creates the XML webpage from the tag XML information -->		
  -  <goal name="doc-tags" prereqs="tag-doclet, jelly-task" 
  +  <goal name="doc:tags" prereqs="doclet:tag, jelly-task" 
   	description="Generates the tag documentation">
   	
   	<mkdir dir="target/generated-xdocs"/>
   
  +<!--      
   	<jelly file="src/script/makeTagDoc.jelly" 
   		   output="target/generated-xdocs/tags.xml"/> 
  +-->	
  +    <java classname="org.apache.commons.jelly.Jelly" fork="yes">
  +      <classpath refid="test.classpath"/>
  +      <arg value="src/script/makeTagDoc.jelly"/> 
  +      <arg value="target/generated-xdocs/tags.xml"/> 
  +    </java>
     </goal>
   
   
  @@ -62,7 +69,7 @@
     <preGoal
       name="site:generate">
   
  -    <attainGoal name="doc-tags"/>
  +    <attainGoal name="doc:tags"/>
     
     </preGoal>
   
  
  
  

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


Mime
View raw message