forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/src/resources/library/xslt filterlinks.xsl filterlinks-html.xsl linkutils.xsl
Date Wed, 11 Dec 2002 08:28:11 GMT
jefft       2002/12/11 00:28:11

  Modified:    .        build.xml status.xml
               src/resources/conf sitemap.xmap
               src/resources/forrest-shbat forrest.build.xml
               src/resources/fresh-site/src/documentation/content/xdocs
                        sample.xml
               src/resources/library/xslt filterlinks.xsl
  Removed:     src/resources/fresh-site/src/documentation/content hello.pdf
               src/resources/library/xslt filterlinks-html.xsl
                        linkutils.xsl
  Log:
  Ye olde -1..
  
  Revision  Changes    Path
  1.53      +2 -25     xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- build.xml	10 Dec 2002 11:56:20 -0000	1.52
  +++ build.xml	11 Dec 2002 08:28:08 -0000	1.53
  @@ -66,7 +66,6 @@
       <path id="classpath">
         <fileset dir="src/scratchpad/lib" includes="**/*.jar"/>
         <fileset dir="lib" includes="**/*.jar"/>
  -      <fileset dir="tools/ant/lib" includes="*.jar"/>
         <pathelement location="${tools.jar}"/>
       </path>
   
  @@ -331,27 +330,8 @@
     <!-- =================================================================== -->
     <!-- Make the shell-bat distribution                                     -->
     <!-- =================================================================== -->
  -
  -  <target name="compile-shbat" depends="init">
  -    <mkdir dir="${build.dir}/shbat/tasks-classes"/>
  -    <javac srcdir=   "src/resources/forrest-shbat/tasks"
  -      destdir=       "${build.dir}/shbat/tasks-classes"
  -      debug=         "${build.compiler.debug}"
  -      optimize=      "${build.compiler.optimize}"
  -      deprecation=   "${build.compiler.deprecation}"
  -      nowarn=        "${build.compiler.nowarn}"
  -      classpathref=  "classpath">
  -    </javac>
  -  </target>
  -
  -  <target name="jar-shbat" depends="compile-shbat">
  -    <jar destfile="${build.dir}/shbat/forrest-shbat-tasks.jar"
  -      basedir="${build.dir}/shbat/tasks-classes"/>
  -  </target>
  - 
  -
     <target name="dist-shbat" 
  -    depends="init, validate-config, fresh-site-zip, webapp-webinf, bare-context-dir, jar-shbat"
>
  +    depends="init, validate-config, fresh-site-zip, webapp-webinf, bare-context-dir" >
       <!-- TODO: decide on a better place to read/set this prop from/to -->
   
       <!-- fresh drop-off location for the distribution -->
  @@ -365,11 +345,8 @@
   
       <!-- copy the prepared and wrapper stuff for the distribution -->
       <copy todir="${dist-shbat.dir}">
  -      <fileset dir="./src/resources/forrest-shbat">
  -        <exclude name="tasks/**"/>
  -      </fileset>
  +      <fileset dir="./src/resources/forrest-shbat" />
       </copy>
  -    <copy file="${build.dir}/shbat/forrest-shbat-tasks.jar" todir="${dist-shbat.dir}/WEB-INF/lib"
/>
   
       <!-- copy licenses -->
       <copy todir="${dist-shbat.dir}/legal">
  
  
  
  1.79      +0 -6      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- status.xml	10 Dec 2002 11:56:20 -0000	1.78
  +++ status.xml	11 Dec 2002 08:28:10 -0000	1.79
  @@ -24,12 +24,6 @@
   
     <changes>
       <release version="0.3-dev" date="unreleased">
  -      <action dev="JT" type="update" context="shbat">
  -        Add the ability to link to files not generated by Cocoon, with a
  -        <code>file:</code> link prefix. Eg, a static file
  -        <code>src/documentation/content/report.pdf</code> can be linked to
