Merge branch 'feature/finalizations-4-release' into development

ApplicationTemplates/Advanced/robots.txt

@@ -27,5 +27,6 @@ Disallow: /interceptors/
 Disallow: /layouts/
 Disallow: /logs/
 Disallow: /models/
+Disallow: /modules/
 Disallow: /views/
 Allow: /

ApplicationTemplates/AdvancedScript/robots.txt

@@ -27,5 +27,6 @@ Disallow: /interceptors/
 Disallow: /layouts/
 Disallow: /logs/
 Disallow: /models/
+Disallow: /modules/
 Disallow: /views/
 Allow: /

apidocs/Application.cfc

@@ -1,25 +1,8 @@
-<!-----------------------------------------------------------------------
-********************************************************************************
-Copyright 2005-2007 ColdBox Framework by Luis Majano and Ortus Solutions, Corp
-www.coldboxframework.com | www.luismajano.com | www.ortussolutions.com
-********************************************************************************
+component{
 
-Author     :	Luis Majano
-Date        :	10/16/2007
-Description :
-	This is the Application.cfc for usage withing the ColdBox Framework.
-	Make sure that it extends the coldbox object:
-	coldbox.system.coldbox
-
-	So if you have refactored your framework, make sure it extends coldbox.
------------------------------------------------------------------------>
-<cfcomponent output="false">
-
-	<cfscript>
-
-	this.name = "CBOX_APIDOCS" & hash(getCurrentTemplatePath());
+	this.name = "CBOX_APIDOCS" & hash( getCurrentTemplatePath() );
 	this.sessionManagement 	= true;
-	this.sessionTimeout 	= createTimeSpan(0,0,1,0);
+	this.sessionTimeout 	= createTimeSpan( 0, 0, 1, 0 );
 	this.setClientCookies 	= true;
 
 	// API Root
@@ -29,13 +12,14 @@ Description :
 
 	// Core Mappings
 	this.mappings[ "/colddoc" ]  = API_ROOT;
+
 	// Standlone mappings
-	this.mappings[ "/coldbox" ]  = ( structKeyExists( url, "coldbox_root" ) ? url.coldbox_root : COLDBOX_ROOT );
+	this.mappings[ "/coldbox" ]  = ( structKeyExists( url, "coldbox_root" )  ? url.coldbox_root  : COLDBOX_ROOT );
 	this.mappings[ "/cachebox" ] = ( structKeyExists( url, "cachebox_root" ) ? url.cachebox_root : COLDBOX_ROOT );
 	this.mappings[ "/logbox" ] 	 = ( structKeyExists( url, "logbox_root" )   ? url.logbox_root   : COLDBOX_ROOT );
 	this.mappings[ "/wirebox" ]  = ( structKeyExists( url, "wirebox_root" )  ? url.wirebox_root  : COLDBOX_ROOT );
 
-	this.mappings["/shared"] = expandPath("shared");
-	</cfscript>
+	// Shared mapping
+	this.mappings[ "/shared" ] = expandPath( "shared" );
 
-</cfcomponent>
+}

box-cachebox.json

