Return-Path: Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org Received: (qmail 50362 invoked by uid 500); 5 Nov 2002 11:00:06 -0000 Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: forrest-dev@xml.apache.org Delivered-To: mailing list forrest-cvs@xml.apache.org Received: (qmail 50188 invoked from network); 5 Nov 2002 10:59:31 -0000 Received: from icarus.apache.org (63.251.56.143) by daedalus.apache.org with SMTP; 5 Nov 2002 10:59:31 -0000 Received: (qmail 93044 invoked by uid 1464); 5 Nov 2002 10:59:26 -0000 Date: 5 Nov 2002 10:59:26 -0000 Message-ID: <20021105105926.93042.qmail@icarus.apache.org> From: nicolaken@apache.org To: xml-forrest-cvs@apache.org Subject: cvs commit: xml-forrest/src/resources/editor/editor/images dir.gif file.gif get.gif new.gif see.gif X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N nicolaken 2002/11/05 02:59:26 Modified: . build.xml status.xml src/resources/conf sitemap.xmap Added: src/resources/editor/editor/stylesheets dir2skin.xsl editor2writer.xsl file2editor.xsl request2editor.xsl skin.xsl writeresult2skin.xsl src/resources/editor/chaperon/stylesheets document2wiki.xsl java2html.xsl mathexp2html.xsl parsefragment.xsl rgrm2grm.xsl wiki2document.xsl wiki2html.xsl src/resources/editor/editor/docs editor.html footer.html menu.html template.xml src/resources/editor editor.xmap src/resources/editor/editor/stylesheets/error error2html.xsl src/resources/editor/chaperon/misc java.css matex.xsp mathexp.xsp samples.xml test1.java test2.java wiki.xsp src/resources/editor/chaperon/grammars java.rgrm mathexp.grm rgrm.grm wiki.grm wiki.rgrm lib/core chaperon-1.3-dev.jar chaperon-block.jar cocoon-scratchpad-20021030.jar src/resources/editor/editor/images dir.gif file.gif get.gif new.gif see.gif Log: DONE Added alpha system for editing content in the webapp. To try it do "forrest run" and point the browser to http://localhost:8888/edit/ . TODO Continue development of the editing system in the webapp. Needs bugfixes, xml2wiki stylesheet and enhancements to the wiki grammer especially to define sections and titles. Revision Changes Path 1.40 +5 -0 xml-forrest/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/xml-forrest/build.xml,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- build.xml 4 Nov 2002 10:33:43 -0000 1.39 +++ build.xml 5 Nov 2002 10:59:24 -0000 1.40 @@ -158,6 +158,11 @@ + + + + + 1.38 +10 -3 xml-forrest/status.xml Index: status.xml =================================================================== RCS file: /home/cvs/xml-forrest/status.xml,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- status.xml 5 Nov 2002 07:54:58 -0000 1.37 +++ status.xml 5 Nov 2002 10:59:24 -0000 1.38 @@ -42,6 +42,11 @@ + + Continue development of the editing system in the webapp. + Needs bugfixes, xml2wiki stylesheet and enhancements to the wiki grammer + especially to define sections and titles. + Add the PATCHQUEUE system to Forrest, as used by cocoon-dev@xml.apache.org @@ -93,6 +98,10 @@ + + Added alpha system for editing content in the webapp. + To try it do "forrest run" and point the browser to http://localhost:8888/edit/ . + Added avalon-tigris skin. @@ -100,9 +109,6 @@ Removed unmaintained skins: avalon-site, jakarta-site, xml-apache-site, - - Add the PATCH-QUEUE bot mechanism as used by cocoon-dev@xml.apache.org. - Removed the dependency that the default "site" target had on clean-site. It means that running "forrest" will not delete the current files in ./build/site/** . @@ -337,3 +343,4 @@ + 1.1 xml-forrest/src/resources/editor/editor/stylesheets/dir2skin.xsl Index: dir2skin.xsl =================================================================== Parent
(preview) 1.1 xml-forrest/src/resources/editor/editor/stylesheets/editor2writer.xsl Index: editor2writer.xsl ===================================================================
content/xdocs/
<xsl:value-of select="request:request/request:requestParameters/request:parameter[@name = 'title']/request:value"/>
1.1 xml-forrest/src/resources/editor/editor/stylesheets/file2editor.xsl Index: file2editor.xsl =================================================================== Bravo Editor
Title
Body
Save as
1.1 xml-forrest/src/resources/editor/editor/stylesheets/request2editor.xsl Index: request2editor.xsl ===================================================================

