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/14 02:52:16 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/samples simple.xml
gregor 2004/01/13 17:52:16
Modified: src/webapp/lenya/pubs/default/xslt lenya-header.xsl
src/webapp/lenya/pubs/default/content/live/index
index_en.xml
src/webapp/lenya/pubs/default/content/authoring sitetree.xml
src/webapp/lenya/pubs/default/config/doctypes doctypes.xconf
src/webapp/lenya/pubs/default/content/authoring/index
index_en.xml index_de.xml
src/webapp/lenya/pubs/default/content/authoring/doctypes
index_de.xml index_en.xml
src/webapp/lenya/pubs/default publication-sitemap.xmap
parameter-doctype.xmap
Removed: src/webapp/lenya/pubs/default/lenya/xslt/formeditor
simple.xsl
src/webapp/lenya/pubs/default/resources/misc/bxeng
simple-bxeng.css simple-namespaces.xml
src/webapp/lenya/pubs/default/xslt simple-bxeng.xsl
simple2xhtml.xsl
src/webapp/lenya/pubs/default/config/doctypes/schemas
simple.rng
src/webapp/lenya/pubs/default/content/authoring/doctypes/simple-document
index_en.xml index_de.xml
src/webapp/lenya/pubs/default/config/doctypes/samples
simple.xml
Log:
remove simple doctype
Revision Changes Path
1.7 +2 -3 cocoon-lenya/src/webapp/lenya/pubs/default/xslt/lenya-header.xsl
Index: lenya-header.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/xslt/lenya-header.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lenya-header.xsl 4 Nov 2003 10:23:12 -0000 1.6
+++ lenya-header.xsl 14 Jan 2004 01:52:15 -0000 1.7
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- $Id$ -->
-<!-- RKUPATCH -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -15,7 +14,7 @@
<xsl:template match="dc:title">
<h1>
<xsl:if test="$rendertype = 'edit'">
- <xsl:attribute name="bxe_xpath">/simple:simple-document/lenya:meta/dc:title</xsl:attribute>
+ <xsl:attribute name="bxe_xpath">/html/lenya:meta/dc:title</xsl:attribute>
</xsl:if>
<xsl:apply-templates/>
</h1>
1.3 +19 -19 cocoon-lenya/src/webapp/lenya/pubs/default/content/live/index/index_en.xml
Index: index_en.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/content/live/index/index_en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index_en.xml 30 Jul 2003 13:51:38 -0000 1.2
+++ index_en.xml 14 Jan 2004 01:52:15 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<simple-document xmlns="http://apache.org/cocoon/lenya/doctypes/simple-document/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0">
<!-- the root element indicates the doctype -->
<lenya:meta>
<dc:title>DC Title</dc:title>
@@ -18,6 +18,9 @@
<dc:coverage/>
<dc:rights>DC Rights</dc:rights>
</lenya:meta>
+ <head>
+ <title>Welcome to the Default publication</title>
+ </head>
<body>
<p>Hello and welcome to the Lenya default publication!</p>
@@ -27,32 +30,29 @@
Cocoon.</p>
<p>For an overview of the concepts and the terminology used in
- Apache Lenya please see the <ulink url="concepts.html">Concepts
- section</ulink>. To see what you can do with Apache Lenya please
- refer to the <ulink url="features.html">Features
- section</ulink>.</p>
+ Apache Lenya please see the <a href="concepts.html">Concepts
+ section</a>. To see what you can do with Apache Lenya please
+ refer to the <a href="features.html">Features
+ section</a>.</p>
<p>If you'd like to get a quick introduction on how to use Apache
- Lenya CMS please go through the <ulink
- url="tutorial.html">tutorial</ulink>.</p>
+ Lenya CMS please go through the <a
+ href="tutorial.html">tutorial</a>.</p>
<p>The purpose of this publication is</p>
- <itemizedlist>
- <listitem>to show beginners the basic functionality of the Apache
- Lenya CMS,</listitem>
-
- <listitem>to provide an "out of the box" publication that can be
- easily adapted and used,</listitem>
-
- <listitem>and to provide a basis for reference implementations of new
- concepts and best practices.</listitem>
-
- </itemizedlist>
+ <ul>
+ <li>to show beginners the basic functionality of the Apache
+ Lenya CMS,</li>
+ <li>to provide an "out of the box" publication that can be
+ easily adapted and used,</li>
+ <li>and to provide a basis for reference implementations of new
+ concepts and best practices.</li>
+ </ul>
<p>This publication does not go to the limit of what's possible
with Apache Lenya CMS, there are no fancy bells and whistles to
confuse you, this publication simply contains everything you need
to get started.</p>
</body>
-</simple-document>
+</html>
1.14 +1 -5 cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/sitetree.xml
Index: sitetree.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/sitetree.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sitetree.xml 28 Jul 2003 20:11:02 -0000 1.13
+++ sitetree.xml 14 Jan 2004 01:52:15 -0000 1.14
@@ -31,10 +31,6 @@
<node id="doctypes">
<label xml:lang="en">Document Type Examples</label>
<label xml:lang="de">Dokumenttyp Beispiele</label>
- <node id="simple-document">
- <label xml:lang="en">Simple Doctype</label>
- <label xml:lang="de">Einfacher Dokumenttyp</label>
- </node>
<node id="xhtml-document">
<label xml:lang="en">XHTML Doctype</label>
<label xml:lang="de">XHTML Dokumenttyp</label>
1.5 +0 -15 cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/doctypes.xconf
Index: doctypes.xconf
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/doctypes/doctypes.xconf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- doctypes.xconf 12 Aug 2003 14:31:17 -0000 1.4
+++ doctypes.xconf 14 Jan 2004 01:52:15 -0000 1.5
@@ -2,23 +2,8 @@
<doctypes>
- <doc type="simple">
- <children>
- <doc type="simple"/>
- <doc type="xhtml"/>
- </children>
- <creator src="org.apache.lenya.cms.authoring.DefaultBranchCreator">
- <sample-name>simple.xml</sample-name>
- </creator>
- <tasks>
- <task id="publish"/>
- </tasks>
- <workflow src="workflow.xml"/>
- </doc>
-
<doc type="xhtml">
<children>
- <doc type="simple"/>
<doc type="xhtml"/>
</children>
<creator src="org.apache.lenya.cms.authoring.DefaultBranchCreator">
1.5 +19 -16 cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/index/index_en.xml
Index: index_en.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/index/index_en.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index_en.xml 19 Nov 2003 10:09:22 -0000 1.4
+++ index_en.xml 14 Jan 2004 01:52:15 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<simple-document xmlns="http://apache.org/cocoon/lenya/doctypes/simple-document/1.0" xmlns:simple="http://apache.org/cocoon/lenya/doctypes/simple-document/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0" simple:dummy="FIXME:keepNamespace" dc:dummy="FIXME:keepNamespace" lenya:dummy="FIXME:keepNamespace">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0" html:dummy="FIXME:keepNamespace" dc:dummy="FIXME:keepNamespace" lenya:dummy="FIXME:keepNamespace">
<!-- the root element indicates the doctype -->
<lenya:meta>
<dc:title>Welcome to the Lenya default publication</dc:title>
@@ -18,6 +18,9 @@
<dc:coverage/>
<dc:rights>DC Rights</dc:rights>
</lenya:meta>
+ <head>
+ <title>Welcome to the Default publication</title>
+ </head>
<body>
<p>Hello and welcome to the Lenya default publication!</p>
@@ -27,32 +30,32 @@
Cocoon.</p>
<p>For an overview of the concepts and the terminology used in
- Apache Lenya please see the <ulink url="concepts.html">Concepts
- section</ulink>. To see what you can do with Apache Lenya please
- refer to the <ulink url="features.html">Features
- section</ulink>.</p>
+ Apache Lenya please see the <a href="concepts.html">Concepts
+ section</a>. To see what you can do with Apache Lenya please
+ refer to the <a href="features.html">Features
+ section</a>.</p>
<p>If you'd like to get a quick introduction on how to use Apache
- Lenya CMS please go through the <ulink
- url="tutorial.html">tutorial</ulink>.</p>
+ Lenya CMS please go through the <a
+ href="tutorial.html">tutorial</a>.</p>
<p>The purpose of this publication is</p>
- <itemizedlist>
- <listitem>to show beginners the basic functionality of the Apache
- Lenya CMS,</listitem>
+ <ul>
+ <li>to show beginners the basic functionality of the Apache
+ Lenya CMS,</li>
- <listitem>to provide an "out of the box" publication that can be
- easily adapted and used,</listitem>
+ <li>to provide an "out of the box" publication that can be
+ easily adapted and used,</li>
- <listitem>and to provide a basis for reference implementations of new
- concepts and best practices.</listitem>
+ <li>and to provide a basis for reference implementations of new
+ concepts and best practices.</li>
- </itemizedlist>
+ </ul>
<p>This publication does not go to the limit of what's possible
with Apache Lenya CMS, there are no fancy bells and whistles to
confuse you, this publication simply contains everything you need
to get started.</p>
</body>
-</simple-document>
+</html>
1.3 +21 -19 cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/index/index_de.xml
Index: index_de.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/index/index_de.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index_de.xml 30 Jul 2003 13:51:13 -0000 1.2
+++ index_de.xml 14 Jan 2004 01:52:15 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<simple-document xmlns="http://apache.org/cocoon/lenya/doctypes/simple-document/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0">
<!-- the root element indicates the doctype -->
<lenya:meta>
<dc:title>Standardpublikation</dc:title>
@@ -18,6 +18,9 @@
<dc:coverage/>
<dc:rights>DC Rights</dc:rights>
</lenya:meta>
+ <head>
+ <title>Welcome to the Default publication</title>
+ </head>
<body>
<p>Hello and welcome to the Lenya default publication!</p>
@@ -27,32 +30,31 @@
Cocoon.</p>
<p>For an overview of the concepts and the terminology used in
- Apache Lenya please see the <ulink url="concepts.html">Concepts
- section</ulink>. To see what you can do with Apache Lenya please
- refer to the <ulink url="features.html">Features
- section</ulink>.</p>
+ Apache Lenya please see the <a href="concepts.html">Concepts
+ section</a>. To see what you can do with Apache Lenya please
+ refer to the <a href="features.html">Features
+ section</a>.</p>
<p>If you'd like to get a quick introduction on how to use Apache
- Lenya CMS please go through the <ulink
- url="tutorial.html">tutorial</ulink>.</p>
+ Lenya CMS please go through the <a
+ href="tutorial.html">tutorial</a>.</p>
<p>The purpose of this publication is</p>
- <itemizedlist>
- <listitem>to show beginners the basic functionality of the Apache
- Lenya CMS,</listitem>
-
- <listitem>to provide an "out of the box" publication that can be
- easily adapted and used,</listitem>
-
- <listitem>and to provide a basis for reference implementations of new
- concepts and best practices.</listitem>
-
- </itemizedlist>
+ <ul>
+ <li>to show beginners the basic functionality of the Apache
+ Lenya CMS,</li>
+
+ <li>to provide an "out of the box" publication that can be
+ easily adapted and used,</li>
+
+ <li>and to provide a basis for reference implementations of new
+ concepts and best practices.</li>
+ </ul>
<p>This publication does not go to the limit of what's possible
with Apache Lenya CMS, there are no fancy bells and whistles to
confuse you, this publication simply contains everything you need
to get started.</p>
</body>
-</simple-document>
+</html>
1.4 +2 -12 cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/doctypes/index_de.xml
Index: index_de.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/doctypes/index_de.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index_de.xml 14 Jan 2004 00:40:17 -0000 1.3
+++ index_de.xml 14 Jan 2004 01:52:16 -0000 1.4
@@ -25,19 +25,9 @@
<body>
<h1>Dokumenttyp Beispiele</h1>
- <p>The default publication comes with two doctypes:</p>
-
- <ul>
- <li>the <a href="doctypes/simple-document.html">Simple Doctype</a> and </li>
- <li>the <a href="doctypes/xhtml-document.html">XHTML Doctype</a></li>
- </ul>
+ <p>The default publication comes with the <a href="doctypes/xhtml-document.html">XHTML Doctype.</a>
- <p>The Simple Doctype is typically used for situations when you
- want control over what information has to be included in a
- document. The Simple Document defines a set of tags that a
- document has to be comprised of.</p>
-
- <p>The XHTML Doctype on the other hand is for situations where
+ <p>The XHTML Doctype is for situations where
users ask for complete freedom on what information can be inserted
into a document. While this approach doesn't restrict you, it also
looses some of the major benefits of well defined document types.</p>
1.4 +2 -12 cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/doctypes/index_en.xml
Index: index_en.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/doctypes/index_en.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index_en.xml 14 Jan 2004 00:40:17 -0000 1.3
+++ index_en.xml 14 Jan 2004 01:52:16 -0000 1.4
@@ -25,19 +25,9 @@
<body>
<h1>Document Type Examples</h1>
- <p>The default publication comes with two doctypes:</p>
-
- <ul>
- <li>the <a href="doctypes/simple-document.html">Simple Doctype</a> and </li>
- <li>the <a href="doctypes/xhtml-document.html">XHTML Doctype</a></li>
- </ul>
+ <p>The default publication comes with the <a href="doctypes/xhtml-document.html">XHTML Doctype</a>.
- <p>The Simple Doctype is typically used for situations when you
- want control over what information has to be included in a
- document. The Simple Document defines a set of tags that a
- document has to be comprised of.</p>
-
- <p>The XHTML Doctype on the other hand is for situations where
+ <p>The XHTML Doctype is for situations where
users ask for complete freedom on what information can be inserted
into a document. While this approach doesn't restrict you, it also
looses some of the major benefits of well defined document types.</p>
1.64 +2 -2 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.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- publication-sitemap.xmap 10 Dec 2003 18:02:21 -0000 1.63
+++ publication-sitemap.xmap 14 Jan 2004 01:52:16 -0000 1.64
@@ -46,7 +46,7 @@
</map:pipeline>
<map:pipeline>
- <!-- pattern="{area}/simple/{document-path}" -->
+ <!-- pattern="{area}/xhtml/{document-path}" -->
<map:match pattern="lenya-document-*/*/*/**.xml">
<map:mount check-reload="true" reload-method="synchron" src="doctypes.xmap" uri-prefix="lenya-document-"/>
</map:match>
1.12 +1 -7 cocoon-lenya/src/webapp/lenya/pubs/default/parameter-doctype.xmap
Index: parameter-doctype.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/parameter-doctype.xmap,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- parameter-doctype.xmap 8 Jan 2004 16:13:41 -0000 1.11
+++ parameter-doctype.xmap 14 Jan 2004 01:52:16 -0000 1.12
@@ -12,12 +12,6 @@
<map:matchers default="wildcard"/>
<map:actions>
<map:action logger="sitemap.action.sourcetype" name="sourcetype" src="org.apache.forrest.components.sourcetype.SourceTypeAction">
- <sourcetype name="simple">
- <document-element local-name="simple-document"/>
- </sourcetype>
- <sourcetype name="simple">
- <document-element local-name="document"/>
- </sourcetype>
<sourcetype name="xhtml">
<document-element namespace="http://www.w3.org/1999/xhtml" />
</sourcetype>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org