Merge remote-tracking branch 'upstream/development' into development

.gitignore

@@ -10,13 +10,9 @@ settings.xml
 /bower_components
 /node_modules/*
 /node_modules
-test/results/*.properties
-test/results/*.html
-test/results/*.log
-tests/results
-modules/cbjavaloader
-modules/cbi18n
+tests/results/*
 workbench/build.number
+build/*
 modules/*
 !modules/relax
 modules/relax/includes/js/build.txt

.travis.yml

@@ -0,0 +1,22 @@
+language: java
+notifications:
+  slack:
+    secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=
+branches:
+  only:
+  - development
+sudo: required
+dist: trusty
+before_install:
+- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
+- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
+  /etc/apt/sources.list.d/commandbox.list
+install:
+- sudo apt-get update && sudo apt-get --assume-yes install commandbox
+- box install
+- box server start
+before_script:
+# Startup the app
+- curl http://localhost:49616/
+script:
+  - ant -f workbench/build.xml

Application.cfc

@@ -1,8 +1,7 @@
 /**
-********************************************************************************
-Copyright 2005-2007 ColdBox Framework by Luis Majano and Ortus Solutions, Corp
-www.coldboxframework.com | www.luismajano.com | www.ortussolutions.com
-********************************************************************************
+* Copyright Ortus Solutions, Corp, All rights reserved
+* www.ortussolutions.com
+* ---
 */
 component{
 	// Application properties

apidocs/Application.cfc

@@ -1,19 +1,17 @@
 component{
 
-	this.name = "colddoc_" & hash(getCurrentTemplatePath());
+	this.name = "APIDocs" & hash(getCurrentTemplatePath());
 	this.sessionManagement = true;
 	this.sessionTimeout = createTimeSpan(0,0,1,0);
 
-	// mappings
-	this.mappings[ "/colddoc" ] = getDirectoryFromPath( getCurrentTemplatePath() );
+	// API Root
+	API_ROOT = getDirectoryFromPath( getCurrentTemplatePath() );
+	rootPath = REReplaceNoCase( API_ROOT, "apidocs(\\|\/)$", "" );
 
-	rootPath = REReplaceNoCase( this.mappings[ "/colddoc" ], "apidocs(\\|\/)$", "" );
-	this.mappings[ "/root" ] 	= rootPath;
-	this.mappings[ "/relax" ] 	= rootPath & "modules/relax/models";
+	request.moduleName = "relax";
 
-	// request start
-	public boolean function onRequestStart(String targetPage){
-		return true;
-	}
+	this.mappings[ "/docbox" ]  				= API_ROOT & "docbox";
+	this.mappings[ "/root" ] 					= rootPath;
+	this.mappings[ "/#request.moduleName#" ] 	= rootPath & "modules/#request.moduleName#/models";
 
 }