Changeset 823

Timestamp:

07/31/07 05:40:42 (6 years ago)

Author:

lmajano

Message:

Almost there.

Location:

coldbox/trunk/src/system

Files:

• beans/cacheConfigBean.cfc (modified) (1 diff)
• beans/configBean.cfc (modified) (3 diffs)
• beans/datasourceBean.cfc (modified) (11 diffs)
• beans/eventhandlerBean.cfc (modified) (7 diffs)
• beans/exceptionBean.cfc (modified) (23 diffs)
• beans/mailsettingsBean.cfc (modified) (9 diffs)
• beans/requestContext.cfc (modified) (19 diffs)
• cache/cacheManager.cfc (modified) (10 diffs)
• cache/objectPool.cfc (modified) (10 diffs)
• config/readme.txt (modified) (1 diff)
• config/settings.xml (modified) (1 diff)
• controller.cfc (modified) (6 diffs)
• extras/baseTest.cfc (modified) (1 diff)
• plugin.cfc (modified) (8 diffs)
• plugins/FileWriter.cfc (modified) (1 diff)
• plugins/JavaLoader.cfc (modified) (1 diff)
• plugins/StringBuffer.cfc (modified) (1 diff)
• plugins/XMLParser.cfc (modified) (1 diff)
• plugins/cfcViewer.cfc (modified) (2 diffs)
• plugins/i18n.cfc (modified) (1 diff)
• plugins/logger.cfc (modified) (1 diff)
• plugins/zip.cfc (modified) (1 diff)
• services/requestService.cfc (modified) (2 diffs)

coldbox/trunk/src/system/beans/cacheConfigBean.cfc

@@ -28 +28 @@
                 <cfscript>
                 variables.instance = structnew();
-                variables.instance.CacheObjectDefaultTimeout = arguments.CacheObjectDefaultTimeout;
-                variables.instance.CacheObjectDefaultLastAccessTimeout = arguments.CacheObjectDefaultLastAccessTimeout;
-                variables.instance.CacheReapFrequency = arguments.CacheReapFrequency;
-                variables.instance.CacheMaxObjects = arguments.CacheMaxObjects;
-                variables.instance.CacheFreeMemoryPercentageThreshold = arguments.CacheFreeMemoryPercentageThreshold;
+                instance.CacheObjectDefaultTimeout = arguments.CacheObjectDefaultTimeout;
+                instance.CacheObjectDefaultLastAccessTimeout = arguments.CacheObjectDefaultLastAccessTimeout;
+                instance.CacheReapFrequency = arguments.CacheReapFrequency;
+                instance.CacheMaxObjects = arguments.CacheMaxObjects;
+                instance.CacheFreeMemoryPercentageThreshold = arguments.CacheFreeMemoryPercentageThreshold;
                 return this;
                 </cfscript>

coldbox/trunk/src/system/beans/configBean.cfc

@@ -49 +49 @@
                 <cfargument name="key" type="string" required="true">
                 <cfif keyExists(arguments.key)>
-                        <cfreturn Evaluate("variables.configStruct.#arguments.key#")>
+                        <cfreturn Evaluate("configStruct.#arguments.key#")>
                 <cfelse>
                         <cfthrow message="Key not found in configStruct">
@@ -61 +61 @@
                 <cfargument name="value" type="any" required="true">
                 <cfscript>
-                "variables.configStruct.#arguments.key#" = arguments.value;
+                "configStruct.#arguments.key#" = arguments.value;
                 </cfscript>
         </cffunction>
@@ -69 +69 @@
         <cffunction name="keyExists" access="public" returntype="any" output="false">
                 <cfargument name="key" type="string" required="true">
-                <cfreturn isDefined("variables.configStruct.#arguments.key#")>
+                <cfreturn isDefined("configStruct.#arguments.key#")>
         </cffunction>
 

coldbox/trunk/src/system/beans/datasourceBean.cfc

@@ -19 +19 @@
         <cfscript>
                 variables.instance = structnew();
-                variables.instance.name = "";
-                variables.instance.alias = "";
-                variables.instance.dbtype = "";
-                variables.instance.username = "";
-            variables.instance.password = "" ;
+                instance.name = "";
+                instance.alias = "";
+                instance.dbtype = "";
+                instance.username = "";
+            instance.password = "" ;
         </cfscript>
 
@@ -57 +57 @@
         <cffunction name="setname" access="public" return="void" output="false" hint="Set name of the datasource, this maps to the Coldfusion datasource name">
           <cfargument name="name" type="string" required="true">
-          <cfset variables.instance.name=arguments.name >
+          <cfset instance.name=arguments.name >
         </cffunction>
 
@@ -63 +63 @@
 
         <cffunction name="getname" access="public" return="string" output="false" hint="Get the name">
-          <cfreturn variables.instance.name >
+          <cfreturn instance.name >
         </cffunction>
 
@@ -70 +70 @@
         <cffunction name="setalias" access="public" return="void" output="false" hint="Set alias of the datasource, this is used for reference to the structure.">
           <cfargument name="alias" type="string" required="true">
-          <cfset variables.instance.alias=arguments.alias >
+          <cfset instance.alias=arguments.alias >
         </cffunction>
 
@@ -76 +76 @@
 
         <cffunction name="getalias" access="public" return="string" output="false" hint="Get the alias">
-          <cfreturn variables.instance.name >
+          <cfreturn instance.name >
         </cffunction>
 
@@ -83 +83 @@
         <cffunction name="setDBType" access="public" return="void" output="false" hint="Set DBType">
           <cfargument name="dbtype" type="string" required="true">
-          <cfset variables.instance.dbtype=arguments.dbtype >
+          <cfset instance.dbtype=arguments.dbtype >
         </cffunction>
 
@@ -89 +89 @@
 
         <cffunction name="getDBType" access="public" return="string" output="false" hint="Get DBType">
-          <cfreturn variables.instance.dbtype >
+          <cfreturn instance.dbtype >
         </cffunction>
 
@@ -96 +96 @@
         <cffunction name="setUsername" access="public" return="void" output="false" hint="Set Username">
           <cfargument name="Username" type="string" required="true">
-          <cfset variables.instance.Username=arguments.Username >
+          <cfset instance.Username=arguments.Username >
         </cffunction>
 
@@ -102 +102 @@
 
         <cffunction name="getUsername" access="public" return="string" output="false" hint="Get Username">
-          <cfreturn variables.instance.Username >
+          <cfreturn instance.Username >
         </cffunction>
 
@@ -109 +109 @@
         <cffunction name="setPassword" access="public" return="void" output="false" hint="Set Password">
           <cfargument name="Password" type="string" required="true" >
-          <cfset variables.instance.Password=arguments.Password >
+          <cfset instance.Password=arguments.Password >
         </cffunction>
 
@@ -115 +115 @@
 
         <cffunction name="getPassword" access="public" return="string" output="false" hint="Get Password">
-          <cfreturn variables.instance.Password >
+          <cfreturn instance.Password >
         </cffunction>
 

coldbox/trunk/src/system/beans/eventhandlerBean.cfc

@@ -20 +20 @@
         <cfscript>
         variables.instance = structnew();
-        variables.instance.invocationPath = "";
-        variables.instance.handler = "";
-        variables.instance.method = "";
+        instance.invocationPath = "";
+        instance.handler = "";
+        instance.method = "";
         </cfscript>
 
@@ -59 +59 @@
         <cffunction name="setMethod" access="public" returntype="void" output="false">
                 <cfargument name="method" type="string" required="true" />
-                <cfset variables.instance.method = arguments.method>
+                <cfset instance.method = arguments.method>
         </cffunction>
 
@@ -65 +65 @@
 
         <cffunction name="getMethod" access="public" returntype="any" output="false">
-                <cfreturn variables.instance.method >
+                <cfreturn instance.method >
         </cffunction>
 
@@ -72 +72 @@
         <cffunction name="setHandler" access="public" returntype="void" output="false">
                 <cfargument name="handler" type="string" required="true" />
-                <cfset variables.instance.handler = arguments.handler >
+                <cfset instance.handler = arguments.handler >
         </cffunction>
 
@@ -78 +78 @@
 
         <cffunction name="getHandler" access="public" returntype="any" output="false">
-                <cfreturn variables.instance.handler >
+                <cfreturn instance.handler >
         </cffunction>
 
