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

[Peter Muir]

  User: pmuir   
  Date: 07/10/08 10:53:13

  Modified:    examples/seamdiscs/resources/WEB-INF   components.xml
                        web.xml
  Log:
  Oops
  
  Revision  Changes    Path
  1.8       +7 -1      jboss-seam/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/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	1 Oct 2007 14:58:40 -0000	1.7
  +++ components.xml	8 Oct 2007 14:53:13 -0000	1.8
  @@ -39,7 +39,11 @@
   	
   	<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"/>
  +	<framework:entity-query name="artists" ejbql="select artist from Artist artist" order="artist.name DESC" max-results="5">
  +      <framework:restrictions>
  +        <value>lower(artist.name) like lower(concat(#{exampleArtist.name}, '%'))</value>
  +      </framework:restrictions>
  +    </framework:entity-query>
   	
   	<framework:entity-query name="allArtists" ejbql="select artist from Artist artist" order="artist.name"/>
   	
  @@ -47,4 +51,6 @@
   	
   	<factory name="disc" value="#{discHome.instance}"/>
   
  +    <component name="exampleArtist" class="org.jboss.seam.example.seamdiscs.model.Artist" scope="session" />
  +
   </components>
  
  
  
  1.8       +117 -106  jboss-seam/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/examples/seamdiscs/resources/WEB-INF/web.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- web.xml	23 Sep 2007 17:57:35 -0000	1.7
  +++ web.xml	8 Oct 2007 14:53:13 -0000	1.8
  @@ -37,7 +37,9 @@
           
      <servlet>
         <servlet-name>Seam Resource Servlet</servlet-name>
  -      <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class>
  +    <servlet-class>
  +      org.jboss.seam.servlet.SeamResourceServlet
  +    </servlet-class>
      </servlet>
       
      <servlet-mapping>
  @@ -73,33 +75,34 @@
      <!-- Trinidad - as suggested by a4j-trinidad example-->
      
      <context-param>
  -      <param-name>org.apache.myfaces.trinidad.ALTERNATE_VIEW_HANDLER</param-name>
  +    <param-name>
  +      org.apache.myfaces.trinidad.ALTERNATE_VIEW_HANDLER
  +    </param-name>
         <param-value>com.sun.facelets.FaceletViewHandler</param-value>
   	</context-param> 
   	
       <filter>
           <filter-name>Trinidad</filter-name>
  -        <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class>
  +    <filter-class>
  +      org.apache.myfaces.trinidad.webapp.TrinidadFilter
  +    </filter-class>
       </filter>
       
       <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-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>
  +    <servlet-class>
  +      org.apache.myfaces.trinidad.webapp.ResourceServlet
  +    </servlet-class>
       </servlet>
       
       <servlet-mapping>
  @@ -107,4 +110,12 @@
           <url-pattern>/adf/*</url-pattern>
       </servlet-mapping>
      
  +  <context-param>
  +    <param-name>
  +      org.apache.myfaces.trinidadinternal.DISABLE_CONTENT_COMPRESSION
  +    </param-name>
  +    <param-value>true</param-value>
  +  </context-param>
  +
  +
   </web-app>