@@ -1,6 +1,6 @@
 {
 	"name" 				: "CacheBox",
-	"version"			: "2.0.0-rc+@build.number@",
+	"version"			: "2.0.0+@build.number@",
 	"author" 			: "Ortus Solutions <info@ortussolutions.com>",
 	"slug"				: "cachebox",
 	"type"				: "caching",

box-logbox.json

@@ -1,6 +1,6 @@
 {
 	"name" 				: "LogBox Logging Library",
-	"version"			: "2.0.0-rc+@build.number@",
+	"version"			: "2.0.0+@build.number@",
 	"author" 			: "Ortus Solutions <info@ortussolutions.com>",
 	"slug"				: "logbox",
 	"type"				: "logging",

box-wirebox-cachebox.json

@@ -1,6 +1,6 @@
 {
 	"name" 				: "WireBox DI/AOP With CacheBox",
-	"version"			: "2.0.0-rc+@build.number@",
+	"version"			: "2.0.0+@build.number@",
 	"author" 			: "Ortus Solutions <info@ortussolutions.com>",
 	"slug"				: "wirebox-with-cachebox",
 	"type"				: "di",

box-wirebox.json

@@ -1,6 +1,6 @@
 {
 	"name" 				: "WireBox DI/AOP",
-	"version"			: "2.0.0-rc+@build.number@",
+	"version"			: "2.0.0+@build.number@",
 	"author" 			: "Ortus Solutions <info@ortussolutions.com>",
 	"slug"				: "wirebox",
 	"type"				: "di",

box.json

@@ -1,6 +1,6 @@
 {
 	"name" 				: "ColdBox Platform",
-	"version"			: "4.0.0-rc+@build.number@",
+	"version"			: "4.0.0+@build.number@",
 	"author" 			: "Ortus Solutions <info@ortussolutions.com>",
 	"slug"				: "coldbox",
 	"packageDirectory"	: "coldbox",

build/coldbox.xml

@@ -121,13 +121,15 @@
 		<mkdir dir="${dir.build}/apidocs"/>
 		<property name="dir.coldbox.exports"	value="${dir.exports}/${coldbox.slug}/${coldbox.version}" />
 		<property name="be.coldbox.exports" 	value="${be.exports}/${coldbox.slug}" />
+
 		<!-- Cleanup Old Code -->
 		<delete verbose="true" failonerror="false">
 			<fileset dir="${dir.coldbox.exports}" />
 			<fileset dir="${dir.exports}/${coldbox.slug}">
 				<include name="coldbox-be*" />
 			</fileset>
 		</delete>
+
 		<!-- Update Permissions -->
 		<antcall target="update.permissions" />
 
@@ -144,7 +146,7 @@
 		<!-- Move Install folder -->
 		<copy todir="${dir.build}/install" encoding="UTF-8">
         	<fileset dir="install">
-        		<exclude name="ColdboxCheatSheet.pages" />
+        		<exclude name="ColdboxCheatSheet.*" />
         	</fileset>
         </copy>
 
@@ -156,7 +158,7 @@
 		<!--Copy text files to install folder-->
 		<copy todir="${dir.build}" encoding="UTF-8">
 			<fileset file="license.txt" />
-			<fileset file="readme.txt" />						
+			<fileset file="readme.md" />						
 		</copy>
 
 		<!-- Copy box.json to build -->
@@ -178,7 +180,8 @@
 		<delete file="${dir.build}/colddoc.html" />
 
 		<!-- Zip API Docs -->
-		<zip destfile="${dir.coldbox.exports}/coldbox-apidocs-${coldbox.version}.zip" basedir="${dir.build}/apidocs"></zip>
+		<zip destfile="${dir.coldbox.exports}/coldbox-apidocs-${coldbox.version}.zip" basedir="${dir.build}/apidocs" />
+
 		<!-- Zip ColdBox Bundle -->
 		<zip destfile="${dir.coldbox.exports}/coldbox-${coldbox.version}.zip" basedir="${dir.build}" />
 
@@ -266,7 +269,7 @@
 		<!--Copy text files to root folder-->
 		<copy todir="${dir.build}" encoding="UTF-8">
 			<fileset file="license.txt" />
-			<fileset file="system/cache/readme.txt" />						
+			<fileset file="system/cache/readme.md" />						
 		</copy>
 
 		<!--Copy box.json to root -->
@@ -370,7 +373,7 @@
         <!--Copy text files to root folder-->
 		<copy todir="${dir.build}" encoding="UTF-8">
 			<fileset file="license.txt" />
-			<fileset file="system/logging/readme.txt" />						
+			<fileset file="system/logging/readme.md" />						
 		</copy>
 		<!--Copy box.json to root -->
 		<copy toFile="${dir.build}/box.json" file="box-logbox.json"  encoding="UTF-8"/>
@@ -481,7 +484,7 @@
 		<!--Copy text files to root folder-->
 		<copy todir="${dir.build}" encoding="UTF-8">
 			<fileset file="license.txt" />
-			<fileset file="system/ioc/readme.txt" />						
+			<fileset file="system/ioc/readme.md" />						
 		</copy>
 		<!--Copy box.json to root -->
 		<copy toFile="${dir.build}/box.json" file="box-wirebox-cachebox.json"  encoding="UTF-8"/>

readme.md

@@ -0,0 +1 @@
+```   ____     ____     _____       ______     ______      ____     __     __    / ___)   / __ \   (_   _)     (_  __ \   (_   _ \    / __ \   (_ \   / _)  / /      / /  \ \    | |         ) ) \ \    ) (_) )  / /  \ \    \ \_/ /   ( (      ( ()  () )   | |        ( (   ) )   \   _/  ( ()  () )    \   /    ( (      ( ()  () )   | |   __    ) )  ) )   /  _ \  ( ()  () )    / _ \     \ \___   \ \__/ /  __| |___) )  / /__/ /   _) (_) )  \ \__/ /   _/ / \ \_    \____)   \____/   \________/  (______/   (______/    \____/   (__/   \__) ```Copyright Since 2005 ColdBox Platform by Luis Majano and Ortus Solutions, Corpwww.coldbox.org | www.ortussolutions.com----Because of God's grace, this project exists. If you don't like this, then don't read it, its not for you.>"Therefore being justified by faith, we have peace with God through our Lord Jesus Christ:By whom also we have access by faith into this grace wherein we stand, and rejoice in hope of the glory of God.And not only so, but we glory in tribulations also: knowing that tribulation worketh patience;And patience, experience; and experience, hope:And hope maketh not ashamed; because the love of God is shed abroad in our hearts by the Holy Ghost which is given unto us. ." Romans 5:5----# Welcome to ColdBoxColdBox is a conventions modular MVC development platform for ColdFusion (CFML).## LicenseApache License, Version 2.0.>The ColdBox Websites, logo and content have a separate license and they are a separate entity.## VersioningColdBox is maintained under the Semantic Versioning guidelines as much as possible.Releases will be numbered with the following format:```<major>.<minor>.<patch>```And constructed with the following guidelines:* Breaking backward compatibility bumps the major (and resets the minor and patch)* New additions without breaking backward compatibility bumps the minor (and resets the patch)* Bug fixes and misc changes bumps the patch## Important LinksSource Code- https://github.com/coldbox/coldbox-platformContinuous Integration- http://jenkins.staging.ortussolutions.com/job/OS-ColdBoxPlatform%20BE/Bug Tracking/Agile Boards- https://ortussolutions.atlassian.net/browse/COLDBOX- https://ortussolutions.atlassian.net/browse/WIREBOX- https://ortussolutions.atlassian.net/browse/LOGBOX- https://ortussolutions.atlassian.net/browse/CACHEBOXDocumentation- http://coldbox.ortusbooks.com- http://wiki.coldbox.orgBlog- http://blog.coldbox.orgOfficial Site- http://www.coldbox.org## System Requirements- Railo 4+- ColdFusion 9.02+## Quick InstallationPlease go to our [documentation](http://coldbox.ortusbooks.com) for expanded instructions. **CommandBox (Recommended)**We recommend you use [CommandBox](http://www.ortussolutions.com/products/commandbox), our CFML CLI and package manager, to install ColdBox.**Stable Release**`box install coldbox`**Bleeding Edge Release**`box install coldbox-be`**Simple Install**Unzip the download into a folder called `coldbox` in your webroot or place outside of the webroot and create a per-application mapping `/coldbox` that points to it.**Bleeding Edge Downloads**You can always leverage our bleeding edge artifacts server to download ColdBox: http://integration.staging.ortussolutions.com/artifacts/ortussolutions/coldbox/--- ###THE DAILY BREAD > "I am the way, and the truth, and the life; no one comes to the Father, but by me (JESUS)" Jn 14:1-12