From e826296b9fea7e2b33e9d173150b2298eb82cb99 Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Tue, 7 Jul 2015 16:27:29 -0700
Subject: [PATCH] Prep for 3.1 RC 2

---
 framework/WireBoxAdapter.cfc |  2 +-
 framework/aop.cfc            | 12 ++++++------
 framework/beanProxy.cfc      | 10 +++++-----
 framework/ioc.cfc            |  4 ++--
 framework/one.cfc            |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/framework/WireBoxAdapter.cfc b/framework/WireBoxAdapter.cfc
index d6e568da..c8bb1cbd 100644
--- a/framework/WireBoxAdapter.cfc
+++ b/framework/WireBoxAdapter.cfc
@@ -1,5 +1,5 @@
 component extends="wirebox.system.ioc.Injector" {
-    variables._fw1_version = "3.1-rc1";
+    variables._fw1_version = "3.1-rc2";
 /*
     Copyright (c) 2010-2015, Sean Corfield
 
diff --git a/framework/aop.cfc b/framework/aop.cfc
index afa8ab9d..d910db6d 100755
--- a/framework/aop.cfc
+++ b/framework/aop.cfc
@@ -1,6 +1,6 @@
 component extends="framework.ioc" {
-    variables._fw1_version = "3.1-rc1";
-    variables._aop1_version = "2.0-rc1";
+    variables._fw1_version = "3.1-rc2";
+    variables._aop1_version = "2.0-rc2";
 /*
 	Copyright (c) 2013-2015, Mark Drew, Sean Corfield, Daniel Budde
 
@@ -250,9 +250,9 @@ component extends="framework.ioc" {
 			{
 				// Same cfc dotted path, must be an alias.
 				if (
-						key != arguments.beanName && 
-						structKeyExists(variables.beanInfo[key], "cfc") && 
-						structKeyExists(variables.beanInfo[arguments.beanName], "cfc") && 
+						key != arguments.beanName &&
+						structKeyExists(variables.beanInfo[key], "cfc") &&
+						structKeyExists(variables.beanInfo[arguments.beanName], "cfc") &&
 						variables.beanInfo[key].cfc == variables.beanInfo[arguments.beanName].cfc)
 				{
 					arrayAppend(aliases, key);
@@ -309,4 +309,4 @@ component extends="framework.ioc" {
 		super.setupFrameworkDefaults();
 		variables.config.version = variables._aop1_version & " (" & variables._di1_version & ")";
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/beanProxy.cfc b/framework/beanProxy.cfc
index fd904d57..533312fc 100755
--- a/framework/beanProxy.cfc
+++ b/framework/beanProxy.cfc
@@ -1,6 +1,6 @@
 component {
-    variables._fw1_version = "3.1-rc1";
-    variables._aop1_version = "2.0-rc1";
+    variables._fw1_version = "3.1-rc2";
+    variables._aop1_version = "2.0-rc2";
 /*
 	Copyright (c) 2013-2015, Mark Drew, Sean Corfield, Daniel Budde
 
@@ -657,7 +657,7 @@ component {
 			}
 		}
 
-		
+
 		// Checks to see if the 'initMethod' was defined in the config and handles if it exists on the target bean.
 		if (structKeyExists(arguments.config, "initMethod") && len(arguments.config.initMethod) && structKeyExists(variables.targetBean, arguments.config.initMethod))
 		{
@@ -714,7 +714,7 @@ component {
 
 			// Only alter methods that should be intercepted. 'init()', accessors, and 'initMethod' are ignored unless specified in the methods list.
 			if	(
-					(variables.interceptedMethods == "*" && key != "init" && key != initMethod && !methodInfo.isPropertyAccessor) || 
+					(variables.interceptedMethods == "*" && key != "init" && key != initMethod && !methodInfo.isPropertyAccessor) ||
 					listFindNoCase(variables.interceptedMethods, key)
 				)
 			{
@@ -851,4 +851,4 @@ component {
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/ioc.cfc b/framework/ioc.cfc
index eef8eba9..3d25ad00 100644
--- a/framework/ioc.cfc
+++ b/framework/ioc.cfc
@@ -1,6 +1,6 @@
 component {
-    variables._fw1_version = "3.1-rc1";
-    variables._di1_version = "1.1-rc1";
+    variables._fw1_version = "3.1-rc2";
+    variables._di1_version = "1.1-rc2";
 /*
     Copyright (c) 2010-2015, Sean Corfield
 
diff --git a/framework/one.cfc b/framework/one.cfc
index e63647b2..bd7cd60f 100644
--- a/framework/one.cfc
+++ b/framework/one.cfc
@@ -1,5 +1,5 @@
 component {
-    variables._fw1_version = "3.1-rc1";
+    variables._fw1_version = "3.1-rc2";
 /*
     Copyright (c) 2009-2015, Sean Corfield, Marcin Szczepanski, Ryan Cogswell