add gateway functions

core/src/main/java/lucee/runtime/functions/gateway/GatewayAction.java

@@ -0,0 +1,25 @@
+package lucee.runtime.functions.gateway;
+
+import lucee.runtime.PageContext;
+import lucee.runtime.config.ConfigWebPro;
+import lucee.runtime.exp.FunctionException;
+import lucee.runtime.exp.PageException;
+import lucee.runtime.ext.function.Function;
+import lucee.runtime.gateway.GatewayEngineImpl;
+
+public final class GatewayAction implements Function {
+
+	private static final long serialVersionUID = -4801573283953497373L;
+
+	public static String call(PageContext pc, String gatewayID, String action) throws PageException {
+		GatewayEngineImpl g = ((GatewayEngineImpl) ((ConfigWebPro) pc.getConfig()).getGatewayEngine());
+
+		action = action.trim().toLowerCase();
+
+		if ("start".equals(action)) g.start(gatewayID);
+		else if ("stop".equals(action)) g.stop(gatewayID);
+		else if ("restart".equals(action)) g.restart(gatewayID);
+		else new FunctionException(pc, "GatewayAction", 2, "action", "invalid action [" + action + "], valid values are [start,stop,restart]");
+		return null;
+	}
+}

core/src/main/java/lucee/runtime/functions/gateway/GatewayState.java

@@ -0,0 +1,16 @@
+package lucee.runtime.functions.gateway;
+
+import lucee.runtime.PageContext;
+import lucee.runtime.config.ConfigWebPro;
+import lucee.runtime.exp.PageException;
+import lucee.runtime.ext.function.Function;
+import lucee.runtime.gateway.GatewayEngineImpl;
+import lucee.runtime.gateway.GatewayUtil;
+
+public final class GatewayState implements Function {
+
+	public static String call(PageContext pc, String gatewayID) throws PageException {
+		GatewayEngineImpl g = ((GatewayEngineImpl) ((ConfigWebPro) pc.getConfig()).getGatewayEngine());
+		return GatewayUtil.toState(g.getState(gatewayID), "UNDEFINED");
+	}
+}

core/src/main/java/lucee/runtime/gateway/GatewayUtil.java

@@ -58,4 +58,13 @@ public static int getState(GatewayEntry ge) { // this method only exists to make
 		return ge.getGateway().getState();
 	}
 
+	public static String toState(int state, String defaultValue) {
+		if (Gateway.FAILED == state) return "failed";
+		if (Gateway.RUNNING == state) return "running";
+		if (Gateway.STARTING == state) return "starting";
+		if (Gateway.STOPPED == state) return "stopped";
+		if (Gateway.STOPPING == state) return "stopping";
+		return defaultValue;
+	}
+
 }

core/src/main/java/lucee/runtime/listener/ModernApplicationContext.java

@@ -1829,8 +1829,8 @@ public JavaSettings getJavaSettings() {
 			getRPCClassLoader();
 		}
 		catch (IOException e) {
-			return ((ConfigPro) config).getJavaSettings();
 		}
+		if (javaSettings == null) return ((ConfigPro) config).getJavaSettings();
 		return javaSettings;
 	}
 

core/src/main/java/resource/fld/core-base.fld

@@ -12404,6 +12404,42 @@ You can find a list of all available timezones in the Lucee administrator (Setti
 			<type>string</type>
 		</return>
 	</function>
+		<!-- GatewayState -->
+	<function>
+		<name>GatewayState</name>
+		<class>lucee.runtime.functions.gateway.GatewayState</class>
+		<description>Return the current state for the given gateway id.</description>
+		<argument>
+			<name>gatewayID</name>
+			<type>string</type>
+			<required>Yes</required>
+		<description>Identifier of the gateway to get info for.</description>
+    </argument>
+		<return>
+			<type>string</type>
+		</return>
+	</function>
+		<!-- GatewayAction -->
+	<function>
+		<name>GatewayAction</name>
+		<class>lucee.runtime.functions.gateway.GatewayAction</class>
+		<description>Executes a specifc action for a gateway instance.</description>
+		<argument>
+			<name>gatewayID</name>
+			<type>string</type>
+			<required>Yes</required>
+		<description>Identifier of the gateway to do the action on.</description>
+    </argument>
+    		<argument>
+			<name>action</name>
+			<type>string</type>
+			<required>Yes</required>
+		<description>action to execute, possible values are [start,stop and restart]</description>
+    </argument>
+		<return>
+			<type>string</type>
+		</return>
+	</function>
 
 	<!-- serialize -->
 	<function>

loader/build.xml

@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.0.75-SNAPSHOT"/>
+  <property name="version" value="6.2.0.76-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

loader/pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.0.75-SNAPSHOT</version>
+  <version>6.2.0.76-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>