Skip to content

Commit d3b8252

Browse files
lmajanolmajano
committed
CONTENTBOX-1539 #resolve
statusText removed in Jakarta specs
1 parent cfa7914 commit d3b8252

File tree

6 files changed

+77
-83
lines changed

6 files changed

+77
-83
lines changed

‎box.json‎

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
{
2-
"name": "ContentBox Tester Site",
3-
"version": "6.1.0",
4-
"author": "Ortus Solutions <info@ortussolutions.com>",
5-
"shortDescription": "A tester site for developing the ContentBox Modular CMS",
6-
"type": "cms",
7-
"keywords": "cms,content management,modular cms",
8-
"homepage": "https://www.contentboxcms.org",
9-
"documentation": "https://contentbox.ortusbooks.com",
10-
"repository": {
11-
"type": "git",
12-
"url": "https://github.com/Ortus-Solutions/ContentBox"
13-
},
14-
"bugs": "https://ortussolutions.atlassian.net/browse/CONTENTBOX",
15-
"license": [
16-
{
17-
"type": "Apache2",
18-
"url": "http://www.apache.org/licenses/LICENSE-2.0.html"
19-
}
20-
],
21-
"contributors": [
22-
"Joel Watson <existdissolve@gmail.com>",
23-
"Brad Wood <bdw429s@gmail.com>",
24-
"Curt Gratz <gratz@computerknowhow.com>"
25-
],
26-
"dependencies": {
27-
"coldbox": "^7.0.0",
28-
"commandbox-migrations": "^5.0.0"
29-
},
30-
"devDependencies": {
31-
"testbox": "^5.0.0+1",
32-
"commandbox-boxlang": "*",
33-
"commandbox-cfformat": "*",
34-
"commandbox-cfconfig" : "*",
35-
"commandbox-docbox": "*",
36-
"cbdebugger": "*",
37-
"route-visualizer": "*"
38-
},
39-
"installPaths": {
40-
"testbox": "testbox/",
41-
"coldbox": "coldbox/",
42-
"cbdebugger": "modules/cbdebugger/",
43-
"route-visualizer": "modules/route-visualizer/"
44-
},
45-
"ignores": [],
46-
"scripts": {
47-
"release": "recipe build/release.boxr",
48-
"build:allDocs": "task run taskFile=build/BuildDocs.cfc :version=`package show version`",
49-
"build:apidocs": "task run taskFile=build/BuildDocs.cfc target=apiDocs :version=`package show version`",
50-
"build:swagger": "task run taskFile=build/BuildDocs.cfc target=swagger :version=`package show version`",
51-
"dbseed:mysql": "task run contentbox/modules/seeders/MSSQL.cfc",
52-
"dbseed:mssal": "task run contentbox/modules/seeders/SeedMySQL.cfc",
53-
"dbseed:postgres": "task run contentbox/modules/seeders/SeedPostgreSQL.cfc",
54-
"format": "cfformat run config/**/*.cfc,modules_app/**/*.cfc,modules/contentbox/**/*.cfc,tests/**/*.cfc,Application.cfc --overwrite",
55-
"format:watch": "cfformat watch config/**/*.cfc,modules_app/**/*.cfc,modules/contentbox/**/*.cfc,tests/**/*.cfc,Application.cfc ./.cfformat.json",
56-
"format:watch:core": "cfformat watch config/**/*.cfc,modules/contentbox/models/**/*.cfc,Application.cfc ./.cfformat.json",
57-
"format:check": "cfformat check config/**/*.cfc,modules_app/**/*.cfc,modules/contentbox/**/*.cfc,tests/**/*.cfc,Application.cfc ./.cfformat.json",
58-
"contentbox:install": "install --force && cd modules/contentbox && install --force",
59-
"contentbox:migrate:create": "migrate create name=${1} manager=contentbox",
60-
"contentbox:migrate": "migrate up manager=contentbox",
61-
"contentbox:migrate:up": "run-script contentbox:migrate",
62-
"contentbox:migrate:down": "migrate down manager=contentbox",
63-
"contentbox:migrate:fresh": "migrate fresh manager=contentbox"
64-
},
65-
"testbox": {
66-
"runner": [
67-
{
68-
"default": "http://127.0.0.1:8589/tests/runner.cfm"
69-
},
70-
{
71-
"api": "http://127.0.0.1:8589/tests/runner-api.cfm"
72-
}
73-
]
74-
}
2+
"name":"ContentBox Tester Site",
3+
"version":"6.1.0",
4+
"author":"Ortus Solutions <info@ortussolutions.com>",
5+
"shortDescription":"A tester site for developing the ContentBox Modular CMS",
6+
"type":"cms",
7+
"keywords":"cms,content management,modular cms",
8+
"homepage":"https://www.contentboxcms.org",
9+
"documentation":"https://contentbox.ortusbooks.com",
10+
"repository":{
11+
"type":"git",
12+
"url":"https://github.com/Ortus-Solutions/ContentBox"
13+
},
14+
"bugs":"https://ortussolutions.atlassian.net/browse/CONTENTBOX",
15+
"license":[
16+
{
17+
"type":"Apache2",
18+
"url":"http://www.apache.org/licenses/LICENSE-2.0.html"
19+
}
20+
],
21+
"contributors":[
22+
"Joel Watson <existdissolve@gmail.com>",
23+
"Brad Wood <bdw429s@gmail.com>",
24+
"Curt Gratz <gratz@computerknowhow.com>"
25+
],
26+
"dependencies":{
27+
"coldbox":"be",
28+
"commandbox-migrations":"^5.0.0"
29+
},
30+
"devDependencies":{
31+
"testbox":"^5.0.0+1",
32+
"commandbox-boxlang":"*",
33+
"commandbox-cfformat":"*",
34+
"commandbox-cfconfig":"*",
35+
"commandbox-docbox":"*",
36+
"cbdebugger":"*",
37+
"route-visualizer":"*"
38+
},
39+
"installPaths":{
40+
"testbox":"testbox/",
41+
"coldbox":"coldbox/",
42+
"cbdebugger":"modules/cbdebugger/",
43+
"route-visualizer":"modules/route-visualizer/"
44+
},
45+
"ignores":[],
46+
"scripts":{
47+
"release":"recipe build/release.boxr",
48+
"build:allDocs":"task run taskFile=build/BuildDocs.cfc :version=`package show version`",
49+
"build:apidocs":"task run taskFile=build/BuildDocs.cfc target=apiDocs :version=`package show version`",
50+
"build:swagger":"task run taskFile=build/BuildDocs.cfc target=swagger :version=`package show version`",
51+
"dbseed:mysql":"task run contentbox/modules/seeders/MSSQL.cfc",
52+
"dbseed:mssal":"task run contentbox/modules/seeders/SeedMySQL.cfc",
53+
"dbseed:postgres":"task run contentbox/modules/seeders/SeedPostgreSQL.cfc",
54+
"format":"cfformat run config/**/*.cfc,modules_app/**/*.cfc,modules/contentbox/**/*.cfc,tests/**/*.cfc,Application.cfc --overwrite",
55+
"format:watch":"cfformat watch config/**/*.cfc,modules_app/**/*.cfc,modules/contentbox/**/*.cfc,tests/**/*.cfc,Application.cfc ./.cfformat.json",
56+
"format:watch:core":"cfformat watch config/**/*.cfc,modules/contentbox/models/**/*.cfc,Application.cfc ./.cfformat.json",
57+
"format:check":"cfformat check config/**/*.cfc,modules_app/**/*.cfc,modules/contentbox/**/*.cfc,tests/**/*.cfc,Application.cfc ./.cfformat.json",
58+
"contentbox:install":"install --force && cd modules/contentbox && install --force",
59+
"contentbox:migrate:create":"migrate create name=${1} manager=contentbox",
60+
"contentbox:migrate":"migrate up manager=contentbox",
61+
"contentbox:migrate:up":"run-script contentbox:migrate",
62+
"contentbox:migrate:down":"migrate down manager=contentbox",
63+
"contentbox:migrate:fresh":"migrate fresh manager=contentbox"
64+
},
65+
"testbox":{
66+
"runner":[
67+
{
68+
"default":"http://127.0.0.1:8589/tests/runner.cfm"
69+
},
70+
{
71+
"api":"http://127.0.0.1:8589/tests/runner-api.cfm"
72+
}
73+
]
74+
}
7575
}

