Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/status.xml?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/status.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/status.xml Mon Apr 9 22:45:15 2007 @@ -16,27 +16,24 @@ limitations under the License. --> <status> - <developers> - <!-- Add new developers here --> +<!-- Add new developers here --> <person name="Volunteer needed" email="[email protected]" id="open"/> </developers> - - <!-- Define here the Title of the Context you want to display in the Changes pages. +<!-- Define here the Title of the Context you want to display in the Changes pages. id = the context value of actions title = Title of the Context - --> + --> <contexts> - <!-- Add new contexts here --> - <context id="code" title="Changes to the Code Base"/> - <context id="docs" title="Changes to Documentation"/> - <context id="admin" title="Changes to Project Administration"/> - <context id="design" title="Changes to Design"/> - <context id="build" title="Changes to Build"/> - </contexts> - +<!-- Add new contexts here --> + <context id="code" title="Changes to the Code Base"/> + <context id="docs" title="Changes to Documentation"/> + <context id="admin" title="Changes to Project Administration"/> + <context id="design" title="Changes to Design"/> + <context id="build" title="Changes to Build"/> + </contexts> <changes> - <!-- Add new releases here --> +<!-- Add new releases here --> <release version="0.1" date="unreleased"> <action dev="TS" type="update" context="code" fixes-bug="FOR-848" due-to="Gavin"> Upgrade NoteTaking plugin to use current Dispatcher @@ -46,7 +43,6 @@ </action> </release> </changes> - <todo> <actions priority="high"> <action context="docs" dev="open"> @@ -60,5 +56,4 @@ </action> </actions> </todo> - </status>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/build.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/build.xml?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/build.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/build.xml Mon Apr 9 22:45:15 2007 @@ -24,10 +24,8 @@ <property name="author" value="Apache Forrest Project"/> <property name="websiteURL" value="http://forrest.apache.org/pluginDocs/org.apache.forrest.plugin.internal.xhtml2"/> <property name="downloadURL" value="http://forrest.apache.org/plugins/"/> - <import file="../build.xml"/> - - <!-- Add any additional installation work here in the build target, for example: +<!-- Add any additional installation work here in the build target, for example: <target name="build" description="Extract the tools"> <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources"> @@ -38,5 +36,3 @@ </target> --> </project> - - Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap Mon Apr 9 22:45:15 2007 @@ -16,28 +16,23 @@ limitations under the License. --> <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";> - <map:pipelines> - - <map:pipeline> - <!-- forrest:views --> + <map:pipeline> +<!-- forrest:views --> <map:mount uri-prefix="" src="structurer.xmap" check-reload="yes" pass-through="true"/> - - <!-- special matchers (reserved by Forrest) --> +<!-- special matchers (reserved by Forrest) --> <map:match pattern="locationmap.xml"> <map:generate src="{forrest:forrest.locationmap}" /> <map:serialize type="xml"/> </map:match> - - <!-- Source matchers --> +<!-- Source matchers --> <map:match pattern="**.source.xml"> <map:generate src="{lm:{1}.xml}"/> <map:serialize type="xml"/> </map:match> - - <!-- TEMPORARY PIPELINES --> - <!-- Pipelines below this section are for testing purposes only --> - <!-- They should be removed before merging with trunk +<!-- TEMPORARY PIPELINES --> +<!-- Pipelines below this section are for testing purposes only --> +<!-- They should be removed before merging with trunk <map:match pattern="**.html"> <map:generate src="cocoon:/{1}.source.xml"/> COMMENT OUT apply the view here END COMMENT @@ -45,9 +40,6 @@ <map:serialize/> </map:match> --> - - </map:pipeline> </map:pipelines> - </map:sitemap> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/contract.css.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/contract.css.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/contract.css.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/contract.css.xsl Mon Apr 9 22:45:15 2007 @@ -15,16 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:forrest="http://apache.org/forrest/templates/1.0";> - <xsl:template match="/"> <xsl:apply-templates select="//forrest:template/xsl:stylesheet/xsl:template[contains(@name,'-css')]"/> </xsl:template> - - <xsl:template match="xsl:template[contains(@name,'-css')]"> + <xsl:template match="xsl:template[contains(@name,'-css')]"> <xsl:value-of select="."/> - </xsl:template> + </xsl:template> </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/contract.property.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/contract.property.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/contract.property.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/contract.property.xsl Mon Apr 9 22:45:15 2007 @@ -15,21 +15,17 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:forrest="http://apache.org/forrest/templates/1.0";> - <xsl:param name="format"/> - <xsl:template match="/"> <xsl:apply-templates select="//forrest:template"/> </xsl:template> - - <xsl:template match="forrest:[EMAIL PROTECTED]"> + <xsl:template match="forrest:[EMAIL PROTECTED]"> <forrest:property format="[EMAIL PROTECTED]" body="[EMAIL PROTECTED]" head="[EMAIL PROTECTED]" name="[EMAIL PROTECTED]"/> - </xsl:template> + </xsl:template> </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/contract.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/contract.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/contract.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/contract.xsl Mon Apr 9 22:45:15 2007 @@ -29,11 +29,9 @@ </elements> --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:forrest="http://apache.org/forrest/templates/1.0";> - <xsl:param name="format"/> <xsl:template match="/"> <xsl:copy-of select="forrest:contract/forrest:[EMAIL PROTECTED]/xsl:stylesheet/*"/> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/hooksMatcher.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/hooksMatcher.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/hooksMatcher.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/hooksMatcher.xsl Mon Apr 9 22:45:15 2007 @@ -15,11 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:forrest="http://apache.org/forrest/templates/1.0"; xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> - <!--This template will match the different combinations for forrest:hooks--> +<!--This template will match the different combinations for forrest:hooks--> <xsl:template match="forrest:[EMAIL PROTECTED] and (@type='div' or not(@type))]"> <div id="[EMAIL PROTECTED]"> <xsl:apply-templates/> @@ -33,13 +32,13 @@ </div> </xsl:template> <xsl:template match="forrest:[EMAIL PROTECTED] and @type='span']"> - <span class="[EMAIL PROTECTED]"> + <span class="[EMAIL PROTECTED]"> <xsl:apply-templates/> <xsl:if test="@nbsp='true'"> </xsl:if> </span> </xsl:template> <xsl:template match="forrest:[EMAIL PROTECTED] and @type='span']"> - <span id="[EMAIL PROTECTED]"> + <span id="[EMAIL PROTECTED]"> <xsl:apply-templates/> <xsl:if test="@nbsp='true'"> </xsl:if> </span> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/includes-viewLocationmap.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/includes-viewLocationmap.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/includes-viewLocationmap.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/includes-viewLocationmap.xsl Mon Apr 9 22:45:15 2007 @@ -19,7 +19,6 @@ xmlns:collection="http://apache.org/cocoon/collection/1.0"; xmlns:xi="http://www.w3.org/2001/XInclude"; xmlns:dyn="http://exslt.org/dynamic";> - <xsl:param name="defaultView" select="'default.fv'"/> <xsl:param name="rootElement" select="'/xdocs/'"/> <xsl:param name="viewExtension" select="'.fv'"/> @@ -27,7 +26,7 @@ <xsl:param name="root" select="'xdocs'"/> <xsl:param name="viewFallback" select="'resources/views/default.fv'"/> <xsl:variable name="lastFallback" select="boolean(/xdocs/*[local-name()=$defaultView])"/> - <!-- +<!-- *viewSelector* project-xdocs will return which view is responsible for the requested path. If no view (choice|fallback) could be found the template will return the @@ -59,7 +58,7 @@ view can be found in the requested child. --> <xsl:template match="/"> - <!--<xsl:comment> +<!--<xsl:comment> lastFallback: <xsl:value-of select="$lastFallback"/> root: <xsl:value-of select="$root"/> request: <xsl:value-of select="$path"/> @@ -68,24 +67,23 @@ </xsl:comment>--> <xsl:variable name="view2response"> <xsl:call-template name="viewSelector"> - <xsl:with-param name="request" select="concat($path,$viewExtension)"/> - <xsl:with-param name="rest" select="''"/> - </xsl:call-template> + <xsl:with-param name="request" select="concat($path,$viewExtension)"/> + <xsl:with-param name="rest" select="''"/> + </xsl:call-template> </xsl:variable> - <!--Nothing can be found, returning the default.fv--> +<!--Nothing can be found, returning the default.fv--> <xsl:if test="not($lastFallback) and $view2response=''"> <xi:include href="{$viewFallback}"/> </xsl:if> - <!--The lastFallback can be found, returning this--> +<!--The lastFallback can be found, returning this--> <xsl:if test="$lastFallback and $view2response=''"> <xi:include href="{concat('file://', $root,$defaultView)}"/> </xsl:if> - <!--Some fallback can be found that is not the last one--> +<!--Some fallback can be found that is not the last one--> <xsl:if test="$view2response!=''"> <xi:include href="{concat('file://', $root,$view2response)}"/> </xsl:if> </xsl:template> - <xsl:template name="viewSelector"> <xsl:param name="request" select="''"/> <xsl:param name="rest" select="''"/> @@ -93,7 +91,7 @@ <xsl:if test="contains($request,'/')"> <xsl:variable name="nextRequest" select="substring-after($request,'/')"/> <xsl:variable name="currentDir" select="substring-before($request,'/')"/> - <!--<xsl:comment> +<!--<xsl:comment> request: <xsl:value-of select="$request"/> currentDir: <xsl:value-of select="$currentDir"/> currentDir has default view: <xsl:value-of select="boolean(dyn:evaluate(concat($rootElement,$rest,$currentDir,'/',$defaultView)))"/> @@ -101,59 +99,58 @@ rest: <xsl:value-of select="$rest"/> view2response: <xsl:value-of select="$view2response"/> </xsl:comment>--> - <!--In the path are still directories--> +<!--In the path are still directories--> <xsl:if test="boolean(dyn:evaluate(concat($rootElement,$rest,$currentDir,'/',$defaultView)))"> - <!--<xsl:comment>view2response set - <xsl:value-of select="(concat($rest,$currentDir,'/',$defaultView)"/></xsl:comment>--> +<!--<xsl:comment>view2response set - <xsl:value-of select="(concat($rest,$currentDir,'/',$defaultView)"/></xsl:comment>--> <xsl:variable name="viewTemp" select="concat($rest,$currentDir,'/',$defaultView)"/> <xsl:call-template name="viewSelector"> - <xsl:with-param name="request" select="$nextRequest"/> - <xsl:with-param name="rest" select="concat($rest,$currentDir,'/')"/> - <xsl:with-param name="view2response" select="$viewTemp"/> - </xsl:call-template> + <xsl:with-param name="request" select="$nextRequest"/> + <xsl:with-param name="rest" select="concat($rest,$currentDir,'/')"/> + <xsl:with-param name="view2response" select="$viewTemp"/> + </xsl:call-template> </xsl:if> <xsl:if test="not(dyn:evaluate(concat($rootElement,$rest,$currentDir,'/',$defaultView)))"> - <!--<xsl:comment>no view2response set</xsl:comment>--> +<!--<xsl:comment>no view2response set</xsl:comment>--> <xsl:if test="$view2response=''"> <xsl:variable name="viewTemp" select="''"/> <xsl:call-template name="viewSelector"> - <xsl:with-param name="request" select="$nextRequest"/> - <xsl:with-param name="rest" select="concat($rest,$currentDir,'/')"/> - <xsl:with-param name="view2response" select="$viewTemp"/> - </xsl:call-template> + <xsl:with-param name="request" select="$nextRequest"/> + <xsl:with-param name="rest" select="concat($rest,$currentDir,'/')"/> + <xsl:with-param name="view2response" select="$viewTemp"/> + </xsl:call-template> </xsl:if> <xsl:if test="$view2response!=''"> <xsl:variable name="viewTemp" select="$view2response"/> <xsl:call-template name="viewSelector"> - <xsl:with-param name="request" select="$nextRequest"/> - <xsl:with-param name="rest" select="concat($rest,$currentDir,'/')"/> - <xsl:with-param name="view2response" select="$viewTemp"/> - </xsl:call-template> + <xsl:with-param name="request" select="$nextRequest"/> + <xsl:with-param name="rest" select="concat($rest,$currentDir,'/')"/> + <xsl:with-param name="view2response" select="$viewTemp"/> + </xsl:call-template> </xsl:if> </xsl:if> </xsl:if> <xsl:if test="not(contains($request,'/'))"> - <!--<xsl:comment> +<!--<xsl:comment> request: <xsl:value-of select="$request"/> rest: <xsl:value-of select="$rest"/> iteration: <xsl:value-of select="number($iteration)"/> view2response: <xsl:value-of select="$view2response"/> </xsl:comment>--> <xsl:if test="not(dyn:evaluate(concat($rootElement, $rest, $request)))"> - <!--<xsl:comment>no file specific override</xsl:comment>--> +<!--<xsl:comment>no file specific override</xsl:comment>--> <xsl:if test="boolean(dyn:evaluate(concat($rootElement,$rest,$defaultView)))"> - <!--<xsl:comment>dir specific override</xsl:comment>--> +<!--<xsl:comment>dir specific override</xsl:comment>--> <xsl:value-of select="concat($rest,$defaultView)"/> </xsl:if> <xsl:if test="not(dyn:evaluate(concat($rootElement,$rest,$defaultView)))"> - <!--<xsl:comment>no dir specific override</xsl:comment>--> +<!--<xsl:comment>no dir specific override</xsl:comment>--> <xsl:value-of select="$view2response"/> </xsl:if> </xsl:if> <xsl:if test="boolean(dyn:evaluate(concat($rootElement, $rest, $request)))"> - <!--<xsl:comment>file specific override</xsl:comment>--> - <xsl:value-of select="concat($rest, $request)"/> +<!--<xsl:comment>file specific override</xsl:comment>--> + <xsl:value-of select="concat($rest, $request)"/> </xsl:if> </xsl:if> </xsl:template> - </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/nugget.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/nugget.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/nugget.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/nugget.xsl Mon Apr 9 22:45:15 2007 @@ -18,20 +18,16 @@ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:forrest="http://apache.org/forrest/templates/1.0";> - <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/> <xsl:strip-space elements="forrest:properties"/> <xsl:param name="contract"/> - <xsl:template match="/"> <xsl:apply-templates/> </xsl:template> - <xsl:template match="forrest:[EMAIL PROTECTED]"> - <xsl:comment> properties <xsl:value-of select="$contract"/> </xsl:comment> + <xsl:comment> properties <xsl:value-of select="$contract"/> + </xsl:comment> <xsl:copy-of select="*"/> </xsl:template> - <xsl:template match="forrest:property"/> - </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.css.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.css.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.css.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.css.xsl Mon Apr 9 22:45:15 2007 @@ -15,15 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:xi="http://www.w3.org/2001/XInclude"; xmlns:forrest="http://apache.org/forrest/templates/1.0"; > - <xsl:key name="contract-name" match="forrest:properties" use="@name" /> - <xsl:template match="/"> <xsl:for-each select="//forrest:properties/*[count(. | key('contract-name', @name)[1]) = 1 and @css='true']"> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.include.templates.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.include.templates.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.include.templates.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.include.templates.xsl Mon Apr 9 22:45:15 2007 @@ -15,20 +15,17 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:forrest="http://apache.org/forrest/templates/1.0"; xmlns:xi="http://www.w3.org/2001/XInclude"; > - <xsl:template match="/"> <xsl:apply-templates/> </xsl:template> - <!----> +<!----> <xsl:template match="forrest:call-template"> <xi:include href="cocoon://[EMAIL PROTECTED](/*/*)"/> </xsl:template> - <xsl:template match="@*|*|text()|processing-instruction()|comment()"> <xsl:copy> <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.include.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.include.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.include.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.include.xsl Mon Apr 9 22:45:15 2007 @@ -15,21 +15,18 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:forrest="http://apache.org/forrest/templates/1.0"; xmlns:xi="http://www.w3.org/2001/XInclude"; xmlns:alias="http://www.w3.org/1999/XSL/TransformAlias";> - <xsl:namespace-alias + <xsl:namespace-alias stylesheet-prefix="alias" result-prefix="xsl"/> - - <xsl:param name="format"/> + <xsl:param name="format"/> <xsl:key name="contract-name" match="forrest:contract" use="@name" /> - <xsl:template match="/"> <alias:stylesheet version="1.0"> - <!--NOTE: +<!--NOTE: contracts are allowed only to be importet once! Thx to http://www.jenitennison.com/xslt/grouping/muenchian.html--> <xsl:for-each @@ -39,5 +36,4 @@ </xsl:for-each> </alias:stylesheet> </xsl:template> - </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.properties.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.properties.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.properties.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.properties.xsl Mon Apr 9 22:45:15 2007 @@ -15,21 +15,17 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:forrest="http://apache.org/forrest/templates/1.0"; xmlns:xi="http://www.w3.org/2001/XInclude"; > - - <xsl:param name="format"/> - + <xsl:param name="format"/> <xsl:template match="/"> <forrest:properties > - <xsl:for-each select="forrest:views/forrest:[EMAIL PROTECTED]//forrest:contract"> - <xi:include href="cocoon://[EMAIL PROTECTED]"/> - </xsl:for-each> + <xsl:for-each select="forrest:views/forrest:[EMAIL PROTECTED]//forrest:contract"> + <xi:include href="cocoon://[EMAIL PROTECTED]"/> + </xsl:for-each> </forrest:properties> </xsl:template> - </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.view.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.view.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.view.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.view.xsl Mon Apr 9 22:45:15 2007 @@ -15,39 +15,33 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:forrest="http://apache.org/forrest/templates/1.0"; xmlns:xi="http://www.w3.org/2001/XInclude"; xmlns:alias="http://www.w3.org/1999/XSL/TransformAlias";> - <xsl:namespace-alias + <xsl:namespace-alias stylesheet-prefix="alias" result-prefix="xsl"/> -<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/> + <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/> <xsl:strip-space elements="forrest:property"/> - - <xsl:param name="view"/> - + <xsl:param name="view"/> <xsl:template match="/"> <xsl:apply-templates/> </xsl:template> - <xsl:template match="forrest:[EMAIL PROTECTED]"> <xsl:element name="forrest:property"> <xsl:attribute name="name"> <xsl:value-of select="@name"/> </xsl:attribute> - <xsl:element name="xi:include"> - <xsl:attribute name="href">cocoon://<xsl:value-of select="url/text()"/></xsl:attribute> - </xsl:element> - </xsl:element> + <xsl:element name="xi:include"> + <xsl:attribute name="href">cocoon://<xsl:value-of select="url/text()"/> + </xsl:attribute> + </xsl:element> + </xsl:element> </xsl:template> - <xsl:template match="@*|*|text()|processing-instruction()|comment()"> <xsl:copy> <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/> </xsl:copy> </xsl:template> - - </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.xhtml.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.xhtml.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.xhtml.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/prepare.xhtml.xsl Mon Apr 9 22:45:15 2007 @@ -15,147 +15,154 @@ See the License for the specific language governing permissions and limitations under the License. --> - <xsl:stylesheet version="1.0" xmlns:alias="http://www.w3.org/1999/XSL/TransformAlias"; xmlns:forrest="http://apache.org/forrest/templates/1.0"; xmlns:xi="http://www.w3.org/2001/XInclude"; xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:xhtml2="http://www.w3.org/2002/06/xhtml2";> - <xsl:namespace-alias result-prefix="xsl" stylesheet-prefix="alias"/> - <!--Include forrest:hook matchers--> - <xsl:include href="hooksMatcher.xsl"/> - <xsl:param name="request"/> - <xsl:param name="forrestContext" select="'test'"/> - <xsl:key name="head-template" match="forrest:[EMAIL PROTECTED]'xhtml']" use="@name" /> - <xsl:key name="css-includes" match="forrest:css" use="@url" /> - <xsl:template match="/"> - <!--Create the final stylesheet (alias:)--> - <alias:stylesheet version="1.0"> - <alias:import href="file:{$forrestContext}/skins/common/xslt/html/site-to-xhtml.xsl"/> - <alias:import href="file:{$forrestContext}/skins/common/xslt/html/dotdots.xsl"/> - <alias:import href="file:{$forrestContext}/skins/common/xslt/html/pathutils.xsl"/> - <alias:import href="file:{$forrestContext}/skins/common/xslt/html/renderlogo.xsl"/> - <alias:include href="cocoon://prepare.include.xhtml.{$request}"/> - <alias:param name="path"/> - <xsl:comment>All xhtml head elements requested by the forrest:template</xsl:comment> - <alias:template name="getHead"> - <xsl:for-each + <xsl:namespace-alias result-prefix="xsl" stylesheet-prefix="alias"/> +<!--Include forrest:hook matchers--> + <xsl:include href="hooksMatcher.xsl"/> + <xsl:param name="request"/> + <xsl:param name="forrestContext" select="'test'"/> + <xsl:key name="head-template" match="forrest:[EMAIL PROTECTED]'xhtml']" use="@name" /> + <xsl:key name="css-includes" match="forrest:css" use="@url" /> + <xsl:template match="/"> +<!--Create the final stylesheet (alias:)--> + <alias:stylesheet version="1.0"> + <alias:import href="file:{$forrestContext}/skins/common/xslt/html/site-to-xhtml.xsl"/> + <alias:import href="file:{$forrestContext}/skins/common/xslt/html/dotdots.xsl"/> + <alias:import href="file:{$forrestContext}/skins/common/xslt/html/pathutils.xsl"/> + <alias:import href="file:{$forrestContext}/skins/common/xslt/html/renderlogo.xsl"/> + <alias:include href="cocoon://prepare.include.xhtml.{$request}"/> + <alias:param name="path"/> + <xsl:comment>All xhtml head elements requested by the forrest:template</xsl:comment> + <alias:template name="getHead"> + <xsl:for-each select="/*/forrest:properties/[EMAIL PROTECTED]'true' and count(. | key('head-template', @name)[1]) = 1]"> - <xsl:variable name="name" select="@name"/> - <xsl:apply-templates mode="head" + <xsl:variable name="name" select="@name"/> + <xsl:apply-templates mode="head" select="//forrest:[EMAIL PROTECTED]"/> - </xsl:for-each> - </alias:template> - <xsl:comment>All xhtml body elements requested by the forrest:template</xsl:comment> - <alias:template name="getBody"> - <xsl:apply-templates select="/*/forrest:views/forrest:view"/> - </alias:template> - <!--default entry point into the presentation model 'site'--> - <alias:template match="xhtml2:html"> - <xhtml2:html> - <xhtml2:head> - <alias:call-template name="getHead"/> - <!--Test whether there is an own css implemention requested by the view--> - <!--*No* forrest:css found in the view--> - <xsl:if test="not(/*/forrest:views/forrest:view/forrest:css)"> - <xhtml2:link rel="stylesheet" type="text/css"> - <xsl:attribute name="href">{$root}skin/default.css</xsl:attribute> - </xhtml2:link> - </xsl:if> - <!-- forrest:css *found* in the view--> - <xsl:if test="/*/forrest:views/forrest:view/forrest:css"> - <xsl:apply-templates select="/*/forrest:views/forrest:view/forrest:css"/> - </xsl:if> - <xhtml2:title> - <alias:value-of select="[EMAIL PROTECTED]'content']/h1"/> - </xhtml2:title> - </xhtml2:head> - <xhtml2:body onload="init()"> - <alias:call-template name="getBody"/> - </xhtml2:body> - </xhtml2:html> - </alias:template> - </alias:stylesheet> - </xsl:template> - <xsl:template match="forrest:view"> - <xsl:apply-templates select="*[local-name()!='css']"/> - </xsl:template> - <xsl:template match="forrest:[EMAIL PROTECTED] and count(. | key('css-includes', @url)[1]) = 1]"> - <xhtml2:link type="text/css"> - <xsl:choose> - <xsl:when test="@rel"> - <xsl:attribute name="rel"><xsl:value-of select="@rel"/></xsl:attribute> - </xsl:when> - <xsl:otherwise> - <xsl:attribute name="rel">stylesheet</xsl:attribute> - </xsl:otherwise> - </xsl:choose> - <xsl:choose> - <xsl:when test="@title"> - <xsl:attribute name="title"><xsl:value-of select="@title"/></xsl:attribute> - </xsl:when> - <xsl:otherwise> - <xsl:attribute name="title"><xsl:value-of select="@url"/></xsl:attribute> - </xsl:otherwise> - </xsl:choose> - <xsl:attribute name="href">{$root}skin/<xsl:value-of select="@url"/> - </xsl:attribute> - <xsl:if test="@media"> - <xsl:attribute name="media"><xsl:value-of select="@media"/></xsl:attribute> + </xsl:for-each> + </alias:template> + <xsl:comment>All xhtml body elements requested by the forrest:template</xsl:comment> + <alias:template name="getBody"> + <xsl:apply-templates select="/*/forrest:views/forrest:view"/> + </alias:template> +<!--default entry point into the presentation model 'site'--> + <alias:template match="xhtml2:html"> + <xhtml2:html> + <xhtml2:head> + <alias:call-template name="getHead"/> +<!--Test whether there is an own css implemention requested by the view--> +<!--*No* forrest:css found in the view--> + <xsl:if test="not(/*/forrest:views/forrest:view/forrest:css)"> + <xhtml2:link rel="stylesheet" type="text/css"> + <xsl:attribute name="href">{$root}skin/default.css</xsl:attribute> + </xhtml2:link> </xsl:if> - </xhtml2:link> - </xsl:template> - <xsl:template match="forrest:contract" mode="head"> - <xsl:variable name="name" select="@name"/> - <xsl:if test="/*/forrest:properties/[EMAIL PROTECTED]'true' and @name=$name]"> - <!--If next son is not forrest:properties go on--> - <xsl:choose> - <xsl:when test="not(forrest:[EMAIL PROTECTED])"> - <alias:call-template name="[EMAIL PROTECTED]"/> - </xsl:when> - <xsl:when test="forrest:[EMAIL PROTECTED]"> - <alias:call-template name="[EMAIL PROTECTED]" xmlns:forrest="http://apache.org/forrest/templates/1.0";> - <xsl:for-each select="forrest:[EMAIL PROTECTED]/forrest:property"> - <xsl:variable name="xpath"> - <xsl:value-of select="'/site'"/> - <xsl:call-template name="generateXPath"/> - </xsl:variable> - <alias:with-param name="[EMAIL PROTECTED]" select="{normalize-space($xpath)}"/> - </xsl:for-each> - </alias:call-template> - </xsl:when> - </xsl:choose> - </xsl:if> - </xsl:template> - <xsl:template match="forrest:contract"> - <xsl:variable name="name" select="@name"/> - <!--Test whether there is a body template needed--> - <xsl:if test="/*/forrest:properties/[EMAIL PROTECTED]'true' and @name=$name]"> - <!--If next son is not forrest:properties go on--> - <xsl:choose> - <xsl:when test="not(forrest:[EMAIL PROTECTED])"> - <xsl:apply-templates/> - <alias:call-template name="[EMAIL PROTECTED]"/> - </xsl:when> - <xsl:when test="forrest:[EMAIL PROTECTED]"> - <alias:call-template name="[EMAIL PROTECTED]"> - <xsl:for-each select="forrest:[EMAIL PROTECTED]/forrest:property"> <xsl:variable name="xpath"> - <xsl:value-of select="'/site'"/> - <xsl:call-template name="generateXPath"/> - </xsl:variable> - <alias:with-param name="[EMAIL PROTECTED]" select="{normalize-space($xpath)}" /> - </xsl:for-each> - </alias:call-template> - </xsl:when> - </xsl:choose> - </xsl:if> - </xsl:template> - - <xsl:template name="generateXPath"> - <xsl:for-each select="ancestor::*[name()!='filter']"> +<!-- forrest:css *found* in the view--> + <xsl:if test="/*/forrest:views/forrest:view/forrest:css"> + <xsl:apply-templates select="/*/forrest:views/forrest:view/forrest:css"/> + </xsl:if> + <xhtml2:title> + <alias:value-of select="[EMAIL PROTECTED]'content']/h1"/> + </xhtml2:title> + </xhtml2:head> + <xhtml2:body onload="init()"> + <alias:call-template name="getBody"/> + </xhtml2:body> + </xhtml2:html> + </alias:template> + </alias:stylesheet> + </xsl:template> + <xsl:template match="forrest:view"> + <xsl:apply-templates select="*[local-name()!='css']"/> + </xsl:template> + <xsl:template match="forrest:[EMAIL PROTECTED] and count(. | key('css-includes', @url)[1]) = 1]"> + <xhtml2:link type="text/css"> + <xsl:choose> + <xsl:when test="@rel"> + <xsl:attribute name="rel"> + <xsl:value-of select="@rel"/> + </xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="rel">stylesheet</xsl:attribute> + </xsl:otherwise> + </xsl:choose> + <xsl:choose> + <xsl:when test="@title"> + <xsl:attribute name="title"> + <xsl:value-of select="@title"/> + </xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="title"> + <xsl:value-of select="@url"/> + </xsl:attribute> + </xsl:otherwise> + </xsl:choose> + <xsl:attribute name="href">{$root}skin/<xsl:value-of select="@url"/> + </xsl:attribute> + <xsl:if test="@media"> + <xsl:attribute name="media"> + <xsl:value-of select="@media"/> + </xsl:attribute> + </xsl:if> + </xhtml2:link> + </xsl:template> + <xsl:template match="forrest:contract" mode="head"> + <xsl:variable name="name" select="@name"/> + <xsl:if test="/*/forrest:properties/[EMAIL PROTECTED]'true' and @name=$name]"> +<!--If next son is not forrest:properties go on--> + <xsl:choose> + <xsl:when test="not(forrest:[EMAIL PROTECTED])"> + <alias:call-template name="[EMAIL PROTECTED]"/> + </xsl:when> + <xsl:when test="forrest:[EMAIL PROTECTED]"> + <alias:call-template name="[EMAIL PROTECTED]" xmlns:forrest="http://apache.org/forrest/templates/1.0";> + <xsl:for-each select="forrest:[EMAIL PROTECTED]/forrest:property"> + <xsl:variable name="xpath"> + <xsl:value-of select="'/site'"/> + <xsl:call-template name="generateXPath"/> + </xsl:variable> + <alias:with-param name="[EMAIL PROTECTED]" select="{normalize-space($xpath)}"/> + </xsl:for-each> + </alias:call-template> + </xsl:when> + </xsl:choose> + </xsl:if> + </xsl:template> + <xsl:template match="forrest:contract"> + <xsl:variable name="name" select="@name"/> +<!--Test whether there is a body template needed--> + <xsl:if test="/*/forrest:properties/[EMAIL PROTECTED]'true' and @name=$name]"> +<!--If next son is not forrest:properties go on--> + <xsl:choose> + <xsl:when test="not(forrest:[EMAIL PROTECTED])"> + <xsl:apply-templates/> + <alias:call-template name="[EMAIL PROTECTED]"/> + </xsl:when> + <xsl:when test="forrest:[EMAIL PROTECTED]"> + <alias:call-template name="[EMAIL PROTECTED]"> + <xsl:for-each select="forrest:[EMAIL PROTECTED]/forrest:property"> + <xsl:variable name="xpath"> + <xsl:value-of select="'/site'"/> + <xsl:call-template name="generateXPath"/> + </xsl:variable> + <alias:with-param name="[EMAIL PROTECTED]" select="{normalize-space($xpath)}" /> + </xsl:for-each> + </alias:call-template> + </xsl:when> + </xsl:choose> + </xsl:if> + </xsl:template> + <xsl:template name="generateXPath"> + <xsl:for-each select="ancestor::*[name()!='filter']"> /<xsl:value-of select="name()"/>[<xsl:number/>] </xsl:for-each> /<xsl:value-of select="name()"/>[<xsl:number/>] - </xsl:template> + </xsl:template> </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/strip_namespaces.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/strip_namespaces.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/strip_namespaces.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/strip_namespaces.xsl Mon Apr 9 22:45:15 2007 @@ -17,17 +17,17 @@ --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> <xsl:output method="xhtml" version="1.0" encoding="UTF-8" indent="yes"/> - <xsl:template match="*"> - <!-- remove element prefix (if any) --> - <xsl:element name="{local-name()}"> - <!-- process attributes --> - <xsl:for-each select="@*"> - <!-- remove attribute prefix (if any) --> - <xsl:attribute name="{local-name()}"> - <xsl:value-of select="."/> - </xsl:attribute> - </xsl:for-each> - <xsl:apply-templates/> - </xsl:element> + <xsl:template match="*"> +<!-- remove element prefix (if any) --> + <xsl:element name="{local-name()}"> +<!-- process attributes --> + <xsl:for-each select="@*"> +<!-- remove attribute prefix (if any) --> + <xsl:attribute name="{local-name()}"> + <xsl:value-of select="."/> + </xsl:attribute> + </xsl:for-each> + <xsl:apply-templates/> + </xsl:element> </xsl:template> </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/viewLocationmap.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/viewLocationmap.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/viewLocationmap.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/viewLocationmap.xsl Mon Apr 9 22:45:15 2007 @@ -18,25 +18,23 @@ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:collection="http://apache.org/cocoon/collection/1.0";> <xsl:variable name="includePattern" select="'.fv'"/> - <xsl:template match="/"> <xsl:apply-templates/> </xsl:template> <xsl:template match="collection:collection"> <dir name="[EMAIL PROTECTED]"> - <xsl:apply-templates/> + <xsl:apply-templates/> </dir> </xsl:template> <xsl:template match="collection:resource[contains(@name,$includePattern)]"> <view name="[EMAIL PROTECTED]"> - <xsl:apply-templates/> + <xsl:apply-templates/> </view> </xsl:template> - <!--/collection:resource[contains(@name,$includePattern)]--> - <!-- <xsl:template match="//*/*[contains(@name,$includePattern)]"> +<!--/collection:resource[contains(@name,$includePattern)]--> +<!-- <xsl:template match="//*/*[contains(@name,$includePattern)]"> <xsl:variable name="parent" select="../."/> <node id="{$parent/@name}"/> <!-#-<xsl:copy-of select="$parent"/>-#-> </xsl:template>--> - </xsl:stylesheet> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/viewLocationmap2path.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/viewLocationmap2path.xsl?view=diff&rev=527038&r1=527037&r2=527038 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/viewLocationmap2path.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/stylesheets/viewLocationmap2path.xsl Mon Apr 9 22:45:15 2007 @@ -17,19 +17,15 @@ --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:collection="http://apache.org/cocoon/collection/1.0";> - <xsl:template match="/"> - <xsl:apply-templates/> + <xsl:apply-templates/> </xsl:template> - <xsl:template match="dir[view or dir]"> <xsl:element name="[EMAIL PROTECTED]"> <xsl:apply-templates/> </xsl:element> </xsl:template> - <xsl:template match="view"> <xsl:element name="[EMAIL PROTECTED]"/> </xsl:template> - </xsl:stylesheet>
