[jboss-svn-commits] JBoss Common SVN: r4579 - in arquillian/trunk/containers: jetty-embedded-6.1 and 1 other directory.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Jun 28 16:16:11 EDT 2010


Author: dan.j.allen
Date: 2010-06-28 16:16:11 -0400 (Mon, 28 Jun 2010)
New Revision: 4579

Added:
   arquillian/trunk/containers/jetty-embedded-6.1/
   arquillian/trunk/containers/jetty-embedded-6.1/pom.xml
Removed:
   arquillian/trunk/containers/jetty-embedded-6.1/pom.xml
   arquillian/trunk/containers/jetty-embedded-6_1/
Modified:
   arquillian/trunk/containers/pom.xml
Log:
ARQ-200 update artifactId for evaluation

Copied: arquillian/trunk/containers/jetty-embedded-6.1 (from rev 4577, arquillian/trunk/containers/jetty-embedded-6_1)

Deleted: arquillian/trunk/containers/jetty-embedded-6.1/pom.xml
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6_1/pom.xml	2010-06-28 19:27:54 UTC (rev 4577)
+++ arquillian/trunk/containers/jetty-embedded-6.1/pom.xml	2010-06-28 20:16:11 UTC (rev 4579)
@@ -1,149 +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">
-
-   <parent>
-      <groupId>org.jboss.arquillian</groupId>
-      <artifactId>arquillian-build</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-      <relativePath>../../build/pom.xml</relativePath>
-   </parent>
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <groupId>org.jboss.arquillian.container</groupId>
-   <artifactId>arquillian-jetty-embedded-6_1</artifactId>
-   <name>Arquillian Container Jetty Embedded 6.1.x</name>
-   <description>Jetty Embedded 6.1.x Container integration for the Arquillian project</description>
-
-   <properties>
-      <!-- minimum version known to work with tests (minimum recommended version) -->
-      <version.jetty>6.1.12</version.jetty>
-   </properties>
-
-   <dependencies>
-
-      <dependency>
-         <groupId>org.jboss.arquillian</groupId>
-         <artifactId>arquillian-spi</artifactId>
-         <version>${project.version}</version>
-      </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</artifactId>
-         <version>${version.shrinkwrap_shrinkwrap}</version>
-         <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>org.jboss.arquillian.protocol</groupId>
-         <artifactId>arquillian-protocol-servlet-ee6</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-
-      <!-- TODO We likely need a servlet packager to restrict use of EAR -->
-      <dependency>
-         <groupId>org.jboss.arquillian.packager</groupId>
-         <artifactId>arquillian-packager-javaee</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-resource</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-         <groupId>org.jboss.shrinkwrap</groupId>
-         <artifactId>shrinkwrap-impl-base</artifactId>
-      </dependency>
-
-      <dependency>
-         <groupId>org.jboss.arquillian</groupId>
-         <artifactId>arquillian-impl-base</artifactId>
-         <version>${project.version}</version>
-         <scope>test</scope>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.jboss.arquillian</groupId>
-        <artifactId>arquillian-junit</artifactId>
-        <version>${project.version}</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <scope>test</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>javax.enterprise</groupId>
-         <artifactId>cdi-api</artifactId>
-         <version>1.0</version>
-         <scope>test</scope>
-      </dependency>
-
-      <!-- Jetty plus and naming required for testing resource injections -->
-      <dependency>
-         <groupId>org.mortbay.jetty</groupId>
-         <artifactId>jetty-plus</artifactId>
-         <version>${version.jetty}</version>
-         <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>org.mortbay.jetty</groupId>
-         <artifactId>jetty-naming</artifactId>
-         <version>${version.jetty}</version>
-         <scope>test</scope>
-      </dependency>
-
-      <!-- Weld servlet required for testing CDI injections -->
-      <dependency>
-         <groupId>org.jboss.weld.servlet</groupId>
-         <artifactId>weld-servlet</artifactId>
-         <version>1.0.1-Final</version>
-         <scope>test</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>org.glassfish.web</groupId>
-         <artifactId>el-impl</artifactId>
-         <version>2.2</version>
-         <scope>test</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>javax.servlet.jsp</groupId>
-         <artifactId>jsp-api</artifactId>
-         <version>2.2</version>
-         <scope>test</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>com.h2database</groupId>
-         <artifactId>h2</artifactId>
-         <version>1.2.138</version>
-         <scope>test</scope>
-      </dependency>
-
-   </dependencies>
-</project>
-

