Author: craigmcc
Date: Thu Dec 14 00:29:27 2006
New Revision: 487130
URL: http://svn.apache.org/viewvc?view=rev&rev=487130
Log:
Correctly resolve the implicit variable names that are not currently
supported: application, cookie, header, headerValues, param, paramValues,
request, response, session, and view.
SHALE-361
Modified:
shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockVariableResolver.java
Modified:
shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockVariableResolver.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockVariableResolver.java?view=diff&rev=487130&r1=487129&r2=487130
==============================================================================
---
shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockVariableResolver.java
(original)
+++
shale/framework/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockVariableResolver.java
Thu Dec 14 00:29:27 2006
@@ -65,16 +65,34 @@
}
// Check for magic names
- if ("applicationScope".equals(name)) {
+ if ("application".equals(name)) {
+ return external().getContext();
+ } else if ("applicationScope".equals(name)) {
return external().getApplicationMap();
+ } else if ("cookie".equals(name)) {
+ return external().getRequestCookieMap();
} else if ("facesContext".equals(name)) {
return FacesContext.getCurrentInstance();
+ } else if ("header".equals(name)) {
+ return external().getRequestHeaderMap();
+ } else if ("headerValues".equals(name)) {
+ return external().getRequestHeaderValuesMap();
+ } else if ("param".equals(name)) {
+ return external().getRequestParameterMap();
+ } else if ("paramValues".equals(name)) {
+ return external().getRequestParameterValuesMap();
+ } else if ("request".equals(name)) {
+ return external().getRequest();
} else if ("requestScope".equals(name)) {
return external().getRequestMap();
+ } else if ("response".equals(name)) {
+ return external().getResponse();
+ } else if ("session".equals(name)) {
+ return external().getSession(true);
} else if ("sessionScope".equals(name)) {
return external().getSessionMap();
- } else if ("param".equals(name)) {
- return external().getRequestParameterMap();
+ } else if ("view".equals(name)) {
+ return FacesContext.getCurrentInstance().getViewRoot();
}
// Search ascending scopes for non-magic names