with
  -        &lt;link href="file:report.pdf&gt;
  -      </action> 
         <action dev="NKB" type="update" context="skins">
           Added rss capability to changes generation.
         </action> 
  
  
  
  1.44      +3 -6      xml-forrest/src/resources/conf/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- sitemap.xmap	10 Dec 2002 11:56:20 -0000	1.43
  +++ sitemap.xmap	11 Dec 2002 08:28:10 -0000	1.44
  @@ -122,17 +122,15 @@
      <map:serialize type="xml"/>
     </map:view>
   
  -  <map:view name="links" from-label="links">
  -   <map:transform src="library/xslt/filterlinks.xsl">
  -    <map:parameter name="linkdir" value="{system-property:java.io.tmpdir}"/>
  -   </map:transform>
  +  <map:view name="links" from-position="last">
  +   <map:transform src="library/xslt/filterlinks.xsl"/>
      <map:serialize type="links"/>
     </map:view>
    </map:views>
   
    <map:resources>
     <map:resource name="skinit">
  -    <map:transform src="skins/{forrest:skin}/xslt/html/{type}.xsl" label="links">
  +   <map:transform src="skins/{forrest:skin}/xslt/html/{type}.xsl">
        <map:parameter name="isfaq" value="{isfaq}"/>
        <map:parameter name="nopdf" value="{nopdf}"/>
        <map:parameter name="path" value="{path}"/>
  @@ -140,7 +138,6 @@
        <map:parameter name="config-file" value="../../../../skinconf.xml"/>
        -->
      </map:transform>
  -   <map:transform src="library/xslt/filterlinks-html.xsl"/>
      <map:serialize/>
     </map:resource>
   
  
  
  
  1.31      +0 -24     xml-forrest/src/resources/forrest-shbat/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/forrest.build.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- forrest.build.xml	10 Dec 2002 11:56:20 -0000	1.30
  +++ forrest.build.xml	11 Dec 2002 08:28:11 -0000	1.31
  @@ -564,7 +564,6 @@
         <arg value="${project.start-uri}"/>              <!-- starting page -->
         <arg value="-V" />                          <!-- be verbose -->
       </java>
  -    <antcall target="copy-files"/>
       <echo>
   ------------------------------
   Static site generated at:
  @@ -577,27 +576,6 @@
       </echo>
     </target>
   
  -  <target name="check-uncopied-files">
  -    <available property="uncopied-files" type="file" file="${java.io.tmpdir}/unprocessed-files.txt"/>
  -  </target>
  -
  -  <!-- ===============================================================
  -       Copies any files that Cocoon didn't crawl. These are written by a
  -       stylesheet to /tmp/unprocessed-files.txt during the Cocoon run, and must
  -       now be copied
  -       =============================================================== -->
  -  <target name="copy-files" if="uncopied-files" depends="check-uncopied-files, -prepare-classpath">
  -    <echo>Copying files not handled by Cocoon..</echo>
  -    <copy todir="${project.site-dir}">
  -      <fileset dir="${project.ctxt-dir}/content" includes="**/*">
  -        <custom classname="org.apache.forrest.UncopiedFileSelector"
  -          classpathref="forrest.cp">
  -          <param name="config" value="${java.io.tmpdir}/unprocessed-files.txt"/>
  -        </custom>
  -      </fileset>
  -    </copy>
  -    <delete file="${java.io.tmpdir}/unprocessed-files.txt"/>
  -  </target>
   
     <target name="project.webapp.defined" unless="project.webapp">
       <fail>
  @@ -607,8 +585,6 @@
         ------------------------------------------------
       </fail>
     </target>
  -
  -
   
     <!-- ===============================================================
          Builds a cocoon webapp for your project.
  
  
  
  1.4       +0 -9      xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/sample.xml
  
  Index: sample.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/sample.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sample.xml	10 Dec 2002 11:56:20 -0000	1.3
  +++ sample.xml	11 Dec 2002 08:28:11 -0000	1.4
  @@ -50,15 +50,6 @@
              the new document in the same browser window.
             </dd> 
   
  -          <dt><code>&lt;link href="file:hello.pdf"&gt;</code></dt>

  -          <dd>Use the <code>file:</code> prefix to
  -            <link href="file:hello.pdf" title="Example of a document not
  -              generated by Cocoon">link</link>
  -            to an existing file not generated by Cocoon.
  -            <code>file:</code>-referenced files should be placed in
  -            <code>src/documentation/content</code>
  -          </dd> 
  -
             <dt><code>&lt;jump href="sample.html"&gt;</code></dt>

             <dd>Use this to
               <jump href="sample.html" title="Example of a document via jump">jump</jump>
  
  
  
  1.4       +7 -23     xml-forrest/src/resources/library/xslt/filterlinks.xsl
  
  Index: filterlinks.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/library/xslt/filterlinks.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- filterlinks.xsl	10 Dec 2002 11:56:20 -0000	1.3
  +++ filterlinks.xsl	11 Dec 2002 08:28:11 -0000	1.4
  @@ -1,35 +1,19 @@
   <?xml version="1.0"?>
   
   <!--
  -This stylesheet filters all references to the javadocs, the samples and any
  -protocols (file:, java:) that Cocoon shouldn't handle.  This stylesheet is
  -applied while rendering the 'links' View.
  +This stylesheet filters all references to the javadocs
  +and the samples.
   -->
   <xsl:stylesheet
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       version="1.0">
  -  <xsl:include href="linkutils.xsl"/>
  -
  -  <!-- Directory in which to write unprocessed-<protocol>s.txt files. Any
  -  protocol'ed link that is deliberately stripped before being passed to Cocoon
  -  should be recorded in a file. -->
  -  <xsl:param name="linkdir"/>
   
     <xsl:template match="@src|@href|@background">
  -    <xsl:choose>
  -      <xsl:when test="not(contains(.,'apidocs')) and not(starts-with(.,
  -        'samples/')) and not(starts-with(., 'file:'))">
  -        <xsl:copy>
  -          <xsl:apply-templates select="."/>
  -        </xsl:copy>
  -      </xsl:when>
  -      <xsl:when test="starts-with(., 'file:')">
  -        <xsl:call-template name="record-link">
  -          <xsl:with-param name="href" select="." /> 
  -          <xsl:with-param name="linkdir" select="$linkdir" /> 
  -        </xsl:call-template>
  -      </xsl:when>
  -    </xsl:choose>
  +    <xsl:if test="not(contains(.,'apidocs')) and not(starts-with(., 'samples/'))">
  +      <xsl:copy>
  +        <xsl:apply-templates select="."/>
  +      </xsl:copy>
  +    </xsl:if>
     </xsl:template>
   
     <!-- This is a hack which makes the javascript images work -->
  
  
  

Mime
View raw message