[jboss-cvs] JBossAS SVN: r94794 - branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx.

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

Author: alesj
Date: 2009-10-13 17:07:19 -0400 (Tue, 13 Oct 2009)
New Revision: 94794

Modified:
   branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java
Log:
[JBAS-7347]; port hibernate-int to vfs3.

Modified: branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java
===================================================================
--- branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java	2009-10-13 20:35:38 UTC (rev 94793)
+++ branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java	2009-10-13 21:07:19 UTC (rev 94794)
@@ -21,11 +21,9 @@
  */
 package org.jboss.hibernate.jmx;
 
-import java.io.IOException;
 import java.net.URL;
 import java.util.Date;
 import java.util.Properties;
-
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
@@ -220,8 +218,7 @@
             buffer.append("@org.jboss.aop.microcontainer.aspects.jmx.JMX(name=\"").append(hibernateStatisticsServiceName).append("JMX\"");
             buffer.append(", exposedInterface=").append(StatisticsServiceMBean.class.getName()).append(".class, registerDirectly=true)");
             String jmxAnnotation = buffer.toString();
-            // todo - add the @JMX into annotations
-            //builder.addAnnotation(jmxAnnotation);
+            builder.addAnnotation(jmxAnnotation);
             controller.install(builder.getBeanMetaData(), hibernateStatisticsService);
          }
 
@@ -273,14 +270,14 @@
       }
    }
 
-   private void handleMappings(Configuration cfg) throws IOException
+   private void handleMappings(Configuration cfg) throws Exception
    {
       if (root == null)
       {
          if (harUrl == null)
             throw new IllegalArgumentException("Must set one of the resources, root or harUrl: " + this);
 
-         root = VFS.getRoot(harUrl);
+         root = VFS.getChild(harUrl);
       }
 
       log.debug("Scanning for Hibernate mappings, root: " + root);