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/skins/template/xslt/html book2menu.xsl document2html.xsl site2xhtml.xsl tab2menu.xsl
Date Sat, 08 Feb 2003 05:50:44 GMT
jefft       2003/02/07 21:50:43

  Modified:    .        Tag: FORREST_03_BRANCH status.xml
               etc      Tag: FORREST_03_BRANCH DTD_DEFICIENCIES.txt
               src/documentation/content/xdocs Tag: FORREST_03_BRANCH
                        forrestbot.xml live-sites.xml site.xml
               src/java/components/org/apache/cocoon/transformation Tag:
                        FORREST_03_BRANCH XPathTransformer.java
               src/resources/conf Tag: FORREST_03_BRANCH logkit.xconf
                        sitemap.xmap web.xml
               src/resources/forrest-shbat Tag: FORREST_03_BRANCH
                        forrest.antproxy.xml forrest.build.xml
               src/resources/forrestbot/ant Tag: FORREST_03_BRANCH
                        templates.build.xml
               src/resources/forrestbot/bin Tag: FORREST_03_BRANCH
                        forrestbot
               src/resources/forrestbot/samples/entities Tag:
                        FORREST_03_BRANCH krysalis-centipede.ent
               src/resources/fresh-site/src/documentation/content/xdocs
                        Tag: FORREST_03_BRANCH site.xml
               src/resources/skins/common/xslt/html Tag: FORREST_03_BRANCH
                        renderlogo.xsl
               src/resources/skins/forrest-site/css Tag: FORREST_03_BRANCH
                        page.css
               src/resources/skins/krysalis-site/css Tag: FORREST_03_BRANCH
                        page.css
               src/resources/skins/krysalis-site/xslt/html Tag:
                        FORREST_03_BRANCH document2html.xsl
  Added:       src/documentation/content/xdocs Tag: FORREST_03_BRANCH
                        forrestbar.ehtml
               src/resources/fresh-site/src/documentation/content/xdocs
                        Tag: FORREST_03_BRANCH cwiki-sample.cwiki
               src/resources/library/xslt Tag: FORREST_03_BRANCH
                        wiki2html.xsl wiki2htmlpage.xsl
               src/resources/skins/template/css Tag: FORREST_03_BRANCH
                        README.txt
               src/resources/skins/template/images Tag: FORREST_03_BRANCH
                        README.txt
               src/resources/skins/template/scripts Tag: FORREST_03_BRANCH
                        README.txt
               src/resources/skins/template/xslt/fo Tag: FORREST_03_BRANCH
                        document2fo.xsl
               src/resources/skins/template/xslt/html Tag:
                        FORREST_03_BRANCH book2menu.xsl document2html.xsl
                        site2xhtml.xsl tab2menu.xsl
  Log:
  Synch with CVS head, fetching most fixes and minor improvements.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.1 +39 -1     xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.106
  retrieving revision 1.106.2.1
  diff -u -r1.106 -r1.106.2.1
  --- status.xml	30 Jan 2003 10:22:02 -0000	1.106
  +++ status.xml	8 Feb 2003 05:50:37 -0000	1.106.2.1
  @@ -23,7 +23,45 @@
     <!-- ===================================================================== -->
   
     <changes>
  -    <release version="0.4-dev" date="unreleased">
  +    <release version="0.3.1-dev" date="unreleased">
  +      <action dev="JT" type="add" context="shbat">
  +        Added a minimal template skin.
  +      </action>
  +      <action dev="NKB" type="fix" context="shbat" due-to="Berin Loritsch"
  +        due-to-email="bloritsch@apache.org">
  +        The problem with starting a new forked JVM is that all 
  +        properties get lost.  This makes it able to use one forrest.properties
  +        for all multiple projects, and just create the docs from there. 
  +      </action>
  +      <action dev="JT" type="fix" context="webapp" due-to="Bernhard Brandmair"
  +        due-to-email="Bernhard.Brandmair@integral.com">
  +        The menu is now limited to only pages in the current subdirectory and
  +        below. 
  +      </action>
  +      <action dev="NKB" type="fix" context="webapp" due-to="Cathy Zura"
  +        due-to-email="czura@optonline.net">
  +        Added the cwiki stylesheets that were missing and an example in the
  +        fresh site seed.
  +      </action>
  +      <action dev="NKB" type="update" context="skins" >
  +        Make the forrest-site and krysalis-site skins more printer friendly by
  +        using CSS media type to hide navigations. the avalon-tigris skin already
  +        works well, the forrest-site one still needs tweaking.
  +      </action>
  +      <action dev="NKB" type="update" context="webapp" >
  +        Switched all loglevels to ERROR.
  +      </action>
  +      <action dev="NKB" type="update" context="docs" >
  +        Added page for ForrestBar on the site with a simple link and an autoinstall link
  +        to the forrestbar.xpi generated by Gump every day.
  +      </action>
  +      <action dev="JT" type="fix" context="core">
  +        Correctly serve swf files.
  +      </action>
  +      <action dev="JT" type="fix" context="skins">
  +        Fix <code>site:</code> and <code>ext:</code> rewriting
