Merge branch 'development' into master

Author: angel-chrystian

.gitignore

@@ -1,10 +1,18 @@
+# IDE Stuff
 .settings
-logs/*.log
 settings.xml
-.netbeans
-test/results/*.properties
-test/results/*.html
-test/results/*.log
-tests/results
-modules/cbjavaloader
-modules/cbi18n
+
+# Logs
+logs/*.log
+
+# Test Results
+tests/results/*
+
+# Dependenncies
+coldbox/*
+testbox/*
+artifacts/*
+apidocs/docbox/*
+workbench/*
+build/*
+modules/cbi18n

.module.properties

@@ -0,0 +1,3 @@
+project.name=cbvalidation
+project.version=1.4.0
+module.name=cbvalidation

.travis.yml

@@ -0,0 +1,99 @@
+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=
+
+env:
+  global:
+    - MODULE_ID=cbvalidation
+  matrix:
+    - [email protected]
+    - ENGINE=lucee@5
+    - ENGINE=adobe@11
+    - ENGINE=adobe@2016
+
+branches:
+  only:
+  - development
+  - master
+
+dist: trusty
+
+sudo: required
+
+before_install:
+  # CommandBox Keys
+  - 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:
+  # Install Commandbox
+  - sudo apt-get update && sudo apt-get --assume-yes install git haveged rsync commandbox
+  # Test that the box binary is available and ready for our tests
+  - box version
+  # If using auto-publish, you will need to provide your API token with this line:
+  - box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
+  # Setup for our tests
+  - mkdir tests/results
+  - sudo chmod -R 775 tests/results
+
+# Build script - note module versioning is passed to ANT
+script:
+  # run our dependency install to ensure the workbench is in place
+  - box install
+  # add our module-specific build properties
+  - printf "\nmodule.name=$MODULE_ID" >> workbench/build.properties
+  - printf "\ncfengine=$ENGINE" >> workbench/build.properties
+  # execute our build
+  - ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f workbench/build.xml
+
+after_failure:
+  - cd $TRAVIS_BUILD_DIR
+  # Display the contents of our root directory
+  # Spit out our Commandbox log in case we need to debug
+  - box server log name=$ENGINE
+  - cat `box system-log`
+  
+before_deploy:
+  - cd $TRAVIS_BUILD_DIR
+  - mkdir -p s3deploy
+  - rsync -av ./artifacts/$MODULE_ID/ ./s3deploy/
+  - rm -f ./s3deploy/box-repo.json
+
+deploy:
+  #Module Deployment
+  - provider: s3
+    on:
+      branch: 
+        - master
+        - development
+      condition: "$ENGINE = [email protected]"
+    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: s3deploy
+    upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
+    acl: public_read
+  #API Docs Deployment
+  - provider: s3
+    on:
+      branch: 
+        - master
+        - development
+      condition: "$ENGINE = [email protected]"
+    skip_cleanup: true
+    #AWS Credentials need to be set in Travis
+    access_key_id: $AWS_ACCESS_KEY
+    secret_access_key: $AWS_ACCESS_SECRET
+    bucket: "apidocs.ortussolutions.com"
+    local-dir: build/apidocs
+    upload-dir: coldbox-modules/$MODULE_ID
+    acl: public_read
+
+
+after_deploy:
+  - cd $TRAVIS_BUILD_DIR/build && box forgebox publish

apidocs/Application.cfc

@@ -1,19 +1,15 @@
 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[ "/cbvalidation" ] = rootPath & "modules/cbvalidation/models";
-
-	// request start
-	public boolean function onRequestStart(String targetPage){
-		return true;
-	}
+	this.mappings[ "/docbox" ]  		= API_ROOT & "docbox";
+	this.mappings[ "/root" ] 			= rootPath;
+	this.mappings[ "/cbvalidation" ] 	= rootPath & "modules/cbvalidation/models";
 
 }