headers
bruno | 1 Apr 2003 10:27
Picon
Favicon

cvs commit: cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation HTMLGenerator.java

bruno       2003/04/01 00:27:28

  Modified:    src/blocks/html/java/org/apache/cocoon/generation
                        HTMLGenerator.java
  Log:
  - fix double endDocument call when using xpath expressions, by using the normal
    DOMStreamer instead of a TRAX transform (reported on cocoon-users by
    Tonny Collen).
  - removed setNormalizeNamespaces(false) call on DOMStreamer, so that correct
    SAX events are generated (a startPrefixMapping for the xhtml namespace was
    called, but the uri's of the individual start- and endElement calls were
    empty)
  - IDEA has been trimming some whitespace-only lines

  Revision  Changes    Path
  1.4       +27 -29    cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java

  Index: HTMLGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HTMLGenerator.java	19 Mar 2003 15:42:17 -0000	1.3
  +++ HTMLGenerator.java	1 Apr 2003 08:27:28 -0000	1.4
   <at>  <at>  -101,16 +101,16  <at>  <at> 
    */
   public class HTMLGenerator extends ComposerGenerator
   implements Configurable, CacheableProcessingComponent, Disposable {
  -
(Continue reading)

Permalink | Reply | 0 comments |
headers
shannon | 1 Apr 2003 13:46
Picon
Favicon

cvs commit: cocoon-2.1/src/documentation/xdocs/installing updating.xml

shannon     2003/04/01 03:46:31

  Modified:    src/documentation/xdocs/installing updating.xml
  Log:
  Updated based on Sylvain's timely
  comments on cocoon-dev. Other
  holes remain, however.

  Revision  Changes    Path
  1.4       +1 -1      cocoon-2.1/src/documentation/xdocs/installing/updating.xml

  Index: updating.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/installing/updating.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- updating.xml	13 Mar 2003 15:13:10 -0000	1.3
  +++ updating.xml	1 Apr 2003 11:46:31 -0000	1.4
   <at>  <at>  -44,7 +44,7  <at>  <at> 
       one change which shouldn't affect anybody (see below).
     </p>
     <s2 title="Source Resolving">
  -    <p>Mention changes and update strategy...</p>
  +<p>Under Cocoon 2.0.x, the SourceResolver was not an Avalon component, so it could not be looked up using a
component manager. Under 2.1, the SourceResolver is now an Avalon component and can be requested using
<em>cocoon.manager.lookup(SourceResolver.ROLE).</em></p>  
     </s2>
     <s2 title="XSLT Processor">
       <p>Mention changes and update strategy...</p>
(Continue reading)

Permalink | Reply | 0 comments |
headers
shannon | 1 Apr 2003 13:50
Picon
Favicon

cvs commit: cocoon-2.0/src/documentation/xdocs/installing updating.xml

shannon     2003/04/01 03:50:02

  Modified:    src/documentation/xdocs/installing updating.xml
  Log:
  Updated based on Sylvain's timely
  comments on cocoon-dev. Other
  holes remain, however.

  Revision  Changes    Path
  1.3       +1 -1      cocoon-2.0/src/documentation/xdocs/installing/updating.xml

  Index: updating.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/documentation/xdocs/installing/updating.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- updating.xml	10 Mar 2003 09:12:05 -0000	1.2
  +++ updating.xml	1 Apr 2003 11:50:01 -0000	1.3
   <at>  <at>  -35,7 +35,7  <at>  <at> 
       one change which shouldn't affect anybody (see below).
     </p>
     <s2 title="Source Resolving">
  -    <p>Mention changes and update strategy...</p>
  +<p>Under Cocoon 2.0.x, the SourceResolver was not an Avalon component, so it could not be looked up using a
component manager. Under 2.1, the SourceResolver is now an Avalon component and can be requested using
<em>cocoon.manager.lookup(SourceResolver.ROLE).</em></p>  
     </s2>
     <s2 title="XSLT Processor">
       <p>Mention changes and update strategy...</p>
(Continue reading)

Permalink | Reply | 0 comments |
headers
stefano | 1 Apr 2003 14:31
Picon
Favicon

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript JavaScriptInterpreter.java

stefano     2003/04/01 04:31:25

  Modified:    src/java/org/apache/cocoon/components/flow/javascript
                        JavaScriptInterpreter.java
  Log:
  removing leftover debug message

  Revision  Changes    Path
  1.14      +2 -2      cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java

  Index: JavaScriptInterpreter.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- JavaScriptInterpreter.java	27 Mar 2003 19:11:53 -0000	1.13
  +++ JavaScriptInterpreter.java	1 Apr 2003 12:31:25 -0000	1.14
   <at>  <at>  -321,8 +321,8  <at>  <at> 
               userScopes = new HashMap();
               session.setAttribute(USER_GLOBAL_SCOPE, userScopes);
           }
  +        
           String uriPrefix = environment.getURIPrefix();
  -        System.out.println("set uriPrefix="+uriPrefix);
           userScopes.put(uriPrefix, scope);
       }
