[jboss-svn-commits] JBoss Common SVN: r4743 - in arquillian/trunk/containers/tomcat-embedded-6: src/main/java/org/jboss/arquillian/container/tomcat/embedded_6 and 1 other directories.

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

Author: dan.j.allen
Date: 2010-07-15 01:50:08 -0400 (Thu, 15 Jul 2010)
New Revision: 4743

Modified:
   arquillian/trunk/containers/tomcat-embedded-6/pom.xml
   arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java
   arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedInContainerTestCase.java
Log:
SHRINKWRAP-189 track shrinkwrap trunk


Modified: arquillian/trunk/containers/tomcat-embedded-6/pom.xml
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/pom.xml	2010-07-15 05:32:15 UTC (rev 4742)
+++ arquillian/trunk/containers/tomcat-embedded-6/pom.xml	2010-07-15 05:50:08 UTC (rev 4743)
@@ -29,14 +29,28 @@
 
       <dependency>
          <groupId>org.jboss.shrinkwrap</groupId>
-         <artifactId>shrinkwrap-extension-tomcat</artifactId>
+         <artifactId>shrinkwrap-extension-tomcat-6</artifactId>
          <version>1.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
 
+      <!-- shrinkwrap dependencies temporary until we move to 1.0.0-alpha-11 -->
       <dependency>
          <groupId>org.jboss.shrinkwrap</groupId>
+         <artifactId>shrinkwrap-api</artifactId>
+         <version>1.0.0-SNAPSHOT</version>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.shrinkwrap</groupId>
+         <artifactId>shrinkwrap-spi</artifactId>
+         <version>1.0.0-SNAPSHOT</version>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.shrinkwrap</groupId>
          <artifactId>shrinkwrap-impl-base</artifactId>
+         <version>1.0.0-SNAPSHOT</version>
       </dependency>
 
       <!-- Not yet working w/o a hack -->

Modified: arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java	2010-07-15 05:32:15 UTC (rev 4742)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java	2010-07-15 05:50:08 UTC (rev 4743)
@@ -41,7 +41,7 @@
 import org.jboss.arquillian.spi.DeploymentException;
 import org.jboss.arquillian.spi.LifecycleException;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.tomcat.api.ShrinkWrapStandardContext;
+import org.jboss.shrinkwrap.tomcat_6.api.ShrinkWrapStandardContext;
 
 /**
  * <p>Arquillian {@link DeployableContainer} implementation for an

Modified: arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedInContainerTestCase.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedInContainerTestCase.java	2010-07-15 05:32:15 UTC (rev 4742)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedInContainerTestCase.java	2010-07-15 05:50:08 UTC (rev 4743)
@@ -68,7 +68,7 @@
          .addClasses(TestServlet.class, TestBean.class)
          .addLibrary(MavenArtifactResolver.resolve("org.jboss.weld.servlet:weld-servlet:1.0.1-Final"))
          .addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml")
-         .addManifestResource("in-container-context.xml", "context.xml")
+         .addResource("in-container-context.xml", "META-INF/context.xml")
          .setWebXML("in-container-web.xml");
 	}
 
@@ -89,6 +89,7 @@
    {
       log.info("Name: " + name);
       Assert.assertEquals("Tomcat", name);
+      Assert.assertNotNull(testBean);
       Assert.assertEquals("Tomcat", testBean.getName());
 	}