[seam-commits] Seam SVN: r14590 - in branches/community/Seam_2_3/examples-ee6/icefaces: icefaces-tests/src/test/resources-integration and 2 other directories.

[seam-commits at lists.jboss.org]

Author: maschmid
Date: 2012-04-16 11:29:26 -0400 (Mon, 16 Apr 2012)
New Revision: 14590

Added:
   branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/resources-integration/web.xml
Modified:
   branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java
   branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java
   branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java
   branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml
   branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/WEB-INF/components.xml
Log:
fix icefaces seamtest


Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java	2012-04-16 15:15:00 UTC (rev 14589)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java	2012-04-16 15:29:26 UTC (rev 14590)
@@ -52,7 +52,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/icefaces/icefaces-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java	2012-04-16 15:15:00 UTC (rev 14589)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java	2012-04-16 15:29:26 UTC (rev 14590)
@@ -8,7 +8,6 @@
 import org.jboss.seam.core.Manager;
 import org.jboss.seam.example.booking.User;
 import org.jboss.seam.mock.JUnitSeamTest;
-import org.jboss.seam.mock.SeamTest;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;

Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java	2012-04-16 15:15:00 UTC (rev 14589)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java	2012-04-16 15:29:26 UTC (rev 14590)
@@ -3,12 +3,20 @@
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.importer.ZipImporter;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 
 import java.io.File;
 
 public class Deployments {
    public static EnterpriseArchive iceFacesDeployment() {
-      return ShrinkWrap.create(ZipImporter.class, "seam-icefaces.ear").importFrom(new File("../icefaces-ear/target/seam-icefaces.ear"))
+      EnterpriseArchive ear = ShrinkWrap.create(ZipImporter.class, "seam-icefaces.ear").importFrom(new File("../icefaces-ear/target/seam-icefaces.ear"))
               .as(EnterpriseArchive.class);
+      
+      // Install org.jboss.seam.mock.MockSeamListener
+      WebArchive web = ear.getAsType(WebArchive.class, "icefaces-web.war");
+      web.delete("/WEB-INF/web.xml");
+      web.addAsWebInfResource("web.xml");
+      
+      return ear;
    }
 }

Added: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/resources-integration/web.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/resources-integration/web.xml	                        (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/src/test/resources-integration/web.xml	2012-04-16 15:29:26 UTC (rev 14590)
@@ -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>

Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml	2012-04-16 15:15:00 UTC (rev 14589)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml	2012-04-16 15:29:26 UTC (rev 14590)
@@ -16,7 +16,7 @@
 
    <properties>
       <!-- filtering property for components.xml -->
-      <jndiPattern>java:app/seam-icefaces/#{ejbName}</jndiPattern>
+      <jndiPattern>java:app/icefaces-ejb/#{ejbName}</jndiPattern>
    </properties>
 
    <repositories>
@@ -39,6 +39,7 @@
          <groupId>org.jboss.seam</groupId>
          <artifactId>jboss-seam</artifactId>
          <type>ejb</type>
+         <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>commons-logging</groupId>

Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/WEB-INF/components.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/WEB-INF/components.xml	2012-04-16 15:15:00 UTC (rev 14589)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/WEB-INF/components.xml	2012-04-16 15:29:26 UTC (rev 14590)
@@ -20,4 +20,7 @@
 
     <security:identity authenticate-method="#{authenticator.authenticate}"/>
 
+    <component class="org.jboss.seam.transaction.EjbSynchronizations" jndi-name="java:app/jboss-seam/EjbSynchronizations"/>
+    <component class="org.jboss.seam.async.TimerServiceDispatcher" jndi-name="java:app/jboss-seam/TimerServiceDispatcher"/>
+
 </components>