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

small changes to reflect moving SystemProperties to the

Browse source 
helma.util package and renaming helma.objectmodel.Node to
helma.objectmodel.TransientNode.
This commit is contained in:
hns 2001-08-20 14:40:30 +00:00
parent 062b3a4e5f
commit f3b05ef897
6 changed files with 16 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,8 +9,7 @@ import java.rmi.*;
import java.rmi.server.*; import java.rmi.server.*;
import helma.framework.*; import helma.framework.*;
import helma.objectmodel.*; import helma.objectmodel.*;
import helma.objectmodel.db.NodeManager; import helma.objectmodel.db.*;
import helma.objectmodel.db.WrappedNodeManager;
import helma.xmlrpc.*; import helma.xmlrpc.*;
import helma.util.*; import helma.util.*;
import FESI.Data.*; import FESI.Data.*;
@ -153,7 +152,7 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
dbMappings = new Hashtable (); dbMappings = new Hashtable ();
dbSources = new Hashtable (); dbSources = new Hashtable ();
appnode = new Node ("app"); appnode = new TransientNode ("app");
xmlrpc = IServer.getXmlRpcServer (); xmlrpc = IServer.getXmlRpcServer ();
xmlrpcAccess = new XmlRpcAccess (this); xmlrpcAccess = new XmlRpcAccess (this);
} }

8
src/helma/framework/core/ESNode.java
View file

@ -5,7 +5,7 @@
package helma.framework.core; package helma.framework.core;
import helma.objectmodel.*; import helma.objectmodel.*;
import helma.objectmodel.db.NodeHandle; import helma.objectmodel.db.*;
import helma.util.*; import helma.util.*;
import FESI.Interpreter.*; import FESI.Interpreter.*;
import FESI.Exceptions.*; import FESI.Exceptions.*;
@ -52,13 +52,13 @@ public class ESNode extends ObjectPrototype {
// eval.app.logEvent ("in ESNode constructor: "+o.getClass ()); // eval.app.logEvent ("in ESNode constructor: "+o.getClass ());
this.eval = eval; this.eval = eval;
if (obj == null) if (obj == null)
node = new Node (null); node = new TransientNode (null);
else if (obj instanceof ESWrapper) else if (obj instanceof ESWrapper)
node = (INode) ((ESWrapper) obj).getJavaObject (); node = (INode) ((ESWrapper) obj).getJavaObject ();
else if (obj instanceof INode) else if (obj instanceof INode)
node = (INode) obj; node = (INode) obj;
else else
node = new Node (obj.toString ()); node = new TransientNode (obj.toString ());
// set node handle to wrapped node // set node handle to wrapped node
if (node instanceof helma.objectmodel.db.Node) if (node instanceof helma.objectmodel.db.Node)
handle = ((helma.objectmodel.db.Node) node).getHandle (); handle = ((helma.objectmodel.db.Node) node).getHandle ();
@ -384,7 +384,7 @@ public class ESNode extends ObjectPrototype {
if ("__hash__".equals (propertyName)) if ("__hash__".equals (propertyName))
return new ESString (""+node.hashCode ()); return new ESString (""+node.hashCode ());
if ("__node__".equals (propertyName)) if ("__node__".equals (propertyName))
return ESLoader.normalizeObject (node, evaluator); return new ESWrapper (node, evaluator);
return ESNull.theNull; return ESNull.theNull;
} }

190
src/helma/framework/core/RequestEvaluator.java
View file

@ -9,7 +9,7 @@ import java.util.Enumeration;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.io.*; import java.io.*;
import helma.objectmodel.*; import helma.objectmodel.*;
import helma.objectmodel.db.Transactor; import helma.objectmodel.db.*;
import helma.framework.*; import helma.framework.*;
import helma.framework.extensions.*; import helma.framework.extensions.*;
import helma.xmlrpc.fesi.*; import helma.xmlrpc.fesi.*;
@ -111,7 +111,7 @@ public class RequestEvaluator implements Runnable {
dbx.setApplication (this.app); dbx.setApplication (this.app);
// fake a cache member like the one found in ESNodes // fake a cache member like the one found in ESNodes
global.putHiddenProperty ("cache", new ESNode (new Node ("cache"), this)); global.putHiddenProperty ("cache", new ESNode (new TransientNode ("cache"), this));
global.putHiddenProperty ("undefined", ESUndefined.theUndefined); global.putHiddenProperty ("undefined", ESUndefined.theUndefined);
appnode = new ESAppNode (app.appnode, this); appnode = new ESAppNode (app.appnode, this);
global.putHiddenProperty ("app", appnode); global.putHiddenProperty ("app", appnode);
@ -529,6 +529,8 @@ public class RequestEvaluator implements Runnable {
if (msg == null || msg.length () == 0) if (msg == null || msg.length () == 0)
msg = wrong.toString (); msg = wrong.toString ();
app.logEvent ("Error executing "+funcdesc+": "+msg); app.logEvent ("Error executing "+funcdesc+": "+msg);
if (app.debug)
wrong.printStackTrace ();
this.exception = new Exception (msg); this.exception = new Exception (msg);
} }
break; break;
@ -918,187 +920,3 @@ public class RequestEvaluator implements Runnable {
} }

2
src/helma/framework/core/Skin.java
View file

@ -135,7 +135,7 @@ public class Skin {
if (escape) if (escape)
b.append (cnt[i]); b.append (cnt[i]);
escape = !escape; escape = !escape;
break;; break;
case '"': case '"':
case '\'': case '\'':
if (!escape && state == PARAMVALUE) { if (!escape && state == PARAMVALUE) {

6
src/helma/framework/core/User.java
View file

@ -7,7 +7,7 @@ import java.io.*;
import java.util.*; import java.util.*;
import java.net.URLEncoder; import java.net.URLEncoder;
import helma.objectmodel.*; import helma.objectmodel.*;
import helma.objectmodel.db.NodeHandle; import helma.objectmodel.db.*;
/** /**
* This represents a user who is currently using the Hop application. This does * This represents a user who is currently using the Hop application. This does
@ -24,7 +24,7 @@ public class User implements Serializable {
NodeHandle nhandle; NodeHandle nhandle;
DbMapping umap; DbMapping umap;
long onSince, lastTouched; long onSince, lastTouched;
Node cache; TransientNode cache;
String message; String message;
public User (String sid, Application app) { public User (String sid, Application app) {
@ -33,7 +33,7 @@ public class User implements Serializable {
this.app = app; this.app = app;
setNode (null); setNode (null);
umap = app.getDbMapping ("user"); umap = app.getDbMapping ("user");
cache = new Node ("[session cache]"); cache = new TransientNode ("[session cache]");
cache.setPrototype ("user"); cache.setPrototype ("user");
cache.setDbMapping (umap); cache.setDbMapping (umap);
sessionID = sid; sessionID = sid;

4
src/helma/framework/core/ZippedAppFile.java
View file

@ -8,8 +8,8 @@ import java.util.zip.*;
import java.io.*; import java.io.*;
import helma.framework.*; import helma.framework.*;
import helma.util.Updatable; import helma.util.Updatable;
import helma.objectmodel.SystemProperties; import helma.util.SystemProperties;
import helma.objectmodel.DbMapping; import helma.objectmodel.db.DbMapping;
/** /**
* This represents a Zip-File which may contain other Updatables for one or more prototypes. * This represents a Zip-File which may contain other Updatables for one or more prototypes.