[jboss-cvs] JBossAS SVN: r60195 - in branches/Branch_4_2: hibernate-int/src/main/org/jboss/hibernate/jmx and 2 other directories.

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

Author: scott.stark at jboss.org
Date: 2007-02-02 10:58:02 -0500 (Fri, 02 Feb 2007)
New Revision: 60195

Modified:
   branches/Branch_4_2/console/src/main/org/jboss/console/manager/PluginManager.java
   branches/Branch_4_2/hibernate-int/src/main/org/jboss/hibernate/jmx/Hibernate.java
   branches/Branch_4_2/messaging/src/main/org/jboss/mq/kernel/Queue.java
   branches/Branch_4_2/messaging/src/main/org/jboss/mq/kernel/Topic.java
   branches/Branch_4_2/messaging/src/main/org/jboss/mq/server/jmx/DestinationMBeanSupport.java
Log:
Use the common version of org.jboss.util.naming.Util


Modified: branches/Branch_4_2/console/src/main/org/jboss/console/manager/PluginManager.java
===================================================================
--- branches/Branch_4_2/console/src/main/org/jboss/console/manager/PluginManager.java	2007-02-02 15:08:26 UTC (rev 60194)
+++ branches/Branch_4_2/console/src/main/org/jboss/console/manager/PluginManager.java	2007-02-02 15:58:02 UTC (rev 60195)
@@ -49,6 +49,7 @@
 import org.jboss.jmx.adaptor.rmi.RMIRemoteMBeanProxy;
 import org.jboss.system.Registry;
 import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.util.naming.Util;
 
 /**
  * Main service for the administration console: aggregate all information from
@@ -480,7 +481,7 @@
    {
       InitialContext ctx = new InitialContext ();      
       Object proxy = RMIRemoteMBeanProxy.create (PluginManagerMBean.class, this.getServiceName (), this.getServer ());         
-      org.jboss.naming.Util.rebind (ctx, this.jndiName, proxy);
+      Util.rebind (ctx, this.jndiName, proxy);
    }
    
    protected void initNotificationReception () throws Exception

Modified: branches/Branch_4_2/hibernate-int/src/main/org/jboss/hibernate/jmx/Hibernate.java
===================================================================
--- branches/Branch_4_2/hibernate-int/src/main/org/jboss/hibernate/jmx/Hibernate.java	2007-02-02 15:08:26 UTC (rev 60194)
+++ branches/Branch_4_2/hibernate-int/src/main/org/jboss/hibernate/jmx/Hibernate.java	2007-02-02 15:58:02 UTC (rev 60195)
@@ -50,7 +50,7 @@
 import org.jboss.hibernate.cache.DeployedTreeCacheProvider;
 import org.jboss.logging.Logger;
 import org.jboss.mx.loading.RepositoryClassLoader;
-import org.jboss.naming.Util;
+import org.jboss.util.naming.Util;
 import org.jboss.system.ServiceMBeanSupport;
 
 /**

Modified: branches/Branch_4_2/messaging/src/main/org/jboss/mq/kernel/Queue.java
===================================================================
--- branches/Branch_4_2/messaging/src/main/org/jboss/mq/kernel/Queue.java	2007-02-02 15:08:26 UTC (rev 60194)
+++ branches/Branch_4_2/messaging/src/main/org/jboss/mq/kernel/Queue.java	2007-02-02 15:58:02 UTC (rev 60195)
@@ -28,11 +28,12 @@
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanException;
 import javax.management.ReflectionException;
+
 import org.jboss.mq.SpyQueue;
 import org.jboss.mq.server.JMSDestinationManager;
 import org.jboss.mq.server.JMSQueue;
 import org.jboss.mq.SpyDestination;
-import org.jboss.naming.Util;
+import org.jboss.util.naming.Util;
 
 /**
  * lite wrapper so that this can work in a dependency injection framework.

Modified: branches/Branch_4_2/messaging/src/main/org/jboss/mq/kernel/Topic.java
===================================================================
--- branches/Branch_4_2/messaging/src/main/org/jboss/mq/kernel/Topic.java	2007-02-02 15:08:26 UTC (rev 60194)
+++ branches/Branch_4_2/messaging/src/main/org/jboss/mq/kernel/Topic.java	2007-02-02 15:58:02 UTC (rev 60195)
@@ -22,16 +22,18 @@
 package org.jboss.mq.kernel;
 
 import java.util.Hashtable;
+
+import javax.jms.JMSException;
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanException;
 import javax.management.ReflectionException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.jms.*;
+
+import org.jboss.mq.SpyTopic;
 import org.jboss.mq.server.JMSDestinationManager;
 import org.jboss.mq.server.JMSTopic;
-import org.jboss.mq.SpyTopic;
-import org.jboss.naming.Util;
+import org.jboss.util.naming.Util;
 
 /**
  * Comment

Modified: branches/Branch_4_2/messaging/src/main/org/jboss/mq/server/jmx/DestinationMBeanSupport.java
===================================================================
--- branches/Branch_4_2/messaging/src/main/org/jboss/mq/server/jmx/DestinationMBeanSupport.java	2007-02-02 15:08:26 UTC (rev 60194)
+++ branches/Branch_4_2/messaging/src/main/org/jboss/mq/server/jmx/DestinationMBeanSupport.java	2007-02-02 15:58:02 UTC (rev 60195)
@@ -35,9 +35,9 @@
 import javax.management.MBeanException;
 import javax.management.ReflectionException;
 
+import org.jboss.logging.Logger;
 import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.naming.Util;
-import org.jboss.logging.Logger;
+import org.jboss.util.naming.Util;
 
 import org.jboss.mq.MessageStatistics;
 import org.jboss.mq.SpyDestination;