Merge branch 'development'

Author: lmajano

.travis.yml

@@ -7,13 +7,13 @@ notifications:
 
 env:
   global:
-    - COLDBOX_VERSION=5.1.1
+    - COLDBOX_VERSION=5.1.2
   matrix:
     - ENGINE=lucee@4.5 ANT_TARGET=build.all
     - ENGINE=lucee@5 ANT_TARGET=run-tests
     - ENGINE=adobe@11	ANT_TARGET=run-tests
     - ENGINE=adobe@2016	ANT_TARGET=run-tests
-    #- ENGINE=@ortus/adobe-aether	COLDBOX_VERSION=5.0.0	ANT_TARGET=run-tests ENGINENAME=adobe-aether
+    #- ENGINE=adobe@2018	ANT_TARGET=run-tests
 
 branches:
   only:
@@ -33,15 +33,11 @@ addons:
 
 before_install:
   # CommandBox Keys
-  - sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
+  - curl -fsSl https://downloads.ortussolutions.com/debs/gpg | sudo apt-key add -
   - sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
     /etc/apt/sources.list.d/commandbox.list
 
 install:
-  # Install CommandBox
-  #- sudo bash -c "$(curl -fsSL https://commandbox.stg.ortushq.com/install.sh)" 4.0.0
-  # Make CommandBox usable by travis user so I don't have to change anything
-  #- sudo chmod 777 /usr/local/bin/box
   # Install Commandbox + Supporting Utilities
   - sudo apt-get update && sudo apt-get --assume-yes install commandbox haveged jq
   # Install dependencies

build/build.xml

@@ -10,9 +10,9 @@
 
 	<!-- UPDATE ON EACH VERSION CYCLE -->
 	<property name="groupID"				value="ortussolutions" />
-	
-	<property name="coldbox.version" 		value="5.1.1" />
-	<property name="coldbox.stableversion" 	value="5.1.0" />
+
+	<property name="coldbox.version" 		value="5.1.2" />
+	<property name="coldbox.stableversion" 	value="5.1.1" />
 
 	<property name="coldbox.slug"	 		value="coldbox"/>
 	<property name="cachebox.slug"	 		value="cachebox"/>

server-adobe-aether.json renamed to server-adobe@2018.json

@@ -1,8 +1,8 @@
 {
     "app":{
-        "cfengine":"@ortus/adobe-aether"
+        "cfengine":"adobe@2018"
     },
-    "name":"coldbox-adobe-aether",
+    "name":"coldbox-adobe@2018",
     "force":true,
     "openBrowser":false,
     "web":{

system/Bootstrap.cfc

@@ -134,6 +134,8 @@ component serializable="false" accessors="true"{
 						application.fwReinit = true;
 						// Verify if we are Reiniting?
 						if( structkeyExists( application, appKey ) AND application[ appKey ].getColdboxInitiated() AND needReinit ){
+							// Load Module CF Mappings so modules can unload properly
+							application[ appKey ].getModuleService().loadMappings();
 							// process preReinit interceptors
 							application[ appKey ].getInterceptorService().processState( "preReinit" );
 							// Shutdown the application services

system/FrameworkSupertype.cfc

@@ -68,15 +68,15 @@ component serializable="false" accessors="true"{
 		} else {
 			arguments.target = arguments.model;
 		}
-		
+
 		// json?
 		if( structKeyExists( arguments, "jsonstring" ) ){
 			return wirebox.getObjectPopulator().populateFromJSON( argumentCollection=arguments );
 		}
 		// XML
 		else if( structKeyExists( arguments, "xml" ) ){
 			return wirebox.getObjectPopulator().populateFromXML( argumentCollection=arguments );
-		} 
+		}
 		// Query
 		else if( structKeyExists( arguments, "qry" ) ){
 			return wirebox.getObjectPopulator().populateFromQuery( argumentCollection=arguments );
@@ -432,7 +432,7 @@ component serializable="false" accessors="true"{
 	* @asset The asset(s) to load, only js or css files. This can also be a comma delimmited list.
 	*/
 	string function addAsset( required asset ){
-		return getInstance( "coldbox.system.core.dynamic.HTMLHelper" ).addAsset( argumentCollection=arguments );
+		return getInstance( "@HTMLHelper" ).addAsset( argumentCollection=arguments );
 	}
 
 	/**
@@ -463,7 +463,7 @@ component serializable="false" accessors="true"{
 		} else if ( fileExists( UDFFullPath & ".cfm" ) ){
 			targetLocation = "#udflibrary#.cfm";
 		} else {
-			throw( 
+			throw(
 				message = "Error loading UDF library: #arguments.udflibrary#",
 				detail 	= "The UDF library was not found.  Please make sure you verify the file location.",
 				type 	= "FrameworkSupertype.UDFLibraryNotFoundException");

system/modules/HTMLHelper/ModuleConfig.cfc

@@ -0,0 +1,56 @@
+/**
+ * Module Config
+ */
+component {
+
+	// Module Properties
+	this.title 				= "HTML Helper";
+	// Model Namespace
+	this.modelNamespace		= "HTMLHelper";
+	// CF Mapping
+	this.cfmapping			= "HTMLHelper";
+	// Auto-map models
+	this.autoMapModels		= true;
+	// Module Dependencies
+	this.dependencies 		= [];
+
+	function configure(){
+		// module settings - stored in modules.name.settings
+		settings = {
+			// The base path of JS assets
+			js_path 		= "",
+			// The base path of CSS assets
+			css_path 		= "",
+			// Encode values on all dynamically generated tags in the HTML Helper
+			encodeValues	= false
+		};
+
+		// Custom Declared Points
+		interceptorSettings = {
+			customInterceptionPoints = ""
+		};
+
+		// Custom Declared Interceptors
+		interceptors = [
+		];
+
+		// Map HTML Helper to provide continuity from previous ColdBox apps
+		binder.map( "HTMLHelper@coldbox" )
+			.to( "#moduleMapping#.models.HTMLHelper" );
+
+	}
+
+	/**
+	* Fired when the module is registered and activated.
+	*/
+	function onLoad(){
+	}
+
+	/**
+	* Fired when the module is unregistered and unloaded
+	*/
+	function onUnload(){
+
+	}
+
+}