Changeset 376

Timestamp:

01/28/07 19:53:48 (6 years ago)

Author:

lmajano

Message:

Ticket #88, #89
Solved.

Location:

coldbox/trunk/src/system

Files:

• beans/datasourceBean.cfc (modified) (6 diffs)
• config/config.xsd (modified) (2 diffs)
• plugins/XMLParser.cfc (modified) (2 diffs)
• util/actioncontroller.cfc (modified) (3 diffs)

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

@@ -9 +9 @@
 
 Modification History:
-
+01/28/2007 - Added the alias property and solved the java contract with correct arg.
 ----------------------------------------------------------------------->
 <cfcomponent name="datasourceBean" hint="I model a datasource connection setting." output="false">
@@ -17 +17 @@
                 variables.instance = structnew();
                 variables.instance.name = "";
+                variables.instance.alias = "";
                 variables.instance.dbtype = "";
                 variables.instance.username = "";
@@ -52 +53 @@
         
         <cffunction name="setname" access="public" return="void" output="false" hint="Set name of the datasource, this maps to the Coldfusion datasource name">
-          <cfargument name="value" type="string" >
-          <cfset variables.instance.name=arguments.value >
+          <cfargument name="name" type="string" required="true">
+          <cfset variables.instance.name=arguments.name >
         </cffunction>
         
@@ -64 +65 @@
         <!--- ************************************************************* --->
         
+        <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 >
+        </cffunction>
+        
+        <!--- ************************************************************* --->
+        
+        <cffunction name="getalias" access="public" return="string" output="false" hint="Get the alias">
+          <cfreturn variables.instance.name >
+        </cffunction>
+        
+        <!--- ************************************************************* --->
+        
         <cffunction name="setDBType" access="public" return="void" output="false" hint="Set DBType">
-          <cfargument name="value" type="string" >
-          <cfset variables.instance.dbtype=arguments.value >
+          <cfargument name="dbtype" type="string" required="true">
+          <cfset variables.instance.dbtype=arguments.dbtype >
         </cffunction>
         
@@ -78 +92 @@
         
         <cffunction name="setUsername" access="public" return="void" output="false" hint="Set Username">
-          <cfargument name="value" type="string" >
-          <cfset variables.instance.Username=arguments.value >
+          <cfargument name="Username" type="string" required="true">
+          <cfset variables.instance.Username=arguments.Username >
         </cffunction>
         
@@ -91 +105 @@
         
         <cffunction name="setPassword" access="public" return="void" output="false" hint="Set Password">
-          <cfargument name="value" type="string" >
-          <cfset variables.instance.Password=arguments.value >
+          <cfargument name="Password" type="string" required="true" >
+          <cfset variables.instance.Password=arguments.Password >
         </cffunction>
         

coldbox/trunk/src/system/config/config.xsd

@@ -58 +58 @@
                                                                         <xs:enumeration value="onInvalidEvent"/>        
                                                                         <xs:enumeration value="HandlerCaching" />
+                                                                        <xs:enumeration value="IOCFramework" />
+                                                                        <xs:enumeration value="IOCDefinitionFile" />
                                                                 </xs:restriction>
                                                         </xs:simpleType>
@@ -294 +296 @@
                 </xs:annotation>
                 <xs:complexType>
+                        <xs:attribute name="alias" type="xs:string" use="required">
+                                <xs:annotation>
+                                        <xs:documentation>The alias of the registered datasource, for use in your application.</xs:documentation>
+                                </xs:annotation>
+                        </xs:attribute>
                         <xs:attribute name="name" type="xs:string" use="required">
                                 <xs:annotation>

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

@@ -29 +29 @@
 01/17/2007 - fixed Bug #83, failure to set handler invocation path if / as first char
 01/18/2007 - Preparing for new event registration system.
+01/26/2007 - Datasource Alias and error checking Ticket #88, #89
 ----------------------------------------------------------------------->
 <cfcomponent name="XMLParser"
