[seam-commits] Seam SVN: r15607 - in branches/enterprise/WFK-2_1/examples: booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test and 16 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Thu Oct 10 10:22:25 EDT 2013


Author: maschmid
Date: 2013-10-10 10:22:23 -0400 (Thu, 10 Oct 2013)
New Revision: 15607

Modified:
   branches/enterprise/WFK-2_1/examples/blog/blog-ejb/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java
   branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java
   branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/java/org/jboss/seam/example/contactlist/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/excel/excel-ejb/src/test/java/org/jboss/seam/example/excel/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/excel/excel-ejb/src/test/java/org/jboss/seam/example/excel/test/RenderTest.java
   branches/enterprise/WFK-2_1/examples/itext/itext-ejb/src/test/java/org/jboss/seam/example/itext/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/itext/itext-ejb/src/test/java/org/jboss/seam/example/itext/test/DocumentTest.java
   branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/test/java/org/jboss/seam/example/booking/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/mail/mail-ejb/src/test/java/org/jboss/seam/example/mail/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/messages/messages-ejb/src/test/java/org/jboss/seam/example/messages/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/nestedbooking/nestedbooking-ejb/src/main/java/org/jboss/seam/example/booking/HotelBookingAction.java
   branches/enterprise/WFK-2_1/examples/nestedbooking/nestedbooking-ejb/src/test/java/org/jboss/seam/example/nestedbooking/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/quartz/quartz-ejb/src/test/java/org/jboss/seam/example/quartz/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/restbay/restbay-ejb/src/test/java/org/jboss/seam/example/restbay/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java
   branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayArtistTest.java
   branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayDiscTest.java
   branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/EditArtistTest.java
   branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/EditDiscTest.java
   branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/LoginTest.java
   branches/enterprise/WFK-2_1/examples/seampay/seampay-ejb/src/test/java/org/jboss/seam/example/seampay/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/src/test/java/org/jboss/seam/example/seamspace/test/BlogTest.java
   branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/src/test/java/org/jboss/seam/example/seamspace/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/src/test/java/org/jboss/seam/example/seamspace/test/RegisterTest.java
   branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/CategoryResourceTest.java
   branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java
   branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/ResolvedTaskResourceQueryTest.java
   branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java
Log:
WFK2-84 rename test components.xml to components-test.xml


Modified: branches/enterprise/WFK-2_1/examples/blog/blog-ejb/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/blog/blog-ejb/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/blog/blog-ejb/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -61,7 +61,7 @@
                 
                 // manually copied from Web module, modified
                 .addAsWebInfResource("web.xml") // only contains MockSeamListener definition
