Skip to content

Commit 18ec4d8

Browse files
lmajanolmajano
committed
Merge branch 'development'
2 parents 6b02c10 + 5281000 commit 18ec4d8

File tree

17 files changed

+188
-68
lines changed

17 files changed

+188
-68
lines changed

‎.gitignore‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
logs/*.log
33
settings.xml
44
.netbeans
5-
test/results/*.properties
6-
test/results/*.html
7-
test/results/*.log
8-
build
9-
tests/results
10-
modules/relax
11-
testbox
12-
coldbox
5+
tests/results/*
6+
modules/cbvalidation/*
7+
coldbox/*
8+
testbox/*
9+
artifacts/*
10+
apidocs/docbox/*
11+
workbench/build.number
12+
build/*

‎.travis.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
language: java
2+
notifications:
3+
slack:
4+
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=
5+
branches:
6+
only:
7+
- development
8+
sudo: required
9+
dist: trusty
10+
before_install:
11+
- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
12+
- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
13+
/etc/apt/sources.list.d/commandbox.list
14+
install:
15+
- sudo apt-get update && sudo apt-get --assume-yes install commandbox
16+
- box install
17+
- box server start
18+
before_script:
19+
# Startup the app
20+
- curl http://localhost:49616/
21+
script:
22+
- ant -f workbench/build.xml

‎apidocs/Application.cfc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ component{
88
API_ROOT = getDirectoryFromPath( getCurrentTemplatePath() );
99
rootPath = REReplaceNoCase( API_ROOT, "apidocs(\\|\/)$", "" );
1010

11-
this.mappings[ "/docbox" ] = API_ROOT & "docbox";
12-
this.mappings[ "/root" ] = rootPath;
13-
this.mappings[ "/coldbox" ] = rootPath & "coldbox";
14-
this.mappings[ "/cbdebugger" ] = rootPath & "modules/cbdebugger/models";
11+
// MODULE NAME
12+
request.moduleName = "cbdebugger";
13+
14+
this.mappings[ "/docbox" ] = API_ROOT & "docbox";
15+
this.mappings[ "/root" ] = rootPath;
16+
this.mappings[ "/#request.moduleName#" ] = rootPath & "modules/#request.moduleName#/models";
1517

1618
}

‎apidocs/box.json‎

Lines changed: 67 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,45 @@
11
{
22
"name":"API Docs",
33
"version":"1.0.0",
4+
"author":"",
5+
"location":"",
6+
"directory":"",
7+
"createPackageDirectory":true,
8+
"packageDirectory":"",
9+
"homepage":"",
10+
"documentation":"",
11+
"repository":{
12+
"type":"",
13+
"URL":""
14+
},
15+
"bugs":"",
416
"slug":"module-apidocs",
17+
"shortDescription":"",
18+
"description":"",
19+
"instructions":"",
20+
"changelog":"",
21+
"type":"",
22+
"keywords":[
23+
24+
],
525
"private":true,
6-
"defaultPort":8511,
26+
"engines":[
27+
{
28+
"type":"",
29+
"version":""
30+
}
31+
],
32+
"defaultEngine":"",
33+
"projectURL":"",
34+
"license":[
35+
{
36+
"type":"",
37+
"URL":""
38+
}
39+
],
40+
"contributors":[
41+
42+
],
743
"dependencies":{
844
"docbox":"https://github.com/Ortus-Solutions/DocBox/archive/v2.0.4.zip"
945
},
@@ -16,5 +52,34 @@
1652
"ignore":[
1753
"**/.*",
1854
"tests"
19-
]
55+
],
56+
"testbox":{
57+
"runner":[
58+
{
59+
"default":""
60+
}
61+
],
62+
"labels":[
63+
64+
],
65+
"reporter":"",
66+
"reporterResults":"",
67+
"bundles":[
68+
""
69+
],
70+
"directory":{
71+
"mapping":"",
72+
"recurse":true
73+
},
74+
"watchers":[
75+
76+
],
77+
"notify":{
78+
"emails":[
79+
80+
],
81+
"growl":"",
82+
"URL":""
83+
}
84+
}
2085
}