@@ -85 +85 @@
         <cffunction name="setInvocationPath" access="public" returntype="void" output="false">
                 <cfargument name="InvocationPath" type="string" required="true" />
-                <cfset variables.instance.InvocationPath = arguments.InvocationPath >
+                <cfset instance.InvocationPath = arguments.InvocationPath >
         </cffunction>
 
@@ -91 +91 @@
 
         <cffunction name="getInvocationPath" access="public" returntype="any" output="false">
-                <cfreturn variables.instance.InvocationPath >
+                <cfreturn instance.InvocationPath >
         </cffunction>
 

coldbox/trunk/src/system/beans/exceptionBean.cfc

@@ -20 +20 @@
                 variables.instance = structnew();
                 // CFMX Exception Structure ;
-                variables.instance.exceptionStruct = structnew();
+                instance.exceptionStruct = structnew();
                 // Exception Message ;
-                variables.instance.extramessage = "";
+                instance.extramessage = "";
                 // Exception ExtraInformation variable, could be anything. ;
-                variables.instance.extraInfo = "";
+                instance.extraInfo = "";
                 // Exception type, either application or framework ;
-                variables.instance.errorType = "application";
+                instance.errorType = "application";
                 // Null Declarations ;
                 variables.STRINGNULL = "";
@@ -41 +41 @@
                 <!--- ************************************************************* --->
                 <!--- Set instance for exception structure --->
-                <cfset variables.instance.exceptionStruct = duplicate(arguments.errorStruct) />
-                <cfif not isStruct(variables.instance.exceptionStruct)>
-                        <cfset variables.instance.exceptionStruct = structnew()>
+                <cfset instance.exceptionStruct = duplicate(arguments.errorStruct) />
+                <cfif not isStruct(instance.exceptionStruct)>
+                        <cfset instance.exceptionStruct = structnew()>
                 </cfif>
                 <!--- Set extra exception messages --->
-                <cfset variables.instance.extramessage = arguments.extramessage>
-                <cfset variables.instance.extraInfo = arguments.extraInfo>
+                <cfset instance.extramessage = arguments.extramessage>
+                <cfset instance.extraInfo = arguments.extraInfo>
                 <!--- Verify errorType --->
                 <cfif not reFindnocase("^(application|framework)$",arguments.errorType)>
-                        <cfset variables.instance.errorType = "application">
-                <cfelse>
-                        <cfset variables.instance.errorType = arguments.errorType>
+                        <cfset instance.errorType = "application">
+                <cfelse>
+                        <cfset instance.errorType = arguments.errorType>
                 </cfif>
                 <cfreturn this >
@@ -75 +75 @@
 
         <cffunction name="getErrorType" access="public" returntype="string" output="false">
-                <cfreturn variables.instance.errorType >
+                <cfreturn instance.errorType >
         </cffunction>
 
@@ -81 +81 @@
 
         <cffunction name="getExceptionStruct" access="public" returntype="struct" output="false">
-                <cfreturn variables.instance.exceptionStruct >
+                <cfreturn instance.exceptionStruct >
         </cffunction>
 
@@ -87 +87 @@
 
         <cffunction name="getExtraMessage" access="public" returntype="string" output="false">
-                <cfreturn variables.instance.extramessage >
+                <cfreturn instance.extramessage >
         </cffunction>
 
@@ -93 +93 @@
 
         <cffunction name="getExtraInfo" access="public" returntype="any" output="false">
-                <cfreturn variables.instance.extraInfo >
+                <cfreturn instance.extraInfo >
         </cffunction>
 
@@ -99 +99 @@
 
         <cffunction name="getType" access="public" returntype="string" output="false">
-                <cfif structKeyExists(variables.instance.exceptionStruct, "Type")>
-                        <cfreturn variables.instance.exceptionStruct.type >
+                <cfif structKeyExists(instance.exceptionStruct, "Type")>
+                        <cfreturn instance.exceptionStruct.type >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -109 +109 @@
 
         <cffunction name="getMessage" access="public" returntype="string" output="false">
-                <cfif structkeyExists(variables.instance.exceptionStruct,"message")>
-                        <cfreturn variables.instance.exceptionStruct.message >
+                <cfif structkeyExists(instance.exceptionStruct,"message")>
+                        <cfreturn instance.exceptionStruct.message >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -119 +119 @@
 
         <cffunction name="getDetail" access="public" returntype="string" output="false">
-                <cfif structkeyExists(variables.instance.exceptionStruct,"detail")>
-                        <cfreturn variables.instance.exceptionStruct.detail >
+                <cfif structkeyExists(instance.exceptionStruct,"detail")>
+                        <cfreturn instance.exceptionStruct.detail >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -129 +129 @@
 
         <cffunction name="getStackTrace" access="public" returntype="string" output="false">
-                <cfif structKeyExists(variables.instance.exceptionStruct, 'StackTrace')>
-                        <cfreturn variables.instance.exceptionStruct.StackTrace >
+                <cfif structKeyExists(instance.exceptionStruct, 'StackTrace')>
+                        <cfreturn instance.exceptionStruct.StackTrace >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -139 +139 @@
 
         <cffunction name="getTagContext" access="public" returntype="array" output="false">
-                <cfif structkeyExists(variables.instance.exceptionStruct, "TagContext")>
-                        <cfreturn variables.instance.exceptionStruct.tagContext >
+                <cfif structkeyExists(instance.exceptionStruct, "TagContext")>
+                        <cfreturn instance.exceptionStruct.tagContext >
                 <cfelse>
                         <cfreturn variables.ARRAYNULL>
@@ -153 +153 @@
                 <cfset var i = 1>
                 <cfset var entry = "">
-                <cfif structkeyExists(variables.instance.exceptionStruct, "TagContext") and ArrayLen(variables.instance.exceptionStruct.TagContext)>
+                <cfif structkeyExists(instance.exceptionStruct, "TagContext") and ArrayLen(instance.exceptionStruct.TagContext)>
                         <cfloop from="1" to="#arrayLen(arrayTagContext)#" index="i">
                           <cfsavecontent variable="entry"><cfoutput>ID: <cfif not structKeyExists(arrayTagContext[i], "ID")>N/A<cfelse>#arrayTagContext[i].ID#</cfif>; LINE: #arrayTagContext[i].LINE#; TEMPLATE: #arrayTagContext[i].Template# #chr(13)#</cfoutput></cfsavecontent>
@@ -167 +167 @@
 
         <cffunction name="getNativeErrorCode" access="public" returntype="string" output="false">
-                <cfif StructKeyExists(variables.instance.exceptionStruct,'nativeErrorCode')>
-                        <cfreturn variables.instance.exceptionStruct.nativeErrorCode >
+                <cfif StructKeyExists(instance.exceptionStruct,'nativeErrorCode')>
+                        <cfreturn instance.exceptionStruct.nativeErrorCode >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -178 +178 @@
         <!--- ************************************************************* --->
         <cffunction name="getSqlState" access="public" returntype="string" output="false">
-                <cfif StructKeyExists(variables.instance.exceptionStruct,'sqlState')>
-                        <cfreturn variables.instance.exceptionStruct.sqlState >
+                <cfif StructKeyExists(instance.exceptionStruct,'sqlState')>
+                        <cfreturn instance.exceptionStruct.sqlState >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -188 +188 @@
 
         <cffunction name="getSql" access="public" returntype="string" output="false">
-                <cfif StructKeyExists(variables.instance.exceptionStruct,'sql')>
-                        <cfreturn variables.instance.exceptionStruct.sql >
+                <cfif StructKeyExists(instance.exceptionStruct,'sql')>
+                        <cfreturn instance.exceptionStruct.sql >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -198 +198 @@
 
         <cffunction name="getQueryError" access="public" returntype="string" output="false">
-                <cfif StructKeyExists(variables.instance.exceptionStruct,'queryError')>
-                        <cfreturn variables.instance.exceptionStruct.queryError >
+                <cfif StructKeyExists(instance.exceptionStruct,'queryError')>
+                        <cfreturn instance.exceptionStruct.queryError >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -208 +208 @@
 
         <cffunction name="getWhere" access="public" returntype="string" output="false">
