From 4236304e8425fe7784d6d439524219ef55e4bea3 Mon Sep 17 00:00:00 2001 From: hns Date: Tue, 24 Jun 2003 14:00:55 +0000 Subject: [PATCH] Moved extensions to separate directory. --- .../{ => extensions}/DatabaseObject.java | 4 +- .../rhino/{ => extensions}/FileObject.java | 2 +- .../rhino/{ => extensions}/FtpObject.java | 2 +- .../rhino/{ => extensions}/ImageObject.java | 2 +- .../rhino/{ => extensions}/MailObject.java | 2 +- .../rhino/{ => extensions}/XmlObject.java | 59 ++----------------- .../rhino/{ => extensions}/XmlRpcObject.java | 7 ++- 7 files changed, 16 insertions(+), 62 deletions(-) rename src/helma/scripting/rhino/{ => extensions}/DatabaseObject.java (99%) rename src/helma/scripting/rhino/{ => extensions}/FileObject.java (99%) rename src/helma/scripting/rhino/{ => extensions}/FtpObject.java (99%) rename src/helma/scripting/rhino/{ => extensions}/ImageObject.java (98%) rename src/helma/scripting/rhino/{ => extensions}/MailObject.java (99%) rename src/helma/scripting/rhino/{ => extensions}/XmlObject.java (61%) rename src/helma/scripting/rhino/{ => extensions}/XmlRpcObject.java (95%) diff --git a/src/helma/scripting/rhino/DatabaseObject.java b/src/helma/scripting/rhino/extensions/DatabaseObject.java similarity index 99% rename from src/helma/scripting/rhino/DatabaseObject.java rename to src/helma/scripting/rhino/extensions/DatabaseObject.java index 15810088..6f0e76c2 100644 --- a/src/helma/scripting/rhino/DatabaseObject.java +++ b/src/helma/scripting/rhino/extensions/DatabaseObject.java @@ -18,7 +18,7 @@ // Modified to use Helma database connections, Hannes Wallnöfer 2000-2003 -package helma.scripting.rhino; +package helma.scripting.rhino.extensions; import helma.framework.core.Application; import helma.objectmodel.db.DbSource; @@ -46,7 +46,7 @@ public class DatabaseObject { * @param dbsource The name of the DB source */ - DatabaseObject(DbSource dbsource, int flag) { + public DatabaseObject(DbSource dbsource, int flag) { try { connection = dbsource.getConnection (); driverName = dbsource.getDriverName (); diff --git a/src/helma/scripting/rhino/FileObject.java b/src/helma/scripting/rhino/extensions/FileObject.java similarity index 99% rename from src/helma/scripting/rhino/FileObject.java rename to src/helma/scripting/rhino/extensions/FileObject.java index ae40190d..207fbe30 100644 --- a/src/helma/scripting/rhino/FileObject.java +++ b/src/helma/scripting/rhino/extensions/FileObject.java @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package helma.scripting.rhino; +package helma.scripting.rhino.extensions; import java.io.BufferedReader; diff --git a/src/helma/scripting/rhino/FtpObject.java b/src/helma/scripting/rhino/extensions/FtpObject.java similarity index 99% rename from src/helma/scripting/rhino/FtpObject.java rename to src/helma/scripting/rhino/extensions/FtpObject.java index 2fbfbb7f..218f3800 100644 --- a/src/helma/scripting/rhino/FtpObject.java +++ b/src/helma/scripting/rhino/extensions/FtpObject.java @@ -14,7 +14,7 @@ * $Date$ */ -package helma.scripting.rhino; +package helma.scripting.rhino.extensions; import com.oroinc.net.ftp.*; import java.io.*; diff --git a/src/helma/scripting/rhino/ImageObject.java b/src/helma/scripting/rhino/extensions/ImageObject.java similarity index 98% rename from src/helma/scripting/rhino/ImageObject.java rename to src/helma/scripting/rhino/extensions/ImageObject.java index 4282c8af..658c3aed 100644 --- a/src/helma/scripting/rhino/ImageObject.java +++ b/src/helma/scripting/rhino/extensions/ImageObject.java @@ -14,7 +14,7 @@ * $Date$ */ -package helma.scripting.rhino; +package helma.scripting.rhino.extensions; import helma.image.*; import helma.util.*; diff --git a/src/helma/scripting/rhino/MailObject.java b/src/helma/scripting/rhino/extensions/MailObject.java similarity index 99% rename from src/helma/scripting/rhino/MailObject.java rename to src/helma/scripting/rhino/extensions/MailObject.java index 53daa5fc..5eed8f38 100644 --- a/src/helma/scripting/rhino/MailObject.java +++ b/src/helma/scripting/rhino/extensions/MailObject.java @@ -14,7 +14,7 @@ * $Date$ */ -package helma.scripting.rhino; +package helma.scripting.rhino.extensions; import helma.util.*; import org.mozilla.javascript.*; diff --git a/src/helma/scripting/rhino/XmlObject.java b/src/helma/scripting/rhino/extensions/XmlObject.java similarity index 61% rename from src/helma/scripting/rhino/XmlObject.java rename to src/helma/scripting/rhino/extensions/XmlObject.java index fec962fd..d27710b8 100644 --- a/src/helma/scripting/rhino/XmlObject.java +++ b/src/helma/scripting/rhino/extensions/XmlObject.java @@ -14,8 +14,9 @@ * $Date$ */ -package helma.scripting.rhino; +package helma.scripting.rhino.extensions; +import helma.scripting.rhino.*; import helma.framework.core.Application; import helma.framework.core.RequestEvaluator; import helma.objectmodel.INode; @@ -58,7 +59,7 @@ public class XmlObject { INode node = null; if (hopObject instanceof HopObject) { - node = ((HopObject) hopObject).node; + node = ((HopObject) hopObject).getNode(); } // we definitly need a node @@ -95,7 +96,7 @@ public class XmlObject { INode node = null; if (hopObject instanceof HopObject) { - node = ((HopObject) hopObject).node; + node = ((HopObject) hopObject).getNode(); } // we definitly need a node @@ -149,7 +150,7 @@ public class XmlObject { INode node = null; if (hopObject instanceof HopObject) { - node = ((HopObject) hopObject).node; + node = ((HopObject) hopObject).getNode(); } if (node == null) { @@ -202,7 +203,7 @@ public class XmlObject { INode node = null; if (hopObject instanceof HopObject) { - node = ((HopObject) hopObject).node; + node = ((HopObject) hopObject).getNode(); } if (node == null) { @@ -223,52 +224,4 @@ public class XmlObject { } } - /* class XmlGet extends BuiltinFunctionObject { - XmlGet(String name, Evaluator evaluator, FunctionPrototype fp) { - super(fp, evaluator, name, 1); - } - public ESValue callFunction(ESObject thisObject, ESValue[] arguments) throws EcmaScriptException { - if ( arguments==null || arguments.length==0 ) - throw new EcmaScriptException("Xml.get() needs a location as an argument"); - try { - XmlConverter converter; - if ( arguments.length>1 ) { - converter = new XmlConverter (arguments[1].toString()); - } else { - converter = new XmlConverter (); - } - INode node = new helma.objectmodel.db.Node ( (String)null, (String)null, this.evaluator.engine.getApplication().getWrappedNodeManager() ); - INode result = converter.convert (arguments[0].toString(),node); - return this.evaluator.engine.getNodeWrapper(result); - } catch ( NoClassDefFoundError e ) { - throw new EcmaScriptException("Can't load dom-capable xml parser."); - } catch ( RuntimeException f ) { - throw new EcmaScriptException(f.toString()); - } - } - } - class XmlGetFromString extends BuiltinFunctionObject { - XmlGetFromString(String name, Evaluator evaluator, FunctionPrototype fp) { - super(fp, evaluator, name, 1); - } - public ESValue callFunction(ESObject thisObject, ESValue[] arguments) throws EcmaScriptException { - if ( arguments==null || arguments.length==0 ) - throw new EcmaScriptException("Xml.getFromString() needs an XML string as parameter"); - try { - XmlConverter converter; - if ( arguments.length>1 ) { - converter = new XmlConverter (arguments[1].toString()); - } else { - converter = new XmlConverter (); - } - INode node = new helma.objectmodel.db.Node ( (String)null, (String)null, this.evaluator.engine.getApplication().getWrappedNodeManager() ); - INode result = converter.convertFromString (arguments[0].toString(),node); - return this.evaluator.engine.getNodeWrapper(result); - } catch ( NoClassDefFoundError e ) { - throw new EcmaScriptException("Can't load dom-capable xml parser."); - } catch ( RuntimeException f ) { - throw new EcmaScriptException(f.toString()); - } - } - } */ } diff --git a/src/helma/scripting/rhino/XmlRpcObject.java b/src/helma/scripting/rhino/extensions/XmlRpcObject.java similarity index 95% rename from src/helma/scripting/rhino/XmlRpcObject.java rename to src/helma/scripting/rhino/extensions/XmlRpcObject.java index 32e5a939..c8087511 100644 --- a/src/helma/scripting/rhino/XmlRpcObject.java +++ b/src/helma/scripting/rhino/extensions/XmlRpcObject.java @@ -14,8 +14,9 @@ * $Date$ */ -package helma.scripting.rhino; +package helma.scripting.rhino.extensions; +import helma.scripting.rhino.*; import org.mozilla.javascript.*; import org.apache.xmlrpc.*; import java.io.*; @@ -108,11 +109,11 @@ public class XmlRpcObject extends BaseFunction { } RhinoEngine engine = (RhinoEngine) cx.getThreadLocal("engine"); - RhinoCore c = engine.core; + RhinoCore c = engine.getCore(); Scriptable retval = null; try { - retval = Context.getCurrentContext().newObject(c.global); + retval = Context.getCurrentContext().newObject(c.getScope()); XmlRpcClient client = new XmlRpcClient(url); // long now = System.currentTimeMillis ();