Skip to content

Commit 0a077ca

Browse files
lmajanolmajano
committed
finalized for release
1 parent 478ef57 commit 0a077ca

35 files changed

+199
-57
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ test/results/*.properties
66
test/results/*.html
77
test/results/*.log
88
tests/results
9-
modules/javaloader
10-
modules/i18n
9+
modules/cbjavaloader
10+
modules/cbi18n

‎Application.cfc‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ component{
1111
this.sessionTimeout = createTimeSpan(0,0,30,0);
1212
this.setClientCookies = true;
1313

14-
// Mappings Imports
15-
import coldbox.system.*;
16-
1714
// COLDBOX STATIC PROPERTY, DO NOT CHANGE UNLESS THIS IS NOT THE ROOT OF YOUR COLDBOX APP
1815
COLDBOX_APP_ROOT_PATH = getDirectoryFromPath( getCurrentTemplatePath() );
1916
// The web server mapping to this application. Used for remote purposes or static purposes
@@ -32,15 +29,6 @@ component{
3229

3330
// request start
3431
public boolean function onRequestStart(String targetPage){
35-
36-
// Bootstrap Reinit
37-
if( not structKeyExists(application,"cbBootstrap") or application.cbBootStrap.isfwReinit() ){
38-
lock name="coldbox.bootstrap_#this.name#" type="exclusive" timeout="5" throwonTimeout=true{
39-
structDelete( application, "cbBootStrap" );
40-
onApplicationStart();
41-
}
42-
}
43-
4432
// Process ColdBox Request
4533
application.cbBootstrap.onRequestStart( arguments.targetPage );
4634

‎apidocs/Application.cfc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ component{
99

1010
rootPath = REReplaceNoCase( this.mappings[ "/colddoc" ], "apidocs(\\|\/)$", "" );
1111
this.mappings[ "/root" ] = rootPath;
12-
this.mappings[ "/cbvalidation" ] = rootPath & "modules/validation/models";
12+
this.mappings[ "/cbvalidation" ] = rootPath & "modules/cbvalidation/models";
1313

1414
// request start
1515
public boolean function onRequestStart(String targetPage){

‎box.json‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
{
2+
"name":"",
3+
"version":"1.0.0.0000",
4+
"author":"",
5+
"location":"",
6+
"directory":"",
7+
"createPackageDirectory":true,
8+
"packageDirectory":"",
9+
"homepage":"",
10+
"documentation":"",
11+
"repository":{
12+
"type":"",
13+
"url":""
14+
},
15+
"bugs":"",
16+
"slug":"",
17+
"shortDescription":"",
18+
"description":"",
19+
"instructions":"",
20+
"changelog":"",
21+
"type":"",
22+
"keywords":[
23+
24+
],
25+
"private":false,
26+
"engines":[
27+
{
28+
"type":"railo",
29+
"version":">=4.1.x"
30+
},
31+
{
32+
"type":"adobe",
33+
"version":">=10.0.0"
34+
}
35+
],
36+
"defaultEngine":"",
37+
"defaultPort":0,
38+
"projectURL":"",
39+
"license":[
40+
{
41+
"type":"",
42+
"url":""
43+
}
44+
],
45+
"contributors":[
46+
47+
],
48+
"dependencies":{
49+
"cbi18n":"1.0.0"
50+
},
51+
"devDependencies":{
52+
53+
},
54+
"installPaths":{
55+
"cbi18n":"modules/cbi18n"
56+
},
57+
"ignore":[
58+
59+
],
60+
"testbox":{
61+
"runner":[
62+
{
63+
"default":""
64+
}
65+
],
66+
"labels":[
67+
68+
],
69+
"reporter":"",
70+
"reporterResults":"",
71+
"bundles":[
72+
""
73+
],
74+
"directory":{
75+
"mapping":"",
76+
"recurse":true
77+
},
78+
"watchers":[
79+
80+
],
81+
"notify":{
82+
"emails":[
83+
84+
],
85+
"growl":"",
86+
"url":""
87+
}
88+
}
89+
}

‎modules/validation/ModuleConfig.cfc‎ renamed to ‎modules/cbvalidation/ModuleConfig.cfc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ component{
1717
// If true, looks for layouts in the parent first, if not found, then in module. Else vice-versa
1818
this.layoutParentLookup = true;
1919
// Module Entry Point
20-
this.entryPoint = "validation";
20+
this.entryPoint = "cbvalidation";
2121
// Model Namespace
22-
this.modelNamespace = "validation";
22+
this.modelNamespace = "cbvalidation";
2323
// CF Mapping
2424
this.cfmapping = "cbvalidation";
2525
// Module Dependencies That Must Be Loaded First, use internal names or aliases
26-
this.dependencies = [ "i18n" ];
26+
this.dependencies = [ "cbi18n" ];
2727
// ColdBox Static path to validation manager
2828
this.COLDBOX_VALIDATION_MANAGER = "cbvalidation.models.ValidationManager";
2929

@@ -58,12 +58,12 @@ component{
5858
parseParentSettings();
5959
// Did you change the validation manager?
6060
if( configSettings.validation.manager != this.COLDBOX_VALIDATION_MANAGER ){
61-
binder.map( "validationManager@validation" )
61+
binder.map( "validationManager@cbvalidation" )
6262
.to( configSettings.validation.manager )
6363
.asSingleton();
6464
}
6565
// setup shared constraints
66-
wirebox.getInstance( "validationManager@validation" )
66+
wirebox.getInstance( "validationManager@cbvalidation" )
6767
.setSharedConstraints( configSettings.validation.sharedConstraints );
6868

6969
}

‎modules/cbvalidation/box.json‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
{
2+
"name":"ColdBox Validation",
3+
"version":"1.0.0",
4+
"author":"Luis Majano <[email protected]",
5+
"location":"",
6+
"directory":"",
7+
"createPackageDirectory":true,
8+
"packageDirectory":"",
9+
"homepage":"http://www.coldbox.org",
10+
"documentation":"http://wiki.coldbox.org/wiki/Validation.cfm",
11+
"repository":{
12+
"type":"git",
13+
"url":"https://github.com/ColdBox/cbox-validation"
14+
},
15+
"bugs":"",
16+
"slug":"cbvalidation",
17+
"shortDescription":"This module provides server side validation to ColdBox applications",
18+
"description":"",
19+
"instructions":"",
20+
"changelog":"",
21+
"type":"modules",
22+
"keywords":[
23+
24+
],
25+
"private":false,
26+
"engines":[
27+
{
28+
"type":"railo",
29+
"version":">4.1"
30+
},
31+
{
32+
"type":"adobe",
33+
"version":">9.02"
34+
}
35+
],
36+
"defaultEngine":"",
37+
"defaultPort":0,
38+
"projectURL":"",
39+
"license":[
40+
{
41+
"type":"Apache2",
42+
"url":"http://www.apache.org/licenses/LICENSE-2.0.html"
43+
}
44+
],
45+
"contributors":[
46+
"Brad Wood <[email protected]>",
47+
"Curt Gratz <[email protected]>"
48+
],
49+
"dependencies":{
50+
"cbi18n":"1.0.0"
51+
},
52+
"devDependencies":{
53+
54+
},
55+
"installPaths":{
56+
"cbi18n":"modules/cbi18n"
57+
},
58+
"ignore":[
59+
60+
],
61+
"testbox":{
62+
"runner":[
63+
{
64+
"default":""
65+
}
66+
],
67+
"labels":[
68+
69+
],
70+
"reporter":"",
71+
"reporterResults":"",
72+
"bundles":[
73+
""
74+
],
75+
"directory":{
76+
"mapping":"",
77+
"recurse":true
78+
},
79+
"watchers":[
80+
81+
],
82+
"notify":{
83+
"emails":[
84+
85+
],
86+
"growl":"",
87+
"url":""
88+
}
89+
}
90+
}

‎modules/validation/changelog.md‎ renamed to ‎modules/cbvalidation/changelog.md‎

File renamed without changes.

‎modules/validation/instructions.md‎ renamed to ‎modules/cbvalidation/instructions.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ INSTRUCTIONS
33

44
Just drop into your **modules** folder or use the box-cli to install
55

6-
`box install validation`
6+
`box install cbvalidation`
77

8-
The module will register several objects into WireBox using the `@validation` namespace. The validation manager is registered as `ValidationManager@validation`
8+
The module will register several objects into WireBox using the `@cbvalidation` namespace. The validation manager is registered as `ValidationManager@cbvalidation`
99

1010
## Mixins
1111
The module will also register two methods in your handlers/interceptors/layouts/views

‎modules/validation/models/GenericObject.cfc‎ renamed to ‎modules/cbvalidation/models/GenericObject.cfc‎

File renamed without changes.

‎modules/validation/models/IValidationManager.cfc‎ renamed to ‎modules/cbvalidation/models/IValidationManager.cfc‎

File renamed without changes.

0 commit comments

Comments
 (0)