forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/src/core/context/resources/chaperon/misc source.xml view.xml wiki.js
Date Fri, 06 Feb 2004 10:44:12 GMT
nicolaken    2004/02/06 02:44:12

  Modified:    src/core/context/resources/chaperon/wiki broken.txt
                        index.txt rules.txt selftest.txt
               src/core/context/resources/chaperon/stylesheets
                        egrm2xegrm.xsl
               src/core/context/resources/chaperon sitemap.xmap
               src/core/context/resources/chaperon/misc view.xml wiki.js
  Added:       lib/core chaperon-20040205.jar
                        cocoon-chaperon-block-2004205.jar
               src/core/context/resources/chaperon/misc source.xml
  Removed:     lib/core chaperon-20040119.jar
                        cocoon-chaperon-block-20040121.jar
  Log:
  Update Chaperon
  
  Revision  Changes    Path
  1.2       +3 -9      xml-forrest/src/core/context/resources/chaperon/wiki/broken.txt
  
  Index: broken.txt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/resources/chaperon/wiki/broken.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- broken.txt	23 Jan 2004 09:49:37 -0000	1.1
  +++ broken.txt	6 Feb 2004 10:44:10 -0000	1.2
  @@ -1,13 +1,7 @@
  -! Boken page
  -
  -
  +!!! Boken page
   
   Here comes a text with __an inclomplete element.
   
  +!!! Next section
   
  -
  -! Next section
  -
  -
  -
  -Stephan.
  \ No newline at end of file
  +Stephan.
  
  
  
  1.2       +1 -17     xml-forrest/src/core/context/resources/chaperon/wiki/index.txt
  
  Index: index.txt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/resources/chaperon/wiki/index.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.txt	23 Jan 2004 09:49:37 -0000	1.1
  +++ index.txt	6 Feb 2004 10:44:10 -0000	1.2
  @@ -1,32 +1,16 @@
  -! Introduction
  -
  -
  +!!! Introduction
   
   This is a little example how easy it is to write a wiki engine 
  -
   using the Chaperon parser and Apache Cocoon.
   
  -
  -
   Here are some example sites:
  -
   * [Rule of the wiki|rules]
  -
   * [Test document|selftest]
  -
   * [Broken page|broken]
  -
   * [New page|new]
   
  -
  -
   You can edit the page with the little "edit" under the Cocoon logo.
   
  -
  -
   Stephan Michels.
  -
  -
  -
   
   
  
  
  
  1.2       +18 -18    xml-forrest/src/core/context/resources/chaperon/wiki/rules.txt
  
  Index: rules.txt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/resources/chaperon/wiki/rules.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- rules.txt	23 Jan 2004 09:49:37 -0000	1.1
  +++ rules.txt	6 Feb 2004 10:44:10 -0000	1.2
  @@ -1,7 +1,7 @@
   When you've figured out how the editor works, then you should read [WikiEtiquette] so that
you would know how to use
   your newly acquired skills...
   
  -!Quick reference
  +!!!Quick reference
   
   {{{
   ----       = Make a horizontal ruler. Extra '-' is ignored.
  @@ -30,7 +30,7 @@
   ;term:ex   = makes a definition for 'term' with the explanation 'ex'
   }}}
   
  -!Writing text
  +!!!Writing text
   
   You don't need to know anything about the Wiki text formatting rules to use Wiki.  Just
write normal text, and then use
   an empty line to mark a paragraph.
  @@ -39,7 +39,7 @@
   You can always Edit this page (look at the left sidebar) to see how the different
   effects on this page are used.
   
  -!Hyperlinks
  +!!!Hyperlinks
   The link can also be a direct URL starting with http:, ftp:, mailto:, https:, or news:,
