[seam-commits] Seam SVN: r14634 - in branches/community/Seam_2_3/seam-integration-tests: src/test/java/org/jboss/seam/test/integration and 1 other directory.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Tue Apr 24 04:41:22 EDT 2012
Author: maschmid
Date: 2012-04-24 04:41:21 -0400 (Tue, 24 Apr 2012)
New Revision: 14634
Modified:
branches/community/Seam_2_3/seam-integration-tests/pom.xml
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java
Log:
seam-integration-tests, getting rid of the shrinkwrap maven resolver
Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-04-23 18:07:09 UTC (rev 14633)
+++ branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-04-24 08:41:21 UTC (rev 14634)
@@ -10,6 +10,8 @@
<artifactId>seam-integration-tests</artifactId>
<name>Seam Integration Tests</name>
+ <!-- We let Maven build a skeleton war with the required dependencies to be used in tests -->
+ <packaging>war</packaging>
<build>
<testResources>
@@ -60,72 +62,68 @@
<dependencies>
<dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-jpdl</artifactId>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-jpdl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
+
<dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <scope>test</scope>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
-
+
<dependency>
- <groupId>org.jboss.spec.javax.jms</groupId>
- <artifactId>jboss-jms-api_1.1_spec</artifactId>
+ <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.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- </dependency>
-
+
<dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</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.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-api-maven</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
@@ -136,14 +134,17 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
+ <scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-04-23 18:07:09 UTC (rev 14633)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-04-24 08:41:21 UTC (rev 14634)
@@ -1,80 +1,64 @@
package org.jboss.seam.test.integration;
-import org.jboss.seam.test.integration.bpm.SeamExpressionEvaluatorTestController;
-import org.jboss.shrinkwrap.api.Archive;
+import java.io.File;
+
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.DependencyResolvers;
-import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver;
-
public class Deployments {
- public static WebArchive defaultSeamDeployment() {
- return ShrinkWrap.create(WebArchive.class, "test.war")
- .addAsWebInfResource(new StringAsset(
- "<jboss-deployment-structure>" +
- "<deployment>" +
- "<dependencies>" +
- "<module name=\"org.javassist\"/>" +
- "<module name=\"org.dom4j\"/>" +
- "</dependencies>" +
- "</deployment>" +
- "</jboss-deployment-structure>"), "jboss-deployment-structure.xml")
- .addAsResource("seam.properties")
- .addAsResource("components.properties")
- .addAsResource("messages_en.properties")
- .addAsResource("META-INF/persistence.xml")
-
- .addAsResource("hibernate.cfg.xml")
- .addAsWebInfResource("WEB-INF/components.xml", "components.xml")
- .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml")
- .addAsWebInfResource("WEB-INF/web.xml", "web.xml")
- .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml")
-
- .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class)
- .configureFrom("pom.xml")
- .goOffline()
- .artifact("org.jboss.seam:jboss-seam:2.3.0.Beta2-SNAPSHOT")
- .resolveAsFiles());
- }
-
- public static WebArchive jbpmSeamDeployment() {
- return ShrinkWrap.create(WebArchive.class, "test.war")
- .addAsWebInfResource(new StringAsset(
- "<jboss-deployment-structure>" +
- "<deployment>" +
- "<dependencies>" +
- "<module name=\"org.javassist\"/>" +
- "<module name=\"org.dom4j\"/>" +
- "<module name=\"org.apache.commons.collections\"/>" +
- "</dependencies>" +
- "</deployment>" +
- "</jboss-deployment-structure>"), "jboss-deployment-structure.xml")
- .addAsResource("seam.properties")
- .addAsResource("components.properties")
- .addAsResource("messages_en.properties")
- .addAsResource("META-INF/persistence.xml")
-
- .addAsResource("testProcess1.jpdl.xml")
- .addAsResource("testProcess2.jpdl.xml")
- .addAsResource("testProcess3.jpdl.xml")
- .addAsResource("testProcess4.jpdl.xml")
+ public static WebArchive defaultSeamDeployment() {
+ return ShrinkWrap.create(ZipImporter.class, "test.war").importFrom(new File("target/seam-integration-tests.war")).as(WebArchive.class)
+ .addAsWebInfResource(new StringAsset(
+ "<jboss-deployment-structure>" +
+ "<deployment>" +
+ "<dependencies>" +
+ "<module name=\"org.javassist\"/>" +
+ "<module name=\"org.dom4j\"/>" +
+ "</dependencies>" +
+ "</deployment>" +
+ "</jboss-deployment-structure>"), "jboss-deployment-structure.xml")
+ .addAsResource("seam.properties")
+ .addAsResource("components.properties")
+ .addAsResource("messages_en.properties")
+ .addAsResource("META-INF/persistence.xml")
- .addAsResource("jbpm.cfg.xml")
-
- .addAsResource("hibernate.cfg.xml")
- .addAsWebInfResource("WEB-INF/components-jbpm.xml", "components.xml")
- .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml")
- .addAsWebInfResource("WEB-INF/web.xml", "web.xml")
- .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml")
-
- .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class)
- .configureFrom("pom.xml")
- .goOffline()
- .artifact("org.jboss.seam:jboss-seam:2.3.0.Beta2-SNAPSHOT")
- .artifact("org.jbpm.jbpm3:jbpm-jpdl:3.2.10.SP3_seam2")
- .exclusion("org.hibernate:hibernate-core")
- .resolveAsFiles());
- }
+ .addAsResource("hibernate.cfg.xml")
+ .addAsWebInfResource("WEB-INF/components.xml", "components.xml")
+ .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml")
+ .addAsWebInfResource("WEB-INF/web.xml", "web.xml")
+ .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml");
+ }
+
+ public static WebArchive jbpmSeamDeployment() {
+ return ShrinkWrap.create(ZipImporter.class, "test.war").importFrom(new File("target/seam-integration-tests.war")).as(WebArchive.class)
+ .addAsWebInfResource(new StringAsset(
+ "<jboss-deployment-structure>" +
+ "<deployment>" +
+ "<dependencies>" +
+ "<module name=\"org.javassist\"/>" +
+ "<module name=\"org.dom4j\"/>" +
+ "<module name=\"org.apache.commons.collections\"/>" +
+ "</dependencies>" +
+ "</deployment>" +
+ "</jboss-deployment-structure>"), "jboss-deployment-structure.xml")
+ .addAsResource("seam.properties")
+ .addAsResource("components.properties")
+ .addAsResource("messages_en.properties")
+ .addAsResource("META-INF/persistence.xml")
+
+ .addAsResource("testProcess1.jpdl.xml")
+ .addAsResource("testProcess2.jpdl.xml")
+ .addAsResource("testProcess3.jpdl.xml")
+ .addAsResource("testProcess4.jpdl.xml")
+
+ .addAsResource("jbpm.cfg.xml")
+
+ .addAsResource("hibernate.cfg.xml")
+ .addAsWebInfResource("WEB-INF/components-jbpm.xml", "components.xml")
+ .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml")
+ .addAsWebInfResource("WEB-INF/web.xml", "web.xml")
+ .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml");
+ }
}
More information about the seam-commits
mailing list