[jboss-svn-commits] JBoss Common SVN: r4767 - in arquillian/trunk: containers/jetty-embedded-6.1 and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jul 18 10:16:01 EDT 2010
Author: aslak
Date: 2010-07-18 10:16:00 -0400 (Sun, 18 Jul 2010)
New Revision: 4767
Modified:
arquillian/trunk/build/pom.xml
arquillian/trunk/containers/jetty-embedded-6.1/pom.xml
arquillian/trunk/containers/jetty-embedded-7/pom.xml
arquillian/trunk/containers/tomcat-embedded-6/pom.xml
arquillian/trunk/containers/weld-ee-embedded-1.1/pom.xml
arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/resources/META-INF/services/org.jboss.arquillian.container.weld.ee.embedded_1_1.shrinkwrap.ShrinkwrapBeanDeploymentArchive
arquillian/trunk/containers/weld-se-embedded-1/pom.xml
arquillian/trunk/containers/weld-se-embedded-1/src/main/resources/META-INF/services/org.jboss.arquillian.container.weld.se.embedded_1.shrinkwrap.ShrinkwrapBeanDeploymentArchive
arquillian/trunk/protocols/jmx-osgi/src/test/java/org/jboss/arquillian/packager/osgi/OSGiDeploymentPackagerTestCase.java
Log:
ARQ-206 Updated to support ShrinkWrap Alpha-11 changes
Modified: arquillian/trunk/build/pom.xml
===================================================================
--- arquillian/trunk/build/pom.xml 2010-07-18 12:47:21 UTC (rev 4766)
+++ arquillian/trunk/build/pom.xml 2010-07-18 14:16:00 UTC (rev 4767)
@@ -24,6 +24,9 @@
<!-- Properties -->
<properties>
+ <!-- Plugin version -->
+ <version.surefire.plugin>2.5</version.surefire.plugin>
+
<!-- Versioning -->
<version.javax.inject_javax.inject>1</version.javax.inject_javax.inject>
<version.javaee_api>6.0</version.javaee_api>
@@ -32,10 +35,10 @@
<version.jboss_osgi_spi>1.0.10-SNAPSHOT</version.jboss_osgi_spi>
<version.jboss_osgi_vfs>1.0.0</version.jboss_osgi_vfs>
<version.jetty_jetty>6.1.9</version.jetty_jetty>
- <version.junit_junit>4.6</version.junit_junit>
+ <version.junit_junit>4.8.1</version.junit_junit>
<version.mockito_all>1.8.3</version.mockito_all>
<version.osgi>4.2.0</version.osgi>
- <version.shrinkwrap_shrinkwrap>1.0.0-alpha-10</version.shrinkwrap_shrinkwrap>
+ <version.shrinkwrap_shrinkwrap>1.0.0-alpha-11</version.shrinkwrap_shrinkwrap>
<version.testng_testng>5.12.1</version.testng_testng>
</properties>
@@ -107,6 +110,15 @@
<!-- Build -->
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${version.surefire.plugin}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<!-- JBoss-specific Packaging -->
@@ -243,6 +255,27 @@
<version>${version.shrinkwrap_shrinkwrap}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-classloader</artifactId>
+ <version>${version.shrinkwrap_shrinkwrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-tomcat-6</artifactId>
+ <version>${version.shrinkwrap_shrinkwrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-jetty-6</artifactId>
+ <version>${version.shrinkwrap_shrinkwrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-jetty-7</artifactId>
+ <version>${version.shrinkwrap_shrinkwrap}</version>
+ </dependency>
+
+ <dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>${version.javaee_api}</version>
Modified: arquillian/trunk/containers/jetty-embedded-6.1/pom.xml
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6.1/pom.xml 2010-07-18 12:47:21 UTC (rev 4766)
+++ arquillian/trunk/containers/jetty-embedded-6.1/pom.xml 2010-07-18 14:16:00 UTC (rev 4767)
@@ -18,8 +18,6 @@
<properties>
<!-- minimum version known to work with tests (minimum recommended version) -->
<version.jetty>6.1.12</version.jetty>
- <!-- override shrinkwrap version until Arquillian switches to 1.0.0-alpha-11 -->
- <version.shrinkwrap_shrinkwrap>1.0.0-SNAPSHOT</version.shrinkwrap_shrinkwrap>
</properties>
<dependencies>
@@ -31,17 +29,8 @@
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${version.jetty}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-extension-jetty-6</artifactId>
- <version>${version.shrinkwrap_shrinkwrap}</version>
- <scope>provided</scope>
</dependency>
<!-- TODO We likely need a servlet packager to restrict use of EAR -->
@@ -83,6 +72,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${version.jetty}</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Jetty plus and naming required for testing resource injections -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
Modified: arquillian/trunk/containers/jetty-embedded-7/pom.xml
===================================================================
--- arquillian/trunk/containers/jetty-embedded-7/pom.xml 2010-07-18 12:47:21 UTC (rev 4766)
+++ arquillian/trunk/containers/jetty-embedded-7/pom.xml 2010-07-18 14:16:00 UTC (rev 4767)
@@ -18,8 +18,7 @@
<properties>
<!-- known to work with all Jetty 7.x and 8.x versions (7.0.0.v20091005 through 8.0.0.M0) -->
<version.jetty>7.0.0.v20091005</version.jetty>
- <!-- override shrinkwrap version until Arquillian switches to 1.0.0-alpha-11 -->
- <version.shrinkwrap_shrinkwrap>1.0.0-SNAPSHOT</version.shrinkwrap_shrinkwrap>
+
</properties>
<dependencies>
@@ -31,20 +30,6 @@
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${version.jetty}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-extension-jetty-7</artifactId>
- <version>${version.shrinkwrap_shrinkwrap}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet-3</artifactId>
<version>${project.version}</version>
@@ -65,6 +50,18 @@
</dependency>
<dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-jetty-7</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${version.jetty}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-impl-base</artifactId>
<version>${project.version}</version>
Modified: arquillian/trunk/containers/tomcat-embedded-6/pom.xml
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/pom.xml 2010-07-18 12:47:21 UTC (rev 4766)
+++ arquillian/trunk/containers/tomcat-embedded-6/pom.xml 2010-07-18 14:16:00 UTC (rev 4767)
@@ -18,8 +18,6 @@
<properties>
<version.org.apache.tomcat>6.0.26</version.org.apache.tomcat>
- <!-- override shrinkwrap version until Arquillian switches to 1.0.0-alpha-11 -->
- <version.shrinkwrap_shrinkwrap>1.0.0-SNAPSHOT</version.shrinkwrap_shrinkwrap>
</properties>
<dependencies>
@@ -33,8 +31,6 @@
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-extension-tomcat-6</artifactId>
- <version>${version.shrinkwrap_shrinkwrap}</version>
- <scope>provided</scope>
</dependency>
<!-- Not yet working w/o a hack -->
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/pom.xml
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/pom.xml 2010-07-18 12:47:21 UTC (rev 4766)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/pom.xml 2010-07-18 14:16:00 UTC (rev 4767)
@@ -78,6 +78,17 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-classloader</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!--
org.jboss.weld
-->
@@ -93,13 +104,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-impl-base</artifactId>
- <scope>provided</scope>
- </dependency>
-
-
- <dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>2.2</version>
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/resources/META-INF/services/org.jboss.arquillian.container.weld.ee.embedded_1_1.shrinkwrap.ShrinkwrapBeanDeploymentArchive
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/resources/META-INF/services/org.jboss.arquillian.container.weld.ee.embedded_1_1.shrinkwrap.ShrinkwrapBeanDeploymentArchive 2010-07-18 12:47:21 UTC (rev 4766)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/resources/META-INF/services/org.jboss.arquillian.container.weld.ee.embedded_1_1.shrinkwrap.ShrinkwrapBeanDeploymentArchive 2010-07-18 14:16:00 UTC (rev 4767)
@@ -1 +1 @@
-org.jboss.arquillian.container.weld.ee.embedded_1_1.shrinkwrap.ShrinkwrapBeanDeploymentArchiveImpl
\ No newline at end of file
+implementingClassName=org.jboss.arquillian.container.weld.ee.embedded_1_1.shrinkwrap.ShrinkwrapBeanDeploymentArchiveImpl
\ No newline at end of file
Modified: arquillian/trunk/containers/weld-se-embedded-1/pom.xml
===================================================================
--- arquillian/trunk/containers/weld-se-embedded-1/pom.xml 2010-07-18 12:47:21 UTC (rev 4766)
+++ arquillian/trunk/containers/weld-se-embedded-1/pom.xml 2010-07-18 14:16:00 UTC (rev 4767)
@@ -1,115 +1,117 @@
<?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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../../build/pom.xml</relativePath>
- </parent>
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-build</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../build/pom.xml</relativePath>
+ </parent>
- <!-- Model Version -->
- <modelVersion>4.0.0</modelVersion>
+ <!-- Model Version -->
+ <modelVersion>4.0.0</modelVersion>
- <!-- Artifact Configuration -->
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-se-embedded-1</artifactId>
- <name>Arquillian Container Weld SE Embedded 1.x</name>
- <description>Weld SE 1.x Embedded Container integration for the Arquillian Project</description>
+ <!-- Artifact Configuration -->
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-weld-se-embedded-1</artifactId>
+ <name>Arquillian Container Weld SE Embedded 1.x</name>
+ <description>Weld SE 1.x Embedded Container integration for the Arquillian Project</description>
- <!-- Properties -->
- <properties>
+ <!-- Properties -->
+ <properties>
- <!-- Versioning -->
- <version.weld_core>1.0.1-SP1</version.weld_core>
+ <!-- Versioning -->
+ <version.weld_core>1.0.1-SP1</version.weld_core>
- </properties>
+ </properties>
<dependencyManagement>
<dependencies>
<!-- org.jboss.weld -->
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-bom</artifactId>
- <version>${version.weld_core}</version>
- <type>pom</type>
- <scope>import</scope>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-bom</artifactId>
+ <version>${version.weld_core}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
</dependencies>
- </dependencyManagement>
+ </dependencyManagement>
- <!-- Dependencies -->
- <dependencies>
+ <!-- Dependencies -->
+ <dependencies>
- <!--
- org.jboss.arquillian
- -->
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-spi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-local</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <!-- org.jboss.arquillian -->
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.protocol</groupId>
+ <artifactId>arquillian-protocol-local</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.testenricher</groupId>
- <artifactId>arquillian-testenricher-cdi</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.testenricher</groupId>
+ <artifactId>arquillian-testenricher-cdi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <!--
- org.jboss.weld
- -->
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-impl-base</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-classloader</artifactId>
+ </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>provided</scope>
- </dependency>
+ <!-- org.jboss.weld -->
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-junit</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-junit</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
</project>
Modified: arquillian/trunk/containers/weld-se-embedded-1/src/main/resources/META-INF/services/org.jboss.arquillian.container.weld.se.embedded_1.shrinkwrap.ShrinkwrapBeanDeploymentArchive
===================================================================
--- arquillian/trunk/containers/weld-se-embedded-1/src/main/resources/META-INF/services/org.jboss.arquillian.container.weld.se.embedded_1.shrinkwrap.ShrinkwrapBeanDeploymentArchive 2010-07-18 12:47:21 UTC (rev 4766)
+++ arquillian/trunk/containers/weld-se-embedded-1/src/main/resources/META-INF/services/org.jboss.arquillian.container.weld.se.embedded_1.shrinkwrap.ShrinkwrapBeanDeploymentArchive 2010-07-18 14:16:00 UTC (rev 4767)
@@ -1 +1 @@
-org.jboss.arquillian.container.weld.se.embedded_1.shrinkwrap.ShrinkwrapBeanDeploymentArchiveImpl
\ No newline at end of file
+implementingClassName=org.jboss.arquillian.container.weld.se.embedded_1.shrinkwrap.ShrinkwrapBeanDeploymentArchiveImpl
\ No newline at end of file
Modified: arquillian/trunk/protocols/jmx-osgi/src/test/java/org/jboss/arquillian/packager/osgi/OSGiDeploymentPackagerTestCase.java
===================================================================
--- arquillian/trunk/protocols/jmx-osgi/src/test/java/org/jboss/arquillian/packager/osgi/OSGiDeploymentPackagerTestCase.java 2010-07-18 12:47:21 UTC (rev 4766)
+++ arquillian/trunk/protocols/jmx-osgi/src/test/java/org/jboss/arquillian/packager/osgi/OSGiDeploymentPackagerTestCase.java 2010-07-18 14:16:00 UTC (rev 4767)
@@ -41,7 +41,7 @@
@Test
public void testValidBundle() throws Exception
{
- final JavaArchive archive = ShrinkWrap.create("test-archive.jar", JavaArchive.class);
+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class);
archive.setManifest(new Asset()
{
public InputStream openStream()
@@ -60,7 +60,7 @@
@Test
public void testInvalidBundle() throws Exception
{
- final JavaArchive archive = ShrinkWrap.create("test-archive.jar", JavaArchive.class);
+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class);
archive.setManifest(new Asset()
{
public InputStream openStream()
More information about the jboss-svn-commits
mailing list