Permalink | Reply | 0 comments |
headers
stephan | 1 Apr 2003 18:34
Picon
Favicon

cvs commit: cocoon-2.1/lib jars.xml

stephan     2003/04/01 08:34:17

  Modified:    lib      jars.xml
  Log:
  Update Chaperon lib.

  Revision  Changes    Path
  1.21      +4 -4      cocoon-2.1/lib/jars.xml

  Index: jars.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- jars.xml	31 Mar 2003 14:08:16 -0000	1.20
  +++ jars.xml	1 Apr 2003 16:34:17 -0000	1.21
   <at>  <at>  -620,11 +620,11  <at>  <at> 
    <file>
     <title>Chaperon Text Parser</title>
     <description>
  -    chaperon is parser which could parse text files, and convert those
  -    to XML files.
  +    The chaperon project is parser which could parse text files, and 
  +    convert those to XML files.
     </description>
     <used-by>Chaperon block</used-by>
  -  <lib>chaperon/lib/chaperon-20030208.jar</lib>
  +  <lib>chaperon/lib/chaperon-20030401.jar</lib>
     <homepage>http://chaperon.sourceforge.net</homepage>
(Continue reading)

Permalink | Reply | 0 comments |
headers
stephan | 1 Apr 2003 18:33
Picon
Favicon

cvs commit: cocoon-2.1/src/blocks/chaperon/samples sitemap.xmap

stephan     2003/04/01 08:33:49

  Modified:    src/blocks/chaperon/java/org/apache/cocoon/transformation
                        LexicalTransformer.java ParserTransformer.java
               src/blocks/chaperon/samples sitemap.xmap
  Added:       src/blocks/chaperon/lib chaperon-20030401.jar
  Removed:     src/blocks/chaperon/lib chaperon-20030208.jar
  Log:
  Update to new chaperon parser, which now offers some basic error-recovery
  strategies, and improved performance.

  Revision  Changes    Path
  1.3       +17 -6     cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java

  Index: LexicalTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LexicalTransformer.java	19 Mar 2003 15:42:14 -0000	1.2
  +++ LexicalTransformer.java	1 Apr 2003 16:33:49 -0000	1.3
   <at>  <at>  -73,6 +73,8  <at>  <at> 
   import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.logger.Logger;
  +import org.apache.avalon.framework.parameters.ParameterException;
  +import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
(Continue reading)

Permalink | Reply | 0 comments |
headers
stephan | 1 Apr 2003 18:41
Picon
Favicon

cvs commit: cocoon-2.1/src/blocks/chaperon/samples sitemap.xmap

stephan     2003/04/01 08:41:45

  Modified:    src/blocks/chaperon/samples sitemap.xmap
  Log:
  Revert some debugging statements.

  Revision  Changes    Path
  1.10      +0 -12     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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- sitemap.xmap	1 Apr 2003 16:33:49 -0000	1.9
  +++ sitemap.xmap	1 Apr 2003 16:41:45 -0000	1.10
   <at>  <at>  -203,24 +203,12  <at>  <at> 

      <map:match pattern="quote.html">
       <map:generate type="text" src="misc/quote.txt"/>
  -    <map:transform type="log">
  -     <map:parameter name="logfile" value="logfile1.log"/>
  -     <map:parameter name="append" value="no"/>
  -    </map:transform>
   <!--
       <map:transform type="lexer"   src="cocoon:/quote.xlex"/>
       <map:transform type="parser"  src="cocoon:/quote.xgrm"/>
   -->
       <map:transform type="lexer"   src="grammars/quote.xlex"/>