-                .addAsWebInfResource("components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-blog
+                .addAsWebInfResource("components-test.xml", "components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-blog
 
                 // manually copied from EAR module
                 .addAsWebInfResource("jboss-deployment-structure.xml")

Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -21,7 +21,7 @@
                 .addAsWebInfResource("META-INF/ejb-jar.xml", "ejb-jar.xml")
                 .addAsResource("import.sql")
                 .addAsResource("persistence.xml", "META-INF/persistence.xml")
-                .addAsWebInfResource("components.xml")
+                .addAsWebInfResource("components-test.xml", "components.xml")
                 .addAsWebInfResource("jboss-deployment-structure.xml")
                 .addAsResource("seam.properties")
                 .addAsWebInfResource("web.xml")

Modified: branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -13,7 +13,6 @@
 import org.jboss.seam.framework.EntityHome;
 import org.jboss.seam.framework.EntityQuery;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/java/org/jboss/seam/example/contactlist/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/java/org/jboss/seam/example/contactlist/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/java/org/jboss/seam/example/contactlist/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -20,7 +20,7 @@
               .addAsWebInfResource("META-INF/ejb-jar.xml", "ejb-jar.xml")
               .addAsWebInfResource("import.sql", "classes/import.sql")
               .addAsWebInfResource("persistence.xml", "classes/META-INF/persistence.xml")
-              .addAsWebInfResource("components.xml", "components.xml")
+              .addAsWebInfResource("components-test.xml", "components.xml")
               .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml")
               .addAsWebInfResource("seam.properties", "classes/seam.properties")
               .addAsWebInfResource("web.xml", "web.xml")

Modified: branches/enterprise/WFK-2_1/examples/excel/excel-ejb/src/test/java/org/jboss/seam/example/excel/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/excel/excel-ejb/src/test/java/org/jboss/seam/example/excel/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/excel/excel-ejb/src/test/java/org/jboss/seam/example/excel/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -22,7 +22,7 @@
               .addAsWebInfResource("META-INF/ejb-jar.xml", "ejb-jar.xml")
               .addAsWebInfResource("persistence.xml", "classes/META-INF/persistence.xml")
               .addAsWebInfResource(new StringAsset("org.jboss.seam.mock.MockFacesContextFactory"), "classes/META-INF/services/javax.faces.context.FacesContextFactory")
-              .addAsWebInfResource("components.xml", "components.xml")
+              .addAsWebInfResource("components-test.xml", "components.xml")
               .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml")
               .addAsWebInfResource("seam.properties", "classes/seam.properties")
               .addAsWebInfResource("web.xml", "web.xml")

Modified: branches/enterprise/WFK-2_1/examples/excel/excel-ejb/src/test/java/org/jboss/seam/example/excel/test/RenderTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/excel/excel-ejb/src/test/java/org/jboss/seam/example/excel/test/RenderTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/excel/excel-ejb/src/test/java/org/jboss/seam/example/excel/test/RenderTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -14,7 +14,6 @@
 import org.jboss.seam.faces.Renderer;
 import org.jboss.seam.mock.JUnitSeamTest;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: branches/enterprise/WFK-2_1/examples/itext/itext-ejb/src/test/java/org/jboss/seam/example/itext/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/itext/itext-ejb/src/test/java/org/jboss/seam/example/itext/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/itext/itext-ejb/src/test/java/org/jboss/seam/example/itext/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -22,7 +22,7 @@
               .addAsWebInfResource("META-INF/ejb-jar.xml", "ejb-jar.xml")
               .addAsWebInfResource("persistence.xml", "classes/META-INF/persistence.xml")
               .addAsWebInfResource(new StringAsset("org.jboss.seam.mock.MockFacesContextFactory"), "classes/META-INF/services/javax.faces.context.FacesContextFactory")
-              .addAsWebInfResource("components.xml", "components.xml")
+              .addAsWebInfResource("components-test.xml", "components.xml")
               .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml")
               .addAsWebInfResource("seam.properties", "classes/seam.properties")
               .addAsWebInfResource("web.xml", "web.xml")

Modified: branches/enterprise/WFK-2_1/examples/itext/itext-ejb/src/test/java/org/jboss/seam/example/itext/test/DocumentTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/itext/itext-ejb/src/test/java/org/jboss/seam/example/itext/test/DocumentTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/itext/itext-ejb/src/test/java/org/jboss/seam/example/itext/test/DocumentTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -11,7 +11,6 @@
 import org.jboss.seam.mock.JUnitSeamTest;
 import org.jboss.seam.pdf.ui.UIDocument;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/test/java/org/jboss/seam/example/booking/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/test/java/org/jboss/seam/example/booking/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/test/java/org/jboss/seam/example/booking/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -25,7 +25,7 @@
                 .addAsWebInfResource("import.sql", "classes/import.sql")
                 .addAsWebInfResource("seam.properties", "classes/seam.properties")
                 .addAsWebInfResource("persistence.xml", "classes/META-INF/persistence.xml")
-                .addAsWebInfResource("components.xml")
+                .addAsWebInfResource("components-test.xml", "components.xml")
                 
                 // copy files from src/main/webapp to test-archive's WEB-INF
                 .addAsWebInfResource(new File(webInf, "jboss-deployment-structure.xml"))

Modified: branches/enterprise/WFK-2_1/examples/mail/mail-ejb/src/test/java/org/jboss/seam/example/mail/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/mail/mail-ejb/src/test/java/org/jboss/seam/example/mail/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/mail/mail-ejb/src/test/java/org/jboss/seam/example/mail/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -20,7 +20,7 @@
       return ShrinkWrap.create(WebArchive.class, "seam-mail.war")
               .addPackage(MailExample.class.getPackage())
               .addAsWebInfResource("META-INF/ejb-jar.xml", "ejb-jar.xml")
-              .addAsWebInfResource("components.xml", "components.xml")
+              .addAsWebInfResource("components-test.xml", "components.xml")
               .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml")
               .addAsWebInfResource("seam.properties", "classes/seam.properties")
               .addAsWebInfResource("web.xml", "web.xml")

Modified: branches/enterprise/WFK-2_1/examples/messages/messages-ejb/src/test/java/org/jboss/seam/example/messages/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/messages/messages-ejb/src/test/java/org/jboss/seam/example/messages/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/messages/messages-ejb/src/test/java/org/jboss/seam/example/messages/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -19,7 +19,7 @@
       return ShrinkWrap.create(WebArchive.class, "seam-messages.war")
               .addPackage(Message.class.getPackage())
               .addAsWebInfResource("META-INF/ejb-jar.xml", "ejb-jar.xml")
-              .addAsWebInfResource("components.xml", "components.xml")
+              .addAsWebInfResource("components-test.xml", "components.xml")
               .addAsWebInfResource("persistence.xml", "classes/META-INF/persistence.xml")
               .addAsWebInfResource("import.sql", "classes/import.sql")
               .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml")

Modified: branches/enterprise/WFK-2_1/examples/nestedbooking/nestedbooking-ejb/src/main/java/org/jboss/seam/example/booking/HotelBookingAction.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/nestedbooking/nestedbooking-ejb/src/main/java/org/jboss/seam/example/booking/HotelBookingAction.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/nestedbooking/nestedbooking-ejb/src/main/java/org/jboss/seam/example/booking/HotelBookingAction.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -14,7 +14,6 @@
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Out;
 import org.jboss.seam.annotations.security.Restrict;
-import org.jboss.seam.core.Conversation;
 import org.jboss.seam.core.Events;
 import org.jboss.seam.faces.FacesMessages;
 import org.jboss.seam.log.Log;

Modified: branches/enterprise/WFK-2_1/examples/nestedbooking/nestedbooking-ejb/src/test/java/org/jboss/seam/example/nestedbooking/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/nestedbooking/nestedbooking-ejb/src/test/java/org/jboss/seam/example/nestedbooking/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/nestedbooking/nestedbooking-ejb/src/test/java/org/jboss/seam/example/nestedbooking/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -30,7 +30,7 @@
                 .addAsWebInfResource("jboss-deployment-structure.xml")
                 
                 // manually copied from WAR
-                .addAsWebInfResource("components.xml")
+                .addAsWebInfResource("components-test.xml", "components.xml")
                 .addAsLibraries(libs);
     }
 }

