Permalink
Browse files

JSFUNIT-287 Fix failing Cactus/Cargo tests

  • Loading branch information...
1 parent b9e68b4 commit af1e0523e5aeb03e2c02648de2669059f7fa346a @ssilvert ssilvert committed Sep 8, 2011
@@ -52,6 +52,7 @@
*/
public static boolean isFaceletsErrorPage(WebResponse response)
{
+ if (response == null) return false;
String responseBody = response.getContentAsString();
if (responseBody == null) return false;
@@ -132,10 +132,11 @@ public Object getComponentValue(String componentID)
public Object getManagedBeanValue(String elExpression)
{
FacesContext facesContext = getFacesContext();
+ ExternalContext extContext = facesContext.getExternalContext();
try
{
- setELRunning(true, facesContext.getExternalContext());
+ setELRunning(true, extContext);
return facesContext.getApplication()
.createValueBinding(elExpression)
.getValue(facesContext);
@@ -157,7 +158,7 @@ public Object getManagedBeanValue(String elExpression)
}
finally
{
- setELRunning(false, facesContext.getExternalContext());
+ setELRunning(false, extContext);
}
}
@@ -231,6 +231,17 @@
</build>
</profile>
+ <profile>
+ <id>mojarra1.2</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>compile</scope>
+ <version>1.2_13</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
@@ -88,6 +88,14 @@
<jsfMajorVersion>1</jsfMajorVersion>
<jsfMinorVersion>2</jsfMinorVersion>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>compile</scope>
+ <version>1.2_13</version>
+ </dependency>
+ </dependencies>
</profile>
<profile>
@@ -107,6 +107,22 @@
</build>
</profile>
+ <profile>
+ <id>mojarra1.2</id>
+ <properties>
+ <jsfMajorVersion>1</jsfMajorVersion>
+ <jsfMinorVersion>2</jsfMinorVersion>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>compile</scope>
+ <version>1.2_13</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
<dependencies>

0 comments on commit af1e052

Please sign in to comment.