Copied: arquillian/trunk/containers/jetty-embedded-6.1/pom.xml (from rev 4578, arquillian/trunk/containers/jetty-embedded-6_1/pom.xml)
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6.1/pom.xml	                        (rev 0)
+++ arquillian/trunk/containers/jetty-embedded-6.1/pom.xml	2010-06-28 20:16:11 UTC (rev 4579)
@@ -0,0 +1,149 @@
+<?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>
+      <groupId>org.jboss.arquillian</groupId>
+      <artifactId>arquillian-build</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <relativePath>../../build/pom.xml</relativePath>
+   </parent>
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <groupId>org.jboss.arquillian.container</groupId>
+   <artifactId>arquillian-jetty-embedded-6.1</artifactId>
+   <name>Arquillian Container Jetty Embedded 6.1.x</name>
+   <description>Jetty Embedded 6.1.x Container integration for the Arquillian project</description>
+
+   <properties>
+      <!-- minimum version known to work with tests (minimum recommended version) -->
+      <version.jetty>6.1.12</version.jetty>
+   </properties>
+
+   <dependencies>
+
+      <dependency>
+         <groupId>org.jboss.arquillian</groupId>
+         <artifactId>arquillian-spi</artifactId>
+         <version>${project.version}</version>
+      </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</artifactId>
+         <version>${version.shrinkwrap_shrinkwrap}</version>
+         <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.arquillian.protocol</groupId>
+         <artifactId>arquillian-protocol-servlet-ee6</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+
+      <!-- TODO We likely need a servlet packager to restrict use of EAR -->
+      <dependency>
+         <groupId>org.jboss.arquillian.packager</groupId>
+         <artifactId>arquillian-packager-javaee</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-resource</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.shrinkwrap</groupId>
+         <artifactId>shrinkwrap-impl-base</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.arquillian</groupId>
+         <artifactId>arquillian-impl-base</artifactId>
+         <version>${project.version}</version>
+         <scope>test</scope>
+      </dependency>
+      
+      <dependency>
+        <groupId>org.jboss.arquillian</groupId>
+        <artifactId>arquillian-junit</artifactId>
+        <version>${project.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>javax.enterprise</groupId>
+         <artifactId>cdi-api</artifactId>
+         <version>1.0</version>
+         <scope>test</scope>
+      </dependency>
+
+      <!-- Jetty plus and naming required for testing resource injections -->
+      <dependency>
+         <groupId>org.mortbay.jetty</groupId>
+         <artifactId>jetty-plus</artifactId>
+         <version>${version.jetty}</version>
+         <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>org.mortbay.jetty</groupId>
+         <artifactId>jetty-naming</artifactId>
+         <version>${version.jetty}</version>
+         <scope>test</scope>
+      </dependency>
+
+      <!-- Weld servlet required for testing CDI injections -->
+      <dependency>
+         <groupId>org.jboss.weld.servlet</groupId>
+         <artifactId>weld-servlet</artifactId>
+         <version>1.0.1-Final</version>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>org.glassfish.web</groupId>
+         <artifactId>el-impl</artifactId>
+         <version>2.2</version>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>javax.servlet.jsp</groupId>
+         <artifactId>jsp-api</artifactId>
+         <version>2.2</version>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>com.h2database</groupId>
+         <artifactId>h2</artifactId>
+         <version>1.2.138</version>
+         <scope>test</scope>
+      </dependency>
+
+   </dependencies>
+</project>
+

Modified: arquillian/trunk/containers/pom.xml
===================================================================
--- arquillian/trunk/containers/pom.xml	2010-06-28 20:14:08 UTC (rev 4578)
+++ arquillian/trunk/containers/pom.xml	2010-06-28 20:16:11 UTC (rev 4579)
@@ -31,7 +31,7 @@
     <module>jbossas-local-60</module>
     <module>jbossas-embedded-60</module>
     <module>glassfish-embedded-30</module>
-    <module>jetty-embedded-6_1</module>
+    <module>jetty-embedded-6.1</module>
     <module>tomcat-embedded-6</module>
     <module>weld-embedded</module>    
     <module>weld-ee-embedded</module>



More information about the jboss-svn-commits mailing list