Author: jjamrich Date: 2012-05-25 16:20:36 -0400 (Fri, 25 May 2012) New Revision: 23214 Added: branches/community/rfpl-2256_openshift/samples/richfaces-demo/src/main/webapp/WEB-INF/jboss-deployment-structure.xml Removed: branches/community/rfpl-2256_openshift/samples/richfaces-demo/src/main/webapp/WEB-INF/jboss-web.xml Log: RFPL-2256: basic changes to get RF-demo run on AS7.1 Changes described in RFPL-1493 Added: branches/community/rfpl-2256_openshift/samples/richfaces-demo/src/main/webapp/WEB-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/rfpl-2256_openshift/samples/richfaces-demo/src/main/webapp/WEB-INF/jboss-deployment-structure.xml (rev 0) +++ branches/community/rfpl-2256_openshift/samples/richfaces-demo/src/main/webapp/WEB-INF/jboss-deployment-structure.xml 2012-05-25 20:20:36 UTC (rev 23214) @@ -0,0 +1,12 @@ +<jboss-deployment-structure> + <deployment> + <exclusions> + <module name="javax.faces.api" slot="main"/> + <module name="com.sun.jsf-impl" slot="main"/> + </exclusions> + <dependencies> + <module name="javax.faces.api" slot="1.2"/> + <module name="com.sun.jsf-impl" slot="1.2"/> + </dependencies> + </deployment> +</jboss-deployment-structure> Deleted: branches/community/rfpl-2256_openshift/samples/richfaces-demo/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- branches/community/rfpl-2256_openshift/samples/richfaces-demo/src/main/webapp/WEB-INF/jboss-web.xml 2012-05-22 14:15:30 UTC (rev 23213) +++ branches/community/rfpl-2256_openshift/samples/richfaces-demo/src/main/webapp/WEB-INF/jboss-web.xml 2012-05-25 20:20:36 UTC (rev 23214) @@ -1,12 +0,0 @@ -<!DOCTYPE jboss-web PUBLIC - "-//JBoss//DTD Web Application 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> - -<jboss-web> - <class-loading> - <loader-repository> - org.richfaces.samples.richfaces-demo:loader=richfaces-demo-jee5.war - <loader-repository-config>java2ParentDelegation=true</loader-repository-config> - </loader-repository> - </class-loading> -</jboss-web> \ No newline at end of file