Prepare for a 4.2.0 release

framework-one · Mar 27, 2018 · 4b58c15 · 4b58c15
1 parent a5ddba2
commit 4b58c15
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 14 deletions.
diff --git 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
@@ -1,25 +1,40 @@
-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
 	};
 
 	function setupApplication() {
 		application.adminEmail = '[email protected]';
+		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
@@ -1,4 +1,8 @@
 <cfparam name="rc.message" default="#arrayNew(1)#">
+<cfscript>
+function aaa() { }
+function bbb() { }
+</cfscript>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -43,6 +47,17 @@
 	</div>
 
 </div>
-
+<cfdump var="#rc#">
+<cftry>
+	<cfif aaa == bbb>
+		<p>aaa and bbb are equal -- WTF?</p>
+	<cfelse>
+		<p>aaa and bbb are different -- as expected!</p>
+	</cfif>
+	<cfcatch type="any">
+		<p>I haz a sad -- functions cannot be compared!</p>
+		<cfdump var="#cfcatch#" />
+	</cfcatch>
+</cftry>
 </body>
 </html>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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