1.1 xml-forrest/src/resources/editor/editor/stylesheets/skin.xsl Index: skin.xsl =================================================================== Forrest editor 1.1 xml-forrest/src/resources/editor/editor/stylesheets/writeresult2skin.xsl Index: writeresult2skin.xsl =================================================================== Writing to Source...
Result
Behaviour
Message
Source
Action None taken New document created Existing document overwritten Unknown
Serializer
1.1 xml-forrest/src/resources/editor/chaperon/stylesheets/document2wiki.xsl Index: document2wiki.xsl ===================================================================

    • [] []     1.1 xml-forrest/src/resources/editor/chaperon/stylesheets/java2html.xsl Index: java2html.xsl =================================================================== MethodDeclaration java2html example
    1.1 xml-forrest/src/resources/editor/chaperon/stylesheets/mathexp2html.xsl Index: mathexp2html.xsl ===================================================================
    1.1 xml-forrest/src/resources/editor/chaperon/stylesheets/parsefragment.xsl Index: parsefragment.xsl =================================================================== math 1.1 xml-forrest/src/resources/editor/chaperon/stylesheets/rgrm2grm.xsl Index: rgrm2grm.xsl =================================================================== left right append resolve neglect 1.1 xml-forrest/src/resources/editor/chaperon/stylesheets/wiki2document.xsl Index: wiki2document.xsl ===================================================================

    • [] []     1.1 xml-forrest/src/resources/editor/chaperon/stylesheets/wiki2html.xsl Index: wiki2html.xsl ===================================================================

    • [] []     1.1 xml-forrest/src/resources/editor/editor/docs/editor.html Index: editor.html =================================================================== Apache Ant User Manual Please use a browsre that supports frames. 1.1 xml-forrest/src/resources/editor/editor/docs/footer.html Index: footer.html =================================================================== Forrest editor Copyright © 1999-2002 The Apache Software Foundation. All rights reserved. 1.1 xml-forrest/src/resources/editor/editor/docs/menu.html Index: menu.html =================================================================== Forrest editor Browse - New - 1.1 xml-forrest/src/resources/editor/editor/docs/template.xml Index: template.xml ===================================================================
    title x
    !Example heading !!bold and italics stuff Here's some __bold text__ and now "some italic text I hope ". Not sure about italics though. !!bullets * first bulleted item * second bulleted item !!numbered lists # number list point 1 ## is that 1.1? ### is that 1.1.1? # this is point 2 # and point 3 We _love_ horizontal rules [1] ------------ Brought to you by [http://www.perdu.com].
    1.1 xml-forrest/src/resources/editor/editor.xmap Index: editor.xmap =================================================================== 1.1 xml-forrest/src/resources/editor/editor/stylesheets/error/error2html.xsl Index: error2html.xsl =================================================================== <xsl:value-of select="@error:type"/>:<xsl:value-of select="error:title"/>
    The notifies that says:



    More precisely:
    extra info

    If you need help and this information is not enough, you are invited to read the cocoon faq.
    If you still don't find the answers you need, can send a mail to the mailto:cocoon-users@xml.apache.org?subject=[HELP]&body=Description: Cocoon users mailing list, remembering to
    • specify the version of Cocoon you're using, or we suppose that you are talking about the latest version;
    • specify the taglibs and sitemap components that are pertinent;
    • specify the platform-operating system-version-servlet container version;
    • send any pertinent error message;
    • send pertinent log snippets;
    • send pertinent sitemap snippets;
    • send pertinent parts of the page that gives you problems.
    For more detailed technical information, take a look at the log files in the log directory of cocoon, which is /WEB-INF/logs by default.
    Logging configuration is by default in /WEB-INF/logkit.xconf.

    If you think you found a bug, please report it to Apache's Bugzilla; a message will be sent to the developer mailing list.
    description

    1.1 xml-forrest/src/resources/editor/chaperon/misc/java.css Index: java.css =================================================================== body { background-color: #FFFFFF; } body { color: #000000} #Header { color: #ffffff; background-color:#8697a5 } #CharacerLiteral { color: #FF00FF; } #StringLiteral { color: #FF00FF; } #SingleLineComment { color: #008000; } #FormalComment { color: #008000; } #MultiLineComment { color: #008000; } #ABSTRACT { color: #0000FF ; font-weight: bold } #BOOLEAN { color: #0000FF ; font-weight: bold } #BREAK { color: #0000FF ; font-weight: bold } #BYTE { color: #0000FF ; font-weight: bold } #CASE { color: #0000FF ; font-weight: bold } #CATCH { color: #0000FF ; font-weight: bold } #CHAR { color: #0000FF ; font-weight: bold } #CLASS { color: #0000FF ; font-weight: bold } #CONST { color: #0000FF ; font-weight: bold } #CONTINUE { color: #0000FF ; font-weight: bold } #DEFAULT { color: #0000FF ; font-weight: bold } #DO { color: #0000FF ; font-weight: bold } #DOUBLE { color: #0000FF ; font-weight: bold } #ELSE { color: #0000FF ; font-weight: bold } #EXTENDS { color: #0000FF ; font-weight: bold } #FALSE { color: #0000FF ; font-weight: bold } #FINAL { color: #0000FF ; font-weight: bold } #FINALLY { color: #0000FF ; font-weight: bold } #FLOAT { color: #0000FF ; font-weight: bold } #FOR { color: #0000FF ; font-weight: bold } #GOTO { color: #0000FF ; font-weight: bold } #IF { color: #0000FF ; font-weight: bold } #IMPLEMENTS { color: #0000FF ; font-weight: bold } #IMPORT { color: #0000FF ; font-weight: bold } #INSTANCEOF { color: #0000FF ; font-weight: bold } #INT { color: #0000FF ; font-weight: bold } #INTERFACE { color: #0000FF ; font-weight: bold } #LONG { color: #0000FF ; font-weight: bold } #NATIVE { color: #0000FF ; font-weight: bold } #NEW { color: #0000FF ; font-weight: bold } #PACKAGE { color: #0000FF ; font-weight: bold } #PRIVATE { color: #0000FF ; font-weight: bold } #PROTECTED { color: #0000FF ; font-weight: bold } #PUBLIC { color: #0000FF ; font-weight: bold } #RETURN { color: #0000FF ; font-weight: bold } #SHORT { color: #0000FF ; font-weight: bold } #STATIC { color: #0000FF ; font-weight: bold } #SUPER { color: #0000FF ; font-weight: bold } #SWITCH { color: #0000FF ; font-weight: bold } #SYCHRONIZED { color: #0000FF ; font-weight: bold } #THIS { color: #0000FF ; font-weight: bold } #THROW { color: #0000FF ; font-weight: bold } #THROWS { color: #0000FF ; font-weight: bold } #TRANSIENT { color: #0000FF ; font-weight: bold } #TRUE { color: #0000FF ; font-weight: bold } #TRY { color: #0000FF ; font-weight: bold } #VOID { color: #0000FF ; font-weight: bold } #VOLATILE { color: #0000FF ; font-weight: bold } #WHILE { color: #0000FF ; font-weight: bold } #StrictFP { color: #0000FF ; font-weight: bold } #LITERAL { color: #b27b8c } #IDENTIFIER { color: #000000 } 1.1 xml-forrest/src/resources/editor/chaperon/misc/matex.xsp Index: matex.xsp =================================================================== Matex Exmaple

    Matex Exmaple

    text text 80 110

    1.1 xml-forrest/src/resources/editor/chaperon/misc/mathexp.xsp Index: mathexp.xsp =================================================================== Mathexp Example

    Mathexp Example

    text text 80 110

    1.1 xml-forrest/src/resources/editor/chaperon/misc/samples.xml Index: samples.xml =================================================================== to Cocoon examples main page This example demonstrate how parser can be use to parse input text, like mathematical expressions. In this example the parser were used to build an online editor, which based on the very popular syntax of Wiki. The parser also be used to colorize some source code. (Need once 2-3min, for the parser table generation process) Another example. 1.1 xml-forrest/src/resources/editor/chaperon/misc/test1.java Index: test1.java =================================================================== /* * Copyright (C) Chaperon. All rights reserved. * ------------------------------------------------------------------------- * This software is published under the terms of the Apache Software License * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ package example; public class Example { public String concat(String param1, String param2) { return param1 + param2; } } 1.1 xml-forrest/src/resources/editor/chaperon/misc/test2.java Index: test2.java =================================================================== /* * Copyright (C) Chaperon. All rights reserved. * ------------------------------------------------------------------------- * This software is published under the terms of the Apache Software License * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ package net.sourceforge.chaperon.helpers; /** * The class maskes special characters * * @author Stephan Michels * @version %version% */ public class Decoder { /** * Mask special characters * * @param string String * * @return Mask string */ public static String decode(String string) { StringBuffer buffer = new StringBuffer(); for (int i = 0; i < string.length(); i++) { if (string.charAt(i) == '\n') buffer.append("\\n"); else if (string.charAt(i) == '\t') buffer.append("\\t"); else if (string.charAt(i) == '\r') buffer.append("\\r"); else if (string.charAt(i) == '\"') buffer.append("\""); else if (string.charAt(i) == '\\') buffer.append("\\"); else if ((string.charAt(i) >= '!') && (string.charAt(i) <= '~')) buffer.append(string.charAt(i)); else { String hexstring = Integer.toHexString((int) string.charAt(i)); String zeros = "0000"; buffer.append("\\u" + zeros.substring(4 - hexstring.length()) + hexstring); } } return buffer.toString(); } } 1.1 xml-forrest/src/resources/editor/chaperon/misc/wiki.xsp Index: wiki.xsp =================================================================== Wiki example
    Wiki example

    Preview

    Content

     1.1 xml-forrest/src/resources/editor/chaperon/grammars/java.rgrm Index: java.rgrm =================================================================== /*------------------------------------------------------------------ * Copyright (C) * 1996, 1997, 1998 Dmitri Bronnikov, All rights reserved. * * THIS GRAMMAR IS PROVIDED "AS IS" WITHOUT ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE, OR NON-INFRINGMENT. * * Bronikov@inreach.com * *------------------------------------------------------------------ * * VERSION 1.06 DATE 20 AUG 1998 * *------------------------------------------------------------------ * * UPDATES * * 1.06 Correction of Java 1.1 syntax * 1.05 Yet more Java 1.1 * . * 1.04 More Java 1.1 features: * .this * .class * 1.03 Added Java 1.1 features: * inner classes, * anonymous classes, * non-static initializer blocks, * array initialization by new operator * 1.02 Corrected cast expression syntax * 1.01 All shift/reduce conflicts, except dangling else, resolved * *------------------------------------------------------------------ * * PARSING CONFLICTS RESOLVED * * Some Shift/Reduce conflicts have been resolved at the expense of * the grammar defines a superset of the language. The following * actions have to be performed to complete program syntax checking: * * 1) Check that modifiers applied to a class, interface, field, * or constructor are allowed in respectively a class, inteface, * field or constructor declaration. For example, a class * declaration should not allow other modifiers than abstract, * final and public. * * 2) For an expression statement, check it is either increment, or * decrement, or assignment expression. * * 3) Check that type expression in a cast operator indicates a type. * Some of the compilers that I have tested will allow simultaneous * use of identically named type and variable in the same scope * depending on context. * * 4) Change lexical definition to change '[' optionally followed by * any number of white-space characters immediately followed by ']' * to OP_DIM token. I defined this token as [\[]{white_space}*[\]] * in the lexer. * *------------------------------------------------------------------ * * UNRESOLVED SHIFT/REDUCE CONFLICTS * * Dangling else in if-then-else * *------------------------------------------------------------------ */ %uri "http://chaperon.sourceforge.net/grammar/java/1.0"; %token DOPEN \(; %token DCLOSE \); %token COPEN \{; %token CCLOSE \}; %token BOPEN \[; %token BCLOSE \]; %token SEMICOLON \;; %token COMMA \,; %token DOT \.; %token OP_EQ ==; %token OP_LE \<=; %token OP_GE \>=; %token OP_NE !=; %token OP_LOR \|\|; %token OP_LAND &&; %token OP_INC \+\+; %token OP_DEC \-\-; %token OP_SHR \>\>; %token OP_SHL \<\<; %token OP_SHRR \>\>\>; %token ASS_OP \+= | \-= | \*= | /= | &= | \|= | \^= | \%= | \<\<= | \>\>= | \>\>\>=; %token EQ \=; %token GT \>; %token LT \<; %token NOT \!; %token TILDE \~; %token QM \?; %token COLON \:; %token PLUS \+; %token MINUS \-; %token MULT \*; %token DIV \/; %token AND \&; %token OR \|; %token XOR \^; %token MOD \%; %token BOOLLIT true|false; %token ABSTRACT abstract; %token DO do; %token IMPLEMENTS implements; %token PACKAGE package; %token THROW throw; %token BOOLEAN boolean; %token DOUBLE double; %token IMPORT import; %token PRIVATE private; %token THROWS throws; %token BREAK break; %right ELSE else; %token INNER inner; %token PROTECTED protected; %token TRANSIENT transient; %token BYTE byte; %token EXTENDS extends; %token INSTANCEOF instanceof; %token PUBLIC public; %token TRY try; %token CASE case; %token FINAL final; %token INT int; %token REST rest; %token VAR var; %token CAST cast; %token FINALLY finally; %token INTERFACE interface; %token RETURN return; %token VOID void; %token CATCH catch; %token FLOAT float; %token LONG long; %token SHORT short; %token VOLATILE volatile; %token CHAR char; %token FOR for; %token NATIVE native; %token STATIC static; %token WHILE while; %token CLASS class; %token FUTURE future; %token NEW new; %token SUPER super; %token CONST const; %token GENERIC generic; %token NULL null; %token SWITCH switch; %token CONTINUE continue; %token GOTO goto; %token OPERATOR operator; %token SYNCHRONIZED synchronized; %token DEFAULT default; %token IF if; %token OUTER outer; %token THIS this; %ab HexDigit [0-9a-fA-F]; %ab Digit [0-9]; %ab OctalDigit [0-7]; %ab TetraDigit [0-3]; %ab NonZeroDigit [1-9]; %ab Letter [a-zA-Z_]; %ab AnyButSlash [^\/]; %ab AnyButAstr [^\*]; %ab UniEsc [\1b]; %ab OctEscape1 \\ ; %ab OctEscape2 \\ ; %ab OctEscape3 \\ ; %ab OctEscape (||); %ab Escape [\\]([rnbft\\\'\"]); %ab ULetter (|); %ab Identifier (|)*; %ab IntSuffix (l|L); %ab DecimalNum *?; %ab OctalNum 0 *?; %ab HexNum 0 (x|X) *?; %ab IntegerLiteral (||); %ab Sign (\+ | \-); %ab FlSuffix (f|F|d|D); %ab SignedInt ?+; %ab Expo (e|E); %ab ExponentPart ?; %ab Float1 + \. (+)???; %ab Float2 \. +??; %ab Float3 +?; %ab Float4 +; %ab FloatingPoint (|||); %ab AnyChrChr [^\\']; %ab AnyStrChr [^\\\"]; %ab Character \' (||) \' ; %ab String \" (||)* \" ; %ab Numeric (|); %token LITERAL (||); %token IDENTIFIER ([a-zA-Z_]|[\1b])(([a-zA-Z_]|[\1b])|[0-9])*; //%token OP_DIM \[ ([\r\n\f\t\b\ ]|( \/ \* ([^\*]| \* [^\/])* \* \/ | // \/ \/ (.*)))* \] ; //%whitespace [\r\n\f\t\b\ ]; %token OP_DIM \[ ([\r\n\t\ ]|( \/ \* ([^\*]| \* [^\/])* \* \/ | \/ \/ (.*)))* \] ; %ignore whitespace [\t\ ]; %ignore eol \r(\n)?|\n; %ab Comment1 \/ \* (|[\*])* \* \/; %ab Comment2 \/ \/ (.*); %ignore comment (|); %start CompilationUnit; %% TypeSpecifier : TypeName | TypeName Dims ; TypeName : PrimitiveType | QualifiedName ; ClassNameList : QualifiedName | ClassNameList COMMA QualifiedName ; PrimitiveType : BOOLEAN | CHAR | BYTE | SHORT | INT | LONG | FLOAT | DOUBLE | VOID ; SemiColons : SEMICOLON | SemiColons SEMICOLON ; CompilationUnit : ProgramFile ; ProgramFile : PackageStatement ImportStatements TypeDeclarations | PackageStatement ImportStatements | PackageStatement TypeDeclarations | ImportStatements TypeDeclarations | PackageStatement | ImportStatements | TypeDeclarations ; PackageStatement : PACKAGE QualifiedName SemiColons ; TypeDeclarations : TypeDeclarationOptSemi | TypeDeclarations TypeDeclarationOptSemi ; TypeDeclarationOptSemi : TypeDeclaration | TypeDeclaration SemiColons ; ImportStatements : ImportStatement | ImportStatements ImportStatement ; ImportStatement : IMPORT QualifiedName SemiColons | IMPORT QualifiedName DOT MULT SemiColons ; QualifiedName : IDENTIFIER %append | QualifiedName DOT IDENTIFIER %append ; TypeDeclaration : ClassHeader COPEN FieldDeclarations CCLOSE | ClassHeader COPEN CCLOSE ; ClassHeader : Modifiers ClassWord IDENTIFIER Extends Interfaces | Modifiers ClassWord IDENTIFIER Extends | Modifiers ClassWord IDENTIFIER Interfaces | ClassWord IDENTIFIER Extends Interfaces | Modifiers ClassWord IDENTIFIER | ClassWord IDENTIFIER Extends | ClassWord IDENTIFIER Interfaces | ClassWord IDENTIFIER ; Modifiers : Modifier %append | Modifiers Modifier %append ; Modifier : ABSTRACT | FINAL | PUBLIC | PROTECTED | PRIVATE | STATIC | TRANSIENT | VOLATILE | NATIVE | SYNCHRONIZED ; ClassWord : CLASS | INTERFACE ; Interfaces : IMPLEMENTS ClassNameList ; FieldDeclarations : FieldDeclarationOptSemi | FieldDeclarations FieldDeclarationOptSemi ; FieldDeclarationOptSemi : FieldDeclaration | FieldDeclaration SemiColons ; FieldDeclaration : FieldVariableDeclaration SEMICOLON | MethodDeclaration | ConstructorDeclaration | StaticInitializer | NonStaticInitializer | TypeDeclaration ; FieldVariableDeclaration : Modifiers TypeSpecifier VariableDeclarators | TypeSpecifier VariableDeclarators ; VariableDeclarators : VariableDeclarator | VariableDeclarators COMMA VariableDeclarator ; VariableDeclarator : DeclaratorName | DeclaratorName EQ VariableInitializer ; VariableInitializer : Expression | COPEN CCLOSE | COPEN ArrayInitializers CCLOSE ; ArrayInitializers : VariableInitializer | ArrayInitializers COMMA VariableInitializer | ArrayInitializers COMMA ; MethodDeclaration : Modifiers TypeSpecifier MethodDeclarator Throws MethodBody | Modifiers TypeSpecifier MethodDeclarator MethodBody | TypeSpecifier MethodDeclarator Throws MethodBody | TypeSpecifier MethodDeclarator MethodBody ; MethodDeclarator : DeclaratorName DOPEN ParameterList DCLOSE | DeclaratorName DOPEN DCLOSE | MethodDeclarator OP_DIM ; ParameterList : Parameter | ParameterList COMMA Parameter ; Parameter : TypeSpecifier DeclaratorName | FINAL TypeSpecifier DeclaratorName ; DeclaratorName : IDENTIFIER | DeclaratorName OP_DIM ; Throws : THROWS ClassNameList ; MethodBody : Block | SEMICOLON ; ConstructorDeclaration : Modifiers ConstructorDeclarator Throws Block | Modifiers ConstructorDeclarator Block | ConstructorDeclarator Throws Block | ConstructorDeclarator Block ; ConstructorDeclarator : IDENTIFIER DOPEN ParameterList DCLOSE | IDENTIFIER DOPEN DCLOSE ; StaticInitializer : STATIC Block ; NonStaticInitializer : Block ; Extends : EXTENDS TypeName | Extends COMMA TypeName ; Block : COPEN LocalVariableDeclarationsAndStatements CCLOSE | COPEN CCLOSE ; LocalVariableDeclarationsAndStatements : LocalVariableDeclarationOrStatement %append | LocalVariableDeclarationsAndStatements LocalVariableDeclarationOrStatement %append ; LocalVariableDeclarationOrStatement : LocalVariableDeclarationStatement | Statement ; LocalVariableDeclarationStatement : TypeSpecifier VariableDeclarators SEMICOLON | FINAL TypeSpecifier VariableDeclarators SEMICOLON ; Statement : EmptyStatement | LabelStatement | ExpressionStatement SEMICOLON | SelectionStatement | IterationStatement | JumpStatement | GuardingStatement | Block ; EmptyStatement : SEMICOLON ; LabelStatement : IDENTIFIER COLON | CASE ConstantExpression COLON | DEFAULT COLON ; ExpressionStatement : Expression ; SelectionStatement : IF DOPEN Expression DCLOSE Statement %prec ELSE | IF DOPEN Expression DCLOSE Statement ELSE Statement %prec ELSE | SWITCH DOPEN Expression DCLOSE Block ; IterationStatement : WHILE DOPEN Expression DCLOSE Statement | DO Statement WHILE DOPEN Expression DCLOSE SEMICOLON | FOR DOPEN ForInit ForExpr ForIncr DCLOSE Statement | FOR DOPEN ForInit ForExpr DCLOSE Statement ; ForInit : ExpressionStatements SEMICOLON | LocalVariableDeclarationStatement | SEMICOLON ; ForExpr : Expression SEMICOLON | SEMICOLON ; ForIncr : ExpressionStatements ; ExpressionStatements : ExpressionStatement %resolve | ExpressionStatements COMMA ExpressionStatement ; JumpStatement : BREAK IDENTIFIER SEMICOLON | BREAK SEMICOLON | CONTINUE IDENTIFIER SEMICOLON | CONTINUE SEMICOLON | RETURN Expression SEMICOLON | RETURN SEMICOLON | THROW Expression SEMICOLON ; GuardingStatement : SYNCHRONIZED DOPEN Expression DCLOSE Statement | TRY Block Finally | TRY Block Catches | TRY Block Catches Finally ; Catches : Catch | Catches Catch ; Catch : CatchHeader Block ; CatchHeader : CATCH DOPEN TypeSpecifier IDENTIFIER DCLOSE | CATCH DOPEN TypeSpecifier DCLOSE ; Finally : FINALLY Block ; PrimaryExpression : QualifiedName %resolve | NotJustName %resolve ; NotJustName : SpecialName %resolve | NewAllocationExpression %resolve | ComplexPrimary %resolve ; ComplexPrimary : DOPEN Expression DCLOSE | ComplexPrimaryNoParenthesis %resolve ; ComplexPrimaryNoParenthesis : LITERAL | BOOLLIT | ArrayAccess | FieldAccess | MethodCall ; ArrayAccess : QualifiedName BOPEN Expression BCLOSE | ComplexPrimary BOPEN Expression BCLOSE ; FieldAccess : NotJustName DOT IDENTIFIER | RealPostfixExpression DOT IDENTIFIER | QualifiedName DOT THIS | QualifiedName DOT CLASS | PrimitiveType DOT CLASS ; MethodCall : MethodAccess DOPEN ArgumentList DCLOSE | MethodAccess DOPEN DCLOSE ; MethodAccess : ComplexPrimaryNoParenthesis | SpecialName | QualifiedName ; SpecialName : THIS | SUPER | NULL ; ArgumentList : Expression | ArgumentList COMMA Expression ; NewAllocationExpression : PlainNewAllocationExpression | QualifiedName DOT PlainNewAllocationExpression ; PlainNewAllocationExpression : ArrayAllocationExpression | ClassAllocationExpression | ArrayAllocationExpression COPEN CCLOSE | ClassAllocationExpression COPEN CCLOSE | ArrayAllocationExpression COPEN ArrayInitializers CCLOSE | ClassAllocationExpression COPEN FieldDeclarations CCLOSE ; ClassAllocationExpression : NEW TypeName DOPEN ArgumentList DCLOSE | NEW TypeName DOPEN DCLOSE ; ArrayAllocationExpression : NEW TypeName DimExprs Dims | NEW TypeName DimExprs | NEW TypeName Dims ; DimExprs : DimExpr | DimExprs DimExpr ; DimExpr : BOPEN Expression BCLOSE ; Dims : OP_DIM | Dims OP_DIM ; PostfixExpression : PrimaryExpression %resolve | RealPostfixExpression %resolve ; RealPostfixExpression : PostfixExpression OP_INC | PostfixExpression OP_DEC ; UnaryExpression : OP_INC UnaryExpression | OP_DEC UnaryExpression | ArithmeticUnaryOperator CastExpression | LogicalUnaryExpression %resolve ; LogicalUnaryExpression : PostfixExpression %resolve | LogicalUnaryOperator UnaryExpression ; LogicalUnaryOperator : TILDE | NOT ; ArithmeticUnaryOperator : PLUS | MINUS ; CastExpression : UnaryExpression %resolve | DOPEN PrimitiveTypeExpression DCLOSE CastExpression | DOPEN ClassTypeExpression DCLOSE CastExpression | DOPEN Expression DCLOSE LogicalUnaryExpression ; PrimitiveTypeExpression : PrimitiveType | PrimitiveType Dims ; ClassTypeExpression : QualifiedName Dims ; MultiplicativeExpression : CastExpression %resolve | MultiplicativeExpression MULT CastExpression | MultiplicativeExpression DIV CastExpression | MultiplicativeExpression MOD CastExpression ; AdditiveExpression : MultiplicativeExpression %resolve | AdditiveExpression PLUS MultiplicativeExpression | AdditiveExpression MINUS MultiplicativeExpression ; ShiftExpression : AdditiveExpression %resolve | ShiftExpression OP_SHL AdditiveExpression | ShiftExpression OP_SHR AdditiveExpression | ShiftExpression OP_SHRR AdditiveExpression ; RelationalExpression : ShiftExpression %resolve | RelationalExpression LT ShiftExpression | RelationalExpression GT ShiftExpression | RelationalExpression OP_LE ShiftExpression | RelationalExpression OP_GE ShiftExpression | RelationalExpression INSTANCEOF TypeSpecifier ; EqualityExpression : RelationalExpression %resolve | EqualityExpression OP_EQ RelationalExpression | EqualityExpression OP_NE RelationalExpression ; AndExpression : EqualityExpression %resolve | AndExpression AND EqualityExpression ; ExclusiveOrExpression : AndExpression %resolve | ExclusiveOrExpression XOR AndExpression ; InclusiveOrExpression : ExclusiveOrExpression %resolve | InclusiveOrExpression OR ExclusiveOrExpression ; ConditionalAndExpression : InclusiveOrExpression %resolve | ConditionalAndExpression OP_LAND InclusiveOrExpression ; ConditionalOrExpression : ConditionalAndExpression %resolve | ConditionalOrExpression OP_LOR ConditionalAndExpression ; ConditionalExpression : ConditionalOrExpression %resolve | ConditionalOrExpression QM Expression COLON ConditionalExpression ; AssignmentExpression : ConditionalExpression %resolve | UnaryExpression AssignmentOperator AssignmentExpression ; AssignmentOperator : EQ | ASS_OP ; Expression : AssignmentExpression ; ConstantExpression : ConditionalExpression ; 1.1 xml-forrest/src/resources/editor/chaperon/grammars/mathexp.grm Index: mathexp.grm =================================================================== 1.1 xml-forrest/src/resources/editor/chaperon/grammars/rgrm.grm Index: rgrm.grm =================================================================== 1.1 xml-forrest/src/resources/editor/chaperon/grammars/wiki.grm Index: wiki.grm =================================================================== 1.1 xml-forrest/src/resources/editor/chaperon/grammars/wiki.rgrm Index: wiki.rgrm =================================================================== %uri "http://chaperon.sourceforge.net/grammar/wiki/1.0"; %token LINE \-\-\-(\-)+; %token QUOTE :; %token BULLETED (\*)+; %token NUMBERED3 \#\#\#; %token NUMBERED2 \#\#; %token NUMBERED1 \#; %token HEAD (\!)+; %left ITALIC \"; %left BOLD __; %left UNDERLINE _; %token LINK (http|ftp|mailto|news):(/){1,3}[A-Za-z0-9\.\_\-]*; %token BOPEN \[; %token BCLOSE \]; %token TEXT [A-Za-z0-9\,\'\.\?\:]+[A-Za-z0-9\ \t\,\'\.\?\!\:]*; %left EMPTY \r\n [\ \t]* \r\n | \r [\ \t]* \r | \n [\ \t]* \n ; %token EOL (\r(\n)?|\n); %start wiki; %ignore whitespace [\ \r\n]+; %% wiki : wiki paragraphs %append | paragraphs %append ; paragraphs : paragraphs paragraph %append | paragraph %append ; paragraph : bulletedlist | numberedlist1 | textitem | headitem | footnote | LINE | EMPTY ; bulletedlist : bulletedlist bulletedlistitem %append | bulletedlistitem %append ; bulletedlistitem : BULLETED textblock textsequence | BULLETED textblock ; numberedlist1 : numberedlist1 numberedlistitem1 %append | numberedlistitem1 %append | numberedlist1 numberedlist2 %append | numberedlist2 %append ; numberedlistitem1 : NUMBERED1 textblock textsequence | NUMBERED1 textblock ; numberedlist2 : numberedlist2 numberedlistitem2 %append | numberedlistitem2 %append | numberedlist2 numberedlist3 %append | numberedlist3 %append ; numberedlistitem2 : NUMBERED2 textblock textsequence | NUMBERED2 textblock ; numberedlist3 : numberedlist3 numberedlistitem3 %append | numberedlistitem3 %append ; numberedlistitem3 : NUMBERED3 textblock textsequence | NUMBERED3 textblock ; textitem : firstblock textblock textsequence | firstblock textblock | firstblock ; headitem : HEAD textblock textsequence | HEAD textblock ; footnote : note textblock textsequence | note textblock ; textsequence : textsequence EOL %resolve | EOL %resolve | textsequence textblock %resolve | textblock %resolve ; textblock : LINK | boldblock | italicblock | underlineblock | TEXT | note ; firstblock : LINK | boldblock | italicblock | underlineblock | TEXT ; italicblock : ITALIC TEXT ITALIC ; boldblock : BOLD TEXT BOLD ; underlineblock : UNDERLINE TEXT UNDERLINE ; note : BOPEN TEXT BCLOSE | BOPEN LINK BCLOSE ; 1.34 +8 -0 xml-forrest/src/resources/conf/sitemap.xmap Index: sitemap.xmap =================================================================== RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sitemap.xmap 5 Nov 2002 08:00:34 -0000 1.33 +++ sitemap.xmap 5 Nov 2002 10:59:25 -0000 1.34 @@ -329,6 +329,14 @@ + + + + + + + + 1.1 xml-forrest/lib/core/chaperon-1.3-dev.jar <> 1.1 xml-forrest/lib/core/chaperon-block.jar <> 1.1 xml-forrest/lib/core/cocoon-scratchpad-20021030.jar <> 1.1 xml-forrest/src/resources/editor/editor/images/dir.gif <> 1.1 xml-forrest/src/resources/editor/editor/images/file.gif <> 1.1 xml-forrest/src/resources/editor/editor/images/get.gif <> 1.1 xml-forrest/src/resources/editor/editor/images/new.gif <> 1.1 xml-forrest/src/resources/editor/editor/images/see.gif <>