[jboss-cvs] jboss-seam/examples/ui/resources/WEB-INF ...

[Norman Richards]

  User: nrichards
  Date: 07/04/12 14:15:15

  Modified:    examples/ui/resources/WEB-INF   Tag: Seam_1_2_AP
                        faces-config.xml web.xml
  Log:
  integrate ap team patch by request
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +7 -0      jboss-seam/examples/ui/resources/WEB-INF/faces-config.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: faces-config.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/ui/resources/WEB-INF/faces-config.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -b -r1.1 -r1.1.2.1
  --- faces-config.xml	29 Jan 2007 23:52:49 -0000	1.1
  +++ faces-config.xml	12 Apr 2007 18:15:15 -0000	1.1.2.1
  @@ -1,10 +1,16 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
   
   <!DOCTYPE faces-config
   PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
   							 "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
   
   <faces-config>
  +-->
  +<faces-config version="1.2"
  +    xmlns="http://java.sun.com/xml/ns/javaee"
  +    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  +    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
   
   	<lifecycle>
   		<phase-listener>
  @@ -15,6 +21,7 @@
   	<application>
   		<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
   		<message-bundle>messages</message-bundle>
  +        <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
   	</application>
   
   </faces-config>
  
  
  
  1.2.2.1   +2 -4      jboss-seam/examples/ui/resources/WEB-INF/web.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: web.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/ui/resources/WEB-INF/web.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -b -r1.2 -r1.2.2.1
  --- web.xml	22 Feb 2007 04:30:52 -0000	1.2
  +++ web.xml	12 Apr 2007 18:15:15 -0000	1.2.2.1
  @@ -12,11 +12,9 @@
   		</listener-class>
   	</listener>
   
  -	<!-- MyFaces -->
  -
   	<listener>
   		<listener-class>
  -			org.apache.myfaces.webapp.StartupServletContextListener
  +			com.sun.faces.config.ConfigureListener
   		</listener-class>
   	</listener>