10:17 a.m.
Author: jeff.yuchang
Date: 2009-04-22 11:17:41 -0400 (Wed, 22 Apr 2009)
New Revision: 450
Modified:
idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java
idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml
idm/trunk/integration/jboss5/src/main/resources/assembly.xml
Log:
* Refactor the IDMService, using the @JMX instead.
* update the jboss-beans.xml, adding the dependency for datasource.
Modified:
idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java
===================================================================
---
idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java 2009-04-21
03:58:16 UTC (rev 449)
+++
idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java 2009-04-22
15:17:41 UTC (rev 450)
@@ -5,9 +5,9 @@
import java.util.logging.Logger;
-import javax.management.MBeanServer;
import javax.naming.InitialContext;
+import org.jboss.aop.microcontainer.aspects.jmx.JMX;
import org.jboss.identity.idm.api.IdentitySessionFactory;
import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl;
@@ -18,6 +18,7 @@
* @author Jeff Yu
*
*/
+(a)JMX(exposedInterface=IDMServiceMBean.class,
name="jboss.identity:service=IDMService")
public class IDMService implements IDMServiceMBean {
public final static String DEFAULT_JNDI = "java:/IdentitySessionFactory";
@@ -29,14 +30,11 @@
private String idmSessionFactoryJNDI;
private String SQLScript;
-
- private MBeanServer mbeanServer;
-
+
private IdentitySessionFactory sessionFactory;
- public IDMService(String idmConfigFile, MBeanServer mbeanServer) {
+ public IDMService(String idmConfigFile) {
this.idmConfigFile = idmConfigFile;
- this.mbeanServer = mbeanServer;
}
@@ -61,9 +59,8 @@
}
- public void create() throws Exception {
+ public void start() throws Exception {
logger.info("Starting the JBoss Identity Management Service");
- mbeanServer.registerMBean(this, IDMServiceMBean.OBJECT_NAME);
startIdentitySessionFactory();
logger.info("Started the JBoss Identity Management Service");
}
@@ -74,9 +71,11 @@
context.bind(getIdmSessionFactoryJNDI(), sessionFactory);
}
+ public void stop() throws Exception {
+ logger.info("Stopping the JBoss Identity Management Service");
+ }
+
public void destroy() throws Exception {
- logger.info("Stopping the JBoss Identity Management Service");
- mbeanServer.unregisterMBean(IDMServiceMBean.OBJECT_NAME);
sessionFactory.close();
InitialContext context = new InitialContext();
context.unbind(getIdmSessionFactoryJNDI());
Modified:
idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml
===================================================================
---
idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml 2009-04-21
03:58:16 UTC (rev 449)
+++
idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml 2009-04-22
15:17:41 UTC (rev 450)
@@ -9,10 +9,10 @@
class="org.jboss.identity.idm.integration.jboss5.IDMService">
<constructor>
<parameter>jboss-idm.xml</parameter>
- <parameter><inject bean="JMXKernel"
property="mbeanServer"/></parameter>
</constructor>
<property
name="idmSessionFactoryJNDI">java:/IdentitySessionFactory</property>
<property
name="SQLScript">hsql/idm.create.hsqldb.sql</property>
+ <depends>jboss.jca:service=DataSourceBinding,name=jbossidmDS</depends>
</bean>
</deployment>
\ No newline at end of file
Modified: idm/trunk/integration/jboss5/src/main/resources/assembly.xml
===================================================================
--- idm/trunk/integration/jboss5/src/main/resources/assembly.xml 2009-04-21 03:58:16 UTC
(rev 449)
+++ idm/trunk/integration/jboss5/src/main/resources/assembly.xml 2009-04-22 15:17:41 UTC
(rev 450)
@@ -12,7 +12,7 @@
<includes>
<include>META-INF/*.xml</include>
<include>jboss-idm.xml</include>
- <include>hibernate-jboss-identity.cfg.xml</include>
+ <include>jboss.idm.hibernate.cfg.xml</include>
</includes>
</fileSet>
</fileSets>