Author: jeff.yuchang Date: 2009-06-01 01:56:51 -0400 (Mon, 01 Jun 2009) New Revision: 548 Modified: idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMDeployer.java idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml idm/trunk/integration/pom.xml Log: * Update deployer. Modified: idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMDeployer.java =================================================================== --- idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMDeployer.java 2009-05-31 23:25:59 UTC (rev 547) +++ idm/trunk/integration/deployer/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMDeployer.java 2009-06-01 05:56:51 UTC (rev 548) @@ -7,6 +7,8 @@ import java.lang.reflect.Method; import java.sql.Connection; import java.sql.DatabaseMetaData; +import java.sql.SQLException; +import java.util.logging.Level; import java.util.logging.Logger; import javax.naming.InitialContext; @@ -177,23 +179,30 @@ } - private void checkTargetDB(String datasource) throws Exception{ - DataSource ds = (DataSource)new InitialContext().lookup(datasource); + private void checkTargetDB(String datasource) { + Connection conn = null; Dialect dialectName = null; try { + DataSource ds = (DataSource)new InitialContext().lookup(datasource); conn = ds.getConnection(); DatabaseMetaData meta = conn.getMetaData(); String databaseName = meta.getDatabaseProductName(); int databaseMajorVersion = getDatabaseMajorVersion(meta); dialectName = DialectFactory.determineDialect(databaseName, databaseMajorVersion); logger.fine("Detected dialect " + dialectName + ", database is (" + databaseName + "," + databaseMajorVersion + ")"); + } catch (Exception e) { + logger.warning(e.getMessage()); } finally { if (conn != null) { - conn.close(); + try { + conn.close(); + } catch (SQLException e) { + logger.log(Level.SEVERE, "error in closing the connection", e); + } } } } Modified: idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml =================================================================== --- idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml 2009-05-31 23:25:59 UTC (rev 547) +++ idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml 2009-06-01 05:56:51 UTC (rev 548) @@ -8,4 +8,11 @@ <hibernateConfiguration>jboss.idm.hibernate.cfg.xml</hibernateConfiguration> <hibernateSessionFactoryJNDIName>java:/IDMHibernateSessionFactory</hibernateSessionFactoryJNDIName> </hibernateDeployer> + <initializers> + <datasource>java:/jbossidmDS</datasource> + <sqlInitializer> + <sqlFile>idm-sql/jboss.idm.@database@.create.sql</sqlFile> + <exitSQL>select * from jbid_io</exitSQL> + </sqlInitializer> + </initializers> </jboss-idm-deployer> Modified: idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml =================================================================== --- idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml 2009-05-31 23:25:59 UTC (rev 547) +++ idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml 2009-06-01 05:56:51 UTC (rev 548) @@ -86,6 +86,26 @@ <attributes/> <options/> </identity-object-type> + <identity-object-type> + <name>unit</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>unit</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> </supported-identity-object-types> <options> <option> Modified: idm/trunk/integration/pom.xml =================================================================== --- idm/trunk/integration/pom.xml 2009-05-31 23:25:59 UTC (rev 547) +++ idm/trunk/integration/pom.xml 2009-06-01 05:56:51 UTC (rev 548) @@ -19,6 +19,7 @@ <modules> <module>jboss5</module> + <module>deployer</module> </modules> <!-- Plugins -->