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

[Norman Richards]

  User: nrichards
  Date: 07/02/12 16:14:23

  Modified:    examples/spring/resources/WEB-INF     components.xml
                        faces-config.xml pages.xml web.xml
  Log:
  from patch
  
  Revision  Changes    Path
  1.2       +2 -12     jboss-seam/examples/spring/resources/WEB-INF/components.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: components.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/spring/resources/WEB-INF/components.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- components.xml	21 Jan 2007 07:36:17 -0000	1.1
  +++ components.xml	12 Feb 2007 21:14:23 -0000	1.2
  @@ -2,16 +2,6 @@
               xmlns:spring="http://jboss.com/products/seam/spring"
               xmlns:core="http://jboss.com/products/seam/core"
               xmlns:framework="http://jboss.com/products/seam/framework">
  -            
  -    <spring:bean-factory name="beanFactory" 
  -                         scope="APPLICATION" 
  -                         bean-file="spring-beans.xml" />
  -
  -    <spring:application-context name="springContext" 
  -                                scope="APPLICATION" 
  -                                bean-files="spring-beans.xml test-beans.xml" />
  -                                                  
  -
   	<core:init debug="true" jndi-pattern="@jndiPattern@" />
  -    <core:ejb installed="@embeddedEjb@" />
  +    <!--<core:ejb installed="@embeddedEjb@" />-->
   </components>
  
  
  
  1.2       +11 -2     jboss-seam/examples/spring/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/spring/resources/WEB-INF/faces-config.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- faces-config.xml	21 Jan 2007 07:36:17 -0000	1.1
  +++ faces-config.xml	12 Feb 2007 21:14:23 -0000	1.2
  @@ -4,11 +4,20 @@
   <faces-config>
       <!-- Facelets support -->
       <application>
  +        <variable-resolver>org.springframework.web.jsf.DelegatingVariableResolver</variable-resolver>
  +        <!--
           <view-handler>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</view-handler>
  +        -->
  +        <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
       </application>
   
       <!-- Phase listener needed for all Seam applications -->
  +    <!--
       <lifecycle>
           <phase-listener>org.jboss.seam.jsf.TransactionalSeamPhaseListener</phase-listener>
       </lifecycle>
  +    -->
  +    <lifecycle>
  +        <phase-listener>org.jboss.seam.jsf.SeamPhaseListener</phase-listener>
  +    </lifecycle>
   </faces-config>
  
  
  
  1.3       +9 -9      jboss-seam/examples/spring/resources/WEB-INF/pages.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pages.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/spring/resources/WEB-INF/pages.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  
  
  
  1.2       +9 -0      jboss-seam/examples/spring/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/spring/resources/WEB-INF/web.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- web.xml	21 Jan 2007 07:36:17 -0000	1.1
  +++ web.xml	12 Feb 2007 21:14:23 -0000	1.2
  @@ -8,6 +8,15 @@
           <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
       </listener>
       
  +    <listener>
  +        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
  +    </listener>
  +
  +    <context-param>
  +        <param-name>contextConfigLocation</param-name>
  +        <param-value>classpath:/spring-beans.xml</param-value>
  +    </context-param>
  +    
       <filter>
           <filter-name>Seam Servlet Filter</filter-name>
           <filter-class>org.jboss.seam.servlet.SeamServletFilter</filter-class>