From d8f3d385b9ce3f5aa68400d18d86a106b38a4b20 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 24 Aug 2010 20:37:10 +0000
Subject: Merge revision 959617 from trunk into the 1.6.1 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@988713 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca-java-1.6.1/itest/osgi-implementation/pom.xml       | 14 ++++++++++++++
 .../src/test/java/util/OSGiTestUtil.java                   |  9 +++++++++
 2 files changed, 23 insertions(+)

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/pom.xml
index fd16af6962..c19ea167d0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/pom.xml
@@ -144,6 +144,12 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.4</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -196,6 +202,14 @@
                     </executions>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <forkMode>pertest</forkMode>
+                    </configuration>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
index 7b95c12038..4639d7a692 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
@@ -18,6 +18,9 @@
  */
 package util;
 
+import java.io.File;
+import org.apache.commons.io.FileUtils;
+
 import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
 
 
@@ -37,6 +40,12 @@ public  class OSGiTestUtil  {
         String felixConfigFileName = "file:target/test-classes/osgi/felix/felix.config.properties";
         
         System.setProperty("felix.config.properties", felixConfigFileName);
+
+		// delete any cached OSGI bundles left over from previous test executions
+		File felixCache = new File("target/.felix");
+		if (felixCache.exists()) {
+		    FileUtils.cleanDirectory(felixCache);
+		}
         
         try {
             
-- 
cgit v1.2.3