Modified: branches/enterprise/WFK-2_1/examples/quartz/quartz-ejb/src/test/java/org/jboss/seam/example/quartz/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/quartz/quartz-ejb/src/test/java/org/jboss/seam/example/quartz/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/quartz/quartz-ejb/src/test/java/org/jboss/seam/example/quartz/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -28,7 +28,7 @@
                .addPackage(AsynchronousTest.class.getPackage())
                .addPackage(PaymentProcessor.class.getPackage())
                .addAsWebInfResource("META-INF/ejb-jar.xml", "ejb-jar.xml")
-               .addAsWebInfResource("components.xml")
+               .addAsWebInfResource("components-test.xml", "components.xml")
                .addAsResource("persistence.xml", "META-INF/persistence.xml")
                .addAsResource("import.sql")
                .addAsWebInfResource("jboss-deployment-structure.xml")

Modified: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -20,7 +20,7 @@
       return ShrinkWrap.create(WebArchive.class, "seam-registration.war")
               .addPackage(RegisterAction.class.getPackage())
               .addAsWebInfResource("META-INF/ejb-jar.xml", "ejb-jar.xml")
-              .addAsWebInfResource("components.xml")
+              .addAsWebInfResource("components-test.xml", "components.xml")
               .addAsResource("persistence.xml", "META-INF/persistence.xml")
               .addAsWebInfResource("jboss-deployment-structure.xml")
               .addAsResource("seam.properties")

