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

[Norman Richards]

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

  Modified:    examples/seamspace/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.3.2.1   +7 -0      jboss-seam/examples/seamspace/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/seamspace/resources/WEB-INF/faces-config.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -b -r1.3 -r1.3.2.1
  --- faces-config.xml	10 Feb 2007 09:02:09 -0000	1.3
  +++ faces-config.xml	12 Apr 2007 18:15:12 -0000	1.3.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.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>
           <view-handler>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</view-handler>
  +        <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
       </application>
   
       <!-- Phase listener needed for all Seam applications -->
  
  
  
  1.15.2.1  +1 -3      jboss-seam/examples/seamspace/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/seamspace/resources/WEB-INF/web.xml,v
  retrieving revision 1.15
  retrieving revision 1.15.2.1
  diff -u -b -r1.15 -r1.15.2.1
  --- web.xml	14 Feb 2007 00:36:37 -0000	1.15
  +++ web.xml	12 Apr 2007 18:15:12 -0000	1.15.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>