From 4b58c152b4ed519bd7da3bfffc1c730a556f676d Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Tue, 27 Mar 2018 10:32:26 -0700 Subject: [PATCH] Prepare for a 4.2.0 release --- box.json | 2 +- .../userManagerAccessControl/Application.cfc | 21 ++++++++++++++++--- .../layouts/default.cfm | 17 ++++++++++++++- framework/Application.cfc | 2 +- framework/MyApplication.cfc | 2 +- framework/WireBoxAdapter.cfc | 2 +- framework/aop.cfc | 2 +- framework/beanProxy.cfc | 2 +- framework/facade.cfc | 2 +- framework/ioc.cfc | 2 +- framework/methodProxy.cfc | 2 +- framework/one.cfc | 2 +- 12 files changed, 44 insertions(+), 14 deletions(-) diff --git a/box.json b/box.json index fb756b27..a865b875 100644 --- a/box.json +++ b/box.json @@ -1,7 +1,7 @@ { "name":"Framework One", "slug":"fw1", - "version":"4.5.0-SNAPSHOT", + "version":"4.2.0-SNAPSHOT", "author":"Sean Corfield, Marcin Szczepanski, Ryan Cogswell", "location":"framework-one/fw1#develop", "createPackageDirectory":true, diff --git a/examples/userManagerAccessControl/Application.cfc b/examples/userManagerAccessControl/Application.cfc index 38e6217f..c1391560 100755 --- a/examples/userManagerAccessControl/Application.cfc +++ b/examples/userManagerAccessControl/Application.cfc @@ -1,10 +1,12 @@ -component extends="framework.one" { +component accessors=true extends="framework.one" { + + property departmentService; this.mappings["/userManager"] = getDirectoryFromPath(getCurrentTemplatePath()); - this.name = 'fw1-userManager-accessControl'; + this.name = 'fw1-userManager-accessControl-5'; this.sessionmanagement = true; this.sessiontimeout = createTimeSpan(0,2,0,0); - + // FW/1 - configuration: variables.framework = { trace = true @@ -12,14 +14,27 @@ component extends="framework.one" { function setupApplication() { application.adminEmail = 'admin@mysite.com'; + if ( variables.keyExists( "departmentService" ) ) + writeDump( var = variables.departmentService, label = "setupApplication" ); } function setupSession() { controller( 'security.session' ); + if ( variables.keyExists( "departmentService" ) ) + writeDump( var = variables.departmentService, label = "setupSession" ); } function setupRequest() { controller( 'security.authorize' ); + if ( variables.keyExists( "departmentService" ) ) + writeDump( var = variables.departmentService, label = "setupRequest" ); + } + + function setupView( rc ) { + if ( variables.keyExists( "departmentService" ) ) { + writeDump( var = variables.departmentService, label = "setupView" ); + rc.d1 = departmentService.get( 1 ); + } } } diff --git a/examples/userManagerAccessControl/layouts/default.cfm b/examples/userManagerAccessControl/layouts/default.cfm index 1ebc8dae..150e5843 100755 --- a/examples/userManagerAccessControl/layouts/default.cfm +++ b/examples/userManagerAccessControl/layouts/default.cfm @@ -1,4 +1,8 @@ + +function aaa() { } +function bbb() { } + @@ -43,6 +47,17 @@ - + + + +

aaa and bbb are equal -- WTF?

+ +

aaa and bbb are different -- as expected!

+ + +

I haz a sad -- functions cannot be compared!

+ + + diff --git a/framework/Application.cfc b/framework/Application.cfc index c03faa93..3011aac2 100644 --- a/framework/Application.cfc +++ b/framework/Application.cfc @@ -1,5 +1,5 @@ component { - // Version: FW/1 4.5.0-SNAPSHOT + // Version: FW/1 4.2.0-SNAPSHOT // copy this to your application root to use as your Application.cfc // or incorporate the logic below into your existing Application.cfc diff --git a/framework/MyApplication.cfc b/framework/MyApplication.cfc index 2d56dd00..928af9c2 100644 --- a/framework/MyApplication.cfc +++ b/framework/MyApplication.cfc @@ -1,5 +1,5 @@ component extends="framework.one" { - // Version: FW/1 4.5.0-SNAPSHOT + // Version: FW/1 4.2.0-SNAPSHOT // if you need to provide extension points, copy this to // your web root, next to your Application.cfc, and add diff --git a/framework/WireBoxAdapter.cfc b/framework/WireBoxAdapter.cfc index be932a05..406bdc28 100644 --- a/framework/WireBoxAdapter.cfc +++ b/framework/WireBoxAdapter.cfc @@ -1,5 +1,5 @@ component extends="wirebox.system.ioc.Injector" { - variables._fw1_version = "4.5.0-SNAPSHOT"; + variables._fw1_version = "4.2.0-SNAPSHOT"; /* Copyright (c) 2010-2017, Sean Corfield diff --git a/framework/aop.cfc b/framework/aop.cfc index b1eb0e66..661c5878 100644 --- a/framework/aop.cfc +++ b/framework/aop.cfc @@ -1,5 +1,5 @@ component extends="framework.ioc" { - variables._fw1_version = "4.5.0-SNAPSHOT"; + variables._fw1_version = "4.2.0-SNAPSHOT"; variables._aop1_version = variables._fw1_version; /* Copyright (c) 2013-2017, Mark Drew, Sean Corfield, Daniel Budde diff --git a/framework/beanProxy.cfc b/framework/beanProxy.cfc index 8e0df3e2..2c9a9c4a 100644 --- a/framework/beanProxy.cfc +++ b/framework/beanProxy.cfc @@ -1,5 +1,5 @@ component { - variables._fw1_version = "4.5.0-SNAPSHOT"; + variables._fw1_version = "4.2.0-SNAPSHOT"; variables._aop1_version = variables._fw1_version; /* Copyright (c) 2013-2017, Mark Drew, Sean Corfield, Daniel Budde diff --git a/framework/facade.cfc b/framework/facade.cfc index ab5cbb47..b972d5f5 100644 --- a/framework/facade.cfc +++ b/framework/facade.cfc @@ -1,5 +1,5 @@ component { - variables._fw1_version = "4.5.0-SNAPSHOT"; + variables._fw1_version = "4.2.0-SNAPSHOT"; /* Copyright (c) 2016-2017, Sean Corfield diff --git a/framework/ioc.cfc b/framework/ioc.cfc index 83407117..15f0005a 100644 --- a/framework/ioc.cfc +++ b/framework/ioc.cfc @@ -1,5 +1,5 @@ component { - variables._fw1_version = "4.5.0-SNAPSHOT"; + variables._fw1_version = "4.2.0-SNAPSHOT"; variables._di1_version = variables._fw1_version; /* Copyright (c) 2010-2017, Sean Corfield diff --git a/framework/methodProxy.cfc b/framework/methodProxy.cfc index 70d67583..6585d24b 100644 --- a/framework/methodProxy.cfc +++ b/framework/methodProxy.cfc @@ -1,5 +1,5 @@ component { - variables._fw1_version = "4.5.0-SNAPSHOT"; + variables._fw1_version = "4.2.0-SNAPSHOT"; /* Copyright (c) 2017, Sean Corfield diff --git a/framework/one.cfc b/framework/one.cfc index 479a5b23..29d38391 100644 --- a/framework/one.cfc +++ b/framework/one.cfc @@ -1,5 +1,5 @@ component { - variables._fw1_version = "4.5.0-SNAPSHOT"; + variables._fw1_version = "4.2.0-SNAPSHOT"; /* Copyright (c) 2009-2017, Sean Corfield, Marcin Szczepanski, Ryan Cogswell