https://ortussolutions.atlassian.net/browse/COLDBOX-1387

Author: lmajano

system/core/util/Util.cfc

@@ -7,18 +7,18 @@ component {
 	 * SERVER/USER/CFML ENGINE HELPERS *
 	 ****************************************************************/
 
-	private function getEngineMappingHelper(){
+	private function getClassMappingHelper(){
 		// Lazy load the helper
-		if ( isNull( variables.engineMappingHelper ) ) {
+		if ( isNull( variables.classMappingHelper ) ) {
 			if ( server.keyExists( "boxlang" ) ) {
-				variables.engineMappingHelper = new BoxLangMappingHelper();
+				variables.classMappingHelper = new BoxLangMappingHelper();
 			} else if ( listFindNoCase( "Lucee", server.coldfusion.productname ) ) {
-				variables.engineMappingHelper = new LuceeMappingHelper();
+				variables.classMappingHelper = new LuceeMappingHelper();
 			} else {
-				variables.engineMappingHelper = new CFMappingHelper();
+				variables.classMappingHelper = new CFMappingHelper();
 			}
 		}
-		return variables.engineMappingHelper;
+		return variables.classMappingHelper;
 	}
 
 	/**
@@ -27,7 +27,7 @@ component {
 	 * @path The absolute path to the directory containing tags
 	 */
 	Util function addCustomTagPath( required path ){
-		getEngineMappingHelper().addCustomTagPath( arguments.path );
+		getClassMappingHelper().addCustomTagPath( arguments.path );
 		return this;
 	}
 
@@ -39,18 +39,18 @@ component {
 	 * @mappings A struct of mappings to incorporate instead of one-offs
 	 */
 	Util function addMapping( string name, string path, struct mappings ){
-		var engineMappingHelper = getEngineMappingHelper();
+		var classMappingHelper = getClassMappingHelper();
 
 		if ( !isNull( arguments.mappings ) ) {
-			engineMappingHelper.addMappings( arguments.mappings );
+			classMappingHelper.addMappings( arguments.mappings );
 		} else {
 			// Add / registration
 			if ( left( arguments.name, 1 ) != "/" ) {
 				arguments.name = "/#arguments.name#";
 			}
 
 			// Add mapping
-			engineMappingHelper.addMapping( arguments.name, arguments.path );
+			classMappingHelper.addMapping( arguments.name, arguments.path );
 		}
 
 		return this;

system/ioc/config/Mapping.cfc

@@ -485,7 +485,10 @@ component accessors="true" {
 	){
 		// check if already registered, if it is, just return
 		for ( var x = 1; x lte arrayLen( variables.DISetters ); x++ ) {
-			if ( variables.DISetters[ x ].name eq arguments.name ) {
+			if (
+				structKeyExists( variables.DISetters[ x ], "name" ) AND
+				variables.DISetters[ x ].name eq arguments.name
+			) {
 				return this;
 			}
 		}
@@ -1129,7 +1132,8 @@ component accessors="true" {
 		// Constructor Processing if found
 		if ( arguments.metadata.name eq variables.constructor ) {
 			// Process parameters for constructor injection
-			for ( var thisParam in arguments.metadata.parameters ) {
+			for ( var x = 1; x lte arrayLen( arguments.metadata.parameters ); x++ ) {
+				var thisParam = arguments.metadata.parameters[ x ];
 				// Check injection annotation, if not found then no injection
 				if ( hasAnnotationValue( thisParam, "inject" ) ) {
 					// ADD Constructor argument

system/modules/HTMLHelper/ModuleConfig.cfc

@@ -8,7 +8,7 @@ component {
 	// Model Namespace
 	this.modelNamespace    = "HTMLHelper";
 	// Engine Mapping
-	this.engineMapping     = "HTMLHelper";
+	this.classMapping     = "HTMLHelper";
 	// Auto-map models
 	this.autoMapModels     = true;
 	// Helpers

system/web/services/ModuleService.cfc

@@ -335,7 +335,7 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
 				// Does the module belong to a bundle or not
 				bundle            : arguments.bundle,
 				// Engine mapping for this module (ex: /myModule)
-				engineMapping     : "",
+				classMapping     : "",
 				// Child modules
 				childModules      : [],
 				// Module Conventions
@@ -481,9 +481,9 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
 			mConfig.schedulerPhysicalPath &= "/#mConfig.conventions.schedulerLocation.replace( ".", "/", "all" )#";
 
 			// Register Engine Mapping if it exists, for loading purposes
-			if ( len( trim( mConfig.engineMapping ) ) ) {
-				variables.util.addMapping( name: mConfig.engineMapping, path: mConfig.path );
-				variables.mappingRegistry[ "/#mConfig.engineMapping#" ] = mConfig.path;
+			if ( len( trim( mConfig.classMapping ) ) ) {
+				variables.util.addMapping( name: mConfig.classMapping, path: mConfig.path );
+				variables.mappingRegistry[ "/#mConfig.classMapping#" ] = mConfig.path;
 			}
 
 			// Register Custom Interception Points
@@ -698,7 +698,7 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
 
 				// Add as a mapped directory with module name as the namespace with correct mapping path
 				var packagePath = (
-					len( mConfig.engineMapping ) ? mConfig.engineMapping & ".#mConfig.conventions.modelsLocation#" : mConfig.modelsInvocationPath
+					len( mConfig.classMapping ) ? mConfig.classMapping & ".#mConfig.conventions.modelsLocation#" : mConfig.modelsInvocationPath
 				);
 
 				// Module Injector : Map with no namespace in the local injector
@@ -1148,8 +1148,8 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
 		mConfig.version                     = results.config.version;
 		// engine mapping: cfmapping is deprecated but we check for it for backward compatibility
 		param results.config.cfmapping      = "";
-		param results.config.engineMapping  = "";
-		mConfig.engineMapping               = len( results.config.engineMapping ) ? results.config.engineMapping : results.config.cfmapping;
+		param results.config.classMapping  = "";
+		mConfig.classMapping               = len( results.config.classMapping ) ? results.config.classMapping : results.config.cfmapping;
 		// Module Injector
 		param results.config.moduleInjector = false;
 		mConfig.moduleInjector              = results.config.moduleInjector;

test-harness/modules_app/Inception/ModuleConfig.cfc

@@ -17,7 +17,7 @@ component {
 	// Auto Map Models Directory
 	this.autoMapModels      = true;
 	// Engine Mapping
-	this.engineMapping          = "";
+	this.classMapping          = "";
 
 	function configure(){
 		// parent settings

test-harness/modules_app/Inception/modules/a-inception/ModuleConfig.cfc

@@ -17,7 +17,7 @@ component {
 	// Auto Map Models Directory
 	this.autoMapModels      = true;
 	// Engine Mapping
-	this.engineMapping          = "";
+	this.classMapping          = "";
 	this.dependencies       = [ "Inception" ];
 
 	function configure(){

test-harness/modules_app/Inception/modules/inception-mod1/ModuleConfig.cfc

@@ -17,7 +17,7 @@ component {
 	// Auto Map Models Directory
 	this.autoMapModels      = true;
 	// Engine Mapping
-	this.engineMapping          = "";
+	this.classMapping          = "";
 
 	function configure(){
 		// parent settings

test-harness/modules_app/Inception/modules_app/api/ModuleConfig.cfc

@@ -9,7 +9,7 @@ this.viewParentLookup     = (true) [boolean] (Optional) // If true, checks for v
 this.layoutParentLookup = (true) [boolean] (Optional) // If true, checks for layouts in the parent first, then it the module.If false, then modules first, then parent.
 this.entryPoint          		= "" (Optional) // If set, this is the default event (ex:forgebox:manager.index) or default route (/forgebox) the framework
 									       will use to create an entry link to the module. Similar to a default event.
-this.engineMapping     			= "The Engine Mapping to create";
+this.classMapping     			= "The Engine Mapping to create";
 this.modelNamespace		= "The namespace to use for registered models, if blank it uses the name of the module."
 this.dependencies   		= "The array of dependencies for this module"
 
@@ -58,7 +58,7 @@ component {
 	// Model Namespace
 	this.modelNamespace     = "api";
 	// Engine Mapping
-	this.engineMapping          = "api";
+	this.classMapping          = "api";
 	// Auto-map models
 	this.autoMapModels      = true;
 	// Module Dependencies

test-harness/modules_app/Inception/modules_app/api/modules_app/v1/ModuleConfig.cfc

@@ -17,7 +17,7 @@ component {
 	// Model Namespace
 	this.modelNamespace = "v1";
 	// Engine Mapping
-	this.engineMapping      = "v1";
+	this.classMapping      = "v1";
 	// Auto-map models
 	this.autoMapModels  = true;
 	// Module Dependencies

test-harness/modules_app/Inception/modules_app/inception-app1/ModuleConfig.cfc

@@ -17,7 +17,7 @@ component {
 	// Auto Map Models Directory
 	this.autoMapModels      = true;
 	// Engine Mapping
-	this.engineMapping          = "";
+	this.classMapping          = "";
 
 	function configure(){
 		// parent settings