boxlang compats

Author: lmajano

server-boxlang@1.json

@@ -0,0 +1,29 @@
+{
+    "app":{
+        "cfengine":"boxlang",
+        "serverHomeDirectory":".engine/boxlang"
+    },
+    "name":"coldbox-boxlang@1",
+    "force":true,
+    "openBrowser":false,
+    "web":{
+        "directoryBrowsing":true,
+        "http":{
+            "port":"8599"
+        },
+        "rewrites":{
+            "enable":true
+        },
+        "aliases":{
+            "/coldbox":"./"
+        }
+    },
+    "JVM":{
+        "heapSize":"1024"
+    },
+    "cfconfig":{
+        "file":".cfconfig.json"
+    },
+    "env":{
+    }
+}

system/core/util/CFMLEngine.cfc

@@ -9,6 +9,7 @@ component {
 	// setup the engine properties
 	this.ADOBE = "adobe";
 	this.LUCEE = "lucee";
+	this.BOXLANG = "boxlang";
 
 	// JDK Version
 	this.JDK_VERSION = createObject( "java", "java.lang.System" ).getProperty( "java.version" );
@@ -22,9 +23,9 @@ component {
 			adobe2018 : { invokeArray : false },
 			adobe2021 : { invokeArray : false },
 			adobe2023 : { invokeArray : false },
-			lucee     : { invokeArray : true }
+			lucee     	: { invokeArray : true },
+			boxlang 	: { invokeArray : true }
 		};
-		variables.productVersion = listFirst( server.coldfusion.productversion );
 
 		return this;
 	}
@@ -33,14 +34,21 @@ component {
 	 * Returns the current running CFML major version level
 	 */
 	numeric function getVersion(){
-		return variables.productVersion;
+		return listFirst( getFullVersion(), "." );
 	}
 
 	/**
 	 * Returns the current running CFML full version
 	 */
 	string function getFullVersion(){
-		return server.coldfusion.productversion;
+		switch( getEngine() ){
+			case this.adobe:
+				return server.coldfusion.productVersion;
+			case this.lucee:
+				return server.lucee.version;
+			case this.boxlang:
+				return server.boxlang.version;
+		}
 	}
 
 	/**
@@ -57,13 +65,26 @@ component {
 		return server.keyExists( "coldfusion" ) && server.coldfusion.productName.findNoCase( "ColdFusion" );
 	}
 
+	/**
+	 * Verify if this is a boxlang server
+	 */
+	boolean function isBoxLang(){
+		return server.keyExists( "boxlang" );
+	}
+
 	/**
 	 * Get the current CFML Engine name
 	 *
-	 * @return Either 'lucee' or 'adobe'
+	 * @return Either 'lucee' or 'adobe' or 'boxlang'
 	 */
 	string function getEngine(){
-		return ( isLucee() ? this.lucee : this.adobe );
+		if( isLucee() ){
+			return this.lucee;
+		}else if( isAdobe() ){
+			return this.adobe;
+		}else if( isBoxLang() ){
+			return this.boxlang;
+		}
 	}
 
 	/**
@@ -72,7 +93,8 @@ component {
 	 * @return lucee, adobe{version}
 	 */
 	string function getFeatureEngineSlug(){
-		return isLucee() ? this.lucee : this.adobe & getVersion();
+		var engine = getEngine();
+		return isAdobe() ? engine & getVersion() : engine;
 	}
 
 	/**

tests/specs/core/util/CFMLEngineTest.cfc

@@ -1,22 +1,19 @@
 component extends="coldbox.system.testing.BaseModelTest" {
 
 	function setup(){
-		cfmlengine = new coldbox.system.core.util.CFMLEngine();
+		target = new coldbox.system.core.util.CFMLEngine();
 	}
 
-	function testCFMLEngine(){
-		version = listFirst( server.coldfusion.productversion );
-		engine  = server.coldfusion.productname;
-
-		if ( findNoCase( "coldfusion", engine ) ) {
-			enginetype = "adobe";
-		} else if ( findNoCase( "lucee", engine ) ) {
-			enginetype = "lucee";
-		}
+	function testGetVersion(){
+		expect( target.getVersion() ).toBeNumeric();
+	}
 
-		assertTrue( len( cfmlengine.getEngine() ) gt 0, "Engine test" );
+	function testGetFullVersion(){
+		expect( target.getFullVersion() ).toBeString();
+	}
 
-		assertTrue( isNumeric( cfmlengine.getVersion() ), "Version Test" );
+	function testGetEngine(){
+		expect( target.getEngine() ).toBeString();
 	}
 
 }