svn commit: r1159835 - in /openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian: TomEEConfiguration.java TomEEContainer.java

[dblevins]

Author: dblevins
Date: Sat Aug 20 02:37:25 2011
New Revision: 1159835

URL: http://svn.apache.org/viewvc?rev=1159835&view=rev
Log:
Create a temp dir for writing the application -- the app name is derived from 
the war file name so it needs to be predictable
This is what happens when we put random characters in app names

Modified:
    
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

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=1159835&r1=1159834&r2=1159835&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
 Sat Aug 20 02:37:25 2011
@@ -19,11 +19,14 @@ package org.apache.openejb.arquillian;
 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 implements ContainerConfiguration {
 
     private int httpPort = 8080;
     private int stopPort = 8005;
-    private String dir = System.getProperty("java.io.tmpdir") + 
"/arquillian-apache-tomee";
+    private String dir;
 
     public int getHttpPort() {
         return httpPort;
@@ -50,5 +53,12 @@ public class TomEEConfiguration implemen
     }
 
     public void validate() throws ConfigurationException {
+        try {
+            if (dir == null) {
+                dir = FileUtils.createTempDir().getAbsolutePath();
+            }
+        } catch (IOException e) {
+            throw new ConfigurationException(String.format("Cannot create tmp 
TomEE home dir", e));
+        }
     }
 }

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=1159835&r1=1159834&r2=1159835&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
 Sat Aug 20 02:37:25 2011
@@ -67,21 +67,6 @@ public class TomEEContainer implements D
         this.configuration = configuration;
     }
 
-    public static void main(String[] args) {
-       try {
-                       TomEEContainer tomEEContainer = new TomEEContainer();
-                       TomEEConfiguration cfg = new TomEEConfiguration();
-
-            File dir = FileUtils.createTempDir();
-            cfg.setDir(dir.getAbsolutePath());
-                       tomEEContainer.setup(cfg);
-                       tomEEContainer.start();
-                       Thread.sleep(120000);
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-    }
-    
     public void start() throws LifecycleException {
         try {
             catalinaDirectory = new File(configuration.getDir());
@@ -169,8 +154,8 @@ public class TomEEContainer implements D
     public ProtocolMetaData deploy(Archive<?> archive) throws 
DeploymentException {
        try {
 
-            final File file = File.createTempFile("deploy", "-" + 
archive.getName());
-            file.deleteOnExit();
+            final File tempDir = FileUtils.createTempDir();
+            final File file = new File(tempDir, archive.getName());
                archive.as(ZipExporter.class).exportTo(file, true);