Skip to content

Commit 784efa2

Browse files
committed
COLDBOX-1387
it's called engineMapping instead of an explicit cfmapping
1 parent b1f6881 commit 784efa2

File tree

13 files changed

+20
-20
lines changed

13 files changed

+20
-20
lines changed

system/modules/HTMLHelper/ModuleConfig.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ component {
88
// Model Namespace
99
this.modelNamespace = "HTMLHelper";
1010
// Engine Mapping
11-
this.mapping = "HTMLHelper";
11+
this.engineMapping = "HTMLHelper";
1212
// Auto-map models
1313
this.autoMapModels = true;
1414
// Helpers

system/web/services/ModuleService.cfc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
334334
autoProcessModels : false,
335335
// Does the module belong to a bundle or not
336336
bundle : arguments.bundle,
337-
// Engine mapping
338-
mapping : "",
337+
// Engine mapping for this module (ex: /myModule)
338+
engineMapping : "",
339339
// Child modules
340340
childModules : [],
341341
// Module Conventions
@@ -481,9 +481,9 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
481481
mConfig.schedulerPhysicalPath &= "/#mConfig.conventions.schedulerLocation.replace( ".", "/", "all" )#";
482482

483483
// Register Engine Mapping if it exists, for loading purposes
484-
if ( len( trim( mConfig.mapping ) ) ) {
485-
variables.util.addMapping( name: mConfig.mapping, path: mConfig.path );
486-
variables.mappingRegistry[ "/#mConfig.mapping#" ] = mConfig.path;
484+
if ( len( trim( mConfig.engineMapping ) ) ) {
485+
variables.util.addMapping( name: mConfig.engineMapping, path: mConfig.path );
486+
variables.mappingRegistry[ "/#mConfig.engineMapping#" ] = mConfig.path;
487487
}
488488

489489
// Register Custom Interception Points
@@ -1148,8 +1148,8 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
11481148
mConfig.version = results.config.version;
11491149
// engine mapping: cfmapping is deprecated but we check for it for backward compatibility
11501150
param results.config.cfmapping = "";
1151-
param results.config.mapping = "";
1152-
mConfig.mapping = len( results.config.mapping ) ? results.config.mapping : results.config.cfmapping;
1151+
param results.config.engineMapping = "";
1152+
mConfig.engineMapping = len( results.config.engineMapping ) ? results.config.engineMapping : results.config.cfmapping;
11531153
// Module Injector
11541154
param results.config.moduleInjector = false;
11551155
mConfig.moduleInjector = results.config.moduleInjector;

test-harness/modules_app/Inception/ModuleConfig.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ component {
1717
// Auto Map Models Directory
1818
this.autoMapModels = true;
1919
// Engine Mapping
20-
this.mapping = "";
20+
this.engineMapping = "";
2121

2222
function configure(){
2323
// parent settings

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ component {
1717
// Auto Map Models Directory
1818
this.autoMapModels = true;
1919
// Engine Mapping
20-
this.mapping = "";
20+
this.engineMapping = "";
2121
this.dependencies = [ "Inception" ];
2222

2323
function configure(){

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ component {
1717
// Auto Map Models Directory
1818
this.autoMapModels = true;
1919
// Engine Mapping
20-
this.mapping = "";
20+
this.engineMapping = "";
2121

2222
function configure(){
2323
// parent settings

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ this.viewParentLookup = (true) [boolean] (Optional) // If true, checks for v
99
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.
1010
this.entryPoint = "" (Optional) // If set, this is the default event (ex:forgebox:manager.index) or default route (/forgebox) the framework
1111
will use to create an entry link to the module. Similar to a default event.
12-
this.mapping = "The Engine Mapping to create";
12+
this.engineMapping = "The Engine Mapping to create";
1313
this.modelNamespace = "The namespace to use for registered models, if blank it uses the name of the module."
1414
this.dependencies = "The array of dependencies for this module"
1515
@@ -58,7 +58,7 @@ component {
5858
// Model Namespace
5959
this.modelNamespace = "api";
6060
// Engine Mapping
61-
this.mapping = "api";
61+
this.engineMapping = "api";
6262
// Auto-map models
6363
this.autoMapModels = true;
6464
// Module Dependencies

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ component {
1717
// Model Namespace
1818
this.modelNamespace = "v1";
1919
// Engine Mapping
20-
this.mapping = "v1";
20+
this.engineMapping = "v1";
2121
// Auto-map models
2222
this.autoMapModels = true;
2323
// Module Dependencies

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ component {
1717
// Auto Map Models Directory
1818
this.autoMapModels = true;
1919
// Engine Mapping
20-
this.mapping = "";
20+
this.engineMapping = "";
2121

2222
function configure(){
2323
// parent settings

test-harness/modules_app/disabledModule/ModuleConfig.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ component {
1717
// Auto Map Models Directory
1818
this.autoMapModels = true;
1919
// Engine Mapping
20-
this.mapping = "";
20+
this.engineMapping = "";
2121
// Disabled
2222
this.disabled = true;
2323

test-harness/modules_app/notActivatedModule/ModuleConfig.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ component {
1717
// Auto Map Models Directory
1818
this.autoMapModels = true;
1919
// Engine Mapping
20-
this.mapping = "";
20+
this.engineMapping = "";
2121
// Disabled
2222
this.disabled = false;
2323
// Activate the module

0 commit comments

Comments
 (0)