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/jelly/src/script makeTagDoc.jelly
Date Fri, 07 Feb 2003 17:16:38 GMT
jstrachan    2003/02/07 09:16:38

  Modified:    jelly    maven.xml project.xml
  Removed:     jelly/src/java/org/apache/commons/jelly/util
                        TagXMLDoclet.java XMLDoclet.java
               jelly/src/script makeTagDoc.jelly
  Log:
  removed the old doclet for generating documentation - this has migrated over to the jellydoc
plugin for maven.
  
  almost got the new website build working - so we can nearly build the whole site & all
the libraries. Nearly there...
  
  Revision  Changes    Path
  1.60      +115 -69   jakarta-commons/jelly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/maven.xml,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- maven.xml	31 Jan 2003 02:51:43 -0000	1.59
  +++ maven.xml	7 Feb 2003 17:16:37 -0000	1.60
  @@ -1,71 +1,5 @@
   <project default="java:jar" xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:util="jelly:util">
   
  -  <!-- define the classpath used to run examples -->
  -  <goal name="create-classpath" prereqs="java:compile,test:compile">
  -		<path id="test.classpath">
  -			<pathelement path="${maven.build.dest}"/>
  -			<pathelement path="target/classes"/>
  -			<pathelement path="target/test-classes"/>
  -			<path refid="maven.dependency.classpath"/>
  -		</path>
  -  </goal>
  -
  -  <!-- runs the XML doclet -->
  -  <goal name="doclet:xml" prereqs="java:compile">
  -    <path id="doclet.classpath">
  -      <pathelement path="${maven.build.dest}"/>
  -      <path refid="maven.dependency.classpath"/>
  -    </path>
  -
  -    <javadoc
  -      sourcepath="src/java"
  -      packagenames="org.apache.commons.jelly.tags.*"
  -      doclet="org.apache.commons.jelly.util.XMLDoclet"
  -      docletpathref="doclet.classpath">
  -    </javadoc>
  -  </goal>
  -
  -  <!-- runs the Tag doclet -->
  -  <goal name="doclet:tag" prereqs="java:compile">
  -    <path id="doclet.classpath">
  -      <pathelement path="target/classes"/>
  -      <pathelement path="${maven.build.dest}"/>
  -      <path refid="maven.dependency.classpath"/>
  -    </path>
  -
  -    <javadoc
  -      sourcepath="src/java"
  -      packagenames="org.apache.commons.jelly.tags.*"
  -      doclet="org.apache.commons.jelly.util.TagXMLDoclet"
  -      docletpathref="doclet.classpath">
  -    </javadoc>
  -  </goal>
  -
  -  <!-- creates the XML webpage from the tag XML information -->
  -  <goal name="doc:tags" prereqs="doclet:tag, create-classpath"
  -		description="Generates the tag documentation">
  -
  -		<mkdir dir="target/generated-xdocs"/>
  -
  -    <java classname="org.apache.commons.jelly.Jelly" fork="yes">
  -      <classpath refid="test.classpath"/>
  -      <arg value="src/script/makeTagDoc.jelly"/>
  -      <arg value="-o"/>
  -      <arg value="target/generated-xdocs/tags.xml"/>
  -    </java>
  -  </goal>
  -
  -
  -  <!-- ensure that the tag documentation is generated as part of the site -->
  -  <preGoal
  -    name="site:generate">
  -
  -    <attainGoal name="doc:tags"/>
  -
  -  </preGoal>
  -
  -
  -
     <!-- create the lib and bin directories in the binary distro -->
     <preGoal name="dist:build">
   
  @@ -101,7 +35,7 @@
   
     <!-- TAG LIBS BUILD -->
     <goal 
  -    name="tags-build"
  +    name="tags:build"
       description="Build each tag into an installable jar">
   
       <maven:reactor
  @@ -112,9 +46,24 @@
         ignoreFailures="false"/>
     </goal>
   
  +	<!-- TAG DOCUMENTATION -->
  +  <goal 
  +    name="tags:doc"
  +    description="Build the documentation for each tag library">
  +
  +    <j:set var="maven.jellydoc.packages" value="org.apache.commons.jelly.*"/>
  +    
  +    <maven:reactor
  +      basedir="jelly-tags"
  +      includes="*/project.xml"
  +      goals="jellydoc,xdoc"
  +      banner="Building tag"
  +      ignoreFailures="false"/>
  +  </goal>
  +
     <!-- Do the same goal on all Tag Libs -->
     <goal 
  -    name="tags-do"
  +    name="tags:do"
       description="Do a specific goal on each taglib">
   
       <maven:reactor
  @@ -125,6 +74,7 @@
         ignoreFailures="false"/>
     </goal>
   
  +
     <!-- ===================================================================== -->
     <!--                      D I S T : I N S T A L L                          -->
     <!-- ===================================================================== -->
  @@ -175,10 +125,88 @@
     </goal>
   
   
  +  <!-- ===================================================================== -->
  +  <!-- GENERATE THE LIBRARY AND JELLYDOC DOCUMENTATION                       -->
  +  <!-- ===================================================================== -->
  +  <preGoal name="site">
  +  	<!-- use a template to create the plugins home page
  +  		 if it's an xdoc, it must be done before xdoc:transform
  +  		 and should generate to ${maven.gen.docs}/libs/index.xml
  +  	  -->
  +  	  
  +		<!-- can't pass anything into the jellydoc doclet so its hard coded to target -->
 	  
  +		<mkdir dir="target"/>
  +		  	  
  +		<mkdir dir="${maven.gen.docs}/libs/"/>
  +    <j:file name="${maven.gen.docs}/libs/index.xml"
  +      prettyPrint="true">
  +      <document>
  +        <properties>
  +          <title>Jelly Libraries</title>
  +          <author email="dion@multitask.com.au">dIon Gillard</author>
  +        </properties>
  +        <body>
  +          <section name="Jelly Libraries">
  +            <p>
  +              The following libraries are available for Jelly as part of the standard distribution.
  +              Other libraries are maintained elsewhere - please see the 
  +              <a href="../poweredby.html">powered by</a> page for more details.
  +            </p>
  +            <ul>
  +              <fileScanner var="pluginProjects">
  +                <fileset dir="${basedir}">
  +                  <include name="jelly-tags/*/project.xml" />
  +                </fileset>
  +             </fileScanner>
  +             <j:forEach items="${pluginProjects.iterator()}" var="plugin">
  +               <j:set var="pluginName" value="${plugin.parentFile.name}" />
  +               <li>
  +                 <a href="./${pluginName}/index.html">${pluginName}</a>
  +               </li>
  +             </j:forEach>
  +            </ul>
  +          </section>
  +        </body>
  +      </document>
  +    </j:file>
  +
  +		<maven:reactor
  +			basedir="${basedir}"
  +			includes="jelly-tags/*/project.xml"
  +			goals="jellydoc,site"
  +			banner="Generating site for"
  +			ignoreFailures="false"
  +		/>
  +		
  +		<!-- create the parent directory for the docs -->
  +		<mkdir dir="${maven.docs.dest}/libs" />
  +	
  +		<!-- copy them all to ${maven.docs.dest}/libs/${plugin.id}/ -->
  +		<fileScanner var="pluginProjects">
  +			<fileset dir="${basedir}">
  +				<include name="jelly-tags/*/project.xml" />
  +			</fileset>
  +		</fileScanner>
  +		<j:forEach items="${pluginProjects.iterator()}" var="plugin">
  +			<j:set var="pluginName" value="${plugin.parentFile.name}" />
  +			<mkdir dir="${maven.docs.dest}/libs/${pluginName}/" />
  +			<copy toDir="${maven.docs.dest}/libs/${pluginName}/">
  +				<fileset dir="jelly-tags/${pluginName}/target/docs/">
  +					<include name="**" />
  +				</fileset>
  +			</copy>
  +		</j:forEach>
  +
  +		<!-- now lets implement the jellydoc for the core package -->		
  +    <j:set var="maven.jellydoc.packages" value="org.apache.commons.jelly.tags.core.*"/>
  +    <attainGoal name="jellydoc"/>
  +    
  +  </preGoal>
  +
   
   
  -  <!-- demo programs -->
   
  +  <!-- demo programs -->
   
   	<!-- a sample of using the command line interface to invoke Jelly -->
     <goal name="demo:cmdline" prereqs="create-classpath"
  @@ -255,4 +283,22 @@
       </copy>
     </postGoal>
   
  +
  +	<!--
  +		|| Disable some goals not currently working with CVS HEAD 
  +		-->
  +	<goal name="maven-license-plugin:report"/>
  +
  +
  +  <!-- define the classpath used to run examples -->
  +  <goal name="create-classpath" prereqs="java:compile,test:compile">
  +		<path id="test.classpath">
  +			<pathelement path="${maven.build.dest}"/>
  +			<pathelement path="target/classes"/>
  +			<pathelement path="target/test-classes"/>
  +			<path refid="maven.dependency.classpath"/>
  +		</path>
  +  </goal>
  +
  +			
   </project>
  
  
  
  1.125     +8 -12     jakarta-commons/jelly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/project.xml,v
  retrieving revision 1.124
  retrieving revision 1.125
  diff -u -r1.124 -r1.125
  --- project.xml	7 Feb 2003 10:09:04 -0000	1.124
  +++ project.xml	7 Feb 2003 17:16:37 -0000	1.125
  @@ -248,6 +248,14 @@
           <role>Developer</role>
         </roles>
       </contributor>            
  +    <contributor>
  +      <name>Christiaan ten Klooster</name>
  +      <email></email>
  +      <organization></organization>
  +      <roles>
  +        <role>Developer</role>
  +      </roles>
  +    </contributor>            
     </contributors>
     
     <dependencies>
  @@ -283,18 +291,6 @@
         <version>1.0-beta-2</version>
         <url>http://forehead.sf.net/</url>
       </dependency>
  -    
  -    <!-- for doclets -->
  -    <dependency>
  -      <id>javadoc</id>
  -      <version>1.3</version>
  -    </dependency>
  -
  -    <dependency>
  -      <id>nekohtml</id>
  -      <version>0.7.1</version>
  -    </dependency>
  -
     </dependencies>
     
     <build>
  
  
  

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


Mime
View raw message