Changeset 9115

Show
Ignore:
Timestamp:
06/13/08 14:39:10 (4 months ago)
Author:
matthias
Message:

* Added testing framework from Robert.
* Enabled ArticleController.prototype.foo_action ... declarations

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sandbox/aida/demo-app/main.js

    r9111 r9115  
    55// this is just for convinience while developing/debugging aida - i will remove this in the future 
    66global.shell = shell; 
    7 global.logger = logging.getLogger(__name__); 
     7 
     8logging.setConfig(getResource('config/log4j.properties').name); 
     9global.logger = logging.getLogger(); 
    810 
    911importFromModule("helma.file", "File"); 

  • sandbox/aida/modules/aida/controller.js

    r9112 r9115  
    1212   importModule("app.controllers." + name + "_controller"); 
    1313   var ctor = app.controllers[name + "_controller"][getClassNameFromName(name)]; 
     14   var proto = Object.clone(ctor.prototype); 
    1415   ctor.prototype = app.controllers[name + "_controller"]; 
     16   Object.extend(ctor.prototype, proto); 
    1517   ctor.prototype.__name__ = getClassNameFromName(name); 
    1618   var c = new ctor(req, res, session);