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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/02/08 18:43:39

  Modified:    examples/seamspace/resources/WEB-INF   components.xml
                        web.xml
  Log:
  use SeamFilter
  
  Revision  Changes    Path
  1.22      +5 -4      jboss-seam/examples/seamspace/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/seamspace/resources/WEB-INF/components.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- components.xml	8 Feb 2007 16:14:10 -0000	1.21
  +++ components.xml	8 Feb 2007 23:43:39 -0000	1.22
  @@ -3,13 +3,13 @@
               xmlns:core="http://jboss.com/products/seam/core"
               xmlns:security="http://jboss.com/products/seam/security"
               xmlns:drools="http://jboss.com/products/seam/drools"
  -            xmlns:filter="http://jboss.com/products/seam/filter"
  +            xmlns:servlet="http://jboss.com/products/seam/servlet"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation=
                   "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.1.xsd 
                    http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.1.xsd
                    http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.1.xsd
  -                 http://jboss.com/products/seam/filter http://jboss.com/products/seam/filter-1.1.xsd
  +                 http://jboss.com/products/seam/servlet http://jboss.com/products/seam/servlet-1.1.xsd
                    http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.1.xsd">
   
       <core:init jndi-pattern="@jndiPattern@" debug="false"/>  
  @@ -21,7 +21,8 @@
       
       <security:identity authenticate-method="#{authenticator.authenticate}"/>
       
  -    <filter:multipart-filter create-temp-files="true" max-request-size="1000000" url-pattern="*.seam"/>
  +    <servlet:multipart-filter create-temp-files="true" max-request-size="1000000" url-pattern="*.seam"/>
  +    <servlet:seam-servlet-filter url-pattern="/content/*"/>
   
       <drools:rule-base name="securityRules">
          <drools:rule-files><value>/META-INF/security-rules.drl</value></drools:rule-files>
  
  
  
  1.12      +3 -48     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.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- web.xml	8 Feb 2007 16:14:10 -0000	1.11
  +++ web.xml	8 Feb 2007 23:43:39 -0000	1.12
  @@ -18,44 +18,9 @@
       
       <filter-mapping>
         <filter-name>Seam Filter</filter-name>
  -      <url-pattern>*.seam</url-pattern>
  -    </filter-mapping>
  -
  -    
  -    <!-- Propagate conversations across redirects -->
  -
  -    <filter>
  -        <filter-name>Seam Redirect Filter</filter-name>
  -        <filter-class>org.jboss.seam.servlet.SeamRedirectFilter</filter-class>
  -    </filter>
  -
  -    <filter-mapping>
  -        <filter-name>Seam Redirect Filter</filter-name>
  -        <url-pattern>*.seam</url-pattern>
  -    </filter-mapping>
  -    
  -    <!-- Seam exception filter -->
  -    
  -    <filter>
  -        <filter-name>Seam Exception Filter</filter-name>
  -        <filter-class>org.jboss.seam.servlet.SeamExceptionFilter</filter-class>
  -    </filter>
  -    
  -    <filter-mapping>
  -        <filter-name>Seam Exception Filter</filter-name>
           <url-pattern>/*</url-pattern>
       </filter-mapping>    
       
  -    <!--filter>
  -        <filter-name>Seam Multipart Filter</filter-name>
  -        <filter-class>org.jboss.seam.servlet.SeamMultipartFilter</filter-class>
  -    </filter>
  -    
  -    <filter-mapping>
  -        <filter-name>Seam Multipart Filter</filter-name>
  -        <url-pattern>*.seam</url-pattern>
  -    </filter-mapping-->
  -
       <!-- MyFaces -->
   
       <listener>
  @@ -102,16 +67,6 @@
           <url-pattern>/content/*</url-pattern>
       </servlet-mapping>
       
  -    <filter>
  -        <filter-name>Seam Servlet Filter</filter-name>
  -        <filter-class>org.jboss.seam.servlet.SeamServletFilter</filter-class>
  -    </filter>
  -    
  -    <filter-mapping>
  -        <filter-name>Seam Servlet Filter</filter-name>
  -        <url-pattern>/content/*</url-pattern>
  -    </filter-mapping>      
  -    
       <!-- Captcha Servlet -->
       
       <servlet>