[webbeans-commits] Webbeans SVN: r1661 - in ri/trunk/jboss-tck-runner: src/main/java/org/jboss/webbeans/tck/integration/jbossas and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-02-23 14:43:17 -0500 (Mon, 23 Feb 2009)
New Revision: 1661

Modified:
   ri/trunk/jboss-tck-runner/pom.xml
   ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
   ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java
Log:
Attempt to fix windows undeploy problems...

Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml	2009-02-23 18:36:03 UTC (rev 1660)
+++ ri/trunk/jboss-tck-runner/pom.xml	2009-02-23 19:43:17 UTC (rev 1661)
@@ -195,6 +195,10 @@
                            <name>org.jboss.jsr299.tck.libraryDirectory</name>
                            <value>target/dependency/lib</value>
                         </property>
+                        <property>
+                           <name>org.jboss.jsr299.tck.outputDirectory</name>
+                           <value>target</value>
+                        </property>
                      </systemProperties>
                   </configuration>
                </plugin>

Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java	2009-02-23 18:36:03 UTC (rev 1660)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java	2009-02-23 19:43:17 UTC (rev 1661)
@@ -2,6 +2,7 @@
 
 import java.io.DataOutputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
@@ -184,6 +185,11 @@
       }
    }
    
+   public String getJbossHome() 
+   {
+      return jbossHome;
+   }
+   
    public void cleanup() throws IOException
    {
       if (jbossWasStarted)
@@ -227,7 +233,7 @@
       dump(p.getInputStream());
    }
 
-   protected static void dump(final InputStream is) 
+   protected void dump(final InputStream is) 
    {
       new Thread(new Runnable() 
       {
@@ -235,7 +241,7 @@
           {
              try 
              {
-                DataOutputStream out = new DataOutputStream(new FileOutputStream(System.getProperty("java.io.tmpdir") + File.separator + "jboss.log"));
+                DataOutputStream out = new DataOutputStream(new FileOutputStream(configuration.getOutputDirectory() + File.separator + "jboss.log"));
                 int c;
                 while((c = is.read()) != -1) 
                 {

Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java	2009-02-23 18:36:03 UTC (rev 1660)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java	2009-02-23 19:43:17 UTC (rev 1661)
@@ -3,6 +3,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.naming.InitialContext;
 
@@ -22,6 +24,8 @@
    
    private Logger log = Logger.getLogger(ProfileServiceContainersImpl.class);
    
+   private final List<String> failedUndeployments;
+   
    private DeploymentManager deploymentManager;
    private JBossTestServices testServices;
    private final File tmpdir;
@@ -35,6 +39,7 @@
       tmpdir = new File(System.getProperty("java.io.tmpdir"), "org.jboss.webbeans.tck.integration.jbossas");
       tmpdir.mkdir();
       tmpdir.deleteOnExit();
+      this.failedUndeployments = new ArrayList<String>();
    }
    
    
@@ -89,8 +94,15 @@
    {
       try
       {
-         deploymentManager.stop(DeploymentPhase.APPLICATION, name).run();
-         deploymentManager.undeploy(DeploymentPhase.APPLICATION, name).run();
+         DeploymentProgress stopProgress = deploymentManager.stop(DeploymentPhase.APPLICATION, name);
+         stopProgress.run();
+         
+         DeploymentProgress undeployProgress = deploymentManager.undeploy(DeploymentPhase.APPLICATION, name);
+         undeployProgress.run();
+         if (undeployProgress.getDeploymentStatus().isFailed())
+         {
+        	 failedUndeployments.add(name);
+         }
       }
       catch (Exception e)
       {
@@ -114,4 +126,31 @@
       VFS.init();
    }
    
+   @Override
+   public void cleanup() throws IOException 
+   {
+	  super.cleanup();
+	  List<String> remainingDeployments = new ArrayList<String>();
+	  for (String name : failedUndeployments)
+	  {
+		  try
+		  {
+			  DeploymentProgress undeployProgress = deploymentManager.undeploy(DeploymentPhase.APPLICATION, name);
+		      undeployProgress.run();
+		      if (undeployProgress.getDeploymentStatus().isFailed())
+		      {
+		    	  remainingDeployments.add(name);
+		      }
+		  }
+		  catch (Exception e) 
+		  {
+			  throw new IOException(e);
+		  }
+	   }
+	  if (remainingDeployments.size() > 0)
+	  {
+		  //log.error("Failed to undeploy these artifacts: " + remainingDeployments);
+	  }
+   }
+   
 }