Author: jgallimore
Date: Sat Oct 8 19:10:04 2011
New Revision: 1180464
URL: http://svn.apache.org/viewvc?rev=1180464&view=rev
Log:
OPENEJB-1696 corrections to deployment archive, add dependency for Selenium
Modified:
openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesIT.java
Modified:
openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml?rev=1180464&r1=1180463&r2=1180464&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
(original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
Sat Oct 8 19:10:04 2011
@@ -26,6 +26,10 @@
<version>1.0-SNAPSHOT</version>
<name>TomEE Arquillian Adaptor :: Sample :: Moviefun</name>
+ <properties>
+ <version.selenium>2.0b2</version.selenium>
+ </properties>
+
<build>
<finalName>moviefun</finalName>
<defaultGoal>install</defaultGoal>
@@ -85,6 +89,24 @@
<version>${version.arquillian}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.extension</groupId>
+ <artifactId>arquillian-drone</artifactId>
+ <version>${version.arquillian}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-remote-control</artifactId>
+ <version>${version.selenium}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-server</artifactId>
+ <version>${version.selenium}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- This section allows you to configure where to publish libraries for
sharing. It is not required and may be deleted. For more information see:
@@ -101,13 +123,25 @@
</distributionManagement>
<profiles>
<profile>
- <id>tomee</id>
+ <id>arquillian-tomee-embedded</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>arquillian-tomee-embedded</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>arquillian-tomee-remote</id>
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>arquillian-tomee-container</artifactId>
+ <artifactId>arquillian-tomee-remote</artifactId>
<version>1.0-SNAPSHOT</version>
- <scope>test</scope>
</dependency>
</dependencies>
</profile>
Modified:
openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesIT.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesIT.java?rev=1180464&r1=1180463&r2=1180464&view=diff
==============================================================================
---
openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesIT.java
(original)
+++
openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesIT.java
Sat Oct 8 19:10:04 2011
@@ -16,9 +16,14 @@
*/
package org.superbiz.moviefun;
+import java.io.File;
+import java.net.URL;
+
+import org.jboss.arquillian.api.ArquillianResource;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.FileAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.impl.base.asset.ClassLoaderAsset;
import org.junit.Test;
@@ -26,20 +31,42 @@ import org.junit.runner.RunWith;
@RunWith(Arquillian.class)
public class MoviesIT {
+
+ @ArquillianResource
+ private URL deploymentUrl;
+
+ //@Drone
+ //private DefaultSelenium driver;
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebArchive archive = ShrinkWrap.create(WebArchive.class, "test.war")
.addPackage("org.superbiz.moviefun")
- .addDirectory("src/main/webapp")
- .addAsManifestResource(new
ClassLoaderAsset("META-INF/ejb-jar.xml") , "ejb-jar.xml")
- .addAsManifestResource(new
ClassLoaderAsset("META-INF/persistence.xml") , "persistence.xml");
-
-
+ .addPackage("org.superbiz.moviefun.util")
+ .addAsResource(new
ClassLoaderAsset("META-INF/ejb-jar.xml") , "META-INF/ejb-jar.xml")
+ .addAsResource(new
ClassLoaderAsset("META-INF/persistence.xml") , "META-INF/persistence.xml");
+
+ addResources("src/main/webapp", "", archive);
+ System.out.println(archive.toString(true));
return archive;
}
- @Test
+ private static void addResources(String source, String target, WebArchive
archive) {
+ File sourceFile = new File(source);
+ if (! sourceFile.exists()) return;
+ if (sourceFile.isFile()) {
+ archive.add(new FileAsset(sourceFile), target);
+ }
+
+ if (sourceFile.isDirectory()) {
+ for (File file : sourceFile.listFiles()) {
+ if (file.getName().startsWith(".")) continue;
+ addResources(source + File.separator +
file.getName(), target + File.separator + file.getName(), archive);
+ }
+ }
+ }
+
+ @Test
public void testShouldMakeSureWebappIsWorking() throws Exception {
System.out.println("Hello");
}
