Index: DefaultXmlBeanFactory.cfc
===================================================================
RCS file: /coldspring/coldspring/beans/DefaultXmlBeanFactory.cfc,v
retrieving revision 1.46
diff -u -r1.46 DefaultXmlBeanFactory.cfc
--- DefaultXmlBeanFactory.cfc	5 Jun 2007 20:20:12 -0000	1.46
+++ DefaultXmlBeanFactory.cfc	15 Jun 2007 05:32:40 -0000
@@ -1,42 +1,42 @@
 <!---
- 
+
   Copyright (c) 2005, David Ross, Chris Scott, Kurt Wiersma, Sean Corfield
-  
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-		
-			
+
+
  $Id: DefaultXmlBeanFactory.cfc,v 1.46 2007/06/05 20:20:12 scottc Exp $
 
----> 
+--->
 
-<cfcomponent name="DefaultXmlBeanFactory" 
-			displayname="DefaultXmlBeanFactory" 
+<cfcomponent name="DefaultXmlBeanFactory"
+			displayname="DefaultXmlBeanFactory"
 			extends="coldspring.beans.AbstractBeanFactory"
-			hint="XML Bean Factory implimentation" 
+			hint="XML Bean Factory implimentation"
 			output="false">
-	
+
 	<cffunction name="init" access="public" returntype="coldspring.beans.DefaultXmlBeanFactory" output="false"
 				hint="Constuctor. Creates a beanFactory">
 		<cfargument name="defaultAttributes" type="struct" required="false" default="#structnew()#" hint="default behaviors for undefined bean attributes"/>
 		<cfargument name="defaultProperties" type="struct" required="false" default="#structnew()#" hint="any default properties, which can be refernced via ${key} in your bean definitions"/>
-		
+
 		<!--- set defaults passed into constructor --->
 		<cfset setDefaultAttributes(arguments.defaultAttributes)/>
 		<cfset setDefaultProperties(arguments.defaultProperties)/>
-		
+
 		<cfreturn this />
 	</cffunction>
-	
+
 	<cffunction name="loadBeans" access="public" returntype="void" output="false" hint="loads bean definitions into the bean factory from an xml file location">
 		<cfargument name="beanDefinitionFileName" type="string" required="true" />
 		<cfset var xmlFiles = structNew()>
@@ -65,14 +65,14 @@
 				<cfthrow message="The file #arguments.importedFilename# does not exist!"
 						detail="You have tried to use or include a file (#arguments.importedFilename#) that does not exist using either absolute, relative, or mapped paths." />
 			</cfif>
-			
+
 			<cffile action="read" file="#arguments.importedFilename#" variable="fileContent" />
-			
+
 			<cfset xml = xmlParse(fileContent)>
 			<cfset imports = xmlSearch(xml,"/beans/import")>
 
 			<cfset structInsert(arguments.importFiles,arguments.importedFilename,xml,false)>
-	
+
 			<cfif arrayLen(imports) GT 0>
 				<cfloop from="1" to="#arrayLen(imports)#" index="i">
 					<cfset resource = imports[i].xmlAttributes.resource>
@@ -98,9 +98,9 @@
 
 		<cfset xml = xmlParse(arguments.beanDefinitionXmlObj)>
 		<cfset imports = xmlSearch(xml,"/beans/import")>
-		
+
 		<cfset structInsert(arguments.importFiles,"root",xml,false)>
-		
+
 		<cfif arrayLen(imports) GT 0>
 			<cfloop from="1" to="#arrayLen(imports)#" index="i">
 				<cfset resource = imports[i].xmlAttributes.resource>
@@ -109,7 +109,7 @@
 				<cfelseif left(resource,1) is ".">
 					<cfset resource = shrinkFullRelativePath(expandPath(resource))>
 				</cfif>
-				
+
 				<cfif not fileExists(resource)>
 					<cfthrow message="The file #resource# does not exist!"
 							detail="You have tried to use or include a file (#resource#) that does not exist using either absolute, relative, or mapped paths." />
@@ -123,7 +123,7 @@
 
 	<cffunction name="shrinkFullRelativePath" access="public" output="true" returntype="string">
 		<cfargument name="fullPath" type="string" required="true" />
-	
+
 		<cfset var newPath = 0>
 		<cfset var i = 0>
 		<cfset var h = 0>
@@ -131,11 +131,11 @@
 		<cfset var offset = 0>
 		<cfset var retVal = "">
 		<cfset var depth = 0>
