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

* Mount static directory at /app/static by default.

Browse source 
* Start applications in start() rather than in register()/bind() so we can rebind
  applications without restarting them.
This commit is contained in:
hns 2003-05-20 16:18:57 +00:00
parent 143abce688
commit e2bff453f6
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/helma/main/ApplicationManager.java
View file

@ -231,6 +231,14 @@ public class ApplicationManager implements XmlRpcHandler {
return mountpoint; return mountpoint;
} }
private String joinMountpoint(String prefix, String suffix) {
if (prefix.endsWith("/") || suffix.startsWith("/")) {
return prefix+suffix;
} else {
return prefix+"/"+suffix;
}
}
private String getPathPattern(String mountpoint) { private String getPathPattern(String mountpoint) {
if (!mountpoint.startsWith("/")) { if (!mountpoint.startsWith("/")) {
mountpoint = "/"+mountpoint; mountpoint = "/"+mountpoint;
@ -244,11 +252,7 @@ public class ApplicationManager implements XmlRpcHandler {
return mountpoint + "*"; return mountpoint + "*";
} }
if (!mountpoint.endsWith("*")) { return mountpoint + "/*";
return mountpoint + "/*";
}
return mountpoint;
} }
/** /**
@ -281,7 +285,7 @@ public class ApplicationManager implements XmlRpcHandler {
pathPattern = getPathPattern(mountpoint); pathPattern = getPathPattern(mountpoint);
staticDir = props.getProperty(name+".static"); staticDir = props.getProperty(name+".static");
staticMountpoint = getPathPattern(props.getProperty(name+".staticMountpoint", staticMountpoint = getPathPattern(props.getProperty(name+".staticMountpoint",
"/static")); joinMountpoint(mountpoint, "static")));
xmlrpcHandlerNames = StringUtils.split(props.getProperty(name+".xmlrpcHandler")); xmlrpcHandlerNames = StringUtils.split(props.getProperty(name+".xmlrpcHandler"));
cookieDomain = props.getProperty(name+".cookieDomain"); cookieDomain = props.getProperty(name+".cookieDomain");
uploadLimit = props.getProperty(name+".uploadLimit"); uploadLimit = props.getProperty(name+".uploadLimit");
@ -308,6 +312,7 @@ public class ApplicationManager implements XmlRpcHandler {
// the application is started later in the register method, when it's bound // the application is started later in the register method, when it's bound
app.init(); app.init();
app.start();
} catch (Exception x) { } catch (Exception x) {
Server.getLogger().log("Error creating application " + appName + ": " + x); Server.getLogger().log("Error creating application " + appName + ": " + x);
x.printStackTrace(); x.printStackTrace();
@ -402,7 +407,7 @@ public class ApplicationManager implements XmlRpcHandler {
// register as XML-RPC handler // register as XML-RPC handler
xmlrpcHandlers.put(app.getXmlRpcHandlerName(), app); xmlrpcHandlers.put(app.getXmlRpcHandlerName(), app);
app.start(); // app.start();
} catch (Exception x) { } catch (Exception x) {
Server.getLogger().log("Couldn't bind app: " + x); Server.getLogger().log("Couldn't bind app: " + x);
x.printStackTrace(); x.printStackTrace();
@ -439,8 +444,6 @@ public class ApplicationManager implements XmlRpcHandler {
// unregister as XML-RPC handler // unregister as XML-RPC handler
xmlrpcHandlers.remove(app.getXmlRpcHandlerName()); xmlrpcHandlers.remove(app.getXmlRpcHandlerName());
Server.getLogger().log("Unbound application " + appName);
} catch (Exception x) { } catch (Exception x) {
Server.getLogger().log("Couldn't unbind app: " + x); Server.getLogger().log("Couldn't unbind app: " + x);
} }