You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/02/20 09:11:14 UTC

cvs commit: jakarta-turbine-maven/xdocs/stylesheets index.dvsl front-page.dvsl

jvanzyl     02/02/20 00:11:14

  Modified:    .        .cvsignore NOTES build-docs.xml build.xml
                        default.properties
               src/templates/build build.xml
               xdocs    project.xml
  Added:       xdocs/stylesheets index.dvsl
  Removed:     xdocs/stylesheets front-page.dvsl
  Log:
  - first step at automated site update:
  
    -> the docs are produced
    -> javadocs are produced
    -> docs/ directory is tar'd up
    -> tarball transferred to jakarta site
    -> tarball untar'd on the site
  
    lifted and modified some targets from the cactus build
  
  - slowly starting the merge the template build with maven's actual
    build so it uses itself. will need to make a little bootstrap
    process.
  
    anyway, lightly tested while producing the maven site which is
    now up as a result of these changes.
  
  Revision  Changes    Path
  1.2       +1 -0      jakarta-turbine-maven/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore	19 Feb 2002 18:09:58 -0000	1.1
  +++ .cvsignore	20 Feb 2002 08:11:13 -0000	1.2
  @@ -3,3 +3,4 @@
   velocity.log
   maven.log
   *~
  +docs
  
  
  
  1.2       +0 -1      jakarta-turbine-maven/NOTES
  
  Index: NOTES
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/NOTES,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NOTES	19 Feb 2002 18:09:58 -0000	1.1
  +++ NOTES	20 Feb 2002 08:11:13 -0000	1.2
  @@ -28,5 +28,4 @@
   . standard location for libs versus distributions
   . javadoc viewer
   . make the tools easily integrated into cvs
  -
   . lxr finding all the source files that use a particular file.
  
  
  
  1.3       +88 -27    jakarta-turbine-maven/build-docs.xml
  
  Index: build-docs.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/build-docs.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build-docs.xml	20 Feb 2002 04:16:19 -0000	1.2
  +++ build-docs.xml	20 Feb 2002 08:11:13 -0000	1.3
  @@ -20,15 +20,18 @@
   
     <target
       name="docs"
  -    depends="docs:front-page, docs:mail-lists, docs:developer-list,docs:dependencies"
  +    depends="docs:index, docs:mail-lists, docs:developer-list,docs:dependencies"
       description="o Generate html project documentation xdoc sources">
     </target>
   
     <target
  -    name="docs:front-page"
  +    name="docs:index"
       description="o Generates front page">
   
  -    <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
  +    <taskdef 
  +      name="dvsl" 
  +      classname="org.apache.tools.dvsl.DVSLTask">
  +      
         <classpath>
           <path refid="classpath"/>
         </classpath>
  @@ -38,12 +41,12 @@
       <mkdir dir="${docs.dest}"/>
   
         <dvsl
  -           basedir="."
  -           destdir="${docs.dest}/"
  -           extension=".html"
  -           style="${docs.src}/stylesheets/front-page.dvsl"
  -           in="project-maven.xml"
  -           out="${docs.dest}/front-page.html"
  +        basedir="."
  +        destdir="${docs.dest}/"
  +        extension=".html"
  +        style="${docs.src}/stylesheets/index.dvsl"
  +        in="project-maven.xml"
  +        out="${docs.dest}/index.html"
         />
     </target>
   
  @@ -61,12 +64,12 @@
       <mkdir dir="${docs.dest}"/>
   
         <dvsl
  -           basedir="."
  -           destdir="${docs.dest}/"
  -           extension=".html"
  -           style="${docs.src}/stylesheets/mail-lists.dvsl"
  -           in="project-maven.xml"
  -           out="${docs.dest}/mail-lists.html"
  +        basedir="."
  +        destdir="${docs.dest}/"
  +        extension=".html"
  +        style="${docs.src}/stylesheets/mail-lists.dvsl"
  +        in="project-maven.xml"
  +        out="${docs.dest}/mail-lists.html"
         />
     </target>
   
  @@ -84,12 +87,12 @@
       <mkdir dir="${docs.dest}"/>
   
         <dvsl
  -           basedir="."
  -           destdir="${docs.dest}/"
  -           extension=".html"
  -           style="${docs.src}/stylesheets/developer-list.dvsl"
  -           in="project-maven.xml"
  -           out="${docs.dest}/developer-list.html"
  +        basedir="."
  +        destdir="${docs.dest}/"
  +        extension=".html"
  +        style="${docs.src}/stylesheets/developer-list.dvsl"
  +        in="project-maven.xml"
  +        out="${docs.dest}/developer-list.html"
         />
     </target>
   
  @@ -107,13 +110,71 @@
       <mkdir dir="${docs.dest}"/>
   
         <dvsl
  -           basedir="."
  -           destdir="${docs.dest}/"
  -           extension=".html"
  -           style="${docs.src}/stylesheets/dependencies.dvsl"
  -           in="project-maven.xml"
  -           out="${docs.dest}/dependencies.html"
  +        basedir="."
  +        destdir="${docs.dest}/"
  +        extension=".html"
  +        style="${docs.src}/stylesheets/dependencies.dvsl"
  +        in="project-maven.xml"
  +        out="${docs.dest}/dependencies.html"
         />
  +  </target>
  +
  +  <target 
  +    name="deploy-site" 
  +    depends="javadocs,docs">
  +    
  +    <!-- This needs to taken from the project properties -->
  +    <property name="homepage" value="/www/jakarta.apache.org/turbine/maven/"/>
  +
  +    <tar tarfile="${project}-site.tar" basedir="${docs.dest}"/>
  +    <gzip zipfile="${project}-site.tar.gz" src="${project}-site.tar"/>
  +    <delete file="${project}-site.tar"/>
  +
  +    <exec dir="." executable="scp">
  +      <arg value="${project}-site.tar.gz"/>
  +      <arg value="jakarta.apache.org:${homepage}"/>
  +    </exec>
  +
  +    <exec dir="." executable="ssh">
  +      <arg line="jakarta.apache.org 'cd ${homepage};gunzip ${project}-site.tar.gz;tar xvf ${project}-site.tar;rm ${project}-site.tar'"/>
  +    </exec>
  +
  +  </target>
  +
  +  <!-- ================================================================== -->
  +  <!-- J A V A D O C S                                                    -->
  +  <!-- ================================================================== -->
  +
  +  <target
  +    name="javadocs"
  +    description="o Generates the Javadoc API documentation">
  +
  +    <mkdir dir="${javadoc.destdir}"/>
  +
  +    <!-- Get the year to display in the Javadocs -->
  +    <tstamp>
  +      <format property="year" pattern="${inception.year}-yyyy"/>
  +    </tstamp>
  + 
  +    <property 
  +      name="copyright" 
  +      value="Copyright &amp;copy; ${year} ${organization}. All Rights Reserved."
  +    />
  +    
  +    <javadoc
  +      sourcepath="${src.dir}/java"
  +      packagenames="${package}.*"
  +      destdir="${javadoc.destdir}"
  +      author="${author}"
  +      private="${javadoc.private}"
  +      version="${javadoc.version}"
  +      use="${javadoc.use}"
  +      windowtitle="${javadoc.windowtitle}"
  +      doctitle="${javadoc.doctitle}"
  +      bottom="${copyright}">
  +      <classpath refid="classpath"/>
  +    </javadoc>
  +
     </target>
   
   </project>
  
  
  
  1.4       +0 -27     jakarta-turbine-maven/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	20 Feb 2002 04:03:42 -0000	1.3
  +++ build.xml	20 Feb 2002 08:11:13 -0000	1.4
  @@ -170,33 +170,6 @@
     </target>
   
     <!-- ================================================================== -->
  -  <!-- J A V A D O C S                                                    -->
  -  <!-- ================================================================== -->
  -
  -  <target
  -    name="javadocs"
  -    depends="prepare"
  -    description="==> generates the API documentation">
  -
  -    <mkdir dir="${docs.dest}/api"/>
  -
  -    <javadoc
  -      sourcepath="${src.dir}/java"
  -      packagenames="${package}.*"
  -      destdir="${javadoc.destdir}"
  -      author="true"
  -      private="true"
  -      version="true"
  -      use="true"
  -      windowtitle="${name} ${version} API"
  -      doctitle="${name} ${version} API"
  -      bottom="Copyright &amp;copy; ${year} Apache Software Foundation. All Rights Reserved.">
  -      <classpath refid="classpath"/>
  -      <classpath path="${ant.home}/lib/ant.jar"/>
  -    </javadoc>
  -  </target>
  -
  -  <!-- ================================================================== -->
     <!-- C L E A N                                                          -->
     <!-- ================================================================== -->
   
  
  
  
  1.3       +10 -2     jakarta-turbine-maven/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/default.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- default.properties	20 Feb 2002 04:16:19 -0000	1.2
  +++ default.properties	20 Feb 2002 08:11:13 -0000	1.3
  @@ -9,7 +9,7 @@
   name = maven
   project = maven
   version = 0.1
  -package = org.apache.alexandria
  +package = org.apache.maven
   final.name = ${project}
   
   build.dir = ./target
  @@ -21,7 +21,6 @@
   
   docs.src = ./xdocs
   docs.dest = ./docs
  -javadoc.destdir = ./docs/api
   jakarta.site2 = ../jakarta-site2
   
   year = 1999-2001
  @@ -50,3 +49,12 @@
   oro.jar = ${lib.repo}/oro.jar
   
   workspace = src/descriptors/workspace/jvz.xml
  +
  +inception.year = 1999
  +javadoc.destdir = ${basedir}/docs/api
  +javadoc.windowtitle = ${name} ${version} API
  +javadoc.doctitle = ${name} ${version} API
  +javadoc.author = true
  +javadoc.private = true
  +javadoc.version = true
  +javadoc.use = true
  
  
  
  1.2       +1 -1      jakarta-turbine-maven/src/templates/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	19 Feb 2002 18:10:12 -0000	1.1
  +++ build.xml	20 Feb 2002 08:11:14 -0000	1.2
  @@ -394,7 +394,7 @@
     </target>
   
     <!-- ================================================================== -->
  -  <!-- J A V A D O C                                                      -->
  +  <!-- J A V A D O C S                                                    -->
     <!-- ================================================================== -->
   
     <target
  
  
  
  1.4       +2 -1      jakarta-turbine-maven/xdocs/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/xdocs/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	20 Feb 2002 04:04:05 -0000	1.3
  +++ project.xml	20 Feb 2002 08:11:14 -0000	1.4
  @@ -9,7 +9,8 @@
         <item name="Front Page"              href="/front-page.html"/>
         <item name="Mail Lists"              href="/mail-lists.html"/>
         <item name="Developers"              href="/developer-list.html"/>
  -      <item name="Dependencies"              href="/dependencies.html"/>
  +      <item name="Dependencies"            href="/dependencies.html"/>
  +      <item name="JavaDocs"                href="/api/index.html"/>
       </menu>
     </body>
   </project>
  
  
  
  1.1                  jakarta-turbine-maven/xdocs/stylesheets/index.dvsl
  
  Index: index.dvsl
  ===================================================================
  <!--
  
    front page generator
  
    version : $Id: index.dvsl,v 1.1 2002/02/20 08:11:14 jvanzyl Exp $
  -->
  
  #macro( doBody $document )
  $context.applyTemplates( $document, "description" )
  #end
  
  #parse( "xdocs/stylesheets/maven.dvsl" )
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>