Merge branch 'development'

Author: lmajano

.cfconfig.json

@@ -1,4 +1,7 @@
 {
+	"systemErr":"System",
+    "systemOut":"System",
+	"adminPassword" : "coldbox",
     "caches": {
         "default": {
             "storage": "false",
@@ -26,5 +29,6 @@
     },
     "debuggingEnabled": false,
     "ajaxDebugWindowEnabled": false,
-    "debuggingReportExecutionTimes": false
+    "debuggingReportExecutionTimes": false,
+    "maxCFThreads":100
 }

.cfformat.json

@@ -1,29 +1,62 @@
 {
-    "brackets.padding": true,
-	"strings.quote": "double",
-	"strings.attributes.quote": "double",
+	"array.empty_padding": false,
+	"array.padding": true,
+	"array.multiline.min_length": 50,
+	"array.multiline.element_count": 2,
+	"array.multiline.leading_comma.padding": true,
+	"array.multiline.leading_comma": false,
+	"alignment.consecutive.assignments": true,
+	"alignment.consecutive.properties": true,
+	"alignment.consecutive.params": true,
+	"brackets.padding": true,
+	"comment.asterisks": "align",
+	"binary_operators.padding": true,
+	"for_loop_semicolons.padding": true,
 	"function_call.empty_padding": false,
-    "function_call.padding": true,
-	"function_declaration.padding": true,
+	"function_call.padding": true,
 	"function_call.multiline.leading_comma.padding": true,
-	"function_declaration.multiline.leading_comma.padding" : true,
+	"function_call.casing.builtin": "cfdocs",
+	"function_call.casing.userdefined": "camel",
+	"function_call.multiline.element_count": 3,
+	"function_call.multiline.leading_comma": false,
+	"function_call.multiline.min_length": 50,
+	"function_declaration.padding": true,
 	"function_declaration.empty_padding": false,
+	"function_declaration.multiline.leading_comma": false,
+	"function_declaration.multiline.leading_comma.padding": true,
+	"function_declaration.multiline.element_count": 3,
+	"function_declaration.multiline.min_length": 50,
 	"function_declaration.group_to_block_spacing": "compact",
+	"function_anonymous.empty_padding": false,
+	"function_anonymous.group_to_block_spacing": "compact",
+	"function_anonymous.multiline.element_count": 3,
+	"function_anonymous.multiline.leading_comma": false,
+	"function_anonymous.multiline.leading_comma.padding": true,
+	"function_anonymous.multiline.min_length": 50,
+	"function_anonymous.padding": true,
+	"indent_size": 4,
+	"keywords.block_to_keyword_spacing": "spaced",
+	"keywords.group_to_block_spacing": "spaced",
+	"keywords.padding_inside_group": true,
+	"keywords.spacing_to_block": "spaced",
+	"keywords.spacing_to_group": true,
+	"keywords.empty_group_spacing": false,
+	"max_columns": 100,
+	"metadata.multiline.element_count": 3,
+	"metadata.multiline.min_length": 50,
+	"method_call.chain.multiline" : 3,
+	"newline":"\n",
+	"property.multiline.element_count": 3,
+	"property.multiline.min_length": 30,
+	"parentheses.padding": true,
+	"strings.quote": "double",
+	"strings.attributes.quote": "double",
+	"struct.separator": " : ",
 	"struct.padding": true,
 	"struct.empty_padding": false,
-	"struct.multiline.leading_comma.padding" : true,
-	"array.empty_padding":false,
-    "array.padding":true,
-    "array.multiline.leading_comma.padding":true,
-    "binary_operators.padding":true,
-    "for_loop_semicolons.padding":true,
-    "indent_size":4,
-    "parentheses.padding":true,
-    "struct.separator":" : ",
-	"tab_indent":true,
-	"keywords.block_to_keyword_spacing" : "spaced",
-	"keywords.group_to_block_spacing" : "spaced",
-	"keywords.padding_inside_group" : true,
-	"keywords.spacing_to_block" : "compact",
-	"keywords.spacing_to_group" : true
+	"struct.multiline.leading_comma": false,
+	"struct.multiline.leading_comma.padding": true,
+	"struct.multiline.element_count": 2,
+	"struct.multiline.min_length": 60,
+	"tab_indent": true
 }

.gitignore

@@ -31,6 +31,7 @@ apidocs/docbox/*
 ApplicationTemplates/*
 tests/suites/loadtests/logs
 test-harness/**/route-visualizer
+system/exceptions/node_modules/**
 
 # Custom Settings
 test-harness/config/runtime.properties.cfm

.markdownlint.json

@@ -0,0 +1,14 @@
+{
+	"line-length": false,
+	"single-h1": false,
+	"no-hard-tabs" : false,
+	"fenced-code-language" : false,
+	"no-bare-urls" : false,
+	"first-line-h1": false,
+	"no-multiple-blanks": {
+		"maximum": 2
+	},
+	"no-duplicate-header" : {
+		"siblings_only" : true
+	}
+}

.travis.yml

@@ -1,4 +1,5 @@
 language: java
+os: "linux"
 group: deprecated-2017Q2
 
 notifications:
@@ -8,13 +9,12 @@ notifications:
 env:
   global:
     # TARGET RELEASE VERSION: BUMP AS NEEDED
-    - COLDBOX_VERSION=5.6.2
+    - COLDBOX_VERSION=6.0.0
+    - COLDBOX_PRERELEASE=false
   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=adobe@2018	ANT_TARGET=run-tests
+    - ENGINE=lucee@5 # Build Entire Frameworks
+    - ENGINE=adobe@2016	ANT_TARGET=run-tests #just run tests
+    - ENGINE=adobe@2018	ANT_TARGET=run-tests #just run tests
 
 branches:
   only:
@@ -23,8 +23,6 @@ branches:
 
 dist: trusty
 
-sudo: required
-
 addons:
   apt:
     packages:
@@ -47,6 +45,8 @@ install:
   - box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
 
 before_script:
+  # Set Travis Tag
+  - TRAVIS_TAG=${COLDBOX_VERSION}
   # create test database
   - mysql -u root -e 'create database coolblog;'
   # import database
@@ -61,7 +61,8 @@ before_script:
 
 script:
   # Execute build via ANT
-  - ant -Dcoldbox.version=$COLDBOX_VERSION -DisTravis=true -Dbuild.branch=$TRAVIS_BRANCH -Dbuild.number=$TRAVIS_BUILD_NUMBER -f build/build.xml $ANT_TARGET
+  - ant -DisPreRelease=${COLDBOX_PRERELEASE} -Dcoldbox.version=$COLDBOX_VERSION -DisTravis=true -Dbuild.branch=$TRAVIS_BRANCH -Dbuild.number=$TRAVIS_BUILD_NUMBER -f build/build.xml $ANT_TARGET
+  #- ls -l $TRAVIS_BUILD_DIR
 
 after_failure:
   - cd $TRAVIS_BUILD_DIR
@@ -71,7 +72,7 @@ after_failure:
   # Spit out our Commandbox log in case we need to debug
   - box server log name=$ENGINE
   - cat `box system-log`
-  - ls -l $TRAVIS_BUILD_DIR/apidocs
+  - ls -lr $TRAVIS_BUILD_DIR
 
 deploy:
   # Binary Deployments
@@ -80,22 +81,23 @@ deploy:
       branch:
         - master
         - development
-      condition: "$ENGINE = lucee@4.5"
+      condition: "$ENGINE = lucee@5"
     skip_cleanup: true
     #AWS Credentials need to be set in Travis
     access_key_id: $AWS_ACCESS_KEY
     secret_access_key: $AWS_ACCESS_SECRET
     bucket: "downloads.ortussolutions.com"
-    local-dir: artifacts
+    local-dir: $TRAVIS_BUILD_DIR/artifacts
     upload-dir: ortussolutions
     acl: public_read
+
   # API Docs Deployment
   - provider: s3
     on:
       branch:
         - master
         - development
-      condition: "$ENGINE = lucee@4.5"
+      condition: "$ENGINE = lucee@5"
     skip_cleanup: true
     #AWS Credentials need to be set in Travis
     access_key_id: $AWS_ACCESS_KEY
@@ -104,6 +106,39 @@ deploy:
     local-dir: $TRAVIS_BUILD_DIR/build-coldbox/apidocs
     acl: public_read
 
+  # Github Release only on Master
+  - provider: releases
+    token: ${GITHUB_TOKEN}
+    on:
+      branch:
+        - master
+      condition: "$ENGINE = lucee@5"
+    skip_cleanup: true
+    edge: true
+    file_glob: true
+    file: $TRAVIS_BUILD_DIR/artifacts/**/*
+    release_notes_file: $TRAVIS_BUILD_DIR/changelog.md
+    name: v${TRAVIS_TAG}
+    tag_name: v${TRAVIS_TAG}
+    overwrite: true
+
+  # Github Pre-Releases
+  - provider: releases
+    token: ${GITHUB_TOKEN}
+    on:
+      branch:
+        - development
+      condition: "$ENGINE = lucee@5 && $COLDBOX_PRERELEASE = true"
+    skip_cleanup: true
+    edge: true
+    file_glob: true
+    file: $TRAVIS_BUILD_DIR/artifacts/**/*
+    release_notes_file: $TRAVIS_BUILD_DIR/changelog.md
+    name: v${COLDBOX_VERSION}
+    tag_name: v${COLDBOX_VERSION}
+    overwrite: true
+    prerelease: true
+
 after_deploy:
   # publish ColdBox
   - cd $TRAVIS_BUILD_DIR/artifacts/coldbox/$COLDBOX_VERSION && box forgebox publish

box-original.json

@@ -6,19 +6,21 @@
     "slug": "coldbox",
     "packageDirectory": "coldbox",
     "type": "mvc",
-    "keywords": "mvc,conventions,coldbox",
+    "keywords": "mvc,hmc,conventions,coldbox",
     "homepage": "https://www.coldbox.org",
     "documentation": "https://coldbox.ortusbooks.com/",
     "repository": {
         "type": "git",
         "url": "https://github.com/coldbox/coldbox-platform"
     },
     "bugs": "https://ortussolutions.atlassian.net/browse/COLDBOX",
-    "shortDescription": "A conventions based MVC development framework",
-    "license": [{
+    "shortDescription": "A conventions based HMVC development framework",
+    "license": [
+		{
         "type": "Apache2",
         "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
-    }],
+		}
+	],
     "contributors": [
         "Brad Wood <bdw429s@gmail.com>",
         "Curt Gratz <gratz@computerknowhow.com>"
@@ -30,11 +32,6 @@
         "testbox",
         "*/.md"
     ],
-    "testbox": {
-        "runner": [{
-            "default": "http://localhost:8599/tests/runner.cfm"
-        }]
-    },
     "devDependencies": {
         "testbox": "^3.0.0"
     },

box.json

@@ -6,15 +6,15 @@
     "slug":"coldbox",
     "packageDirectory":"coldbox",
     "type":"mvc",
-    "keywords":"mvc,conventions,coldbox",
+    "keywords":"mvc,hmvc,conventions,coldbox",
     "homepage":"https://www.coldbox.org",
     "documentation":"https://coldbox.ortusbooks.com/",
     "repository":{
         "type":"git",
         "url":"https://github.com/coldbox/coldbox-platform"
     },
     "bugs":"https://ortussolutions.atlassian.net/browse/COLDBOX",
-    "shortDescription":"A conventions based MVC development framework",
+    "shortDescription":"A conventions based HMVC development framework",
     "license":[
         {
             "type":"Apache2",
@@ -39,10 +39,20 @@
         ]
     },
     "devDependencies":{
-        "testbox":"^3.0.0"
+        "testbox":"^4.1.0"
     },
     "installPaths":{
         "testbox":"testbox/"
     },
-    "scripts":{}
+    "scripts":{
+        "format":"cfformat run system/**/*.cfc,tests/specs/**/*.cfc --overwrite",
+        "format:watch":"cfformat watch system/**/*.cfc,tests/specs/**/*.cfc ./.cfformat.json",
+        "format:check":"cfformat check system/**/*.cfc,tests/specs/**/*.cfc",
+        "start:lucee":"server start serverConfigFile='server-lucee@5.json' --force",
+        "start:2016":"server start serverConfigFile='server-adobe@2016.json' --force",
+        "start:2018":"server start serverConfigFile='server-adobe@2018.json' --force",
+        "log:lucee":"server log coldbox-lucee@5 --follow",
+        "log:2016":"server log coldbox-adobe@2016 --follow",
+        "log:2018":"server log coldbox-adobe@2018 --follow"
+    }
 }