(Continue reading)

Permalink | Reply | 0 comments |
headers
giacomo | 1 Apr 2003 20:39
Picon
Favicon

cvs commit: cocoon-2.1/src/idl/java _module.idl

giacomo     2003/04/01 10:39:31

  Modified:    src/idl/java _module.idl
  Log:
  fixed typo

  Revision  Changes    Path
  1.2       +1 -1      cocoon-2.1/src/idl/java/_module.idl

  Index: _module.idl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/idl/java/_module.idl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -d -b -u -r1.1 -r1.2
  --- _module.idl	9 Mar 2003 00:08:34 -0000	1.1
  +++ _module.idl	1 Apr 2003 18:39:31 -0000	1.2
   <at>  <at>  -67,7 +67,7  <at>  <at> 
    * </p>
    * <p>
    *   It is required, though, to provide the definition of all Java
  - *   &quot;native&quot; ojbects accessible from the Apache Cocoon scripting
  + *   &quot;native&quot; objects accessible from the Apache Cocoon scripting
    *   layers, because if any of the future scripting environment implemented
    *   does not support automatic wrapping, developers will have to implement
    *   those manually.
Permalink | Reply | 0 comments |
headers
coliver | 1 Apr 2003 21:19
Picon
Favicon

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript JavaScriptInterpreter.java

coliver     2003/04/01 11:19:30

  Modified:    src/java/org/apache/cocoon/components/flow/javascript
                        JavaScriptInterpreter.java
  Log:
  synchronized compilation and fixed bug where scripts weren't execed the first time a thrScope was created

  Revision  Changes    Path
  1.15      +46 -40    cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java

  Index: JavaScriptInterpreter.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- JavaScriptInterpreter.java	1 Apr 2003 12:31:25 -0000	1.14
  +++ JavaScriptInterpreter.java	1 Apr 2003 19:19:30 -0000	1.15
   <at>  <at>  -417,9 +417,9  <at>  <at> 
           cocoon.setContext(manager, environment);

           // Check if we need to compile and/or execute scripts
  -        List execList = new ArrayList();
  -        boolean needsRefresh = false;
  -        synchronized (this) {
  +        synchronized (compiledScripts) {
  +            List execList = new ArrayList();
  +            boolean needsRefresh = false;
               if (reloadScripts) {
                   long now = System.currentTimeMillis();
(Continue reading)

Permalink | Reply | 0 comments |
headers
coliver | 1 Apr 2003 21:25
Picon
Favicon

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript xmlForm.js

coliver     2003/04/01 11:25:11

  Modified:    src/java/org/apache/cocoon/components/flow/javascript
                        xmlForm.js
  Log:
  Removed dependency on session. Request scope should now work. Call back to
JavaScriptInterpreter.handleContinuation to ensure that cocoon object is set up properly when
invoking continuation. Added workaround while I look into apparent dynamic scoping bug in Rhino that
causes session scope forms to fail with multiple users

  Revision  Changes    Path
  1.8       +32 -51    cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/xmlForm.js

  Index: xmlForm.js
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/xmlForm.js,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- xmlForm.js	29 Mar 2003 19:12:24 -0000	1.7
  +++ xmlForm.js	1 Apr 2003 19:25:11 -0000	1.8
   <at>  <at>  -15,21 +15,17  <at>  <at> 
    */

   function XForm(id, validatorNS, validatorDoc, scope) {
  -    if (scope != "request") {
  +    if (scope == "session") {
           cocoon.createSession();
       }
  +    this.cocoon = cocoon; // workaround for Rhino dynamic scope bug
(Continue reading)

Permalink | Reply | 0 comments |

Gmane