in ihtml, ehtml
  +        and cwiki files in subdirectories.
  +      </action>
       </release>
   
       <release version="0.3" date="2003-01-30">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.4.1   +31 -2     xml-forrest/etc/DTD_DEFICIENCIES.txt
  
  Index: DTD_DEFICIENCIES.txt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/etc/DTD_DEFICIENCIES.txt,v
  retrieving revision 1.6
  retrieving revision 1.6.4.1
  diff -u -r1.6 -r1.6.4.1
  --- DTD_DEFICIENCIES.txt	8 Jan 2003 05:44:32 -0000	1.6
  +++ DTD_DEFICIENCIES.txt	8 Feb 2003 05:50:37 -0000	1.6.4.1
  @@ -215,6 +215,35 @@
   2) Would characters in the included non-XML fragment need to be escaped on rendition? Is
this
   to show sourcecode fragments or to include in-place verbatim HTML...?
   3) Check what Eliotte R. Harold does w.r.t. XInclude (I remember him mentioning this once)
  - 
  +
  +
  +
  +
  + 8) Restrict content of <ul> to <li>
  +------------------------------------
  +Submittor: Jeff Turner
  +Date: 2003-02-01
  +Yeas: jefft
  +Nays:
  +Summary:
  +
  +Strangely, our docv11 DTD allows lists to be nested in HTML-invalid ways:
  +
  +<!ENTITY % lists "ol|ul|dl">
  +<!ELEMENT li (%content.mix; | %lists;)*>
  +
  +allowing things like:
  +
  +<ul>
  +  <ul>
  +    <ul>
  +      <li>Hello</li>
  +      </ul>
  +   </ul>
  +</ul>
  +
  +In document-v12.dtd, we should restrict the contents of <ul> to just <li>,
