Seam SVN: r15552 - branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-05 10:15:38 -0400 (Wed, 05 Jun 2013)
New Revision: 15552
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:
bz922049 using arquillian.xml for seam-gen configuration 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-06-05 11:34:38 UTC (rev 15551)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml 2013-06-05 14:15:38 UTC (rev 15552)
@@ -409,6 +409,7 @@
<exclude name="WEB-INF/web.xml"/>
</fileset>
<fileset dir="${basedir}/view"/>
+ <fileset dir="${basedir}/resources-test"/>
</copy>
<copy tofile="${test.dir}/META-INF/persistence.xml"
file="${basedir}/resources/META-INF/persistence-test.xml"/>
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-06-05 11:34:38 UTC (rev 15551)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml 2013-06-05 14:15:38 UTC (rev 15552)
@@ -440,6 +440,7 @@
<exclude name="WEB-INF/web.xml"/>
</fileset>
<fileset dir="${basedir}/view"/>
+ <fileset dir="${basedir}/resources-test"/>
</copy>
<copy tofile="${test.dir}/META-INF/persistence.xml"
file="${basedir}/resources/META-INF/persistence-test.xml"/>
11 years, 5 months
- 1
- 0
Seam SVN: r15551 - branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2013-06-05 07:34:38 -0400 (Wed, 05 Jun 2013)
New Revision: 15551
Modified:
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java
Log:
fix ExceptionRedirectTest
Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java 2013-06-05 11:27:19 UTC (rev 15550)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java 2013-06-05 11:34:38 UTC (rev 15551)
@@ -18,6 +18,7 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.test.integration.Deployments;
import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -46,8 +47,9 @@
public static Archive<?> createDeployment()
{
// This is a client test, use a real (non-mocked) Seam deployment
- return Deployments.realSeamDeployment()
- .addClasses(TestComponent.class, PageScopedComponent.class)
+ WebArchive war= Deployments.realSeamDeployment();
+ war.delete("WEB-INF/pages.xml");
+ war.addClasses(TestComponent.class, PageScopedComponent.class)
.addAsWebResource(new StringAsset(
"<html xmlns=\"http://www.w3.org/1999/xhtml\"" +
" xmlns:h=\"http://java.sun.com/jsf/html\"" +
@@ -79,10 +81,12 @@
"<pages xmlns=\"http://jboss.org/schema/seam/pages\"" +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
" xsi:schemaLocation=\"http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd\">\n" +
- "<exception class=\"org.jboss.seam.test.integration.faces.ExceptionRedirectTest.TestException\">" +
+ "<exception class=\"org.jboss.seam.test.integration.faces.ExceptionRedirectTest$TestException\">" +
"<redirect view-id=\"/error.xhtml\">"+
"</redirect>"+
"</exception></pages>"), "pages.xml");
+
+ return war;
}
public static class TestException extends Exception
11 years, 5 months
- 1
- 0
Seam SVN: r15550 - branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2013-06-05 07:27:19 -0400 (Wed, 05 Jun 2013)
New Revision: 15550
Modified:
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java
Log:
attempting to fix ErrorHandlingTest
Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java 2013-06-05 11:13:46 UTC (rev 15549)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java 2013-06-05 11:27:19 UTC (rev 15550)
@@ -17,6 +17,7 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.test.integration.Deployments;
import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,8 +43,9 @@
public static Archive<?> createDeployment()
{
// This is a client test, use a real (non-mocked) Seam deployment
- return Deployments.realSeamDeployment()
- .addClasses(TestComponent.class, TestException.class)
+ WebArchive war = Deployments.realSeamDeployment();
+ war.delete("WEB-INF/pages.xml");
+ war.addClasses(TestComponent.class, TestException.class)
.addAsWebResource(new StringAsset(
"<html xmlns=\"http://www.w3.org/1999/xhtml\"" +
" xmlns:h=\"http://java.sun.com/jsf/html\"" +
@@ -74,10 +76,12 @@
"<pages xmlns=\"http://jboss.org/schema/seam/pages\"" +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
" xsi:schemaLocation=\"http://jboss.org/schema/seam/pages http://jboss.org/schema/seam/pages-2.3.xsd\">\n" +
- "<exception class=\"org.jboss.seam.test.integration.faces.ErrorHandlingTest.TestException\">" +
+ "<exception class=\"org.jboss.seam.test.integration.faces.ErrorHandlingTest$TestException\">" +
"<redirect view-id=\"/error.xhtml\">"+
"</redirect>"+
"</exception></pages>"), "pages.xml");
+
+ return war;
}
public static class TestException extends Exception
11 years, 5 months
- 1
- 0
Seam SVN: r15549 - branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-05 07:13:46 -0400 (Wed, 05 Jun 2013)
New Revision: 15549
Modified:
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java
Log:
fixed pages.xml for tests
Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java 2013-06-05 11:13:34 UTC (rev 15548)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ErrorHandlingTest.java 2013-06-05 11:13:46 UTC (rev 15549)
@@ -77,7 +77,7 @@
"<exception class=\"org.jboss.seam.test.integration.faces.ErrorHandlingTest.TestException\">" +
"<redirect view-id=\"/error.xhtml\">"+
"</redirect>"+
- "</exception>"), "pages.xml");
+ "</exception></pages>"), "pages.xml");
}
public static class TestException extends Exception
Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java 2013-06-05 11:13:34 UTC (rev 15548)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java 2013-06-05 11:13:46 UTC (rev 15549)
@@ -82,7 +82,7 @@
"<exception class=\"org.jboss.seam.test.integration.faces.ExceptionRedirectTest.TestException\">" +
"<redirect view-id=\"/error.xhtml\">"+
"</redirect>"+
- "</exception>"), "pages.xml");
+ "</exception></pages>"), "pages.xml");
}
public static class TestException extends Exception
11 years, 5 months
- 1
- 0
Seam SVN: r15548 - in branches/enterprise/WFK-2_1: bom and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-05 07:13:34 -0400 (Wed, 05 Jun 2013)
New Revision: 15548
Modified:
branches/enterprise/WFK-2_1/bom/pom.xml
branches/enterprise/WFK-2_1/pom.xml
Log:
updated shrinkwrap/arq versions
Modified: branches/enterprise/WFK-2_1/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/bom/pom.xml 2013-06-04 18:04:48 UTC (rev 15547)
+++ branches/enterprise/WFK-2_1/bom/pom.xml 2013-06-05 11:13:34 UTC (rev 15548)
@@ -36,7 +36,6 @@
<version.drools>5.3.0.BRMS</version.drools>
<version.resteasy>2.3.6.Final-redhat-1</version.resteasy>
<version.spring>3.1.4.RELEASE</version.spring>
- <version.jbossas7>7.2.0.Final-redhat-8</version.jbossas7>
<version.jsf2>2.1.19-redhat-1</version.jsf2>
<!-- <version.webdriver>0.9.7376</version.webdriver> -->
<version.infinispan>5.1.8.Final-redhat-1</version.infinispan>
@@ -89,20 +88,7 @@
<version>3.2.0.Final-redhat-2</version>
</dependency>
- <!-- not supported shrinkwrap artifacts -->
<dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>2.0.0-beta-3</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-api-maven</artifactId>
- <version>2.0.0-beta-3</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>${version.seam}</version>
Modified: branches/enterprise/WFK-2_1/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/pom.xml 2013-06-04 18:04:48 UTC (rev 15547)
+++ branches/enterprise/WFK-2_1/pom.xml 2013-06-05 11:13:34 UTC (rev 15548)
@@ -48,7 +48,7 @@
<version.seam>2.3.1.Final-redhat-2</version.seam>
<version.testng>5.14.10</version.testng>
<version.jacoco>0.5.8.201207111220</version.jacoco>
- <version.jbossas7>7.1.1.Final</version.jbossas7>
+ <version.jbossas7>7.2.0.Final</version.jbossas7>
<version.emma>2.0.5312</version.emma>
<version.junit>4.8.2</version.junit>
<version.richfaces>4.3.1.Final-redhat-2</version.richfaces>
11 years, 5 months
- 1
- 0
Seam SVN: r15547 - branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-04 14:04:48 -0400 (Tue, 04 Jun 2013)
New Revision: 15547
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml
Log:
bz967549, JBSEAM-5112 excluding jboss-deployment-structure.xml from war in EAR type project
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-06-04 18:02:46 UTC (rev 15546)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml 2013-06-04 18:04:48 UTC (rev 15547)
@@ -216,6 +216,7 @@
<include name="*.*"/>
<include name="lib/*.*"/>
<exclude name="web.xml"/>
+ <exclude name="jboss-deployment-structure.xml"/>
</fileset>
</copy>
<copy todir="${war.dir}/WEB-INF/lib">
11 years, 5 months
- 1
- 0
Seam SVN: r15546 - in branches/enterprise/WFK-2_1: examples/blog/blog-ejb/src/test/java/org/jboss/seam/example/blog/test and 8 other directories.
by seam-commits＠lists.jboss.org
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")
11 years, 5 months
- 1
- 0
Seam SVN: r15545 - in branches/enterprise/WFK-2_1/examples: blog and 25 other directories.
by seam-commits＠lists.jboss.org
Author: rsmeral
Date: 2013-06-04 11:42:29 -0400 (Tue, 04 Jun 2013)
New Revision: 15545
Modified:
branches/enterprise/WFK-2_1/examples/blog/pom.xml
branches/enterprise/WFK-2_1/examples/booking/pom.xml
branches/enterprise/WFK-2_1/examples/contactlist/pom.xml
branches/enterprise/WFK-2_1/examples/excel/excel-ejb/pom.xml
branches/enterprise/WFK-2_1/examples/excel/pom.xml
branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml
branches/enterprise/WFK-2_1/examples/groovybooking/pom.xml
branches/enterprise/WFK-2_1/examples/hibernate/pom.xml
branches/enterprise/WFK-2_1/examples/itext/pom.xml
branches/enterprise/WFK-2_1/examples/jee6/pom.xml
branches/enterprise/WFK-2_1/examples/jpa/pom.xml
branches/enterprise/WFK-2_1/examples/mail/pom.xml
branches/enterprise/WFK-2_1/examples/messages/pom.xml
branches/enterprise/WFK-2_1/examples/nestedbooking/pom.xml
branches/enterprise/WFK-2_1/examples/openid/pom.xml
branches/enterprise/WFK-2_1/examples/pom.xml
branches/enterprise/WFK-2_1/examples/quartz/pom.xml
branches/enterprise/WFK-2_1/examples/quartz/quartz-ear/pom.xml
branches/enterprise/WFK-2_1/examples/registration/pom.xml
branches/enterprise/WFK-2_1/examples/restbay/pom.xml
branches/enterprise/WFK-2_1/examples/seambay/pom.xml
branches/enterprise/WFK-2_1/examples/seamdiscs/pom.xml
branches/enterprise/WFK-2_1/examples/seampay/pom.xml
branches/enterprise/WFK-2_1/examples/seamspace/pom.xml
branches/enterprise/WFK-2_1/examples/spring/pom.xml
branches/enterprise/WFK-2_1/examples/tasks/pom.xml
branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/pom.xml
Log:
Clean examples pom, update SWR to 2.0.0-beta-5 + minor fixes
Modified: branches/enterprise/WFK-2_1/examples/blog/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/blog/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/blog/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -30,7 +30,7 @@
<version.commons.logging>1.1.1</version.commons.logging>
<version.slf4j>1.6.1</version.slf4j>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.clean.plugin>2.5</version.clean.plugin>
Modified: branches/enterprise/WFK-2_1/examples/booking/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/booking/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/booking/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -22,7 +22,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/contactlist/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/contactlist/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/contactlist/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -32,7 +32,7 @@
<!--<maven.profiles>custom,profile</maven.profiles> -->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/excel/excel-ejb/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/excel/excel-ejb/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/excel/excel-ejb/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -95,10 +95,6 @@
<artifactId>jboss-seam-pdf</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-rss</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.el</groupId>
<artifactId>jboss-el-api_2.2_spec</artifactId>
</dependency>
Modified: branches/enterprise/WFK-2_1/examples/excel/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/excel/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/excel/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -31,7 +31,7 @@
<!--<maven.profiles>custom,profile</maven.profiles> -->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -69,10 +69,6 @@
<artifactId>groovy-all</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </dependency>
- <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<exclusions>
Modified: branches/enterprise/WFK-2_1/examples/groovybooking/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/groovybooking/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/groovybooking/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -18,7 +18,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/hibernate/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/hibernate/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/hibernate/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -23,7 +23,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/itext/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/itext/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/itext/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -30,7 +30,7 @@
<!--<maven.profiles>custom,profile</maven.profiles> -->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/jee6/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/jee6/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/jee6/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -23,7 +23,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/jpa/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/jpa/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/jpa/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -22,7 +22,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/mail/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/mail/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/mail/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -25,7 +25,7 @@
<!--<maven.profiles>custom,profile</maven.profiles> -->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/messages/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/messages/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/messages/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -30,7 +30,7 @@
<!--<maven.profiles>custom,profile</maven.profiles> -->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/nestedbooking/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/nestedbooking/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/nestedbooking/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -22,7 +22,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/openid/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/openid/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/openid/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -30,7 +30,7 @@
<!--<maven.profiles>custom,profile</maven.profiles> -->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -43,39 +43,10 @@
</organization>
<properties>
- <!-- Excluded TestNG groups (ex: slow annotated tests won't run during
- the test phase) -->
- <tests.excludedGroups>slow</tests.excludedGroups>
- <guava.version>12.0</guava.version>
- <richfaces.version>4.3.1.Final-redhat-1</richfaces.version>
- <slf4j.version>1.6.1</slf4j.version>
- <version.jbossas7>7.1.1.Final</version.jbossas7>
+
+
<version.jacoco>0.5.8.201207111220</version.jacoco>
- <!-- dependencies for functional tests -->
- <ant.junit.version>1.6.2</ant.junit.version>
- <ftest.version.discriminator/>
- <selenium.browser>*firefoxproxy</selenium.browser>
- <selenium.browser.url>http://localhost:8080</selenium.browser.url>
- <selenium.browser.cluster.url>http://localhost:8180</selenium.browser.cluster.url>
- <selenium.server.port>14444</selenium.server.port>
- <selenium.server.host>localhost</selenium.server.host>
- <selenium.speed>0</selenium.speed>
- <selenium.timeout>30000</selenium.timeout>
- <selenium.debug>false</selenium.debug>
- <selenium.log.dir>${project.build.directory}/ftest-logs</selenium.log.dir>
- <selenium.output.dir>${project.build.directory}/ftest-output</selenium.output.dir>
- <application.deploy.timeout>300</application.deploy.timeout>
- <browserSessionReuse>true</browserSessionReuse>
- <ftest.resources.dir>src/test/resources-ftest</ftest.resources.dir>
- <context.host>localhost</context.host>
- <example.context.path>/${project.build.finalName}/</example.context.path>
- <jboss.master.configuration>${env.JBOSS_HOME}/server/all</jboss.master.configuration>
- <jboss.home>${env.JBOSS_HOME}</jboss.home>
- <jboss.domain>default</jboss.domain>
- <catalina.home>${env.CATALINA_HOME}</catalina.home>
- <xml.namespace.aware>false</xml.namespace.aware>
-
<!-- ************** -->
<!-- Build settings -->
<!-- ************** -->
@@ -123,169 +94,7 @@
<module>tasks</module>
<module>ui</module>
</modules>
-
- <build>
- <defaultGoal>package</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
- <configuration>
- <excludedGroups>${tests.excludedGroups}</excludedGroups>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <version>2.7</version>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- </plugin>
-
- <!--This plugin's configuration is used to store Eclipse
- m2e settings only. It has no influence on the Maven build itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>unpack</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>false</runOnIncremental>
- </execute>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.as.plugins</groupId>
- <artifactId>jboss-as-maven-plugin</artifactId>
- <version>7.3.Final</version>
- <executions>
- <execution>
- <phase></phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-ejb-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <ejbVersion>3.0</ejbVersion>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
- <inherited>true</inherited>
- <configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- <warName>${project.build.finalName}</warName>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>bom</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- <dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
- <version>${richfaces.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- <!-- common provided scope dependencies -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-components-ui</artifactId>
- <version>${richfaces.version}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.core</groupId>
- <artifactId>richfaces-core-impl</artifactId>
- <version>${richfaces.version}</version>
- </dependency>
-
- <!-- guava is required by richfaces -->
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
-
- <!-- common test scope dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- <version>2.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-impl</artifactId>
- <version>2.0.1</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
+
<profiles>
<profile>
<id>distribution</id>
@@ -313,535 +122,6 @@
</profile>
<profile>
- <id>integration-tests</id>
- <activation>
- <property>
- <name>arquillian</name>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <!-- Needed as we have both junit and testng -->
- <testNGArtifactName>none:none</testNGArtifactName>
- <!-- exclude selenium tests -->
- <excludes>
- <exclude>**/selenium/*</exclude>
- <exclude>**/webdriver/*</exclude>
- <exclude>**/xml/*</exclude>
- </excludes>
- <systemProperties>
- <!-- used by the jbossas-managed-7 profile in arquillian.xml for the jbossHome property-->
- <version.jbossas7>${version.jbossas7}</version.jbossas7>
- <jacoco.agent>${jacoco.agent}</jacoco.agent>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
-
- <profile>
- <id>arq-jbossas-7-managed</id>
- <activation>
- <property>
- <name>arquillian</name>
- <value>jbossas-managed-7</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-arquillian-container-managed</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>arq-jbossas-7-remote</id>
- <activation>
- <property>
- <name>arquillian</name>
- <value>jbossas-remote-7</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-arquillian-container-remote</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>ftest-jbossas</id>
- <properties>
- <testng.suite>testng.xml</testng.suite>
- <container>jbossas7</container>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-server</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!-- skip unit tests when running functional tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>start-selenium</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <background>true</background>
- <port>${selenium.server.port}</port>
- <logOutput>true</logOutput>
- <logFile>${selenium.log.dir}/selenium-server.log</logFile>
- <browserSideLog>${selenium.debug}</browserSideLog>
- <debug>${selenium.debug}</debug>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- <version>2.4.3-alpha-1</version>
- <configuration>
- <junitArtifactName>none:node</junitArtifactName>
- <suiteXmlFiles>
- <suiteXmlFile>${ftest.resources.dir}/${testng.suite}</suiteXmlFile>
- </suiteXmlFiles>
- <argLine>-Xmx748m</argLine>
- <forkMode>once</forkMode>
- <properties>
- <property>
- <name>listener</name>
- <value>
- org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener
- </value>
- </property>
- </properties>
- <systemProperties>
- <property>
- <name>selenium.browser</name>
- <value>${selenium.browser}</value>
- </property>
- <property>
- <name>selenium.browser.url</name>
- <value>${selenium.browser.url}</value>
- </property>
- <property>
- <name>example.context.path</name>
- <value>${example.context.path}</value>
- </property>
- <property>
- <name>selenium.host</name>
- <value>${selenium.server.host}</value>
- </property>
- <property>
- <name>selenium.server.port</name>
- <value>${selenium.server.port}</value>
- </property>
- <property>
- <name>selenium.speed</name>
- <value>${selenium.speed}</value>
- </property>
- <property>
- <name>selenium.timeout</name>
- <value>${selenium.timeout}</value>
- </property>
- <property>
- <name>selenium.output.dir</name>
- <value>${selenium.output.dir}</value>
- </property>
- <property>
- <name>jboss.home</name>
- <value>${jboss.home}</value>
- </property>
- <property>
- <name>container</name>
- <value>${container}</value>
- </property>
- <property>
- <name>openid.account</name>
- <value>${openid.account}</value>
- </property>
- <property>
- <name>openid.password</name>
- <value>${openid.password}</value>
- </property>
- <property>
- <name>xml.namespace.aware</name>
- <value>${xml.namespace.aware}</value>
- </property>
- <!-- WebDriver specific properties -->
- <property>
- <name>browser</name>
- <value>${selenium.browser}</value>
- </property>
- <property>
- <name>server.url</name>
- <value>${selenium.browser.url}</value>
- </property>
- <property>
- <name>context.path</name>
- <value>${example.context.path}</value>
- </property>
- </systemProperties>
- </configuration>
- <executions>
- <execution>
- <id>verify</id>
- <phase>verify</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <!-- this ant script runs testng natively -->
- <id>wait-for-application</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
- <echo message="Waiting for ${selenium.browser.url}/${example.context.path}"/>
- <waitfor maxwait="1" maxwaitunit="minute" checkevery="5000">
- <http url="${selenium.browser.url}/${example.context.path}"
- errorsBeginAt="404"/>
- </waitfor>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <!-- this ant script runs testng natively -->
- <id>stop-selenium</id>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <echo taskname="selenium-shutdown"
- message="DGF Errors during shutdown are expected"/>
- <get taskname="selenium-shutdown"
- src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer"
- ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <!-- undeploy the example now in the event of being a directory (exploded) -->
- <id>undeploy-exploded</id>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <delete dir="${jboss.home}/server/${jboss.domain}/deploy/${example.context.path}.war"
- failonerror="false"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
- <id>ftest-jbossas-cluster</id>
- <properties>
- <testng.suite>testng-cluster.xml</testng.suite>
- <container>jboss5</container>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.seleniumhq.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- <classifier>standalone</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!-- skip unit tests when running functional tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>start-selenium</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <background>true</background>
- <port>${selenium.server.port}</port>
- <logOutput>true</logOutput>
- <logFile>${selenium.log.dir}/selenium-server.log</logFile>
- <browserSideLog>${selenium.debug}</browserSideLog>
- <debug>${selenium.debug}</debug>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- <version>2.4.3-alpha-1</version>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${ftest.resources.dir}/${testng.suite}</suiteXmlFile>
- </suiteXmlFiles>
- <argLine>-Xmx748m</argLine>
- <forkMode>once</forkMode>
- <properties>
- <property>
- <name>listener</name>
- <value>
- org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener
- </value>
- </property>
- </properties>
- <systemProperties>
- <property>
- <name>selenium.browser</name>
- <value>${selenium.browser}</value>
- </property>
- <property>
- <name>selenium.browser.url</name>
- <value>${selenium.browser.url}</value>
- </property>
- <property>
- <name>example.context.path</name>
- <value>${example.context.path}</value>
- </property>
- <property>
- <name>selenium.host</name>
- <value>${selenium.server.host}</value>
- </property>
- <property>
- <name>selenium.server.port</name>
- <value>${selenium.server.port}</value>
- </property>
- <property>
- <name>selenium.speed</name>
- <value>${selenium.speed}</value>
- </property>
- <property>
- <name>selenium.timeout</name>
- <value>${selenium.timeout}</value>
- </property>
- <property>
- <name>selenium.output.dir</name>
- <value>${selenium.output.dir}</value>
- </property>
- <property>
- <name>jboss.home</name>
- <value>${jboss.home}</value>
- </property>
- <property>
- <name>container</name>
- <value>${container}</value>
- </property>
- <property>
- <name>openid.account</name>
- <value>${openid.account}</value>
- </property>
- <property>
- <name>openid.password</name>
- <value>${openid.password}</value>
- </property>
- <property>
- <name>xml.namespace.aware</name>
- <value>${xml.namespace.aware}</value>
- </property>
- <!-- WebDriver specific properties -->
- <property>
- <name>browser</name>
- <value>${selenium.browser}</value>
- </property>
- <property>
- <name>server.url</name>
- <value>${selenium.browser.url}</value>
- </property>
- <property>
- <name>context.path</name>
- <value>${example.context.path}</value>
- </property>
- </systemProperties>
- </configuration>
- <executions>
- <execution>
- <id>verify</id>
- <phase>verify</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-to-cluster</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
- <copy todir="${jboss.master.configuration}/farm" overwrite="true"
- flatten="true">
- <fileset dir="${basedir}/../${example.name}-ear/">
- <include
- name="src/main/resources/jboss-seam-${example.name}-ds.xml"/>
- <include name="target/${example.context.path}.ear"/>
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <!-- this ant script runs testng natively -->
- <id>wait-for-application</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
- <echo message="Waiting for ${selenium.browser.cluster.url}/${example.context.path}"/>
- <waitfor maxwait="1" maxwaitunit="minute" checkevery="5000">
- <http url="${selenium.browser.cluster.url}/${example.context.path}"
- errorsBeginAt="404"/>
- </waitfor>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <!-- this ant script runs testng natively -->
- <id>stop-selenium</id>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <echo taskname="selenium-shutdown"
- message="DGF Errors during shutdown are expected"/>
- <get taskname="selenium-shutdown"
- src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer"
- ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>undeploy-from-cluster</id>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <delete failonerror="false">
- <fileset dir="${jboss.master.configuration}/farm">
- <include name="jboss-seam-${example.name}-ds.xml"/>
- <include name="${example.context.path}.ear"/>
- </fileset>
- </delete>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
<id>validate</id>
<build>
<plugins>
@@ -875,34 +155,6 @@
</plugin>
</plugins>
</build>
- </profile>
- <profile>
- <id>jacoco</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>jacoco</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${version.jacoco}</version>
- <configuration>
- <propertyName>jacoco.agent</propertyName>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</profile>
</profiles>
Modified: branches/enterprise/WFK-2_1/examples/quartz/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/quartz/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/quartz/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -30,7 +30,7 @@
<!--<maven.profiles>custom,profile</maven.profiles> -->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/quartz/quartz-ear/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/quartz/quartz-ear/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/quartz/quartz-ear/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -1,4 +1,4 @@
-:<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: branches/enterprise/WFK-2_1/examples/registration/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/registration/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -31,7 +31,7 @@
<!--<maven.profiles>custom,profile</maven.profiles> -->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/restbay/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/restbay/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/restbay/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -23,7 +23,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/seambay/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/seambay/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/seambay/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -23,7 +23,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/seamdiscs/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamdiscs/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/seamdiscs/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -23,7 +23,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/seampay/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/seampay/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/seampay/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -23,7 +23,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/seamspace/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamspace/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/seamspace/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -23,7 +23,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/spring/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/spring/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/spring/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -22,7 +22,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/tasks/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/tasks/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/tasks/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -23,7 +23,7 @@
<!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>-->
<version.commons.logging>1.1.1</version.commons.logging>
- <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>2.0.0-beta-5</version.shrinkwrap.resolver>
<!-- Plugin versions -->
<version.dependency.plugin>2.5.1</version.dependency.plugin>
Modified: branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
+++ branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/pom.xml 2013-06-04 15:42:29 UTC (rev 15545)
@@ -17,6 +17,7 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
+ <scope>provided</scope>
<type>ejb</type>
</dependency>
<dependency>
@@ -58,6 +59,12 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-atom-provider</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
11 years, 5 months
- 1
- 0
Seam SVN: r15544 - in branches/enterprise/WFK-2_1/examples/registration: registration-ear and 17 other directories.
by seam-commits＠lists.jboss.org
Author: tremes
Date: 2013-06-04 07:52:59 -0400 (Tue, 04 Jun 2013)
New Revision: 15544
Added:
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/
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/RegisterTest.java
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/arquillian.xml
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/components.xml
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/ejb-jar.xml
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/index.html
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/jboss-deployment-structure.xml
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/persistence.xml
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/register.xhtml
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/registered.xhtml
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/seam.properties
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/web.xml
Removed:
branches/enterprise/WFK-2_1/examples/registration/registration-tests/pom.xml
branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java
branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/selenium/RegistrationTest.java
branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-ftest/testng.xml
branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/arquillian.xml
branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/web.xml
Modified:
branches/enterprise/WFK-2_1/examples/registration/pom.xml
branches/enterprise/WFK-2_1/examples/registration/registration-ear/pom.xml
branches/enterprise/WFK-2_1/examples/registration/registration-ejb/pom.xml
branches/enterprise/WFK-2_1/examples/registration/registration-web/pom.xml
Log:
Registration example migrated
Modified: branches/enterprise/WFK-2_1/examples/registration/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/pom.xml 2013-06-04 10:29:19 UTC (rev 15543)
+++ branches/enterprise/WFK-2_1/examples/registration/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -1,48 +1,134 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>examples</artifactId>
- <groupId>org.jboss.seam</groupId>
- <version>2.3.1.Final-redhat-2</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam.examples</groupId>
- <artifactId>registration</artifactId>
- <packaging>pom</packaging>
- <name>Registration Example (EE6)</name>
-
- <modules>
- <module>registration-ejb</module>
- <module>registration-web</module>
- <module>registration-ear</module>
- <module>registration-tests</module>
- </modules>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.seam.examples</groupId>
+ <artifactId>registration</artifactId>
+ <version>2.3.1.Final-redhat-2</version>
+ <packaging>pom</packaging>
+ <name>Registration Example (EE6)</name>
- <properties>
- <example.name>registration</example.name>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples.registration</groupId>
- <artifactId>registration-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples.registration</groupId>
- <artifactId>registration-web</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples.registration</groupId>
- <artifactId>registration-ear</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <modules>
+ <module>registration-ejb</module>
+ <module>registration-web</module>
+ <module>registration-ear</module>
+ </modules>
+ <properties>
+ <example.name>registration</example.name>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.6</maven.compiler.source>
+
+ <!-- To use jacoco, set jacoco.agent system property to something like
+ -javaagent:/path/to/jacocoagent.jar=append=true,destfile=/path/to/output/jacoco.exec -->
+ <jacoco.agent />
+
+ <!-- To use custom Maven settings and profiles, uncomment and customize
+ the following properties. This is necessary for the ShrinkWrap resolver to
+ function properly. -->
+ <!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings> -->
+ <!--<maven.profiles>custom,profile</maven.profiles> -->
+
+ <version.commons.logging>1.1.1</version.commons.logging>
+ <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver>
+
+ <!-- Plugin versions -->
+ <version.dependency.plugin>2.5.1</version.dependency.plugin>
+ <version.surefire.plugin>2.10</version.surefire.plugin>
+ <version.compiler.plugin>2.3.1</version.compiler.plugin>
+ <version.ear.plugin>2.6</version.ear.plugin>
+ <version.war.plugin>2.1.1</version.war.plugin>
+ <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples.registration</groupId>
+ <artifactId>registration-ejb</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.examples.registration</groupId>
+ <artifactId>registration-web</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.examples.registration</groupId>
+ <artifactId>registration-ear</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${version.commons.logging}</version>
+ </dependency>
+
+ <!-- BOMs -->
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-bom</artifactId>
+ <version>${version.shrinkwrap.resolver}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- Manage plugin versions for build stability -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${version.surefire.plugin}</version>
+ <configuration>
+ <systemPropertyVariables>
+ <org.apache.maven.user-settings>${maven.user.settings}</org.apache.maven.user-settings>
+ <maven.profiles>${maven.profiles}</maven.profiles>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${version.dependency.plugin}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.compiler.plugin}</version>
+ <configuration>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
</project>
Modified: branches/enterprise/WFK-2_1/examples/registration/registration-ear/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ear/pom.xml 2013-06-04 10:29:19 UTC (rev 15543)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ear/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -52,6 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
+ <version>${version.ear.plugin}</version>
<configuration>
<version>6</version>
<defaultLibBundleDir>lib</defaultLibBundleDir>
Modified: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/pom.xml 2013-06-04 10:29:19 UTC (rev 15543)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -1,62 +1,179 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>registration</artifactId>
- <groupId>org.jboss.seam.examples</groupId>
- <version>2.3.1.Final-redhat-2</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.jboss.seam.examples.registration</groupId>
- <artifactId>registration-ejb</artifactId>
- <packaging>ejb</packaging>
- <name>Registration EJB Module (EE6)</name>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>registration</artifactId>
+ <groupId>org.jboss.seam.examples</groupId>
+ <version>2.3.1.Final-redhat-2</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.jboss.seam.examples.registration</groupId>
+ <artifactId>registration-ejb</artifactId>
+ <packaging>ejb</packaging>
+ <name>Registration EJB Module (EE6)</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-depchain</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.protocol</groupId>
+ <artifactId>arquillian-protocol-servlet</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>integration-tests</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ </property>
+ </activation>
+ <properties>
+ <jndiPattern>java:app/seam-registration/#{ejbName}</jndiPattern>
+ <distributable>false</distributable>
+ </properties>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>arq-jbossas-7-managed</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ <value>jbossas-managed-7</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-managed</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>arq-jbossas-7-remote</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ <value>jbossas-remote-7</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-remote</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <!-- Skip tests by default -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added: 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 (rev 0)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/Deployments.java 2013-06-04 11:52:59 UTC (rev 15544)
@@ -0,0 +1,41 @@
+package org.jboss.seam.example.registration.test;
+
+import java.io.File;
+
+import org.jboss.seam.example.registration.RegisterAction;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.resolver.api.maven.Maven;
+
+public class Deployments
+{
+
+ public static WebArchive registrationDeployment() {
+
+ // use profiles defined in 'maven.profiles' property in pom.xml
+ String profilesString = System.getProperty("maven.profiles");
+ String[] profiles = profilesString != null ? profilesString.split(", ?") : new String[0];
+
+ File[] libs = Maven.resolver().loadPomFromFile("pom.xml", profiles)
+ .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();
+
+
+
+ return ShrinkWrap.create(WebArchive.class, "seam-registration.war")
+ .addPackage(RegisterAction.class.getPackage())
+ .addAsWebInfResource("META-INF/ejb-jar.xml", "ejb-jar.xml")
+ .addAsWebInfResource("components.xml", "components.xml")
+ .addAsWebInfResource("persistence.xml", "classes/META-INF/persistence.xml")
+ .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml")
+ .addAsWebInfResource("seam.properties", "classes/seam.properties")
+ .addAsWebInfResource("web.xml", "web.xml")
+ .addAsWebResource("index.html")
+ .addAsWebResource("register.xhtml")
+ .addAsWebResource("registered.xhtml")
+ .addAsLibraries(libs);
+
+ }
+
+}
Copied: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java (from rev 15541, branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java)
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java (rev 0)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java 2013-06-04 11:52:59 UTC (rev 15544)
@@ -0,0 +1,120 @@
+//$Id: RegisterTest.java 10428 2009-04-15 21:54:38Z norman.richards(a)jboss.com $
+package org.jboss.seam.example.registration.test;
+
+import javax.faces.context.FacesContext;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.mock.JUnitSeamTest;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(Arquillian.class)
+public class RegisterTest extends JUnitSeamTest
+{
+ @Deployment(name = "RegisterTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+
+ return Deployments.registrationDeployment();
+ }
+
+ @Test
+ public void testLogin() throws Exception
+ {
+
+ new FacesRequest("/register.xhtml")
+ {
+
+ @Override
+ protected void processValidations() throws Exception
+ {
+ validateValue("#{user.username}", "1ovthafew");
+ validateValue("#{user.name}", "Gavin King");
+ validateValue("#{user.password}", "secret");
+ assert !isValidationFailure();
+ }
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ setValue("#{user.username}", "1ovthafew");
+ setValue("#{user.name}", "Gavin King");
+ setValue("#{user.password}", "secret");
+ }
+
+ @Override
+ protected void invokeApplication()
+ {
+ assert invokeMethod("#{register.register}").equals("/registered.xhtml");
+ setOutcome("/registered.xhtml");
+ }
+
+ @Override
+ protected void afterRequest()
+ {
+ assert isInvokeApplicationComplete();
+ assert !isRenderResponseBegun();
+ }
+
+ }.run();
+
+ new NonFacesRequest("/registered.xhtml")
+ {
+
+ @Override
+ protected void renderResponse()
+ {
+ assert getValue("#{user.username}").equals("1ovthafew");
+ assert getValue("#{user.password}").equals("secret");
+ assert getValue("#{user.name}").equals("Gavin King");
+ }
+
+ }.run();
+
+ new FacesRequest("/register.xhtml")
+ {
+
+ @Override
+ protected void processValidations() throws Exception
+ {
+ validateValue("#{user.username}", "1ovthafew");
+ validateValue("#{user.name}", "Gavin A King");
+ validateValue("#{user.password}", "password");
+ }
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ setValue("#{user.username}", "1ovthafew");
+ setValue("#{user.name}", "Gavin A King");
+ setValue("#{user.password}", "password");
+ }
+
+ @Override
+ protected void invokeApplication()
+ {
+ assert invokeMethod("#{register.register}") == null;
+ }
+
+ @Override
+ protected void renderResponse() throws Exception
+ {
+ assert FacesContext.getCurrentInstance().getMessages().hasNext();
+ }
+
+ @Override
+ protected void afterRequest()
+ {
+ assert isInvokeApplicationComplete();
+ assert isRenderResponseComplete();
+ }
+
+ }.run();
+
+ }
+
+}
Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/arquillian.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/arquillian.xml (rev 0)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/arquillian.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://jboss.org/schema/arquillian"
+ xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+ <engine>
+ <property name="deploymentExportPath">target/</property>
+ </engine>
+
+ <container qualifier="jboss" default="true">
+ <configuration>
+ <!-- These properties are only valid for arquillian managed container,
+ but don't cause a problem for the remote container, so they can be left in. -->
+ <!-- To use jacoco, set jacoco.agent system property to something like
+ -javaagent:/path/to/jacocoagent.jar=append=true,destfile=/path/to/output/jacoco.exec -->
+ <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=1024m ${jacoco.agent}</property>
+ <property name="serverConfig">standalone.xml</property>
+ <!-- If jbossHome property is not set, the JBOSS_HOME environment variable
+ is used -->
+ <!--<property name="jbossHome">/path/to/jboss/as</property> -->
+ </configuration>
+ </container>
+
+</arquillian>
Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/components.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/components.xml (rev 0)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/components.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns="http://jboss.org/schema/seam/components"
+ xmlns:core="http://jboss.org/schema/seam/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation=
+ "http://jboss.org/schema/seam/core http://jboss.org/schema/seam/core-2.3.xsd
+ http://jboss.org/schema/seam/components http://jboss.org/schema/seam/components-2.3.xsd">
+
+ <core:init jndi-pattern="${jndiPattern}"/>
+
+</components>
Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/ejb-jar.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/ejb-jar.xml (rev 0)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/ejb-jar.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar 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/ejb-jar_3_0.xsd"
+ version="3.0">
+
+ <interceptors>
+ <interceptor>
+ <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class>
+ </interceptor>
+ </interceptors>
+
+ <assembly-descriptor>
+ <interceptor-binding>
+ <ejb-name>*</ejb-name>
+ <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class>
+ </interceptor-binding>
+ </assembly-descriptor>
+
+</ejb-jar>
Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/index.html
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/index.html (rev 0)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/index.html 2013-06-04 11:52:59 UTC (rev 15544)
@@ -0,0 +1,5 @@
+<html>
+<head>
+ <meta http-equiv="Refresh" content="0; URL=register.seam">
+</head>
+</html>
\ No newline at end of file
Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/jboss-deployment-structure.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/jboss-deployment-structure.xml (rev 0)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/jboss-deployment-structure.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -0,0 +1,9 @@
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
+ <deployment>
+ <dependencies>
+ <module name="org.dom4j" export="true"/>
+ <module name="org.apache.commons.collections" export="true"/>
+ <module name="javax.faces.api" export="true"/>
+ </dependencies>
+ </deployment>
+</jboss-deployment-structure>
Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/persistence.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/persistence.xml (rev 0)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/persistence.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
+
+ <persistence-unit name="userDatabase">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
+ <properties>
+ <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ </properties>
+ </persistence-unit>
+
+</persistence>
Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/register.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/register.xhtml (rev 0)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/register.xhtml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.org/schema/seam/taglib"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <head>
+ <title>Register New User</title>
+ </head>
+ <body>
+ <f:view>
+ <h:form id="registration">
+ <s:validateAll>
+ <h:panelGrid columns="2">
+ Username: <h:inputText id="username" value="#{user.username}" required="true"/>
+ Real Name: <h:inputText id="name" value="#{user.name}" required="true"/>
+ Password: <h:inputSecret id="password" value="#{user.password}" required="true"/>
+ </h:panelGrid>
+ </s:validateAll>
+ <h:messages id="messages"/>
+ <h:commandButton id="register" value="Register" action="#{register.register}"/>
+ </h:form>
+ </f:view>
+ </body>
+
+</html>
Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/registered.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/registered.xhtml (rev 0)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/registered.xhtml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <head>
+ <title>Successfully Registered New User</title>
+ </head>
+ <body>
+ <f:view>
+ Welcome, #{user.name}, you are successfully registered as #{user.username}.
+ </f:view>
+ </body>
+
+</html>
Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/seam.properties
===================================================================
Copied: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/web.xml (from rev 15541, branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/web.xml)
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/web.xml (rev 0)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/web.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -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>
Deleted: branches/enterprise/WFK-2_1/examples/registration/registration-tests/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-tests/pom.xml 2013-06-04 10:29:19 UTC (rev 15543)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-tests/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>registration</artifactId>
- <groupId>org.jboss.seam.examples</groupId>
- <version>2.3.1.Final-redhat-2</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.jboss.seam.examples.registration</groupId>
- <artifactId>registration-tests</artifactId>
- <name>Registration Integration Tests Module (EE6)</name>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples.registration</groupId>
- <artifactId>registration-ejb</artifactId>
- <type>ejb</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>functional-tests</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.el</groupId>
- <artifactId>jboss-el-api_2.2_spec</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>src/test/resources-integration</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
-
- <profile>
- <id>integration-tests</id>
- <activation>
- <property>
- <name>arquillian</name>
- </property>
- </activation>
- </profile>
-
- <profile>
- <id>arq-jbossas-7-managed</id>
- <activation>
- <property>
- <name>arquillian</name>
- <value>jbossas-managed-7</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>arq-jbossas-7-remote</id>
- <activation>
- <property>
- <name>arquillian</name>
- <value>jbossas-remote-7</value>
- </property>
- </activation>
- </profile>
-
- <profile>
- <id>ftest-jbossas</id>
- <properties>
- <example.context.path>seam-registration</example.context.path>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
Deleted: branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java 2013-06-04 10:29:19 UTC (rev 15543)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java 2013-06-04 11:52:59 UTC (rev 15544)
@@ -1,132 +0,0 @@
-//$Id: RegisterTest.java 10428 2009-04-15 21:54:38Z norman.richards(a)jboss.com $
-package org.jboss.seam.example.registration.test;
-
-import java.io.File;
-
-import javax.faces.context.FacesContext;
-
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.OverProtocol;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.seam.mock.JUnitSeamTest;
-import org.jboss.shrinkwrap.api.Archive;
-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 org.junit.Test;
-import org.junit.runner.RunWith;
-
-(a)RunWith(Arquillian.class)
-public class RegisterTest extends JUnitSeamTest
-{
- @Deployment(name="RegisterTest")
- @OverProtocol("Servlet 3.0")
- public static Archive<?> createDeployment()
- {
- EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-registration.ear").importFrom(new File("../registration-ear/target/seam-registration.ear"))
- .as(EnterpriseArchive.class);
- WebArchive web = er.getAsType(WebArchive.class, "registration-web.war");
- web.addClasses(RegisterTest.class);
-
- // Install org.jboss.seam.mock.MockSeamListener
- web.delete("/WEB-INF/web.xml");
- web.addAsWebInfResource("web.xml");
-
- return er;
- }
-
- @Test
- public void testLogin() throws Exception
- {
-
- new FacesRequest("/register.xhtml") {
-
- @Override
- protected void processValidations() throws Exception
- {
- validateValue("#{user.username}", "1ovthafew");
- validateValue("#{user.name}", "Gavin King");
- validateValue("#{user.password}", "secret");
- assert !isValidationFailure();
- }
-
- @Override
- protected void updateModelValues() throws Exception
- {
- setValue("#{user.username}", "1ovthafew");
- setValue("#{user.name}", "Gavin King");
- setValue("#{user.password}", "secret");
- }
-
- @Override
- protected void invokeApplication()
- {
- assert invokeMethod("#{register.register}").equals("/registered.xhtml");
- setOutcome("/registered.xhtml");
- }
-
- @Override
- protected void afterRequest()
- {
- assert isInvokeApplicationComplete();
- assert !isRenderResponseBegun();
- }
-
- }.run();
-
- new NonFacesRequest("/registered.xhtml")
- {
-
- @Override
- protected void renderResponse()
- {
- assert getValue("#{user.username}").equals("1ovthafew");
- assert getValue("#{user.password}").equals("secret");
- assert getValue("#{user.name}").equals("Gavin King");
- }
-
- }.run();
-
- new FacesRequest("/register.xhtml") {
-
- @Override
- protected void processValidations() throws Exception
- {
- validateValue("#{user.username}", "1ovthafew");
- validateValue("#{user.name}", "Gavin A King");
- validateValue("#{user.password}", "password");
- }
-
- @Override
- protected void updateModelValues() throws Exception
- {
- setValue("#{user.username}", "1ovthafew");
- setValue("#{user.name}", "Gavin A King");
- setValue("#{user.password}", "password");
- }
-
- @Override
- protected void invokeApplication()
- {
- assert invokeMethod("#{register.register}")==null;
- }
-
- @Override
- protected void renderResponse() throws Exception
- {
- assert FacesContext.getCurrentInstance().getMessages().hasNext();
- }
-
- @Override
- protected void afterRequest()
- {
- assert isInvokeApplicationComplete();
- assert isRenderResponseComplete();
- }
-
- }.run();
-
- }
-
-}
Deleted: branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/selenium/RegistrationTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/selenium/RegistrationTest.java 2013-06-04 10:29:19 UTC (rev 15543)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/selenium/RegistrationTest.java 2013-06-04 11:52:59 UTC (rev 15544)
@@ -1,96 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.seam.example.registration.test.selenium;
-
-import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import static org.testng.AssertJUnit.assertTrue;
-import static org.testng.AssertJUnit.assertEquals;
-
-/**
- * This class tests registration form functionality in registration example.
- *
- * @author Jozef Hartinger
- *
- */
-public class RegistrationTest extends SeamSeleniumTest
-{
- protected static String REGISTRATION_URL = "/register.seam";
- protected static String REGISTRATION_USERNAME = "registration:username";
- protected static String REGISTRATION_NAME = "registration:name";
- protected static String REGISTRATION_PASSWORD = "registration:password";
- protected static String REGISTRATION_SUBMIT = "registration:register";
- protected static String REGISTRATION_MESSAGE = "registration:messages";
- protected static String REGISTRATION_MESSAGE_COUNT = "//ul[@id='registration:messages']/li";
- protected static String REGISTERED_URL = "/registered.seam";
-
- @Override
- @BeforeMethod
- public void setUp()
- {
- super.setUp();
- browser.open(CONTEXT_PATH + REGISTRATION_URL);
- }
-
- @Test
- public void simpleRegistrationTest()
- {
- String username = "johny";
- String name = "John Doe";
- String password = "secretPassword";
- submitRegistrationForm(username, name, password);
- assertTrue("After-registration page expected.", browser.getLocation().contains(REGISTERED_URL));
- assertTrue("Welcome message should contain username.", browser.isTextPresent(username));
- assertTrue("Welcome message should contain name.", browser.isTextPresent(name));
- }
-
- @Test(dependsOnMethods = { "simpleRegistrationTest" })
- public void duplicateUsernameTest()
- {
- String username = "jane";
- String name = "Jane Doe";
- String password = "secretPassword";
- submitRegistrationForm(username, name, password);
- browser.goBackAndWait();
- submitRegistrationForm(username, name, password);
- assertTrue("Registration page expected.", browser.getLocation().contains(REGISTRATION_URL));
- assertTrue("Error message did not appear.", browser.isElementPresent(REGISTRATION_MESSAGE));
- }
-
- @Test
- public void emptyValuesTest()
- {
- submitRegistrationForm("", "", "");
- assertTrue("Registration page expected.", browser.getLocation().contains(REGISTRATION_URL));
- assertEquals("Unexpected number of error messages.", 3, browser.getXpathCount(REGISTRATION_MESSAGE_COUNT));
- }
-
- protected void submitRegistrationForm(String username, String name, String password)
- {
- browser.type(REGISTRATION_USERNAME, username);
- browser.type(REGISTRATION_NAME, name);
- browser.type(REGISTRATION_PASSWORD, password);
- browser.clickAndWait(REGISTRATION_SUBMIT);
- }
-
-}
Deleted: branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-ftest/testng.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-ftest/testng.xml 2013-06-04 10:29:19 UTC (rev 15543)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-ftest/testng.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -1,27 +0,0 @@
-
- <!--
- JBoss, Home of Professional Open Source Copyright 2008, Red Hat
- Middleware LLC, and individual contributors by the @authors tag. See
- the copyright.txt in the distribution for a full listing of individual
- contributors. This is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of the
- License, or (at your option) any later version. This software is
- distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- License for more details. You should have received a copy of the GNU
- Lesser General Public License along with this software; if not, write
- to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-<suite name="Registration example" verbose="2" parallel="false">
- <test name="registration_jboss5">
- <parameter name="PROPERTY_FILE" value="" />
- <classes>
- <class
- name="org.jboss.seam.example.registration.test.selenium.RegistrationTest" />
- </classes>
- </test>
-</suite>
Deleted: branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/arquillian.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/arquillian.xml 2013-06-04 10:29:19 UTC (rev 15543)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/arquillian.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://jboss.org/schema/arquillian"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <engine>
- <property name="deploymentExportPath">target/</property>
- </engine>
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m ${jacoco.agent}</property>
- </configuration>
- </container>
-
-</arquillian>
Deleted: branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/web.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/web.xml 2013-06-04 10:29:19 UTC (rev 15543)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/web.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -1,12 +0,0 @@
-<?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/enterprise/WFK-2_1/examples/registration/registration-web/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/registration/registration-web/pom.xml 2013-06-04 10:29:19 UTC (rev 15543)
+++ branches/enterprise/WFK-2_1/examples/registration/registration-web/pom.xml 2013-06-04 11:52:59 UTC (rev 15544)
@@ -4,7 +4,7 @@
<parent>
<artifactId>registration</artifactId>
<groupId>org.jboss.seam.examples</groupId>
- <version>2.3.1.Final-redhat-2</version>
+ <version>2.3.1.Final-redhat-2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -46,10 +46,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
<artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
@@ -66,6 +62,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>${version.war.plugin}</version>
<configuration>
<webResources>
<resource>
11 years, 5 months
- 1
- 0
Seam SVN: r15543 - in branches/enterprise/WFK-2_1: jboss-seam/src/main/java/org/jboss/seam/contexts and 3 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-04 06:29:19 -0400 (Tue, 04 Jun 2013)
New Revision: 15543
Modified:
branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/cdk/MethodBindingToMethodExpression.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/Component.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/AnnotationDeploymentHandler.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/ClassDescriptor.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/DeploymentStrategy.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/GroovyDeploymentHandler.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/init/DependencyManager.java
Log:
bz961249, JBSEAM-5111
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/Component.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/Component.java 2013-06-04 10:28:59 UTC (rev 15542)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/Component.java 2013-06-04 10:29:19 UTC (rev 15543)
@@ -88,10 +88,10 @@
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Events;
import org.jboss.seam.core.Expressions;
+import org.jboss.seam.core.Expressions.MethodExpression;
+import org.jboss.seam.core.Expressions.ValueExpression;
import org.jboss.seam.core.Init;
import org.jboss.seam.core.Mutable;
-import org.jboss.seam.core.Expressions.MethodExpression;
-import org.jboss.seam.core.Expressions.ValueExpression;
import org.jboss.seam.databinding.DataBinder;
import org.jboss.seam.databinding.DataSelector;
import org.jboss.seam.ejb.SeamInterceptor;
@@ -102,12 +102,12 @@
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.util.Conversions;
+import org.jboss.seam.util.Conversions.PropertyValue;
import org.jboss.seam.util.Naming;
import org.jboss.seam.util.ProxyFactory;
import org.jboss.seam.util.Reflections;
import org.jboss.seam.util.SortItem;
import org.jboss.seam.util.Sorter;
-import org.jboss.seam.util.Conversions.PropertyValue;
import org.jboss.seam.web.Parameters;
/**
@@ -964,7 +964,7 @@
{
addInterceptor(new Interceptor(interceptorInstance, this));
}
- catch (NoClassDefFoundError e)
+ catch (LinkageError e)
{
log.debug("Unable to load interceptor " + interceptorInstance.getClass(), e);
}
@@ -1085,7 +1085,7 @@
interceptorInstance = clazz.newInstance();
}
- catch (NoClassDefFoundError e)
+ catch (LinkageError e)
{
log.debug("Unable to load interceptor " + interceptorName, e);
}
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java 2013-06-04 10:28:59 UTC (rev 15542)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java 2013-06-04 10:29:19 UTC (rev 15543)
@@ -124,7 +124,7 @@
}
}
}
- catch (NoClassDefFoundError e)
+ catch (LinkageError e)
{
// do nothing as this context is supposed to be active only with JSF view layer
}
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/AnnotationDeploymentHandler.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/AnnotationDeploymentHandler.java 2013-06-04 10:28:59 UTC (rev 15542)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/AnnotationDeploymentHandler.java 2013-06-04 10:29:19 UTC (rev 15543)
@@ -63,7 +63,7 @@
{
log.warn("could not load annotation class: " + classname, cnfe);
}
- catch (NoClassDefFoundError ncdfe)
+ catch (LinkageError ncdfe)
{
log.warn("could not load annotation class (missing dependency): " + classname, ncdfe);
}
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/ClassDescriptor.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/ClassDescriptor.java 2013-06-04 10:28:59 UTC (rev 15542)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/ClassDescriptor.java 2013-06-04 10:29:19 UTC (rev 15543)
@@ -36,7 +36,7 @@
{
log.debug("could not load class: " + classname, cnfe);
}
- catch (NoClassDefFoundError ncdfe)
+ catch (LinkageError ncdfe)
{
log.debug("could not load class (missing dependency): " + classname, ncdfe);
}
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/DeploymentStrategy.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/DeploymentStrategy.java 2013-06-04 10:28:59 UTC (rev 15542)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/DeploymentStrategy.java 2013-06-04 10:29:19 UTC (rev 15543)
@@ -126,7 +126,7 @@
{
log.trace("Unable to use " + className + " as scanner (class not found)", e);
}
- catch (NoClassDefFoundError e)
+ catch (LinkageError e)
{
log.trace("Unable to use " + className + " as scanner (dependency not found)", e);
}
@@ -190,7 +190,7 @@
{
log.trace("Unable to use " + className + " as a deployment handler (class not found)", e);
}
- catch (NoClassDefFoundError e)
+ catch (LinkageError e)
{
log.trace("Unable to use " + className + " as a deployment handler (dependency not found)", e);
}
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/GroovyDeploymentHandler.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/GroovyDeploymentHandler.java 2013-06-04 10:28:59 UTC (rev 15542)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/GroovyDeploymentHandler.java 2013-06-04 10:29:19 UTC (rev 15543)
@@ -111,7 +111,7 @@
log.debug("could not load groovy class: " + classname, cnfe);
}
- catch (NoClassDefFoundError ncdfe)
+ catch (LinkageError ncdfe)
{
log.debug("could not load groovy class (missing dependency): " + classname, ncdfe);
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/init/DependencyManager.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/init/DependencyManager.java 2013-06-04 10:28:59 UTC (rev 15542)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/init/DependencyManager.java 2013-06-04 10:29:19 UTC (rev 15543)
@@ -137,7 +137,7 @@
{
descriptor.getComponentClass().getClassLoader().loadClass(className);
}
- catch (NoClassDefFoundError e)
+ catch (LinkageError e)
{
return false;
}
Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/cdk/MethodBindingToMethodExpression.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/cdk/MethodBindingToMethodExpression.java 2013-06-04 10:28:59 UTC (rev 15542)
+++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/cdk/MethodBindingToMethodExpression.java 2013-06-04 10:29:19 UTC (rev 15543)
@@ -274,7 +274,7 @@
{
return clazz.newInstance();
}
- catch(NoClassDefFoundError e)
+ catch(LinkageError e)
{
throw new FacesException(e);
}
11 years, 5 months
- 1
- 0