You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ni...@apache.org on 2004/04/26 09:25:48 UTC
svn commit: rev 10277 - in xml/forrest/branches/copyless: . etc/cocoon_upgrade legal scratchpad/forrestbot2/core src/core/context src/core/context/WEB-INF src/core/context/resources/schema/dtd src/core/context/resources/stylesheets src/core/context/skins/common src/core/context/skins/common/xslt/html src/core/context/skins/forrest-site/xslt/html src/core/fresh-site/src/documentation src/documentation/content/xdocs tools/ant/lib tools/jetty
Author: nicolaken
Date: Mon Apr 26 00:25:46 2004
New Revision: 10277
Added:
xml/forrest/branches/copyless/legal/jetty-4.2.19.jar.license.html
- copied unchanged from rev 10274, xml/forrest/trunk/legal/jetty-4.2.19.jar.license.html
xml/forrest/branches/copyless/legal/jsch-0.1.14.jar.license.txt
- copied unchanged from rev 10274, xml/forrest/trunk/legal/jsch-0.1.14.jar.license.txt
xml/forrest/branches/copyless/tools/ant/lib/ant-jsch.jar (props changed)
- copied unchanged from rev 10274, xml/forrest/trunk/tools/ant/lib/ant-jsch.jar
xml/forrest/branches/copyless/tools/ant/lib/jsch-0.1.14.jar (props changed)
- copied unchanged from rev 10274, xml/forrest/trunk/tools/ant/lib/jsch-0.1.14.jar
xml/forrest/branches/copyless/tools/jetty/jetty-4.2.19.jar (props changed)
- copied unchanged from rev 10274, xml/forrest/trunk/tools/jetty/jetty-4.2.19.jar
Removed:
xml/forrest/branches/copyless/legal/LICENSE.jetty.html
xml/forrest/branches/copyless/tools/jetty/jetty-4.2.14.jar
Modified:
xml/forrest/branches/copyless/etc/cocoon_upgrade/build.xml
xml/forrest/branches/copyless/scratchpad/forrestbot2/core/deploy.xml
xml/forrest/branches/copyless/scratchpad/forrestbot2/core/getsrc.xml
xml/forrest/branches/copyless/src/core/context/WEB-INF/cocoon.xconf
xml/forrest/branches/copyless/src/core/context/resources.xmap
xml/forrest/branches/copyless/src/core/context/resources/schema/dtd/skinconfig-v06.dtd
xml/forrest/branches/copyless/src/core/context/resources/stylesheets/upgrade-skinconf.xsl
xml/forrest/branches/copyless/src/core/context/skins/common/skinconf.xsl
xml/forrest/branches/copyless/src/core/context/skins/common/xslt/html/site2xhtml.xsl
xml/forrest/branches/copyless/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl
xml/forrest/branches/copyless/src/core/fresh-site/src/documentation/skinconf.xml
xml/forrest/branches/copyless/src/documentation/content/xdocs/forrestbot.xml
xml/forrest/branches/copyless/status.xml
Log:
Synch with trunk
Modified: xml/forrest/branches/copyless/etc/cocoon_upgrade/build.xml
==============================================================================
--- xml/forrest/branches/copyless/etc/cocoon_upgrade/build.xml (original)
+++ xml/forrest/branches/copyless/etc/cocoon_upgrade/build.xml Mon Apr 26 00:25:46 2004
@@ -29,7 +29,7 @@
</target>
<target name="import-cocoon-xconf" depends="init">
- <xslt in="${cocoon.home}/src/webapp/WEB-INF/cocoon.xconf" out="${forrest.root}/src/core/context/WEB-INF/cocoon.xconf" style="./upgrade-cocoon-xconf.xsl" >
+ <xslt in="${cocoon.home}/src/webapp/WEB-INF/cocoon.xconf" out="${forrest.build}/context/WEB-INF/cocoon.xconf" style="./upgrade-cocoon-xconf.xsl" >
<outputproperty name="indent" value="yes"/>
</xslt>
</target>
Modified: xml/forrest/branches/copyless/scratchpad/forrestbot2/core/deploy.xml
==============================================================================
--- xml/forrest/branches/copyless/scratchpad/forrestbot2/core/deploy.xml (original)
+++ xml/forrest/branches/copyless/scratchpad/forrestbot2/core/deploy.xml Mon Apr 26 00:25:46 2004
@@ -28,6 +28,13 @@
<!-- set a property to be used in the notify target -->
<property name="notify.deploy-location" value="${deploy.local.dir}"/>
</target>
+
+ <property name="deploy.scp.dest" value=""/>
+ <target name="deploy.scp">
+ <scp todir="${deploy.scp.dest}">
+ <fileset dir="${build.site-dir}"/>
+ </scp>
+ </target>
<property name="deploy.cvs.user" value="anoncvs"/>
<property name="deploy.cvs.password" value="anoncvs"/>
@@ -52,7 +59,7 @@
<copy todir="${deploy.cvsmodule-dir}/${deploy.cvs.module}">
<fileset dir="${build.site-dir}"/>
</copy>
- <!-- add new files to CVS -->
+ <!-- add new files to CVS -->
<!-- check in to CVS -->
<cvs command="commit" cvsRoot="${deploy.cvs.fullroot}"
dest="${deploy.cvsmodule-dir}/${deploy.cvs.module}"
Modified: xml/forrest/branches/copyless/scratchpad/forrestbot2/core/getsrc.xml
==============================================================================
--- xml/forrest/branches/copyless/scratchpad/forrestbot2/core/getsrc.xml (original)
+++ xml/forrest/branches/copyless/scratchpad/forrestbot2/core/getsrc.xml Mon Apr 26 00:25:46 2004
@@ -19,11 +19,14 @@
<!-- default values -->
<property name="getsrc.local.root-dir" value=""/>
+ <target name="getsrc.clean-workdir">
+ <delete dir="${build.work-dir}"/>
+ </target>
+
<target name="getsrc.local">
<property name="build.home-dir" value="${getsrc.local.root-dir}" />
</target>
-
<!-- default values -->
<property name="getsrc.cvs.user" value="anoncvs"/>
<property name="getsrc.cvs.password" value="anoncvs"/>
@@ -34,7 +37,7 @@
<property name="build.cvsmodule-dir" location="work/cvsmodules"/>
- <target name="getsrc.cvs">
+ <target name="getsrc.cvs" depends="getsrc.clean-workdir">
<cvspass cvsroot=":pserver:${getsrc.cvs.user}@${getsrc.cvs.host}:${getsrc.cvs.root}" password="${getsrc.cvs.password}"/>
@@ -98,7 +101,7 @@
<property name="build.svn-dir" location="work/svn"/>
- <target name="getsrc.svn">
+ <target name="getsrc.svn" depends="getsrc.clean-workdir">
<!-- non-recursive; just to get forrest.properties -->
<svncheckout repositoryUrl="${getsrc.svn.url}"
destination="${build.svn-dir}/${ant.project.name}"
Modified: xml/forrest/branches/copyless/src/core/context/WEB-INF/cocoon.xconf
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/WEB-INF/cocoon.xconf (original)
+++ xml/forrest/branches/copyless/src/core/context/WEB-INF/cocoon.xconf Mon Apr 26 00:25:46 2004
@@ -191,7 +191,8 @@
<values>
<skin>@project.skin@</skin>
<status>@project.home@/@project.status@</status>
- <skinconf>@project.home@/@project.skinconf@</skinconf>
+ <!--FIXME: hard code values -->
+ <skinconf>skinconf.xml</skinconf>
<doc>@project.home@/@project.content-dir@/</doc>
<content>@project.home@/@project.raw-content-dir@/</content>
<content.xdocs>@project.home@/@project.xdocs-dir@/</content.xdocs>
Modified: xml/forrest/branches/copyless/src/core/context/resources.xmap
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/resources.xmap (original)
+++ xml/forrest/branches/copyless/src/core/context/resources.xmap Mon Apr 26 00:25:46 2004
@@ -189,6 +189,25 @@
<map:pipelines>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<map:pipeline>
<map:match pattern="**skin/**.js">
<map:call resource="skin-read">
@@ -358,4 +377,4 @@
</map:match>
</map:pipeline>
</map:pipelines>
-</map:sitemap>
\ No newline at end of file
+</map:sitemap>
Modified: xml/forrest/branches/copyless/src/core/context/resources/schema/dtd/skinconfig-v06.dtd
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/resources/schema/dtd/skinconfig-v06.dtd (original)
+++ xml/forrest/branches/copyless/src/core/context/resources/schema/dtd/skinconfig-v06.dtd Mon Apr 26 00:25:46 2004
@@ -44,25 +44,24 @@
href CDATA #REQUIRED' >
- <!ELEMENT skinconfig (disable-lucene?, disable-search?,
- disable-print-link?, disable-pdf-link?, disable-xml-link?,
- disable-external-link-image?, disable-compliance-links?,
- obfuscate-mail-links?, searchsite-domain?, searchsite-name?,
+ <!ELEMENT skinconfig (search?, disable-print-link?, disable-pdf-link?,
+ disable-xml-link?, disable-external-link-image?,
+ disable-compliance-links?, obfuscate-mail-links?,
project-name?, project-description?, project-url?, project-logo,
group-name?, group-description?, group-url?, group-logo,
host-url?, host-logo, favicon-url?, year?, vendor?, trail?,
- toc?, headings?, extra-css?, colors?, credits?, pdf?)>
+ toc?, headings?, extra-css?, colors?, pdf?, credits?)>
- <!ELEMENT disable-lucene (#PCDATA)>
- <!ELEMENT disable-search (#PCDATA)>
+ <!ELEMENT search EMPTY>
+ <!ATTLIST search name CDATA #IMPLIED
+ domain CDATA #IMPLIED
+ provider CDATA #IMPLIED>
<!ELEMENT disable-print-link (#PCDATA)>
<!ELEMENT disable-pdf-link (#PCDATA)>
<!ELEMENT disable-xml-link (#PCDATA)>
<!ELEMENT disable-external-link-image (#PCDATA)>
<!ELEMENT disable-compliance-links (#PCDATA)>
<!ELEMENT obfuscate-mail-links (#PCDATA)>
- <!ELEMENT searchsite-domain (#PCDATA)>
- <!ELEMENT searchsite-name (#PCDATA)>
<!ELEMENT project-name (#PCDATA)>
<!ELEMENT project-description (#PCDATA)>
<!ELEMENT project-url (#PCDATA)>
Modified: xml/forrest/branches/copyless/src/core/context/resources/stylesheets/upgrade-skinconf.xsl
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/resources/stylesheets/upgrade-skinconf.xsl (original)
+++ xml/forrest/branches/copyless/src/core/context/resources/stylesheets/upgrade-skinconf.xsl Mon Apr 26 00:25:46 2004
@@ -22,11 +22,43 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:import href="copyover.xsl"/>
+
<xsl:template match="toc/@level">
<xsl:attribute name="max-depth">
<xsl:value-of select="."/>
</xsl:attribute>
<xsl:apply-templates />
</xsl:template>
+
+ <!--Search Element-->
+ <!--First ignore these elements to avoid been copied.-->
+ <xsl:template match="disable-lucene|searchsite-name|searchsite-domain|comment()"/>
+ <xsl:template match="disable-search">
+ <xsl:if test=".='false'">
+ <xsl:element name="search">
+ <xsl:apply-templates select="../disable-lucene" mode="search-enable"/>
+ <xsl:apply-templates select="../searchsite-name" mode="search-enable"/>
+ <xsl:apply-templates select="../searchsite-domain" mode="search-enable"/>
+ </xsl:element>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template match="disable-lucene" mode="search-enable">
+ <xsl:if test=".='false'">
+ <xsl:attribute name="provider">lucene</xsl:attribute>
+ </xsl:if>
+ </xsl:template >
+
+ <xsl:template match="searchsite-name" mode="search-enable">
+ <xsl:attribute name="name">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ </xsl:template>
+
+ <xsl:template match="searchsite-domain" mode="search-enable">
+ <xsl:attribute name="domain">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ </xsl:template >
</xsl:stylesheet>
Modified: xml/forrest/branches/copyless/src/core/context/skins/common/skinconf.xsl
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/skins/common/skinconf.xsl (original)
+++ xml/forrest/branches/copyless/src/core/context/skins/common/skinconf.xsl Mon Apr 26 00:25:46 2004
@@ -17,13 +17,7 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="skinconfig">
-
- <xsl:if test="not(disable-lucene)">
- <disable-lucene>true</disable-lucene>
- </xsl:if>
- <xsl:if test="not(disable-search)">
- <disable-search>true</disable-search>
- </xsl:if>
+ <xsl:copy>
<xsl:if test="not(disable-print-link)">
<disable-print-link>true</disable-print-link>
</xsl:if>
@@ -44,12 +38,6 @@
</xsl:if>
<!--
- <xsl:if test="not(searchsite-domain)">
- <searchsite-domain>mydomain</searchsite-domain>
- </xsl:if>
- <xsl:if test="not(searchsite-name)">
- <searchsite-name>MyProject</searchsite-name>
- </xsl:if>
<xsl:if test="not(project-name)">
<project-name>MyProject</project-name>
</xsl:if>
@@ -152,7 +140,6 @@
</credits>
</xsl:if>
- <xsl:copy>
<xsl:copy-of select="@*"/>
<xsl:copy-of select="node()"/>
<!--
Modified: xml/forrest/branches/copyless/src/core/context/skins/common/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/skins/common/xslt/html/site2xhtml.xsl (original)
+++ xml/forrest/branches/copyless/src/core/context/skins/common/xslt/html/site2xhtml.xsl Mon Apr 26 00:25:46 2004
@@ -37,6 +37,7 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:variable name="config" select="//skinconfig"/>
+
<xsl:param name="path"/>
<xsl:include href="dotdots.xsl"/>
Modified: xml/forrest/branches/copyless/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl (original)
+++ xml/forrest/branches/copyless/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl Mon Apr 26 00:25:46 2004
@@ -106,9 +106,9 @@
<xsl:comment>================= start Search ==================</xsl:comment>
<td bgcolor="{$header-color}" rowspan="2" valign="top">
- <xsl:if test="not(//skinconfig/disable-search) or
- //skinconfig/disable-search='false' and //skinconfig/searchsite-domain and
- //skinconfig/searchsite-name">
+ <xsl:if test="$config/search">
+
+
<form method="get" action="http://www.google.com/search" target="_blank">
<table bgcolor="{$menu-border}" cellpadding="0" cellspacing="0" border="0" summary="search">
<tr>
@@ -117,13 +117,13 @@
<tr>
<td><img class="spacer" src="{$spacer}" alt="" width="1" height="1" /></td>
<td nowrap="nowrap">
- <input type="hidden" name="sitesearch" value="{//skinconfig/searchsite-domain}"/>
+ <input type="hidden" name="sitesearch" value="{$config/search/attribute::domain}"/>
<input type="text" id="query" name="q" size="15"/>
<img class="spacer" src="{$spacer}" alt="" width="5" height="1" />
<input type="submit" value="Search" name="Search"/>
<br />
<font color="white" size="2" face="Arial, Helvetica, Sans-serif">
- the <xsl:value-of select="//skinconfig/searchsite-name"/> site
+ the <xsl:value-of select="$config/search/attribute::name"/> site
<!-- setting search options off for the moment -->
<!--
<input type="radio" name="web" value="web"/>web site  <input type="radio" name="mail" value="mail"/>mail lists
Modified: xml/forrest/branches/copyless/src/core/fresh-site/src/documentation/skinconf.xml
==============================================================================
--- xml/forrest/branches/copyless/src/core/fresh-site/src/documentation/skinconf.xml (original)
+++ xml/forrest/branches/copyless/src/core/fresh-site/src/documentation/skinconf.xml Mon Apr 26 00:25:46 2004
@@ -20,12 +20,8 @@
be used to configure the chosen Forrest skin.
-->
<skinconfig>
- <!-- Do we want to disable the Lucene search box? -->
- <disable-lucene>true</disable-lucene>
- <!-- Do we want to disable the Google search box? -->
- <!-- Ensure not both 'false' -->
- <!-- To show search box in an alternative location use 'alt' -->
- <disable-search>false</disable-search>
+ <!-- To enable lucene search add provider="lucene" -->
+ <search name="MyProject" domain="mydomain"/>
<!-- Do we want to disable the print link? If enabled, invalid HTML 4.0.1 -->
<disable-print-link>true</disable-print-link>
@@ -47,9 +43,6 @@
<!-- Whether to render mailto: links unrecognisable by spam harvesters -->
<obfuscate-mail-links>true</obfuscate-mail-links>
- <searchsite-domain>mydomain</searchsite-domain>
- <searchsite-name>MyProject</searchsite-name>
-
<!-- mandatory project logo
skin: forrest-site renders it at the top -->
<project-name>MyProject</project-name>
@@ -103,6 +96,9 @@
<!-- Heading types can be clean|underlined|boxed -->
<headings type="boxed"/>
+ <extra-css>
+ </extra-css>
+
<colors>
<!-- Krysalis -->
@@ -202,20 +198,16 @@
-->
</colors>
- <!-- FIXME: this element does not validate (JJP)
- <extra-css>
- </extra-css>
- -->
<!-- Settings specific to PDF output. -->
- <!-- FIXME: this element does not validate (JJP)
<pdf>
+ <!--
Supported page sizes are a0, a1, a2, a3, a4, a5, executive,
folio, legal, ledger, letter, quarto, tabloid (default letter).
Supported page orientations are portrait, landscape (default
portrait).
- <page size="letter" orientation="portrait"/>
-->
+ <page size="letter" orientation="portrait"/>
<!--
Margins can be specified for top, bottom, inner, and outer
@@ -224,6 +216,7 @@
inner edge will be left on odd pages, right on even pages,
the outer edge vice versa.
Specified below are the default settings.
+ -->
<margins double-sided="false">
<top>1in</top>
<bottom>1in</bottom>
@@ -231,7 +224,6 @@
<outer>1in</outer>
</margins>
</pdf>
- -->
<!-- Credits are typically rendered as a set of small clickable images in the
page footer -->
Modified: xml/forrest/branches/copyless/src/documentation/content/xdocs/forrestbot.xml
==============================================================================
--- xml/forrest/branches/copyless/src/documentation/content/xdocs/forrestbot.xml (original)
+++ xml/forrest/branches/copyless/src/documentation/content/xdocs/forrestbot.xml Mon Apr 26 00:25:46 2004
@@ -23,11 +23,10 @@
<body>
<warning>This documentation applies to the forrestbot in the current
- development version (i.e. svn trunk) and not the
- forrestbot included with Forrest 0.5.1 or any previous release.
- Documentation for that forrestbot is <link
- href="site:forrestbot-old">here</link>. This page is incomplete and may have
- errors.</warning>
+ development version (i.e. svn trunk) and not the forrestbot included with
+ Forrest 0.5.1 or any previous release. Documentation for that forrestbot
+ is <link href="site:forrestbot-old">here</link>. This page is incomplete
+ and may have errors.</warning>
<section>
<title>Using Forrestbot</title>
@@ -61,9 +60,9 @@
</source>
<p>First, set properties needed by the workstages you are going to use.
- Here, we set properties that will be used by notify.email and getsrc.cvs.
- Next, specify what implementations will be used by each workstage. By
- default, 'local' will be used.</p>
+ Here, we set properties that will be used by notify.email and
+ getsrc.cvs. Next, specify what implementations will be used by each
+ workstage. By default, 'local' will be used.</p>
<table>
<tr>
@@ -96,7 +95,9 @@
<td>deploy</td>
<td><ul>
- <li><link href="#getsrc.local">local</link></li>
+ <li><link href="#deploy.local">local</link></li>
+
+ <li><link href="#deploy.scp">scp</link></li>
</ul></td>
</tr>
@@ -235,8 +236,8 @@
<tr>
<td>getsrc.cvs.module</td>
- <td>CVS module name (an alias, or full path) to the directory that
- contains forrest.properties</td>
+ <td>CVS module name (an alias, or full path) to the directory
+ that contains forrest.properties</td>
<td>${ant.project.name}</td>
@@ -273,7 +274,7 @@
<td>getsrc.svn.url</td>
<td>full repository URL for project (this directory must contain
- forrest.properties) </td>
+ forrest.properties)</td>
<td></td>
@@ -328,7 +329,7 @@
</table>
</section>
- <section id="deploy.local">
+ <section id="deploy.scp">
<title>deploy.local</title>
<table>
@@ -355,6 +356,37 @@
</table>
</section>
+ <section id="deploy.local">
+ <title>deploy.scp</title>
+
+ <p>${user.home}/.ssh/known_hosts must properly recognize the host,
+ so you should manually make an ssh connection to the host if you
+ never have before.</p>
+
+ <table>
+ <tr>
+ <th>Property</th>
+
+ <th>Description</th>
+
+ <th>Default Value</th>
+
+ <th>Required?</th>
+ </tr>
+
+ <tr>
+ <td>deploy.scp.dest</td>
+
+ <td>Full destination reference in the format
+ user[:password]@host:/directory/path</td>
+
+ <td></td>
+
+ <td>Yes</td>
+ </tr>
+ </table>
+ </section>
+
<section id="notify">
<title>notify</title>
@@ -460,9 +492,9 @@
<section>
<title>Forrestbot design</title>
- <p>Forrest and forrestbot use ant buildfiles extensively. Ant 1.6's import
- task is used to import multiple buildfiles into a single build. The
- following is the flow of control when running forrestbot:</p>
+ <p>Forrest and forrestbot use ant buildfiles extensively. Ant 1.6's
+ import task is used to import multiple buildfiles into a single build.
+ The following is the flow of control when running forrestbot:</p>
<ul>
<li>Your buildfile<ul>
@@ -476,11 +508,11 @@
<p>The workstage buildfiles set up the properties and files so that the
main forrest buildfile (forrest.build.xml) will run. After it is run,
- other workstages buildfiles can implement reporting, deployment, or other
- post-build activities.</p>
+ other workstages buildfiles can implement reporting, deployment, or
+ other post-build activities.</p>
<p>Your buildfile can specify which workstages you want to use, set
properties for them, and do any additional pre- and post-processing.</p>
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: xml/forrest/branches/copyless/status.xml
==============================================================================
--- xml/forrest/branches/copyless/status.xml (original)
+++ xml/forrest/branches/copyless/status.xml Mon Apr 26 00:25:46 2004
@@ -45,6 +45,16 @@
<changes>
<release version="0.6-dev" date="unreleased">
<action dev="JJP" type="fix" context="core" >
+ Replace document() function to get skinconf values and use "//skinconfig"
+ Fix order so it can validate skinconf
+ Use <search/> instead of <disable-search/> <disable-lucene/>
+ <searchsite-domain/> <searchsite-name/>
+ Fix skinconf.xsl so it produces a proper skinconf
+ </action>
+ <action dev="AG" type="fix" context="core" >
+ Updated jetty to 4.2.19
+ </action>
+ <action dev="JJP" type="fix" context="core" >
Update scripts and config files to allow upgrade to cocoon 2.1.5-dev
</action>
<action dev="JJP" type="add" context="core" >