Changeset 1736

Timestamp:

08/28/08 17:07:21 (4 months ago)

Author:

lmajano

Message:

locatePath() additions and fixes

Files:

• coldbox/trunk/CodeDepot/interceptors/com/ortussolutions/deployment/Deploy.cfc (modified) (1 diff)
• coldbox/trunk/system/config/settings.xml (modified) (1 diff)
• coldbox/trunk/system/frameworkSupertype.cfc (modified) (2 diffs)
• coldbox/trunk/system/interceptors/environmentControl.cfc (modified) (1 diff)
• coldbox/trunk/system/interceptors/security.cfc (modified) (1 diff)
• coldbox/trunk/system/plugins/ioc.cfc (modified) (1 diff)
• coldbox/trunk/system/plugins/logger.cfc (modified) (1 diff)
• coldbox/trunk/system/plugins/resourceBundle.cfc (modified) (1 diff)

coldbox/trunk/CodeDepot/interceptors/com/ortussolutions/deployment/Deploy.cfc

@@ -20 +20 @@
-
-- tagFile : config/_deploy.tag [required]
-
-
+
+
+
-        
------------------------------------------------------------------------>

coldbox/trunk/system/config/settings.xml

@@ -7 +7 @@
-        <Setting name="AuthorWebsite" value="http://www.coldboxframework.com"/>
-        <Setting name="Suffix" value="FAITH"/>
-1
+2
-        <Setting name="Description" value="This is the ColdBox ColdFusion Framework for web applications."/>
-        <Setting name="ModifyLogLocation" value="readme.txt"/>

coldbox/trunk/system/frameworkSupertype.cfc

@@ -235 +235 @@
-
-<!------------------------------------------- UTILITY METHODS ------------------------------------------->
+        
+        <!--- locateFilePath --->
+        <cffunction name="locateFilePath" output="false" access="private" returntype="string" hint="Locate the real path location of a file in a coldbox application. 3 checks: 1) inside of coldbox app, 2) expand the path, 3) Absolute location. If path not found, it returns an empty path">
+                <cfargument name="pathToCheck" type="string" required="true" hint="The path to check"/>
+                <cfscript>
+                        var foundPath = "";
+                        var appRoot = controller.getAppRootPath();
+                        
+                        //Check 1: Inside of App Root
+                        if ( fileExists(appRoot & arguments.pathToCheck) ){
+                                foundPath = appRoot & arguments.pathToCheck;
+                        }
+                        //Check 2: Expand the Path
+                        else if( fileExists( ExpandPath(arguments.pathToCheck) ) ){
+                                foundPath = ExpandPath( arguments.pathToCheck );
+                        }
+                        //Check 3: Absolute Path
+                        else if( fileExists( arguments.pathToCheck ) ){
+                                foundPath = arguments.pathToCheck;
+                        }
+                        
+                        //Return 
+                        return foundPath;                       
+                </cfscript>
+        </cffunction>
-        
-        <!--- cfhtml head facade --->
@@ -289 +314 @@
-        </cffunction>
-        
+        <!--- Rethrow Facade --->
+        <cffunction name="rethrowit" access="public" returntype="void" hint="Rethrow facade" output="false" >
+                <cfargument name="throwObject" required="true" type="any" hint="The cfcatch object">
+                <cfthrow object="#arguments.throwObject#">
+        </cffunction>
+        
-        <!--- Abort Facade --->
-        <cffunction name="abort" access="private" hint="Facade for cfabort" returntype="void" output="false">

coldbox/trunk/system/interceptors/environmentControl.cfc

@@ -30 +30 @@
-                <cfscript>
-                        var configFile = "";
-                        var appRoot = getController().getAppRootPath();
-                
-                        /* Clean app root */
-                        if( right(appRoot,1) neq getSetting("OSFileSeparator",true) ){
-                                appRoot = appRoot & getSetting("OSFileSeparator",true);
-                        }
-                        
-/Verify that the configFile propety is set
+* Verify that the configFile propety is set */
-                        if( not propertyExists('configFile') ){
-                                throw("Config File property does not exist. Please declare it.",'','interceptors.environmentControl.configFilePropertyNotDefined');
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                                throw('Config File could not be located: #getProperty('configFile')#. Please check again.','','interceptors.environmentControl.configFileNotFound');
-                        }

coldbox/trunk/system/interceptors/security.cfc

@@ -287 +287 @@
-                        var x=1;
-                        var node = "";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                                throw('Security Rules File could not be located: #getProperty('rulesFile')#. Please check again.','','interceptors.security.rulesFileNotFound');
-                        }
+                        
-                        /* Set the correct expanded path now */
-                        setProperty('rulesFile',rulesFile);

coldbox/trunk/system/plugins/ioc.cfc

@@ -222 +222 @@
-        <cffunction name="validateDefinitionFile" access="private" output="false" returntype="void" hint="Validate the IoC Definition File. Called internally to verify the file location and get the correct path to it.">
-                <cfscript>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                                throw("The definition file: #getIOCDefinitionFile()# does not exist. Please check your path","","ColdBox.plugins.ioc.InvalidDefitinionFile");
-                        }
+                        /* Save the found location path */
+                        setExpandedIOCDefinitionFile( foundFilePath );
-                </cfscript>
-        </cffunction>

coldbox/trunk/system/plugins/logger.cfc

@@ -367 +367 @@
-        <!--- Create the default log directory --->
-        <cffunction name="createDefaultLogDirectory" access="private" hint="Creates the default log directory." output="false" returntype="void">
-OSFileSeparator",1) & getSetting("
+
-                <!--- Check if the directory already exists --->
-                <cfif not directoryExists(DefaultLogDirectory)>

coldbox/trunk/system/plugins/resourceBundle.cfc

@@ -115 +115 @@
-                var thisMSG = "";
-                var keys = "";
-                var appRoot = getController().getAppRootPath();
-                var rbFilePath = arguments.rbFile & "_#arguments.rbLocale#.properties";
-                var rbFullPath = rbFilePath;
-
-
-
-
+
+
+
+
+
+
-                }
-                /* Absolute Path Check */
-                if( not fileExists(rbFullPath) ){
-                        /* Relative App Path Check */
-                        if( fileExists(appRoot & rbFilePath) ){
-                                rbFullPath = appRoot & rbFilePath;
-                        }
-                        /* Expand Path Check */
-                        else if( fileExists( expandPath(rbFilePath) ) ){
-                                rbFullPath = ExpandPath(rbFilePath);
-                        }
-                        else{
-                                throw("The resource bundle file: #rbFullPath# does not exist. Please check your path","","ColdBox.plugins.resourceBundle.InvalidBundlePath");
-                        }
-                }               
-                
-                //Load Instance