[jboss-svn-commits] JBoss Common SVN: r4692 - in arquillian/trunk: archetypes/junit-javaee6 and 13 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 8 05:58:34 EDT 2010
Author: aslak
Date: 2010-07-08 05:58:33 -0400 (Thu, 08 Jul 2010)
New Revision: 4692
Modified:
arquillian/trunk/archetypes/
arquillian/trunk/archetypes/junit-javaee6/
arquillian/trunk/archetypes/junit-javaee6/src/test/java/org/jboss/arquillian/example/BeanManagerTest.java
arquillian/trunk/archetypes/junit-javaee6/src/test/java/org/jboss/arquillian/example/GamePersistenceTest.java
arquillian/trunk/build/ide/eclipse/templates/junit/ArquillianJUnitTest.java
arquillian/trunk/build/ide/netbeans/templates/JUnit/ArquillianJUnitTest.java
arquillian/trunk/containers/jetty-embedded-7/
arquillian/trunk/containers/jetty-embedded-7/src/main/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedDeploymentAppender.java
arquillian/trunk/containers/jetty-embedded-7/src/test/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedClientTestCase.java
arquillian/trunk/containers/jetty-embedded-7/src/test/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedInContainerTestCase.java
arquillian/trunk/containers/pom.xml
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ArquillianDeploymentAppender.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ArchiveDeploymentToolingExporter.java
arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitDeploymentAppender.java
arquillian/trunk/junit/src/test/java/org/jboss/arquillian/junit/JUnitIntegrationTestCase.java
arquillian/trunk/packagers/osgi/src/test/java/org/jboss/arquillian/packager/osgi/OSGiDeploymentPackagerTestCase.java
arquillian/trunk/protocols/servlet-ee6/src/test/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackagerTestCase.java
Log:
ARQ-206 Updated to ShrinkWrap Alpha-10
Property changes on: arquillian/trunk/archetypes
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Property changes on: arquillian/trunk/archetypes/junit-javaee6
___________________________________________________________________
Name: svn:ignore
- target
+ .classpath
.project
.settings
target
Modified: arquillian/trunk/archetypes/junit-javaee6/src/test/java/org/jboss/arquillian/example/BeanManagerTest.java
===================================================================
--- arquillian/trunk/archetypes/junit-javaee6/src/test/java/org/jboss/arquillian/example/BeanManagerTest.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/archetypes/junit-javaee6/src/test/java/org/jboss/arquillian/example/BeanManagerTest.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -16,15 +16,18 @@
*/
package org.jboss.arquillian.example;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
-import static org.junit.Assert.*;
+
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,7 +36,7 @@
{
@Deployment
public static Archive<?> createTestArchive() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml");
}
Modified: arquillian/trunk/archetypes/junit-javaee6/src/test/java/org/jboss/arquillian/example/GamePersistenceTest.java
===================================================================
--- arquillian/trunk/archetypes/junit-javaee6/src/test/java/org/jboss/arquillian/example/GamePersistenceTest.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/archetypes/junit-javaee6/src/test/java/org/jboss/arquillian/example/GamePersistenceTest.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -16,7 +16,11 @@
*/
package org.jboss.arquillian.example;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.util.List;
+
import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -24,13 +28,13 @@
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import javax.transaction.UserTransaction;
-import static org.junit.Assert.*;
+
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -47,7 +51,7 @@
@Deployment
public static Archive<?> createTestArchive()
{
- return ShrinkWrap.create("test.war", WebArchive.class)
+ return ShrinkWrap.create(WebArchive.class, "test.war")
.addPackage(Game.class.getPackage())
.addWebResource("test-persistence.xml", "classes/META-INF/persistence.xml")
.addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml");
Modified: arquillian/trunk/build/ide/eclipse/templates/junit/ArquillianJUnitTest.java
===================================================================
--- arquillian/trunk/build/ide/eclipse/templates/junit/ArquillianJUnitTest.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/build/ide/eclipse/templates/junit/ArquillianJUnitTest.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -7,7 +7,7 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -17,8 +17,8 @@
@Deployment
public static Archive<?> createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class)
- .addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml");
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
+ .addManifestResource(new StringAsset("", "beans.xml");
}
@Inject BeanManager beanManager;
Modified: arquillian/trunk/build/ide/netbeans/templates/JUnit/ArquillianJUnitTest.java
===================================================================
--- arquillian/trunk/build/ide/netbeans/templates/JUnit/ArquillianJUnitTest.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/build/ide/netbeans/templates/JUnit/ArquillianJUnitTest.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -10,7 +10,7 @@
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -19,8 +19,8 @@
{
@Deployment
public static Archive<?> createTestArchive() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
- .addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml");
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
+ .addManifestResource(new StringAsset("", "beans.xml");
}
@Inject BeanManager beanManager;
Property changes on: arquillian/trunk/containers/jetty-embedded-7
___________________________________________________________________
Name: svn:ignore
- target
+ .classpath
.project
.settings
target
Modified: arquillian/trunk/containers/jetty-embedded-7/src/main/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jetty-embedded-7/src/main/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/containers/jetty-embedded-7/src/main/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedDeploymentAppender.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -36,7 +36,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-jetty-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-jetty-testenrichers.jar")
.addPackages(
false,
CDIInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/jetty-embedded-7/src/test/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedClientTestCase.java
===================================================================
--- arquillian/trunk/containers/jetty-embedded-7/src/test/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedClientTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/containers/jetty-embedded-7/src/test/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedClientTestCase.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -51,7 +51,7 @@
@Deployment
public static WebArchive getTestArchive()
{
- final WebArchive war = ShrinkWrap.create("client-test.war", WebArchive.class)
+ final WebArchive war = ShrinkWrap.create(WebArchive.class, "client-test.war")
.addClass(TestServlet.class)
.setWebXML("client-web.xml");
log.info(war.toString(true));
Modified: arquillian/trunk/containers/jetty-embedded-7/src/test/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedInContainerTestCase.java
===================================================================
--- arquillian/trunk/containers/jetty-embedded-7/src/test/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedInContainerTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/containers/jetty-embedded-7/src/test/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedInContainerTestCase.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -17,7 +17,9 @@
package org.jboss.arquillian.container.jetty.embedded_7;
import java.sql.Connection;
+
import java.util.logging.Logger;
+
import javax.annotation.Resource;
import javax.inject.Inject;
import javax.sql.DataSource;
@@ -25,8 +27,8 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -48,7 +50,7 @@
@Deployment
public static WebArchive getTestArchive()
{
- final WebArchive war = ShrinkWrap.create("in-container-test.war", WebArchive.class)
+ final WebArchive war = ShrinkWrap.create(WebArchive.class, "in-container-test.war")
.addClass(TestBean.class)
// adding the configuration class silences the logged exception when building the configuration on the server-side, but shouldn't be necessary
//.addClass(JettyEmbeddedConfiguration.class)
Modified: arquillian/trunk/containers/pom.xml
===================================================================
--- arquillian/trunk/containers/pom.xml 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/containers/pom.xml 2010-07-08 09:58:33 UTC (rev 4692)
@@ -34,7 +34,8 @@
<module>jbossas-embedded-6</module>
<module>glassfish-remote-3</module>
<module>glassfish-embedded-3</module>
- <module>jetty-embedded-6.1</module>
+ <module>jetty-embedded-6.1</module>
+ <module>jetty-embedded-7</module>
<module>tomcat-embedded-6</module>
<module>weld-se-embedded-1</module>
<module>weld-ee-embedded-1.1</module>
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ArquillianDeploymentAppender.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ArquillianDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ArquillianDeploymentAppender.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -18,33 +18,36 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.spi.AuxiliaryArchiveAppender;
+import org.jboss.arquillian.spi.Context;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.ArchiveBase;
+import org.jboss.shrinkwrap.spi.Configurable;
/**
- * ArquillianDeploymentAppender
+ * Appender to package up Arquillian api/spi/impl and ShrinkWrap api/spi/impl
*
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
*/
public class ArquillianDeploymentAppender implements AuxiliaryArchiveAppender
{
-
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.AuxiliaryArchiveAppender#createAuxiliaryArchive()
+ */
public Archive<?> createAuxiliaryArchive()
{
JavaArchive archive = ShrinkWrap.create(JavaArchive.class ,"arquillian-core.jar")
.addPackages(
true,
- //Package.getPackage("org.jboss.arquillian.api"), // TODO: figure out why this does not work..
- Deployment.class.getPackage(),
- Package.getPackage("org.jboss.arquillian.impl"),
- Package.getPackage("org.jboss.arquillian.spi"),
- Package.getPackage("org.jboss.shrinkwrap.api"),
- Package.getPackage("org.jboss.shrinkwrap.impl.base"),
- Package.getPackage("org.jboss.shrinkwrap.spi"));
+ Deployment.class.getPackage(), // "org.jboss.arquillian.api"
+ ConfigurationBuilder.class.getPackage(), // "org.jboss.arquillian.impl"
+ Context.class.getPackage(), // "org.jboss.arquillian.spi"
+ Archive.class.getPackage(), // "org.jboss.shrinkwrap.api"
+ ArchiveBase.class.getPackage(), // "org.jboss.shrinkwrap.impl.base"
+ Configurable.class.getPackage()); // "org.jboss.shrinkwrap.spi"
return archive;
}
-
}
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ArchiveDeploymentToolingExporter.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ArchiveDeploymentToolingExporter.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ArchiveDeploymentToolingExporter.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -20,12 +20,12 @@
import java.io.FileOutputStream;
import org.jboss.arquillian.impl.ToolingDeploymentFormatter;
+import org.jboss.arquillian.impl.Validate;
import org.jboss.arquillian.spi.Context;
import org.jboss.arquillian.spi.TestClass;
import org.jboss.arquillian.spi.event.suite.ClassEvent;
import org.jboss.arquillian.spi.event.suite.EventHandler;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.impl.base.Validate;
/**
* Handler that will export a XML version of the Deployed Archive.
Modified: arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitDeploymentAppender.java
===================================================================
--- arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitDeploymentAppender.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -35,7 +35,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-junit.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-junit.jar")
.addPackages(
true,
Package.getPackage("org.junit"),
Modified: arquillian/trunk/junit/src/test/java/org/jboss/arquillian/junit/JUnitIntegrationTestCase.java
===================================================================
--- arquillian/trunk/junit/src/test/java/org/jboss/arquillian/junit/JUnitIntegrationTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/junit/src/test/java/org/jboss/arquillian/junit/JUnitIntegrationTestCase.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -114,7 +114,7 @@
@Deployment
public static JavaArchive create()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class);
+ return ShrinkWrap.create(JavaArchive.class, "test.jar");
}
@Test
Modified: arquillian/trunk/packagers/osgi/src/test/java/org/jboss/arquillian/packager/osgi/OSGiDeploymentPackagerTestCase.java
===================================================================
--- arquillian/trunk/packagers/osgi/src/test/java/org/jboss/arquillian/packager/osgi/OSGiDeploymentPackagerTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/packagers/osgi/src/test/java/org/jboss/arquillian/packager/osgi/OSGiDeploymentPackagerTestCase.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -23,8 +23,8 @@
import org.jboss.osgi.testing.OSGiManifestBuilder;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
@@ -39,7 +39,7 @@
@Test
public void testValidBundle() throws Exception
{
- final JavaArchive archive = ShrinkWrap.create("test-archive.jar", JavaArchive.class);
+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "test-archive.jar");
archive.setManifest(new Asset()
{
public InputStream openStream()
@@ -58,7 +58,7 @@
@Test
public void testInvalidBundle() throws Exception
{
- final JavaArchive archive = ShrinkWrap.create("test-archive.jar", JavaArchive.class);
+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "test-archive.jar");
archive.setManifest(new Asset()
{
public InputStream openStream()
Modified: arquillian/trunk/protocols/servlet-ee6/src/test/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackagerTestCase.java
===================================================================
--- arquillian/trunk/protocols/servlet-ee6/src/test/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackagerTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
+++ arquillian/trunk/protocols/servlet-ee6/src/test/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackagerTestCase.java 2010-07-08 09:58:33 UTC (rev 4692)
@@ -17,6 +17,7 @@
package org.jboss.arquillian.protocol.servlet;
import java.util.ArrayList;
+
import java.util.Collection;
import java.util.List;
More information about the jboss-svn-commits
mailing list