Executable embedding ok
This commit is contained in:
@@ -42,6 +42,12 @@ public class JettyBootstrap
|
||||
File warFile = new File(warLocation.toURI());
|
||||
System.setProperty("org.eclipse.jetty.livewar.LOCATION",warFile.toPath().toRealPath().toString());
|
||||
|
||||
// CB we want colorized output on linux
|
||||
if (System.getProperty("os.name").equalsIgnoreCase("linux"))
|
||||
{
|
||||
System.setProperty("org.eclipse.jetty.logging.appender.MESSAGE_ESCAPE", "false");
|
||||
}
|
||||
|
||||
Class<?> mainClass = Class.forName("org.jeudego.pairgoth.container.ServerMain",false,clWar);
|
||||
Method mainMethod = mainClass.getMethod("main",args.getClass());
|
||||
mainMethod.invoke(mainClass,new Object[] { args });
|
||||
|
@@ -102,7 +102,7 @@ class ApiServlet : HttpServlet() {
|
||||
}
|
||||
if (payload != null) {
|
||||
try {
|
||||
logger.logPayload(green(">> "), payload, false)
|
||||
logger.logPayload(">> ", payload, false)
|
||||
} catch (ioe: IOException) {
|
||||
}
|
||||
}
|
||||
|
@@ -55,7 +55,7 @@ class WebappManager : ServletContextListener, ServletContextAttributeListener, H
|
||||
context.setAttribute("manager", this)
|
||||
webappRoot = context.getRealPath("/")
|
||||
try {
|
||||
properties.load(context.getResourceAsStream("/WEB-INF/webapp.properties"))
|
||||
properties.load(context.getResourceAsStream("/WEB-INF/pairgoth.properties"))
|
||||
val submaps: MutableMap<String, MutableMap<String, String>> = HashMap()
|
||||
for (prop in properties.stringPropertyNames()) {
|
||||
val value = properties.getProperty(prop)
|
||||
|
Reference in New Issue
Block a user