[jboss-cvs] JBossAS SVN: r84000 - in trunk: testsuite/imports/sections and 1 other directories.

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

Author: alesj
Date: 2009-02-09 09:50:19 -0500 (Mon, 09 Feb 2009)
New Revision: 84000

Modified:
   trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
   trunk/testsuite/imports/sections/util.xml
   trunk/testsuite/src/main/org/jboss/test/util/test/SchedulerUnitTestCase.java
Log:
Avoid caching (as we don't explictily control that root).
Avoid .. at top level - too cache/root dependant.

Modified: trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java	2009-02-09 13:55:52 UTC (rev 83999)
+++ trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java	2009-02-09 14:50:19 UTC (rev 84000)
@@ -805,14 +805,8 @@
       {
          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);
+            // avoid caching
+            VirtualFile file = VFS.createNewRoot(url);
             VFSDeployment deployment = deploymentFactory.createVFSDeployment(file);
             delegate.addDeployment(deployment);
             deploymentName = deployment.getName();

Modified: trunk/testsuite/imports/sections/util.xml
===================================================================
--- trunk/testsuite/imports/sections/util.xml	2009-02-09 13:55:52 UTC (rev 83999)
+++ trunk/testsuite/imports/sections/util.xml	2009-02-09 14:50:19 UTC (rev 84000)
@@ -35,5 +35,7 @@
             <include name="org/jboss/test/util/mbean/**"/>
          </fileset>
       </jar>      
+      <!-- The service -->
+      <copy tofile="${build.lib}/test-default-scheduler-service.xml" file="${build.resources}/util/test-default-scheduler-service.xml"/>
    </target>
 </project>

Modified: trunk/testsuite/src/main/org/jboss/test/util/test/SchedulerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/util/test/SchedulerUnitTestCase.java	2009-02-09 13:55:52 UTC (rev 83999)
+++ trunk/testsuite/src/main/org/jboss/test/util/test/SchedulerUnitTestCase.java	2009-02-09 14:50:19 UTC (rev 84000)
@@ -46,9 +46,9 @@
 public class SchedulerUnitTestCase
    extends JBossTestCase
 {
+   // avoid .. in top
+   private String file = "test-default-scheduler-service.xml";
 
-   private String file = "../resources/util/test-default-scheduler-service.xml";
-
    /**
     * Constructor for the SchedulerUnitTestCase object
     *