You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/09/12 11:39:36 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/default menus.xmap publication-sitemap.xmap
andreas 2003/09/12 02:39:36
Modified: src/webapp/lenya/pubs/default/xslt xhtml-live.xsl
xhtml-authoring.xsl simple-live.xsl page2xhtml.xsl
simple-authoring.xsl
src/webapp/lenya/pubs/default menus.xmap
publication-sitemap.xmap
Log:
reflecting changes to lenya page processing
Revision Changes Path
1.2 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/default/xslt/xhtml-live.xsl
Index: xhtml-live.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/xslt/xhtml-live.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xhtml-live.xsl 14 May 2003 13:23:49 -0000 1.1
+++ xhtml-live.xsl 12 Sep 2003 09:39:36 -0000 1.2
@@ -2,7 +2,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:include href="../../../xslt/menu/live-root.xsl"/>
+<xsl:include href="../../../xslt/menu/page2xhtml.xsl"/>
<xsl:template match="cmsbody">
<xsl:copy-of select="*"/>
1.4 +2 -7 cocoon-lenya/src/webapp/lenya/pubs/default/xslt/xhtml-authoring.xsl
Index: xhtml-authoring.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/xslt/xhtml-authoring.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xhtml-authoring.xsl 14 May 2003 13:23:02 -0000 1.3
+++ xhtml-authoring.xsl 12 Sep 2003 09:39:36 -0000 1.4
@@ -2,11 +2,6 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:include href="../../../xslt/menu/root.xsl"/>
-
-<xsl:template match="cmsbody">
- <xsl:copy-of select="*"/>
-</xsl:template>
-
-</xsl:stylesheet>
+<xsl:import href="../../../xslt/menu/page2xhtml.xsl"/>
+</xsl:stylesheet>
\ No newline at end of file
1.4 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/default/xslt/simple-live.xsl
Index: simple-live.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/xslt/simple-live.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- simple-live.xsl 14 May 2003 13:23:02 -0000 1.3
+++ simple-live.xsl 12 Sep 2003 09:39:36 -0000 1.4
@@ -2,7 +2,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:include href="../../../xslt/menu/live-root.xsl"/>
+<xsl:include href="../../../xslt/menu/page2xhtml.xsl"/>
<xsl:template match="cmsbody">
<xsl:copy-of select="*"/>
1.10 +0 -2 cocoon-lenya/src/webapp/lenya/pubs/default/xslt/page2xhtml.xsl
Index: page2xhtml.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/xslt/page2xhtml.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- page2xhtml.xsl 23 Jul 2003 13:21:24 -0000 1.9
+++ page2xhtml.xsl 12 Sep 2003 09:39:36 -0000 1.10
@@ -20,7 +20,6 @@
<xsl:param name="document-id"/>
<xsl:template match="cmsbody">
- <xsl:copy>
<html>
<head>
<link rel="stylesheet" href="{$root}/css/page.css" mime-type="text/css"/>
@@ -45,7 +44,6 @@
</table>
</body>
</html>
- </xsl:copy>
</xsl:template>
<xsl:template match="@*|node()" priority="-1">
1.5 +1 -1 cocoon-lenya/src/webapp/lenya/pubs/default/xslt/simple-authoring.xsl
Index: simple-authoring.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/xslt/simple-authoring.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- simple-authoring.xsl 8 Jul 2003 15:07:03 -0000 1.4
+++ simple-authoring.xsl 12 Sep 2003 09:39:36 -0000 1.5
@@ -2,7 +2,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:include href="../../../xslt/menu/root.xsl"/>
+ <xsl:include href="../../../xslt/menu/page2xhtml.xsl"/>
<xsl:template match="cmsbody">
<xsl:copy-of select="*"/>
1.2 +2 -2 cocoon-lenya/src/webapp/lenya/pubs/default/menus.xmap
Index: menus.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/menus.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menus.xmap 9 Sep 2003 14:37:43 -0000 1.1
+++ menus.xmap 12 Sep 2003 09:39:36 -0000 1.2
@@ -14,12 +14,12 @@
<map:pipeline>
- <map:match pattern="live.xml">
+ <map:match pattern="live/**">
<map:generate type="serverpages" src="../../content/menus/live.xsp"/>
<map:serialize type="xml"/>
</map:match>
- <map:match pattern="*.xml">
+ <map:match pattern="**">
<map:generate type="serverpages" src="config/menus/generic.xsp"/>
<map:serialize type="xml"/>
</map:match>
1.48 +8 -26 cocoon-lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap
Index: publication-sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- publication-sitemap.xmap 9 Sep 2003 15:06:52 -0000 1.47
+++ publication-sitemap.xmap 12 Sep 2003 09:39:36 -0000 1.48
@@ -62,22 +62,6 @@
</map:pipeline>
- <!-- Menubar -->
- <map:pipeline>
-
- <map:match pattern="lenyamenubar/authoring/article.xml">
- <map:generate type="serverpages" src="config/menus/generic.xsp"/>
- <map:transform type="workflowmenu"/>
- <map:transform type="usecasemenu"/>
- <map:serialize type="xml"/>
- </map:match>
- <map:match pattern="lenyamenubar/live/article.xml">
- <map:generate type="serverpages" src="../../content/menus/live.xsp"/>
- <map:serialize type="xml"/>
- </map:match>
- </map:pipeline>
-
-
<!-- This is the pipeline that builds the page. It aggregates all
the navigational elements (breadcrumb, tabs, menu) with the actual
content of the document. -->
@@ -85,7 +69,6 @@
<!-- /lenyabody/{publication-id}/{area}/{doctype}/{document-id} -->
<map:match pattern="lenyabody/*/*/*/**">
<map:aggregate element="cmsbody">
- <!-- <map:aggregate element="body" prefix="page" ns="http://apache.org/cocoon/lenya/cms-page/1.0" label="aggregation"> -->
<map:part src="cocoon://navigation/{1}/{2}/breadcrumb/{4}.xml"/>
<map:part src="cocoon://navigation/{1}/{2}/tabs/{4}.xml"/>
<map:part src="cocoon://navigation/{1}/{2}/menu/{4}.xml"/>
@@ -104,23 +87,22 @@
request. It then aggregates the lenya menu (for the given area) and
the lenya body, the actual document. -->
<map:pipeline>
- <map:match pattern="**.html">
- <map:act type="uriparametrizer" src="{1}.html">
+ <map:match pattern="*/**.html">
+ <map:act type="uriparametrizer" src="{1}/{2}.html">
<map:parameter name="doctype" value="cocoon://uri-parameter/{page-envelope:publication-id}/doctype"/>
- <map:parameter name="document-id" value="cocoon://uri-parameter/{page-envelope:publication-id}/document-id"/>
- <map:aggregate element="lenya" label="aggregation">
- <map:part src="cocoon:/lenyamenubar/{page-envelope:area}/article.xml"/>
- <map:part src="cocoon:/lenyabody/{page-envelope:publication-id}/{page-envelope:area}/{doctype}/{document-id}"/>
- </map:aggregate>
- <map:transform src="xslt/{doctype}-{page-envelope:area}.xsl"/>
+ <map:generate src="cocoon:/lenyabody/{page-envelope:publication-id}/{page-envelope:area}/{doctype}/{page-envelope:document-id}"/>
+ <map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{../1}/{../2}.xml"/>
</map:act>
+
<map:serialize type="html"/>
</map:match>
<map:handle-errors type="500">
<!-- FIXME: other exceptions are also caught here! -->
+ <!--
<map:transform src="../../xslt/exception/not-published-yet.xsl"/>
<map:serialize type="html"/>
+ -->
</map:handle-errors>
</map:pipeline>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org