[gatein-commits] gatein SVN: r6130 - in components/wsrp/trunk/admin-gui: src/main/webapp/WEB-INF and 1 other directory.

Author: chris.laprun(a)jboss.com Date: 2011-03-29 05:20:28 -0400 (Tue, 29 Mar 2011) New Revision: 6130 Modified: components/wsrp/trunk/admin-gui/pom.xml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml Log: - GTNWSRP-218: Added dependency on JBoss EL engine and force its use in the admin portlet. Modified: components/wsrp/trunk/admin-gui/pom.xml =================================================================== --- components/wsrp/trunk/admin-gui/pom.xml 2011-03-25 16:33:00 UTC (rev 6129) +++ components/wsrp/trunk/admin-gui/pom.xml 2011-03-29 09:20:28 UTC (rev 6130) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -81,7 +82,14 @@ <version>1.1.15</version> </dependency> + <!-- To make JSF works on AS 6 --> <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + <version>1.0_02.CR5</version> + </dependency> + + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <scope>provided</scope> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2011-03-25 16:33:00 UTC (rev 6129) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2011-03-29 09:20:28 UTC (rev 6130) @@ -43,6 +43,12 @@ <param-value>Mojarra-1.2</param-value> </context-param> + <!-- Tell JBoss AS 6 to use JBoss EL engine instead of default --> + <context-param> + <param-name>com.sun.faces.expressionFactory</param-name> + <param-value>org.jboss.el.ExpressionFactoryImpl</param-value> + </context-param> + <!-- Facelet configuration --> <context-param> <param-name>facelets.DEVELOPMENT</param-name> @@ -83,8 +89,6 @@ <exception-type>java.lang.Exception</exception-type> <location>/faces/jsf/error.xhtml</location> </error-page> - - </web-app>