ovidiu 02/03/19 01:48:42 Modified: src/scratchpad/schecoon ChangeLog Log: 2002-03-19 Ovidiu Predescu <[EMAIL PROTECTED]> * webapp/sitemap.xmap: Use the wildcard matcher instead of regexp. Changed the name of the special function that handles continuations to "handleContinuation". * webapp/example2.js: Added some more code. Use builtin JavaScript objects to pass information to sendPage and cocoon.processPipeline. * webapp/cocoon.xconf: Added the JPath logicsheet as a builtin logicsheet. * src/org/apache/cocoon/markup/xsp/jpath.xsl: No longer assumes the flow control implementation is the Scheme SISC interpreter. It is now up to various interpreters to convert the data appropriately. * src/org/apache/cocoon/components/flow/javascript/system.js: Created. Defines the necessary JavaScript functions for dealing with continuations. * src/org/apache/cocoon/components/flow/javascript/JSGlobal.java: Inherit from Rhino's Global class, to automatically inherit all the top level definitions. * src/org/apache/cocoon/components/flow/javascript/JSCocoon.java: Save the InvokeContext instance in addition to Environment. Automatically convert JavaScript objects to Java Map instances. * src/org/apache/cocoon/components/flow/JavaScriptInterpreter.java: Do not use initStandardObjects() to initialize the global scope, use instead JSGlobal directly. Add additional InvokeContext argument to enterContext. Pass both the Environment and the InvokeContext to the JSCocoon object, to be used later in processPipeline(). Call top level functions through a special defined function "callFunction". This captures the continuation in the "suicide" variable, which is later used to exit non-locally from "sendPage". Need to solve bug in Christopher's continuations code, which makes the function return twice. Implement processPipeline(), which calls an internally defined sitemap resource. Still need to implement the ability to invoke an arbitrary pipeline. TODO: figure out how to pass information from the flow layer down the pipeline. * src/org/apache/cocoon/components/flow/InterpreterSelector.java: Use the "load-on-startup" XML attribute of <component-instance> to specify a file which should be executed on Interpreter start-up. Normally this provides the definitions need for flow scripts. * src/org/apache/cocoon/components/flow/Interpreter.java: Pass the Environment and InvokeContext in processPipeline. * src/org/apache/cocoon/components/flow/AbstractInterpreter.java: FIXME: Protect with a synchronize removing the registered files from needResolve. Revision Changes Path 1.24 +68 -0 xml-cocoon2/src/scratchpad/schecoon/ChangeLog Index: ChangeLog =================================================================== RCS file: /home/cvs/xml-cocoon2/src/scratchpad/schecoon/ChangeLog,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ChangeLog 18 Mar 2002 06:49:55 -0000 1.23 +++ ChangeLog 19 Mar 2002 09:48:42 -0000 1.24 @@ -1,3 +1,71 @@ +2002-03-19 Ovidiu Predescu <[EMAIL PROTECTED]> + + * webapp/sitemap.xmap: Use the wildcard matcher instead of + regexp. Changed the name of the special function that handles + continuations to "handleContinuation". + + * webapp/example2.js: Added some more code. Use builtin JavaScript + objects to pass information to sendPage and + cocoon.processPipeline. + + * webapp/cocoon.xconf: Added the JPath logicsheet as a builtin + logicsheet. + + * src/org/apache/cocoon/markup/xsp/jpath.xsl: No longer assumes + the flow control implementation is the Scheme SISC interpreter. It + is now up to various interpreters to convert the data + appropriately. + + * src/org/apache/cocoon/components/flow/javascript/system.js: + Created. Defines the necessary JavaScript functions for dealing + with continuations. + + * src/org/apache/cocoon/components/flow/javascript/JSGlobal.java: + Inherit from Rhino's Global class, to automatically inherit all + the top level definitions. + + * src/org/apache/cocoon/components/flow/javascript/JSCocoon.java: + Save the InvokeContext instance in addition to Environment. + + Automatically convert JavaScript objects to Java Map instances. + + * src/org/apache/cocoon/components/flow/JavaScriptInterpreter.java: + Do not use initStandardObjects() to initialize the global scope, + use instead JSGlobal directly. + + Add additional InvokeContext argument to enterContext. Pass both + the Environment and the InvokeContext to the JSCocoon object, to + be used later in processPipeline(). + + Call top level functions through a special defined function + "callFunction". This captures the continuation in the "suicide" + variable, which is later used to exit non-locally from + "sendPage". Need to solve bug in Christopher's continuations code, + which makes the function return twice. + + Implement processPipeline(), which calls an internally defined + sitemap resource. Still need to implement the ability to invoke an + arbitrary pipeline. TODO: figure out how to pass information from + the flow layer down the pipeline. + + * src/org/apache/cocoon/components/flow/InterpreterSelector.java: + Use the "load-on-startup" XML attribute of <component-instance> to + specify a file which should be executed on Interpreter + start-up. Normally this provides the definitions need for flow + scripts. + + * src/org/apache/cocoon/components/flow/Interpreter.java: Pass the + Environment and InvokeContext in processPipeline. + + * src/org/apache/cocoon/components/flow/AbstractInterpreter.java: + FIXME: Protect with a synchronize removing the registered files + from needResolve. + +2002-03-18 Ovidiu Predescu <[EMAIL PROTECTED]> + + * src/org/apache/cocoon/components/flow/flow.xconf: Added + load-on-startup. + 2002-03-17 Ovidiu Predescu <[EMAIL PROTECTED]> * src/org/apache/cocoon/components/treeprocessor/sitemap/CallNodeBuilder2.java:
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]