[seam-commits] Seam SVN: r15462 - in branches/enterprise/WFK-2_1/jboss-seam-gen/dist: resources/WEB-INF and 1 other directory.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2013-03-20 08:36:24 -0400 (Wed, 20 Mar 2013)
New Revision: 15462

Added:
   branches/enterprise/WFK-2_1/jboss-seam-gen/dist/resources/WEB-INF/web-test.xml
Modified:
   branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml
   branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml
Log:
bz922051 added mocked web.xml into seam-gen generated tests

Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml	2013-03-20 12:36:14 UTC (rev 15461)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml	2013-03-20 12:36:24 UTC (rev 15462)
@@ -406,6 +406,8 @@
                 <exclude name="import*.sql"/>
                 <exclude name="${project.name}-*-ds.xml"/>
                 <exclude name="components-*.properties"/>
+    			<exclude name="WEB-INF/web-*.xml"/>
+    			<exclude name="WEB-INF/web.xml"/>            	
             </fileset>
             <fileset dir="${basedir}/view"/>
         </copy>
@@ -415,13 +417,13 @@
             file="${basedir}/resources/import-test.sql"/>
         <copy tofile="${test.dir}/components.properties"
             file="${basedir}/resources/components-test.properties"/>
+    	<copy tofile="${test.dir}/WEB-INF/web.xml"
+    	            file="${basedir}/resources/WEB-INF/web-test.xml"/>    	
         <copy todir="${test.dir}" flatten="true">
             <fileset dir="${src.test.dir}">
                 <include name="**/*Test.xml"/>
             </fileset>
-        </copy>
-        <copy tofile="${test.dir}/components.properties"
-            file="${basedir}/resources/components-test.properties"/>        
+        </copy>      
     </target>
     
     <target name="test" depends="buildtest" description="Run the tests">

Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml	2013-03-20 12:36:14 UTC (rev 15461)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml	2013-03-20 12:36:24 UTC (rev 15462)
@@ -430,6 +430,8 @@
 				<exclude name="import*.sql"/>
 				<exclude name="${project.name}-*-ds.xml"/>
 				<exclude name="components-*.properties"/>
+				<exclude name="WEB-INF/web-*.xml"/>
+				<exclude name="WEB-INF/web.xml"/>
 			</fileset>
 			<fileset dir="${basedir}/view"/>
 		</copy>
@@ -439,13 +441,13 @@
             file="${basedir}/resources/import-test.sql"/>
 		<copy tofile="${test.dir}/components.properties"
             file="${basedir}/resources/components-test.properties"/>
+		<copy tofile="${test.dir}/WEB-INF/web.xml"
+            file="${basedir}/resources/WEB-INF/web-test.xml"/>
 		<copy todir="${test.dir}" flatten="true">
 			<fileset dir="${src.test.dir}">
 				<include name="**/*Test.xml"/>
 			</fileset>
-		</copy>
-        <copy tofile="${test.dir}/components.properties"
-            file="${basedir}/resources/components-test.properties"/>		
+		</copy>		
 	</target>
 
 	<target name="test" depends="buildtest" description="Run the tests">

Added: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/resources/WEB-INF/web-test.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/resources/WEB-INF/web-test.xml	                        (rev 0)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/resources/WEB-INF/web-test.xml	2013-03-20 12:36:24 UTC (rev 15462)
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+   version="3.0">
+   
+   <!-- Seam MockListener for JUnitSeamTest usage -->
+   <listener>
+      <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class>
+   </listener>
+
+</web-app>