From 710c4c902bf7bd92cf513928987ddbe23ca685eb Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Sun, 23 Dec 2018 23:11:47 -0600 Subject: [PATCH 01/30] Bump for 4.6.0 --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index 256e0d7c5..9f8a8281a 100644 --- a/build/build.xml +++ b/build/build.xml @@ -16,7 +16,7 @@ External Dependencies: - + From 9bb075b2d2b7814501cc6fe00d0dd6611b12f1f2 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Thu, 27 Dec 2018 15:14:30 -0600 Subject: [PATCH 02/30] COMMANDBOX-927 --- .../modules/propertyFile/ModuleConfig.cfc | 2 +- src/cfml/system/modules/propertyFile/box.json | 4 +- .../propertyFile/models/PropertyFile.cfc | 47 ++++++++++--------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/cfml/system/modules/propertyFile/ModuleConfig.cfc b/src/cfml/system/modules/propertyFile/ModuleConfig.cfc index 6f40fe6f6..f95e7055a 100644 --- a/src/cfml/system/modules/propertyFile/ModuleConfig.cfc +++ b/src/cfml/system/modules/propertyFile/ModuleConfig.cfc @@ -5,4 +5,4 @@ component { function configure(){ } -} +} \ No newline at end of file diff --git a/src/cfml/system/modules/propertyFile/box.json b/src/cfml/system/modules/propertyFile/box.json index f75167acf..7c2184fa7 100644 --- a/src/cfml/system/modules/propertyFile/box.json +++ b/src/cfml/system/modules/propertyFile/box.json @@ -1,8 +1,8 @@ { "name":"PropertyFile Util", - "version":"1.1.0", + "version":"1.2.0", "author":"Brad Wood", - "location":"bdw429s/PropertyFile#v1.1.0", + "location":"bdw429s/PropertyFile#v1.2.0", "homepage":"https://github.com/bdw429s/PropertyFile/", "documentation":"https://github.com/bdw429s/PropertyFile/blob/master/readme.md", "repository":{ diff --git a/src/cfml/system/modules/propertyFile/models/PropertyFile.cfc b/src/cfml/system/modules/propertyFile/models/PropertyFile.cfc index ab0d44c5a..9e7f17e5d 100644 --- a/src/cfml/system/modules/propertyFile/models/PropertyFile.cfc +++ b/src/cfml/system/modules/propertyFile/models/PropertyFile.cfc @@ -2,12 +2,13 @@ * I am a new Model Object */ component accessors="true"{ - + // Properties property name='javaPropertyFile'; + // A fully qualified path to a property file property name='path'; property name='syncedNames'; - + /** * Constructor @@ -17,46 +18,46 @@ component accessors="true"{ setJavaPropertyFile( createObject( 'java', 'java.util.Properties' ).init() ); return this; } - + /** - * load + * @load A fully qualified path to a property file */ function load( required string path){ setPath( arguments.path ); - var fis = CreateObject( 'java', 'java.io.FileInputStream' ).init( expandPath( path ) ); + var fis = CreateObject( 'java', 'java.io.FileInputStream' ).init( path ); var BOMfis = CreateObject( 'java', 'org.apache.commons.io.input.BOMInputStream' ).init( fis ); var propertyFile = getJavaPropertyFile(); propertyFile.load( BOMfis ); BOMfis.close(); - - + + var props = propertyFile.propertyNames(); var syncedNames = getSyncedNames(); while( props.hasMoreElements() ) { var prop = props.nextElement(); this[ prop ] = get( prop ); - syncedNames.append( prop ); + syncedNames.append( prop ); } setSyncedNames( syncedNames ); - + return this; } /** - * store + * @load A fully qualified path to a property file. File will be created if it doesn't exist. */ function store( string path=variables.path ){ syncProperties(); - + if( !fileExists( arguments.path ) ) { directoryCreate( getDirectoryFromPath( arguments.path ), true, true ); fileWrite( arguments.path, '' ); } - - var fos = CreateObject( 'java', 'java.io.FileOutputStream' ).init( expandPath( arguments.path ) ); + + var fos = CreateObject( 'java', 'java.io.FileOutputStream' ).init( arguments.path ); getJavaPropertyFile().store( fos, '' ); fos.close(); - + return this; } @@ -65,7 +66,7 @@ component accessors="true"{ */ function get( required string name, string defaultValue ){ if( structKeyExists( arguments, 'defaultValue' ) ) { - return getJavaPropertyFile().getProperty( name, defaultValue ); + return getJavaPropertyFile().getProperty( name, defaultValue ); } else if( exists( name ) ) { return getJavaPropertyFile().getProperty( name ); } else { @@ -78,14 +79,14 @@ component accessors="true"{ */ function set( required string name, required string value ){ getJavaPropertyFile().setProperty( name, value ); - + var syncedNames = getSyncedNames(); this[ name ] = value; if( !arrayContains( syncedNames, name ) ){ syncedNames.append( name ); } setSyncedNames( syncedNames ); - + return this; } @@ -95,7 +96,7 @@ component accessors="true"{ function remove( required string name ){ if( exists( name ) ) { getJavaPropertyFile().remove( name ); - + var syncedNames = getSyncedNames(); if( arrayFind( syncedNames, name ) ){ syncedNames.deleteAt( arrayFind( syncedNames, name ) ); @@ -122,7 +123,7 @@ component accessors="true"{ structAppend( result, getJavaPropertyFile() ); return result; } - + /** * Keeps public properties in sync with Java object */ @@ -130,7 +131,7 @@ component accessors="true"{ var syncedNames = getSyncedNames(); var ignore = listToArray( 'init,load,store,get,set,exists,remove,exists,getAsStruct,$mixed' ); var propertyFile = getJavaPropertyFile(); - + // This CFC's public properties for( var prop in this ) { // Set any new/updated properties in, excluding actual methods and non-simple values @@ -138,7 +139,7 @@ component accessors="true"{ set( prop, this[ prop ] ); } } - + // All the properties in the Java object var props = propertyFile.propertyNames(); while( props.hasMoreElements() ) { @@ -148,7 +149,7 @@ component accessors="true"{ remove( prop ); } } - + } -} +} \ No newline at end of file From 13c27a65d2c815aa1e085635816738017ad5b39a Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Fri, 28 Dec 2018 13:29:20 -0600 Subject: [PATCH 03/30] COMMANDBOX-928 --- .../modules_app/package-commands/commands/package/init.cfc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cfml/system/modules_app/package-commands/commands/package/init.cfc b/src/cfml/system/modules_app/package-commands/commands/package/init.cfc index 8ae96b2fe..cc4a95167 100644 --- a/src/cfml/system/modules_app/package-commands/commands/package/init.cfc +++ b/src/cfml/system/modules_app/package-commands/commands/package/init.cfc @@ -110,7 +110,7 @@ component aliases="init" { // Ignore List if( arguments.ignoreList ){ - arguments[ "ignore" ] = serializeJSON( [ '**/.*', 'test', 'tests' ] ); + arguments[ "ignore" ] = serializeJSON( [ '**/.*', '/test/', '/tests/' ] ); } // Cleanup the argument so it does not get written. structDelete( arguments, "ignoreList" ); From 6b668b6ce5d51ebf934c33a5ae1908977685110c Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Mon, 7 Jan 2019 15:01:38 -0600 Subject: [PATCH 04/30] COMMANDBOX-929 --- build/build.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build/build.xml b/build/build.xml index 9f8a8281a..b4f0d699d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -199,6 +199,14 @@ External Dependencies: + + + From 7a286e24ce950ac16ebe6bce2481627e9e8bd614 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Thu, 10 Jan 2019 12:15:17 -0600 Subject: [PATCH 05/30] COMMANDBOX-930 --- src/cfml/system/modules_app/system-commands/commands/repl.cfc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cfml/system/modules_app/system-commands/commands/repl.cfc b/src/cfml/system/modules_app/system-commands/commands/repl.cfc index 46834a4e1..7416a8bc9 100644 --- a/src/cfml/system/modules_app/system-commands/commands/repl.cfc +++ b/src/cfml/system/modules_app/system-commands/commands/repl.cfc @@ -80,6 +80,9 @@ component { break; } } + + // Evaluate any ${} placeholders + command = systemSettings.expandSystemSettings( command ) // add command to our parser REPLParser.addCommandLine( command ); From 800c4e1e02e09cab5e61932c12965f2938719e7e Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Mon, 14 Jan 2019 17:14:41 -0600 Subject: [PATCH 06/30] COMMANDBOX-931 --- .../modules_app/task-commands/models/TaskService.cfc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cfml/system/modules_app/task-commands/models/TaskService.cfc b/src/cfml/system/modules_app/task-commands/models/TaskService.cfc index 936355545..a2c29c379 100644 --- a/src/cfml/system/modules_app/task-commands/models/TaskService.cfc +++ b/src/cfml/system/modules_app/task-commands/models/TaskService.cfc @@ -77,7 +77,7 @@ component singleton accessors=true { try { // Run the task - taskCFC[ target ]( argumentCollection = taskArgs ); + local.returnedExitCode = taskCFC[ target ]( argumentCollection = taskArgs ); } catch( any e ) { // If this task didn't already set a failing exit code... @@ -100,7 +100,11 @@ component singleton accessors=true { } finally { // Set task exit code into the shell - shell.setExitCode( taskCFC.getExitCode() ); + if( !isNull( local.returnedExitCode ) && isSimpleValue( local.returnedExitCode ) ) { + shell.setExitCode( val( local.returnedExitCode ) ); + } else { + shell.setExitCode( taskCFC.getExitCode() ); + } } // If the previous Task failed From bbab750d4701257ca3851f9ebd7fa1f248831171 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Tue, 15 Jan 2019 10:53:02 -0600 Subject: [PATCH 07/30] COMMANDBOX-932 --- src/cfml/system/util/TaskDSL.cfc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cfml/system/util/TaskDSL.cfc b/src/cfml/system/util/TaskDSL.cfc index ea7b7c6b3..897e9273e 100644 --- a/src/cfml/system/util/TaskDSL.cfc +++ b/src/cfml/system/util/TaskDSL.cfc @@ -20,6 +20,7 @@ component accessors=true { property name='flags'; property name='workingDirectory'; property name='rawParams'; + property name='exitCode'; // DI @@ -45,6 +46,7 @@ component accessors=true { setFlags( [] ); setWorkingDirectory( '' ); setRawParams( false ); + setExitCode( 0 ); return this; } @@ -161,6 +163,8 @@ component accessors=true { var result = shell.callCommand( getTokens(), true ); } finally { + setExitCode( shell.getExitCode() ); + var postCommandCWD = shell.getPWD(); // Only change back if the executed command didn't change the CWD From 013c08ece71a2f8e0ab65766af12f1e1a39d6105 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Wed, 16 Jan 2019 17:10:52 -0600 Subject: [PATCH 08/30] COMMANDBOX-934 --- src/cfml/system/services/ServerService.cfc | 2 +- src/cfml/system/util/FileSystem.cfc | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/cfml/system/services/ServerService.cfc b/src/cfml/system/services/ServerService.cfc index ea99abd0f..5c36a4f46 100644 --- a/src/cfml/system/services/ServerService.cfc +++ b/src/cfml/system/services/ServerService.cfc @@ -1871,7 +1871,7 @@ component accessors="true" singleton { arguments.webroot = fileSystemUtil.resolvePath( arguments.webroot ); var servers = getServers(); for( var thisServer in servers ){ - if( fileSystemUtil.resolvePath( servers[ thisServer ].webroot ) == arguments.webroot ){ + if( fileSystemUtil.resolvePath( path=servers[ thisServer ].webroot, forceDirectory=true ) == arguments.webroot ){ return servers[ thisServer ]; } } diff --git a/src/cfml/system/util/FileSystem.cfc b/src/cfml/system/util/FileSystem.cfc index 61c4ec33a..8077049e0 100644 --- a/src/cfml/system/util/FileSystem.cfc +++ b/src/cfml/system/util/FileSystem.cfc @@ -45,8 +45,9 @@ component accessors="true" singleton { * Resolve the incoming path from the file system * @path.hint The directory to resolve * @basePath.hint An expanded base path to resolve the path against. Defaults to CWD. + * @forceDirectory is for optimization. If you know the path is a directory for sure, pass true and we'll skip the directoryExists() check for performance */ - function resolvePath( required string path, basePath=shell.pwd() ) { + function resolvePath( required string path, basePath=shell.pwd(), boolean forceDirectory=false ) { // The Java class will strip trailing slashses, but these are meaningful in globbing patterns var trailingSlash = ( path.len() > 1 && ( path.endsWith( '/' ) || path.endsWith( '\' ) ) ); @@ -83,10 +84,14 @@ component accessors="true" singleton { } // Add back trailing slash if we had it - var finalPath = oPath.toString() & ( trailingSlash ? server.separator.file : '' ); + var finalPath = oPath.toString() & ( ( trailingSlash || forceDirectory ) ? server.separator.file : '' ); // This will standardize the name and calculate stuff like ../../ - finalPath = getCanonicalPath( finalPath ) + if( forceDirectory ) { + finalPath = calculateCanonicalPath( finalPath ); + } else { + finalPath = getCanonicalPath( finalPath ); + } // have to add back the period after canonicalizing since Java removes it! return finalPath & ( trailingPeriod && !finalPath.endsWith( '.' ) ? '.' : '' ); From adcc4b6f81d372b859199be5beac28fda569bb29 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Wed, 16 Jan 2019 17:38:19 -0600 Subject: [PATCH 09/30] bump loader since upgrade still doesn't work --- build/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.properties b/build/build.properties index bad12bd71..569f057a1 100644 --- a/build/build.properties +++ b/build/build.properties @@ -11,7 +11,7 @@ java.debug=true #dependencies dependencies.dir=${basedir}/lib cfml.version=5.2.9.31 -cfml.loader.version=2.2.9 +cfml.loader.version=2.2.10 cfml.cli.version=${cfml.loader.version}.${cfml.version} lucee.version=${cfml.version} lucee.config.version=5.2.4.37 From 21c79527c5d5c347c5f7bbec76bb9d518c55e92c Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Thu, 17 Jan 2019 22:21:52 -0600 Subject: [PATCH 10/30] COMMANDBOX-935 --- .../system/util/ProgressableDownloader.cfc | 10 +++++- .../system/util/jline/REPLHighlighter.cfc | 35 +++++-------------- 2 files changed, 17 insertions(+), 28 deletions(-) diff --git a/src/cfml/system/util/ProgressableDownloader.cfc b/src/cfml/system/util/ProgressableDownloader.cfc index 627d3a5b0..8fbee801a 100644 --- a/src/cfml/system/util/ProgressableDownloader.cfc +++ b/src/cfml/system/util/ProgressableDownloader.cfc @@ -36,6 +36,14 @@ component singleton { var info = resolveConnection( arguments.downloadURL, arguments.redirectUDF ); var connection = info.connection; var netURL = info.netURL; + + // Initialize status + var status = { + percent = 0, + speedKBps = 0, + totalSizeKB = -1, + completeSizeKB = 0 + }; try { @@ -84,7 +92,7 @@ component singleton { } // Build status data to pass to closure - var status = { + status = { percent = currentPercentage, speedKBps = kiloBytesPerSecond, totalSizeKB = ( lenghtOfFile == -1 ? -1 : lenghtOfFile/1000 ), diff --git a/src/cfml/system/util/jline/REPLHighlighter.cfc b/src/cfml/system/util/jline/REPLHighlighter.cfc index 2323a8d67..d4334e956 100644 --- a/src/cfml/system/util/jline/REPLHighlighter.cfc +++ b/src/cfml/system/util/jline/REPLHighlighter.cfc @@ -13,22 +13,6 @@ component { property name='shell' inject='provider:shell'; function init() { - variables.functionList = getFunctionList() - .keyArray() - // Add in member function versions of functions - .reduce( function( orig, i ) { - orig.append( i ); - if( reFind( 'array|struct|query|image|spreadsheet|XML', i ) ) { - orig.append( i.reReplaceNoCase( '(array|struct|query|image|spreadsheet|XML)(.+)', '\2' ) ); - } - return orig; - }, [] ) - // Sort function names longest to shortest - .sort( function(a,b){ - if( a.len() > b.len() ) return -1; - if( a.len() < b.len() ) return 1; - return 0; - } ); variables.reservedWords = [ 'if', @@ -49,8 +33,10 @@ component { 'false', 'return', 'in', - 'function' - ]; + 'function', + 'any' + ].toList( '|' ); + variables.sets = { ')' : '(', '}' : '{', @@ -64,17 +50,12 @@ component { function highlight( reader, buffer ) { // Highlight CF function names - for( var func in functionList ) { - // Find function names that are at the line start or prepended with a space, curly, or period and ending with an opening paren - buffer = reReplaceNoCase( buffer, '(^|[ \.\{\}])(#func#)(\()', '\1' & print.boldCyan( '\2' ) & '\3', 'all' ); - } + // Find text that is at the line start or prepended with a space, curly, or period and ending with an opening paren + buffer = reReplaceNoCase( buffer, '(^|[ \.\{\}\(\)])([^ \.\{\}\(\)]*)(\()', '\1' & print.boldCyan( '\2' ) & '\3', 'all' ); // highight reserved words - for( var reservedWord in reservedWords ) { - // Find keywords, bookended by a space, curly, paren, or semicolon. Or, of course, the start/end of the line - buffer = reReplaceNoCase( buffer, '(^|[ \{\}\(])(#reservedWord#)($|[ ;\(\)\{\}])', '\1' & print.boldCyan( '\2' ) & '\3', 'all' ); - } - + buffer = reReplaceNoCase( buffer, '(^|[ \{\}\(])(#reservedWords#)($|[ ;\(\)\{\}])', '\1' & print.boldCyan( '\2' ) & '\3', 'all' ); + // If the last character was an ending } or ) or ] or " or ' then highlight it and the matching start character // This logic is pretty basic and doesn't account for escaped stuff. If you want, please send a pull to improve it :) if( sets.keyExists( buffer.right( 1 ) ) ) { From 8efa1b01cfc4c8d22ba4a4c96db707734c3a8031 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Fri, 25 Jan 2019 11:07:57 -0800 Subject: [PATCH 11/30] COMMANDBOX-938 --- src/cfml/system/BaseCommand.cfc | 5 +++-- src/cfml/system/Shell.cfc | 6 ++++-- .../wirebox/system/logging/appenders/FileAppender.cfc | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/cfml/system/BaseCommand.cfc b/src/cfml/system/BaseCommand.cfc index 5eab2b4cb..8195a520a 100644 --- a/src/cfml/system/BaseCommand.cfc +++ b/src/cfml/system/BaseCommand.cfc @@ -37,6 +37,7 @@ component accessors="true" singleton { variables.configService = wirebox.getInstance( "ConfigService" ); variables.SystemSettings = wirebox.getInstance( "SystemSettings" ); variables.job = wirebox.getInstance( "interactiveJob" ); + variables.thisThread = createObject( 'java', 'java.lang.Thread' ).currentThread(); variables.exitCode = 0; return this; @@ -294,8 +295,8 @@ component accessors="true" singleton { * if the user has hit Ctrl-C. This method will throw an UserInterruptException * which you should not catch. It will unroll the stack all the way back to the shell */ - function checkInterrupted() { - shell.checkInterrupted(); + function checkInterrupted( thisThread=variables.thisThread ) { + shell.checkInterrupted( argumentCollection=arguments ); } diff --git a/src/cfml/system/Shell.cfc b/src/cfml/system/Shell.cfc index d705ccd0a..6aa7eb168 100644 --- a/src/cfml/system/Shell.cfc +++ b/src/cfml/system/Shell.cfc @@ -602,8 +602,10 @@ component accessors="true" singleton { * if the user has hit Ctrl-C. This method will throw an UserInterruptException * which you should not catch. It will unroll the stack all the way back to the shell */ - function checkInterrupted() { - var thisThread = createObject( 'java', 'java.lang.Thread' ).currentThread(); + function checkInterrupted( thisThread ) { + if( isNull( arguments.thisThread ) ) { + thisThread = createObject( 'java', 'java.lang.Thread' ).currentThread(); + } // Has the user tried to interrupt this thread? if( thisThread.isInterrupted() ) { diff --git a/src/cfml/system/wirebox/system/logging/appenders/FileAppender.cfc b/src/cfml/system/wirebox/system/logging/appenders/FileAppender.cfc index 234570e64..88a144477 100644 --- a/src/cfml/system/wirebox/system/logging/appenders/FileAppender.cfc +++ b/src/cfml/system/wirebox/system/logging/appenders/FileAppender.cfc @@ -119,8 +119,6 @@ component accessors="true" extends="wirebox.system.logging.AbstractAppender"{ var message = loge.getMessage(); var entry = ""; - // Ensure Log File - initLogLocation(); // Message Layout if( hasCustomLayout() ){ @@ -238,6 +236,10 @@ component accessors="true" extends="wirebox.system.logging.AbstractAppender"{ var flushInterval = 1000; // 1 second var sleepInterval = 50; var count = 0; + + // Ensure Log File + initLogLocation(); + var oFile = fileOpen( variables.logFullPath, "append", this.getProperty( "fileEncoding" ) ); var hasMessages = false; From 34fa8406e019c7e41ec84b99719883c6f8ccf6af Mon Sep 17 00:00:00 2001 From: Kai Koenig Date: Mon, 28 Jan 2019 17:25:26 +1300 Subject: [PATCH 12/30] Checking for Linux when opening an editor from Commandbox (#185) --- src/cfml/system/util/FileSystem.cfc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/cfml/system/util/FileSystem.cfc b/src/cfml/system/util/FileSystem.cfc index 8077049e0..56b735b62 100644 --- a/src/cfml/system/util/FileSystem.cfc +++ b/src/cfml/system/util/FileSystem.cfc @@ -217,15 +217,21 @@ component accessors="true" singleton { var runtime = createObject( "java", "java.lang.Runtime" ).getRuntime(); if( isWindows() and target.isFile() ){ runtime.exec( [ "rundll32", "url.dll,FileProtocolHandler", target.getCanonicalPath() ] ); - } - else if( isWindows() and target.isDirectory() ){ + } else if( isWindows() and target.isDirectory() ){ var processBuilder = createObject( "java", "java.lang.ProcessBuilder" ) .init( [ "explorer.exe", target.getCanonicalPath() ] ) .start(); - } - // Linux based or mac - else { + } else if( isMac() ) { + // Mac runtime.exec( [ "/usr/bin/open", target.getCanonicalPath() ] ); + } else { + // Default to Linux + // If there is xdg-open around, we'll try to use it - otherwise we'll use see. + if( runtime.exec( "which xdg-open" ).waitFor() == 0 ) { + runtime.exec( [ "/usr/bin/xdg-open", target.getCanonicalPath() ] ); + } else { + runtime.exec( [ "/usr/bin/see", target.getCanonicalPath() ] ); + } } return true; } From c9fa6cf3618de6e2613a6422cc4ffbd37c641848 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Mon, 28 Jan 2019 21:03:19 -0600 Subject: [PATCH 13/30] COMMANDBOX-860 --- src/cfml/system/services/ServerService.cfc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/cfml/system/services/ServerService.cfc b/src/cfml/system/services/ServerService.cfc index 5c36a4f46..4fec334e7 100644 --- a/src/cfml/system/services/ServerService.cfc +++ b/src/cfml/system/services/ServerService.cfc @@ -855,6 +855,18 @@ component accessors="true" singleton { var displayEngineName = 'WAR'; } + // Doing this check here instead of the ServerEngineService so it can apply to existing installs + if( CFEngineName == 'adobe' ) { + // Work arounnd sketchy resoution of non-existant paths in Undertow + // https://issues.jboss.org/browse/UNDERTOW-1413 + var flexLogFile = serverInfo.serverHomeDirectory & "/WEB-INF/cfform/logs/flex.log"; + if ( !fileExists( flexLogFile ) ) { + // if this doesn't already exist, it ends up getting created in a WEB-INF folder in the web root. Eww.... + directoryCreate( getDirectoryFromPath( flexLogFile ), true, true ); + fileWrite( flexLogFile, '' ); + } + } + // logdir is set above and is different for WARs and CF engines serverInfo.consolelogPath = serverInfo.logdir & '/server.out.txt'; serverInfo.accessLogPath = serverInfo.logDir & '/access.txt'; From 1781d286a7ab67328f9b7d798b411c416515147e Mon Sep 17 00:00:00 2001 From: Israel Urquiza Date: Tue, 29 Jan 2019 08:31:04 -0800 Subject: [PATCH 14/30] Update ServerService.cfc (#186) --- src/cfml/system/services/ServerService.cfc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cfml/system/services/ServerService.cfc b/src/cfml/system/services/ServerService.cfc index 4fec334e7..a55241f3b 100644 --- a/src/cfml/system/services/ServerService.cfc +++ b/src/cfml/system/services/ServerService.cfc @@ -1654,7 +1654,7 @@ component accessors="true" singleton { throw( "The host name [#arguments.host#] can't be found. Do you need to add a host file entry?", 'serverException', e.message & ' ' & e.detail ); } catch( java.net.BindException var e ) { // Same as above-- the IP address/host isn't bound to any local adapters. Probably a host file entry went missing. - throw( "The IP address that [#arguments.host#] resovles to can't be bound. If you ping it, does it point to a local network adapter?", 'serverException', e.message & ' ' & e.detail ); + throw( "The IP address that [#arguments.host#] resolves to can't be bound. If you ping it, does it point to a local network adapter?", 'serverException', e.message & ' ' & e.detail ); } return portNumber; From a12bad79e2ac48e3e4ee704214cff44d02f6b1e7 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Tue, 29 Jan 2019 15:59:00 -0600 Subject: [PATCH 15/30] Improve console start on dumb terminal --- src/cfml/system/services/ServerService.cfc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/cfml/system/services/ServerService.cfc b/src/cfml/system/services/ServerService.cfc index a55241f3b..7f9c61f19 100644 --- a/src/cfml/system/services/ServerService.cfc +++ b/src/cfml/system/services/ServerService.cfc @@ -1338,13 +1338,19 @@ component accessors="true" singleton { variables.waitingOnConsoleStart = true; while( true ) { - // Detect user pressing Ctrl-C - // Any other characters captured will be ignored - var line = shell.getReader().readLine(); - if( line == 'q' ) { - break; + // For dumb terminals, just sit and wait to be interrupted + // Trying to read from a dumb terminal will throw "The handle is invalid" errors + if( shell.getReader().getTerminal().getClass().getName() contains 'dumb' ) { + sleep( 500 ); } else { - consoleLogger.error( 'To exit press Ctrl-C or "q" followed the enter key.' ); + // Detect user pressing Ctrl-C + // Any other characters captured will be ignored + var line = shell.getReader().readLine(); + if( line == 'q' ) { + break; + } else { + consoleLogger.error( 'To exit press Ctrl-C or "q" followed the enter key.' ); + } } } From aae2c7295fbc7efb1e7463a911d3c7846e7923da Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Thu, 7 Feb 2019 23:13:47 -0600 Subject: [PATCH 16/30] COMMANDBOX-942 --- src/cfml/system/util/jline/CommandHighlighter.cfc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cfml/system/util/jline/CommandHighlighter.cfc b/src/cfml/system/util/jline/CommandHighlighter.cfc index 07f1c05d5..cd8a5cd2d 100644 --- a/src/cfml/system/util/jline/CommandHighlighter.cfc +++ b/src/cfml/system/util/jline/CommandHighlighter.cfc @@ -26,8 +26,12 @@ component { function highlight( reader, buffer ) { - // Call CommandBox parser to parse the line. - var commandChain = CommandService.resolveCommand( buffer ); + try { + // Call CommandBox parser to parse the line. + var commandChain = CommandService.resolveCommand( buffer ); + } catch( any var e ) { + return createObject("java","org.jline.utils.AttributedString").fromAnsi( buffer ); + } // For each command in the chain for( var command in commandChain ) { From 82f9825c26d44e7055bb745851dfea13b1ec4d51 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Thu, 7 Feb 2019 23:15:07 -0600 Subject: [PATCH 17/30] COMMANDBOX-943 --- src/cfml/system/services/CommandService.cfc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/cfml/system/services/CommandService.cfc b/src/cfml/system/services/CommandService.cfc index 09c5eeb6f..9b170b80c 100644 --- a/src/cfml/system/services/CommandService.cfc +++ b/src/cfml/system/services/CommandService.cfc @@ -914,6 +914,12 @@ component accessors="true" singleton { excludeFromHelp = commandMD.excludeFromHelp ?: false, commandMD = commandMD }; + + // Fix for CFCs with no hint, they inherit this from the Lucee base compnent. + if( commandData.hint == 'This is the Base Component' ) { + commandData.hint = ''; + } + // check functions if( structKeyExists( commandMD, 'functions' ) ){ // Capture the command's parameters From ac8f2759382bcd6c807c9eaa22db709c365eaa5d Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Thu, 7 Feb 2019 23:16:25 -0600 Subject: [PATCH 18/30] COMMANDBOX-944 --- src/cfml/system/modules_app/system-commands/commands/run.cfc | 4 ++++ src/cfml/system/services/ConfigService.cfc | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/cfml/system/modules_app/system-commands/commands/run.cfc b/src/cfml/system/modules_app/system-commands/commands/run.cfc index b600eee55..37094d298 100644 --- a/src/cfml/system/modules_app/system-commands/commands/run.cfc +++ b/src/cfml/system/modules_app/system-commands/commands/run.cfc @@ -62,6 +62,10 @@ component{ commandArray = [ nativeShell, '-i', '-c', arguments.command & ' 2>&1 && ( exit $? > /dev/null )' ]; } + if( configService.getSetting( 'debugNativeExecution', false ) ) { + print.line( commandArray.tolist( ' ' ) ).toConsole(); + } + var exitCode = 1; // grab the current working directory var CWDFile = createObject( 'java', 'java.io.File' ).init( resolvePath( '' ) ); diff --git a/src/cfml/system/services/ConfigService.cfc b/src/cfml/system/services/ConfigService.cfc index 2525ae456..92a1e3d4e 100644 --- a/src/cfml/system/services/ConfigService.cfc +++ b/src/cfml/system/services/ConfigService.cfc @@ -71,7 +71,8 @@ component accessors="true" singleton { 'JSON.ANSIColors.number', 'JSON.ANSIColors.string', // General - 'verboseErrors' + 'verboseErrors', + 'debugNativeExecution' ]); setConfigFilePath( '/commandbox-home/CommandBox.json' ); From 84df85fa852ed0f3c0dcc5e4a624cd0da66365ed Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Thu, 7 Feb 2019 23:18:18 -0600 Subject: [PATCH 19/30] COMMANDBOX-945 --- src/cfml/system/services/EndpointService.cfc | 11 +++++++++-- src/cfml/system/util/ForgeBox.cfc | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/cfml/system/services/EndpointService.cfc b/src/cfml/system/services/EndpointService.cfc index ea8902df6..c4b0a07c1 100644 --- a/src/cfml/system/services/EndpointService.cfc +++ b/src/cfml/system/services/EndpointService.cfc @@ -52,7 +52,14 @@ component accessors="true" singleton { var endpointPath = listChangeDelims( arguments.rootDirectory, '/\', '.' ) & '.' & endpointName; var oEndPoint = wirebox.getInstance( endpointPath ); - registerEndpoint( oEndPoint ); + if( endPointName == 'forgebox' ) { + var customForgeBoxAPIURL = configService.getSetting( 'endpoints.forgebox.apiURL', '' ); + if( customForgeBoxAPIURL.len() ) { + oEndPoint.getForgeBox().setEndpointURL( customForgeBoxAPIURL.reReplaceNoCase( '/api/.*', '' ) ); + oEndPoint.getForgeBox().setAPIURL( customForgeBoxAPIURL ); + } + } + registerEndpoint( oEndPoint ); } } @@ -81,7 +88,7 @@ component accessors="true" singleton { oEndPoint.setNamePrefixes( endpointName.replaceNoCase( 'forgebox-', '' ) ); // Set the API URL for this endpoint's forgebox Util - oEndPoint.getForgeBox().setEndpointURL( endpointData.APIURL ); + oEndPoint.getForgeBox().setEndpointURL( endpointData.APIURL.reReplaceNoCase( '/api/.*', '' ) ); oEndPoint.getForgeBox().setAPIURL( endpointData.APIURL ); // Register it, baby! diff --git a/src/cfml/system/util/ForgeBox.cfc b/src/cfml/system/util/ForgeBox.cfc index d53247871..4a0804983 100644 --- a/src/cfml/system/util/ForgeBox.cfc +++ b/src/cfml/system/util/ForgeBox.cfc @@ -419,7 +419,7 @@ or just add DEBUG to the root logger function getStorageLocation( required string slug, required string version, required string APIToken ) { var results = makeRequest( - resource = "storage/#slug#/#version#", + resource = "storage/#urlEncode( slug )#/#urlEncode( version )#", method = "get", headers = { 'x-api-token' : arguments.APIToken @@ -551,7 +551,7 @@ or just add DEBUG to the root logger if( errorDetail != statusMessage ) { errorDetail &= chr( 10 ) & statusMessage; } - errorDetail = ucase( arguments.method ) & ' ' &thisURL & chr( 10 ) & errorDetail; + errorDetail = ucase( arguments.method ) & ' ' & thisURL & ' ' & errorDetail; CommandBoxlogger.error( 'Something other than JSON returned. #errorDetail#', 'Actual HTTP Response: ' & results.rawResponse ); throw( 'Uh-oh, ForgeBox returned something other than JSON. Run "system-log | open" to see the full response.', 'forgebox', errorDetail ); } From 7fd2338dca87dbefc86b39401aad00eacd789d6c Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Fri, 8 Feb 2019 21:45:28 -0600 Subject: [PATCH 20/30] make this message stand out a bit more --- src/cfml/system/endpoints/ForgeBox.cfc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cfml/system/endpoints/ForgeBox.cfc b/src/cfml/system/endpoints/ForgeBox.cfc index b6f2a043a..f89f1ce27 100644 --- a/src/cfml/system/endpoints/ForgeBox.cfc +++ b/src/cfml/system/endpoints/ForgeBox.cfc @@ -225,7 +225,7 @@ component accessors="true" implements="IEndpointInteractive" { try { forgebox.getStorageLocation( props.slug, props.version, props.APIToken ); if ( ! arguments.force ) { - consoleLogger.warn( "A zip for this version has already been uploaded. If you want to override the uploaded zip, run this command with the `force` flag. We will continue to update your package metadata." ); + consoleLogger.error( "A zip for this version has already been uploaded. If you want to override the uploaded zip, run this command with the `force` flag. We will continue to update your package metadata." ); upload = false; } } From ac448b7e83bac29e86290f0268124fce9fd0a96a Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Wed, 13 Feb 2019 00:48:12 -0600 Subject: [PATCH 21/30] COMMANDBOX-948 --- src/cfml/system/util/ForgeBox.cfc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cfml/system/util/ForgeBox.cfc b/src/cfml/system/util/ForgeBox.cfc index 4a0804983..bc35e3447 100644 --- a/src/cfml/system/util/ForgeBox.cfc +++ b/src/cfml/system/util/ForgeBox.cfc @@ -410,7 +410,7 @@ or just add DEBUG to the root logger // If there's only one suggestion and it doesn't have an @ in it, add another suggestion with the @ at the end. // This is to prevent the tab completion from adding a space after the suggestion since it thinks it's the only possible option // Hitting tab will still populate the line, but won't add the space which makes it easier if the user intends to continue for a specific version. - if( opts.len() == 1 && !( opts[1] contains '@' ) ) { + if( opts.len() == 1 && ( !( opts[1] contains '@' ) || opts[1].listRest( '@' ).reFindNoCase( '^[a-z]' ) ) ) { opts.append( opts[1] & '@' ); } From 9071cd1f7668e77af8ad0608db3546e37ee2670f Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Wed, 13 Feb 2019 00:52:06 -0600 Subject: [PATCH 22/30] COMMANDBOX-949 --- .../system/modules_app/system-commands/commands/run.cfc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cfml/system/modules_app/system-commands/commands/run.cfc b/src/cfml/system/modules_app/system-commands/commands/run.cfc index 37094d298..b3406b712 100644 --- a/src/cfml/system/modules_app/system-commands/commands/run.cfc +++ b/src/cfml/system/modules_app/system-commands/commands/run.cfc @@ -115,9 +115,13 @@ component{ // I convert the byte array in the piped input stream to a character array var inputStreamReader = createObject( 'java', 'java.io.InputStreamReader' ).init( inputStream ); + var interruptCount = 0; // This will block/loop until the input stream closes, which means this loops until the process ends. while( ( var char = inputStreamReader.read() ) != -1 ) { - checkInterrupted(); + if( ++interruptCount > 1000 ) { + checkInterrupted(); + interruptCount=0; + } // if running non-interactive, gather the output of the command processOutputStringBuilder.append( javaCast( 'char', char ) ); } From f810c57bab8e94b127ca22f1bcce8d3a7cd330d1 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Thu, 14 Feb 2019 10:04:50 -0600 Subject: [PATCH 23/30] This little guy is annoying --- src/cfml/system/services/ModuleService.cfc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cfml/system/services/ModuleService.cfc b/src/cfml/system/services/ModuleService.cfc index a8b18db66..736061dba 100644 --- a/src/cfml/system/services/ModuleService.cfc +++ b/src/cfml/system/services/ModuleService.cfc @@ -165,7 +165,7 @@ if( len( arguments.invocationPath ) ){ // Check if passed module name is already registered if( structKeyExists( instance.moduleRegistry, arguments.moduleName ) AND !arguments.force ){ - instance.logger.warn( "The module #arguments.moduleName# has already been registered, so skipping registration" ); + instance.logger.debug( "The module #arguments.moduleName# has already been registered, so skipping registration" ); return false; } // register new incoming location From d8a9fb259fac607691b6cef8f4a3d3e45f8338a9 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Thu, 14 Feb 2019 12:09:00 -0600 Subject: [PATCH 24/30] COMMANDBOX-951 --- src/cfml/system/services/ModuleService.cfc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/cfml/system/services/ModuleService.cfc b/src/cfml/system/services/ModuleService.cfc index 736061dba..90ca1971e 100644 --- a/src/cfml/system/services/ModuleService.cfc +++ b/src/cfml/system/services/ModuleService.cfc @@ -468,8 +468,13 @@ interceptorProperties=mConfig.interceptors[ y ].properties, interceptorName=mConfig.interceptors[ y ].name); // Loop over module interceptors to autowire them - wirebox.autowire( target=interceptorService.getInterceptor( mConfig.interceptors[ y ].name, true ), - targetID=mConfig.interceptors[ y ].class ); + try { + wirebox.autowire( target=interceptorService.getInterceptor( mConfig.interceptors[ y ].name, true ), + targetID=mConfig.interceptors[ y ].class ); + } catch( EventPoolManager.ObjectNotFound var e ){ + // This error simply means our interceptor had no states + // And an interceptor with no states basically ceases to exist as it has no purpose in life + } } // Register module routing entry point pre-pended to routes From b9159dbccdcce2bd71c0471072309cd94d500eba Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Fri, 15 Feb 2019 14:44:37 -0600 Subject: [PATCH 25/30] Typo --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index b4f0d699d..d24c8561d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -199,7 +199,7 @@ External Dependencies: - + Date: Fri, 22 Feb 2019 13:13:09 -0600 Subject: [PATCH 26/30] COMMANDBOX-953 --- src/cfml/system/util/FileSystem.cfc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/cfml/system/util/FileSystem.cfc b/src/cfml/system/util/FileSystem.cfc index 56b735b62..521d8ab3c 100644 --- a/src/cfml/system/util/FileSystem.cfc +++ b/src/cfml/system/util/FileSystem.cfc @@ -246,12 +246,18 @@ component accessors="true" singleton { if( !findNoCase( "http", arguments.URI ) ){ arguments.URI = "http://#arguments.uri#"; } - - // open using awt class, if it fails, we are in headless mode. - if( desktop.isDesktopSupported() ){ - desktop.getDesktop().browse( createObject( "java", "java.net.URI" ).init( arguments.URI ) ); - return true; - } + + // Some openJDK distros error out above if installed headlessly. + try { + // open using awt class, if it fails, we are in headless mode. + if( desktop.isDesktopSupported() ){ + desktop.getDesktop().browse( createObject( "java", "java.net.URI" ).init( arguments.URI ) ); + return true; + } + } catch( any var e ) { + // Bird strike! Log it. + logger.error( '#e.message# #e.detail#' ); + } // if we get here, then we don't support desktop awt class, most likely in headless mode. var runtime = createObject( "java", "java.lang.Runtime" ).getRuntime(); From 3f1d17e330ae12bcc4b80501b82f731638b36419 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Sat, 23 Feb 2019 12:15:35 -0600 Subject: [PATCH 27/30] COMMANDBOX-937 --- src/cfml/system/services/ArtifactService.cfc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/cfml/system/services/ArtifactService.cfc b/src/cfml/system/services/ArtifactService.cfc index 7c7733f05..4ce5c2f9c 100644 --- a/src/cfml/system/services/ArtifactService.cfc +++ b/src/cfml/system/services/ArtifactService.cfc @@ -21,7 +21,6 @@ component accessors="true" singleton { property name='packageService' inject='PackageService'; property name='logger' inject='logbox:logger:{this}'; property name="semanticVersion" inject="provider:semanticVersion@semver"; - // COMMANDBOX-479 property name="configService" inject="ConfigService"; @@ -31,7 +30,6 @@ component accessors="true" singleton { function onDIComplete() { // Create the artifacts directory if it doesn't exist - // COMMANDBOX-479 if( !directoryExists( getArtifactsDirectory() ) ) { directoryCreate( getArtifactsDirectory() ); } @@ -44,8 +42,9 @@ component accessors="true" singleton { * @returns A struct of arrays where the struct key is the package package and the array contains the versions of that package in the cache. */ struct function listArtifacts( packageName='' ) { - var result = {}; - // COMMANDBOX-479 + // Ordered struct + var result = [:]; + var dirList = directoryList( path=getArtifactsDirectory(), recurse=false, listInfo='query', sort='name asc' ); for( var dir in dirList ) { @@ -71,7 +70,7 @@ component accessors="true" singleton { * Removes all artifacts from the cache and returns the number of wiped out directories */ numeric function cleanArtifacts() { - // COMMANDBOX-479 + var qryDir = directoryList( path=getArtifactsDirectory(), recurse=false, listInfo='query' ); var numRemoved = 0; @@ -115,7 +114,7 @@ component accessors="true" singleton { */ function getPackagePath( required packageName, version="" ){ // This will likely change, so I'm only going to put the code here. - // COMMANDBOX-479 + var path = getArtifactsDirectory() & '/' & arguments.packageName; // do we have a version? if( arguments.version.len() ){ @@ -267,7 +266,7 @@ component accessors="true" singleton { } } - // COMMANDBOX-479 + string function getArtifactsDirectory() { return configService.getSetting( 'artifactsDirectory', variables.artifactDir ); } From 731a9a7495bf60568e61663c8da603d7a331635b Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Sat, 23 Feb 2019 12:40:02 -0600 Subject: [PATCH 28/30] COMMANDBOX-249 --- .../commands/coldbox/create/handler.cfc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/cfml/system/modules_app/coldbox-commands/commands/coldbox/create/handler.cfc b/src/cfml/system/modules_app/coldbox-commands/commands/coldbox/create/handler.cfc index 4fe59651c..2a95978a8 100644 --- a/src/cfml/system/modules_app/coldbox-commands/commands/coldbox/create/handler.cfc +++ b/src/cfml/system/modules_app/coldbox-commands/commands/coldbox/create/handler.cfc @@ -83,12 +83,18 @@ component aliases='coldbox create controller' { // Are we creating views? if( arguments.views ) { - var viewPath = arguments.viewsDirectory & '/' & arguments.name & '/' & thisAction & '.cfm'; + + var camelCaseHandlerName = arguments.name.left( 1 ).lCase(); + if( arguments.name.len() > 1 ) { + camelCaseHandlerName &= arguments.name.right( -1 ); + } + + var viewPath = resolvePath( arguments.viewsDirectory & '/' & camelCaseHandlerName & '/' & thisAction & '.cfm' ); // Create dir if it doesn't exist directorycreate( getDirectoryFromPath( viewPath ), true, true ); // Create View Stub fileWrite( viewPath, '#cr#

#arguments.name#.#thisAction#

#cr#' ); - print.greenLine( 'Created ' & arguments.viewsDirectory & '/' & arguments.name & '/' & thisAction & '.cfm' ); + print.greenLine( 'Created ' & viewPath ); } // Are we creating tests cases on actions @@ -109,7 +115,7 @@ component aliases='coldbox create controller' { handlerTestContent = replaceNoCase( handlerTestContent, '|TestCases|', '', 'all' ); } - var handlerPath = '#arguments.directory#/#arguments.name#.cfc'; + var handlerPath = resolvePath( '#arguments.directory#/#arguments.name#.cfc' ); // Create dir if it doesn't exist directorycreate( getDirectoryFromPath( handlerPath ), true, true ); @@ -124,7 +130,7 @@ component aliases='coldbox create controller' { print.greenLine( 'Created #handlerPath#' ); if( arguments.integrationTests ) { - var testPath = '#arguments.testsDirectory#/#arguments.name#Test.cfc'; + var testPath = resolvePath( '#arguments.testsDirectory#/#arguments.name#Test.cfc' ); // Create dir if it doesn't exist directorycreate( getDirectoryFromPath( testPath ), true, true ); // Create the tests From e035b2c62b7e7fb9a46a260eab3fa72860e23ef4 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Thu, 28 Feb 2019 17:22:34 -0600 Subject: [PATCH 29/30] Final bump for 4.6.0 --- build/build.properties | 2 +- build/build.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build.properties b/build/build.properties index 569f057a1..7b14377bd 100644 --- a/build/build.properties +++ b/build/build.properties @@ -11,7 +11,7 @@ java.debug=true #dependencies dependencies.dir=${basedir}/lib cfml.version=5.2.9.31 -cfml.loader.version=2.2.10 +cfml.loader.version=2.2.11 cfml.cli.version=${cfml.loader.version}.${cfml.version} lucee.version=${cfml.version} lucee.config.version=5.2.4.37 diff --git a/build/build.xml b/build/build.xml index d24c8561d..69dfcd086 100644 --- a/build/build.xml +++ b/build/build.xml @@ -16,8 +16,8 @@ External Dependencies: - - + + From c74d4b9e65a14f14359dce5fca6a71433d8ec3e9 Mon Sep 17 00:00:00 2001 From: Brad Wood Date: Thu, 28 Feb 2019 17:36:19 -0600 Subject: [PATCH 30/30] Bump to latest JRE --- build/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.properties b/build/build.properties index 7b14377bd..c7b837428 100644 --- a/build/build.properties +++ b/build/build.properties @@ -16,7 +16,7 @@ cfml.cli.version=${cfml.loader.version}.${cfml.version} lucee.version=${cfml.version} lucee.config.version=5.2.4.37 jre.adoptVesionr=openjdk8 -jre.version=jdk8u192-b12 +jre.version=jdk8u202-b08 launch4j.version=3.12 runwar.version=3.8.1-SNAPSHOT jline.version=3.8.2