svn commit: r478875 - in /geronimo/server/trunk: applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/ modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/ modules/geronimo-activemq-gbean/src/mai...

[va...@apache.org]

Author: vamsic007
Date: Fri Nov 24 05:28:42 2006
New Revision: 478875

URL: http://svn.apache.org/viewvc?view=rev&rev=478875
Log:
GERONIMO-2566 Creating new listeners for ActiveMQ from JMS Server portlet fails

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java
    geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java
    geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java

Modified: geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java?view=diff&rev=478875&r1=478874&r2=478875
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/util/KernelManagementHelper.java Fri Nov 24 05:28:42 2006
@@ -368,7 +368,13 @@
     }
 
     public Object getObject(AbstractName objectName) {
-        return kernel.getProxyManager().createProxy(objectName, KernelManagementHelper.class.getClassLoader());
+        ClassLoader cl = null;
+        try {
+            cl = kernel.getClassLoaderFor(objectName);
+        } catch(GBeanNotFoundException e) {
+            cl = KernelManagementHelper.class.getClassLoader();
+        }
+        return kernel.getProxyManager().createProxy(objectName, cl);
     }
 
     public Artifact getConfigurationNameFor(AbstractName abstractName) {

Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java?view=diff&rev=478875&r1=478874&r2=478875
==============================================================================
--- geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java Fri Nov 24 05:28:42 2006
@@ -32,7 +32,7 @@
 /**
  * Default implementation of the ActiveMQ connector
  *
- * @version $Revision$
+ * @version $Revision$ $Date$
  */
 public class TransportConnectorGBeanImpl implements GBeanLifecycle, ActiveMQConnector {
     private Log log = LogFactory.getLog(getClass().getName());
@@ -165,7 +165,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder("ActiveMQ Transport Connector", TransportConnectorGBeanImpl.class, CONNECTOR_J2EE_TYPE);
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic("ActiveMQ Transport Connector", TransportConnectorGBeanImpl.class, CONNECTOR_J2EE_TYPE);
         infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
         infoBuilder.addAttribute("url", String.class.getName(), false);
         infoBuilder.addReference("brokerService", BrokerServiceGBean.class);

Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java?view=diff&rev=478875&r1=478874&r2=478875
==============================================================================
--- geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java Fri Nov 24 05:28:42 2006
@@ -48,7 +48,7 @@
  * Implementation of the ActiveMQ management interface.  These are the ActiveMQ
  * management features available at runtime.
  *
- * @version $Revision: 1.0$
+ * @version $Revision$Date$
  */
 public class ActiveMQManagerGBean implements ActiveMQManager {
     private static final Log log = LogFactory.getLog(ActiveMQManagerGBean.class.getName());
@@ -198,7 +198,7 @@
         connector.setAttribute("protocol", protocol);
         connector.setAttribute("host", host);
         connector.setAttribute("port", new Integer(port));
-        connector.setReferencePattern("activeMQContainer", brokerAbstractName);
+        connector.setReferencePattern("brokerService", brokerAbstractName);
         EditableConfigurationManager mgr = ConfigurationUtil.getEditableConfigurationManager(kernel);
         if(mgr != null) {
             try {