[jboss-svn-commits] JBoss Common SVN: r4744 - in arquillian/trunk/containers/jetty-embedded-6.1: src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1 and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2010-07-15 01:56:19 -0400 (Thu, 15 Jul 2010)
New Revision: 4744

Modified:
   arquillian/trunk/containers/jetty-embedded-6.1/pom.xml
   arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedContainer.java
Log:
ARQ-145 track shrinkwrap trunk


Modified: arquillian/trunk/containers/jetty-embedded-6.1/pom.xml
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6.1/pom.xml	2010-07-15 05:50:08 UTC (rev 4743)
+++ arquillian/trunk/containers/jetty-embedded-6.1/pom.xml	2010-07-15 05:56:19 UTC (rev 4744)
@@ -1,6 +1,5 @@
 <?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">
+<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>
@@ -19,6 +18,8 @@
    <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>
@@ -38,7 +39,7 @@
 
       <dependency>
          <groupId>org.jboss.shrinkwrap</groupId>
-         <artifactId>shrinkwrap-extension-jetty</artifactId>
+         <artifactId>shrinkwrap-extension-jetty-6</artifactId>
          <version>${version.shrinkwrap_shrinkwrap}</version>
          <scope>provided</scope>
       </dependency>
@@ -63,18 +64,6 @@
       </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>
@@ -140,4 +129,3 @@
 
    </dependencies>
 </project>
-

Modified: arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedContainer.java
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedContainer.java	2010-07-15 05:50:08 UTC (rev 4743)
+++ arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedContainer.java	2010-07-15 05:56:19 UTC (rev 4744)
@@ -27,7 +27,7 @@
 import org.jboss.arquillian.spi.DeploymentException;
 import org.jboss.arquillian.spi.LifecycleException;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.jetty.api.ShrinkWrapWebAppContext;
+import org.jboss.shrinkwrap.jetty_6.api.ShrinkWrapWebAppContext;
 import org.mortbay.jetty.Connector;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.nio.SelectChannelConnector;