You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/09/12 00:54:08 UTC

svn commit: r1169569 - in /openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded: ./ src/main/java/org/apache/openejb/arquillian/ src/main/resources/META-INF/org.apache.openejb.tomcat/ src/main/resources/org/apache/openejb/tomee/configs/

Author: dblevins
Date: Sun Sep 11 22:54:04 2011
New Revision: 1169569

URL: http://svn.apache.org/viewvc?rev=1169569&view=rev
Log:
use the tomee-embedded module for the guts

Modified:
    openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml
    openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/Configuration.java
    openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/Container.java
    openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java
    openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
    openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/org.apache.openejb.tomcat/
    openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/org/apache/openejb/tomee/configs/

Modified: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml?rev=1169569&r1=1169568&r2=1169569&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml Sun Sep 11 22:54:04 2011
@@ -54,6 +54,12 @@
    <dependencies>
 
       <dependency>
+         <groupId>org.apache.openejb</groupId>
+         <artifactId>tomee-embedded</artifactId>
+         <version>4.0.0-SNAPSHOT</version>
+      </dependency>
+
+      <dependency>
          <groupId>org.jboss.arquillian</groupId>
          <artifactId>arquillian-spi</artifactId>
          <version>${version.arquillian}</version>

Modified: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java?rev=1169569&r1=1169568&r2=1169569&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java Sun Sep 11 22:54:04 2011
@@ -16,10 +16,10 @@
  */
 package org.apache.openejb.arquillian;
 
+import org.apache.tomee.embedded.Configuration;
 import org.jboss.arquillian.spi.ConfigurationException;
 import org.jboss.arquillian.spi.client.container.ContainerConfiguration;
 
-import java.io.File;
 import java.io.IOException;
 
 public class TomEEConfiguration extends Configuration implements ContainerConfiguration {

Modified: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java?rev=1169569&r1=1169568&r2=1169569&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java Sun Sep 11 22:54:04 2011
@@ -17,31 +17,9 @@
 package org.apache.openejb.arquillian;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.catalina.startup.Bootstrap;
-import org.apache.openejb.AppContext;
-import org.apache.openejb.NoSuchApplicationException;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.UndeployException;
-import org.apache.openejb.assembler.Deployer;
-import org.apache.openejb.assembler.classic.AppInfo;
-import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.config.ConfigurationFactory;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.tomcat.catalina.TomcatLoader;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.log.Log4JLogChute;
-import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
+
+import org.apache.tomee.embedded.Configuration;
+import org.apache.tomee.embedded.Container;
 import org.jboss.arquillian.spi.client.container.DeployableContainer;
 import org.jboss.arquillian.spi.client.container.DeploymentException;
 import org.jboss.arquillian.spi.client.container.LifecycleException;
@@ -52,8 +30,6 @@ import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.exporter.ZipExporter;
 import org.jboss.shrinkwrap.descriptor.api.Descriptor;
 
-import javax.naming.NamingException;
-
 public class TomEEContainer extends Container implements DeployableContainer<TomEEConfiguration> {
 
     public Class<TomEEConfiguration> getConfigurationClass() {