COLDBOX-1361 #resolve

Routing service was not evaluating the coldbox web mapping when public facing app is in another folder than the coldbox app

Author: lmajano

system/web/routing/Router.cfc

@@ -22,16 +22,21 @@ component
 	 ****************************************************************/
 
 	property
-		name    ="cachebox"  
+		name    ="cachebox"
 		inject  ="cachebox"
 		delegate="getCache";
+
 	property
 		name    ="controller"
-		inject  ="coldbox" 
+		inject  ="coldbox"
 		delegate="relocate,runEvent,runRoute";
+
 	property name="flash"  inject="coldbox:flash";
+
 	property name="logBox" inject="logbox";
+
 	property name="log"    inject="logbox:logger:{this}";
+
 	property
 		name    ="wirebox"
 		inject  ="wirebox"
@@ -101,15 +106,6 @@ component
 	 */
 	property name="baseURL" type="string";
 
-	/**
-	 * This flag denotes if full URL rewrites are enabled or not. Meaning if the `index` is in the path of the rewriter or not.
-	 * The default value is **false**.
-	 */
-	property
-		name   ="fullRewrites"
-		type   ="boolean"
-		default="false";
-
 	/**
 	 * This flag denotes that the routing service will discover the incoming base URL from the host + ssl + environment.
 	 * If off, then it will use whatever the base URL was set in the router.
@@ -174,8 +170,7 @@ component
 		variables.validExtensions         = variables.VALID_EXTENSIONS;
 		// Initialize the base URL as empty in case the user overrides it in their own router.
 		variables.baseUrl                 = "";
-		// Are full rewrites enabled
-		variables.fullRewrites            = false;
+		// Multi domain discovery on by default
 		variables.multiDomainDiscovery    = true;
 
 		return this;
@@ -201,11 +196,6 @@ component
 			variables.baseUrl = composeRoutingUrl();
 		}
 
-		// Check if rewrites turned off. If so, append the `index` to it.
-		if ( !variables.fullRewrites AND !findNoCase( frontController, variables.baseURL ) ) {
-			variables.baseURL &= "/#frontController#";
-		}
-
 		// Remove any double slashes: sometimes proxies can interfere
 		variables.baseURL = reReplace( variables.baseURL, "\/\/$", "/", "all" );
 
@@ -1964,9 +1954,7 @@ component
 	 * Composes the base routing path with no host or protocol
 	 */
 	string function composeRoutingPath(){
-		var base = findNoCase( ".bx", cgi.script_name ) ? "index.bxm" : "index.cfm";
-		return variables.controller.getSetting( "RoutingAppMapping" ) & // routing app mapping
-		( variables.fullRewrites ? "" : base ); // full or controller routing
+		return variables.controller.getSetting( "RoutingAppMapping" );
 	}
 
 	/*****************************************************************************************/

system/web/services/RoutingService.cfc

@@ -39,17 +39,26 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
 		variables.requestService               = controller.getRequestService();
 		variables.wirebox                      = controller.getWireBox();
 
-		// Routing AppMapping Determinations
+		// Routing AppMapping Determinations according to where the ColdBox app and the Web assets are located.
 		variables.appMapping        = controller.getSetting( "AppMapping" );
-		variables.routingAppMapping = ( len( variables.appMapping ) ? variables.appMapping & "/" : "" );
+		variables.webMapping 	  = controller.getSetting( "WebMapping" );
+
+		// Determine the routing app mapping
+		// This is determined by the following process:
+		// - If the web mapping is empty, then the app mapping is used
+		// - If the web mapping is not empty, then it is used instead
+		if ( len( variables.webMapping ) ) {
+			variables.routingAppMapping = variables.webMapping;
+		} else {
+			variables.routingAppMapping = ( len( variables.appMapping ) ? variables.appMapping & "/" : "" );
+		}
 		// Make sure it's prefixed with /
 		variables.routingAppMapping = left( variables.routingAppMapping, 1 ) == "/" ? variables.routingAppMapping : "/#variables.routingAppMapping#";
-
 		// Store routing appmapping
 		controller.setSetting( "routingAppMapping", variables.routingAppMapping );
 
 		// Register as an interceptor to listen to pre processes for routing
-		variables.controller.getInterceptorService().registerInterceptor( interceptorObject = this );
+		variables.controller.getInterceptorService().registerInterceptor( interceptorObject : this );
 
 		// Load the Application Router
 		loadRouter();

test-harness/config/Router.cfc

@@ -1,8 +1,6 @@
 component {
 
 	function configure(){
-		// setFullRewrites( false );
-
 		route( "/bar" ).toModuleRouting( "resourcesTest" );
 
 		// Nested Resources

tests/suites/loadtests/beload/config/Router.cfc

@@ -1,9 +1,6 @@
 component {
 
 	function configure() {
-		// Set Full Rewrites
-		setFullRewrites( true );
-
 		/**
 		 * --------------------------------------------------------------------------
 		 * App Routes