Changeset 1769

Timestamp:

10/14/08 15:58:36 (5 years ago)

Author:

lmajano

Message:

Basic autowire support via conventions for coldspring and lightwire

Files:

• coldbox/trunk/system/plugins/ioc.cfc (modified) (6 diffs)

coldbox/trunk/system/plugins/ioc.cfc

@@ -35 +35 @@
                         setpluginDescription("This is an inversion of control plugin.");
                         
-                        /* Local Properties */
-                        
                         /* Setup the framework chosen in the config */
                         setIOCFramework( getSetting("IOCFramework") );
@@ -59 +57 @@
                                 setLIGHTWIRE_FACTORY( getSetting("LightWireBeanFactory",true) );
                         }
-                                                
+                        
                         /* Return instance. */
                         return this;
@@ -110 +108 @@
                 <cfargument name="beanName" type="string" required="true" hint="The bean name to retrieve from the object factory">
                 <!--- ************************************************************* --->
-                <cfset var oBean = "">
+                <cfset var oBean = 0>
                 <cfset var beanKey = "ioc_" & arguments.beanName>
                 <cfset var MetaData = structNew()>
@@ -119 +117 @@
                         <cfset oBean = getColdBoxOCM().get(beanKey)>
                 <cfelse>
-                        
                         <!--- Get Bean from IOC Framework --->
                         <cfif lcase(getIOCFramework()) eq "coldspring">
@@ -126 +123 @@
                                 <cfset oBean = getIoCFactory().getBean(arguments.beanName)>
                         </cfif>
+                        
+                        <!--- Autowire Support --->
+                        <cfset getPlugin("beanFactory").autowire(target=oBean,annotationCheck=true)>
                         
                         <!--- If Caching on, then set object in cache --->
@@ -146 +146 @@
                                                 <cfset MetaData.cacheLastAccessTimeout = "">
                                         </cfif>
-                                        
+                                        <!--- Cache the object --->
                                         <cflock name="ioc.objectCaching.#arguments.beanName#" type="exclusive" timeout="30" throwontimeout="true">
-                                                <!--- Cache the object --->
                                                 <cfset getColdboxOCM().set(beanKey,oBean,metadata.cacheTimeout,metadata.cacheLastAccessTimeout)>
                                         </cflock>
                                 </cfif>
-                        </cfif>
-                        
+                        </cfif>                 
                 </cfif>