Skip to content

Commit 75ca89b

Browse files
committed
making sure our masks are ok for boxlang prime
1 parent ee23222 commit 75ca89b

11 files changed

Lines changed: 20 additions & 20 deletions

File tree

server-boxlang-cfml@1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"JVM":{
2222
"heapSize":"1024",
2323
"javaVersion":"openjdk21_jre",
24-
"args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9999"
24+
"args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9998"
2525
},
2626
"cfconfig":{
2727
"file":".cfconfig.json"

system/async/tasks/ScheduledTask.cfc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -464,29 +464,29 @@ component accessors="true" {
464464
/**
465465
* Set when this task should start execution on. By default it starts automatically.
466466
*
467-
* @date The date when this task should start execution on => yyyy-mm-dd format is preferred.
467+
* @date The date when this task should start execution on => yyyy-MM-dd format is preferred.
468468
* @time The specific time using 24 hour format => HH:mm, defaults to 00:00
469469
*/
470470
ScheduledTask function startOn( required date, string time = "00:00" ){
471471
debugLog( "startOn", arguments );
472472

473473
variables.startOnDateTime = variables.dateTimeHelper.parse(
474-
"#dateFormat( arguments.date, "yyyy-mm-dd" )#T#arguments.time#"
474+
"#dateFormat( arguments.date, "yyyy-MM-dd" )#T#arguments.time#"
475475
);
476476
return this;
477477
}
478478

479479
/**
480480
* Set when this task should stop execution on. By default it never ends
481481
*
482-
* @date The date when this task should stop execution on => yyyy-mm-dd format is preferred.
482+
* @date The date when this task should stop execution on => yyyy-MM-dd format is preferred.
483483
* @time The specific time using 24 hour format => HH:mm, defaults to 00:00
484484
*/
485485
ScheduledTask function endOn( required date, string time = "00:00" ){
486486
debugLog( "endOn", arguments );
487487

488488
variables.endOnDateTime = variables.dateTimeHelper.parse(
489-
"#dateFormat( arguments.date, "yyyy-mm-dd" )#T#arguments.time#"
489+
"#dateFormat( arguments.date, "yyyy-MM-dd" )#T#arguments.time#"
490490
);
491491
return this;
492492
}
@@ -648,12 +648,12 @@ component accessors="true" {
648648
len( variables.endTime )
649649
) {
650650
var _startTime = variables.dateTimeHelper.parse(
651-
dateFormat( getJavaNow().toString(), "yyyy-mm-dd" ) & "T" & (
651+
dateFormat( getJavaNow().toString(), "yyyy-MM-dd" ) & "T" & (
652652
len( variables.startTime ) ? variables.startTime : "00:00:00"
653653
)
654654
);
655655
var _endTime = variables.dateTimeHelper.parse(
656-
dateFormat( getJavaNow().toString(), "yyyy-mm-dd" ) & "T" & (
656+
dateFormat( getJavaNow().toString(), "yyyy-MM-dd" ) & "T" & (
657657
len( variables.endTime ) ? variables.endTime : "23:59:59"
658658
)
659659
);
@@ -1662,7 +1662,7 @@ component accessors="true" {
16621662
function debugLog( required string caller, struct args = {} ){
16631663
if ( variables.debug ) {
16641664
var message = [
1665-
dateTimeFormat( now(), "yyyy-mm-dd hh:nn:ss" ),
1665+
dateTimeFormat( now(), "yyyy-MM-dd hh:mm:ss" ),
16661666
"ScheduledTask",
16671667
"group: #getGroup()#",
16681668
"name: #getName()#",

system/cache/report/skins/default/CacheContentReport.cfm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
<!--- Created --->
3535
<td align="center" >
3636
<cfif !isNull( cacheMetadata[thisKey][ cacheMDKeyLookup.Created ] )>
37-
#dateformat( cacheMetadata[thisKey][ cacheMDKeyLookup.Created ], "mmm-dd" )# <br/>
37+
#dateformat( cacheMetadata[thisKey][ cacheMDKeyLookup.Created ], "MMM-dd" )# <br/>
3838
#timeformat( cacheMetadata[thisKey][ cacheMDKeyLookup.created ], "hh:mm:ss tt" )#
3939
</cfif>
4040
</td>
4141
<!--- Last Accessed --->
4242
<td align="center">
4343
<cfif !isNull( cacheMetadata[thisKey][ cacheMDKeyLookup.LastAccessed ] )>
44-
#dateformat(cacheMetadata[thisKey][ cacheMDKeyLookup.LastAccessed ],"mmm-dd")# <br/>
44+
#dateformat(cacheMetadata[thisKey][ cacheMDKeyLookup.LastAccessed ],"MMM-dd")# <br/>
4545
#timeformat(cacheMetadata[thisKey][ cacheMDKeyLookup.LastAccessed ],"hh:mm:ss tt")#
4646
</cfif>
4747
</td>

system/cache/report/skins/default/CacheReport.cfm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
Last Reap
4141
</div>
4242
<div class="cachebox_debugContentCell">
43-
#DateFormat(cacheStats.getlastReapDatetime(),"mmm-dd-yyyy")#
43+
#DateFormat(cacheStats.getlastReapDatetime(),"MMM-dd-yyyy")#
4444
#TimeFormat(cacheStats.getlastReapDatetime(),"hh:mm:ss tt")#
4545
</div>
4646
</cfif>

system/exceptions/BugReport.cfm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ A reporting template about exceptions in your ColdBox Apps
6868
</cfif>
6969
<tr>
7070
<td align="right" class="info"><strong>Timestamp: </strong></td>
71-
<td>#dateformat(now(), "mm/dd/yyyy")# #timeformat(now(),"hh:mm:ss tt")#</td>
71+
<td>#dateformat(now(), "MM/dd/yyyy")# #timeformat(now(),"hh:mm:ss tt")#</td>
7272
</tr>
7373
<tr >
7474
<th colspan="2" >Event Details:</th>
@@ -155,7 +155,7 @@ A reporting template about exceptions in your ColdBox Apps
155155
<table class="table" align="center">
156156
<tr>
157157
<td align="right" class="info">Bug Date:</td>
158-
<td >#dateformat(now(), "mm/dd/yyyy")# #timeformat(now(),"hh:mm:ss tt")#</td>
158+
<td >#dateformat(now(), "MM/dd/yyyy")# #timeformat(now(),"hh:mm:ss tt")#</td>
159159
</tr>
160160

161161
<tr>

system/exceptions/Whoops.cfm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201

202202
<h1 class="exception__timestamp" title="Time of exception">
203203
<i data-eva="clock-outline" fill="##7fcbe2"></i>
204-
<span>#dateTimeFormat( now(), "mm/dd/yyyy hh:nn tt" )#</span>
204+
<span>#dateTimeFormat( now(), "MMM/dd/yyyy HH:mm:ss" )#</span>
205205
</h1>
206206

207207
<h1 class="exception__type" title="Error Code and Exception Type">

system/logging/appenders/ConsoleAppender.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ component accessors="true" extends="coldbox.system.logging.AbstractAppender" {
5353
}
5454

5555
// Entry string
56-
entry = "#dateFormat( timestamp, "yyyy-mm-dd" )# #timeFormat( timestamp, "HH:MM:SS" )# #arguments.logEvent.getCategory()# #message#";
56+
entry = "#dateFormat( timestamp, "yyyy-MM-dd" )# #timeFormat( timestamp, "HH:mm:ss" )# #arguments.logEvent.getCategory()# #message#";
5757
}
5858

5959
// Log it

system/logging/appenders/DBAppender.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ component accessors="true" extends="coldbox.system.logging.AbstractAppender" {
171171
datetime : {
172172
cfsqltype : variables.queryParamDataTimeType,
173173
sqltype : variables.queryParamDataTimeType,
174-
value : "#dateFormat( targetDate, "mm/dd/yyyy" )#"
174+
value : "#dateFormat( targetDate, "MM/dd/yyyy" )#"
175175
}
176176
},
177177
{ datasource : dsn }

system/logging/appenders/FileAppender.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ component accessors="true" extends="coldbox.system.logging.AbstractAppender" {
108108
message = replace( message, chr( 13 ), " ", "all" );
109109

110110
// Entry string
111-
entry = """#severityToString( logEvent.getSeverity() )#"",""#getname()#"",""#dateFormat( timestamp, "mm/dd/yyyy" )#"",""#timeFormat( timestamp, "HH:mm:ss" )#"",""#arguments.logEvent.getCategory()#"",""#message#""";
111+
entry = """#severityToString( logEvent.getSeverity() )#"",""#getname()#"",""#dateFormat( timestamp, "MM/dd/yyyy" )#"",""#timeFormat( timestamp, "HH:mm:ss" )#"",""#arguments.logEvent.getCategory()#"",""#message#""";
112112
}
113113

114114
// Queue it up

system/logging/appenders/RollingFileAppender.cfc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ component accessors="true" extends="coldbox.system.logging.appenders.FileAppende
5353

5454
/**
5555
* Get the default archive layout:
56-
* <code>#filename#-#yyy-mm-dd#-#hh-mm#-#archiveNumber#</code>
56+
* <code>#filename#-#yyy-MM-dd#-#hh-mm#-#archiveNumber#</code>
5757
* DO NOT ADD EXTENSION TO IT, WE WILL ADD IT
5858
*
5959
* @filename The filename to use for the archive layout
@@ -64,7 +64,7 @@ component accessors="true" extends="coldbox.system.logging.appenders.FileAppende
6464
function getDefaultArchiveLayout( required filename, required archiveCount ){
6565
return arguments.fileName &
6666
"-" &
67-
dateFormat( now(), "yyyy-mm-dd" ) &
67+
dateFormat( now(), "yyyy-MM-dd" ) &
6868
"-" &
6969
timeFormat( now(), "HH-mm" ) &
7070
"-#arguments.archiveCount + 1#";

0 commit comments

Comments
 (0)