[jboss-cvs] JBossAS SVN: r59656 - in trunk/embedded: src/main/java/org/jboss/embedded and 1 other directories.

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

Author: bill.burke at jboss.com
Date: 2007-01-15 16:10:52 -0500 (Mon, 15 Jan 2007)
New Revision: 59656

Modified:
   trunk/embedded/build.xml
   trunk/embedded/src/main/java/org/jboss/embedded/JMXKernel.java
   trunk/embedded/src/main/java/org/jboss/embedded/ServerConfig.java
   trunk/embedded/src/main/java/org/jboss/embedded/junit/ClasspathBasedTestServices.java
Log:
merge to HEAD

Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml	2007-01-15 20:42:03 UTC (rev 59655)
+++ trunk/embedded/build.xml	2007-01-15 21:10:52 UTC (rev 59656)
@@ -93,6 +93,7 @@
          <path refid="quartz.quartz.classpath"/>
          <path refid="jboss.jbossws.classpath"/>
          <path refid="jboss.jbossxb.classpath"/>
+         <path refid="jboss.jboss.vfs.classpath"/>
          <path refid="jboss.web.classpath"/>
          <path refid="jacorb.jacorb.classpath"/>
          <!-- FIXME: temporary for EJBTHREE-485 -->
@@ -318,6 +319,7 @@
          <zipfileset src="${jboss.varia.lib}/hsqldb-plugin.jar"/>
          <zipfileset src="${jboss.mq.lib}/jbossmq.jar"/>
          <zipfileset src="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/>
+         <zipfileset src="${jboss.aspects.lib}/jboss-aop-deployer-jdk50.jar"/>
          <zipfileset src="${jboss.transaction.lib}/jboss-transaction.jar"/>
          <zipfileset src="${jboss.naming.lib}/jnpserver.jar"/>
          <zipfileset src="${jboss.j2ee.lib}/jboss-j2ee.jar"/>
@@ -334,6 +336,8 @@
          <zipfileset src="${jboss.microcontainer.lib}/jboss-aop-mc-int-boot.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-aop-mc-int-deployer.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-aop-mc-int.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-metatype.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-managed.jar"/>
          <zipfileset src="${jboss.server.lib}/jboss.jar"/>
          <zipfileset src="${jboss.remoting.lib}/jboss-remoting.jar"/>
          <zipfileset src="${jboss.j2se.lib}/jboss-j2se.jar"/>
@@ -351,6 +355,7 @@
          <zipfileset src="${jboss.jbossts.lib}/jbossts-common.jar"/>
          <zipfileset src="${jboss.jbossws.lib}/jboss-jaxrpc.jar"/>
          <zipfileset src="${jboss.jbossws.lib}/jboss-jaxws.jar"/>
+         <zipfileset src="${jboss.jboss.vfs.lib}/jboss-vfs.jar"/>
       </jar>
 
 

Modified: trunk/embedded/src/main/java/org/jboss/embedded/JMXKernel.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/JMXKernel.java	2007-01-15 20:42:03 UTC (rev 59655)
+++ trunk/embedded/src/main/java/org/jboss/embedded/JMXKernel.java	2007-01-15 21:10:52 UTC (rev 59656)
@@ -354,4 +354,16 @@
    {
       //To change body of implemented methods use File | Settings | File Templates.
    }
+
+
+   public String getSpecificationVersion()
+   {
+      return serverConfig.getSpecificationVersion();
+   }
+
+
+   public String getVersionNumber()
+   {
+      return "";
+   }
 }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/ServerConfig.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/ServerConfig.java	2007-01-15 20:42:03 UTC (rev 59655)
+++ trunk/embedded/src/main/java/org/jboss/embedded/ServerConfig.java	2007-01-15 21:10:52 UTC (rev 59656)
@@ -241,4 +241,10 @@
    {
       return config.getRootDeploymentFilename();
    }
+
+
+   public String getSpecificationVersion()
+   {
+      return config.getSpecificationVersion();
+   }
 }
\ No newline at end of file

Modified: trunk/embedded/src/main/java/org/jboss/embedded/junit/ClasspathBasedTestServices.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/junit/ClasspathBasedTestServices.java	2007-01-15 20:42:03 UTC (rev 59655)
+++ trunk/embedded/src/main/java/org/jboss/embedded/junit/ClasspathBasedTestServices.java	2007-01-15 21:10:52 UTC (rev 59656)
@@ -23,8 +23,10 @@
 
 import org.jboss.test.JBossTestServices;
 import org.jboss.embedded.Bootstrap;
+import org.jboss.embedded.JMXKernel;
 
 import javax.management.MBeanServerConnection;
+import javax.management.MBeanServer;
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.io.File;
@@ -74,7 +76,12 @@
    @Override
    public MBeanServerConnection getServer() throws Exception
    {
-      return super.getServer();    //To change body of overridden methods use File | Settings | File Templates.
+      if (server == null)
+      {
+         JMXKernel jmxKernel = (JMXKernel)bootstrap.getKernel().getRegistry().getEntry("JMXKernel").getTarget();
+         server = jmxKernel.getMbeanServer();
+      }
+      return server;
    }
 
    @Override