@@ -440 +441 @@
                                 for(i=1;i lte ArrayLen(DatasourcesNodes); i=i+1){
                                         DSNStruct = structNew();
-                                        StructInsert(DSNStruct,"Name", Trim(DatasourcesNodes[i].XMLAttributes["name"]));
-                                        StructInsert(DSNStruct,"DBType", Trim(DatasourcesNodes[i].XMLAttributes["dbtype"]));
-                                        StructInsert(DSNStruct,"Username", Trim(DatasourcesNodes[i].XMLAttributes["username"]));
-                                        StructInsert(DSNStruct,"Password", Trim(DatasourcesNodes[i].XMLAttributes["password"]));
+                                        
+                                        //Required Entries
+                                        if ( not structKeyExists(DatasourcesNodes[i].XMLAttributes, "Alias") or len(Trim(DatasourcesNodes[i].XMLAttributes["Alias"])) eq 0 )
+                                                throw("This datasource entry's alias cannot be blank","","Framework.plugins.XMLParser.ConfigXMLParsingException");
+                                        else
+                                                StructInsert(DSNStruct,"Alias", Trim(DatasourcesNodes[i].XMLAttributes["Alias"]));
+                                        if ( not structKeyExists(DatasourcesNodes[i].XMLAttributes, "Name") or len(Trim(DatasourcesNodes[i].XMLAttributes["Name"])) eq 0 )
+                                                throw("This datasource entry's name cannot be blank","","Framework.plugins.XMLParser.ConfigXMLParsingException");
+                                        else
+                                                StructInsert(DSNStruct,"Name", Trim(DatasourcesNodes[i].XMLAttributes["Name"]));
+                                        
+                                        //Optional Entries.
+                                        if ( structKeyExists(DatasourcesNodes[i].XMLAttributes, "dbtype") )
+                                                StructInsert(DSNStruct,"DBType", Trim(DatasourcesNodes[i].XMLAttributes["dbtype"]));
+                                        else
+                                                StructInsert(DSNStruct,"DBType","");
+                                        if ( structKeyExists(DatasourcesNodes[i].XMLAttributes, "Username") )
+                                                StructInsert(DSNStruct,"Username", Trim(DatasourcesNodes[i].XMLAttributes["username"]));
+                                        else
+                                                StructInsert(DSNStruct,"Username","");
+                                        if ( structKeyExists(DatasourcesNodes[i].XMLAttributes, "password") )
+                                                StructInsert(DSNStruct,"Password", Trim(DatasourcesNodes[i].XMLAttributes["password"]));
+                                        else
+                                                StructInsert(DSNStruct,"Password","");
+                                        
                                         //Insert to structure
-                                        if ( not structKeyExists(DatasourcesStruct,DSNStruct.name) )
-                                                StructInsert(DatasourcesStruct, DSNStruct.name , DSNStruct);
-                                        else
-                                                throw("The datasource name: #dsnStruct.name# has already been declared.","","Framework.plugins.XMLParser.ConfigXMLParsingException");
+                                        if ( not structKeyExists(DatasourcesStruct,DSNStruct.Alias) )
+                                                StructInsert(DatasourcesStruct, DSNStruct.Alias , DSNStruct);
+                                        else
+                                                throw("The datasource alias: #dsnStruct.Alias# has already been declared.","","Framework.plugins.XMLParser.ConfigXMLParsingException");
                                 }
                         }

coldbox/trunk/src/system/util/actioncontroller.cfc

@@ -16 +16 @@
 10/10/2006 - Mail settings updated.
 12/08/2006 - Refactored.
+01/28/2006 - Datasource Alias resolved.
 ----------------------------------------------------------------------->
 <cfcomponent name="actioncontroller" hint="This is the action controller cfc. Method implementations are done here for sharing between plugin and event handler controllers." output="false" extends="coldbox.system.controller">
@@ -168 +169 @@
         <cffunction name="getDatasource" access="public" output="false" returnType="any" hint="I will return to you a datasourceBean according to the name of the datasource you wish to get from the configstruct (config.xml)">
                 <!--- ************************************************************* --->
-                <cfargument name="name" type="string" hint="The name of the datasource to get from the configstruct (name property in the config.xml)">
+                <cfargument name="alias" type="string" hint="The alias of the datasource to get from the configstruct (alias property in the config.xml)">
                 <!--- ************************************************************* --->
                 <cfscript>
@@ -177 +178 @@
                 }
                 //Try to get the correct datasource.
-                if ( structKeyExists(datasources, arguments.name) ){
-                        return getPlugin("beanFactory").create("coldbox.system.beans.datasourceBean").init(datasources[arguments.name]);
+                if ( structKeyExists(datasources, arguments.alias) ){
+                        return getPlugin("beanFactory").create("coldbox.system.beans.datasourceBean").init(datasources[arguments.alias]);
                 }
                 else{
-                        throw("The datasource: #arguments.name# is not defined.","","Framework.actioncontroller.DatasourceNotFoundException");
+                        throw("The datasource: #arguments.alias# is not defined.","","Framework.actioncontroller.DatasourceNotFoundException");
                 }
                 </cfscript>