Return-Path: 
 <cvs-return-12987-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 64946 invoked by uid 500); 6 Jul 2003 07:09:21 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 64935 invoked by uid 500); 6 Jul 2003 07:09:21 -0000
Delivered-To: apmail-cocoon-2.1-cvs@apache.org
Received: (qmail 64932 invoked from network); 6 Jul 2003 07:09:21 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 6 Jul 2003 07:09:21 -0000
Received: (qmail 43256 invoked by uid 1544); 6 Jul 2003 07:09:19 -0000
Date: 6 Jul 2003 07:09:19 -0000
Message-ID: <20030706070919.43255.qmail@icarus.apache.org>
From: coliver@apache.org
To: cocoon-2.1-cvs@apache.org
Subject: cvs commit:
 cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom
 FOM_Cocoon.java FOM_JavaScriptInterpreter.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

coliver     2003/07/06 00:09:19

  Modified:    src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom
                        FOM_Cocoon.java FOM_JavaScriptInterpreter.java
  Log:
  Setup logger
  
  Revision  Changes    Path
  1.9       +13 -7     cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
  
  Index: FOM_Cocoon.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FOM_Cocoon.java	2 Jul 2003 17:05:37 -0000	1.8
  +++ FOM_Cocoon.java	6 Jul 2003 07:09:18 -0000	1.9
  @@ -75,6 +75,7 @@
   import org.mozilla.javascript.Undefined;
   import org.mozilla.javascript.Wrapper;
   import org.mozilla.javascript.continuations.Continuation;
  +import org.apache.avalon.framework.logger.Logger;
   
   /**
    * Implementation of FOM (Flow Object Model).
  @@ -91,6 +92,7 @@
   
       private Environment environment;
       private ComponentManager componentManager;
  +    private Logger logger;
   
       private FOM_Request request;
       private FOM_Response response;
  @@ -117,10 +119,12 @@
   
       public void setup(FOM_JavaScriptInterpreter interp,
                         Environment env, 
  -                      ComponentManager manager) {
  +                      ComponentManager manager,
  +                      Logger logger) {
           this.interpreter = interp;
           this.environment = env;
           this.componentManager = manager;
  +        this.logger = logger;
       }
   
       public void invalidate() {
  @@ -128,6 +132,8 @@
           this.response = null;
           this.session = null;
           this.context = null;
  +        this.log = null;
  +        this.logger = null;
           this.componentManager = null;
           this.environment = null;
           this.interpreter = null;
  @@ -622,14 +628,14 @@
           public FOM_Log() {
           }
   
  +        public FOM_Log(Object logger) {
  +            this.logger = (Logger)unwrap(logger);
  +        }
  +
           public String getClassName() {
               return "FOM_Log";
           }
           
  -        public void enableLogging(Logger logger) {
  -            this.logger = logger;
  -        }
  -        
           public void jsFunction_debug(String message) {
               logger.debug(message);
           }
  @@ -698,7 +704,7 @@
           if (log != null) {
               return log;
           }
  -        log = new FOM_Log();
  +        log = new FOM_Log(logger);
           log.setParentScope(getParentScope());
           log.setPrototype(getClassPrototype(this, "FOM_Log"));
           return log;
  
  
  
  1.6       +3 -3      cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
  
  Index: FOM_JavaScriptInterpreter.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FOM_JavaScriptInterpreter.java	2 Jul 2003 17:05:37 -0000	1.5
  +++ FOM_JavaScriptInterpreter.java	6 Jul 2003 07:09:19 -0000	1.6
  @@ -364,7 +364,7 @@
                                              thrScope)).longValue();
           // We need to setup the FOM_Cocoon object according to the current
           // request. Everything else remains the same.
  -        cocoon.setup(this, environment, manager);
  +        cocoon.setup(this, environment, manager, getLogger());
   
           // Check if we need to compile and/or execute scripts
           synchronized (compiledScripts) {
  @@ -567,7 +567,7 @@
           Scriptable kScope = k.getParentScope();
           synchronized (kScope) {
               FOM_Cocoon cocoon = (FOM_Cocoon)kScope.get("cocoon", kScope);
  -            cocoon.setup(this, environment, manager);
  +            cocoon.setup(this, environment, manager, getLogger());
               if (enableDebugger) {
                   getDebugger().setVisible(true);
               }