[seam-commits] Seam SVN: r14587 - in branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test: resources-integration and 1 other directory.

[seam-commits at lists.jboss.org]

Author: maschmid
Date: 2012-04-16 10:49:07 -0400 (Mon, 16 Apr 2012)
New Revision: 14587

Added:
   branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-integration/web.xml
Modified:
   branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/BookingTest.java
   branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/Deployments.java
Log:
fix jpa seamtest


Modified: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/BookingTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/BookingTest.java	2012-04-16 14:28:04 UTC (rev 14586)
+++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/BookingTest.java	2012-04-16 14:49:07 UTC (rev 14587)
@@ -53,7 +53,7 @@
          {
             Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
             setValue("#{identity.username}", "gavin");
-            setValue("#{identity.password}", "foobar");            
+            setValue("#{identity.password}", "foobar");
             invokeAction("#{identity.login}");
          }
          

Modified: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/Deployments.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/Deployments.java	2012-04-16 14:28:04 UTC (rev 14586)
+++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/Deployments.java	2012-04-16 14:49:07 UTC (rev 14587)
@@ -8,8 +8,13 @@
 import java.io.File;
 
 public class Deployments {
-	public static WebArchive jpaDeployment() {
-		return ShrinkWrap.create(ZipImporter.class, "jboss-seam-jpa.war").importFrom(new File("../jpa-web/target/jboss-seam-jpa.war"))
-				.as(WebArchive.class);
-	}
+   public static WebArchive jpaDeployment() {
+      WebArchive web = ShrinkWrap.create(ZipImporter.class, "jboss-seam-jpa.war").importFrom(new File("../jpa-web/target/jboss-seam-jpa.war"))
+            .as(WebArchive.class);
+
+      web.delete("/WEB-INF/web.xml");
+      web.addAsWebInfResource("web.xml");
+      
+      return web;
+   }
 }

Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-integration/web.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-integration/web.xml	                        (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-integration/web.xml	2012-04-16 14:49:07 UTC (rev 14587)
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<web-app version="3.0"
+         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">
+         
+    <listener>
+        <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class>
+    </listener>
+
+</web-app>