Return-Path: 
 <commits-return-15912-apmail-openejb-commits-archive=openejb.apache.org@openejb.apache.org>
X-Original-To: apmail-openejb-commits-archive@www.apache.org
Delivered-To: apmail-openejb-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C624790E8
	for <apmail-openejb-commits-archive@www.apache.org>;
 Wed,  2 Nov 2011 23:48:09 +0000 (UTC)
Received: (qmail 83559 invoked by uid 500); 2 Nov 2011 23:48:09 -0000
Delivered-To: apmail-openejb-commits-archive@openejb.apache.org
Received: (qmail 83510 invoked by uid 500); 2 Nov 2011 23:48:09 -0000
Mailing-List: contact commits-help@openejb.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@openejb.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@openejb.apache.org>
List-Post: <mailto:commits@openejb.apache.org>
List-Id: <commits.openejb.apache.org>
Reply-To: dev@openejb.apache.org
Delivered-To: mailing list commits@openejb.apache.org
Received: (qmail 83503 invoked by uid 99); 2 Nov 2011 23:48:09 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Nov 2011 23:48:09 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Nov 2011 23:48:07 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 835CD2388CE8
	for <commits@openejb.apache.org>; Wed,  2 Nov 2011 23:47:46 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1196872 - in
 /openejb/trunk/openejb/assembly/tomee/tomee-embedded: pom.xml
 src/test/java/org/apache/tomee/embedded/EmbeddedTomEEContainerTest.java
Date: Wed, 02 Nov 2011 23:47:46 -0000
To: commits@openejb.apache.org
From: rmannibucau@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111102234746.835CD2388CE8@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rmannibucau
Date: Wed Nov  2 23:47:45 2011
New Revision: 1196872

URL: http://svn.apache.org/viewvc?rev=1196872&view=rev
Log:
ensuring temp webapp created in tomee embedded test is deleted

Modified:
    openejb/trunk/openejb/assembly/tomee/tomee-embedded/pom.xml
    openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/EmbeddedTomEEContainerTest.java

Modified: openejb/trunk/openejb/assembly/tomee/tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-embedded/pom.xml?rev=1196872&r1=1196871&r2=1196872&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/tomee/tomee-embedded/pom.xml (original)
+++ openejb/trunk/openejb/assembly/tomee/tomee-embedded/pom.xml Wed Nov  2 23:47:45 2011
@@ -188,6 +188,13 @@
       <artifactId>tomee-catalina</artifactId>
       <version>4.0.0-beta-2-SNAPSHOT</version>
     </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.0.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
 

Modified: openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/EmbeddedTomEEContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/EmbeddedTomEEContainerTest.java?rev=1196872&r1=1196871&r2=1196872&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/EmbeddedTomEEContainerTest.java (original)
+++ openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/EmbeddedTomEEContainerTest.java Wed Nov  2 23:47:45 2011
@@ -1,5 +1,6 @@
 package org.apache.tomee.embedded;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.openejb.OpenEjbContainer;
 import org.apache.openejb.util.IOUtils;
 import org.junit.Test;
@@ -40,8 +41,10 @@ public class EmbeddedTomEEContainerTest 
             assertEquals("true", IOUtils.readProperties(url).getProperty("ok"));
             container.close();
         } finally {
-            if (!war.delete()) {
-                war.deleteOnExit();
+            try {
+                FileUtils.forceDelete(war);
+            } catch (IOException e) {
+                FileUtils.deleteQuietly(war);
             }
         }
     }