antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Add rootObjectFunctionName property that allows to define a function to get the app's root object.

Browse source
This commit is contained in:
hns 2008-12-18 13:57:31 +00:00
parent 4b2f195568
commit ca1aa7f02c
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/helma/framework/core/Application.java
View file

@ -73,6 +73,7 @@ public final class Application implements Runnable {
// if defined this will cause us to get the root object straight
// from the scripting engine, circumventing all hopobject db fluff
String rootObjectPropertyName;
String rootObjectFunctionName;
// The session manager
SessionManager sessionMgr;
@ -838,7 +839,7 @@ public final class Application implements Runnable {
/**
* This method returns the root object of this application's object tree.
*/
public Object getDataRoot(ScriptingEngine scriptingEngine) {
public Object getDataRoot(ScriptingEngine scriptingEngine) throws Exception {
// check if we have a custom root object class
if (rootObjectClass != null) {
// create custom root element.
@ -868,9 +869,13 @@ public final class Application implements Runnable {
} else if (rootObjectPropertyName != null) {
// get root object from a global scripting engine property
return scriptingEngine.getGlobalProperty(rootObjectPropertyName);
} else if (rootObjectFunctionName != null) {
// get root object from a global script engine function
return scriptingEngine.invoke(null, rootObjectFunctionName,
RequestEvaluator.EMPTY_ARGS, ScriptingEngine.ARGS_WRAP_DEFAULT, true);
} else {
// no custom root object is defined - use standard helma objectmodel
return nmgr.safe.getRootNode();
return nmgr.getRootNode();
}
}
@ -1827,6 +1832,7 @@ public final class Application implements Runnable {
hrefRootPrototype = props.getProperty("hrefrootprototype");
rootObjectPropertyName = props.getProperty("rootobjectpropertyname");
rootObjectFunctionName = props.getProperty("rootobjectfunctionname");
// update the XML-RPC access list, containting prototype.method
// entries of functions that may be called via XML-RPC