[jboss-identity-commits] JBoss Identity SVN: r444 - in idm/trunk: distro/src/main/resources/installer and 5 other directories.

Author: jeff.yuchang Date: 2009-04-20 00:16:33 -0400 (Mon, 20 Apr 2009) New Revision: 444 Added: idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/ idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/ idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/ 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/IDMServiceMBean.java Removed: idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/integration/ Modified: idm/trunk/distro/scripts/antrun-installer.xml idm/trunk/distro/scripts/assembly-deploy-artifacts.xml idm/trunk/distro/src/main/resources/installer/install-definition.xml idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml Log: Refactor the IDMService pakcage name, add the 'idm'. Add the sources into distribution. (Trying to remove the assembly module, as the distro will contain all of it) Modified: idm/trunk/distro/scripts/antrun-installer.xml =================================================================== --- idm/trunk/distro/scripts/antrun-installer.xml 2009-04-19 18:26:53 UTC (rev 443) +++ idm/trunk/distro/scripts/antrun-installer.xml 2009-04-20 04:16:33 UTC (rev 444) @@ -46,7 +46,7 @@ </ant> <sql driver="org.hsqldb.jdbcDriver" - url="jdbc:hsqldb:file:target/db/jbossIdm" + url="jdbc:hsqldb:file:target/db/jbossidm" userid="sa" password="" onerror="continue"> Modified: idm/trunk/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- idm/trunk/distro/scripts/assembly-deploy-artifacts.xml 2009-04-19 18:26:53 UTC (rev 443) +++ idm/trunk/distro/scripts/assembly-deploy-artifacts.xml 2009-04-20 04:16:33 UTC (rev 444) @@ -32,7 +32,8 @@ <scope>test</scope> <unpack>false</unpack> </dependencySet> - <!-- resources --> + + <!-- modules --> <dependencySet> <outputDirectory>modules</outputDirectory> <useStrictFiltering>true</useStrictFiltering> @@ -52,5 +53,35 @@ </includes> <outputDirectory></outputDirectory> </fileSet> + + <!-- source --> + <fileSet> + <directory>../idm-common/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../idm-model/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../idm-api/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../idm-spi/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../idm/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../integration/jboss5/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../integration/jboss5/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> </fileSets> </assembly> \ No newline at end of file Modified: idm/trunk/distro/src/main/resources/installer/install-definition.xml =================================================================== --- idm/trunk/distro/src/main/resources/installer/install-definition.xml 2009-04-19 18:26:53 UTC (rev 443) +++ idm/trunk/distro/src/main/resources/installer/install-definition.xml 2009-04-20 04:16:33 UTC (rev 444) @@ -111,16 +111,17 @@ <pack name="jbossIdm Installation Files" required="yes" preselected="yes"> <description>Installation directory containing docs, libs, and sources</description> - <!-- jbossIdm/ --> + <!-- jbossidm/doc--> <file src=&quot;(a){deploy.artifacts.dir}/jboss.eula.txt&quot; targetdir="$INSTALL_PATH" override="true" /> <file src=&quot;(a){deploy.artifacts.dir}/license.txt&quot; targetdir="$INSTALL_PATH" override="true" /> - <!-- jbossIdm/doc --> + <!-- jbossidm--> <fileset dir=&quot;(a){deploy.artifacts.dir}/db.scripts&quot; targetdir="$INSTALL_PATH/db" /> <fileset dir=&quot;(a){deploy.artifacts.dir}/resources&quot; targetdir="$INSTALL_PATH/resources" /> <fileset dir=&quot;(a){deploy.artifacts.dir}/modules&quot; targetdir="$INSTALL_PATH/modules" /> + <fileset dir=&quot;(a){deploy.artifacts.dir}/src&quot; targetdir="$INSTALL_PATH/src" /> - <!-- jbpm4/lib --> + <!-- jbbossidm/lib --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/lib" override="true"> <include name="*.jar" /> </fileset> Added: 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 (rev 0) +++ idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java 2009-04-20 04:16:33 UTC (rev 444) @@ -0,0 +1,86 @@ +/** + * + */ +package org.jboss.identity.idm.integration.jboss5; + +import java.util.logging.Logger; + +import javax.management.MBeanServer; +import javax.naming.InitialContext; + +import org.jboss.identity.idm.api.IdentitySessionFactory; +import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; + + +/** + * Start the {@link IdentitySessionFactory}, and register it in the JNDI. + * + * @author Jeff Yu + * + */ +public class IDMService implements IDMServiceMBean { + + public final static String DEFAULT_JNDI = "java:/IdentitySessionFactory"; + + private static Logger logger = Logger.getLogger(IDMService.class.getName()); + + private String idmConfigFile; + + private String idmSessionFactoryJNDI; + + private String SQLScript; + + private MBeanServer mbeanServer; + + private IdentitySessionFactory sessionFactory; + + public IDMService(String idmConfigFile, MBeanServer mbeanServer) { + this.idmConfigFile = idmConfigFile; + this.mbeanServer = mbeanServer; + + } + + public String getIdmConfigFile() { + return this.idmConfigFile; + } + + public String getIdmSessionFactoryJNDI() { + return idmSessionFactoryJNDI; + } + + public String getSQLScript() { + return this.SQLScript; + } + + public void setIdmSessionFactoryJNDI(String idmSessionFactoryJNDI) { + this.idmSessionFactoryJNDI = idmSessionFactoryJNDI; + } + + public void setSQLScript(String script) { + SQLScript = script; + } + + + public void create() 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"); + } + + private void startIdentitySessionFactory() throws Exception { + sessionFactory = new IdentityConfigurationImpl().configure(getIdmConfigFile()).buildIdentitySessionFactory(); + InitialContext context = new InitialContext(); + context.bind(getIdmSessionFactoryJNDI(), sessionFactory); + } + + 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()); + logger.info("Stopped the JBoss Identity Management Service"); + } + +} Added: idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMServiceMBean.java =================================================================== --- idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMServiceMBean.java (rev 0) +++ idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMServiceMBean.java 2009-04-20 04:16:33 UTC (rev 444) @@ -0,0 +1,28 @@ +/** + * + */ +package org.jboss.identity.idm.integration.jboss5; + +import javax.management.ObjectName; + +import org.jboss.mx.util.ObjectNameFactory; + + +/** + * + * Interface for exposing JMX operations. + * + * @author Jeff Yu + * + */ +public interface IDMServiceMBean { + + ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.identity:service=IDMService"); + + String getIdmConfigFile() ; + + String getIdmSessionFactoryJNDI(); + + String getSQLScript(); + +} 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-19 18:26:53 UTC (rev 443) +++ idm/trunk/integration/jboss5/src/main/resources/META-INF/idm-service-jboss-beans.xml 2009-04-20 04:16:33 UTC (rev 444) @@ -6,7 +6,7 @@ IDM Service --> <bean name="jboss.identity:service=IDMService" - class="org.jboss.identity.integration.jboss5.IDMService"> + class="org.jboss.identity.idm.integration.jboss5.IDMService"> <constructor> <parameter>jboss-idm.xml</parameter> <parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter>