Skip to content

Commit

Permalink
Prep for 3.5.0 Alpha 1
Browse files Browse the repository at this point in the history
  • Loading branch information
seancorfield committed Sep 5, 2015
1 parent e57b234 commit 6640af7
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion framework/WireBoxAdapter.cfc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
component extends="wirebox.system.ioc.Injector" {
variables._fw1_version = "3.5.0_snapshot";
variables._fw1_version = "3.5.0-alpha1";
/*
Copyright (c) 2010-2015, Sean Corfield
Expand Down
12 changes: 6 additions & 6 deletions framework/aop.cfc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component extends="framework.ioc" {
variables._fw1_version = "3.5.0-snapshot";
variables._aop1_version = "2.0.1-snapshot";
variables._fw1_version = "3.5.0-alpha1";
variables._aop1_version = "2.0.1-alpha1";
/*
Copyright (c) 2013-2015, Mark Drew, Sean Corfield, Daniel Budde
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -309,4 +309,4 @@ component extends="framework.ioc" {
super.setupFrameworkDefaults();
variables.config.version = variables._aop1_version & " (" & variables._di1_version & ")";
}
}
}
10 changes: 5 additions & 5 deletions framework/beanProxy.cfc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component {
variables._fw1_version = "3.5.0-snapshot";
variables._aop1_version = "2.0.1-snapshot";
variables._fw1_version = "3.5.0-alpha1";
variables._aop1_version = "2.0.1-alpha1";
/*
Copyright (c) 2013-2015, Mark Drew, Sean Corfield, Daniel Budde
Expand Down Expand Up @@ -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))
{
Expand Down Expand Up @@ -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)
)
{
Expand Down Expand Up @@ -851,4 +851,4 @@ component {
}
}
}
}
}
4 changes: 2 additions & 2 deletions framework/cfmljure.cfc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component {
variables._fw1_version = "3.5.0_snapshot";
variables._cfmljure_version = "1.0.0_snapshot";
variables._fw1_version = "3.5.0-alpha1";
variables._cfmljure_version = "1.0.0-alpha1";
/*
Copyright (c) 2012-2015, Sean Corfield
Expand Down
4 changes: 2 additions & 2 deletions framework/cljcontroller.cfc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component {
variables._fw1_version = "3.5.0_snapshot";
variables._ioclj_version = "1.0.0_snapshot";
variables._fw1_version = "3.5.0-alpha1";
variables._ioclj_version = "1.0.0-alpha1";
/*
Copyright (c) 2015, Sean Corfield
Expand Down
4 changes: 2 additions & 2 deletions framework/ioc.cfc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component {
variables._fw1_version = "3.5.0_snapshot";
variables._di1_version = "1.1.1_snapshot";
variables._fw1_version = "3.5.0-alpha1";
variables._di1_version = "1.1.1-alpha1";
/*
Copyright (c) 2010-2015, Sean Corfield
Expand Down
4 changes: 2 additions & 2 deletions framework/ioclj.cfc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component extends=framework.ioc {
variables._fw1_version = "3.5.0_snapshot";
variables._ioclj_version = "1.0.0_snapshot";
variables._fw1_version = "3.5.0-alpha1";
variables._ioclj_version = "1.0.0-alpha1";
/*
Copyright (c) 2015, Sean Corfield
Expand Down
2 changes: 1 addition & 1 deletion framework/one.cfc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
component {
variables._fw1_version = "3.5.0_snapshot";
variables._fw1_version = "3.5.0-alpha1";
/*
Copyright (c) 2009-2015, Sean Corfield, Marcin Szczepanski, Ryan Cogswell
Expand Down

0 comments on commit 6640af7

Please sign in to comment.