[portal-commits] JBoss Portal SVN: r8807 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service and 1 other directories.
Author: thomas.heute(a)jboss.com
Date: 2007-10-31 08:29:22 -0400 (Wed, 31 Oct 2007)
New Revision: 8807
Modified:
branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java
modules/identity/trunk/identity/src/main/org/jboss/portal/identity/boot/IdentityServiceLoader.java
Log:
JBPORTAL-1730: unregister Service mbean before registering if necessary
Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-10-31 09:08:45 UTC
(rev 8806)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-10-31 12:29:22 UTC
(rev 8807)
@@ -47,11 +47,11 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common"
version="1.0.0"/>
+ <componentref name="jboss-portal/modules/common"
version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/web"
version="1.0.0"/>
<componentref name="jboss-portal/modules/test"
version="1.0.0"/>
<componentref name="jboss-portal/modules/portlet"
version="trunk-SNAPSHOT"/>
- <componentref name="jboss-portal/modules/identity"
version="1.0.0"/>
+ <componentref name="jboss-portal/modules/identity"
version="trunk-SNAPSHOT"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.1.1"/>
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java 2007-10-31
09:08:45 UTC (rev 8806)
+++
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java 2007-10-31
12:29:22 UTC (rev 8807)
@@ -134,6 +134,14 @@
getServer().registerMBean(mbean, new ObjectName(serviceName));
}
+ protected void unregisterMBean(String serviceName) throws Exception
+ {
+ ObjectName on = new ObjectName(serviceName);
+ if (getServer().isRegistered(on))
+ {
+ getServer().unregisterMBean(on);
+ }
+ }
protected ServiceJNDIBinder getServiceJNDIBinder() throws Exception
{
Modified:
modules/identity/trunk/identity/src/main/org/jboss/portal/identity/boot/IdentityServiceLoader.java
===================================================================
---
modules/identity/trunk/identity/src/main/org/jboss/portal/identity/boot/IdentityServiceLoader.java 2007-10-31
09:08:45 UTC (rev 8806)
+++
modules/identity/trunk/identity/src/main/org/jboss/portal/identity/boot/IdentityServiceLoader.java 2007-10-31
12:29:22 UTC (rev 8807)
@@ -97,12 +97,9 @@
//register as an mbean
if (isRegisterMBeans() && (ds.getServiceName() != null))
{
-
+ unregisterMBean(ds.getServiceName());
registerMBean(ds.getServiceName(), datasource);
-
}
-
-
}
}
@@ -149,11 +146,10 @@
//register as an mbean
if (isRegisterMBeans() && (module.getServiceName() != null))
{
+ unregisterMBean(module.getServiceName());
registerMBean(module.getServiceName(), moduleServiceObject);
-
}
}
-
}
/**
@@ -167,6 +163,16 @@
}
/**
+ * Should be extended to provide mbean registration
+ * @param serviceName
+ * @param serviceObject
+ */
+ protected void unregisterMBean(String serviceName) throws Exception
+ {
+ //does nothing
+ }
+
+ /**
* Should be extended to provide JNDI binder
* @return
*/