in which case the link points to
   an external entity. For example, to point at the java.sun.com home page, use [[http://java.sun.com],
which becomes
   [http://java.sun.com/] or [[Java home page|http://java.sun.com], which becomes [Java home
page|http://java.sun.com].
  @@ -55,7 +55,7 @@
   should be a link).  It's off by default, but if your friendly administrator has turned
it on, then well, CamelCase all
   you want =).
   
  -!Footnotes
  +!!!Footnotes
   
   These are a special kind of hyperlink.  By using nothing but a number inside
   a hyperlink you create a reference to a footnote, like this [[1], which 
  @@ -65,7 +65,7 @@
   You can also make a named footnote, just as if you were doing a normal hyperlink.  For
example, this refers to the same
   footnote[Footnote number 1|1] as the footnote above, but this refers to another footnote[2].
   
  -!InterWiki links
  +!!!InterWiki links
   
   You can also do links between different Wikis without knowing the URL.  Just use a link
in the form [[Wiki:WikiPage] and
   JSPWiki will create a link for you.  For example, this link points to the [JSPWiki TextFormatting
  @@ -74,7 +74,7 @@
   If an InterWiki link is not supported, you'll get a notification of it on the page when
   you save your page.
   
  -!Adding pictures
  +!!!Adding pictures
   
   For security reasons uploading images is not permitted, but you can embed
   any image in the wiki code by putting the image available somewhere on the web in one of
the allowed formats, and then
  @@ -87,7 +87,7 @@
   The list of accepted image types depends on the Wiki.  See the [SystemInfo]
   page for a list of the different image types.
   
  -!Bulleted lists
  +!!!Bulleted lists
   Use an asterisk (*) in the first column to make bulleted lists. Use more asterisks for
deeper indentation. For example:
   {{{
   * One
  @@ -101,7 +101,7 @@
   * Three
   ** Three.One
   
  -!Numbered lists
  +!!!Numbered lists
   Just like with bulleted lists, but use a hash (#) instead of the asterisk. Like this:
   {{{
   # One
  @@ -127,7 +127,7 @@
     Notice, however, as all these sentences get put inside a single item!
   * The third line is again a single-line item for your convinience.
   
  -!Definition lists and comments
  +!!!Definition lists and comments
   
   A simple way to make definition lists is to use the ';:' -construct:
   
  @@ -141,19 +141,19 @@
   Which would be seen as
   ;:''Comment here.''
   
  -!Text effects
  +!!!Text effects
   
   You may use __bold__ text or ''italic'' text, by using two underscores (_) and two single
quotes ('), respectively. If
   you're on a Windows computer, make sure that you are using the correct quote sign, as there
is one that looks the same,
   but really isn't.
   
   
  -!Preformatted text
  +!!!Preformatted text
   
   If you want to add preformatted text (like code) just use three consecutive braces ({)
to open a block, and three
   consecutive braces (}) to close a block. Edit this page for an example.
   
  -!Tables
  +!!!Tables
   
   You can do simple tables by using using pipe signs ('|').  Use double pipe
   signs to start the heading of a table, and single pipe signs to then
  @@ -174,7 +174,7 @@
   | [Main]     | [SandBox]
   
   
  -!Conflicts
  +!!!Conflicts
   
   If someone happens to edit the same page as you at the same time, JSPWiki will prevent
you from doing changes and show a
   conflict page instead. Sorry to say, but the first one to make changes wins...
  @@ -182,23 +182,23 @@
   __A word of warning:__ If you use the Back button of your browser to go into the Edit page,
you will almost certainly
   get a conflict. This is because the browser thinks its still editing an earlier copy of
the page.
   
  -!Deleting pages
  +!!!Deleting pages
   
   This is not possible. You can, of course, remove all the links to that page, which makes
it inaccesible. Or you can
   email the administrator, and I'll remove the page.
   
  -!Adding new pages
  +!!!Adding new pages
   
   Create a link that points to a new (not existing) page using its [WikiName].
   Click that new link, which should now have a question mark (?) suffix and
   you will get an editor for the new page. -- [Asser]
   
  -!Attaching files
  +!!!Attaching files
   
   If the administrator of the wiki has configured it, there is a "Attach file..." link at
the bottom of every page.
   Clicking it allows you to attach files into pages.  For more information, please see [WikiAttachments].
   
  -!Inserting variables
  +!!!Inserting variables
   
   There are many possible variables you can insert on a page.  The basic form is:
   
  @@ -209,7 +209,7 @@
   
   You can see the list of available of variables at [WikiVariables].
   
  -!Inserting plugins
  +!!!Inserting plugins
   
   The basic incantation to insert a plugin looks like this:
   
  
  
  
  1.2       +6 -113    xml-forrest/src/core/context/resources/chaperon/wiki/selftest.txt
  
  Index: selftest.txt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/resources/chaperon/wiki/selftest.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- selftest.txt	23 Jan 2004 09:49:37 -0000	1.1
  +++ selftest.txt	6 Feb 2004 10:44:10 -0000	1.2
  @@ -1,214 +1,107 @@
   This wiki document is a self-describing test of the Cocoon Chaperon wiki grammar. Reading
what follows 
  -
   should tell you if the tests are successful.
   
  -
  -
   The page http://wiki.cocoondev.org/Wiki.jsp?page=ChaperonTestPage should be kept in sync
with this so as 
  -
   to be able to compare the output of both, as the Chaperon wiki grammar is meant to emulate
the JSPWiki syntax 
  -
   used by the Cocoon wiki.
   
  -
  -
   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.
   
  -
  -
   -- 0. CURRENT RESULTS --
   
  -
  -
   This must be followed by a section title and a bullet list with some items.
   
  -
  -
  -! KNOWN PROBLEMS
  -
  +!!! KNOWN PROBLEMS
   Currently this test shows the following problems:
   
  -
  -
   * 0.1 This bullet list is invisible in the html output if there is no section title (3
bangs) before it
  -
   * 1.1 Headings must be used in the usual order (big contains medium contains small), otherwise
unpredictable results can occur due to the conversion from the linear wiki model to the nested
xdocs model. 
  -
   * 5.1 relative link points to wiki.cocoondev.org (but is it by design?)
   
  -
  -
   -- 1.HEADINGS --
   
  -
  -
   Test 1.1 headings in the usual order (from big to small): below you should see 3 headings,
big, medium, small:
   
  -
  -
  -! big heading #1
  -
  -
  +!!! big heading #1
   
   !! medium heading #1
   
  -
  -
  -!!! small heading #1
  -
  -
  +! small heading #1
   
   Test 1.2 same headings with text in-between
   
  -
  -
  -! big heading #2
  -
  +!!! big heading #2
   Text after big heading.
   
  -
  -
   !! medium heading #2
  -
   Text after medium heading.
   
  -
  -
  -!!! small heading #2
  -
  +! small heading #2
   Text after small heading.
   
  -
  -
  -! new big heading
  -
  +!!! new big heading
   The above heading starts a new section in the xdocs version of this document.
   
  -
  -
   -- 2.NUMBERED LISTS --
   
  -
  -
   Test 2.1 This should be followed by a list that counts from one to four:
  -
   # one
  -
   #  two
  -
   # three
  -
   #four
   
  -
  -
   -- 3.BULLET LISTS --
   
  -
  -
   Test 3.1 This should be followed by four bullet points:
  -
   * Bullet one
  -
   * Bullet two
  -
   * Bullet three with a longer text, something like the quick brown fox stuff that you know
and like
  -
   * Bullet four
   
  -
  -
   Test 3.2 This should be followed by two bullet points with one line of text in between:
   
  -
  -
   * Bullet one, JSPWiki ends bullet at newline so this is the end.
  -
   and this is not part of bullet one.
  -
   * But this is bullet two.
   
  -
  -
   -- 4.TEXT ATTRIBUTES --
   
  -
  -
   Test 4.1 The words __bold__, ''italic'' and {{monospaced}} in this phrase should be displayed
with the corresponding attributes.
   
  -
  -
   Test 4.2 In test 4.1 all words of the phrase should be followed by a space. 
   
  -
  -
   Test 4.3 Same as 4.1 but words with attributes are repeated twice: __bold bold__, ''italic
italic'' and {{monospaced monospaced}}.
   
  -
  -
   Test 4.4 The block of text that follows should be shown in the source code style:
   
   
  -
  -
  -
   {{{
  -
   	boolean didThisWork() {
  -
   	  return !failed();
  -
   	}
  -
   }}}
   
  -
  -
   -- 5.LINKS --
   
  -
  -
   Test 5.1 Here a link to this same page: [wikitest.html]
   
  -
  -
   Test 5.2 Link to cocoon.apache.org: [http://cocoon.apache.org]
   
  -
  -
   Test 5.3 A link to another wiki site [Text formating rules|rules].
   
  -
  -
   -- 6.MISCELLANEOUS --
   
  -
  -
   Test 6.1 This paragraph should be followed by a horizontal ruler line.
  -
   ----
   
  -
  -
   Test 6.2 There should be a line break between the words one and two that follow: 
   
  -
  -
   ONE\\TWO.
   
  -
  -
   -- 7. TEXT RUNS --
   
  -
  -
   Test 7.1 In this paragraph all
  -
   words should be
  -
   followed by a single space.
  -
  
  
  
  1.1                  xml-forrest/lib/core/chaperon-20040205.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/lib/core/cocoon-chaperon-block-2004205.jar
  
  	<<Binary file>>
  
  
  1.2       +3 -7      xml-forrest/src/core/context/resources/chaperon/stylesheets/egrm2xegrm.xsl
  
  Index: egrm2xegrm.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/resources/chaperon/stylesheets/egrm2xegrm.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- egrm2xegrm.xsl	23 Jan 2004 09:50:31 -0000	1.1
  +++ egrm2xegrm.xsl	6 Feb 2004 10:44:11 -0000	1.2
  @@ -1,6 +1,7 @@
   <?xml version="1.0"?>
   <xsl:stylesheet version="1.0"
                   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
  +                xmlns:text="http://chaperon.sourceforge.net/schema/text/1.0"
                   xmlns:st="http://chaperon.sourceforge.net/schema/syntaxtree/2.0"
                   xmlns="http://chaperon.sourceforge.net/schema/grammar/2.0"
                   exclude-result-prefixes="st text">
  @@ -8,17 +9,14 @@
    <xsl:output indent="yes" method="xml" encoding="ASCII"/>
   
    <xsl:template match="st:output/st:grammar">
  -  <grammar>
  +  <grammar start="{st:start/st:name}">
   
      <xsl:if test="not (st:start)">
  -    bla
       <xsl:message terminate="yes">
        Start element is not defined!
       </xsl:message>
      </xsl:if>
   
  -   <xsl:attribute name="start"><xsl:value-of select="st:start/st:name"/></xsl:attribute>
  -
      <xsl:comment>This file was generated! Don't edit!</xsl:comment>
   
      <xsl:apply-templates select="st:definition"/>
  @@ -26,9 +24,7 @@
    </xsl:template>
   
    <xsl:template match="st:definition">
  -  <definition>
  -   <xsl:attribute name="name"><xsl:value-of select="st:name"/></xsl:attribute>
  -     
  +  <definition name="{st:name}">
      <xsl:apply-templates select="st:regex"/>
     </definition>
    </xsl:template>
  
  
  
  1.3       +8 -4      xml-forrest/src/core/context/resources/chaperon/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/resources/chaperon/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	23 Jan 2004 09:50:48 -0000	1.2
  +++ sitemap.xmap	6 Feb 2004 10:44:11 -0000	1.3
  @@ -142,6 +142,14 @@
       <map:serialize type="html"/>
      </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:match>
  +
     </map:pipeline>
   
     <map:pipeline type="caching">  
  @@ -253,10 +261,6 @@
         </map:transform>
         <map:serialize type="html"/>
        </map:when>
  -     <map:otherwise>
  -           <map:generate  type="notifier"/>
  -                 <map:serialize type="xml"/>
  -     </map:otherwise>
       </map:select>
      </map:handle-errors>
                                                                                         
                                                                      
  
  
  
  1.2       +2 -1      xml-forrest/src/core/context/resources/chaperon/misc/view.xml
  
  Index: view.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/resources/chaperon/misc/view.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- view.xml	23 Jan 2004 09:50:15 -0000	1.1
  +++ view.xml	6 Feb 2004 10:44:11 -0000	1.2
  @@ -3,9 +3,10 @@
    <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="wikitest/${page}.txt"
line="1" column="1">${text}</text>
  +  <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0" source="wiki/${page}.txt"
line="1" column="1">${text}</text>
    </body>
   </document>
  
  
  
  1.2       +12 -0     xml-forrest/src/core/context/resources/chaperon/misc/wiki.js
  
  Index: wiki.js
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/resources/chaperon/misc/wiki.js,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- wiki.js	23 Jan 2004 09:50:15 -0000	1.1
  +++ wiki.js	6 Feb 2004 10:44:11 -0000	1.2
  @@ -46,6 +46,18 @@
       cocoon.sendPage("wiki/view.html", {page:page, text:text});
   }
   
  +function source() {
  +                                                                                      
                                                                                        
  +    var page = cocoon.request.getParameter("page");
  +                                                                                      
                                                                                        
  +    if (page==null)
  +        page = "index";
  +                                                                                      
                                                                                        
  +    var text = read(page);
  +                                                                                      
                                                                                        
  +    cocoon.sendPage("wiki/source.xml", {page:page, text:text});
  +}
  +
   
   function read(page) {
   
  
  
  
  1.1                  xml-forrest/src/core/context/resources/chaperon/misc/source.xml
  
  Index: source.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <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>
  </document>
  
  
  

Mime
View raw message