[jboss-cvs] jboss-seam/examples/hibernate2/resources ...

[Norman Richards]

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

  Modified:    examples/hibernate2/resources   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.1.1.2.1 +9 -0      jboss-seam/examples/hibernate2/resources/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/hibernate2/resources/faces-config.xml,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -b -r1.1.1.1 -r1.1.1.1.2.1
  --- faces-config.xml	8 Nov 2006 10:01:01 -0000	1.1.1.1
  +++ faces-config.xml	12 Apr 2007 18:15:04 -0000	1.1.1.1.2.1
  @@ -1,9 +1,18 @@
   <?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">
  +    <application>
  +        <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
  +    </application>
       
       <lifecycle>
         <phase-listener>
  
  
  
  1.5.2.1   +3 -4      jboss-seam/examples/hibernate2/resources/web.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: web.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/hibernate2/resources/web.xml,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -b -r1.5 -r1.5.2.1
  --- web.xml	26 Feb 2007 23:39:44 -0000	1.5
  +++ web.xml	12 Apr 2007 18:15:04 -0000	1.5.2.1
  @@ -66,9 +66,8 @@
         <param-value>true</param-value>    
       </context-param>  
       
  -    <!-- MyFaces -->    
       <listener>        
  -      <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>    
  +         <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
       </listener>     
       
   </web-app>