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

[Peter Muir]

  User: pmuir   
  Date: 07/06/21 07:11:30

  Modified:    trinidad/examples/seamdiscs/resources/WEB-INF    web.xml
                        components.xml trinidad-config.xml
  Log:
  Work around bug in a4j/trinidad integration
  
  Revision  Changes    Path
  1.5       +11 -1     jboss-seam/trinidad/examples/seamdiscs/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/trinidad/examples/seamdiscs/resources/WEB-INF/web.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- web.xml	30 May 2007 01:16:48 -0000	1.4
  +++ web.xml	21 Jun 2007 11:11:30 -0000	1.5
  @@ -91,7 +91,7 @@
          </auth-constraint>
      </security-constraint>
      
  -   <!-- Trinidad -->
  +   <!-- Trinidad - as suggested by a4j-trinidad example-->
      
      <context-param>
         <param-name>org.apache.myfaces.trinidad.ALTERNATE_VIEW_HANDLER</param-name>
  @@ -106,8 +106,18 @@
       <filter-mapping>
           <filter-name>Trinidad</filter-name>
           <url-pattern>*.seam</url-pattern>
  +        <dispatcher>REQUEST</dispatcher>
  +		<dispatcher>FORWARD</dispatcher>
  +		<dispatcher>INCLUDE</dispatcher>
       </filter-mapping>
       
  +    <context-param>
  +		<param-name>
  +			org.apache.myfaces.trinidad.CACHE_VIEW_ROOT
  +		</param-name>
  +		<param-value>false</param-value>
  +	</context-param>
  +    
       <servlet>
           <servlet-name>Trinidad Resources</servlet-name>
           <servlet-class>org.apache.myfaces.trinidad.webapp.ResourceServlet</servlet-class>
  
  
  
  1.8       +8 -1      jboss-seam/trinidad/examples/seamdiscs/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/trinidad/examples/seamdiscs/resources/WEB-INF/components.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- components.xml	15 Jun 2007 05:28:16 -0000	1.7
  +++ components.xml	21 Jun 2007 11:11:30 -0000	1.8
  @@ -2,11 +2,15 @@
   <components xmlns="http://jboss.com/products/seam/components"
   	xmlns:core="http://jboss.com/products/seam/core"
   	xmlns:security="http://jboss.com/products/seam/security"
  +	xmlns:persistence="http://jboss.com/products/seam/persistence"
  +	xmlns:web="http://jboss.com/products/seam/web"
   	xmlns:framework="http://jboss.com/products/seam/framework"
   	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   	xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.3.xsd 
                    http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.3.xsd
  +                 http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-1.3.xsd
                    http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.3.xsd 
  +                 http://jboss.com/products/seam/web http://jboss.com/products/seam/web-1.3.xsd 
                    http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-1.3.xsd">
   
   	<core:init debug="@debug@" jndi-pattern="@jndiPattern@" />
  @@ -15,7 +19,7 @@
   		conversation-timeout="120000" 
   		conversation-id-parameter="cid"/>
   
  -	<core:managed-persistence-context name="entityManager"
  +	<persistence:managed-persistence-context name="entityManager"
   		auto-create="true"
   		persistence-unit-jndi-name="java:/seamdiscsEntityManagerFactory" />
   
  @@ -30,6 +34,9 @@
           <action expression="#{redirect.returnToCapturedView}"/>
       </event>   
   	
  +    <!-- Work around a bug in ajax4jsf-trindiad integration -->
  +	<web:ajax4jsf-filter enable-cache="false" />
  +	
   	<framework:entity-query name="discs" ejbql="select disc from Disc disc" order="disc.name ASC" max-results="5"/>
   	
   	<framework:entity-query name="artists" ejbql="select artist from Artist artist" order="artist.name DESC" max-results="5"/>
  
  
  
  1.2       +6 -3      jboss-seam/trinidad/examples/seamdiscs/resources/WEB-INF/trinidad-config.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: trinidad-config.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/trinidad/examples/seamdiscs/resources/WEB-INF/trinidad-config.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- trinidad-config.xml	18 Apr 2007 12:06:28 -0000	1.1
  +++ trinidad-config.xml	21 Jun 2007 11:11:30 -0000	1.2
  @@ -1,8 +1,11 @@
   <?xml version="1.0"?>
   <trinidad-config xmlns="http://myfaces.apache.org/trinidad/config">
  -  <!-- Enable debug output -->
  -  <!-- <debug-output>true</debug-output>-->
  -
  +  <!-- Disable client validation, I don't like it -->
     <client-validation-disabled>true</client-validation-disabled>
  +  <!-- Use our own skin, vaguely like the a4j blueSky skin -->
     <skin-family>seamdiscs</skin-family>
  +  <!-- Enable debug output here -->
  +  <debug-output>false</debug-output>
  +  <!-- Improve a4j compatibility -->
  +  <accessibility-mode>inaccessible</accessibility-mode>  
   </trinidad-config>
  \ No newline at end of file