‎modules/contentbox/apidocs/auth/refreshToken/example.200.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
"jsonQueryFormat": "query",
8484
"contentType": "",
8585
"statusCode": 400,
86-
"statusText": "Missing refresh token",
8786
"responsetime": 1,
8887
"headers": [
8988
{
@@ -107,4 +106,4 @@
107106
"VALUE": 1
108107
}
109108
]
110-
}
109+
}

‎modules/contentbox/models/security/RateLimiter.cfc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ component extends="coldbox.system.Interceptor" {
101101
)
102102
);
103103
arguments.event
104-
.setHTTPHeader( statusCode = "503", statusText = "Service Unavailable" )
104+
.setHTTPHeader( statusCode = "503" )
105105
.setHTTPHeader( name = "Retry-After", value = arguments.duration );
106106

107107
// No execution anymore.

‎modules/contentbox/modules/contentbox-api/modules/contentbox-api-v1/handlers/siteSettings.cfc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ component extends="baseHandler" secured="SITES_ADMIN" {
2323
.getResponse()
2424
.setError( true )
2525
.setStatusCode( arguments.event.STATUS.NOT_FOUND )
26-
.setStatusText( "The site requested doesn't exist" )
2726
.addMessage( "The site requested doesn't exist" );
2827
return;
2928
}

‎modules/contentbox/modules/contentbox-ui/handlers/content.cfc‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,7 @@ component {
209209
// Set cache headers if allowed
210210
if ( prc.cbSettings.cb_content_cachingHeader ) {
211211
event
212-
.setHTTPHeader(
213-
statusCode = "203",
214-
statustext = "ContentBoxCache Non-Authoritative Information"
215-
)
212+
.setHTTPHeader( statusCode = "203" )
216213
.setHTTPHeader( name = "x-contentbox-cached-content", value = "true" );
217214
}
218215
// Store hits

‎modules/contentbox/modules/contentbox-ui/handlers/media.cfc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ component singleton {
8383
// Render invalid media
8484
event.renderData(
8585
data = "<h1>404: Requested path not found</h1>",
86-
statusCode = "404",
87-
statusText = "Requested Path Not Found"
86+
statusCode = "404"
8887
);
8988
}
9089

0 commit comments

Comments
 (0)