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

[Norman Richards]

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

  Modified:    examples/dvdstore/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.13.2.1  +7 -0      jboss-seam/examples/dvdstore/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/dvdstore/resources/WEB-INF/faces-config.xml,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -b -r1.13 -r1.13.2.1
  --- faces-config.xml	17 Dec 2006 07:20:05 -0000	1.13
  +++ faces-config.xml	12 Apr 2007 18:15:02 -0000	1.13.2.1
  @@ -1,11 +1,18 @@
   <?xml version='1.0' encoding='UTF-8'?>
  +<!--
   <!DOCTYPE faces-config PUBLIC
             "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//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">
       
       <application>
  +        <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
           <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
       </application>
   
  
  
  
  1.19.2.1  +1 -1      jboss-seam/examples/dvdstore/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/dvdstore/resources/WEB-INF/web.xml,v
  retrieving revision 1.19
  retrieving revision 1.19.2.1
  diff -u -b -r1.19 -r1.19.2.1
  --- web.xml	22 Feb 2007 04:29:08 -0000	1.19
  +++ web.xml	12 Apr 2007 18:15:02 -0000	1.19.2.1
  @@ -15,7 +15,7 @@
       </listener>
       
       <listener>
  -        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
  +        <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
       </listener>
       
       <context-param>