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

[Norman Richards]

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

  Modified:    examples/icefaces/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.2.2.1   +7 -0      jboss-seam/examples/icefaces/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/icefaces/resources/WEB-INF/faces-config.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -b -r1.2 -r1.2.2.1
  --- faces-config.xml	29 Nov 2006 19:17:05 -0000	1.2
  +++ faces-config.xml	12 Apr 2007 18:15:05 -0000	1.2.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">
   
       <managed-bean>
           <managed-bean-name>highlight</managed-bean-name>
  @@ -13,6 +19,7 @@
       
       <application>
           <view-handler>com.icesoft.faces.facelets.D2DSeamFaceletViewHandler</view-handler>
  +        <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
       </application>
       
       <!-- Select one of the standard transaction models for the Seam application -->
  
  
  
  1.1.2.1   +0 -7      jboss-seam/examples/icefaces/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/icefaces/resources/WEB-INF/web.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -b -r1.1 -r1.1.2.1
  --- web.xml	20 Nov 2006 05:03:27 -0000	1.1
  +++ web.xml	12 Apr 2007 18:15:05 -0000	1.1.2.1
  @@ -119,17 +119,10 @@
           <url-pattern>*.seam</url-pattern>
       </servlet-mapping>
   
  -    <!-- MyFaces -->
  -    <listener>
  -        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
  -    </listener>
  - 
       <!-- JSF RI -->
  -    <!--
       <listener>
           <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
       </listener> 
  -    -->
       
   </web-app>