[jboss-cvs] JBossAS SVN: r80934 - in trunk: testsuite/src/main/org/jboss/test/jmx/test and 1 other directory.

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

Author: alesj
Date: 2008-11-13 08:50:04 -0500 (Thu, 13 Nov 2008)
New Revision: 80934

Modified:
   trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
   trunk/testsuite/src/main/org/jboss/test/jmx/test/UndeployBrokenPackageUnitTestCase.java
Log:
Add some comments to help further dev.

Modified: trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java	2008-11-13 13:33:44 UTC (rev 80933)
+++ trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java	2008-11-13 13:50:04 UTC (rev 80934)
@@ -805,6 +805,13 @@
       {
          try
          {
+/*
+            // disable reaper for old deployments
+            // currently I (alesj) have no idea why this custom enable doesn't work
+            VFS vfs = VFS.getVFS(url);
+            VFSUtils.enableNoReaper(vfs);
+            VirtualFile file = vfs.getRoot();
+*/
             VirtualFile file = VFS.getRoot(url);
             VFSDeployment deployment = deploymentFactory.createVFSDeployment(file);
             delegate.addDeployment(deployment);

Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/UndeployBrokenPackageUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/UndeployBrokenPackageUnitTestCase.java	2008-11-13 13:33:44 UTC (rev 80933)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/UndeployBrokenPackageUnitTestCase.java	2008-11-13 13:50:04 UTC (rev 80934)
@@ -23,16 +23,10 @@
 
 import java.io.File;
 import javax.management.ObjectName;
-import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.jboss.test.JBossTestCase;
-import org.jboss.test.jmx.eardeployment.a.interfaces.SessionA;
-import org.jboss.test.jmx.eardeployment.a.interfaces.SessionAHome;
-import org.jboss.test.jmx.eardeployment.b.interfaces.SessionB;
-import org.jboss.test.jmx.eardeployment.b.interfaces.SessionBHome;
-import org.jboss.deployers.client.spi.IncompleteDeploymentException;
 import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.test.JBossTestCase;
 import org.jboss.util.file.Files;
 
 /** Tests of reployment of bad deployment packages
@@ -137,7 +131,9 @@
 
       try
       {
-         thejar.delete();
+         if (thejar.exists())
+            assertTrue(thejar.delete());
+
          Files.copy(badjar, thejar);
          getLog().info("Deploying testPackage: " + testPackage);
          try 
@@ -150,6 +146,7 @@
             log.info("caught exception as expected", e);
          }
 
+         //assertTrue(thejar.delete()); // TODO - this should work
          Files.copy(goodjar, thejar);
          getLog().info("Redeploying testPackage: " + testPackage);