as
  +the HTML DTD does.
  +
   -- 
   $Revision$ $Date$
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.8.4.1   +16 -12    xml-forrest/src/documentation/content/xdocs/forrestbot.xml
  
  Index: forrestbot.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/forrestbot.xml,v
  retrieving revision 1.8
  retrieving revision 1.8.4.1
  diff -u -r1.8 -r1.8.4.1
  --- forrestbot.xml	13 Jan 2003 10:19:18 -0000	1.8
  +++ forrestbot.xml	8 Feb 2003 05:50:38 -0000	1.8.4.1
  @@ -38,7 +38,7 @@
             to yet another machine.</p>
           <p>Running the bot is as easy as calling the following in your shell.
             (executed in the root dir of the distribution.)</p>
  -        <source>build bot -Dbot.forrestbot.xconf=myOwn.conf.xml -Dtemplate.echo=[true|false]</source>
  +        <source>build bot -Dbot.config=myOwn.conf.xml -Dtemplate.echo=[true|false]</source>
           <p>It is quite typical to perform this from a shell script that gets
             scheduled for execution on a regular basis.</p>
         </section>
  @@ -47,11 +47,11 @@
           <fixme author="mpo">There is not yet a DTD for this configuration
             file.</fixme>
           <p>The actions the bot is going to take are defined in the XML
  -          file pointed at with the <code>bot.forrestbot.xconf</code> System
  -          property. (if not specified with <code>-Dbot.forrest.xconf</code>
  +          file pointed at with the <code>bot.config</code> System
  +          property. (if not specified with <code>-Dbot.config</code>
             then the default config from the
             distribution is taken: <code>./forrestbot.conf.xml</code>) </p>
  -        <p>This configuration file has one (optional) child-element for
  +        <p>This configuration file has one (required, but optionally empty) child-element
for
             setting cross-project defaults, followed by a list of
             project-elements that hold the configuration for the various projects
             that the bot is going to work on.</p>
  @@ -119,7 +119,8 @@
         &lt;user name=&quot;anoncvs&quot;/&gt;
         &lt;passwd name=&quot;anoncvs&quot;/&gt;
         &lt;module name=&quot;xml-forrest&quot;/&gt;
  -      &lt;dir name=&quot;src/documentation&quot;/&gt;
  +      &lt;content-dir name=&quot;src/documentation&quot;/&gt;
  +      &lt;project-dir name=&quot;&quot;/&gt;
       &lt;/get-src&gt;
   
       &lt;generate&gt;
  @@ -147,28 +148,31 @@
                 <dd>forrest-site</dd>
               </dl>
               <dl>
  -              <dt>get.cvs.host</dt>
  +              <dt>get-src.cvs.host</dt>
                 <dd>cvs.apache.org</dd>
               </dl>
               <dl>
  -              <dt>get.cvs.root</dt>
  +              <dt>get-src.cvs.root</dt>
                 <dd>/home/cvspublic</dd>
               </dl>
               <dl>
  -              <dt>get.cvs.user</dt>
  +              <dt>get-src.cvs.user</dt>
                 <dd>anoncvs</dd>
               </dl>
               <dl>
  -              <dt>passwd</dt>
  +              <dt>get-src.cvs.passwd</dt>
                 <dd>anoncvs</dd>
               </dl>
               <dl>
  -              <dt>get.cvs.module</dt>
  +              <dt>get-src.cvs.module</dt>
                 <dd>xml-forrest</dd>
               </dl>
               <dl>
  -              <dt>get.cvs.dir</dt>
  +              <dt>get-src.cvs.content-dir</dt>
                 <dd>src/documentation</dd>
  +            </dl><dl>
  +              <dt>get-src.cvs.project-dir</dt>
  +              <dd></dd>
               </dl>
               <dl>
                 <dt>generate.debuglevel</dt>
  @@ -321,7 +325,7 @@
               <li><code>&lt;destination&gt;</code> @name holds
the path to the directory on the remote host where the generated content needs to be published.
 The process is using the <code>ftp cd</code> command to get there.  This means
this directory has to exist.</li>
             </ul>
           </section>
  -        <warning>Currently the ant distribution that is included in forrest cvs is
not offering the required NetComponents.jar to actually support this type of deployment. If
you want to use it anyway you should use get the required jar from <link href="http://www.savarese.org/oro/downloads/index.html#NetComponents">http://www.savarese.org/oro/downloads</link>
and drop that into your <code>{forrest-sandbox}/tools/antipede/lib</code> directory.
 </warning>
  +        <warning>Currently the ant distribution that is included in forrest cvs is
not offering the required NetComponents.jar to actually support this type of deployment. If
you want to use it anyway you should get the required jar from <link href="http://www.savarese.org/oro/downloads/index.html#NetComponents">http://www.savarese.org/oro/downloads</link>
and drop that into your <code>{forrest-sandbox}/tools/antipede/lib</code> directory.
 </warning>
         </section>
         <section>
           <title>
  
  
  
  1.13.4.1  +2 -2      xml-forrest/src/documentation/content/xdocs/live-sites.xml
  
  Index: live-sites.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/live-sites.xml,v
  retrieving revision 1.13
  retrieving revision 1.13.4.1
  diff -u -r1.13 -r1.13.4.1
  --- live-sites.xml	24 Jan 2003 05:28:42 -0000	1.13
  +++ live-sites.xml	8 Feb 2003 05:50:38 -0000	1.13.4.1
  @@ -13,8 +13,8 @@
         <li><link href="http://www.adriatico.be/">Adriatico</link></li>
         <li><link href="http://outerthought.net/">Outerthought.net</link></li>
         <li><link href="http://www.xmlbelux.be/">The BeLux XML User's Group</link></li>
  -      <li><link href="http://aft.sourceforge.net/">Anteater</link>
  -        Ant-based functional testing</li>
  +      <li><link href="http://aft.sourceforge.net/">Anteater</link> -
Ant-based functional testing</li>
  +      <li><link href="http://chaperon.sourceforge.net">Chaperon</link>
- text parser</li>
         <li><link href="http://www.iasandcb.pe.kr/2g/">IAS&amp;CB</link></li>
         <li>Some <link href="http://cvs.apache.org/~coar/people.html">Apache
           Committer</link> personal pages</li>
  
  
  
  1.6.4.1   +6 -1      xml-forrest/src/documentation/content/xdocs/site.xml
  
  Index: site.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/site.xml,v
  retrieving revision 1.6
  retrieving revision 1.6.4.1
  diff -u -r1.6 -r1.6.4.1
  --- site.xml	12 Jan 2003 20:00:30 -0000	1.6
  +++ site.xml	8 Feb 2003 05:50:38 -0000	1.6.4.1
  @@ -40,6 +40,7 @@
       <libre-intro label="Libre" href="libre-intro.html"/>
       <dtd-docs label="DTD documentation" href="dtd-docs.html"/>
       <cap label="Sourcetype Action" href="cap.html"/>
  +    <forrestbar label="The ForrestBar" href="forrestbar.html"/>
     </documentation>
   
     <samples label="Some Samples">
  @@ -95,8 +96,10 @@
           <r3.3.1 href="builds/jakarta-tomcat/release/v3.3.1/bin/"/>
         </tomcat>
         <ant href="ant/"/>
  +      <gump href="gump/"/>
       </jakarta>
  -
  +    <ant href="http://ant.apache.org/"/>
  +          
       <catalog_spec href="http://www.oasis-open.org/committees/entity/background/9401.html"/>
       <catalog_intro href="http://www.arbortext.com/Think_Tank/XML_Resources/Issue_Three/issue_three.html"/>
   
  @@ -111,6 +114,8 @@
       <cool-uris href="http://www.w3.org/Provider/Style/URI.html"/>
       <uri-rfc href="http://zvon.org/tmRFC/RFC2396/Output/index.html"/>
   
  +    <mozilla href="http://www.mozilla.org/"/>
  +        
     </external-refs>
   
   </site>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      xml-forrest/src/documentation/content/xdocs/forrestbar.ehtml
  
  Index: forrestbar.ehtml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/content/xdocs/forrestbar.ehtml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.1   +2 -9      xml-forrest/src/java/components/org/apache/cocoon/transformation/XPathTransformer.java
  
  Index: XPathTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/java/components/org/apache/cocoon/transformation/XPathTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- XPathTransformer.java	12 Jan 2003 12:25:40 -0000	1.1
  +++ XPathTransformer.java	8 Feb 2003 05:50:38 -0000	1.1.4.1
  @@ -143,8 +143,6 @@
           super.setup(resolver, objectModel, source, parameters);
           this.include = (String)parameters.getParameter("include", "/");
           this.exclude = (String)parameters.getParameter("exclude", null);
  -        this.include = (String)parameters.getParameter("include-if", "/");
  -        this.exclude = (String)parameters.getParameter("exclude-if", null);
           }
   
   
  @@ -162,12 +160,6 @@
           }
       }
   
  -    public void startElement(String uri, String loc, String raw, Attributes a)
  -        throws SAXException
  -    {
  -        getLogger().warn("################################### "+raw);
  -        super.startElement(uri, loc, raw, a);
  -    }
   
       /** Implementation of a template method declared in AbstractDOMTransformer.
        * @param doc DOM of XML received by the transformer
  @@ -418,3 +410,4 @@
           this.exclude = null;
       }
   }
  +
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.8.1   +8 -8      xml-forrest/src/resources/conf/logkit.xconf
  
  Index: logkit.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/logkit.xconf,v
  retrieving revision 1.3
  retrieving revision 1.3.8.1
  diff -u -r1.3 -r1.3.8.1
  --- logkit.xconf	23 Sep 2002 07:32:14 -0000	1.3
  +++ logkit.xconf	8 Feb 2003 05:50:38 -0000	1.3.8.1
  @@ -83,32 +83,32 @@
         When defining subcategory manually, it is required to specify log
         targets, because they are not inherited in this case.
       -->
  -    <category name="core" log-level="DEBUG">
  +    <category name="core" log-level="ERROR">
         <!-- Startup component manager logger -->
         <category name="startup" log-level="DEBUG">
           <log-target id-ref="core"/>
           <log-target id-ref="error"/>
         </category>
   
  -      <category name="roles" log-level="DEBUG">
  +      <category name="roles" log-level="ERROR">
           <log-target id-ref="core"/>
           <log-target id-ref="error"/>
         </category>
   
         <!-- Cocoon component manager logger -->
  -      <category name="manager" log-level="DEBUG">
  +      <category name="manager" log-level="ERROR">
           <log-target id-ref="core"/>
           <log-target id-ref="error"/>
         </category>
   
         <!-- Cocoon cache and stores logger -->
  -      <category name="store" log-level="INFO">
  +      <category name="store" log-level="ERROR">
           <log-target id-ref="core"/>
           <log-target id-ref="error"/>
         </category>
   
         <!-- Cocoon source repository logger -->
  -      <category name="repositories" log-level="INFO">
  +      <category name="repositories" log-level="ERROR">
           <log-target id-ref="core"/>
           <log-target id-ref="error"/>
         </category>
  @@ -117,17 +117,17 @@
         <log-target id-ref="error"/>
       </category>
   
  -    <category name="sitemap" log-level="DEBUG">
  +    <category name="sitemap" log-level="ERROR">
         <log-target id-ref="sitemap"/>
         <log-target id-ref="error"/>
       </category>
   
  -    <category name="access" log-level="DEBUG">
  +    <category name="access" log-level="ERROR">
         <log-target id-ref="access"/>
         <log-target id-ref="error"/>
       </category> 
   
  -    <category name="flow" log-level="DEBUG">
  +    <category name="flow" log-level="ERROR">
         <log-target id-ref="flow"/>
         <log-target id-ref="error"/>
       </category>
  
  
  
  1.60.2.1  +8 -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.60
  retrieving revision 1.60.2.1
  diff -u -r1.60 -r1.60.2.1
  --- sitemap.xmap	27 Jan 2003 00:57:24 -0000	1.60
  +++ sitemap.xmap	8 Feb 2003 05:50:38 -0000	1.60.2.1
  @@ -59,7 +59,6 @@
         <map:serializers default="html">
            <map:serializer name="html" mime-type="text/html" src="org.apache.cocoon.serialization.HTMLSerializer">
               <doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
  -
               <encoding>ISO-8859-1</encoding>
            </map:serializer>
   
  @@ -69,9 +68,7 @@
   
            <map:serializer name="rss091" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer">
               <doctype-public>-//Netscape Communications//DTD RSS 0.91//EN</doctype-public>
  -
               <doctype-system>http://my.netscape.com/publish/formats/rss-0.91.dtd</doctype-system>
  -
               <encoding>ISO-8859-1</encoding>
            </map:serializer>
   
  @@ -446,7 +443,7 @@
   
                  <map:transform src="library/xslt/html2document.xsl" />
   
  -               <map:transform type="linkrewriter" src="cocoon:/linkmap" />
  +               <map:transform type="linkrewriter" src="cocoon:/{../1}/linkmap" />
   
                  <map:transform type="idgen" />
   
  @@ -462,7 +459,7 @@
                  <map:parameter name="url" value="content/xdocs/{1}/{2}.ehtml" />
                  <map:generate src="content/xdocs/{../1}/{../2}.ehtml"/>
                  <map:transform src="library/xslt/html2htmlbody.xsl" />
  -               <map:transform type="linkrewriter" src="cocoon:/linkmap" />
  +               <map:transform type="linkrewriter" src="cocoon:/{../1}/linkmap" />
                  <map:serialize type="xml"/>
               </map:act>
   
  @@ -482,7 +479,7 @@
   
                  <map:transform src="library/xslt/html2document.xsl" />
   
  -               <map:transform type="linkrewriter" src="cocoon:/linkmap" />
  +               <map:transform type="linkrewriter" src="cocoon:/{../1}/linkmap" />
   
                  <map:transform type="idgen" />
   
  @@ -686,6 +683,11 @@
   
                  <map:match pattern="**.pdf">
                     <map:read src="content/{1}.pdf" mime-type="application/pdf" />
  +               </map:match>
  +
  +               <map:match pattern="**.swf">
  +                 <map:read src="content/{1}.swf"
  +                   mime-type="application/x-shockwave-flash" />
                  </map:match>
   
                  <map:match pattern="**">
  
  
  
  1.1.8.1   +5 -0      xml-forrest/src/resources/conf/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/web.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.8.1
  diff -u -r1.1 -r1.1.8.1
  --- web.xml	29 May 2002 16:44:56 -0000	1.1
  +++ web.xml	8 Feb 2003 05:50:38 -0000	1.1.8.1
  @@ -252,5 +252,10 @@
       <extension>css</extension>
       <mime-type>text/css</mime-type>
     </mime-mapping>
  + 
  +  <mime-mapping>
  +    <extension>swf</extension>
  +    <mime-type>application/x-shockwave-flash</mime-type>
  +  </mime-mapping>
   
   </web-app>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.8.1   +1 -0      xml-forrest/src/resources/forrest-shbat/forrest.antproxy.xml
  
  Index: forrest.antproxy.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/forrest.antproxy.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.8.1
  diff -u -r1.1 -r1.1.8.1
  --- forrest.antproxy.xml	31 Oct 2002 11:59:59 -0000	1.1
  +++ forrest.antproxy.xml	8 Feb 2003 05:50:38 -0000	1.1.8.1
  @@ -45,6 +45,7 @@
         <classpath refid="forrest-classpath"/>
         <jvmarg value="-Dforrest.home=${forrest.home}"/>
         <jvmarg value="-Dbasedir=${basedir}"/>
  +      <jvmarg value="-Dproject.home=${project.home}"/>
         <jvmarg value="-Djava.endorsed.dirs=${forrest.home}/lib/endorsed${path.separator}${java.endorsed.dirs}"/>
         <arg line="-f ${forrest.home}/forrest.build.xml -emacs ${target}"/>
       </java>
  
  
  
  1.48.2.2  +9 -6      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.48.2.1
  retrieving revision 1.48.2.2
  diff -u -r1.48.2.1 -r1.48.2.2
  --- forrest.build.xml	31 Jan 2003 09:38:28 -0000	1.48.2.1
  +++ forrest.build.xml	8 Feb 2003 05:50:38 -0000	1.48.2.2
  @@ -549,6 +549,7 @@
       <mkdir dir="${project.work-dir}"/>
   
       <parallel>
  +
         <java classname="org.apache.cocoon.Main"
           fork="true"
           dir="."
  @@ -566,7 +567,6 @@
           <arg value="${project.start-uri}"/>              <!-- starting page -->
           <arg value="-V" />                          <!-- be verbose -->
         </java>
  -
         <sequential>
           <!-- 
           | Copy all non-xdocs content across, as we cannot rely on crawling to
  @@ -589,13 +589,16 @@
             <fileset dir="${skindir}/images"/>
           </copy>
   
  -        <!-- Copy CSS and JS files -->
  +        <!-- Copy all other non-resource files -->
           <copy toDir="${project.site-dir}/skin" filtering="false"
             overwrite="true"
             failonerror="false">
  -          <fileset dir="${skindir}/css"/>
  -          <fileset
  -            dir="${skindir}/scripts"/>
  +          <mapper type="flatten"/>
  +          <fileset dir="${skindir}">
  +            <exclude name="images/**"/>
  +            <exclude name="xslt/**"/>
  +          </fileset>
  +
           </copy>
   
         </sequential>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.13.6.1  +2 -2      xml-forrest/src/resources/forrestbot/ant/templates.build.xml
  
  Index: templates.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrestbot/ant/templates.build.xml,v
  retrieving revision 1.13
  retrieving revision 1.13.6.1
  diff -u -r1.13 -r1.13.6.1
  --- templates.build.xml	1 Dec 2002 15:51:32 -0000	1.13
  +++ templates.build.xml	8 Feb 2003 05:50:39 -0000	1.13.6.1
  @@ -231,8 +231,8 @@
       <!--<ant dir="${project.ctxt-dir}"-->
         <ant dir="${project.ctxt-dir}"
           antfile="${forrest.home}/forrest.build.xml" target="-site">
  -        <property name="project.content.present"
  -          value="HACK"/>
  +        <property name="project.content.present" value="HACK"/>
  +        <property name="project.skin" value="${prepare.skin}"/>
         </ant>
     </target>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.6.1   +21 -3     xml-forrest/src/resources/forrestbot/bin/forrestbot
  
  Index: forrestbot
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrestbot/bin/forrestbot,v
  retrieving revision 1.3
  retrieving revision 1.3.6.1
  diff -u -r1.3 -r1.3.6.1
  --- forrestbot	28 Nov 2002 15:34:31 -0000	1.3
  +++ forrestbot	8 Feb 2003 05:50:39 -0000	1.3.6.1
  @@ -1,5 +1,16 @@
   #!/bin/sh
   
  +cygwin=false;
  +darwin=false;
  +case "`uname`" in
  +  CYGWIN*) cygwin=true ;;
  +  Darwin*) darwin=true
  +           if [ -z "$JAVA_HOME" ] ; then
  +             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home   
  +           fi
  +           ;;
  +esac
  +
   # Try to determine the FORREST_HOME
   if [ -z "$FORREST_HOME" ] ; then
     # Note: this piece of code is based on ant's shell script
  @@ -30,7 +41,12 @@
     cd $saveddir
   fi
   
  -FORRESTBOT_HOME="$FORREST_HOME/forrestbot"
  +if ["$cygwin" = "true"]; then
  +  FORRESTBOT_HOME=`cygpath -w "$FORREST_HOME/forrestbot"`
  +else
  +  FORRESTBOT_HOME="$FORREST_HOME/forrestbot"
  +fi
  +
   
   # set the ant file to use
   ANTFILE="$FORRESTBOT_HOME/forrestbot.build.xml"
  @@ -41,10 +57,12 @@
   
   # ----- Set Up The Runtime Classpath ------------------------------------------
   
  -if [ "$TERM" = "cygwin" ] ; then
  +if [ "$cygwin" = "true" ] ; then
     S=';'
  +  BASEDIR=`cygpath -w "$PWD"`
   else
     S=':'
  +  BASEDIR=$PWD
   fi
   
   CP="$CLASSPATH"
  @@ -56,7 +74,7 @@
   
   echo "Apache Forrest.  Run 'forrest -projecthelp' to list options"
   echo
  -"$FORREST_HOME/ant/bin/ant" -buildfile "$ANTFILE" -Dbasedir="$PWD" -Dforrest.home="$FORREST_HOME"
-emacs $@
  +"$FORREST_HOME/ant/bin/ant" -buildfile "$ANTFILE" -Dbasedir="$BASEDIR" -Dforrest.home="$FORREST_HOME"
-emacs $@
   
   # ---- Restore Classpath
   unset CLASSPATH
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.6.1   +1 -1      xml-forrest/src/resources/forrestbot/samples/entities/krysalis-centipede.ent
  
  Index: krysalis-centipede.ent
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrestbot/samples/entities/krysalis-centipede.ent,v
  retrieving revision 1.1
  retrieving revision 1.1.6.1
  diff -u -r1.1 -r1.1.6.1
  --- krysalis-centipede.ent	7 Dec 2002 13:02:45 -0000	1.1
  +++ krysalis-centipede.ent	8 Feb 2003 05:50:39 -0000	1.1.6.1
  @@ -1,6 +1,6 @@
     <project name="krysalis-centipede" sendlogto="&email;">
       <prepare>
  -      <skin name="forrest-site"/>
  +      <skin name="krysalis-site"/>
       </prepare>
       <get-src type="cvs">
         <module name="krysalis-centipede"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.1   +1 -0      xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/site.xml
  
  Index: site.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/site.xml,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- site.xml	27 Jan 2003 00:58:39 -0000	1.8
  +++ site.xml	8 Feb 2003 05:50:39 -0000	1.8.2.1
  @@ -25,6 +25,7 @@
       </sample>
       <sample-ihtml label="Sample ihtml page" href="ihtml-sample.html"/>
       <sample-ihtml label="Sample ehtml page" href="ehtml-sample.html"/>
  +    <sample-cwiki label="Sample cwiki page" href="cwiki-sample.html"/>
       <faq label="FAQ" href="faq.html"/>
       <changes label="Changes" href="changes.html"/>
       <todo label="Todo" href="todo.html"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/cwiki-sample.cwiki
  
  Index: cwiki-sample.cwiki
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/src/documentation/content/xdocs/cwiki-sample.cwiki,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      xml-forrest/src/resources/library/xslt/wiki2html.xsl
  
  Index: wiki2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/library/xslt/wiki2html.xsl,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      xml-forrest/src/resources/library/xslt/wiki2htmlpage.xsl
  
  Index: wiki2htmlpage.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/library/xslt/wiki2htmlpage.xsl,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.6.1   +1 -1      xml-forrest/src/resources/skins/common/xslt/html/renderlogo.xsl
  
  Index: renderlogo.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/common/xslt/html/renderlogo.xsl,v
  retrieving revision 1.1
  retrieving revision 1.1.6.1
  diff -u -r1.1 -r1.1.6.1
  --- renderlogo.xsl	16 Nov 2002 20:58:12 -0000	1.1
  +++ renderlogo.xsl	8 Feb 2003 05:50:39 -0000	1.1.6.1
  @@ -21,7 +21,7 @@
       <xsl:param name="root"/>
       <a href="{$url}">
         <xsl:choose>
  -        <xsl:when test="$logo">
  +        <xsl:when test="$logo and not($logo = '')">
             <img alt="{$name}" class="logoImage" border="0">
               <xsl:attribute name="src">
   	      <xsl:if test="not(starts-with($logo, 'http://'))"><xsl:value-of select="$root"/></xsl:if>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.8.8.1   +6 -0      xml-forrest/src/resources/skins/forrest-site/css/page.css
  
  Index: page.css
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/forrest-site/css/page.css,v
  retrieving revision 1.8
  retrieving revision 1.8.8.1
  diff -u -r1.8 -r1.8.8.1
  --- page.css	30 Oct 2002 01:18:09 -0000	1.8
  +++ page.css	8 Feb 2003 05:50:41 -0000	1.8.8.1
  @@ -48,3 +48,9 @@
   .dtdElement { width: 100%;	font-size: 90%; background-color : #ffffff; }
   
   .dtdTag {    color: #990000; text-transform : uppercase;  font-style : normal;  font-size
: 120%;  font-weight : bold; }
  +
  +
  +@media print {
  +   .menu {
  +     display: none;
  +   }
  \ No newline at end of file
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.4.1   +16 -0     xml-forrest/src/resources/skins/krysalis-site/css/page.css
  
  Index: page.css
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/krysalis-site/css/page.css,v
  retrieving revision 1.3
  retrieving revision 1.3.4.1
  diff -u -r1.3 -r1.3.4.1
  --- page.css	25 Jan 2003 11:11:43 -0000	1.3
  +++ page.css	8 Feb 2003 05:50:41 -0000	1.3.4.1
  @@ -170,4 +170,20 @@
   }
   
   
  +@media print {
  +  .menu { display: none;  }
  +  .minitoc { display: none;  }
  +  .search { display: none;  }
  +  .footnote { display: none;  }
  +  .tab  { display: none;  }
  +  .trail  { display: none;  }
  +  .top-left { display: none;  }
  +  .top-right { display: none;  }
  +  .top-left-tab  { display: none;  }
  +  .top-right-tab  { display: none;  }
  +  .bottom-left  { display: none;  }
  +  .bottom-right  { display: none;  }
  +  .bottom-left-thick { display: none;  }
  +  .bottom-right-thick  { display: none;  }
   
  +}
  \ No newline at end of file
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +2 -2      xml-forrest/src/resources/skins/krysalis-site/xslt/html/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/krysalis-site/xslt/html/document2html.xsl,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- document2html.xsl	27 Jan 2003 18:35:00 -0000	1.3
  +++ document2html.xsl	8 Feb 2003 05:50:41 -0000	1.3.2.1
  @@ -34,7 +34,7 @@
                 <td align="center" width="80" nowrap="nowrap"><a href="{$filename-noext}.pdf"
class="dida">
                 <img border="0" src="{$skin-img-dir}/printer.png" alt="print-friendly
version"/><br/>
                   print-friendly<br/>
  -                version</a>
  +                PDF</a>
                 </td>
               </xsl:if>
             </tr>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      xml-forrest/src/resources/skins/template/css/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/template/css/README.txt,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      xml-forrest/src/resources/skins/template/images/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/template/images/README.txt,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      xml-forrest/src/resources/skins/template/scripts/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/template/scripts/README.txt,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      xml-forrest/src/resources/skins/template/xslt/fo/document2fo.xsl
  
  Index: document2fo.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/template/xslt/fo/document2fo.xsl,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      xml-forrest/src/resources/skins/template/xslt/html/book2menu.xsl
  
  Index: book2menu.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/template/xslt/html/book2menu.xsl,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      xml-forrest/src/resources/skins/template/xslt/html/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/template/xslt/html/document2html.xsl,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +1 -1      xml-forrest/src/resources/skins/template/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/template/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      xml-forrest/src/resources/skins/template/xslt/html/tab2menu.xsl
  
  Index: tab2menu.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/template/xslt/html/tab2menu.xsl,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  

Mime
View raw message