[jboss-cvs] JBossAS SVN: r110992 - projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2011-03-21 23:14:04 -0400 (Mon, 21 Mar 2011)
New Revision: 110992

Modified:
   projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/EmbeddedJcaDiscover.java
Log:
[JBJCA-522] add undeploy rar files in the stop lifecycle

Modified: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/EmbeddedJcaDiscover.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/EmbeddedJcaDiscover.java	2011-03-22 02:49:05 UTC (rev 110991)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/EmbeddedJcaDiscover.java	2011-03-22 03:14:04 UTC (rev 110992)
@@ -33,6 +33,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.jboss.logging.Logger;
 
@@ -60,6 +62,9 @@
    /** ManagementRepository */
    private ManagementRepository mr = null;
    
+   /** URL of rar file */
+   private List<URL> rarUrls = new ArrayList<URL>();
+   
    /** 
     * singleton getInstance
     * 
@@ -95,8 +100,9 @@
          
          //embedJCA.deploy(EmbeddedJcaDiscover.class.getResource("h2-ds.xml"));
          
-         deployFile("/xa.rar");
+         URL deployedURL = deployFile("/xa.rar");
          logger.debug("xa.rar deployed");
+         rarUrls.add(deployedURL);
          
          stopped = false;
       }
@@ -112,7 +118,7 @@
     * 
     * @param fileName file name
     */
-   private void deployFile(String fileName)
+   private URL deployFile(String fileName)
    {
       URL url = EmbeddedJcaDiscover.class.getResource(fileName);
       try
@@ -122,7 +128,8 @@
          copyURLToFile(url, outputFile);
          URL finalURL = outputFile.toURI().toURL();
          embedJCA.deploy(finalURL);
-         outputFile.deleteOnExit();
+         //outputFile.deleteOnExit();
+         return finalURL;
       }
       catch (Throwable e)
       {
@@ -207,6 +214,10 @@
    {
       try
       {
+         for (URL url : rarUrls)
+         {
+            embedJCA.undeploy(url);
+         }
          embedJCA.shutdown();
          mr = null;
          stopped = true;