Author: rsmeral Date: 2013-06-04 14:02:46 -0400 (Tue, 04 Jun 2013) New Revision: 15546 Removed: branches/enterprise/WFK-2_1/build/build.properties branches/enterprise/WFK-2_1/examples/excel/excel-tests/ branches/enterprise/WFK-2_1/examples/openid/openid-tests/ 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/BookingTest.java branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/LoginTest.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/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/DocumentTest.java branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/pom.xml branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java Log: Examples: clean up tests Deleted: branches/enterprise/WFK-2_1/build/build.properties =================================================================== --- branches/enterprise/WFK-2_1/build/build.properties 2013-06-04 15:42:29 UTC (rev 15545) +++ branches/enterprise/WFK-2_1/build/build.properties 2013-06-04 18:02:46 UTC (rev 15546) @@ -1,2 +0,0 @@ -complete.version=2.3.1.Final-redhat-2 -version=2.3 \ No newline at end of file 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-06-04 15:42:29 UTC (rev 15545) +++ branches/enterprise/WFK-2_1/examples/blog/blog-ejb/src/test/java/org/jboss/seam/example/blog/test/BlogTest.java 2013-06-04 18:02:46 UTC (rev 15546) @@ -67,8 +67,6 @@ .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml") .addAsLibraries(libs); - war.addClasses(BlogTest.class); - return war; } Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java 2013-06-04 15:42:29 UTC (rev 15545) +++ branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java 2013-06-04 18:02:46 UTC (rev 15546) @@ -39,11 +39,7 @@ @OverProtocol("Servlet 3.0") public static Archive<?> createDeployment() { - WebArchive war = Deployments.bookingDeployment(); - - war.addClasses(BookingTest.class); - - return war; + return Deployments.bookingDeployment(); } @Before Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java 2013-06-04 15:42:29 UTC (rev 15545) +++ branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java 2013-06-04 18:02:46 UTC (rev 15546) @@ -29,11 +29,7 @@ @OverProtocol("Servlet 3.0") public static Archive<?> createDeployment() { - WebArchive war = Deployments.bookingDeployment(); - - war.addClasses(ChangePasswordTest.class); - - return war; + return Deployments.bookingDeployment(); } @Before Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2013-06-04 15:42:29 UTC (rev 15545) +++ branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2013-06-04 18:02:46 UTC (rev 15546) @@ -27,11 +27,7 @@ @OverProtocol("Servlet 3.0") public static Archive<?> createDeployment() { - WebArchive war = Deployments.bookingDeployment(); - - war.addClasses(LoginTest.class); - - return war; + return Deployments.bookingDeployment(); } @Before 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-06-04 15:42:29 UTC (rev 15545) +++ branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java 2013-06-04 18:02:46 UTC (rev 15546) @@ -26,10 +26,7 @@ @OverProtocol("Servlet 3.0") public static Archive<?> createDeployment() { - WebArchive web = Deployments.contactListDeployment(); - web.addClasses(ContactListTest.class); - - return web; + return Deployments.contactListDeployment(); } @Test 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-06-04 15:42:29 UTC (rev 15545) +++ branches/enterprise/WFK-2_1/examples/excel/excel-ejb/src/test/java/org/jboss/seam/example/excel/test/RenderTest.java 2013-06-04 18:02:46 UTC (rev 15546) @@ -33,9 +33,7 @@ @OverProtocol("Servlet 3.0") public static Archive<?> createDeployment() { - - WebArchive web = Deployments.excelDeployment(); - return web; + return Deployments.excelDeployment(); } @Test 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-06-04 15:42:29 UTC (rev 15545) +++ branches/enterprise/WFK-2_1/examples/itext/itext-ejb/src/test/java/org/jboss/seam/example/itext/test/DocumentTest.java 2013-06-04 18:02:46 UTC (rev 15546) @@ -26,9 +26,7 @@ @OverProtocol("Servlet 3.0") public static Archive<?> createDeployment() { - - WebArchive web = Deployments.itextDeployment(); - return web; + return Deployments.itextDeployment(); } @Test Modified: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/pom.xml 2013-06-04 15:42:29 UTC (rev 15545) +++ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/pom.xml 2013-06-04 18:02:46 UTC (rev 15546) @@ -18,6 +18,7 @@ <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> + <scope>provided</scope> </dependency> <dependency> <groupId>org.hibernate.javax.persistence</groupId> 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-06-04 15:42:29 UTC (rev 15545) +++ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java 2013-06-04 18:02:46 UTC (rev 15546) @@ -31,9 +31,7 @@ { File[] libs = Maven.resolver().loadPomFromFile("pom.xml") .importCompileAndRuntimeDependencies() - // force resolve jboss-seam, because it is provided-scoped in the pom, but we need it bundled in the WAR - .resolve("org.jboss.seam:jboss-seam") - .withTransitivity().asFile(); + .resolve().withTransitivity().asFile(); WebArchive war = ShrinkWrap.create(WebArchive.class, "seam-seambay.war") .addPackages(true, "org.jboss.seam.example.seambay")