-                <cfif StructKeyExists(variables.instance.exceptionStruct,'where')>
-                        <cfreturn variables.instance.exceptionStruct.where >
+                <cfif StructKeyExists(instance.exceptionStruct,'where')>
+                        <cfreturn instance.exceptionStruct.where >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -218 +218 @@
 
         <cffunction name="getErrNumber" access="public" returntype="string" output="false">
-                <cfif StructKeyExists(variables.instance.exceptionStruct,'errNumber')>
-                        <cfreturn variables.instance.exceptionStruct.errNumber >
+                <cfif StructKeyExists(instance.exceptionStruct,'errNumber')>
+                        <cfreturn instance.exceptionStruct.errNumber >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -228 +228 @@
 
         <cffunction name="getMissingFileName" access="public" returntype="string" output="false">
-                <cfif StructKeyExists(variables.instance.exceptionStruct,'missingFileName')>
-                        <cfreturn variables.instance.exceptionStruct.missingFileName >
+                <cfif StructKeyExists(instance.exceptionStruct,'missingFileName')>
+                        <cfreturn instance.exceptionStruct.missingFileName >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -238 +238 @@
 
         <cffunction name="getLockName" access="public" returntype="string" output="false">
-                <cfif StructKeyExists(variables.instance.exceptionStruct,'lockName')>
-                        <cfreturn variables.instance.exceptionStruct.lockName >
+                <cfif StructKeyExists(instance.exceptionStruct,'lockName')>
+                        <cfreturn instance.exceptionStruct.lockName >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -248 +248 @@
 
         <cffunction name="getLockOperation" access="public" returntype="string" output="false">
-                <cfif StructKeyExists(variables.instance.exceptionStruct,'lockOperation')>
-                        <cfreturn variables.instance.exceptionStruct.lockOperation >
+                <cfif StructKeyExists(instance.exceptionStruct,'lockOperation')>
+                        <cfreturn instance.exceptionStruct.lockOperation >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -258 +258 @@
 
         <cffunction name="getErrorCode" access="public" returntype="string" output="false">
-                <cfif StructKeyExists(variables.instance.exceptionStruct,'errorCode')>
-                        <cfreturn variables.instance.exceptionStruct.errorCode >
+                <cfif StructKeyExists(instance.exceptionStruct,'errorCode')>
+                        <cfreturn instance.exceptionStruct.errorCode >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>
@@ -268 +268 @@
 
         <cffunction name="getExtendedInfo" access="public" returntype="string" output="false">
-                <cfif StructKeyExists(variables.instance.exceptionStruct,'extendedInfo')>
-                        <cfreturn variables.instance.exceptionStruct.extendedInfo >
+                <cfif StructKeyExists(instance.exceptionStruct,'extendedInfo')>
+                        <cfreturn instance.exceptionStruct.extendedInfo >
                 <cfelse>
                         <cfreturn variables.STRINGNULL>

coldbox/trunk/src/system/beans/mailsettingsBean.cfc

@@ -22 +22 @@
         <cfscript>
                 variables.instance = structnew();
-                variables.instance.server = "";
-                variables.instance.username = "";
-            variables.instance.password = "" ;
-                variables.instance.port = "";
+                instance.server = "";
+                instance.username = "";
+            instance.password = "" ;
+                instance.port = "";
         </cfscript>
 
@@ -65 +65 @@
         <cffunction name="setserver" access="public" return="void" output="false" hint="Set server">
           <cfargument name="server" type="string" >
-          <cfset variables.instance.server=arguments.server >
+          <cfset instance.server=arguments.server >
         </cffunction>
 
@@ -71 +71 @@
 
         <cffunction name="getserver" access="public" return="string" output="false" hint="Get server">
-          <cfreturn variables.instance.server >
+          <cfreturn instance.server >
         </cffunction>
 
@@ -78 +78 @@
         <cffunction name="setport" access="public" return="void" output="false" hint="Set port">
           <cfargument name="port" type="string" >
-          <cfset variables.instance.port=arguments.port >
+          <cfset instance.port=arguments.port >
         </cffunction>
 
@@ -84 +84 @@
 
         <cffunction name="getport" access="public" return="string" output="false" hint="Get port">
-          <cfreturn variables.instance.port >
+          <cfreturn instance.port >
         </cffunction>
 
@@ -91 +91 @@
         <cffunction name="setUsername" access="public" return="void" output="false" hint="Set Username">
           <cfargument name="Username" type="string" >
-          <cfset variables.instance.Username=arguments.Username >
+          <cfset instance.Username=arguments.Username >
         </cffunction>
 
@@ -97 +97 @@
 
         <cffunction name="getUsername" access="public" return="string" output="false" hint="Get Username">
-          <cfreturn variables.instance.Username >
+          <cfreturn instance.Username >
         </cffunction>
 
@@ -104 +104 @@
         <cffunction name="setPassword" access="public" return="void" output="false" hint="Set Password">
           <cfargument name="Password" type="string" >
-          <cfset variables.instance.Password=arguments.Password >
+          <cfset instance.Password=arguments.Password >
         </cffunction>
 
@@ -110 +110 @@
 
         <cffunction name="getPassword" access="public" return="string" output="false" hint="Get Password">
-          <cfreturn variables.instance.Password >
+          <cfreturn instance.Password >
         </cffunction>
 

coldbox/trunk/src/system/beans/requestContext.cfc

@@ -20 +20 @@
         
         <cfscript>
-                variables.context = structnew();
-                variables.defaultLayout = "";
-                variables.defaultView = "";
-                variables.ViewLayouts = "";
-                variables.eventName = "";
+                variables.instance = structnew();
+                instance.context = structnew();
+                instance.defaultLayout = "";
+                instance.defaultView = "";
+                instance.ViewLayouts = "";
+                instance.eventName = "";
         </cfscript>
 
@@ -53 +54 @@
                 <cfscript>
                         if ( arguments.DeepCopyFlag )
-                                return duplicate(variables.context);
+                                return duplicate(instance.context);
                         else
-                                return variables.context;
+                                return instance.context;
                 </cfscript>
         </cffunction>
@@ -63 +64 @@
         <cffunction name="setCollection" access="public" returntype="void" output="false" hint="Overwrite the collection with another collection">
                 <cfargument name="collection" type="struct" required="true">
-                <cfset variables.context = arguments.collection>
+                <cfset instance.context = arguments.collection>
         </cffunction>
 
@@ -69 +70 @@
 
         <cffunction name="clearCollection" access="public" returntype="void" output="false" hint="Clear the entire collection">
-                <cfset structClear(variables.context)>
+                <cfset structClear(instance.context)>
         </cffunction>
 
@@ -77 +78 @@
                 <cfargument name="collection" type="struct"  required="true">
                 <cfargument name="overwrite"  type="boolean" required="false" default="false" hint="If you need to override data in the collection, set this to true.">
-                <cfset structAppend(variables.context,arguments.collection, arguments.overwrite)>
+                <cfset structAppend(instance.context,arguments.collection, arguments.overwrite)>
         </cffunction>
 
@@ -83 +84 @@
 
         <cffunction name="getSize" access="public" returntype="numeric" output="false" hint="The number of elements in the collection">
-                <cfreturn structCount(variables.context)>
+                <cfreturn structCount(instance.context)>
         </cffunction>
 
@@ -97 +98 @@
                 <!--- ************************************************************* --->
                 <cfscript>
