[Hibernate-commits] CaveatEmptor/HiA-SE/src/etc/webapp/WEB-INF faces-config.xml,1.2,1.3 web.xml,1.2,1.3

[<tu...@us...>]

Update of /cvsroot/hibernate/CaveatEmptor/HiA-SE/src/etc/webapp/WEB-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5762/HiA-SE/src/etc/webapp/WEB-INF

Modified Files:
	faces-config.xml web.xml 
Log Message:
Merged Seam and TestNG configuration

Index: faces-config.xml
===================================================================
RCS file: /cvsroot/hibernate/CaveatEmptor/HiA-SE/src/etc/webapp/WEB-INF/faces-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- faces-config.xml	3 Feb 2006 00:49:33 -0000	1.2
+++ faces-config.xml	25 Feb 2006 13:00:47 -0000	1.3
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE faces-config 
+<!DOCTYPE faces-config
     PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
     "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-    
+
 <faces-config>
 
     <navigation-rule>
@@ -19,7 +19,6 @@
             <to-view-id>/login.xhtml</to-view-id>
         </navigation-case>
 
-
         <navigation-case>
             <from-outcome>start</from-outcome>
             <to-view-id>/itembrowser.xhtml</to-view-id>
@@ -46,13 +45,9 @@
     -->
 
     <application>
-        <!-- Oracle ADF -->
         <default-render-kit-id>oracle.adf.core</default-render-kit-id>
-
-        <!-- JBoss Seam -->
-        <variable-resolver>org.jboss.seam.jsf.SeamVariableResolver</variable-resolver>
     </application>
-    
+
     <!-- Select one of the three standard persistence lifecycle models for the Seam application -->
     <lifecycle>
         <!--phase-listener>org.jboss.seam.jsf.SeamPhaseListener</phase-listener-->

Index: web.xml
===================================================================
RCS file: /cvsroot/hibernate/CaveatEmptor/HiA-SE/src/etc/webapp/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- web.xml	3 Feb 2006 00:49:33 -0000	1.2
+++ web.xml	25 Feb 2006 13:00:47 -0000	1.3
@@ -10,16 +10,35 @@
         <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
     </listener>
 
-    <!-- Needed to ensure safe tx cleanup when using Seam-managed sessions/persistence contexts -->
+    <!-- Propagate conversations across redirects -->
     <filter>
-        <filter-name>Seam Exception Filter</filter-name>
-        <filter-class>org.jboss.seam.servlet.SeamExceptionFilter</filter-class>
+        <filter-name>Seam Redirect Filter</filter-name>
+        <filter-class>org.jboss.seam.servlet.SeamRedirectFilter</filter-class>
     </filter>
+
     <filter-mapping>
-        <filter-name>Seam Exception Filter</filter-name>
-        <url-pattern>*.jsf</url-pattern>
+        <filter-name>Seam Redirect Filter</filter-name>
+        <url-pattern>*.seam</url-pattern>
     </filter-mapping>
 
+    <!-- 120 second conversation timeout -->
+    <context-param>
+        <param-name>org.jboss.seam.core.manager.conversationTimeout</param-name>
+        <param-value>120000</param-value>
+    </context-param>
+
+    <!-- Global JNDI name pattern for Embeddable EJB3 -->
+    <context-param>
+        <param-name>org.jboss.seam.core.init.jndiPattern</param-name>
+        <param-value>#{ejbName}/local</param-value>
+    </context-param>
+
+    <!-- Install the Embeddable EJB3 container -->
+    <context-param>
+        <param-name>org.jboss.seam.core.init.componentClasses</param-name>
+        <param-value>org.jboss.seam.core.Ejb</param-value>
+    </context-param>
+
     <!-- ############################# MyFaces #############################-->
     
     <listener>
@@ -47,7 +66,7 @@
 
     <servlet-mapping>
         <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.jsf</url-pattern>
+        <url-pattern>*.seam</url-pattern>
     </servlet-mapping>
 
     <!-- ############################# Oracle ADF #############################-->