Skip to content

adjust to allow full FW/1 as framework beanfactory #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

adjust to allow full FW/1 as framework beanfactory #429

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab72131
adjust to allow full FW/1 as framework beanfactory
brianharcourt Apr 5, 2022
07054fb
avoid conflict with LBPS resources
brianharcourt May 30, 2023
ecef947
adapt to old 'list' of parameters submission method
brianharcourt Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions core/api.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,6 +1028,8 @@
<cfset local.returnData[local.qsKey] = arrayNew(1) />
</cfif>
<cfset arrayAppend(local.returnData[local.qsKey], local.qsValue) />
<cfelseif local.returnData.keyExists(local.qsKey)>
<cfset local.returnData[local.qsKey] = local.returnData[local.qsKey].listAppend(local.qsValue) />
<cfelse>
<cfset local.returnData[local.qsKey] = local.qsValue />
</cfif>
Expand Down Expand Up @@ -1063,15 +1065,15 @@

<cffunction name="guessResourcesPath" access="private" output="false" returntype="string" hint="used to try and figure out the absolute path of the /resources folder even though this file may not be in the web root">
<!--- if /resources has been explicitly defined in an server/application mapping, it should take precedence --->
<cfif directoryExists(expandPath("resources"))>
<cfreturn "resources" />
<cfelseif directoryExists(expandPath("/resources"))>
<cfreturn "/resources" />
<cfif directoryExists(expandPath("taffy_resources"))>
<cfreturn "taffy_resources" />
<cfelseif directoryExists(expandPath("/taffy_resources"))>
<cfreturn "/taffy_resources" />
</cfif>

<!--- if all else fails, fall through to guessing where /resources lives --->
<cfset local.indexcfmpath = cgi.script_name />
<cfset local.resourcesPath = listDeleteAt(local.indexcfmpath, listLen(local.indexcfmpath, "/"), "/") & "/resources" />
<cfset local.resourcesPath = listDeleteAt(local.indexcfmpath, listLen(local.indexcfmpath, "/"), "/") & "/taffy_resources" />

<cfif GetContextRoot() NEQ "">
<cfset local.resourcesPath = ReReplace(local.resourcesPath,"^#GetContextRoot()#","")>
Expand Down Expand Up @@ -1228,14 +1230,16 @@
<cfset var beanFactoryMeta = getMetadata(arguments.bf) />
<cfif lcase(left(beanFactoryMeta.name, 10)) eq "coldspring">
<cfreturn getBeanListFromColdSpring( arguments.bf ) />
<cfelseif beanFactoryMeta.name contains "ioc">
<cfelseif beanFactoryMeta.name contains "ioc" OR beanFactoryMeta.name contains "aop">
<!--- this isn't a perfect test (contains "ioc") but it's all we can do for now... --->
<!--- If we want AOP with full FW/1 then we need to sniff for ioc extended to: "aop" --->
<cfset local.beanInfo = arguments.bf.getBeanInfo().beanInfo />
<cfset local.beanList = "" />
<cfloop collection="#local.beanInfo#" item="local.beanName">
<cfif structKeyExists(local.beanInfo[local.beanName],'name')
AND local.beanName NEQ local.beanInfo[local.beanName].name
AND local.beanName EQ local.beanInfo[local.beanName].name
AND isInstanceOf(arguments.bf.getBean(local.beanName),'taffy.core.resource')>
<!--- not sure what 'NEQ' eliminates; everything, it seems --->
<cfset local.beanList = listAppend(local.beanList,local.beanName) />
</cfif>
</cfloop>
Expand Down