You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/11/23 22:18:53 UTC
svn commit: r597742 - in
/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources:
COB-INF/ COB-INF/flow/ COB-INF/misc/ COB-INF/wiki/ META-INF/cocoon/spring/
Author: vgritsenko
Date: Fri Nov 23 13:18:52 2007
New Revision: 597742
URL: http://svn.apache.org/viewvc?rev=597742&view=rev
Log:
some cleanup of chaperon samples.
java syntax highlighing samples still do not work.
Added:
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/flow/
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/flow/wiki.js (contents, props changed)
- copied, changed from r597521, cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/wiki.js
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/samples.xml (contents, props changed)
- copied, changed from r597521, cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/samples.xml
Removed:
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/samples.xml
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/wiki.js
Modified:
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/chaperon.xsamples
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/edit.xml
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/error.css
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/java.css
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/mathexp.jx
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/new.xml
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/patterntext.xml
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/source.xml
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/view.xml
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/wiki/broken.txt
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/wiki/selftest.txt
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/chaperon.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/chaperon.xsamples?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/chaperon.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/chaperon.xsamples Fri Nov 23 13:18:52 2007
@@ -22,7 +22,7 @@
<xsamples>
<group name="Input Data Formats" priority="50">
- <sample name="Chaperon Block" href="/cocoon-chaperon-sample/">
+ <sample name="Chaperon Block" href="/samples/chaperon/">
Examples showing how to use the Chaperon text parser to parse common text files
(like Wiki or Java files) into the XML.
</sample>
Copied: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/flow/wiki.js (from r597521, cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/wiki.js)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/flow/wiki.js?p2=cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/flow/wiki.js&p1=cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/wiki.js&r1=597521&r2=597742&rev=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/wiki.js (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/flow/wiki.js Fri Nov 23 13:18:52 2007
@@ -17,18 +17,13 @@
var resolver = cocoon.getComponent(Packages.org.apache.excalibur.source.SourceResolver.ROLE);
function view() {
-
var page = cocoon.request.getParameter("page");
-
- if (page==null)
+ if (page == null)
page = "index";
- var source = null;
-
var text = "";
if (!exists(page)) {
-
cocoon.sendPageAndWait("wiki/new.html", {page:page});
text = cocoon.request.getParameter("text");
@@ -42,17 +37,15 @@
}
function edit() {
-
var page = cocoon.request.getParameter("page");
-
- if (page==null)
+ if (page == null)
page = "index";
var text = read(page);
cocoon.sendPageAndWait("wiki/edit.html", {page:page, text:text});
- var text = cocoon.request.getParameter("text");
+ text = cocoon.request.getParameter("text");
write(page, text);
@@ -60,12 +53,10 @@
}
function source() {
-
var page = cocoon.request.getParameter("page");
-
- if (page==null)
+ if (page == null)
page = "index";
-
+
var text = read(page);
cocoon.sendPage("wiki/source.xml", {page:page, text:text});
@@ -73,7 +64,6 @@
function read(page) {
-
var text = "";
var source = null;
try {
@@ -102,7 +92,6 @@
}
function write(page, text) {
-
var source = null;
try {
source = resolver.resolveURI("wiki/"+page+".txt");
@@ -120,7 +109,6 @@
}
function exists(page) {
-
var exists = true;
var source = null;
try {
@@ -135,10 +123,9 @@
}
function mathexp() {
- var value;
- if ( cocoon.request.getParameter("text") != null )
- value = cocoon.request.getParameter("text");
- else
+ var value = cocoon.request.getParameter("text");
+ if (value == null)
value = "3*a-5*6/7 + ( b-c)*5- b";
+
cocoon.sendPage("mathexp-view.html", {"value" : value});
}
Propchange: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/flow/wiki.js
------------------------------------------------------------------------------
eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/flow/wiki.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/flow/wiki.js
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/edit.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/edit.xml?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/edit.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/edit.xml Fri Nov 23 13:18:52 2007
@@ -15,21 +15,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<document>
- <header>
- <title>Wiki example</title>
- <tab title="back" href="."/>
- </header>
- <body>
- <row>
- <column title="Wiki content">
-
- <form action="${cocoon.continuation.id}.kont" method="post">
- <textarea name="text" type="textarea" cols="100" rows="23" style="width: 100%">${text}</textarea><br/>
- <input value="Save" type="submit" class="submit"/>
- </form>
- </column>
- </row>
- </body>
+<document>
+ <header>
+ <title>Wiki example</title>
+ <tab title="back" href="."/>
+ </header>
+ <body>
+ <row>
+ <column title="Wiki content">
+ <form action="${cocoon.continuation.id}.kont" method="post">
+ <textarea name="text" type="textarea" cols="100" rows="23" style="width: 100%">${text}</textarea>
+ <br/>
+ <input value="Save" type="submit" class="submit"/>
+ </form>
+ </column>
+ </row>
+ </body>
</document>
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/error.css
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/error.css?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/error.css (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/error.css Fri Nov 23 13:18:52 2007
@@ -1,42 +1,21 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-pre.error {
- //font-size: 10pt;
- font-size: 120%;
-}
-
-span.lt {
- background-color: #e5ffe5;
- margin: 0px;
- border: 0px;
- padding: 0px;
-}
-
-span.eq {
- background-color: #ff0000;
- margin: 0px;
- border: 0px;
- padding: 0px;
-}
-
-span.gt {
- background-color: #ffe5e5;
- margin: 0px;
- border: 0px;
- padding: 0px;
-}
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+pre.error { font-size: 120%; }
+span.lt { background-color: #e5ffe5; margin: 0; border: 0; padding: 0; }
+span.eq { background-color: #ff0000; margin: 0; border: 0; padding: 0; }
+span.gt { background-color: #ffe5e5; margin: 0; border: 0; padding: 0; }
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/java.css
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/java.css?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/java.css (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/java.css Fri Nov 23 13:18:52 2007
@@ -1,19 +1,20 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
TD.titleText {
BACKGROUND: #eff7ff; PADDING-left: 5px;
}
@@ -163,4 +164,3 @@
FONT.StrictFP { color: #2020BF ; font-weight: normal }
FONT.LITERAL { color: #b27b8c }
FONT.IDENTIFIER { color: #000000 }
-
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/mathexp.jx
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/mathexp.jx?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/mathexp.jx (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/mathexp.jx Fri Nov 23 13:18:52 2007
@@ -15,25 +15,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- @version $Id$ -->
-<document xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
- <header>
- <title>Chaperon examples</title>
- <tab title="back" href="."/>
- </header>
- <body>
- <row>
- <column title="Mathematical expression">
- <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0" source="" line="1" column="1">${value}</text>
+<!--
+ - $Id$
+ -->
+<page xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+ <title>Chaperon Block Samples</title>
+ <content>
+ <row>
+ <column title="Mathematical Expression">
- <p>
- <form action="mathexp.html" method="post">
- <input name="text" type="text" size="80" maxlength="110" value="${value}"/>
- <input type="submit"/>
- </form>
- </p>
- </column>
- </row>
- </body>
-</document>
+ <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0" source="" line="1" column="1">${value}</text>
+
+ <p>
+ <form action="mathexp.html" method="post">
+ <input name="text" type="text" size="80" maxlength="110" value="${value}"/>
+ <input type="submit"/>
+ </form>
+ </p>
+ </column>
+ </row>
+ </content>
+</page>
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/new.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/new.xml?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/new.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/new.xml Fri Nov 23 13:18:52 2007
@@ -15,21 +15,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<document>
- <header>
- <title>Wiki example</title>
- <tab title="back" href="."/>
- </header>
- <body>
- <row>
- <column title="Wiki content">
-
- <form action="${cocoon.continuation.id}.kont" method="post">
- <textarea name="text" type="textarea" cols="100" rows="23" style="width: 100%"></textarea><br/>
- <input value="Save" type="submit" class="submit"/>
- </form>
- </column>
- </row>
- </body>
+<document>
+ <header>
+ <title>Wiki example</title>
+ <tab title="back" href="."/>
+ </header>
+ <body>
+ <row>
+ <column title="Wiki content">
+ <form action="${cocoon.continuation.id}.kont" method="post">
+ <textarea name="text" type="textarea" cols="100" rows="23" style="width: 100%"/>
+ <br/>
+ <input value="Save" type="submit" class="submit"/>
+ </form>
+ </column>
+ </row>
+ </body>
</document>
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/patterntext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/patterntext.xml?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/patterntext.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/patterntext.xml Fri Nov 23 13:18:52 2007
@@ -15,21 +15,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<document>
- <header>
- <title>Chaperon examples</title>
- <tab title="back" href="."/>
- </header>
- <body>
- <section>
- <title>Pattern test</title>
+ <header>
+ <title>Chaperon examples</title>
+ <tab title="back" href="."/>
+ </header>
+ <body>
+ <section>
+ <title>Pattern test</title>
- <p>Some links for the Apache project(http://xml.apache.org/):</p>
- <ul>
- <li>Here the link for Cocoon http://cocoon.apache.org/</li>
- <li>And the link for Avalon http://jakarta.apache.org/avalon/</li>
- </ul>
- <p>This example was made by Stephan Michels(stephan@apache.org).</p>
- </section>
- </body>
+ <p>Some links for the Apache project(http://xml.apache.org/):</p>
+ <ul>
+ <li>Here the link for Cocoon http://cocoon.apache.org/</li>
+ <li>And the link for Avalon http://jakarta.apache.org/avalon/</li>
+ </ul>
+ <p>This example was made by Stephan Michels(stephan@apache.org).</p>
+ </section>
+ </body>
</document>
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/source.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/source.xml?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/source.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/source.xml Fri Nov 23 13:18:52 2007
@@ -15,11 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<document>
- <header>
- <title>Wiki example</title>
- </header>
- <body>
- <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0" source="wiki/${page}.txt" line="1" column="1">${text}</text>
- </body>
+ <header>
+ <title>Wiki example</title>
+ </header>
+ <body>
+ <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0" source="wiki/${page}.txt" line="1" column="1">${text}</text>
+ </body>
</document>
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/view.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/view.xml?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/view.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/view.xml Fri Nov 23 13:18:52 2007
@@ -15,14 +15,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<document>
- <header>
- <title>Wiki example</title>
- <tab title="Edit" href="edit.do?page=${page}"/>
- <tab title="Source" href="source.do?page=${page}"/>
- <tab title="back" href="."/>
- </header>
- <body>
- <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0" source="wiki/${page}.txt" line="1" column="1">${text}</text>
- </body>
+ <header>
+ <title>Wiki example</title>
+ <tab title="Edit" href="edit.do?page=${page}"/>
+ <tab title="Source" href="source.do?page=${page}"/>
+ <tab title="back" href="."/>
+ </header>
+ <body>
+ <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0" source="wiki/${page}.txt" line="1" column="1">${text}</text>
+ </body>
</document>
Copied: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/samples.xml (from r597521, cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/samples.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/samples.xml?p2=cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/samples.xml&p1=cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/samples.xml&r1=597521&r2=597742&rev=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/misc/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/samples.xml Fri Nov 23 13:18:52 2007
@@ -15,69 +15,70 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<samples xmlns:xlink="http://www.w3.org/1999/xlink" name="Chaperon Block Samples">
- <group name="Back">
- <sample name="Back" href="../..">to Cocoon Samples main page</sample>
- <sample name="Back" href="..">to Cocoon Blocks Samples main page</sample>
- </group>
-
- <group name="Mathexp example">
- <sample name="Mathexp" href="mathexp.html">This example demonstrate how
- the parser can be used to parse input text, like mathematical expressions.
- </sample>
- </group>
-
- <group name="Wiki examples">
- <sample name="Wiki editor" href="view.do?page=index">In this example the parser is used
- to build an online editor,
- which is based on the very popular syntax of Wiki.
- </sample>
- <sample name="Wiki self-test" href="view.do?page=selftest">
- A self-describing document that demonstrates and tests the Wiki grammar.
- </sample>
- </group>
-
- <group name="Pattern example">
- <sample name="Pattern" href="pattern.html">In this example the
- PatternTransformer is used to replace links with HTML links.
- </sample>
- </group>
-
- <group name="Syntax highlighting example">
- <sample name="Example 1" href="org/apache/cocoon/Cocoon.java.html">The parser can also
- be used to colorize some source code.
- </sample>
-
- <sample name="Example 2" href="org/apache/cocoon/Cocoon.class.html">
- This example show a another view of a java class, similar to javadoc.
- (The first use takes 2-3 minutes, for the parser table generation process.)
- </sample>
- </group>
-
- <group name="Comma-Separated Values (CSV)">
- <sample name="Stock Quote" href="quote1.html">
- This example processes a CSV file and generates a table from it.
- </sample>
- <sample name="Excel output" href="quote2.html">
- This example processes a CSV file which was generated by MS Excel.
- </sample>
- </group>
-
- <group name="Documentation">
- <sample name="Lexical Transformer"
- href="../../../docs/userdocs/transformers/lexer-transformer.html">
- </sample>
- <sample name="Parser Transformer"
- href="../../../docs/userdocs/transformers/parser-transformer.html">
- </sample>
- <sample name="Pattern Transformer"
- href="../../../docs/userdocs/transformers/pattern-transformer.html">
- </sample>
- <sample name="Full Chaperon documentation"
- href="http://chaperon.sourceforge.net/">
- </sample>
- </group>
+<samples name="Chaperon Block Samples">
+
+ <group name="Back">
+ <sample name="Back" href="../..">to Cocoon Samples main page</sample>
+ <sample name="Back" href="..">to Cocoon Blocks Samples main page</sample>
+ </group>
+
+ <group name="Mathexp example">
+ <sample name="Mathexp" href="mathexp.html">This example demonstrate how
+ the parser can be used to parse input text, like mathematical expressions.
+ </sample>
+ </group>
+
+ <group name="Wiki examples">
+ <sample name="Wiki editor" href="view.do?page=index">In this example the parser is used
+ to build an online editor,
+ which is based on the very popular syntax of Wiki.
+ </sample>
+ <sample name="Wiki self-test" href="view.do?page=selftest">
+ A self-describing document that demonstrates and tests the Wiki grammar.
+ </sample>
+ </group>
+
+ <group name="Pattern example">
+ <sample name="Pattern" href="pattern.html">In this example the
+ PatternTransformer is used to replace links with HTML links.
+ </sample>
+ </group>
+
+ <group name="Syntax highlighting example">
+ <sample name="Example 1" href="org/apache/cocoon/Cocoon.java.html">The parser can also
+ be used to colorize some source code.
+ </sample>
+
+ <sample name="Example 2" href="org/apache/cocoon/Cocoon.class.html">
+ This example show a another view of a java class, similar to javadoc.
+ (The first use takes 2-3 minutes, for the parser table generation process.)
+ </sample>
+ </group>
+
+ <group name="Comma-Separated Values (CSV)">
+ <sample name="Stock Quote" href="quote1.html">
+ This example processes a CSV file and generates a table from it.
+ </sample>
+ <sample name="Excel output" href="quote2.html">
+ This example processes a CSV file which was generated by MS Excel.
+ </sample>
+ </group>
+
+ <group name="Documentation">
+ <sample name="Lexical Transformer"
+ href="../../../docs/userdocs/transformers/lexer-transformer.html">
+ </sample>
+ <sample name="Parser Transformer"
+ href="../../../docs/userdocs/transformers/parser-transformer.html">
+ </sample>
+ <sample name="Pattern Transformer"
+ href="../../../docs/userdocs/transformers/pattern-transformer.html">
+ </sample>
+ <sample name="Full Chaperon documentation"
+ href="http://chaperon.sourceforge.net/">
+ </sample>
+ </group>
</samples>
Propchange: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/samples.xml
------------------------------------------------------------------------------
eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/samples.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/samples.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/sitemap.xmap Fri Nov 23 13:18:52 2007
@@ -15,7 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- @version $Id$ -->
+
+<!--
+ - $Id$
+ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<!-- =========================== Components ================================ -->
@@ -25,39 +28,39 @@
<!-- =========================== Generators ================================= -->
<map:generators default="file">
- <map:generator name="text" logger="sitemap.generator.textgenerator" src="org.apache.cocoon.generation.TextGenerator">
- <parameter name="localizable" value="true" />
+ <map:generator name="text" src="org.apache.cocoon.generation.TextGenerator">
+ <parameter name="localizable" value="true"/>
</map:generator>
- <map:generator name="exception" src="org.apache.cocoon.generation.ParseExceptionGenerator" />
+ <map:generator name="exception" src="org.apache.cocoon.generation.ParseExceptionGenerator"/>
</map:generators>
<!-- =========================== Transformers ================================= -->
- <map:transformers default="xsltc">
- <map:transformer name="pattern" src="org.apache.cocoon.transformation.PatternTransformer" logger="sitemap.transformer.pattern">
- <parameter name="groups" value="true" />
+ <map:transformers default="xslt">
+ <map:transformer name="pattern" src="org.apache.cocoon.transformation.PatternTransformer">
+ <parameter name="groups" value="true"/>
</map:transformer>
- <map:transformer name="lexer" src="org.apache.cocoon.transformation.LexicalTransformer" logger="sitemap.transformer.lexer">
- <parameter name="localizable" value="true" />
+ <map:transformer name="lexer" src="org.apache.cocoon.transformation.LexicalTransformer">
+ <parameter name="localizable" value="true"/>
</map:transformer>
- <map:transformer name="parser" src="org.apache.cocoon.transformation.ParserTransformer" logger="sitemap.transformer.parser">
- <parameter name="flatten" value="true" />
- <parameter name="recovery" value="true" />
- <parameter name="localizable" value="true" />
+ <map:transformer name="parser" src="org.apache.cocoon.transformation.ParserTransformer">
+ <parameter name="flatten" value="true"/>
+ <parameter name="recovery" value="true"/>
+ <parameter name="localizable" value="true"/>
</map:transformer>
- <map:transformer name="extparser" src="org.apache.cocoon.transformation.ExtendedParserTransformer" logger="sitemap.transformer.extendedparser"></map:transformer>
+ <map:transformer name="extparser" src="org.apache.cocoon.transformation.ExtendedParserTransformer"/>
</map:transformers>
<!-- =========================== Selectors ================================ -->
<map:selectors default="browser">
- <map:selector logger="sitemap.selector.exception" name="exception" src="org.apache.cocoon.selection.ExceptionSelector">
- <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException" />
- <exception class="java.lang.Throwable" unroll="true" />
+ <map:selector name="exception" src="org.apache.cocoon.selection.ExceptionSelector">
+ <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException"/>
+ <exception class="java.lang.Throwable" unroll="true"/>
</map:selector>
</map:selectors>
@@ -67,224 +70,213 @@
<map:views>
<map:view from-label="content" name="content">
- <map:serialize type="xml" />
+ <map:serialize type="xml"/>
</map:view>
- <map:view from-label="content" name="pretty-content">
- <!-- Make use of servlet services -->
+ <map:view name="pretty-content" from-label="content">
<map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"/>
</map:serialize>
</map:view>
<map:view from-position="last" name="links">
- <map:serialize type="links" />
+ <map:serialize type="links"/>
</map:view>
<map:view from-label="ast" name="ast">
- <map:serialize type="xml" />
+ <map:serialize type="xml"/>
</map:view>
<map:view from-label="xdoc" name="xdoc">
- <map:serialize type="xml" />
+ <map:serialize type="xml"/>
</map:view>
<map:view from-position="last" name="links">
- <map:serialize type="links" />
+ <map:serialize type="links"/>
</map:view>
-
</map:views>
<!-- =========================== Flow =================================== -->
- <map:flow language="javascript">
- <map:script src="misc/wiki.js" />
- </map:flow>
+ <!-- Automatically loads flow/wiki.js -->
+ <map:flow language="javascript"/>
<!-- =========================== Pipelines ================================= -->
<map:pipelines>
-
- <map:pipeline type="caching" internal-only="true">
- <!-- Hint: During development you could expose this pipeline, to help
- with writing your grammars. Use a text grammar myapp.grm and request
- the myapp.xlex and myapp.xgrm URLs and then view source.
- -->
+ <map:pipeline internal-only="true">
+ <!--
+ - Hint: During development you could expose this pipeline, to help
+ - with writing your grammars. Use a text grammar myapp.grm and request
+ - the myapp.xlex and myapp.xgrm URLs and then view source.
+ -->
<map:match pattern="*.xlex">
- <map:generate type="text" src="grammars/{1}.grm" />
- <map:transform type="lexer" src="grammars/grm.xlex" />
- <map:transform type="parser" src="grammars/grm.xgrm" />
- <map:transform src="stylesheets/text4regex.xsl" />
- <map:transform type="lexer" src="grammars/regex.xlex" />
- <map:transform type="parser" src="grammars/regex.xgrm" />
- <map:transform src="stylesheets/grm2xlex.xsl" />
- <map:serialize type="xml" />
+ <map:generate type="text" src="grammars/{1}.grm"/>
+ <map:transform type="lexer" src="grammars/grm.xlex"/>
+ <map:transform type="parser" src="grammars/grm.xgrm"/>
+ <map:transform src="stylesheets/text4regex.xsl"/>
+ <map:transform type="lexer" src="grammars/regex.xlex"/>
+ <map:transform type="parser" src="grammars/regex.xgrm"/>
+ <map:transform src="stylesheets/grm2xlex.xsl"/>
+ <map:serialize type="xml"/>
</map:match>
<map:match pattern="*.xgrm">
- <map:generate type="text" src="grammars/{1}.grm" />
- <map:transform type="lexer" src="grammars/grm.xlex" />
- <map:transform type="parser" src="grammars/grm.xgrm" />
- <map:transform src="stylesheets/text4regex.xsl" />
- <map:transform type="lexer" src="grammars/regex.xlex" />
- <map:transform type="parser" src="grammars/regex.xgrm" />
- <map:transform src="stylesheets/grm2xgrm.xsl" />
- <map:serialize type="xml" />
+ <map:generate type="text" src="grammars/{1}.grm"/>
+ <map:transform type="lexer" src="grammars/grm.xlex"/>
+ <map:transform type="parser" src="grammars/grm.xgrm"/>
+ <map:transform src="stylesheets/text4regex.xsl"/>
+ <map:transform type="lexer" src="grammars/regex.xlex"/>
+ <map:transform type="parser" src="grammars/regex.xgrm"/>
+ <map:transform src="stylesheets/grm2xgrm.xsl"/>
+ <map:serialize type="xml"/>
</map:match>
<map:match pattern="*.xegrm">
- <map:generate type="text" src="grammars/{1}.egrm" />
- <map:transform type="extparser" src="grammars/egrm.xegrm" />
- <map:transform src="stylesheets/egrm2xegrm.xsl" />
- <map:serialize type="xml" />
+ <map:generate type="text" src="grammars/{1}.egrm"/>
+ <map:transform type="extparser" src="grammars/egrm.xegrm"/>
+ <map:transform src="stylesheets/egrm2xegrm.xsl"/>
+ <map:serialize type="xml"/>
</map:match>
<map:match pattern="wiki/*.html">
- <map:generate type="jx" src="misc/{1}.xml" />
- <map:transform type="lexer" src="cocoon:/wiki.xlex" />
+ <map:generate type="jx" src="misc/{1}.xml"/>
+ <map:transform type="lexer" src="cocoon:/wiki.xlex"/>
<map:transform type="parser" src="cocoon:/wiki.xgrm" label="ast">
- <map:parameter name="failsafe" value="true" />
+ <map:parameter name="failsafe" value="true"/>
</map:transform>
- <map:transform src="stylesheets/error4wiki.xsl" />
- <map:transform type="lexer" src="grammars/error.xlex" />
- <map:transform src="stylesheets/error2page.xsl" />
- <map:transform src="stylesheets/wiki2xdoc.xsl" label="xdoc" />
- <!-- Make use of servlet services -->
+ <map:transform src="stylesheets/error4wiki.xsl"/>
+ <map:transform type="lexer" src="grammars/error.xlex"/>
+ <map:transform src="stylesheets/error2page.xsl"/>
+ <map:transform src="stylesheets/wiki2xdoc.xsl" label="xdoc"/>
<map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/common/style/complex-page2html" />
+ <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"/>
</map:serialize>
</map:match>
<map:match pattern="wiki/source.xml">
- <map:generate type="jx" src="misc/source.xml" />
- <map:transform type="lexer" src="cocoon:/wiki.xlex" />
- <map:transform type="parser" src="cocoon:/wiki.xgrm" label="ast" />
- <map:transform src="stylesheets/wiki2xdoc.xsl" label="xdoc" />
- <map:serialize type="xml" />
+ <map:generate type="jx" src="misc/source.xml"/>
+ <map:transform type="lexer" src="cocoon:/wiki.xlex"/>
+ <map:transform type="parser" src="cocoon:/wiki.xgrm" label="ast"/>
+ <map:transform src="stylesheets/wiki2xdoc.xsl" label="xdoc"/>
+ <map:serialize type="xml"/>
</map:match>
-
</map:pipeline>
- <map:pipeline type="caching">
-
+ <map:pipeline>
<map:match pattern="">
- <map:redirect-to uri="welcome" />
+ <map:redirect-to uri="welcome"/>
</map:match>
<map:match pattern="welcome">
- <map:generate src="misc/samples.xml" />
- <!-- Make use of servlet services -->
+ <map:generate src="samples.xml"/>
<map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"/>
</map:serialize>
</map:match>
<map:match pattern="sitemap.xmap">
- <map:read src="sitemap.xmap" mime-type="text/xml" />
+ <map:read src="sitemap.xmap" mime-type="text/xml"/>
</map:match>
<map:match pattern="*.kont">
- <map:call continuation="{1}" />
+ <map:call continuation="{1}"/>
</map:match>
<map:match pattern="*.do">
- <map:call function="{1}" />
+ <map:call function="{1}"/>
</map:match>
<map:match pattern="*.css">
- <map:read src="misc/{1}.css" />
+ <map:read src="misc/{1}.css"/>
</map:match>
<map:match pattern="**/*.css">
- <map:read src="misc/{2}.css" />
+ <map:read src="misc/{2}.css"/>
</map:match>
<!-- ========================= Chaperon ================================ -->
<map:match pattern="mathexp.html">
- <map:call function="mathexp" />
+ <map:call function="mathexp"/>
</map:match>
<map:match pattern="mathexp-view.html">
- <map:generate type="jx" src="misc/mathexp.jx" />
- <map:transform type="lexer" src="grammars/mathexp.xlex" />
- <map:transform type="parser" src="grammars/mathexp.xgrm" />
- <map:transform src="stylesheets/mathexp2html.xsl" />
- <!-- Make use of servlet services -->
+ <map:generate type="jx" src="misc/mathexp.jx"/>
+ <map:transform type="lexer" src="grammars/mathexp.xlex"/>
+ <map:transform type="parser" src="grammars/mathexp.xgrm"/>
+ <map:transform src="stylesheets/mathexp2html.xsl"/>
<map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html"/>
</map:serialize>
</map:match>
<map:match pattern="quote*.html">
- <map:generate type="text" src="misc/quote{1}.txt" />
- <map:transform type="lexer" src="cocoon:/quote.xlex" />
- <map:transform type="parser" src="cocoon:/quote.xgrm" label="ast" />
- <map:transform src="stylesheets/quote2page.xsl" />
- <!-- Make use of servlet services -->
+ <map:generate type="text" src="misc/quote{1}.txt"/>
+ <map:transform type="lexer" src="cocoon:/quote.xlex"/>
+ <map:transform type="parser" src="cocoon:/quote.xgrm" label="ast"/>
+ <map:transform src="stylesheets/quote2page.xsl"/>
<map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+ <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"/>
</map:serialize>
</map:match>
<map:match pattern="pattern.html">
- <map:generate src="misc/patterntext.xml" />
- <map:transform type="pattern" src="grammars/link.xlex" />
- <map:transform src="stylesheets/pattern2link.xsl" />
- <!-- Make use of servlet services -->
+ <map:generate src="misc/patterntext.xml"/>
+ <map:transform type="pattern" src="grammars/link.xlex"/>
+ <map:transform src="stylesheets/pattern2link.xsl"/>
<map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+ <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"/>
</map:serialize>
</map:match>
<map:match pattern="**/*.java.html">
- <map:generate type="text" src="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/java/{1}/{2}.java" />
- <map:transform type="lexer" src="grammars/java.xlex" />
- <map:transform src="stylesheets/text4javadoc.xsl" />
- <map:transform type="lexer" src="grammars/javadoc.xlex" label="ast" />
+ <map:generate type="text"
+ src="http://svn.apache.org/repos/asf/cocoon/branches/BRANCH_2_1_X/src/java/{1}/{2}.java"/>
+ <map:transform type="lexer" src="grammars/java.xlex"/>
+ <map:transform src="stylesheets/text4javadoc.xsl"/>
+ <map:transform type="lexer" src="grammars/javadoc.xlex" label="ast"/>
<map:transform src="stylesheets/java2html.xsl">
- <map:parameter name="package" value="{1}" />
- <map:parameter name="class" value="{2}" />
+ <map:parameter name="package" value="{1}"/>
+ <map:parameter name="class" value="{2}"/>
</map:transform>
- <!-- Make use of servlet services -->
<map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+ <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"/>
</map:serialize>
</map:match>
<map:match pattern="**/*.class.html">
- <map:generate type="text" src="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/java/{1}/{2}.java" />
- <map:transform type="lexer" src="grammars/java.xlex" />
- <map:transform src="stylesheets/remove4class.xsl" />
- <map:transform type="parser" src="cocoon:/java.xgrm" />
- <map:transform src="stylesheets/text4javadoc2.xsl" />
- <map:transform type="lexer" src="cocoon:/javadoc.xlex" />
- <map:transform type="parser" src="cocoon:/javadoc.xgrm" label="ast" />
+ <map:generate type="text"
+ src="http://svn.apache.org/repos/asf/cocoon/branches/BRANCH_2_1_X/src/java/{1}/{2}.java"/>
+ <map:transform type="lexer" src="grammars/java.xlex"/>
+ <map:transform src="stylesheets/remove4class.xsl"/>
+ <map:transform type="parser" src="cocoon:/java.xgrm"/>
+ <map:transform src="stylesheets/text4javadoc2.xsl"/>
+ <map:transform type="lexer" src="cocoon:/javadoc.xlex"/>
+ <map:transform type="parser" src="cocoon:/javadoc.xgrm" label="ast"/>
<map:transform src="stylesheets/class2html.xsl">
- <map:parameter name="package" value="{1}" />
- <map:parameter name="class" value="{2}" />
+ <map:parameter name="package" value="{1}"/>
+ <map:parameter name="class" value="{2}"/>
</map:transform>
- <!-- Make use of servlet services -->
<map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+ <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html"/>
</map:serialize>
</map:match>
<map:handle-errors>
<map:select type="exception">
<map:when test="syntax">
- <map:generate type="exception" />
- <map:transform src="stylesheets/text4error.xsl" />
- <map:transform type="xinclude" />
- <map:transform type="lexer" src="grammars/error.xlex" />
+ <map:generate type="exception"/>
+ <map:transform src="stylesheets/text4error.xsl"/>
+ <map:transform type="xinclude"/>
+ <map:transform type="lexer" src="grammars/error.xlex"/>
<map:transform src="stylesheets/error2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}" />
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
</map:transform>
- <map:serialize type="html" />
+ <map:serialize type="html"/>
</map:when>
</map:select>
</map:handle-errors>
</map:pipeline>
-
</map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/wiki/broken.txt
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/wiki/broken.txt?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/wiki/broken.txt (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/wiki/broken.txt Fri Nov 23 13:18:52 2007
@@ -1,6 +1,6 @@
!!! Boken page
-Here comes a text with __an inclomplete element.
+Here comes a text with __an incomplete element.
!!! Next section
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/wiki/selftest.txt
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/wiki/selftest.txt?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/wiki/selftest.txt (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/COB-INF/wiki/selftest.txt Fri Nov 23 13:18:52 2007
@@ -1,12 +1,16 @@
-This wiki document is a self-describing test of the Cocoon Chaperon cwiki grammar. Comparing what follows should show you that the tests are successful.
+This wiki document is a self-describing test of the Cocoon Chaperon cwiki
+grammar. Comparing what follows should show you that the tests are
+successful.
The document in the Cocoon Samples is at: src/blocks/chaperon/samples/wiki/selftest.txt
The document in the JSPWiki is at: http://www.jspwiki.org/Wiki.jsp?page=ChaperonTestPage
-Both documents should be synchronised, so as to be able to compare the output of both, as the Chaperon wiki grammar is meant to emulate the JSPWiki syntax.
+Both documents should be synchronised, so as to be able to compare the output
+of both, as the Chaperon wiki grammar is meant to emulate the JSPWiki syntax.
-In the Cocoon Samples, the "content", "parser-output" and "xdoc" views can be used to check the various stages of parsing and conversion.
+In the Cocoon Samples, the "content", "parser-output" and "xdoc" views can be
+used to check the various stages of parsing and conversion.
Lines like -- THIS TEXT -- are comments about this test, they must appear as is.
----
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml?rev=597742&r1=597741&r2=597742&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-chaperon-sample-blockServlet.xml Fri Nov 23 13:18:52 2007
@@ -26,7 +26,7 @@
http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
<bean name="org.apache.cocoon.chaperon.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-chaperon-sample" context-path="blockcontext:/cocoon-chaperon-sample/">
+ <servlet:context mount-path="/samples/chaperon" context-path="blockcontext:/cocoon-chaperon-sample/">
<servlet:connections>
<entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
</servlet:connections>
Re: svn commit: r597742 - in /cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources:
COB-INF/ COB-INF/flow/ COB-INF/misc/ COB-INF/wiki/ META-INF/cocoon/spring/
Posted by Vadim Gritsenko <va...@reverycodes.com>.
Felix Knecht wrote:
> Hi Vadim
>
> Is there any special reason to mount this block sample not like all others at /cocoon-{block}-sample but at
> /samples/chaperon?
Yes! It makes more sense! :) If you have not noticed, it is not the only block
mounted under /samples - it is just one more joining the others.
URI mapping was always one of Cocoon's strong sides, and there is completely no
reason why samples should not embrace it.
Vadim
> Thanks
> Felix
>
>> <bean name="org.apache.cocoon.chaperon.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
>> - <servlet:context mount-path="/cocoon-chaperon-sample" context-path="blockcontext:/cocoon-chaperon-sample/">
>> + <servlet:context mount-path="/samples/chaperon" context-path="blockcontext:/cocoon-chaperon-sample/">
>> <servlet:connections>
>> <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
>> </servlet:connections>
Re: svn commit: r597742 - in /cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/src/main/resources:
COB-INF/ COB-INF/flow/ COB-INF/misc/ COB-INF/wiki/ META-INF/cocoon/spring/
Posted by Felix Knecht <fe...@apache.org>.
Hi Vadim
Is there any special reason to mount this block sample not like all others at /cocoon-{block}-sample but at
/samples/chaperon?
Thanks
Felix
> <bean name="org.apache.cocoon.chaperon.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
> - <servlet:context mount-path="/cocoon-chaperon-sample" context-path="blockcontext:/cocoon-chaperon-sample/">
> + <servlet:context mount-path="/samples/chaperon" context-path="blockcontext:/cocoon-chaperon-sample/">
> <servlet:connections>
> <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
> </servlet:connections>
>
>