You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/01/29 18:18:50 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/default/resources/misc/bxeng xhtml-bxeng.css
gregor 2004/01/29 09:18:50
Modified: src/webapp/lenya/pubs/default/config/ac/passwd
localhost.ipml
src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules
ruby.rng style.rng link.rng frames.rng param.rng
object.rng datatypes.rng text.rng script.rng
meta.rng image.rng basic-form.rng attribs.rng
basic-table.rng nameident.rng inlstyle.rng
target.rng table.rng struct.rng ssismap.rng
list.rng base.rng pres.rng legacy.rng hypertext.rng
bdo.rng events.rng iframe.rng form.rng applet.rng
csismap.rng edit.rng
src/webapp/lenya/pubs/default menus.xmap usecase-bxe.xmap
src/webapp/lenya/pubs/default/config/doctypes/schemas/dublincore
dublincore.rng
src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/exclude
basic-table.rng form.rng basic.rng
src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml
xhtml-basic.rng xhtml.rng xhtml-strict.rng
src/webapp/lenya/pubs/default/config/doctypes/schemas
lenya.rng xhtml.rng
src/webapp/lenya/pubs/default/lenya/content/authoring
create-language.xsp
src/webapp/lenya/pubs/default/resources/shared/css page.css
src/webapp/lenya/pubs/default/resources/misc/bxeng
xhtml-bxeng.css
Log:
some were binary
Revision Changes Path
1.4 +7 -7 cocoon-lenya/src/webapp/lenya/pubs/default/config/ac/passwd/localhost.ipml
Index: localhost.ipml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/ac/passwd/localhost.ipml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- localhost.ipml 13 Nov 2003 16:16:58 -0000 1.3
+++ localhost.ipml 29 Jan 2004 17:18:46 -0000 1.4
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<ip-range class="org.apache.lenya.ac.file.FileIPRange" id="localhost">
- <name>Localhost</name>
- <network-address>127.0.0.1</network-address>
- <subnet-mask>255.255.255.0</subnet-mask>
-</ip-range>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ip-range class="org.apache.lenya.ac.file.FileIPRange" id="localhost">
+ <name>Localhost</name>
+ <network-address>127.0.0.1</network-address>
+ <subnet-mask>255.255.255.0</subnet-mask>
+</ip-range>
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/ruby.rng
Index: ruby.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/ruby.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/style.rng
Index: style.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/style.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/link.rng
Index: link.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/link.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/frames.rng
Index: frames.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/frames.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/param.rng
Index: param.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/param.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/object.rng
Index: object.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/object.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/datatypes.rng
Index: datatypes.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/datatypes.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/text.rng
Index: text.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/text.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/script.rng
Index: script.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/script.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/meta.rng
Index: meta.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/meta.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/image.rng
Index: image.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/image.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/basic-form.rng
Index: basic-form.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/basic-form.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/attribs.rng
Index: attribs.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/attribs.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/basic-table.rng
Index: basic-table.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/basic-table.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/nameident.rng
Index: nameident.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/nameident.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/inlstyle.rng
Index: inlstyle.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/inlstyle.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/target.rng
Index: target.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/target.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/table.rng
Index: table.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/table.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/struct.rng
Index: struct.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/struct.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/ssismap.rng
Index: ssismap.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/ssismap.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/list.rng
Index: list.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/list.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/base.rng
Index: base.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/base.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/pres.rng
Index: pres.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/pres.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/legacy.rng
Index: legacy.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/legacy.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/hypertext.rng
Index: hypertext.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/hypertext.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/bdo.rng
Index: bdo.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/bdo.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/events.rng
Index: events.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/events.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/iframe.rng
Index: iframe.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/iframe.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/form.rng
Index: form.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/form.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/applet.rng
Index: applet.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/applet.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/csismap.rng
Index: csismap.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/csismap.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/edit.rng
Index: edit.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/modules/edit.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.3 +30 -30 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- menus.xmap 12 Sep 2003 09:39:36 -0000 1.2
+++ menus.xmap 29 Jan 2004 17:18:49 -0000 1.3
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
-
-<!-- CVS: $Id$ -->
-
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
- <map:components>
- <map:generators default="file" />
- <map:matchers default="wildcard"/>
- <map:actions/>
- </map:components>
-
- <map:pipelines>
-
- <map:pipeline>
-
- <map:match pattern="live/**">
- <map:generate type="serverpages" src="../../content/menus/live.xsp"/>
- <map:serialize type="xml"/>
- </map:match>
-
- <map:match pattern="**">
- <map:generate type="serverpages" src="config/menus/generic.xsp"/>
- <map:serialize type="xml"/>
- </map:match>
-
- </map:pipeline>
-
- </map:pipelines>
-</map:sitemap>
+<?xml version="1.0"?>
+
+<!-- CVS: $Id$ -->
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+ <map:components>
+ <map:generators default="file" />
+ <map:matchers default="wildcard"/>
+ <map:actions/>
+ </map:components>
+
+ <map:pipelines>
+
+ <map:pipeline>
+
+ <map:match pattern="live/**">
+ <map:generate type="serverpages" src="../../content/menus/live.xsp"/>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ <map:match pattern="**">
+ <map:generate type="serverpages" src="config/menus/generic.xsp"/>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ </map:pipeline>
+
+ </map:pipelines>
+</map:sitemap>
1.7 +133 -133 cocoon-lenya/src/webapp/lenya/pubs/default/usecase-bxe.xmap
Index: usecase-bxe.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/usecase-bxe.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- usecase-bxe.xmap 16 Jan 2004 09:17:56 -0000 1.6
+++ usecase-bxe.xmap 29 Jan 2004 17:18:49 -0000 1.7
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
- <!-- =========================== Components ================================ -->
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:actions/>
-
- <map:selectors>
- <map:selector name="request-method" logger="sitemap.selector.request-method"
- src="org.apache.cocoon.selection.RequestMethodSelector"/>
- </map:selectors>
-
- </map:components>
-
- <map:resources>
- <map:resource name="style-cms-page">
- <map:transform src="../../xslt/util/page2xhtml.xsl">
- <map:parameter name="contextprefix" value="{request:contextPath}"/>
- </map:transform>
- <map:select type="parameter">
- <map:parameter name="statusCode" value="{statusCode}"/>
- <map:when test="">
- <map:serialize/>
- </map:when>
- <map:otherwise>
- <map:serialize status-code="{statusCode}"/>
- </map:otherwise>
- </map:select>
- </map:resource>
- </map:resources>
-
- <!-- =========================== Pipelines ================================ -->
-
- <map:pipelines>
-
- <map:pipeline type="noncaching">
-
- <map:match type="usecase" pattern="bxe">
-
- <map:match type="step" pattern="open">
- <map:act type="resource-exists" src="../../../../ROOT/bxeng/bxeLoader.js"> <!-- Check for BXENG -->
- <map:act type="reserved-checkout">
- <map:generate type="serverpages" src="../../content/rc/{exception}.xsp">
- <map:parameter name="user" value="{user}"/>
- <map:parameter name="filename" value="{filename}"/>
- <map:parameter name="date" value="{date}"/>
- </map:generate>
- <map:transform src="../../xslt/rc/rco-exception.xsl"/>
- <map:call resource="style-cms-page"/>
- <map:serialize type="html"/>
- </map:act>
- <map:aggregate element="bxeng">
- <map:part src="../../resources/misc/bxeng/index.xhtml"/>
- <map:part src="resources/misc/bxeng/{page-envelope:document-type}-namespaces.xml"/>
- </map:aggregate>
- <map:transform src="../../xslt/bxeng/aggregate.xsl"/>
- <map:transform src="../../xslt/bxeng/index-xhtml.xsl">
- <map:parameter name="configfile" value="{request:requestURI}?lenya.usecase=bxe&lenya.step=config"/>
- </map:transform>
- <map:serialize type="xhtml-iso-8859-1"/>
- </map:act>
- <map:generate src="../../resources/misc/bxeng/download.xhtml"/>
- <map:call resource="style-cms-page"/>
- <map:serialize type="html"/>
- </map:match>
-
- <map:match pattern="**/*.html">
+<?xml version="1.0" encoding="iso-8859-1"?>
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+ <!-- =========================== Components ================================ -->
+ <map:components>
+ <map:generators default="file"/>
+ <map:transformers default="xslt"/>
+ <map:readers default="resource"/>
+ <map:serializers default="html"/>
+ <map:matchers default="wildcard"/>
+ <map:actions/>
+
+ <map:selectors>
+ <map:selector name="request-method" logger="sitemap.selector.request-method"
+ src="org.apache.cocoon.selection.RequestMethodSelector"/>
+ </map:selectors>
+
+ </map:components>
+
+ <map:resources>
+ <map:resource name="style-cms-page">
+ <map:transform src="../../xslt/util/page2xhtml.xsl">
+ <map:parameter name="contextprefix" value="{request:contextPath}"/>
+ </map:transform>
+ <map:select type="parameter">
+ <map:parameter name="statusCode" value="{statusCode}"/>
+ <map:when test="">
+ <map:serialize/>
+ </map:when>
+ <map:otherwise>
+ <map:serialize status-code="{statusCode}"/>
+ </map:otherwise>
+ </map:select>
+ </map:resource>
+ </map:resources>
+
+ <!-- =========================== Pipelines ================================ -->
+
+ <map:pipelines>
+
+ <map:pipeline type="noncaching">
+
+ <map:match type="usecase" pattern="bxe">
+
+ <map:match type="step" pattern="open">
+ <map:act type="resource-exists" src="../../../../ROOT/bxeng/bxeLoader.js"> <!-- Check for BXENG -->
+ <map:act type="reserved-checkout">
+ <map:generate type="serverpages" src="../../content/rc/{exception}.xsp">
+ <map:parameter name="user" value="{user}"/>
+ <map:parameter name="filename" value="{filename}"/>
+ <map:parameter name="date" value="{date}"/>
+ </map:generate>
+ <map:transform src="../../xslt/rc/rco-exception.xsl"/>
+ <map:call resource="style-cms-page"/>
+ <map:serialize type="html"/>
+ </map:act>
+ <map:aggregate element="bxeng">
+ <map:part src="../../resources/misc/bxeng/index.xhtml"/>
+ <map:part src="resources/misc/bxeng/{page-envelope:document-type}-namespaces.xml"/>
+ </map:aggregate>
+ <map:transform src="../../xslt/bxeng/aggregate.xsl"/>
+ <map:transform src="../../xslt/bxeng/index-xhtml.xsl">
+ <map:parameter name="configfile" value="{request:requestURI}?lenya.usecase=bxe&lenya.step=config"/>
+ </map:transform>
+ <map:serialize type="xhtml-iso-8859-1"/>
+ </map:act>
+ <map:generate src="../../resources/misc/bxeng/download.xhtml"/>
+ <map:call resource="style-cms-page"/>
+ <map:serialize type="html"/>
+ </map:match>
+
+ <map:match pattern="**/*.html">
<!-- configuration -->
<map:match type="step" pattern="config">
<map:generate src="../../resources/misc/bxeng/inc/config.xml"/>
@@ -77,70 +77,70 @@
<map:parameter name="BX_xmlfile" value="{request:requestURI}?lenya.usecase=bxe&lenya.step=xml"/>
<!-- Instead of an xsl we use the xhtml file to provide the basic layout
- <map:parameter name="BX_xslfile" value="{request:requestURI}?lenya.usecase=bxe&lenya.step=xsl"/>
+ <map:parameter name="BX_xslfile" value="{request:requestURI}?lenya.usecase=bxe&lenya.step=xsl"/>
-->
- <map:parameter name="BX_xhtmlfile" value="{../2}.bxe.html"/>
+ <map:parameter name="BX_xhtmlfile" value="{../2}.bxe.html"/>
<map:parameter name="BX_validationfile" value="{request:contextPath}/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}.rng"/>
- <map:parameter name="css" value="{request:contextPath}/{page-envelope:publication-id}/{page-envelope:area}/css/{page-envelope:document-type}-bxeng.css"/>
+ <map:parameter name="css" value="{request:contextPath}/{page-envelope:publication-id}/{page-envelope:area}/css/{page-envelope:document-type}-bxeng.css"/>
<map:parameter name="BX_exitdestination" value="{request:requestURI}?lenya.usecase=checkin&lenya.step=checkin&backup=true"/>
</map:transform>
<map:serialize type="xml"/>
</map:match>
- </map:match>
-
- <map:match pattern="*/**.html">
-
- <!-- /GET and PUT -->
- <map:match type="step" pattern="xml">
- <map:select type="request-method">
-
- <map:when test="PUT">
- <map:act type="reserved-checkout-test">
- <map:generate type="serverpages" src="../../content/rc/{exception}.xsp">
- <map:parameter name="user" value="{user}"/>
- <map:parameter name="filename" value="{filename}"/>
- <map:parameter name="date" value="{date}"/>
- </map:generate>
- <map:transform src="../../xslt/rc/rco-exception.xsl"/>
- <map:call resource="style-cms-page"/>
- <map:serialize type="html"/>
- </map:act>
- <map:generate type="stream"/>
- <map:transform src="../../xslt/authoring/edit/addSourceTags.xsl">
- <map:parameter name="source" value="content/{page-envelope:area}/{page-envelope:document-path}"/>
- </map:transform>
- <map:transform type="write-source"/>
- <map:act type="workflow">
- <map:parameter name="area" value="{page-envelope:area}"/>
- <map:parameter name="document-id" value="{page-envelope:document-id}"/>
- <map:parameter name="language" value="{page-envelope:document-language}"/>
- <map:parameter name="event" value="edit"/>
- </map:act>
- <map:serialize type="xml" status-code="204"/>
- </map:when>
-
- <map:otherwise> <!-- GET -->
- <map:generate src="content/authoring/{page-envelope:document-path}"/>
- <map:serialize type="xml"/>
- </map:otherwise>
-
- </map:select>
- </map:match>
- <!-- /GET and PUT -->
-
- </map:match> <!-- uri pattern -->
-
- <map:match type="step" pattern="xsl">
- <map:generate src="xslt/{page-envelope:document-type}2xhtml.xsl"/>
- <map:serialize type="xml"/>
- </map:match>
-
- </map:match> <!-- usecase -->
-
- <map:handle-errors type="500"/>
-
- </map:pipeline>
-
- </map:pipelines>
-
-</map:sitemap>
+ </map:match>
+
+ <map:match pattern="*/**.html">
+
+ <!-- /GET and PUT -->
+ <map:match type="step" pattern="xml">
+ <map:select type="request-method">
+
+ <map:when test="PUT">
+ <map:act type="reserved-checkout-test">
+ <map:generate type="serverpages" src="../../content/rc/{exception}.xsp">
+ <map:parameter name="user" value="{user}"/>
+ <map:parameter name="filename" value="{filename}"/>
+ <map:parameter name="date" value="{date}"/>
+ </map:generate>
+ <map:transform src="../../xslt/rc/rco-exception.xsl"/>
+ <map:call resource="style-cms-page"/>
+ <map:serialize type="html"/>
+ </map:act>
+ <map:generate type="stream"/>
+ <map:transform src="../../xslt/authoring/edit/addSourceTags.xsl">
+ <map:parameter name="source" value="content/{page-envelope:area}/{page-envelope:document-path}"/>
+ </map:transform>
+ <map:transform type="write-source"/>
+ <map:act type="workflow">
+ <map:parameter name="area" value="{page-envelope:area}"/>
+ <map:parameter name="document-id" value="{page-envelope:document-id}"/>
+ <map:parameter name="language" value="{page-envelope:document-language}"/>
+ <map:parameter name="event" value="edit"/>
+ </map:act>
+ <map:serialize type="xml" status-code="204"/>
+ </map:when>
+
+ <map:otherwise> <!-- GET -->
+ <map:generate src="content/authoring/{page-envelope:document-path}"/>
+ <map:serialize type="xml"/>
+ </map:otherwise>
+
+ </map:select>
+ </map:match>
+ <!-- /GET and PUT -->
+
+ </map:match> <!-- uri pattern -->
+
+ <map:match type="step" pattern="xsl">
+ <map:generate src="xslt/{page-envelope:document-type}2xhtml.xsl"/>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ </map:match> <!-- usecase -->
+
+ <map:handle-errors type="500"/>
+
+ </map:pipeline>
+
+ </map:pipelines>
+
+</map:sitemap>
1.2 +65 -65 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/dublincore/dublincore.rng
Index: dublincore.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/dublincore/dublincore.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dublincore.rng 23 Oct 2003 14:04:49 -0000 1.1
+++ dublincore.rng 29 Jan 2004 17:18:49 -0000 1.2
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- >
-
-<!-- Dublin Core Schema -->
-
-<define name="dublincore">
- <interleave>
-
- <optional><element name="dc:title"><text/></element></optional>
- <optional><element name="dc:creator"><text/></element></optional>
- <optional><element name="dc:subject"><text/></element></optional>
- <optional><element name="dc:description"><text/></element></optional>
- <optional><element name="dc:publisher"><text/></element></optional>
- <optional><element name="dc:contributor"><text/></element></optional>
- <optional><element name="dc:date"><text/></element></optional>
- <optional><element name="dc:type"><text/></element></optional>
- <optional><element name="dc:format"><text/></element></optional>
- <optional><element name="dc:identifier"><text/></element></optional>
- <optional><element name="dc:source"><text/></element></optional>
- <optional><element name="dc:language"><text/></element></optional>
- <optional><element name="dc:relation"><text/></element></optional>
- <optional><element name="dc:coverage"><text/></element></optional>
- <optional><element name="dc:rights"><text/></element></optional>
-
- <optional><element name="dcterms:audience"><text/></element></optional>
- <optional><element name="dcterms:alternative"><text/></element></optional>
- <optional><element name="dcterms:tableOfContents"><text/></element></optional>
- <optional><element name="dcterms:abstract"><text/></element></optional>
- <optional><element name="dcterms:created"><text/></element></optional>
- <optional><element name="dcterms:valid"><text/></element></optional>
- <optional><element name="dcterms:available"><text/></element></optional>
- <optional><element name="dcterms:issued"><text/></element></optional>
- <optional><element name="dcterms:modified"><text/></element></optional>
- <optional><element name="dcterms:extent"><text/></element></optional>
- <optional><element name="dcterms:medium"><text/></element></optional>
- <optional><element name="dcterms:isVersionOf"><text/></element></optional>
- <optional><element name="dcterms:hasVersion"><text/></element></optional>
- <optional><element name="dcterms:isReplacedBy"><text/></element></optional>
- <optional><element name="dcterms:replaces"><text/></element></optional>
- <optional><element name="dcterms:isRequiredBy"><text/></element></optional>
- <optional><element name="dcterms:requires"><text/></element></optional>
- <optional><element name="dcterms:isPartOf"><text/></element></optional>
- <optional><element name="dcterms:hasPart"><text/></element></optional>
- <optional><element name="dcterms:isReferencedBy"><text/></element></optional>
- <optional><element name="dcterms:references"><text/></element></optional>
- <optional><element name="dcterms:isFormatOf"><text/></element></optional>
- <optional><element name="dcterms:hasFormat"><text/></element></optional>
- <optional><element name="dcterms:conformsTo"><text/></element></optional>
- <optional><element name="dcterms:spatial"><text/></element></optional>
- <optional><element name="dcterms:temporal"><text/></element></optional>
- <optional><element name="dcterms:mediator"><text/></element></optional>
- <optional><element name="dcterms:dateAccepted"><text/></element></optional>
- <optional><element name="dcterms:dateCopyrighted"><text/></element></optional>
- <optional><element name="dcterms:dateSubmitted"><text/></element></optional>
- <optional><element name="dcterms:educationLevel"><text/></element></optional>
- <optional><element name="dcterms:accessRights"><text/></element></optional>
- <optional><element name="dcterms:bibliographicCitation"><text/></element></optional>
-
- </interleave>
-</define>
-
-</grammar>
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:dcterms="http://purl.org/dc/terms/"
+ >
+
+<!-- Dublin Core Schema -->
+
+<define name="dublincore">
+ <interleave>
+
+ <optional><element name="dc:title"><text/></element></optional>
+ <optional><element name="dc:creator"><text/></element></optional>
+ <optional><element name="dc:subject"><text/></element></optional>
+ <optional><element name="dc:description"><text/></element></optional>
+ <optional><element name="dc:publisher"><text/></element></optional>
+ <optional><element name="dc:contributor"><text/></element></optional>
+ <optional><element name="dc:date"><text/></element></optional>
+ <optional><element name="dc:type"><text/></element></optional>
+ <optional><element name="dc:format"><text/></element></optional>
+ <optional><element name="dc:identifier"><text/></element></optional>
+ <optional><element name="dc:source"><text/></element></optional>
+ <optional><element name="dc:language"><text/></element></optional>
+ <optional><element name="dc:relation"><text/></element></optional>
+ <optional><element name="dc:coverage"><text/></element></optional>
+ <optional><element name="dc:rights"><text/></element></optional>
+
+ <optional><element name="dcterms:audience"><text/></element></optional>
+ <optional><element name="dcterms:alternative"><text/></element></optional>
+ <optional><element name="dcterms:tableOfContents"><text/></element></optional>
+ <optional><element name="dcterms:abstract"><text/></element></optional>
+ <optional><element name="dcterms:created"><text/></element></optional>
+ <optional><element name="dcterms:valid"><text/></element></optional>
+ <optional><element name="dcterms:available"><text/></element></optional>
+ <optional><element name="dcterms:issued"><text/></element></optional>
+ <optional><element name="dcterms:modified"><text/></element></optional>
+ <optional><element name="dcterms:extent"><text/></element></optional>
+ <optional><element name="dcterms:medium"><text/></element></optional>
+ <optional><element name="dcterms:isVersionOf"><text/></element></optional>
+ <optional><element name="dcterms:hasVersion"><text/></element></optional>
+ <optional><element name="dcterms:isReplacedBy"><text/></element></optional>
+ <optional><element name="dcterms:replaces"><text/></element></optional>
+ <optional><element name="dcterms:isRequiredBy"><text/></element></optional>
+ <optional><element name="dcterms:requires"><text/></element></optional>
+ <optional><element name="dcterms:isPartOf"><text/></element></optional>
+ <optional><element name="dcterms:hasPart"><text/></element></optional>
+ <optional><element name="dcterms:isReferencedBy"><text/></element></optional>
+ <optional><element name="dcterms:references"><text/></element></optional>
+ <optional><element name="dcterms:isFormatOf"><text/></element></optional>
+ <optional><element name="dcterms:hasFormat"><text/></element></optional>
+ <optional><element name="dcterms:conformsTo"><text/></element></optional>
+ <optional><element name="dcterms:spatial"><text/></element></optional>
+ <optional><element name="dcterms:temporal"><text/></element></optional>
+ <optional><element name="dcterms:mediator"><text/></element></optional>
+ <optional><element name="dcterms:dateAccepted"><text/></element></optional>
+ <optional><element name="dcterms:dateCopyrighted"><text/></element></optional>
+ <optional><element name="dcterms:dateSubmitted"><text/></element></optional>
+ <optional><element name="dcterms:educationLevel"><text/></element></optional>
+ <optional><element name="dcterms:accessRights"><text/></element></optional>
+ <optional><element name="dcterms:bibliographicCitation"><text/></element></optional>
+
+ </interleave>
+</define>
+
+</grammar>
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/exclude/basic-table.rng
Index: basic-table.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/exclude/basic-table.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/exclude/form.rng
Index: form.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/exclude/form.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/exclude/basic.rng
Index: basic.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/exclude/basic.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/xhtml-basic.rng
Index: xhtml-basic.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/xhtml-basic.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/xhtml.rng
Index: xhtml.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/xhtml.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/xhtml-strict.rng
Index: xhtml-strict.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml/xhtml-strict.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.3 +39 -39 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/lenya.rng
Index: lenya.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/lenya.rng,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lenya.rng 14 Jan 2004 02:05:50 -0000 1.2
+++ lenya.rng 29 Jan 2004 17:18:50 -0000 1.3
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="http://www.w3.org/1999/xhtml"
- xmlns="http://relaxng.org/ns/structure/1.0"
- xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:xhtml="http://www.w3.org/1999/xhtml"
- >
-
-
-<include href="dublincore/dublincore.rng"/>
-
-
-<define name="lenya.meta">
- <element name="lenya:meta">
- <ref name="dublincore"/>
- </element>
-</define>
-
-
-<define name="lenya.asset">
- <element name="lenya:asset">
- <attribute name="src"><ref name="Text.datatype"/></attribute>
- <attribute name="type"><ref name="Text.datatype"/></attribute>
- <text/>
- </element>
-</define>
-
-
-<!-- namespace dummy attributes -->
-<define name="dummy.attlist">
- <attribute name="dc:dummy"><ref name="Text.datatype"/></attribute>
- <attribute name="dcterms:dummy"><ref name="Text.datatype"/></attribute>
- <attribute name="lenya:dummy"><ref name="Text.datatype"/></attribute>
- <attribute name="xhtml:dummy"><ref name="Text.datatype"/></attribute>
-</define>
-
-
-</grammar>
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar ns="http://www.w3.org/1999/xhtml"
+ xmlns="http://relaxng.org/ns/structure/1.0"
+ xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:dcterms="http://purl.org/dc/terms/"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
+ >
+
+
+<include href="dublincore/dublincore.rng"/>
+
+
+<define name="lenya.meta">
+ <element name="lenya:meta">
+ <ref name="dublincore"/>
+ </element>
+</define>
+
+
+<define name="lenya.asset">
+ <element name="lenya:asset">
+ <attribute name="src"><ref name="Text.datatype"/></attribute>
+ <attribute name="type"><ref name="Text.datatype"/></attribute>
+ <text/>
+ </element>
+</define>
+
+
+<!-- namespace dummy attributes -->
+<define name="dummy.attlist">
+ <attribute name="dc:dummy"><ref name="Text.datatype"/></attribute>
+ <attribute name="dcterms:dummy"><ref name="Text.datatype"/></attribute>
+ <attribute name="lenya:dummy"><ref name="Text.datatype"/></attribute>
+ <attribute name="xhtml:dummy"><ref name="Text.datatype"/></attribute>
+</define>
+
+
+</grammar>
1.3 +47 -47 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml.rng
Index: xhtml.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/schemas/xhtml.rng,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xhtml.rng 14 Jan 2004 02:05:50 -0000 1.2
+++ xhtml.rng 29 Jan 2004 17:18:50 -0000 1.3
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--+
- | XHTML doctype
- +-->
-
-<grammar ns="http://www.w3.org/1999/xhtml"
- xmlns="http://relaxng.org/ns/structure/1.0"
- xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:xhtml="http://www.w3.org/1999/xhtml"
- >
-
-<include href="lenya.rng"/>
-
-
-<!-- include original XHTML transitional schema -->
-<include href="xhtml/xhtml-strict.rng">
-
- <define name="html">
- <element name="html">
- <ref name="html.attlist"/>
- <ref name="lenya.meta"/>
- <ref name="head"/>
- <ref name="body"/>
- </element>
- </define>
-
- <define name="html.attlist">
- <ref name="XHTML.version.attrib"/>
- <ref name="I18n.attrib"/>
- <ref name="dummy.attlist"/>
- </define>
-
-</include>
-
-
-<!-- additional block elements -->
-<define name="Block.class" combine="choice">
- <choice>
- <ref name="lenya.asset"/>
- </choice>
-</define>
-
-
-</grammar>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--+
+ | XHTML doctype
+ +-->
+
+<grammar ns="http://www.w3.org/1999/xhtml"
+ xmlns="http://relaxng.org/ns/structure/1.0"
+ xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:dcterms="http://purl.org/dc/terms/"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
+ >
+
+<include href="lenya.rng"/>
+
+
+<!-- include original XHTML transitional schema -->
+<include href="xhtml/xhtml-strict.rng">
+
+ <define name="html">
+ <element name="html">
+ <ref name="html.attlist"/>
+ <ref name="lenya.meta"/>
+ <ref name="head"/>
+ <ref name="body"/>
+ </element>
+ </define>
+
+ <define name="html.attlist">
+ <ref name="XHTML.version.attrib"/>
+ <ref name="I18n.attrib"/>
+ <ref name="dummy.attlist"/>
+ </define>
+
+</include>
+
+
+<!-- additional block elements -->
+<define name="Block.class" combine="choice">
+ <choice>
+ <ref name="lenya.asset"/>
+ </choice>
+</define>
+
+
+</grammar>
1.2 +79 -79 cocoon-lenya/src/webapp/lenya/pubs/default/lenya/content/authoring/create-language.xsp
Index: create-language.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/lenya/content/authoring/create-language.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- create-language.xsp 9 Nov 2003 05:03:01 -0000 1.1
+++ create-language.xsp 29 Jan 2004 17:18:50 -0000 1.2
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<xsp:page
- language="java"
- xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-request="http://apache.org/xsp/request/2.0"
- xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- >
-
- <xsp:structure>
- <xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
- <xsp:include>org.apache.lenya.cms.publication.Document</xsp:include>
- <xsp:include>org.apache.lenya.cms.publication.DocumentException</xsp:include>
- <xsp:include>java.util.HashMap</xsp:include>
- </xsp:structure>
-
- <parent-child>
-
- <xsp:logic>
- String status = <xsp-request:get-parameter name="status"/>;
-
- // get the parentId
- String parentId = <xsp-request:get-parameter name="parent-uri"/>;
- if (parentId == null) {
- parentId = <input:get-attribute module="page-envelope" as="string" name="document-id"/>;
- // for creation purposes the parentid "/index" (the home page) is special.
- if (parentId.equals("/index")) {
- parentId = "/";
- }
- }
-
- if ((status != null) && (status.equals("failed"))) {
- <xsp:content><exception/></xsp:content>
- }
-
- HashMap map = new HashMap();
- Publication pub = (Publication) <input:get-attribute module="page-envelope" as="object" name="publication"/>;
- String[] languages = pub.getLanguages();
- for (int i = 0; i < languages.length; i++) {
- map.put(languages[i], null);
- }
- Document doc = (Document) <input:get-attribute module="page-envelope" as="object" name="document"/>;
- String[] usedLanguages = null;
- try {
- usedLanguages = doc.getLanguages();
- } catch (DocumentException e) {}
- if (usedLanguages != null) {
- for (int i = 0; i < usedLanguages.length; i++) {
- map.remove(usedLanguages[i]);
- }
- }
- String[] validLanguages = (String[])map.keySet().toArray(new String[map.keySet().size()]);
- </xsp:logic>
-
- <document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/></document-id>
- <referer><xsp-request:get-uri/></referer>
- <doctype><xsp:expr><xsp-request:get-parameter name="doctype"/></xsp:expr></doctype>
- <user-id><input:get-attribute module="access-control" name="user-id"/></user-id>
- <ip-address><input:get-attribute module="access-control" name="ip-address"/></ip-address>
-
- <document-language><input:get-attribute module="page-envelope" name="document-language"/></document-language>
- <dc:creator><input:get-attribute module="access-control" name="user-id"/> (<input:get-attribute module="access-control" name="user-name"/>)</dc:creator>
- <dc:subject></dc:subject>
- <dc:publisher>University of Zurich</dc:publisher>
- <dc:date><input:get-attribute module="date" name="currentDate"/></dc:date>
- <dc:rights>University of Zurich</dc:rights>
- <dc:languages>
- <xsp:logic>
- for (int i = 0; i < validLanguages.length; i++) {
- <xsp:content>
- <dc:language><xsp:expr>validLanguages[i]</xsp:expr></dc:language>
- </xsp:content>
- }
- </xsp:logic>
- </dc:languages>
-
- </parent-child>
-</xsp:page>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xsp:page
+ language="java"
+ xmlns:xsp="http://apache.org/xsp"
+ xmlns:xsp-request="http://apache.org/xsp/request/2.0"
+ xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ >
+
+ <xsp:structure>
+ <xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
+ <xsp:include>org.apache.lenya.cms.publication.Document</xsp:include>
+ <xsp:include>org.apache.lenya.cms.publication.DocumentException</xsp:include>
+ <xsp:include>java.util.HashMap</xsp:include>
+ </xsp:structure>
+
+ <parent-child>
+
+ <xsp:logic>
+ String status = <xsp-request:get-parameter name="status"/>;
+
+ // get the parentId
+ String parentId = <xsp-request:get-parameter name="parent-uri"/>;
+ if (parentId == null) {
+ parentId = <input:get-attribute module="page-envelope" as="string" name="document-id"/>;
+ // for creation purposes the parentid "/index" (the home page) is special.
+ if (parentId.equals("/index")) {
+ parentId = "/";
+ }
+ }
+
+ if ((status != null) && (status.equals("failed"))) {
+ <xsp:content><exception/></xsp:content>
+ }
+
+ HashMap map = new HashMap();
+ Publication pub = (Publication) <input:get-attribute module="page-envelope" as="object" name="publication"/>;
+ String[] languages = pub.getLanguages();
+ for (int i = 0; i < languages.length; i++) {
+ map.put(languages[i], null);
+ }
+ Document doc = (Document) <input:get-attribute module="page-envelope" as="object" name="document"/>;
+ String[] usedLanguages = null;
+ try {
+ usedLanguages = doc.getLanguages();
+ } catch (DocumentException e) {}
+ if (usedLanguages != null) {
+ for (int i = 0; i < usedLanguages.length; i++) {
+ map.remove(usedLanguages[i]);
+ }
+ }
+ String[] validLanguages = (String[])map.keySet().toArray(new String[map.keySet().size()]);
+ </xsp:logic>
+
+ <document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/></document-id>
+ <referer><xsp-request:get-uri/></referer>
+ <doctype><xsp:expr><xsp-request:get-parameter name="doctype"/></xsp:expr></doctype>
+ <user-id><input:get-attribute module="access-control" name="user-id"/></user-id>
+ <ip-address><input:get-attribute module="access-control" name="ip-address"/></ip-address>
+
+ <document-language><input:get-attribute module="page-envelope" name="document-language"/></document-language>
+ <dc:creator><input:get-attribute module="access-control" name="user-id"/> (<input:get-attribute module="access-control" name="user-name"/>)</dc:creator>
+ <dc:subject></dc:subject>
+ <dc:publisher>University of Zurich</dc:publisher>
+ <dc:date><input:get-attribute module="date" name="currentDate"/></dc:date>
+ <dc:rights>University of Zurich</dc:rights>
+ <dc:languages>
+ <xsp:logic>
+ for (int i = 0; i < validLanguages.length; i++) {
+ <xsp:content>
+ <dc:language><xsp:expr>validLanguages[i]</xsp:expr></dc:language>
+ </xsp:content>
+ }
+ </xsp:logic>
+ </dc:languages>
+
+ </parent-child>
+</xsp:page>
1.2 +218 -218 cocoon-lenya/src/webapp/lenya/pubs/default/resources/shared/css/page.css
Index: page.css
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/resources/shared/css/page.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- page.css 14 Jan 2004 19:00:25 -0000 1.1
+++ page.css 29 Jan 2004 17:18:50 -0000 1.2
@@ -1,218 +1,218 @@
-/*
- Document : page
- Created on : 11. April 2003, 11:13
- Author : andreas
- Description:
- Purpose of the stylesheet follows.
-*/
-
-/* page */
-
-#page {
- padding: 0px;
- margin: 0px;
-}
-
-/* tabs */
-
-#tabs {
- border-bottom: solid 5px #DDBBBB;
- color: Maroon;
-}
-
-#tabs a {
- text-decoration: none;
- color: Maroon;
-}
-
-#tabs table {
- font-family: Verdana, Arial, Sans-serif;
- font-size: 80%;
-}
-
-#tabs td {
- vertical-align: bottom;
-}
-
-#tabs div {
- white-space: nowrap;
-}
-
-.tab {
- padding: .2em .5em;
- background-color: #FFEEEE;
- border: solid 1px #BB9999;
-}
-
-.tab-selected {
- padding: .2em .5em;
- background-color: #FFCCCC;
- border: solid 1px #BB9999;
- border-bottom: solid 1px #DDBBBB;
-}
-
-.tab-separator {
- border-bottom: solid 1px #BB9999;
-}
-
-.tab-pre-separator {
- width: 25px;
- border-bottom: solid 1px #BB9999;
-}
-
-td.tab-post-separator {
- width: 100%;
-}
-
-/* menu */
-
-#menu {
- font-family: Verdana, Arial, Sans-serif;
- background-color: #DDBBBB;
- border: solid 1px #BB9999;
- border-left: none;
- border-top: none;
- color: Maroon;
- padding: 0px 0px 5px 25px;
-}
-
-#menu a {
- text-decoration: none;
- color: Maroon;
-}
-
-#menu a:hover {
- text-decoration: underline;
-}
-
-.menublock-1, .menublock-selected-1 {
- padding: 0px;
- border-top: solid 1px #DDBBBB;
- background: #FFCCCC;
-}
-
-.menublock-1 a { }
-.menublock-1 a:visited { }
-
-.menublock-1 .menublock-2 { display: none; }
-
-.menublock-selected-1 .menuitem-1 { background-color: #FFEEEE; }
-.menublock-1 .menuitem-1 { }
-
-.menuitem-1 { padding: 5px 5px 5px 5px; font-size: 80%; }
-.menuitem-2 { padding: 2px 5px 2px 25px; font-size: 80%; }
-.menuitem-selected-2 { padding: 2px 5px 2px 25px; font-size: 80%; color: black; }
-.menuitem-2 a { }
-
-.menuitem-selected-1 {
- background-color: #FFEEEE;
- padding: 5px 5px 5px 5px;
- font-size: 80%;
-}
-
-
-.menuitem-3 { padding: 2px 5px 2px 25px; font-size: 60%; }
-.menuitem-selected-3 { padding: 2px 5px 2px 25px; font-size: 60%; }
-
-/* breadcrumb */
-
-#breadcrumb {
- padding: 3px 0px 3px 30px;
- background-color: #FFEEEE;
- border-top: solid 1px #BB9999;
- border-bottom: solid 1px #BB9999;
- font-family: Verdana, Arial, Sans-serif;
- font-size: 80%;
-}
-
-#breadcrumb a {
- text-decoration: none;
- color: Maroon;
-}
-
-/* body */
-
-#body {
- border: none;
- padding: 1em;
- margin-left: 10px;
- font-family: Verdana, Arial, Sans-serif;
-}
-
-#main {
-/*
- float: left;
- width: 80%;
-*/
-}
-
-h1 { font-size: 140%; }
-h2 { font-size: 100%; }
-h3 { font-size: 80%; }
-p { font-size: 80%; }
-li { font-size: 80%; }
-
-.crossheading { font-weight: bold; font-size: 110%; }
-
-table.simple {
- border-collapse: collapse;
-/*
- background-color: #909090;
- border-color: #909090;
-*/
- width: auto;
-}
-
-td.simple {
- font-size: 80%;
- padding: 3px;
- background-color: White;
- border: solid 1px Navy;
- vertical-align: top;
-}
-
-img.simple {
-}
-
-#publication-title {
- font-family: verdana, arial, sans-serif;
- font-weight: bold;
- font-size: 20px;
- vertical-align: bottom;
- padding-left: 25px;
- padding-bottom: 15px;
- color: Maroon;
-}
-
-#project-logo {
- padding: 10px 20px 0px 0px;
- text-align: right;
-}
-
-.media {
- text-align: center;
- padding: 10px;
-}
-
-.caption {
- padding: 5px;
- text-align: center;
- font-style: italic;
- font-size: 80%;
-}
-
-.abstract {
- font-weight: bold;
-}
-
-h1 {
- font-size: 120%;
- color: Maroon;
-}
-
-h2 {
- font-size: 100%;
- color: Maroon;
- border-bottom: solid 1px #BB9999;
- margin-top: 30px;
-}
+/*
+ Document : page
+ Created on : 11. April 2003, 11:13
+ Author : andreas
+ Description:
+ Purpose of the stylesheet follows.
+*/
+
+/* page */
+
+#page {
+ padding: 0px;
+ margin: 0px;
+}
+
+/* tabs */
+
+#tabs {
+ border-bottom: solid 5px #DDBBBB;
+ color: Maroon;
+}
+
+#tabs a {
+ text-decoration: none;
+ color: Maroon;
+}
+
+#tabs table {
+ font-family: Verdana, Arial, Sans-serif;
+ font-size: 80%;
+}
+
+#tabs td {
+ vertical-align: bottom;
+}
+
+#tabs div {
+ white-space: nowrap;
+}
+
+.tab {
+ padding: .2em .5em;
+ background-color: #FFEEEE;
+ border: solid 1px #BB9999;
+}
+
+.tab-selected {
+ padding: .2em .5em;
+ background-color: #FFCCCC;
+ border: solid 1px #BB9999;
+ border-bottom: solid 1px #DDBBBB;
+}
+
+.tab-separator {
+ border-bottom: solid 1px #BB9999;
+}
+
+.tab-pre-separator {
+ width: 25px;
+ border-bottom: solid 1px #BB9999;
+}
+
+td.tab-post-separator {
+ width: 100%;
+}
+
+/* menu */
+
+#menu {
+ font-family: Verdana, Arial, Sans-serif;
+ background-color: #DDBBBB;
+ border: solid 1px #BB9999;
+ border-left: none;
+ border-top: none;
+ color: Maroon;
+ padding: 0px 0px 5px 25px;
+}
+
+#menu a {
+ text-decoration: none;
+ color: Maroon;
+}
+
+#menu a:hover {
+ text-decoration: underline;
+}
+
+.menublock-1, .menublock-selected-1 {
+ padding: 0px;
+ border-top: solid 1px #DDBBBB;
+ background: #FFCCCC;
+}
+
+.menublock-1 a { }
+.menublock-1 a:visited { }
+
+.menublock-1 .menublock-2 { display: none; }
+
+.menublock-selected-1 .menuitem-1 { background-color: #FFEEEE; }
+.menublock-1 .menuitem-1 { }
+
+.menuitem-1 { padding: 5px 5px 5px 5px; font-size: 80%; }
+.menuitem-2 { padding: 2px 5px 2px 25px; font-size: 80%; }
+.menuitem-selected-2 { padding: 2px 5px 2px 25px; font-size: 80%; color: black; }
+.menuitem-2 a { }
+
+.menuitem-selected-1 {
+ background-color: #FFEEEE;
+ padding: 5px 5px 5px 5px;
+ font-size: 80%;
+}
+
+
+.menuitem-3 { padding: 2px 5px 2px 25px; font-size: 60%; }
+.menuitem-selected-3 { padding: 2px 5px 2px 25px; font-size: 60%; }
+
+/* breadcrumb */
+
+#breadcrumb {
+ padding: 3px 0px 3px 30px;
+ background-color: #FFEEEE;
+ border-top: solid 1px #BB9999;
+ border-bottom: solid 1px #BB9999;
+ font-family: Verdana, Arial, Sans-serif;
+ font-size: 80%;
+}
+
+#breadcrumb a {
+ text-decoration: none;
+ color: Maroon;
+}
+
+/* body */
+
+#body {
+ border: none;
+ padding: 1em;
+ margin-left: 10px;
+ font-family: Verdana, Arial, Sans-serif;
+}
+
+#main {
+/*
+ float: left;
+ width: 80%;
+*/
+}
+
+h1 { font-size: 140%; }
+h2 { font-size: 100%; }
+h3 { font-size: 80%; }
+p { font-size: 80%; }
+li { font-size: 80%; }
+
+.crossheading { font-weight: bold; font-size: 110%; }
+
+table.simple {
+ border-collapse: collapse;
+/*
+ background-color: #909090;
+ border-color: #909090;
+*/
+ width: auto;
+}
+
+td.simple {
+ font-size: 80%;
+ padding: 3px;
+ background-color: White;
+ border: solid 1px Navy;
+ vertical-align: top;
+}
+
+img.simple {
+}
+
+#publication-title {
+ font-family: verdana, arial, sans-serif;
+ font-weight: bold;
+ font-size: 20px;
+ vertical-align: bottom;
+ padding-left: 25px;
+ padding-bottom: 15px;
+ color: Maroon;
+}
+
+#project-logo {
+ padding: 10px 20px 0px 0px;
+ text-align: right;
+}
+
+.media {
+ text-align: center;
+ padding: 10px;
+}
+
+.caption {
+ padding: 5px;
+ text-align: center;
+ font-style: italic;
+ font-size: 80%;
+}
+
+.abstract {
+ font-weight: bold;
+}
+
+h1 {
+ font-size: 120%;
+ color: Maroon;
+}
+
+h2 {
+ font-size: 100%;
+ color: Maroon;
+ border-bottom: solid 1px #BB9999;
+ margin-top: 30px;
+}
1.2 +0 -0 cocoon-lenya/src/webapp/lenya/pubs/default/resources/misc/bxeng/xhtml-bxeng.css
Index: xhtml-bxeng.css
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/resources/misc/bxeng/xhtml-bxeng.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org