cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: xml-cocoon2/src/documentation/xdocs/userdocs/xsp xsp-internals.xml
Date Tue, 30 Apr 2002 13:50:30 GMT
dims        02/04/30 06:50:30

  Modified:    .        build.xml
               src/documentation sitemap.xmap
               src/documentation/xdocs/userdocs/xsp xsp-internals.xml
  Log:
  Get javadocs to work when we use "build install"
  
  Revision  Changes    Path
  1.203     +10 -1     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.202
  retrieving revision 1.203
  diff -u -r1.202 -r1.203
  --- build.xml	26 Apr 2002 06:46:00 -0000	1.202
  +++ build.xml	30 Apr 2002 13:50:29 -0000	1.203
  @@ -1111,6 +1111,15 @@
     </target>
   
     <!-- =================================================================== -->
  +  <!-- Prepares the javadocs for webapp                                    -->
  +  <!-- =================================================================== -->
  +  <target name="prepare-webapp-javadocs" depends="javadocs">
  +    <copy todir="${build.war}/apidocs" filtering="off">
  +      <fileset dir="${build.javadocs}"/>
  +    </copy>
  +  </target>
  +
  +  <!-- =================================================================== -->
     <!-- Prepares the webapp directories for scratchpad                      -->
     <!-- =================================================================== -->
     <target name="prepare-webapp-scratchpad" depends="copy-webapp" if="include.scratchpad.libs">
  @@ -1213,7 +1222,7 @@
     <!-- =================================================================== -->
     <!-- Creates the war file                                                -->
     <!-- =================================================================== -->
  -  <target name="webapp" depends="prepare-webapp, prepare-webapp-scratchpad, prepare-webapp-libs,
prepare-scratchpad-libs, prepare-xsp" description="* Generates the war package">
  +  <target name="webapp" depends="prepare-webapp, prepare-webapp-javadocs, prepare-webapp-scratchpad,
prepare-webapp-libs, prepare-scratchpad-libs, prepare-xsp" description="* Generates the war
package">
       <!-- A task to create manifest for webapp. -->
       <taskdef name="manifest-tool" classname="ManifestToolTask" 
           classpath="${tools.dir}/anttasks"/>
  
  
  
  1.6       +9 -1      xml-cocoon2/src/documentation/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/sitemap.xmap,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sitemap.xmap	22 Apr 2002 12:50:48 -0000	1.5
  +++ sitemap.xmap	30 Apr 2002 13:50:30 -0000	1.6
  @@ -133,6 +133,14 @@
        <map:serialize/>
      </map:match>
   
  +   <map:match pattern="apidocs/**.html">
  +     <map:read src="../apidocs/{1}.html" mime-type="text/html" />
  +   </map:match>
  +
  +   <map:match pattern="apidocs/**.css">
  +    <map:read src="../apidocs/{1}.css" mime-type="text/css"/>
  +   </map:match>
  +
      <map:match pattern="*.html">
       <map:aggregate element="site">
        <map:part src="cocoon:/book-{1}.xml"/>
  @@ -203,4 +211,4 @@
     </map:pipeline>
    </map:pipelines>
   
  -</map:sitemap>
  +</map:sitemap>
  \ No newline at end of file
  
  
  
  1.3       +1 -1      xml-cocoon2/src/documentation/xdocs/userdocs/xsp/xsp-internals.xml
  
  Index: xsp-internals.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/xsp/xsp-internals.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xsp-internals.xml	15 Jan 2002 21:01:54 -0000	1.2
  +++ xsp-internals.xml	30 Apr 2002 13:50:30 -0000	1.3
  @@ -154,7 +154,7 @@
         <code>ProgramGenerator</code>, on the other hand, refers to a Cocoon
         component responsible for building and executing programs derived from XML
         documents containing dynamic markup:
  -      <link href="../../apidocs/org/apache/cocoon/components/language/generation/ProgramGenerator.html">
  +      <link href="../../apidocs/org/apache/cocoon/components/language/generator/ProgramGenerator.html">
           <code>org.apache.cocoon.components.language.generator.ProgramGenerator</code>
         </link>
       </note>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message