You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by st...@apache.org on 2004/01/20 16:56:36 UTC
cvs commit: cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation lexertest-lexicon1.xml lexertest-lexicon2.xml lexertest-result1.xml lexertest-result2.xml parsertest-grammar1.xml parsertest-input1.xml parsertest-input2.xml parsertest-input3.xml parsertest-result1.xml parsertest-result2.xml parsertest-result3.xml patterntest-lexicon1.xml patterntest-result1.xml
stephan 2004/01/20 07:56:36
Modified: src/blocks/chaperon/samples sitemap.xmap
src/blocks/chaperon/test/org/apache/cocoon/transformation
lexertest-lexicon1.xml lexertest-lexicon2.xml
lexertest-result1.xml lexertest-result2.xml
parsertest-grammar1.xml parsertest-input1.xml
parsertest-input2.xml parsertest-input3.xml
parsertest-result1.xml parsertest-result2.xml
parsertest-result3.xml patterntest-lexicon1.xml
patterntest-result1.xml
Log:
Removed unused parts of the sitemap.
Update testcases.
Revision Changes Path
1.16 +8 -30 cocoon-2.1/src/blocks/chaperon/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/samples/sitemap.xmap,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sitemap.xmap 20 Jan 2004 15:23:57 -0000 1.15
+++ sitemap.xmap 20 Jan 2004 15:56:36 -0000 1.16
@@ -166,6 +166,14 @@
<map:call function="{1}"/>
</map:match>
+ <map:match pattern="*.css">
+ <map:read src="misc/{1}.css"/>
+ </map:match>
+
+ <map:match pattern="**/*.css">
+ <map:read src="misc/{2}.css"/>
+ </map:match>
+
<!-- ========================= Chaperon ================================ -->
<map:match pattern="mathexp.html">
@@ -179,28 +187,6 @@
<map:serialize type="html"/>
</map:match>
- <map:match pattern="wiki.html">
- <map:generate type="serverpages" src="misc/wiki.xsp"/>
- <map:transform type="lexer" src="cocoon:/wiki.xlex"/>
- <map:transform type="parser" src="cocoon:/wiki.xgrm"/>
- <map:transform src="stylesheets/wiki2xdoc.xsl"/>
- <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize type="html"/>
- </map:match>
-
- <map:match pattern="wikitest/*.html">
- <map:generate type="text" src="wikitest/{1}.txt"/>
- <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:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize type="html"/>
- </map:match>
-
<map:match pattern="quote.html">
<map:generate type="text" src="misc/quote.txt"/>
<map:transform type="lexer" src="grammars/quote.xlex"/>
@@ -253,14 +239,6 @@
<map:parameter name="contextPath" value="{request:contextPath}"/>
</map:transform>
<map:serialize type="html"/>
- </map:match>
-
- <map:match pattern="*.css">
- <map:read src="misc/{1}.css"/>
- </map:match>
-
- <map:match pattern="**/*.css">
- <map:read src="misc/{2}.css"/>
</map:match>
<map:handle-errors>
1.2 +1 -1 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/lexertest-lexicon1.xml
Index: lexertest-lexicon1.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/lexertest-lexicon1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lexertest-lexicon1.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ lexertest-lexicon1.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<lexicon>
+<lexicon xmlns="http://chaperon.sourceforge.net/schema/lexicon/1.0">
<lexeme symbol="id">
<cclass minOccurs="1" maxOccurs="*">
<cinterval min="A" max="Z"/>
1.2 +1 -1 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/lexertest-lexicon2.xml
Index: lexertest-lexicon2.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/lexertest-lexicon2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lexertest-lexicon2.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ lexertest-lexicon2.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<lexicon>
+<lexicon xmlns="http://chaperon.sourceforge.net/schema/lexicon/1.0">
<lexeme symbol="num">
<alt>
<concat>
1.2 +2 -2 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/lexertest-result1.xml
Index: lexertest-result1.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/lexertest-result1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lexertest-result1.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ lexertest-result1.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<lexemes xmlns="http://chaperon.sourceforge.net/schema/lexemes/1.0">
+<output xmlns="http://chaperon.sourceforge.net/schema/lexer/2.0">
<lexeme symbol="number" text="1"/>
<lexeme symbol="plus" text="+"/>
<lexeme symbol="number" text="5"/>
@@ -15,4 +15,4 @@
<lexeme symbol="id" text="pH"/>
<lexeme symbol="plus" text="+"/>
<lexeme symbol="number" text="5"/>
-</lexemes>
+</output>
1.2 +2 -2 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/lexertest-result2.xml
Index: lexertest-result2.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/lexertest-result2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lexertest-result2.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ lexertest-result2.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
-<lexemes xmlns="http://chaperon.sourceforge.net/schema/lexemes/1.0">
+<output xmlns="http://chaperon.sourceforge.net/schema/lexer/2.0">
<lexeme symbol="num" text="35.5"/>
<lexeme symbol="num" text="667.344"/>
<lexeme symbol="num" text="23.23"/>
<lexeme symbol="num" text="98."/>
<lexeme symbol="num" text=".1"/>
<lexeme symbol="num" text="88.88"/>
-</lexemes>
+</output>
1.2 +1 -1 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-grammar1.xml
Index: parsertest-grammar1.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-grammar1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parsertest-grammar1.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ parsertest-grammar1.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<grammar>
+<grammar xmlns="http://chaperon.sourceforge.net/schema/grammar/1.0">
<priority>
<terminal symbol="mult"/>
<terminal symbol="div"/>
1.2 +2 -2 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-input1.xml
Index: parsertest-input1.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-input1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parsertest-input1.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ parsertest-input1.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<lexemes xmlns="http://chaperon.sourceforge.net/schema/lexemes/1.0">
+<output xmlns="http://chaperon.sourceforge.net/schema/lexer/2.0">
<lexeme symbol="number" text="1"/>
<lexeme symbol="plus" text="+"/>
<lexeme symbol="number" text="5"/>
@@ -15,4 +15,4 @@
<lexeme symbol="id" text="pH"/>
<lexeme symbol="plus" text="+"/>
<lexeme symbol="number" text="5"/>
-</lexemes>
+</output>
1.2 +2 -3 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-input2.xml
Index: parsertest-input2.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-input2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parsertest-input2.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ parsertest-input2.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
-<lexemes xmlns="http://chaperon.sourceforge.net/schema/lexemes/1.0">
+<output xmlns="http://chaperon.sourceforge.net/schema/lexer/2.0">
<lexeme symbol="number" text="1"/>
<lexeme symbol="plus" text="+"/>
- <lexeme symbol="minus" text="-"/>
<lexeme symbol="number" text="5"/>
-</lexemes>
+</output>
1.2 +2 -2 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-input3.xml
Index: parsertest-input3.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-input3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parsertest-input3.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ parsertest-input3.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
-<lexemes xmlns="http://chaperon.sourceforge.net/schema/lexemes/1.0">
+<output xmlns="http://chaperon.sourceforge.net/schema/lexer/2.0">
<lexeme symbol="number" text="1"/>
<lexeme symbol="plus" text="+"/>
<lexeme symbol="number" text="5"/>
<lexeme symbol="minus" text="-"/>
-</lexemes>
+</output>
1.2 +31 -29 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-result1.xml
Index: parsertest-result1.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-result1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parsertest-result1.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ parsertest-result1.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,44 +1,46 @@
<?xml version="1.0"?>
-<exp xmlns="http://chaperon.sourceforge.net/schema/syntaxtree/1.0">
- <exp>
- <number>1</number>
- </exp>
- <plus>+</plus>
+<output xmlns="http://chaperon.sourceforge.net/schema/syntaxtree/2.0">
<exp>
<exp>
+ <number>1</number>
+ </exp>
+ <plus>+</plus>
+ <exp>
<exp>
<exp>
- <number>5</number>
- </exp>
- <mult>*</mult>
- <exp>
- <number>67</number>
+ <exp>
+ <number>5</number>
+ </exp>
+ <mult>*</mult>
+ <exp>
+ <number>67</number>
+ </exp>
</exp>
- </exp>
- <div>/</div>
- <exp>
+ <div>/</div>
<exp>
- <pleft>(</pleft>
<exp>
+ <pleft>(</pleft>
<exp>
- <number>7</number>
- </exp>
- <minus>-</minus>
- <exp>
- <number>2</number>
+ <exp>
+ <number>7</number>
+ </exp>
+ <minus>-</minus>
+ <exp>
+ <number>2</number>
+ </exp>
</exp>
+ <pright>)</pright>
+ </exp>
+ <mult>*</mult>
+ <exp>
+ <id>pH</id>
</exp>
- <pright>)</pright>
- </exp>
- <mult>*</mult>
- <exp>
- <id>pH</id>
</exp>
</exp>
- </exp>
- <plus>+</plus>
- <exp>
- <number>5</number>
+ <plus>+</plus>
+ <exp>
+ <number>5</number>
+ </exp>
</exp>
</exp>
-</exp>
+</output>
1.2 +7 -5 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-result2.xml
Index: parsertest-result2.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-result2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parsertest-result2.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ parsertest-result2.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<exp xmlns="http://chaperon.sourceforge.net/schema/syntaxtree/1.0">
- <exp><number>1</number></exp>
- <plus>+</plus>
- <exp><number>5</number></exp>
-</exp>
+<output xmlns="http://chaperon.sourceforge.net/schema/syntaxtree/2.0">
+ <exp>
+ <exp><number>1</number></exp>
+ <plus>+</plus>
+ <exp><number>5</number></exp>
+ </exp>
+</output>
1.2 +7 -5 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-result3.xml
Index: parsertest-result3.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/parsertest-result3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parsertest-result3.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ parsertest-result3.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<exp xmlns="http://chaperon.sourceforge.net/schema/syntaxtree/1.0">
- <exp><number>1</number></exp>
- <plus>+</plus>
- <exp><number>5</number></exp>
-</exp>
+<output xmlns="http://chaperon.sourceforge.net/schema/syntaxtree/2.0">
+ <exp>
+ <exp><number>1</number></exp>
+ <plus>+</plus>
+ <exp><number>5</number></exp>
+ </exp>
+</ouput>
1.2 +1 -1 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/patterntest-lexicon1.xml
Index: patterntest-lexicon1.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/patterntest-lexicon1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- patterntest-lexicon1.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ patterntest-lexicon1.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<lexicon>
+<lexicon xmlns="http://chaperon.sourceforge.net/schema/lexicon/1.0">
<lexeme symbol="cocoon">
<alt>
<cstring content="Apache Cocoon"/>
1.2 +1 -1 cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/patterntest-result1.xml
Index: patterntest-result1.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/test/org/apache/cocoon/transformation/patterntest-result1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- patterntest-result1.xml 9 Apr 2003 12:24:35 -0000 1.1
+++ patterntest-result1.xml 20 Jan 2004 15:56:36 -0000 1.2
@@ -1,4 +1,4 @@
-<section xmlns:lex="http://chaperon.sourceforge.net/schema/lexemes/1.0">
+<section xmlns:lex="http://chaperon.sourceforge.net/schema/lexemes/2.0">
The <lex:lexeme symbol="chaperon" text="Chaperon"/> parser is not a part of the <lex:lexeme symbol="apache" text="Apache"/> project,
but parts can be used in the <lex:lexeme symbol="apache" text="Apache"/> <strong><lex:lexeme symbol="cocoon" text="Cocoon"/></strong>
project.