-	
+
 		<cfset fullPath = replace(fullPath,"\","/","all")>
 		<cfset fullPath = replace(fullPath,"/./","/","all")>
 		<cfset newPath = listToArray(fullPath,"/")>
-	
+
 		<cfloop from="1" to="#arrayLen(newPath)#" index="i">
 			<cfif newPath[i] IS "..">
 				<cfset arrayAppend(hits,i)>
@@ -160,44 +160,44 @@
 		<cfif right(fullPath,1) is "/">
 			<cfset retVal = retVal & "/">
 		</cfif>
-		
+
 		<cfif not directoryExists(getDirectoryFrompath(retVal))>
 			<cfthrow message="You have specified an invalid directory"
 					detail="The directory path specified, #getDirectoryFromPath(retVal)# does not exist." />
 		</cfif>
-		 
+
 		<cfreturn retVal />
 	</cffunction>
 
 	<cffunction name="loadBeansFromXmlFile" returntype="void" access="public" hint="loads bean definitions into the bean factory from an xml file location">
 		<cfargument name="beanDefinitionFile" type="string" required="true" hint="I am the location of the bean definition xml file"/>
 		<cfargument name="ConstructNonLazyBeans" type="boolean" required="false" default="false" hint="set me to true to construct any beans, not marked as lazy-init, immediately after processing"/>
-	
+
 		<cfset var xmlFiles = structNew()/>
 
 		<cfset findImports(xmlFiles,arguments.beanDefinitionFile)>
-		
-		<cfset processLoadBeans(xmlFiles, arguments.ConstructNonLazyBeans)>				
+
+		<cfset processLoadBeans(xmlFiles, arguments.ConstructNonLazyBeans)>
 	</cffunction>
-				
+
 	<cffunction name="loadBeansFromXmlRaw" returntype="void" access="public" hint="loads bean definitions into the bean factory from supplied raw xml">
 		<cfargument name="beanDefinitionXml" type="string" required="true" hint="I am raw unparsed xml bean defs"/>
 		<cfargument name="ConstructNonLazyBeans" type="boolean" required="false" default="false" hint="set me to true to construct any beans, not marked as lazy-init, immediately after processing"/>
-		
+
 		<cfset var xmlParsed = xmlParse(arguments.beanDefinitionXml)>
-		
+
 		<cfset loadBeansFromXmlObj(xmlParsed, arguments.ConstructNonLazyBeans)>
 	</cffunction>
 
 	<cffunction name="loadBeansFromXmlObj" returntype="void" access="public" hint="loads bean definitions into the bean factory from supplied cf xml object">
 		<cfargument name="beanDefinitionXmlObj" type="any" required="true" hint="I am parsed xml bean defs"/>
 		<cfargument name="ConstructNonLazyBeans" type="boolean" required="false" default="false" hint="set me to true to construct any beans, not marked as lazy-init, immediately after processing"/>
-		
+
 		<cfset var xmlFiles = structNew()>
 
 
 		<cfset findImportsFromXmlObj(xmlFiles, arguments.beanDefinitionXmlObj)>
-		
+
 		<cfset processLoadBeans(xmlFiles, arguments.ConstructNonLazyBeans)>
 	</cffunction>
 
@@ -206,23 +206,23 @@
 		<cfargument name="ConstructNonLazyBeans" type="boolean" required="false" default="false" hint="set me to true to construct any beans, not marked as lazy-init, immediately after processing"/>
 
 		<cfset var i = ""/>
-		
+
 		<cfloop collection="#arguments.beanDefinitions#" item="i">
 			<cfset loadBeanDefinitions(arguments.beanDefinitions[i])/>
-		</cfloop>		
-		
+		</cfloop>
+
 		<cfset processFactoryPostProcessors() />
-		
+
 		<cfif arguments.ConstructNonLazyBeans>
-			<cfset initNonLazyBeans()/>
+			<cfset initNonLazyBeans(arguments.beanDefinitions)/>
 		</cfif>
 	</cffunction>
-		
+
 	<cffunction name="loadBeanDefinitions" access="public" returntype="void"
 				hint="actually loads the bean definitions by processing the supplied xml data">
-		<cfargument name="XmlBeanDefinitions" type="any" required="true" 
+		<cfargument name="XmlBeanDefinitions" type="any" required="true"
 					hint="I am a parsed Xml of bean definitions"/>
-					
+
 		<cfset var beans = 0 />
 		<cfset var beanDef = 0 />
 		<cfset var beanIx = 0 />
@@ -234,16 +234,16 @@
 		<cfset var factoryBean = "" />
 		<cfset var factoryMethod = "" />
 		<cfset var autowire = "no" />
-		<cfset var default_autowire = "no" />	
-		<cfset var factoryPostProcessor = "" />	
-		<cfset var beanPostProcessor = "" />	
+		<cfset var default_autowire = "no" />
+		<cfset var factoryPostProcessor = "" />
+		<cfset var beanPostProcessor = "" />
 		<cfset var aliases = 0 />
 		<cfset var aliasIx = 0 />
 		<cfset var aliasAttributes = 0 />
 		<cfset var abstract = false />
 		<cfset var parent = "" />
 		<cfset var beanMetadata = ""/>
-	
+
 		<!--- make sure some beans exist --->
 		<cfif isDefined("arguments.XmlBeanDefinitions.beans.bean")>
 			<cfset beans = arguments.XmlBeanDefinitions.beans.bean>
@@ -251,42 +251,42 @@
 			<!--- no beans found, return without modding the factory at all --->
 			<cfreturn/>
 		</cfif>
-		
+
 		<!--- see if default-autowire is set to anything --->
 		<cfif structKeyExists(arguments.XmlBeanDefinitions.beans,'XmlAttributes')
 			and structKeyExists(arguments.XmlBeanDefinitions.beans.XmlAttributes,'default-autowire')
 			and listFind('byName,byType',arguments.XmlBeanDefinitions.beans.XmlAttributes['default-autowire'])>
-			<cfset default_autowire = arguments.XmlBeanDefinitions.beans.XmlAttributes['default-autowire']/>			
+			<cfset default_autowire = arguments.XmlBeanDefinitions.beans.XmlAttributes['default-autowire']/>
 		</cfif>
-		
+
 		<!--- create bean definition objects for each (top level) bean in the xml--->
 		<cfloop from="1" to="#ArrayLen(beans)#" index="beanIx">
-			
+
 			<cfset beanAttributes = beans[beanIx].XmlAttributes />
 			<cfset beanChildren = beans[beanIx].XmlChildren />
-			
-			<cfif not structKeyExists(beanAttributes, "factory-bean") 
-				AND (not (StructKeyExists(beanAttributes,'id') and 
+
+			<cfif not structKeyExists(beanAttributes, "factory-bean")
+				AND (not (StructKeyExists(beanAttributes,'id') and
 					(StructKeyExists(beanAttributes,'class') or StructKeyExists(beanAttributes,'parent'))))>
-				<cfthrow type="coldspring.MalformedBeanException" 
+				<cfthrow type="coldspring.MalformedBeanException"
 					message="Xml bean definitions must contain 'id' and 'class' attributes!">
 			</cfif>
-			
-			<!--- set the class (it will be blank if we are using parent) --->			
+
+			<!--- set the class (it will be blank if we are using parent) --->
 			<cfif StructKeyExists(beanAttributes,'class')>
 				<cfset class = beanAttributes.class />
 			<cfelse>
 				<cfset class = "" />
 			</cfif>
-			
-			<!--- look for an singleton attribute for this bean def --->			
+
+			<!--- look for an singleton attribute for this bean def --->
 			<cfif StructKeyExists(beanAttributes,'singleton')>
 				<cfset isSingleton = beanAttributes.singleton />
 			<cfelse>
 				<cfset isSingleton = true />
 			</cfif>
-			
-			<!--- look for an factory-bean and factory-method attribute for this bean def --->			
+
+			<!--- look for an factory-bean and factory-method attribute for this bean def --->
 			<cfif StructKeyExists(beanAttributes,'factory-bean')>
 				<cfset factoryBean = beanAttributes["factory-bean"] />
 			<cfelse>
@@ -297,23 +297,23 @@
 			<cfelse>
 				<cfset factoryMethod = "" />
 			</cfif>
-			
+
 			<!--- look for an init-method attribute for this bean def --->
 			<cfif StructKeyExists(beanAttributes,'init-method') and len(beanAttributes['init-method'])>
 				<cfset initMethod = beanAttributes['init-method'] />
 			<cfelse>
 				<cfset initMethod = ""/>
 			</cfif>
-			
+
 			<!--- first set autowire to default-autowire --->
 			<cfset autowire = default_autowire />
-			
+
 			<!--- look for an autowire attribute for this bean def --->
 			<cfif StructKeyExists(beanAttributes,'autowire') and listFind('byName,byType',beanAttributes['autowire'])>
 				<cfset autowire = beanAttributes['autowire'] />
 			</cfif>
-			
-			<!---  todo: CF8 only feature!! 
+
+			<!---  todo: CF8 only feature!!
 			<cfif StructKeyExists(beanAttributes,'class')>
 				<cfset beanMetadata = getComponentMetadata(beanAttributes.class)>
 				<cfif StructKeyExists(beanMetadata,"interface")>
@@ -325,7 +325,7 @@
 					</cfif>
 				</cfif>
 			</cfif> --->
-			
+
 			<!--- look for a factory-post-processor attribute for this bean def --->
 			<cfif StructKeyExists(beanAttributes,'class') and listFind(variables.known_bf_postprocessors,beanAttributes.class)>
 				<cfset factoryPostProcessor = true />
@@ -334,7 +334,7 @@
 			<cfelse>
 				<cfset factoryPostProcessor = false />
 			</cfif>
-			
+
 			<!--- look for a bean-post-processor attribute for this bean def --->
 			<cfif StructKeyExists(beanAttributes,'class') and listFind(variables.known_bean_postprocessors,beanAttributes.class)>
 				<cfset beanPostProcessor = true />
@@ -343,29 +343,29 @@
 			<cfelse>
 				<cfset beanPostProcessor = false />
 			</cfif>
-			
-			<!--- look for abstract flag, and parent bean def --->			
+
+			<!--- look for abstract flag, and parent bean def --->
 			<cfif StructKeyExists(beanAttributes,'abstract')>
 				<cfset abstract = beanAttributes.abstract />
 			<cfelse>
 				<cfset abstract = false />
 			</cfif>
-			
+
 			<cfif StructKeyExists(beanAttributes,'parent')>
 				<cfset parent = beanAttributes.parent />
 			<cfelse>
 				<cfset parent = ""/>
 			</cfif>
-			
+
 			<!--- call function to create bean definition and add to store --->
-			<cfif not structKeyExists(beanAttributes, "factory-bean")> 
-				<cfset createBeanDefinition(beanAttributes.id, 
-										class, 
-										beanChildren, 
-										isSingleton, 
+			<cfif not structKeyExists(beanAttributes, "factory-bean")>
+				<cfset createBeanDefinition(beanAttributes.id,
+										class,
+										beanChildren,
+										isSingleton,
 										false,
 										initMethod,
-										factoryBean, 
+										factoryBean,
 										factoryMethod,
 										autowire,
 										factoryPostProcessor,
@@ -373,13 +373,13 @@
 										abstract,
 										parent) />
 			<cfelse>
-				<cfset createBeanDefinition(beanAttributes.id, 
-										"", 
-										beanChildren, 
-										isSingleton, 
+				<cfset createBeanDefinition(beanAttributes.id,
+										"",
+										beanChildren,
+										isSingleton,
 										false,
 										initMethod,
-										factoryBean, 
+										factoryBean,
 										factoryMethod,
 										autowire,
 										false,
@@ -387,29 +387,29 @@
 										abstract,
 										parent) />
 			</cfif>
-		
+
 		</cfloop>
-		
+
 		<!--- now register aliases --->
 		<cfif isDefined("arguments.XmlBeanDefinitions.beans.alias")>
 			<cfset aliases = arguments.XmlBeanDefinitions.beans.alias>
-			
+
 			<!--- create bean definition objects for each (top level) bean in the xml--->
 			<cfloop from="1" to="#ArrayLen(aliases)#" index="aliasIx">
-				
+
 				<cfset aliasAttributes = aliases[aliasIx].XmlAttributes />
-				
+
 				<cfif not (StructKeyExists(aliasAttributes,'name') and StructKeyExists(aliasAttributes,'alias'))>
-					<cfthrow type="coldspring.MalformedAliasException" 
+					<cfthrow type="coldspring.MalformedAliasException"
 						message="Xml alias definitions must contain 'name' and 'alias' attributes!">
 				</cfif>
-				
+
 				<cfset registerAlias(aliasAttributes.name, aliasAttributes.alias)>
 			</cfloop>
 		</cfif>
-		
+
 	</cffunction>
-	
+
 	<cffunction name="createBeanDefinition" access="public" returntype="void" output="false"
 				hint="creates a bean definition within this bean factory.">
 		<cfargument name="beanID" type="string" required="true" />
@@ -425,14 +425,14 @@
 		<cfargument name="beanPostProcessor" type="boolean" default="false" required="false" />
 		<cfargument name="abstract" type="boolean" default="false" required="false" />
 		<cfargument name="parent" type="string" default="" required="false" />
-		
+
 		<cfset var childIx = 0 />
 		<cfset var child = '' />
-	
+
 		<!--- construct a bean definition file for this bean --->
-		<cfset variables.beanDefs[arguments.beanID] = 
+		<cfset variables.beanDefs[arguments.beanID] =
 				   	CreateObject('component', 'coldspring.beans.BeanDefinition').init(this) />
-		
+
 		<cfset variables.beanDefs[arguments.beanID].setBeanID(arguments.beanID) />
 		<cfset variables.beanDefs[arguments.beanID].setBeanClass(arguments.beanClass) />
 		<cfset variables.beanDefs[arguments.beanID].setSingleton(arguments.isSingleton) />
@@ -443,16 +443,16 @@
 		<cfset variables.beanDefs[arguments.beanID].setFactoryPostProcessor(arguments.factoryPostProcessor) />
 		<cfset variables.beanDefs[arguments.beanID].setBeanPostProcessor(arguments.beanPostProcessor) />
 		<cfset variables.beanDefs[arguments.beanID].setAbstract(arguments.abstract) />
-		
+
 		<cfif len(arguments.parent)>
 			<cfset variables.beanDefs[arguments.beanID].setParent(arguments.parent) />
 		</cfif>
-		
+
 		<cfif len(arguments.initMethod)>
-			<cfset variables.beanDefs[arguments.beanID].setInitMethod(arguments.initMethod) />		
+			<cfset variables.beanDefs[arguments.beanID].setInitMethod(arguments.initMethod) />
 		</cfif>
-		
-		<!--- add properties/constructor-args to this beanDefinition 
+
+		<!--- add properties/constructor-args to this beanDefinition
 			  each property/constructor arg is responsible for its own configuration--->
 		<cfloop from="1" to="#ArrayLen(arguments.children)#" index="childIx">
 			<cfset child = arguments.children[childIx] />
@@ -461,18 +461,18 @@
 			</cfif>
 			<cfif child.XmlName eq "constructor-arg">
 				<cfset variables.beanDefs[arguments.beanID].addConstructorArg(createObject("component","coldspring.beans.BeanProperty").init(child, variables.beanDefs[arguments.beanID]))/>
-			</cfif>			
+			</cfif>
 		</cfloop>
-		
+
 	</cffunction>
-	
+
 
 	<cffunction name="localFactoryContainsBean" access="public" output="false" returntype="boolean"
 				hint="returns true if the BeanFactory contains a bean definition or bean instance that matches the given name">
 		<cfargument name="beanName" required="true" type="string" hint="name of bean to look for"/>
 		<cfreturn structKeyExists(variables.beanDefs, arguments.beanName)/>
 	</cffunction>
-	
+
 
 	<cffunction name="containsBean" access="public" output="false" returntype="boolean"
 				hint="returns true if the BeanFactory contains a bean definition or bean instance that matches the given name">
@@ -488,9 +488,9 @@
 				<cfreturn false />
 			</cfif>
 		</cfif>
-		
+
 	</cffunction>
-	
+
 	<!--- this exists for autowiring by type... could be cleaned up --->
 	<cffunction name="findBeanNameByType" access="public" output="false" returntype="string"
 				hint="finds the first bean matching the specified type in the bean factory, otherwise returns ''">
@@ -506,8 +506,8 @@
 			<cfreturn variables.parent.findBeanNameByType(arguments.typeName) />
 		</cfif>
 		<cfreturn ""/>
-	</cffunction>	
-	
+	</cffunction>
+
 	<!--- DEPRECIATED?? IS THIS METHOD USED EVER??? --->
 	<cffunction name="isSingleton" access="public" returntype="boolean" output="false"
 				hint="returns whether the bean with the specified name is a singleton">
@@ -520,26 +520,26 @@
 			<cfthrow type="coldspring.NoSuchBeanDefinitionException" detail="Bean definition for bean named: #arguments.beanName# could not be found."/>
 		</cfif>
 	</cffunction>
-	
-	<cffunction name="getBean" access="public" output="false" returntype="any" 
+
+	<cffunction name="getBean" access="public" output="false" returntype="any"
 				hint="returns an instance of the bean registered under the given name. Depending on how the bean was configured, either a singleton and thus shared instance or a newly created bean will be returned. A BeansException will be thrown when either the bean could not be found (in which case it'll be a NoSuchBeanDefinitionException), or an exception occurred while instantiating and preparing the bean">
 		<cfargument name="beanName" required="true" type="string" hint="name of bean to look for"/>
 		<cfset var returnFactory = Left(arguments.beanName,1) IS '&'>
 		<cfset var resolvedName = "" />
 		<cfset var beanDef = 0 />
-		
+
 		<cfif returnFactory>
 			<cfset arguments.beanName = Right(arguments.beanName,Len(arguments.beanName)-1) />
 		</cfif>
 		<!--- the supplied 'beanName' could be an alias, so we want to resolve that to the concrete name first --->
 		<cfset resolvedName = resolveBeanName(arguments.beanName) />
-		
+
 		<cfif localFactoryContainsBean(resolvedName)>
-			<!--- now get the merged bean definition (this all would be better if we could circumvent this by directly 
+			<!--- now get the merged bean definition (this all would be better if we could circumvent this by directly
 				  checking the cache first) all instances of variables.beanDefs[resolvedName] changed to beanDef --->
 			<cfset beanDef = getMergedBeanDefinition(resolvedName)/>
 			<cfif beanDef.isAbstract()>
-				<cfthrow type="coldspring.BeanCreationException" 
+				<cfthrow type="coldspring.BeanCreationException"
 						 detail="Abstract Beans cannot be instanciated. Did you really meen to define: #resolvedName# as 'Abstract'?"/>
 			</cfif>
 			<cfif beanDef.isSingleton()>
@@ -548,28 +548,28 @@
 					<cfreturn beanDef.getInstance(returnFactory) />
 				<cfelse>
 					<!--- lazy-init happens here --->
-					<cfset constructBean(resolvedName)/>	
+					<cfset constructBean(resolvedName)/>
 				</cfif>
 				<cfreturn beanDef.getInstance(returnFactory) />
 			<cfelse>
 				<!--- return a new instance of this bean def --->
 				<cfreturn constructBean(resolvedName,true)/>
-			</cfif>	
+			</cfif>
 		<cfelseif isObject(variables.parent)> <!--- AND variables.parent.containsBean(arguments.beanName)> --->
-			<cfreturn variables.parent.getBean(resolvedName)>			
+			<cfreturn variables.parent.getBean(resolvedName)>
 		<cfelse>
 			<cfthrow type="coldspring.NoSuchBeanDefinitionException" detail="Bean definition for bean named: #resolvedName# could not be found."/>
-		</cfif>		
-		
+		</cfif>
+
 	</cffunction>
-	
-	
+
+
 	<cffunction name="processFactoryPostProcessors" access="private" output="false" returntype="void"
 				hint="constructs and calls postProcessBeanFactory(this) for all factory post processor beans">
-		
+
 		<cfset var beanName = "" />
 		<cfset var bean = 0 />
-					
+
 		<cfloop collection="#variables.beanDefs#" item="beanName">
 			<cfif variables.beanDefs[beanName].isFactoryPostProcessor() >
 				<cfset bean = getBean(beanName) />
@@ -580,20 +580,30 @@
 				<cfset bean.postProcessBeanFactory(this) />
 			</cfif>
 		</cfloop>
-		
-	</cffunction>	
-	
-	
+
+	</cffunction>
+
+
 	<cffunction name="initNonLazyBeans" access="private" output="false" returntype="void"
 				hint="constructs all non-lazy beans">
-		
-	</cffunction>	
-	
+				<cfargument name="beanDefinitions" type="struct" required="true" hint="I am a structure containing the beans definition"/>
+				<cfset var i = 0 />
+				<cfset var nonLazyBeanDefinitions = 0 />
+				<cfset var beanDefinition = 0 />
+		<cfloop collection="#arguments.beanDefinitions#" item="i">
+			<cfset nonLazyBeanDefinitions = XMLSearch(arguments.beanDefinitions[i], "/beans/bean[@lazy-init='false' or @lazy-init='no']") />
+			<!--- get the bean, to init it --->
+			<cfloop from="1" to="#ArrayLen(nonLazyBeanDefinitions)#" index="i">
+				<cfset getBean(nonLazyBeanDefinitions[i].xmlAttributes.id) />
+			</cfloop>
+		</cfloop>
+	</cffunction>
+
 	<cffunction name="constructBean" access="private" returntype="any">
 		<cfargument name="beanName" type="string" required="true"/>
-		<cfargument name="returnInstance" type="boolean" required="false" default="false" 
+		<cfargument name="returnInstance" type="boolean" required="false" default="false"
 					hint="true when constructing a non-singleton bean (aka a prototype)"/>
-					
+
 		<cfset var localBeanCache = StructNew() />
 		<cfset var dependentBeanDefs = ArrayNew(1) />
 		<!--- first get list of beans including this bean and it's dependencies
@@ -616,12 +626,12 @@
 		<cfset var instanceType = '' />
 		<cfset var factoryBeanDef = '' />
 		<cfset var factoryBean = 0>
-		
+
 		<cfset var dependentBeanNames = "" />
 		<cfset var dependentBeans = StructNew() />
-		
+
 		<cfset var mergedBeanDefinition = getMergedBeanDefinition(arguments.beanName) />
-		
+
 		<!--- <cfif mergedBeanDefinition.dependenciesChecked()>
 			<cfset dependentBeans = mergedBeanDefinition.getDependentBeans()>
 		<cfelse>
@@ -629,54 +639,54 @@
 		<cfset dependentBeans.allBeans = arguments.beanName />
 		<cfset dependentBeans.orderedBeans = "" />
 		<cfset mergedBeanDefinition.getDependencies(dependentBeans) />
-			
+
 		<cfset dependentBeanNames = ListPrepend(dependentBeans.orderedBeans, arguments.beanName) />
-		
+
 		<!--- DEBUGGING DEP LIST
 		DEPENDECY LIST:<BR/>
 		<cfdump var="#dependentBeanNames#" label="DEPENDENCY LIST"/><cfabort/> --->
-		
+
 		<!--- put them all in an array, and while we're at it, make sure they're in the singleton cache, or the localbean cache --->
-		
+
 		<cfloop from="1" to="#ListLen(dependentBeanNames)#" index="beanDefIx">
 			<cfset beanDef = getMergedBeanDefinition(ListGetAt(dependentBeanNames,beanDefIx)) />
 			<cfset ArrayAppend(dependentBeanDefs,beanDef) />
-			
+
 			<cfif beanDef.getFactoryBean() eq "">
 				<!--- Factory beans are a special situation, and we actually don't want to create them in this way, because
 					their constructor args may be dependencies, so we will create them in the NEXT loop, along with
 					init methods --->
 				<cfif beanDef.isAbstract()>
-					<cfthrow type="coldspring.BeanCreationException" 
+					<cfthrow type="coldspring.BeanCreationException"
 							 detail="Abstract Beans cannot be instanciated. Did you really meen to define: #beanDef.getBeanID()# as 'Abstract'?"/>
 				</cfif>
 				<cfif beanDef.isSingleton() and not(singletonCacheContainsBean(beanDef.getBeanID()))>
 					<cfset beanDef.getBeanFactory().addBeanToSingletonCache(beanDef.getBeanID(), beanDef.getBeanInstance() ) />
 				<cfelse>
-					<cfset localBeanCache[beanDef.getBeanID()] = beanDef.getBeanInstance() /> 
+					<cfset localBeanCache[beanDef.getBeanID()] = beanDef.getBeanInstance() />
 				</cfif>
 			</cfif>
 		</cfloop>
-	
+
 		<!--- now resolve all dependencies by looping through list backwards, causing the "most dependent" beans to get created first  --->
 		<cfloop from="#ArrayLen(dependentBeanDefs)#" to="1" index="beanDefIx" step="-1">
 			<cfset beanDef = dependentBeanDefs[beanDefIx] />
-		
+
 			<cfif not beanDef.isConstructed()>
-			
+
 				<cfset argDefs = beanDef.getConstructorArgs()/>
 				<cfset propDefs = beanDef.getProperties()/>
-				
+
 				<!--- if this is a 'normal' bean, we can just get the created reference
 					but if it's a factory bean, we have to create it now --->
 				<cfif beanDef.getFactoryBean() eq "">
-				
+
 					<cfif beanDef.isSingleton()>
 						<cfset beanInstance = getBeanFromSingletonCache(beanDef.getBeanID())>
 					<cfelse>
 						<cfset beanInstance = localBeanCache[beanDef.getBeanID()] />
 					</cfif>
-					
+
 					<!--- make sure the beanInstance is an object if we are gonna look at it
 						  (beanInstance could be anything)  --->
 					<cfif isCFC(beanInstance)>
@@ -685,18 +695,18 @@
 						<cfset md = structnew()/>
 						<cfset md.name = ""/>
 					</cfif>
-	
-					
+
+
 				<cfelse>
-					
+
 					<!--- retrieve the factoryBeanDef, then the factory bean --->
 					<cfset factoryBeanDef = getMergedBeanDefinition(beanDef.getFactoryBean()) />
-					
+
 					<cfif factoryBeanDef.isAbstract()>
-						<cfthrow type="coldspring.BeanCreationException" 
+						<cfthrow type="coldspring.BeanCreationException"
 								 detail="Abstract Beans cannot be instanciated. Did you really meen to define: #beanDef.getBeanID()# as 'Abstract'?"/>
 					</cfif>
-					
+
 					<cfif factoryBeanDef.isSingleton()>
 						<cfset factoryBean = factoryBeanDef.getInstance() />
 					<cfelse>
@@ -706,10 +716,10 @@
 							<cfset factoryBean = localBeanCache[factoryBeanDef.getBeanID()] />
 						</cfif>
 					</cfif>
-					
+
 					<cftry>
 						<!--- now call the 'constructor' to generate the bean, which is the factoryMethod --->
-						<cfinvoke component="#factoryBean#" method="#beanDef.getFactoryMethod()#" 
+						<cfinvoke component="#factoryBean#" method="#beanDef.getFactoryMethod()#"
 							returnvariable="beanInstance">
 							<!--- loop over constructor-args and pass them into the factoryMethod --->
 							<cfloop collection="#argDefs#" item="arg">
@@ -730,20 +740,20 @@
 											</cfif>
 										</cfif>
 										<cfinvokeargument name="#argDefs[arg].getArgumentName()#" value="#dependentBeanInstance#"/>
-								</cfif>	  								
+								</cfif>
 							</cfloop>
 						</cfinvoke>
 						<cfcatch type="any">
-							<cfthrow type="coldspring.beanCreationException" 
-								message="Bean creation exception during factory-method call (trying to call #beanDef.getFactoryMethod()# on #factoryBeanDef.getBeanClass()#)" 
-								detail="#cfcatch.message#:#cfcatch.detail#">							
-						</cfcatch>						
-					</cftry>					
+							<cfthrow type="coldspring.beanCreationException"
+								message="Bean creation exception during factory-method call (trying to call #beanDef.getFactoryMethod()# on #factoryBeanDef.getBeanClass()#)"
+								detail="#cfcatch.message#:#cfcatch.detail#">
+						</cfcatch>
+					</cftry>
 					<!--- since we skipped factory beans in the bean creation loop, we need to store a reference to the bean now --->
 					<cfif beanDef.isSingleton() and not(singletonCacheContainsBean(beanDef.getBeanID()))>
 						<cfset beanDef.getBeanFactory().addBeanToSingletonCache(beanDef.getBeanID(), beanInstance ) />
 					<cfelse>
-						<cfset localBeanCache[beanDef.getBeanID()] = beanInstance /> 
+						<cfset localBeanCache[beanDef.getBeanID()] = beanInstance />
 					</cfif>
 					<!--- make sure the beanInstance is an object if we are gonna look at it
 						  (beanInstance could be anything returned from a factory-method call)  --->
@@ -754,13 +764,13 @@
 						<cfset md.name = ""/>
 					</cfif>
 				</cfif>
-				
+
 				<cfif structKeyExists(md, "functions")>
 					<!--- we need to call init method if it exists --->
 					<cfloop from="1" to="#arraylen(md.functions)#" index="functionIndex">
 						<cfif md.functions[functionIndex].name eq "init"
 								and beanDef.getFactoryBean() eq "">
-							
+
 							<cftry>
 							<cfinvoke component="#beanInstance#" method="init">
 								<!--- loop over any bean constructor-args and pass them into the init() --->
@@ -775,34 +785,34 @@
 									<cfelseif argType eq "ref" or argType eq "bean">
 										<cfinvokeargument name="#argDefs[arg].getArgumentName()#"
 														  value="#getBean(argDefs[arg].getValue())#"/>
-									</cfif>			  								
+									</cfif>
 								</cfloop>
 							</cfinvoke>
-							
+
 							<cfcatch type="any">
-								<cfthrow type="coldspring.beanCreationException" 
-									message="Bean creation exception during init() of #beanDef.getBeanClass()#" 
+								<cfthrow type="coldspring.beanCreationException"
+									message="Bean creation exception during init() of #beanDef.getBeanClass()#"
 									detail="#cfcatch.message#:#cfcatch.detail#">
 							</cfcatch>
 						</cftry>
-						
+
 						<cfelseif md.functions[functionIndex].name eq "setBeanFactory"
 								  and arraylen(md.functions[functionIndex].parameters) eq 1
 								  and structKeyExists(md.functions[functionIndex].parameters[1],"type")
 								  and md.functions[functionIndex].parameters[1].type eq "coldspring.beans.BeanFactory">
 							<!--- call setBeanFactory() if it exists and is a beanFactory --->
-							<cfset beanInstance.setBeanFactory(beanDef.getBeanFactory()) />	
-							
+							<cfset beanInstance.setBeanFactory(beanDef.getBeanFactory()) />
+
 						</cfif>
 					</cfloop>
-				</cfif>				
-				
+				</cfif>
+
 				<!--- if this is a bean that extends the factory bean, set IsFactory, and give it a ref to the beanFactory --->
 				<cfset searchMd = md />
 				<cfif searchMd.name IS 'coldspring.aop.framework.RemoteFactoryBean'>
 					<cfset beanInstance.setId(arguments.beanName) />
 				</cfif>
-				
+
 				<cfloop condition="#StructKeyExists(searchMd,"extends")#">
 					<cfset searchMd = searchMd.extends />
 					<cfif searchMd.name IS 'coldspring.aop.framework.RemoteFactoryBean'>
@@ -815,8 +825,8 @@
 						<cfbreak />
 					</cfif>
 				</cfloop>
-		
-				<!--- now do dependency injection via setters --->		
+
+				<!--- now do dependency injection via setters --->
 				<cfloop collection="#propDefs#" item="prop">
 					<cfset propType = propDefs[prop].getType() />
 					<cfif propType eq "value">
@@ -824,13 +834,13 @@
 								  method="set#propDefs[prop].getName()#">
 							<cfinvokeargument name="#propDefs[prop].getArgumentName()#"
 								  	value="#propDefs[prop].getValue()#"/>
-						</cfinvoke>			
+						</cfinvoke>
 					<cfelseif propType eq "map" or propType eq "list">
 						<cfinvoke component="#beanInstance#"
 								  method="set#propDefs[prop].getName()#">
 							<cfinvokeargument name="#propDefs[prop].getArgumentName()#"
 								  	value="#constructComplexProperty(propDefs[prop].getValue(), propDefs[prop].getType(), localBeanCache)#"/>
-						</cfinvoke>				
+						</cfinvoke>
 					<cfelseif propType eq "ref" or propType eq "bean">
 						<cfset dependentBeanDef = getMergedBeanDefinition(propDefs[prop].getValue()) />
 						<cfif dependentBeanDef.isSingleton()>
@@ -842,7 +852,7 @@
 								<cfset dependentBeanInstance = localBeanCache[dependentBeanDef.getBeanID()] />
 							</cfif>
 						</cfif>
-						
+
 						<cfinvoke component="#beanInstance#"
 								  method="set#propDefs[prop].getName()#">
 							<cfinvokeargument name="#propDefs[prop].getArgumentName()#"
@@ -850,8 +860,8 @@
 						</cfinvoke>
 					</cfif>
 				</cfloop>
-				
-				<!--- in order to inject the proper advisors into the aop proxy factories, we should do this now, 
+
+				<!--- in order to inject the proper advisors into the aop proxy factories, we should do this now,
 					  instead of letting them lookup their own objects --->
 				<cfif beanDef.isFactory()>
 					<cftry>
@@ -862,36 +872,36 @@
 						</cfcatch>
 					</cftry>
 				</cfif>
-					
+
 				<cfif beanDef.isSingleton()>
 					<cfset beanDef.setIsConstructed(true)/>
 				</cfif>
-				
+
 			</cfif>
 
 		</cfloop>
-		
+
 		<!--- now loop again (same direction: backwards) for init-methods --->
 		<cfloop from="#ArrayLen(dependentBeanDefs)#" to="1" index="beanDefIx" step="-1">
 			<cfset beanDef = dependentBeanDefs[beanDefIx] />
-			
+
 			<cfif beanDef.isSingleton()>
 				<cfset beanInstance = getBeanFromSingletonCache(beanDef.getBeanID())>
 			<cfelse>
 				<cfset beanInstance = localBeanCache[beanDef.getBeanID()] />
 			</cfif>
-			
+
 			<!--- now call an init-method if it's defined --->
 			<cfif beanDef.hasInitMethod() and not beanDef.getInitMethodWasCalled()>
-								
+
 				<cfinvoke component="#beanInstance#"
 						  method="#beanDef.getInitMethod()#"/>
-				
+
 				<!--- make sure it only gets called once --->
 				<cfset beanDef.setInitMethodWasCalled(true) />
-						  
+
 			</cfif>
-			
+
 		</cfloop>
 
 		<!--- if we're supposed to return the new object, do it --->
@@ -900,42 +910,42 @@
 				<cfreturn getBeanFromSingletonCache(dependentBeanDefs[1].getBeanID())>
 			<cfelse>
 				<cfreturn localBeanCache[dependentBeanDefs[1].getBeanID()]>
-			</cfif>	
-		</cfif>	
-		
+			</cfif>
+		</cfif>
+
 	</cffunction>
-	
+
 	<cffunction name="constructComplexProperty" access="private" output="false" returntype="any"
 				hint="recurses through properties/constructor-args that are complex, resolving dependencies along the way">
 		<cfargument name="ComplexProperty" type="any" required="true"/>
 		<cfargument name="type" type="string" required="true"/>
 		<cfargument name="localBeanCache" type="struct" required="true"/>
-		<cfset var rtn = 0 />	
-		
+		<cfset var rtn = 0 />
+
 		<cfif arguments.type eq 'map'>
 			<!--- just return the struct because it's passed by ref --->
-			<cfset findComplexPropertyRefs(arguments.ComplexProperty,arguments.type, arguments.localBeanCache)/> 
-			<cfreturn arguments.ComplexProperty/>		
+			<cfset findComplexPropertyRefs(arguments.ComplexProperty,arguments.type, arguments.localBeanCache)/>
+			<cfreturn arguments.ComplexProperty/>
 		<cfelseif arguments.type eq 'list'>
-			<!--- tail recursion for the array (and return the result) --->			
-			<cfreturn findComplexPropertyRefs(arguments.ComplexProperty,arguments.type, arguments.localBeanCache)/> 			
+			<!--- tail recursion for the array (and return the result) --->
+			<cfreturn findComplexPropertyRefs(arguments.ComplexProperty,arguments.type, arguments.localBeanCache)/>
 		</cfif>
-		
-		
+
+
 	</cffunction>
-	
+
 	<cffunction name="findComplexPropertyRefs" access="private" output="false" returntype="any">
-		<cfargument name="ComplexProperty" type="any" required="true"/>	
+		<cfargument name="ComplexProperty" type="any" required="true"/>
 		<cfargument name="type" type="string" required="true"/>
 		<cfargument name="localBeanCache" type="struct" required="true"/>
 		<cfset var entry=0/>
 		<cfset var tmp_ref=0/>
-		
+
 		<!--- based on the the type of property/con-arg --->
 		<cfswitch expression="#arguments.type#">
 			<cfcase value="map">
 				<cfloop collection="#arguments.ComplexProperty#" item="entry">
-					<!--- loop thru the map (struct) --->			
+					<!--- loop thru the map (struct) --->
 					<cfif isObject(arguments.ComplexProperty[entry]) and getMetaData(arguments.ComplexProperty[entry]).name eq "coldspring.beans.BeanReference">
 						<!--- this key's value is a beanReference, basically a placeholder that we replace
 							  with the actual bean, right now --->
@@ -944,19 +954,19 @@
 							<cfset arguments.ComplexProperty[entry] = getBeanFromSingletonCache(dependentBeanDef.getBeanID())>
 						<cfelse>
 							<cfset arguments.ComplexProperty[entry] = localBeanCache[dependentBeanDef.getBeanID()] />
-						</cfif>						
+						</cfif>
 					<cfelseif isStruct(arguments.ComplexProperty[entry])>
 						<!--- ok, we found a map within this map, so recurse --->
 						<cfset findComplexPropertyRefs(arguments.ComplexProperty[entry],"map",arguments.localBeanCache)/>
 					<cfelseif isArray(arguments.ComplexProperty[entry])>
-						<!--- ok, we found a list within this map, so recurse --->						
-						<cfset arguments.ComplexProperty[entry] = findComplexPropertyRefs(arguments.ComplexProperty[entry],"list",arguments.localBeanCache)/>						
-					</cfif>	
-				</cfloop>	
+						<!--- ok, we found a list within this map, so recurse --->
+						<cfset arguments.ComplexProperty[entry] = findComplexPropertyRefs(arguments.ComplexProperty[entry],"list",arguments.localBeanCache)/>
+					</cfif>
+				</cfloop>
 			</cfcase>
 			<cfcase value="list">
 				<cfloop from="1" to="#arraylen(arguments.ComplexProperty)#" index="entry">
-					<!--- loop thru the list (array) --->			
+					<!--- loop thru the list (array) --->
 					<cfif isObject(arguments.ComplexProperty[entry]) and getMetaData(arguments.ComplexProperty[entry]).name eq "coldspring.beans.BeanReference">
 						<!--- same as above, this key's value is a beanReference, basically a placeholder that we replace
 							  with the actual bean, right now --->
@@ -965,38 +975,38 @@
 							<cfset arguments.ComplexProperty[entry] = getBeanFromSingletonCache(dependentBeanDef.getBeanID())>
 						<cfelse>
 							<cfset arguments.ComplexProperty[entry] = localBeanCache[dependentBeanDef.getBeanID()] />
-						</cfif>						
+						</cfif>
 					<cfelseif isStruct(arguments.ComplexProperty[entry])>
 						<!--- ok, we found a map within this list, so recurse --->
 						<cfset findComplexPropertyRefs(arguments.ComplexProperty[entry],"map",arguments.localBeanCache)/>
 					<cfelseif isArray(arguments.ComplexProperty[entry])>
 						<!--- ok, we found a list within this list, so recurse --->
 						<cfset arguments.ComplexProperty[entry] = findComplexPropertyRefs(arguments.ComplexProperty[entry],"list",arguments.localBeanCache)/>
-					</cfif>	
-				</cfloop>			
+					</cfif>
+				</cfloop>
 				<cfreturn arguments.ComplexProperty />
 			</cfcase>
 		</cfswitch>
-		
-	</cffunction>	
-	
+
+	</cffunction>
+
 	<cffunction name="isCFC" access="public" returntype="boolean">
 		<cfargument name="objectToCheck" type="any" required="true"/>
-		
+
 		<cfset var md = getMetaData(arguments.objectToCheck)/>
 		<cfreturn isObject(arguments.objectToCheck) and structKeyExists(md,'type') and md.type eq 'component'/>
-		
+
 	</cffunction>
-	
+
 	<cffunction name="flattenMetaData" access="public" output="false" hint="takes metadata, copies inherited methods into the top level function array, and returns it" returntype="struct">
 		<cfargument name="md" type="struct" required="true" />
 		<cfset var i = "" />
 		<cfset var flattenedMetaData = duplicate(arguments.md)/>
 		<cfset var foundFunctions = ""/>
 		<cfset var access = "" />
-		
+
 		<cfset flattenedMetaData.functions = arraynew(1)/>
-		
+
 		<cfloop condition="true">
 			<cfif structKeyExists(arguments.md, "functions")>
 				<cfloop from="1" to="#arrayLen(arguments.md.functions)#" index="i">
@@ -1021,9 +1031,9 @@
 			</cfif>
 		</cfloop>
 		<cfreturn flattenedMetaData/>
-		
-	</cffunction>	
-	
+
+	</cffunction>
+
 	<cffunction name="getDefaultProperties" access="public" output="false" returntype="struct">
 		<cfreturn variables.DefaultProperties/>
 	</cffunction>
@@ -1032,7 +1042,7 @@
 		<cfargument name="DefaultProperties" type="struct" required="true"/>
 		<cfset variables.DefaultProperties = arguments.DefaultProperties/>
 	</cffunction>
-	
+
 	<cffunction name="getDefaultAttributes" access="public" output="false" returntype="struct">
 		<cfreturn variables.DefaultAttributes/>
 	</cffunction>
@@ -1040,16 +1050,16 @@
 	<cffunction name="setDefaultAttributes" access="public" output="false" returntype="void">
 		<cfargument name="DefaultAttributes" type="struct" required="true"/>
 		<cfset variables.DefaultAttributes = arguments.DefaultAttributes/>
-	</cffunction>	
-	
+	</cffunction>
+
 
 	<cffunction name="getDefaultValue" access="private">
 		<cfargument name="attributeName" required="true" type="string"/>
 		<cfargument name="attributeValue" required="true" type="any"/>
-		
+
 		<cfif arguments.attributeValue eq "default">
 			<cfif structKeyExists(variables.defaultAttributes, arguments.attributeName)>
-				<cfreturn variables.defaultAttributes[arguments.attributeName]/>		
+				<cfreturn variables.defaultAttributes[arguments.attributeName]/>
 			<cfelse>
 				<cfswitch expression="#arguments.attributeName#">
 					<cfcase value="autowire">
@@ -1057,15 +1067,15 @@
 					</cfcase>
 					<cfcase value="singleton">
 						<cfreturn true/>
-					</cfcase>					
+					</cfcase>
 					<cfdefaultcase>
-						<cfreturn false/>					
+						<cfreturn false/>
 					</cfdefaultcase>
 				</cfswitch>
-			</cfif>			
+			</cfif>
 		<cfelse>
-			<cfreturn arguments.attributeValue/>		
-		</cfif>				
+			<cfreturn arguments.attributeValue/>
+		</cfif>
 	</cffunction>