[jboss-cvs] JBossAS SVN: r88580 - in branches/Branch_5_x_BootstrapLegacyRemoval/testsuite: src/main/org/jboss/test/jmx/mbean and 1 other directories.

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

Author: ALRubinger
Date: 2009-05-09 23:31:45 -0400 (Sat, 09 May 2009)
New Revision: 88580

Modified:
   branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/.classpath
   branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/build.xml
   branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/src/main/org/jboss/test/jmx/mbean/TestDeployer.java
   branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/src/main/org/jboss/test/jmx/xmbean/XMLAttributePersistenceManagerTestService.java
Log:
[JBAS-6856] Switch up compilation dependencies to new bootstrap impl for the testsuite

Modified: branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/.classpath
===================================================================
--- branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/.classpath	2009-05-09 22:04:50 UTC (rev 88579)
+++ branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/.classpath	2009-05-10 03:31:45 UTC (rev 88580)
@@ -51,8 +51,10 @@
 	<classpathentry kind="lib" path="/thirdparty/org/jboss/ws/lib/jbossws-common.jar" sourcepath="/thirdparty/org/jboss/ws/lib/jbossws-common-src.zip"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/org/slf4j/lib/slf4j-api.jar" sourcepath="/thirdparty/org/slf4j/lib/slf4j-api-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/org/jboss/slf4j/lib/slf4j-jboss-logging.jar" sourcepath="/thirdparty/org/jboss/slf4j/lib/slf4j-jboss-logging-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi/lib/jboss-bootstrap-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-as/lib/jboss-bootstrap-spi-as.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap-spi-mc/lib/jboss-bootstrap-spi-mc.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/build.xml
===================================================================
--- branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/build.xml	2009-05-09 22:04:50 UTC (rev 88579)
+++ branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/build.xml	2009-05-10 03:31:45 UTC (rev 88580)
@@ -243,7 +243,9 @@
       <path refid="jboss.security.int.classpath"/>
       <path refid="jboss.server.classpath"/>
       <path refid="jboss.main.classpath"/>
-      <path refid="jboss.jboss.bootstrap.impl.as.classpath"/>
+      <path refid="jboss.jboss.bootstrap.spi.as.classpath"/>
+   	  <path refid="jboss.jboss.bootstrap.spi.mc.classpath"/>
+      <path refid="jboss.jboss.bootstrap.spi.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.test.classpath"/>

Modified: branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/src/main/org/jboss/test/jmx/mbean/TestDeployer.java
===================================================================
--- branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/src/main/org/jboss/test/jmx/mbean/TestDeployer.java	2009-05-09 22:04:50 UTC (rev 88579)
+++ branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/src/main/org/jboss/test/jmx/mbean/TestDeployer.java	2009-05-10 03:31:45 UTC (rev 88580)
@@ -21,21 +21,9 @@
  */
 package org.jboss.test.jmx.mbean;
 
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-import javax.management.RuntimeMBeanException;
-import javax.management.loading.MLet;
-
 import java.io.File;
 
-import org.jboss.system.Service;
 import org.jboss.system.ServiceMBeanSupport;
-
 import org.jboss.system.server.ServerConfigLocator;
 
 /**
@@ -55,7 +43,7 @@
 {
    public String getBaseDir() throws Exception
    {
-      File file = ServerConfigLocator.locate().getServerHomeDir();
+      File file = new File(ServerConfigLocator.locate().getServerHomeLocation().toURI());
 
       return file.getCanonicalPath();
    }

Modified: branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/src/main/org/jboss/test/jmx/xmbean/XMLAttributePersistenceManagerTestService.java
===================================================================
--- branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/src/main/org/jboss/test/jmx/xmbean/XMLAttributePersistenceManagerTestService.java	2009-05-09 22:04:50 UTC (rev 88579)
+++ branches/Branch_5_x_BootstrapLegacyRemoval/testsuite/src/main/org/jboss/test/jmx/xmbean/XMLAttributePersistenceManagerTestService.java	2009-05-10 03:31:45 UTC (rev 88580)
@@ -55,7 +55,7 @@
    protected void startService()
       throws Exception
    {
-      File tmpDir = ServerConfigLocator.locate().getServerTempDir();
+      File tmpDir = new File(ServerConfigLocator.locate().getServerTempLocation().toURI());
       boolean result;
       
       // Get a temporary file in the server tmp dir, with a space in its name