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

[Norman Richards]

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

  Modified:    examples/booking/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.39.2.1  +4 -2      jboss-seam/examples/booking/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/booking/resources/WEB-INF/faces-config.xml,v
  retrieving revision 1.39
  retrieving revision 1.39.2.1
  diff -u -b -r1.39 -r1.39.2.1
  --- faces-config.xml	24 Feb 2007 18:48:48 -0000	1.39
  +++ faces-config.xml	12 Apr 2007 18:15:00 -0000	1.39.2.1
  @@ -1,5 +1,6 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!-- JSF 1.1 -->
  +<!--
   <!DOCTYPE faces-config 
       PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
       "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
  @@ -7,9 +8,10 @@
   
       <lifecycle>
        <phase-listener>org.jboss.seam.jsf.SeamPhaseListener</phase-listener>
    </lifecycle>

   </faces-config>
  +-->
   
   <!-- JSF 1.2 -->
  -<!-- 
  + 
   <faces-config version="1.2"
      xmlns="http://java.sun.com/xml/ns/javaee"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  @@ -24,4 +26,4 @@
       </lifecycle>
   
   </faces-config>
  --->
  +
  
  
  
  1.39.2.1  +0 -7      jboss-seam/examples/booking/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/booking/resources/WEB-INF/web.xml,v
  retrieving revision 1.39
  retrieving revision 1.39.2.1
  diff -u -b -r1.39 -r1.39.2.1
  --- web.xml	22 Feb 2007 04:07:03 -0000	1.39
  +++ web.xml	12 Apr 2007 18:15:00 -0000	1.39.2.1
  @@ -76,16 +76,9 @@
           <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>