-                        if ( isDefined("variables.context.#arguments.name#") ){
-                                return Evaluate("variables.context.#arguments.name#");
+                        if ( isDefined("instance.context.#arguments.name#") ){
+                                return Evaluate("instance.context.#arguments.name#");
                         }
                         else if ( isSimpleValue(arguments.defaultValue) and arguments.defaultValue eq "NONE" )
@@ -126 +127 @@
                 <!--- ************************************************************* --->
                 <cfscript>
-                        "variables.context.#arguments.name#" = arguments.value;
+                        "instance.context.#arguments.name#" = arguments.value;
                 </cfscript>
         </cffunction>
@@ -136 +137 @@
                 <!--- ************************************************************* --->
                 <cfscript>
-                        structDelete(variables.context,"#arguments.name#");
+                        structDelete(instance.context,"#arguments.name#");
                 </cfscript>
         </cffunction>
@@ -146 +147 @@
                 <!--- ************************************************************* --->
                 <cfscript>
-                        return isDefined("variables.context.#arguments.name#");
+                        return isDefined("instance.context.#arguments.name#");
                 </cfscript>
         </cffunction>
@@ -181 +182 @@
             if ( not arguments.nolayout ){
                     if ( not getValue("layoutoverride",false) ){
-                            if ( StructKeyExists(variables.ViewLayouts, arguments.name) )
-                                        setValue("currentLayout",variables.ViewLayouts[arguments.name]);
+                            if ( StructKeyExists(instance.ViewLayouts, arguments.name) )
+                                        setValue("currentLayout",instance.ViewLayouts[arguments.name]);
                                 else
-                                        setValue("currentLayout", variables.DefaultLayout);
+                                        setValue("currentLayout", instance.defaultLayout);
                         }
                 }
@@ -240 +241 @@
         
         <cffunction name="getDefaultLayout" access="public" returntype="string" output="false">
-                <cfreturn variables.DefaultLayout>
+                <cfreturn instance.defaultLayout>
         </cffunction>
         
@@ -247 +248 @@
         <cffunction name="setDefaultLayout" access="public" returntype="void" output="false">
                 <cfargument name="DefaultLayout" type="string" required="true">
-                <cfset variables.DefaultLayout = arguments.DefaultLayout>
+                <cfset instance.defaultLayout = arguments.DefaultLayout>
         </cffunction>
         
@@ -253 +254 @@
         
         <cffunction name="getDefaultView" access="public" returntype="string" output="false">
-                <cfreturn variables.DefaultView>
+                <cfreturn instance.defaultView>
         </cffunction>
         
@@ -260 +261 @@
         <cffunction name="setDefaultView" access="public" returntype="void" output="false">
                 <cfargument name="DefaultView" type="string" required="true">
-                <cfset variables.DefaultView = arguments.DefaultView>
+                <cfset instance.defaultView = arguments.DefaultView>
         </cffunction>
         
@@ -266 +267 @@
         
         <cffunction name="getViewLayouts" access="public" returntype="struct" output="false">
-                <cfreturn variables.ViewLayouts>
+                <cfreturn instance.ViewLayouts>
         </cffunction>
         
@@ -273 +274 @@
         <cffunction name="setViewLayouts" access="public" returntype="void" output="false">
                 <cfargument name="ViewLayouts" type="struct" required="true">
-                <cfset variables.ViewLayouts = arguments.ViewLayouts>
+                <cfset instance.ViewLayouts = arguments.ViewLayouts>
         </cffunction>
         
@@ -279 +280 @@
         
         <cffunction name="getEventName" access="public" returntype="string" output="false">
-                <cfreturn variables.EventName>
+                <cfreturn instance.eventName>
         </cffunction>
         
@@ -286 +287 @@
         <cffunction name="setEventName" access="public" returntype="void" output="false">
                 <cfargument name="EventName" type="string" required="true">
-                <cfset variables.EventName = arguments.EventName>
+                <cfset instance.eventName = arguments.EventName>
         </cffunction>
 

coldbox/trunk/src/system/cache/cacheManager.cfc

@@ -21 +21 @@
                 <cfargument name="controller" type="any" required="true">
                 <cfscript>
-                //Set Controller Injection
-                variables.controller = arguments.controller;
-                //Cache Configuration
-                variables.CacheConfigBean = structnew();
-                //Object Pool
-                variables.objectPool = structnew();
-                //Cache Performance
-                variables.cachePerformance = structNew();
-                variables.cachePerformance.Hits = 0;
-                variables.cachePerformance.Misses = 0;
-                //Reaping Controll
-                variables.lastReapDatetime = now();
-                //Runtime Java object
-                variables.javaRuntime = CreateObject("java", "java.lang.Runtime");
-                //Lock Name
-                variables.lockName = getController().getAppHash() & "_OCM_OPERATION";
-                //Init the object Pool on instantiation
-                initPool();
-                //return Cache Manager reference;
-                return this;
+                        variables.instance = structnew();
+                        //Set Controller Injection
+                        instance.controller = arguments.controller;
+                        //Cache Configuration
+                        instance.CacheConfigBean = structnew();
+                        //Object Pool
+                        instance.objectPool = structnew();
+                        //Cache Performance
+                        instance.cachePerformance = structNew();
+                        instance.cachePerformance.Hits = 0;
+                        instance.cachePerformance.Misses = 0;
+                        //Reaping Controll
+                        instance.lastReapDatetime = now();
+                        //Runtime Java object
+                        instance.javaRuntime = CreateObject("java", "java.lang.Runtime");
+                        //Lock Name
+                        instance.lockName = getController().getAppHash() & "_OCM_OPERATION";
+                        //Init the object Pool on instantiation
+                        initPool();
+                        //return Cache Manager reference;
+                        return this;
                 </cfscript>
         </cffunction>
@@ -282 +283 @@
         <cffunction name="getlastReapDatetime" access="public" output="false" returntype="string" hint="Get the lastReapDatetime">
                 <cfscript>
-                return variables.lastReapDatetime;
+                return instance.lastReapDatetime;
                 </cfscript>
         </cffunction>
         <cffunction name="setlastReapDatetime" access="public" returntype="void" output="false" hint="Set the lastReapDatetime">
                 <cfargument name="lastReapDatetime" type="string" required="true">
-                <cfset variables.lastReapDatetime = arguments.lastReapDatetime>
+                <cfset instance.lastReapDatetime = arguments.lastReapDatetime>
         </cffunction>
 
@@ -294 +295 @@
         <cffunction name="getcachePerformance" access="public" output="false" returntype="struct" hint="Get the cachePerformance structure">
                 <cfscript>
-                return variables.cachePerformance;
+                return instance.cachePerformance;
                 </cfscript>
         </cffunction>
@@ -302 +303 @@
         <cffunction name="setCacheConfigBean" access="public" returntype="void" output="false">
                 <cfargument name="CacheConfigBean" type="coldbox.system.beans.cacheConfigBean" required="true">
-                <cfset variables.CacheConfigBean = arguments.CacheConfigBean>
+                <cfset instance.CacheConfigBean = arguments.CacheConfigBean>
         </cffunction>
         <cffunction name="getCacheConfigBean" access="public" returntype="coldbox.system.beans.cacheConfigBean" output="false">
-                <cfreturn variables.CacheConfigBean >
+                <cfreturn instance.CacheConfigBean >
         </cffunction>
 
@@ -311 +312 @@
 
         <cffunction name="getjavaRuntime" access="public" returntype="any" output="false" hint="Get the java runtime object.">
-                <cfreturn variables.javaRuntime>
+                <cfreturn instance.javaRuntime>
         </cffunction>
         
@@ -317 +318 @@
         
         <cffunction name="getcontroller" access="public" output="false" returntype="any" hint="Get controller">
-                <cfreturn variables.controller/>
+                <cfreturn instance.controller/>
         </cffunction>
         
@@ -324 +325 @@
         <cffunction name="setcontroller" access="public" output="false" returntype="void" hint="Set controller">
                 <cfargument name="controller" type="any" required="true"/>
-                <cfset variables.controller = arguments.controller/>
+                <cfset instance.controller = arguments.controller/>
         </cffunction>
         
@@ -330 +331 @@
         
         <cffunction name="getlockName" access="public" output="false" returntype="string" hint="Get lockName">
-                <cfreturn variables.lockName/>
+                <cfreturn instance.lockName/>
         </cffunction>
         
@@ -337 +338 @@
         <cffunction name="setlockName" access="public" output="false" returntype="void" hint="Set lockName">
                 <cfargument name="lockName" type="string" required="true"/>
-                <cfset variables.lockName = arguments.lockName/>
+                <cfset instance.lockName = arguments.lockName/>
         </cffunction>
         
@@ -359 +360 @@
 
         <cffunction name="getObjectPool" access="private" returntype="any" output="false" hint="Get the internal object pool">
-                <cfreturn variables.objectPool >
+                <cfreturn instance.objectPool >
         </cffunction>
         
         <cffunction name="initPool" access="private" output="false" returntype="void" hint="Initialize and set the internal object Pool">
                 <cfscript>
-                variables.objectPool = CreateObject("component","objectPool").init();
+                instance.objectPool = CreateObject("component","objectPool").init();
                 </cfscript>
         </cffunction>

coldbox/trunk/src/system/cache/objectPool.cfc

@@ -19 +19 @@
         <cffunction name="init" access="public" output="false" returntype="objectPool" hint="Constructor">
                 <cfscript>
-                variables.pool = structnew();
-                variables.pool_metadata = structnew();
-                return this;
+                        variables.instance = structnew();
+                        instance.pool = structnew();
+                        instance.pool_metadata = structnew();
+                        return this;
                 </cfscript>
         </cffunction>
@@ -29 +30 @@
         <!--- Getter/Setter For pool --->
         <cffunction name="getpool" access="public" returntype="struct" output="false">
-                <cfreturn variables.pool >
+                <cfreturn instance.pool >
         </cffunction>
         <cffunction name="setpool" access="public" returntype="void" output="false">
                 <cfargument name="pool" type="struct" required="true">
-                <cfset variables.pool = arguments.pool>
+                <cfset instance.pool = arguments.pool>
         </cffunction>
 
         <!--- Getter/Setter for Pool Metdata --->
         <cffunction name="getpool_metadata" access="public" returntype="struct" output="false">
-                <cfreturn variables.pool_metadata >
+                <cfreturn instance.pool_metadata >
         </cffunction>
         <cffunction name="setpool_metadata" access="public" returntype="void" output="false">
                 <cfargument name="pool_metadata" type="struct" required="true">
-                <cfset variables.pool_metadata = arguments.pool_metadata>
+                <cfset instance.pool_metadata = arguments.pool_metadata>
         </cffunction>
 
@@ -48 +49 @@
         <cffunction name="getObjectMetadata" access="public" returntype="struct" output="false">
                 <cfargument name="objectKey" type="string" required="true">
-                <cfreturn variables.pool_metadata[arguments.objectKey] >
+                <cfreturn instance.pool_metadata[arguments.objectKey] >
         </cffunction>
         <cffunction name="setObjectMetadata" access="public" returntype="void" output="false">
                 <cfargument name="objectKey" type="string" required="true">
                 <cfargument name="metadata"  type="struct" required="true">
-                <cfset variables.pool_metadata[arguments.objectKey] = arguments.metadata>
+                <cfset instance.pool_metadata[arguments.objectKey] = arguments.metadata>
         </cffunction>
         <cffunction name="getMetadataProperty" access="public" returntype="any" output="false">
                 <cfargument name="objectKey" type="string" required="true">
                 <cfargument name="property"  type="string" required="true">
-                <cfreturn variables.pool_metadata[arguments.objectKey][arguments.property] >
+                <cfreturn instance.pool_metadata[arguments.objectKey][arguments.property] >
         </cffunction>
         <cffunction name="setMetadataProperty" access="public" returntype="void" output="false">
@@ -64 +65 @@
                 <cfargument name="property"  type="string" required="true">
                 <cfargument name="value"         type="any"    required="true">
-                <cfset variables.pool_metadata[arguments.objectKey][arguments.property] = arguments.value >
+                <cfset instance.pool_metadata[arguments.objectKey][arguments.property] = arguments.value >
         </cffunction>
 
@@ -73 +74 @@
                 <!--- ************************************************************* --->
                 <!--- Check for Object in Cache. --->
-                <cfreturn structKeyExists(variables.pool, arguments.objectKey) >
+                <cfreturn structKeyExists(instance.pool, arguments.objectKey) >
         </cffunction>
 
@@ -86 +87 @@
                 setMetadataProperty(arguments.objectKey,"lastAccesed", now());
                 //Return object.
-                return variables.pool[arguments.objectKey];
+                return instance.pool[arguments.objectKey];
                 </cfscript>
         </cffunction>
@@ -100 +101 @@
                 var MetaData = structnew();
                 //Set new Object into cache.
-                variables.pool[arguments.objectKey] = arguments.MyObject;
+                instance.pool[arguments.objectKey] = arguments.MyObject;
                 //Create object's metdata
                 MetaData.hits = 1;
@@ -119 +120 @@
                 var Results = false;
                 try{
-                        structDelete(variables.pool,arguments.objectKey);
-                        structDelete(variables.pool_metadata,arguments.objectKey);
+                        structDelete(instance.pool,arguments.objectKey);
+                        structDelete(instance.pool_metadata,arguments.objectKey);
                         Results = true;
                 }
@@ -133 +134 @@
         <cffunction name="getSize" access="public" output="false" returntype="numeric" hint="Get the cache's size in items">
                 <cfscript>
-                return StructCount(variables.pool);
+                return StructCount(instance.pool);
                 </cfscript>
         </cffunction>
@@ -140 +141 @@
         <cffunction name="getObjectsKeyList" access="public" output="false" returntype="string" hint="Get the cache's object entries listing.">
                 <cfscript>
-                return structKeyList(variables.pool);
+                return structKeyList(instance.pool);
                 </cfscript>
         </cffunction>

coldbox/trunk/src/system/config/readme.txt

@@ -333 +333 @@
        be any file now: front.cfm, index.cfm, luis.cfm, anything.cfm
 
-Version 2.0.3 (July 2007) CODENAME: Acts 5:29-32
+Version 2.0.3 (August 2007) CODENAME: Acts 5:29-32
 - #169 Structure variable declarations in the config updated
-- #170 ColdBox Settings support complex variables now, for internal use only.
+- #178 LightWire is now fully supported and included with ColdBox for out of the box IOC. Thanks to Aaron Roberson & Peter bell.
 - #200 queryHelper new methods: getColumnArray(), getCountDistinct(), getRowNumber()
 - #205 Critical Concurrency fix in the coldbox.cfm template.
 - #206 Removal of client variable references.
+- #207 clientstorage plugin syntax updated
+- #208 sessionstorage plugin syntax updated
+- #209 ColdBoxFactory.cfc updated with new method - getColdboxOCM(). To get a reference to the cache manager
+       from within coldspring.
+- #210 Samples Gallery Content Updated.
+- #211 Var scoping optimizations
+- #212 Illidium Scaffolding Templates
+- #213 Configuration file now named: coldbox.xml.cfm or config.xml.cfm
+- #214 Testcontroller - When unit testing relocations, the setnext event will now save the event and querystring
+           in the request collection for assertions.
+- #215 Performance Optimizations
+- #217 Eclipse Dictionaries Updated
+- #218 ColdBox Cheat Sheet Updated
+- #219 JQuery updated to 1.1.3.1
 
 AS ALWAYS, VISIT THE WIKI FOR THE LATEST DOCUMENTATION

coldbox/trunk/src/system/config/settings.xml

@@ -30 +30 @@
                 <!--IOC Frameworks-->
         <Setting name="ColdspringBeanFactory" value="coldspring.beans.DefaultXmlBeanFactory"/>
-                <Setting name="LightWireBeanFactory"  value="coldbox.system.extras.lightwire.LightWire" />
+                <Setting name="LightWireBeanFactory" value="coldbox.system.extras.lightwire.LightWire"/>
         <!--MessageBox Plugin Storage Scope (session|client)-->
         <Setting name="MessageBoxStorage" value="session"/>

coldbox/trunk/src/system/controller.cfc

@@ -15 +15 @@
         <cfscript>
                 variables.instance = structnew();
-                variables.instance.ColdboxInitiated = false;
-                variables.instance.ConfigSettings = structnew();
-                variables.instance.ColdboxSettings = structnew();
-                variables.instance.AppStartHandlerFired = false;
-                variables.instance.AppHash = "";
+                instance.ColdboxInitiated = false;
+                instance.ConfigSettings = structnew();
+                instance.ColdboxSettings = structnew();
+                instance.AppStartHandlerFired = false;
+                instance.AppHash = "";
                 //Services & Managers
-                variables.instance.ColdboxOCM = structNew();
-                variables.instance.DebuggerService = structNew();
-                variables.instance.RequestService = structNew();
+                instance.ColdboxOCM = structNew();
+                instance.DebuggerService = structNew();
+                instance.RequestService = structNew();
         </cfscript>
 
@@ -259 +259 @@
                 </cfif>
 
-                        <!--- Validate and Get registered handler --->
-                        <cfset oEventBean = getRegisteredHandler(arguments.event)>
-                        <!--- Set Executing Parameters --->
-                        <cfset ExecutingHandler = oEventBean.getRunnable()>
-                        <cfset ExecutingMethod = oEventBean.getMethod()>
-
-                        <!--- Check if using handler caching --->
-                        <cfif getSetting("HandlerCaching")>
-
-                                <!--- Lookup in Cache --->
-                                <cfif instance.ColdboxOCM.lookup("handler_" & ExecutingHandler)>
-                                        <cfset oEventHandler = instance.ColdboxOCM.get("handler_" & ExecutingHandler)>
-                                <cfelse>
-                                        <cfset oEventHandler = CreateObject("component",ExecutingHandler).init(this)>
-                                        <!--- Get Object MetaData --->
-                                        <cfset MetaData = getMetaData(oEventHandler)>
-                                        <!--- By Default, handlers with no cache flag are set to true --->
-                                        <cfif not structKeyExists(MetaData,"cache")>
-                                                <cfset MetaData.cache = true>
+                <!--- Validate and Get registered handler --->
+                <cfset oEventBean = getRegisteredHandler(arguments.event)>
+                <!--- Set Executing Parameters --->
+                <cfset ExecutingHandler = oEventBean.getRunnable()>
+                <cfset ExecutingMethod = oEventBean.getMethod()>
+
+                <!--- Check if using handler caching --->
+                <cfif getSetting("HandlerCaching")>
+
+                        <!--- Lookup in Cache --->
+                        <cfif instance.ColdboxOCM.lookup("handler_" & ExecutingHandler)>
+                                <cfset oEventHandler = instance.ColdboxOCM.get("handler_" & ExecutingHandler)>
+                        <cfelse>
+                                <cfset oEventHandler = CreateObject("component",ExecutingHandler).init(this)>
+                                <!--- Get Object MetaData --->
+                                <cfset MetaData = getMetaData(oEventHandler)>
+                                <!--- By Default, handlers with no cache flag are set to true --->
+                                <cfif not structKeyExists(MetaData,"cache")>
+                                        <cfset MetaData.cache = true>
+                                </cfif>
+                                <cfif isBoolean(MetaData["cache"]) and MetaData["cache"]>
+                                        <cfif structKeyExists(MetaData,"cachetimeout") >
+                                                <cfset objTimeout = MetaData["cachetimeout"]>
                                         </cfif>
-                                        <cfif isBoolean(MetaData["cache"]) and MetaData["cache"]>
-                                                <cfif structKeyExists(MetaData,"cachetimeout") >
-                                                        <cfset objTimeout = MetaData["cachetimeout"]>
-                                                </cfif>
-                                                <!--- Set the Runnable Object --->
-                                                <cfset instance.ColdboxOCM.set("handler_" & ExecutingHandler,oEventHandler,objTimeout)>
-                                        </cfif>
-                                </cfif>
-                        <cfelse>
-                                <!--- Create Runnable Object --->
-                                <cfset oEventHandler = CreateObject("component",ExecutingHandler).init(this)>
-                        </cfif>
-
-                        <!--- Verify Event Method Exists --->
-                        <cfif not structKeyExists(oEventHandler,ExecutingMethod)>
-                                <!--- Invalid Event Detected, log it --->
-                                <cfset getPlugin("logger").logEntry("error","Invalid Event detected: #ExecutingHandler#.#ExecutingMethod#")>
-                                <cfif getSetting("onInvalidEvent") neq "">
-                                        <!--- Test for invalid Event Error --->
-                                        <cfif compareNoCase(getSetting("onInvalidEvent"),arguments.event) eq 0>
-                                                <cfthrow type="Framework.onInValidEventSettingException" message="An invalid event has been detected: #RequestContext.getValue("invalidevent","")# and the onInvalidEvent setting is also invalid: #getSetting("onInvalidEvent")#. Please check your settings.">
-                                        </cfif>
-                                        <!--- Relocate to Invalid Event --->
-                                        <cfset setNextEvent(getSetting("onInvalidEvent"),"invalidevent=#ExecutingHandler#.#ExecutingMethod#")>
-                                <cfelse>
-                                        <cfthrow type="Framework.InvalidEventException" message="An invalid event has been detected: #ExecutingHandler#.#ExecutingMethod#. This event does not exist in the specified handler controller.">
+                                        <!--- Set the Runnable Object --->
+                                        <cfset instance.ColdboxOCM.set("handler_" & ExecutingHandler,oEventHandler,objTimeout)>
                                 </cfif>
                         </cfif>
-
-                        <!--- PreHandler Execution --->
-                        <cfif not arguments.prepostExempt and structKeyExists(oEventHandler,"preHandler")>
-                                <cfmodule template="includes/timer.cfm" timertag="invoking runEvent [preHandler] for #arguments.event#">
-                                <cfset oEventHandler.preHandler(RequestContext)>
-                                </cfmodule>
+                <cfelse>
+                        <!--- Create Runnable Object --->
+                        <cfset oEventHandler = CreateObject("component",ExecutingHandler).init(this)>
+                </cfif>
+
+                <!--- Verify Event Method Exists --->
+                <cfif not structKeyExists(oEventHandler,ExecutingMethod)>
+                        <!--- Invalid Event Detected, log it --->
+                        <cfset getPlugin("logger").logEntry("error","Invalid Event detected: #ExecutingHandler#.#ExecutingMethod#")>
+                        <cfif getSetting("onInvalidEvent") neq "">
+                                <!--- Test for invalid Event Error --->
+                                <cfif compareNoCase(getSetting("onInvalidEvent"),arguments.event) eq 0>
+                                        <cfthrow type="Framework.onInValidEventSettingException" message="An invalid event has been detected: #RequestContext.getValue("invalidevent","")# and the onInvalidEvent setting is also invalid: #getSetting("onInvalidEvent")#. Please check your settings.">
+                                </cfif>
+                                <!--- Relocate to Invalid Event --->
+                                <cfset setNextEvent(getSetting("onInvalidEvent"),"invalidevent=#ExecutingHandler#.#ExecutingMethod#")>
+                        <cfelse>
+                                <cfthrow type="Framework.InvalidEventException" message="An invalid event has been detected: #ExecutingHandler#.#ExecutingMethod#. This event does not exist in the specified handler controller.">
                         </cfif>
-
-                        <!--- Start Timer --->
-                        <cfmodule template="includes/timer.cfm" timertag="invoking runEvent [#arguments.event#]">
-                                <!--- Execute the Event --->
-                                <cfinvoke component="#oEventHandler#" method="#ExecutingMethod#">
-                                        <cfinvokeargument name="event" value="#RequestContext#">
-                                </cfinvoke>
+                </cfif>
+
+                <!--- PreHandler Execution --->
+                <cfif not arguments.prepostExempt and structKeyExists(oEventHandler,"preHandler")>
+                        <cfmodule template="includes/timer.cfm" timertag="invoking runEvent [preHandler] for #arguments.event#">
+                        <cfset oEventHandler.preHandler(RequestContext)>
                         </cfmodule>
-
-                        <!--- PostHandler Execution --->
-                        <cfif not arguments.prepostExempt and structKeyExists(oEventHandler,"postHandler")>
-                                <cfmodule template="includes/timer.cfm" timertag="invoking runEvent [postHandler] for #arguments.event#">
-                                <cfset oEventHandler.postHandler(RequestContext)>
-                                </cfmodule>
-                        </cfif>
-
+                </cfif>
+
+                <!--- Start Timer --->
+                <cfmodule template="includes/timer.cfm" timertag="invoking runEvent [#arguments.event#]">
+                        <!--- Execute the Event --->
+                        <cfinvoke component="#oEventHandler#" method="#ExecutingMethod#">
+                                <cfinvokeargument name="event" value="#RequestContext#">
+                        </cfinvoke>
+                </cfmodule>
+
+                <!--- PostHandler Execution --->
+                <cfif not arguments.prepostExempt and structKeyExists(oEventHandler,"postHandler")>
+                        <cfmodule template="includes/timer.cfm" timertag="invoking runEvent [postHandler] for #arguments.event#">
+                        <cfset oEventHandler.postHandler(RequestContext)>
+                        </cfmodule>
+                </cfif>
         </cffunction>
 
@@ -348 +347 @@
                 <!--- ************************************************************* --->
                 <cfscript>
+                var incomingEvent = arguments.event;
                 var handlerIndex = 0;
                 var HandlerReceived = "";
@@ -355 +355 @@
                 var HandlerBean = CreateObject("component","coldbox.system.beans.eventhandlerBean").init(getSetting("HandlersInvocationPath"));
                 //Rip the method
-                HandlerReceived = getPlugin("fileUtilities").ripExtension(arguments.event);
-                MethodReceived = listLast(arguments.event,".");
+                HandlerReceived = getPlugin("fileUtilities").ripExtension(incomingEvent);
+                MethodReceived = listLast(incomingEvent,".");
 
                 //Check Registration
@@ -368 +368 @@
                 else if ( onInvalidEvent neq "" ){
                                 //Check if the invalid event is the same as the current event
-                                if ( CompareNoCase(onInvalidEvent,arguments.event) eq 0){
+                                if ( CompareNoCase(onInvalidEvent,incomingEvent) eq 0){
                                         throw("The invalid event handler: #onInvalidEvent# is also invalid. Please check your settings","","Framework.InvalidEventHandlerException");
                                 }
@@ -380 +380 @@
                         }
                 else{
-                        throw("The event handler: #arguments.event# is not valid registered event.","","Framework.EventHandlerNotRegisteredException");
+                        throw("The event handler: #incomingEvent# is not valid registered event.","","Framework.EventHandlerNotRegisteredException");
                 }
                 return HandlerBean;

coldbox/trunk/src/system/extras/baseTest.cfc

@@ -32 +32 @@
         <cfscript>
         variables.instance = structnew();
-        variables.instance.AppMapping = "";
-        variables.instance.ConfigMapping = "";
-        variables.instance.controller = "";
+        instance.AppMapping = "";
+        instance.ConfigMapping = "";
+        instance.controller = "";
         </cfscript>
 

coldbox/trunk/src/system/plugin.cfc

@@ -26 +26 @@
                         variables.instance = structnew();
                         //instance names
-                        variables.instance.pluginName = "";
-                        variables.instance.pluginVersion = "";
-                        variables.instance.pluginDescription = "";
-                        variables.instance.pluginPath = getCurrentTemplatePath();
+                        instance.pluginName = "";
+                        instance.pluginVersion = "";
+                        instance.pluginDescription = "";
+                        instance.pluginPath = getCurrentTemplatePath();
                         return this;
                 </cfscript>
@@ -39 +39 @@
 
         <cffunction name="getPluginName" access="public" hint="Get the instance's pluginName" returntype="string" output="false">
-                <cfreturn variables.instance.pluginName>
+                <cfreturn instance.pluginName>
         </cffunction>
 
@@ -46 +46 @@
         <cffunction name="setPluginName" access="public" hint="Set the instance's pluginName" returntype="string" output="false">
                 <cfargument name="pluginName" required="true" type="string">
-                <cfset variables.instance.pluginName = arguments.pluginName>
+                <cfset instance.pluginName = arguments.pluginName>
         </cffunction>
 
@@ -52 +52 @@
 
         <cffunction name="getPluginVersion" access="public" hint="Get the instance's pluginVersion" returntype="string" output="false">
-                <cfreturn variables.instance.pluginVersion>
+                <cfreturn instance.pluginVersion>
         </cffunction>
 
@@ -59 +59 @@
         <cffunction name="setPluginVersion" access="public" hint="Set the instance's pluginVersion" returntype="string" output="false">
                 <cfargument name="pluginVersion" required="true" type="string">
-                <cfset variables.instance.pluginVersion = arguments.pluginVersion>
+                <cfset instance.pluginVersion = arguments.pluginVersion>
         </cffunction>
 
@@ -65 +65 @@
 
         <cffunction name="getPluginDescription" access="public" hint="Get the instance's pluginDescription" returntype="string" output="false">
-                <cfreturn variables.instance.pluginDescription>
+                <cfreturn instance.pluginDescription>
         </cffunction>
 
@@ -72 +72 @@
         <cffunction name="setPluginDescription" access="public" hint="Set the instance's pluginDescription" returntype="string" output="false">
                 <cfargument name="pluginDescription" required="true" type="string">
-                <cfset variables.instance.pluginDescription = arguments.pluginDescription>
+                <cfset instance.pluginDescription = arguments.pluginDescription>
         </cffunction>
 
@@ -78 +78 @@
 
         <cffunction name="getpluginPath" access="public" hint="Get the instance's pluginPath" returntype="string" output="false">
-                <cfreturn variables.instance.pluginPath>
+                <cfreturn instance.pluginPath>
         </cffunction>
 

coldbox/trunk/src/system/plugins/FileWriter.cfc

@@ -42 +42 @@
                 <cfset setpluginDescription("Uses the java native classes to perform buffered file writing.")>
                 <!--- This instance constructor --->
-                <cfset variables.instance.joFileOutputStream = ''>
-                <cfset variables.instance.joOutputStreamWriter = ''>
-                <cfset variables.instance.joBufferedWriter = ''>
+                <cfset instance.joFileOutputStream = ''>
+                <cfset instance.joOutputStreamWriter = ''>
+                <cfset instance.joBufferedWriter = ''>
                 <cfreturn this>
         </cffunction>

coldbox/trunk/src/system/plugins/JavaLoader.cfc

@@ -34 +34 @@
                 <cfset setpluginDescription("Java Loader plugin, based on Mark Mandel's brain.")>
                 <!--- This plugins' properties --->
-                <cfset variables.instance.classLoader = "">
+                <cfset instance.classLoader = "">
                 <cfreturn this>
         </cffunction>

coldbox/trunk/src/system/plugins/StringBuffer.cfc

@@ -61 +61 @@
                 <cfset setpluginVersion("1.0")>
                 <cfset setpluginDescription("This is a facade to the java StringBuffer class.")>
-                <cfset variables.instance.joStringBuffer = createObject("java","java.lang.StringBuffer") />
+                <cfset instance.joStringBuffer = createObject("java","java.lang.StringBuffer") />
                 <cfreturn this>
         </cffunction>

coldbox/trunk/src/system/plugins/XMLParser.cfc

@@ -50 +50 @@
 
                 //Search Patterns for Config file
-                variables.instance.searchSettings = "//Settings/Setting";
-                variables.instance.searchYourSettings = "//YourSettings/Setting";
-                variables.instance.searchBugTracer = "//BugTracerReports/BugEmail";
-                variables.instance.searchDevURLS = "//DevEnvironments/url";
-                variables.instance.searchWS = "//WebServices/WebService";
-                variables.instance.searchLayouts = "//Layouts/Layout";
-                variables.instance.searchDefaultLayout = "//Layouts/DefaultLayout";
-                variables.instance.searchDefaultView = "//Layouts/DefaultView";
-                variables.instance.searchMailSettings = "//MailServerSettings";
-                variables.instance.searchi18NSettings = "//i18N";
-                variables.instance.searchDatasources = "//Datasources/Datasource";
-                variables.instance.searchCache = "//Cache";
+                instance.searchSettings = "//Settings/Setting";
+                instance.searchYourSettings = "//YourSettings/Setting";
+                instance.searchBugTracer = "//BugTracerReports/BugEmail";
+                instance.searchDevURLS = "//DevEnvironments/url";
+                instance.searchWS = "//WebServices/WebService";
+                instance.searchLayouts = "//Layouts/Layout";
+                instance.searchDefaultLayout = "//Layouts/DefaultLayout";
+                instance.searchDefaultView = "//Layouts/DefaultView";
+                instance.searchMailSettings = "//MailServerSettings";
+                instance.searchi18NSettings = "//i18N";
+                instance.searchDatasources = "//Datasources/Datasource";
+                instance.searchCache = "//Cache";
 
                 //Search patterns for fw xml
-                variables.instance.searchConventions = "//Conventions";
+                instance.searchConventions = "//Conventions";
 
                 //Properties
-                variables.instance.FileSeparator = createObject("java","java.lang.System").getProperty("file.separator");
-                variables.instance.FrameworkConfigFile = ExpandPath("/coldbox/system/config/settings.xml");
-                variables.instance.FrameworkConfigXSDFile = ExpandPath("/coldbox/system/config/config.xsd");
+                instance.FileSeparator = createObject("java","java.lang.System").getProperty("file.separator");
+                instance.FrameworkConfigFile = ExpandPath("/coldbox/system/config/settings.xml");
+                instance.FrameworkConfigXSDFile = ExpandPath("/coldbox/system/config/config.xsd");
                 //Return
                 return this;

coldbox/trunk/src/system/plugins/cfcViewer.cfc

@@ -37 +37 @@
                 <cfset setpluginDescription("CFC metadata introspection plugin")>
                 <!--- Plugin properties --->
-                <cfset variables.instance.dirpath = "">
-                <cfset variables.instance.cfcpath = "">
-                <cfset variables.instance.aCFC = ArrayNew(1)>
-                <cfset variables.instance.aPacks = ArrayNew(1)>
-                <cfset variables.instance.styleSheet = "/coldbox/system/includes/cfcviewer.css">
-                <cfset variables.instance.lstAccessTypes = "public,private,remote,package">
+                <cfset instance.dirpath = "">
+                <cfset instance.cfcpath = "">
+                <cfset instance.aCFC = ArrayNew(1)>
+                <cfset instance.aPacks = ArrayNew(1)>
+                <cfset instance.styleSheet = "/coldbox/system/includes/cfcviewer.css">
+                <cfset instance.lstAccessTypes = "public,private,remote,package">
                 <cfreturn this>
         </cffunction>
@@ -73 +73 @@
 
                 <cfif arguments.accessTypesFilter neq "">
-                        <cfset variables.instance.lstAccessTypes = arguments.accessTypesFilter>
+                        <cfset instance.lstAccessTypes = arguments.accessTypesFilter>
                 </cfif>
 

coldbox/trunk/src/system/plugins/i18n.cfc

@@ -69 +69 @@
 
                 //<!--- This plugin's properties --->
-                variables.instance.aDFSymbol=createObject("java","java.text.DecimalFormatSymbols");
-                variables.instance.aDateFormat=createObject("java","java.text.DateFormat");
-                variables.instance.sDateFormat=createObject("java","java.text.SimpleDateFormat");
-                variables.instance.aLocale=createObject("java","java.util.Locale");
-                variables.instance.timeZone=createObject("java","java.util.TimeZone");
-                variables.instance.thisLocale = ""; //Setup by the loadLocale() method.
+                instance.aDFSymbol=createObject("java","java.text.DecimalFormatSymbols");
+                instance.aDateFormat=createObject("java","java.text.DateFormat");
+                instance.sDateFormat=createObject("java","java.text.SimpleDateFormat");
+                instance.aLocale=createObject("java","java.util.Locale");
+                instance.timeZone=createObject("java","java.util.TimeZone");
+                instance.thisLocale = ""; //Setup by the loadLocale() method.
                 loadLocale();
-                variables.instance.aCalendar=createObject("java","java.util.GregorianCalendar").init(variables.instance.thisLocale);
-                variables.instance.dateSymbols = createObject("java","java.text.DateFormatSymbols").init(variables.instance.thisLocale);
-                variables.instance.I18NUtilDate="23-aug-2006"; //should be date of latest change
+                instance.aCalendar=createObject("java","java.util.GregorianCalendar").init(instance.thisLocale);
+                instance.dateSymbols = createObject("java","java.text.DateFormatSymbols").init(instance.thisLocale);
+                instance.I18NUtilDate="23-aug-2006"; //should be date of latest change
                 return this;
                 </cfscript>

coldbox/trunk/src/system/plugins/logger.cfc

@@ -37 +37 @@
                 <!--- This plugin's properties --->
                 <!--- log name without extension --->
-                <cfset variables.instance.logfilename = URLEncodedFormat(replace(replace(controller.getSetting("AppName")," ","","all"),".","_","all"))>
+                <cfset instance.logfilename = URLEncodedFormat(replace(replace(controller.getSetting("AppName")," ","","all"),".","_","all"))>
                 <!--- The full absolute path of the log file --->
                 <cfif controller.settingExists("ColdboxLogsLocation")>
-                        <cfset variables.instance.logFullPath = controller.getSetting("ColdboxLogsLocation")>
+                        <cfset instance.logFullPath = controller.getSetting("ColdboxLogsLocation")>
                 <cfelse>
-                        <cfset variables.instance.logFullPath = ''>
+                        <cfset instance.logFullPath = ''>
                 </cfif>
                 <!--- Available valid severities --->
-                <cfset variables.instance.validSeverities = "information|fatal|warning|error|debug">
+                <cfset instance.validSeverities = "information|fatal|warning|error|debug">
                 <!--- Return --->
                 <cfreturn this>

coldbox/trunk/src/system/plugins/zip.cfc

@@ -70 +70 @@
                 setpluginDescription("This is a zip utility for the framework.");
                 //This plugin's properties
-                variables.instance.ioFile      = CreateObject("java","java.io.File");
-                variables.instance.ioInput     = CreateObject("java","java.io.FileInputStream");
-                variables.instance.ioOutput    = CreateObject("java","java.io.FileOutputStream");
-                variables.instance.ioBufOutput = CreateObject("java","java.io.BufferedOutputStream");
-                variables.instance.zipFile     = CreateObject("java","java.util.zip.ZipFile");
-                variables.instance.zipEntry    = CreateObject("java","java.util.zip.ZipEntry");
-                variables.instance.zipInput    = CreateObject("java","java.util.zip.ZipInputStream");
-                variables.instance.zipOutput   = CreateObject("java","java.util.zip.ZipOutputStream");
-                variables.instance.gzInput     = CreateObject("java","java.util.zip.GZIPInputStream");
-                variables.instance.gzOutput    = CreateObject("java","java.util.zip.GZIPOutputStream");
-                variables.instance.objDate     = CreateObject("java","java.util.Date");
+                instance.ioFile      = CreateObject("java","java.io.File");
+                instance.ioInput     = CreateObject("java","java.io.FileInputStream");
+                instance.ioOutput    = CreateObject("java","java.io.FileOutputStream");
+                instance.ioBufOutput = CreateObject("java","java.io.BufferedOutputStream");
+                instance.zipFile     = CreateObject("java","java.util.zip.ZipFile");
+                instance.zipEntry    = CreateObject("java","java.util.zip.ZipEntry");
+                instance.zipInput    = CreateObject("java","java.util.zip.ZipInputStream");
+                instance.zipOutput   = CreateObject("java","java.util.zip.ZipOutputStream");
+                instance.gzInput     = CreateObject("java","java.util.zip.GZIPInputStream");
+                instance.gzOutput    = CreateObject("java","java.util.zip.GZIPOutputStream");
+                instance.objDate     = CreateObject("java","java.util.Date");
 
                 /* Set Localized Variables */
-                variables.instance.os = Server.OS.Name;
-                variables.instance.slash = createObject("java","java.lang.System").getProperty("file.separator");
+                instance.os = Server.OS.Name;
+                instance.slash = createObject("java","java.lang.System").getProperty("file.separator");
 
                 //LM. To fix Overflow.
-                variables.instance.filename = "";
+                instance.filename = "";
 
                 //Return instance

coldbox/trunk/src/system/services/requestService.cfc

@@ -31 +31 @@
                 <cfscript>
                         var Context = createContext();
-                        var DebugPassword = getController().getSetting("debugPassword");
-                        var EventName = getController().getSetting("EventName");
+                        var DebugPassword = controller.getSetting("debugPassword");
+                        var EventName = controller.getSetting("EventName");
                                         
                         //Object Caching Garbage Collector
@@ -101 +101 @@
                 var DefaultView = "";
                 var ViewLayouts = structNew();
-                var EventName = getController().getSetting("EventName");
+                var EventName = controller.getSetting("EventName");
                 
-                if ( getController().settingExists("DefaultLayout") ){
-                        DefaultLayout = getController().getSetting("DefaultLayout");
+                if ( controller.settingExists("DefaultLayout") ){
+                        DefaultLayout = controller.getSetting("DefaultLayout");
                 }
-                if ( getController().settingExists("DefaultView") ){
-                        DefaultView = getController().getSetting("DefaultView");
+                if ( controller.settingExists("DefaultView") ){
+                        DefaultView = controller.getSetting("DefaultView");
                 }
-                if ( getController().settingExists("ViewLayouts") ){
-                        ViewLayouts = getController().getSetting("ViewLayouts");
+                if ( controller.settingExists("ViewLayouts") ){
+                        ViewLayouts = controller.getSetting("ViewLayouts");
                 }
                 //Return context.