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

gotten rid of userroot.properties file, finally

Browse source
This commit is contained in:
hns 2001-02-08 20:56:42 +00:00
parent 0843826ed1
commit 223ed97251
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,22 +122,18 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, Runn
allThreads.addElement (ev); allThreads.addElement (ev);
} }
File urootp = new File (appDir, "userroot.properties");
SystemProperties p = new SystemProperties (urootp.getAbsolutePath ());
// if no userroot.properties, set values manually
if (!urootp.exists ()) {
p.put ("_subnodes", "user.id");
p.put ("_properties", "user.name");
}
new DbMapping (this, "userroot", p);
typemgr = new TypeManager (this); typemgr = new TypeManager (this);
typemgr.check (); typemgr.check ();
IServer.getLogger().log ("Started type manager for "+name); IServer.getLogger().log ("Started type manager for "+name);
rootMapping = getDbMapping ("root"); rootMapping = getDbMapping ("root");
userRootMapping = getDbMapping ("userroot");
userMapping = getDbMapping ("user"); userMapping = getDbMapping ("user");
SystemProperties p = new SystemProperties ();
String usernameField = userMapping.getNameField ();
if (usernameField == null)
usernameField = "name";
p.put ("_properties", "user."+usernameField);
userRootMapping = new DbMapping (this, "__userroot__", p);
rewireDbMappings (); rewireDbMappings ();
worker = new Thread (this, "Worker-"+name); worker = new Thread (this, "Worker-"+name);
@ -360,7 +356,7 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, Runn
INode users = getUserRoot (); INode users = getUserRoot ();
INode unode = users.getNode (uname, false); INode unode = users.getNode (uname, false);
String pw = unode.getString ("password", false); String pw = unode.getString ("password", false);
if (pw.equals (password)) { if (pw != null && pw.equals (password)) {
// give the user her piece of persistence // give the user her piece of persistence
u.setNode (unode); u.setNode (unode);
u.user.setNode (unode); u.user.setNode (unode);