Modified: branches/enterprise/WFK-2_1/examples/restbay/restbay-ejb/src/test/java/org/jboss/seam/example/restbay/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/restbay/restbay-ejb/src/test/java/org/jboss/seam/example/restbay/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/restbay/restbay-ejb/src/test/java/org/jboss/seam/example/restbay/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -33,7 +33,7 @@
 
                 // manually copied from Web module, modified
                 .addAsWebInfResource("web.xml") // only contains MockSeamListener definition
-                .addAsWebInfResource("components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-restbay
+                .addAsWebInfResource("components-test.xml", "components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-restbay
 
                 // manually copied from EAR module
                 .addAsWebInfResource("jboss-deployment-structure.xml")

Modified: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -11,11 +11,9 @@
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.example.seambay.Auction;
 import org.jboss.seam.example.seambay.Category;
-import org.jboss.seam.mock.AbstractSeamTest.FacesRequest;
 import org.jboss.seam.mock.JUnitSeamTest;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.junit.Test;
@@ -55,7 +53,7 @@
 
                 // manually copied from Web module, modified
                 .addAsWebInfResource("web.xml") // only contains MockSeamListener definition
-                .addAsWebInfResource("components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-blog
+                .addAsWebInfResource("components-test.xml", "components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-blog
 
                 // manually copied from EAR module
                 .addAsWebInfResource("jboss-deployment-structure.xml")

Modified: branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -1,7 +1,6 @@
 package org.jboss.seam.example.seamdiscs.test;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 
@@ -42,7 +41,7 @@
 
                 // manually copied from Web module, modified
                 .addAsWebInfResource("web.xml") // only contains MockSeamListener definition
-                .addAsWebInfResource("components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-restbay
+                .addAsWebInfResource("components-test.xml", "components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-restbay
 
                 // manually copied from EAR module
                 .addAsWebInfResource("jboss-deployment-structure.xml")

Modified: branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayArtistTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayArtistTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayArtistTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -21,8 +21,6 @@
 import org.jboss.seam.example.seamdiscs.model.Band;
 import org.jboss.seam.mock.DBJUnitSeamTest;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.runner.RunWith;
 import org.junit.Test;
 

Modified: branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayDiscTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayDiscTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayDiscTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -21,8 +21,6 @@
 import org.jboss.seam.example.seamdiscs.model.Disc;
 import org.jboss.seam.mock.DBJUnitSeamTest;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.runner.RunWith;
 import org.junit.Test;
 

Modified: branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/EditArtistTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/EditArtistTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/EditArtistTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -25,8 +25,6 @@
 import org.jboss.seam.example.seamdiscs.model.BandMember;
 import org.jboss.seam.mock.DBJUnitSeamTest;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.runner.RunWith;
 import org.junit.Test;
 

Modified: branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/EditDiscTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/EditDiscTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/EditDiscTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -20,8 +20,6 @@
 import org.jboss.seam.example.seamdiscs.model.Disc;
 import org.jboss.seam.mock.DBJUnitSeamTest;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.runner.RunWith;
 import org.junit.Test;
 

Modified: branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/LoginTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/LoginTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/seamdiscs/seamdiscs-ejb/src/test/java/org/jboss/seam/example/seamdiscs/test/LoginTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -10,8 +10,6 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.mock.DBJUnitSeamTest;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.runner.RunWith;
 import org.junit.Test;
 

Modified: branches/enterprise/WFK-2_1/examples/seampay/seampay-ejb/src/test/java/org/jboss/seam/example/seampay/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seampay/seampay-ejb/src/test/java/org/jboss/seam/example/seampay/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/seampay/seampay-ejb/src/test/java/org/jboss/seam/example/seampay/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -30,7 +30,7 @@
 
                 // manually copied from Web module, modified
                 .addAsWebInfResource("web.xml") // only contains MockSeamListener definition
-                .addAsWebInfResource("components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-seampay
+                .addAsWebInfResource("components-test.xml", "components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-seampay
 
                 // manually copied from EAR module
                 .addAsWebInfResource("jboss-deployment-structure.xml")

Modified: branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/src/test/java/org/jboss/seam/example/seamspace/test/BlogTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/src/test/java/org/jboss/seam/example/seamspace/test/BlogTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/src/test/java/org/jboss/seam/example/seamspace/test/BlogTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -7,8 +7,6 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.mock.JUnitSeamTest;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/src/test/java/org/jboss/seam/example/seamspace/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/src/test/java/org/jboss/seam/example/seamspace/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/src/test/java/org/jboss/seam/example/seamspace/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -5,7 +5,6 @@
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 
 import java.io.File;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
 
 public class Deployments {
    public static WebArchive seamSpaceDeployment() {
@@ -33,7 +32,7 @@
 
                 // manually copied from Web module, modified
                 .addAsWebInfResource("web.xml") // only contains MockSeamListener definition
-                .addAsWebInfResource("components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-seampay
+                .addAsWebInfResource("components-test.xml", "components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-seampay
 
                 // manually copied from EAR module
                 .addAsWebInfResource("jboss-deployment-structure.xml")

Modified: branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/src/test/java/org/jboss/seam/example/seamspace/test/RegisterTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/src/test/java/org/jboss/seam/example/seamspace/test/RegisterTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/src/test/java/org/jboss/seam/example/seamspace/test/RegisterTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -10,7 +10,6 @@
 import org.jboss.seam.core.Manager;
 import org.jboss.seam.mock.JUnitSeamTest;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/CategoryResourceTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/CategoryResourceTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/CategoryResourceTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -32,8 +32,6 @@
 import org.jboss.seam.mock.JUnitSeamTest;
 import org.jboss.seam.mock.ResourceRequestEnvironment;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;

Modified: branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -1,7 +1,6 @@
 package org.jboss.seam.example.tasks.test;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.importer.ZipImporter;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 
@@ -31,7 +30,7 @@
 
                 // manually copied from Web module, modified
                 .addAsWebInfResource("web.xml") // only contains MockSeamListener definition
-                .addAsWebInfResource("components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-tasks
+                .addAsWebInfResource("components-test.xml", "components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-tasks
 
                 // manually copied from EAR module
                 .addAsWebInfResource("jboss-deployment-structure.xml")

Modified: branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/ResolvedTaskResourceQueryTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/ResolvedTaskResourceQueryTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/ResolvedTaskResourceQueryTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -32,7 +32,6 @@
 import org.jboss.seam.mock.JUnitSeamTest;
 import org.jboss.seam.mock.ResourceRequestEnvironment;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

Modified: branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java	2013-10-10 11:10:58 UTC (rev 15606)
+++ branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java	2013-10-10 14:22:23 UTC (rev 15607)
@@ -32,7 +32,6 @@
 import org.jboss.seam.mock.JUnitSeamTest;
 import org.jboss.seam.mock.ResourceRequestEnvironment;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;



More information about the seam-commits mailing list