‎apidocs/index.cfm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<cfparam name="url.version" default="0">
2-
<cfparam name="url.path" default="#expandPath( "./cbdebugger-APIDocs" )#">
2+
<cfparam name="url.path" default="#expandPath( "./#request.moduleName#-APIDocs" )#">
33
<cfscript>
4-
docName = "cbdebugger-APIDocs";
5-
base = expandPath( "/cbdebugger" );
4+
docName = "#request.moduleName#-APIDocs";
5+
base = expandPath( "/#request.moduleName#" );
66
docbox = new docbox.DocBox( properties = {
7-
projectTitle = "cbdebugger v#url.version#",
7+
projectTitle = "#request.moduleName# v#url.version#",
88
outputDir = url.path
99
} );
10-
docbox.generate( source=base, mapping="cbdebugger" );
10+
docbox.generate( source=base, mapping=request.moduleName );
1111
</cfscript>
1212

1313
<!---

‎apidocs/server.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"force":true,
3+
"openbrowser":"false",
4+
"web":{
5+
"http":{
6+
"port":"8511"
7+
}
8+
}
9+
}

‎box.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
{
2-
"name":"CBDebugger Builder",
2+
"name":"cbdebugger Builder",
33
"version":"1.0.0",
4-
"slug" : "cbdebugger-shell",
4+
"slug":"cbdebugger-shell",
55
"private":false,
66
"defaultPort":0,
77
"dependencies":{
8-
"relax":"1.7",
98
"coldbox":"4.1.0+00002"
109
},
1110
"devDependencies":{
12-
"testbox":"2.0.0"
11+
"testbox":"2.3.0+00044"
1312
},
1413
"installPaths":{
15-
"relax":"modules/relax",
1614
"coldbox":"coldbox",
1715
"testbox":"testbox"
1816
}

‎config/Coldbox.cfc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<cfcomponent output="false" hint="My App Configuration">
2-
<cfscript>
1+
component{
2+
33
// Configure ColdBox Application
44
function configure(){
55

@@ -106,5 +106,5 @@
106106
];
107107

108108
}
109-
</cfscript>
110-
</cfcomponent>
109+
110+
}

‎modules/cbdebugger/ModuleConfig.cfc‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
/**
2-
*********************************************************************************
32
* Copyright Since 2005 ColdBox Framework by Luis Majano and Ortus Solutions, Corp
4-
* www.coldbox.org | www.luismajano.com | www.ortussolutions.com
5-
********************************************************************************
3+
* www.ortussolutions.com
4+
* ---
65
*/
76
component {
87

98
// Module Properties
109
this.title = "ColdBox Debugger";
1110
this.author = "Curt Gratz";
12-
this.webURL = "http://www.coldbox.org";
11+
this.webURL = "http://www.ortussolutions.com";
1312
this.description = "The ColdBox Debugger Module";
14-
this.version = "1.2.0[email protected]@";
13+
this.version = "@version.number@[email protected]@";
1514
// If true, looks for views in the parent first, if not found, then in the module. Else vice-versa
1615
this.viewParentLookup = true;
1716
// If true, looks for layouts in the parent first, if not found, then in module. Else vice-versa

‎modules/cbdebugger/box.json‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,26 @@
11
{
22
"name" : "ColdBox Debugger",
3-
"version" : "1.2.0",
4-
"author" : "Curt Gratz <[email protected]",
3+
"author" : "Ortus Solutions <[email protected]",
4+
"version" : "@version.number@[email protected]@",
55
"slug" : "cbdebugger",
66
"type" : "modules",
7-
"homepage" : "http://www.coldbox.org",
7+
"homepage" : "https://github.com/ColdBox/cbox-debugger",
88
"documentation" : "https://github.com/ColdBox/cbox-debugger",
99
"repository" : { "type" : "git", "url" : "https://github.com/ColdBox/cbox-debugger" },
1010
"shortDescription" : "The official ColdBox 4 debugger module",
1111
"license" : [
1212
{ "type" : "Apache2", "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" }
1313
],
1414
"contributors" : [
15-
"Brad Wood <[email protected]>", "Luis Majano <[email protected]>"
15+
"Curt Gratz <[email protected]", "Brad Wood <[email protected]>", "Luis Majano <[email protected]>"
1616
],
1717
"engines" : [
1818
{ "type" : "lucee", "version" : ">4.5" },
1919
{ "type" : "adobe", "version" : ">9.02" }
2020
],
21-
"testbox" : {
22-
"runner" : {
23-
"cf10" : "http://cf10cboxdev.jfetmac/codedepot/cbox-debugger/test/runner.cfm",
24-
"railo" : "http://railocboxdev.jfetmac/codedepot/cbox-debugger/test/runner.cfm"
25-
}
26-
},
2721
"ignore":[
2822
"**/.*",
29-
"test",
3023
"tests",
31-
"apidocs",
3224
"*/.md"
3325
]
3426
}

0 commit comments

Comments
 (0)