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

[Norman Richards]

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

  Modified:    examples/issues/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/issues/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/issues/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	19 Feb 2007 05:41:31 -0000	1.5
  +++ faces-config.xml	12 Apr 2007 18:15:06 -0000	1.5.2.1
  @@ -1,8 +1,14 @@
   <?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-rule>
           <navigation-case>
  @@ -104,6 +110,7 @@
       <!-- i18n -->
   
       <application>
  +        <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
   	  <locale-config>
   		<default-locale>en</default-locale>
   		<supported-locale>en</supported-locale>
  
  
  
  1.8.2.1   +2 -4      jboss-seam/examples/issues/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/issues/resources/WEB-INF/web.xml,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -b -r1.8 -r1.8.2.1
  --- web.xml	12 Oct 2006 02:43:41 -0000	1.8
  +++ web.xml	12 Apr 2007 18:15:06 -0000	1.8.2.1
  @@ -21,10 +21,8 @@
           <url-pattern>*.jsf</url-pattern>
       </filter-mapping>
   
  -    <!-- MyFaces -->
  -    
       <listener>
  -        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
  +         <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
       </listener>
       
       <context-param>