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

[Norman Richards]

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

  Modified:    examples/hibernate/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.5.2.1   +7 -0      jboss-seam/examples/hibernate/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/hibernate/resources/WEB-INF/faces-config.xml,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -b -r1.5 -r1.5.2.1
  --- faces-config.xml	4 Nov 2006 01:29:23 -0000	1.5
  +++ faces-config.xml	12 Apr 2007 18:15:03 -0000	1.5.2.1
  @@ -1,9 +1,15 @@
   <?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_0.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">
   
       <!-- Navigation rules for the Booking demo app -->
   
  @@ -105,6 +111,7 @@
   
       <application>
           <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
  +        <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
       </application>
       
       <!-- Select one of the two standard persistence lifecycle models for the Seam application -->
  
  
  
  1.9.2.1   +1 -3      jboss-seam/examples/hibernate/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/hibernate/resources/WEB-INF/web.xml,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -b -r1.9 -r1.9.2.1
  --- web.xml	22 Feb 2007 04:26:16 -0000	1.9
  +++ web.xml	12 Apr 2007 18:15:03 -0000	1.9.2.1
  @@ -31,10 +31,8 @@
         <url-pattern>/seam/resource/*</url-pattern>
       </servlet-mapping>     
           
  -    <!-- MyFaces -->
  -    
       <listener>
  -        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
  +        <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
       </listener>
       
       <context-param>