Author: jeff.yuchang Date: 2009-11-13 06:22:34 -0500 (Fri, 13 Nov 2009) New Revision: 939 Removed: idm/trunk/integration/deployer/src/main/resources/setupdata.txt Modified: 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/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/HibernatePopulator.java idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java Log: * remove the setupdata.txt. 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-11-13 11:00:24 UTC (rev 938) +++ idm/trunk/integration/deployer/src/main/resources/META-INF/default-jboss-idm.xml 2009-11-13 11:22:34 UTC (rev 939) @@ -10,13 +10,12 @@ </hibernateDeployer> <initializers> <datasource>java:/jbossidmDS</datasource> - <!-- sqlInitializer> + <sqlInitializer> <sqlFile>idm-sql/jboss.idm.@database@.create.sql</sqlFile> <exitSQL>select * from jbid_io</exitSQL> - </sqlInitializer--> - <hibernateInitializer> + </sqlInitializer> + <!-- hibernateInitializer> <doChecking>true</doChecking> - <setupLocation>setupdata.txt</setupLocation> - </hibernateInitializer> + </hibernateInitializer--> </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-11-13 11:00:24 UTC (rev 938) +++ idm/trunk/integration/deployer/src/main/resources/jboss.idm.cfg.xml 2009-11-13 11:22:34 UTC (rev 939) @@ -93,6 +93,10 @@ <value>java:/IDMHibernateSessionFactory</value> </option> <option> + <name>addHibernateMappings</name> + <value>false</value> + </option> + <option> <name>populateRelationshipTypes</name> <value>true</value> </option> Modified: idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml =================================================================== --- idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-13 11:00:24 UTC (rev 938) +++ idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-13 11:22:34 UTC (rev 939) @@ -30,10 +30,12 @@ <property name="show_sql">false</property> <property name="cache.use_second_level_cache">true</property> - <property name="cache.use_query_cache">false</property> + <property name="cache.use_query_cache">true</property> <property name="current_session_context_class">thread</property> - + + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + <!--<property name="connection.datasource"></property>--> <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbossidm</property> Deleted: idm/trunk/integration/deployer/src/main/resources/setupdata.txt =================================================================== --- idm/trunk/integration/deployer/src/main/resources/setupdata.txt 2009-11-13 11:00:24 UTC (rev 938) +++ idm/trunk/integration/deployer/src/main/resources/setupdata.txt 2009-11-13 11:22:34 UTC (rev 939) @@ -1,77 +0,0 @@ -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential; -import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; -import org.jboss.identity.idm.impl.api.PasswordCredential; - - -try -{ - session = SessionFactory.openSession(); - tx = session.beginTransaction(); - - HibernateRealm realm = new HibernateRealm("realm://JBossIdentity"); - session.save(realm); - - HibernateIdentityObjectType typeUser = new HibernateIdentityObjectType("USER"); - HibernateIdentityObjectType typeGroup = new HibernateIdentityObjectType("GROUP"); - - session.save(typeUser); - session.save(typeGroup); - - HibernateIdentityObject userUserObject = new HibernateIdentityObject("user", typeUser, realm); - HibernateIdentityObject userGroupObject = new HibernateIdentityObject("User", typeGroup, realm); - HibernateIdentityObject adminUserObject = new HibernateIdentityObject("admin", typeUser, realm); - HibernateIdentityObject adminGroupObject = new HibernateIdentityObject("Admin", typeGroup, realm); - - session.save(userUserObject); - session.save(userGroupObject); - session.save(adminUserObject); - session.save(adminGroupObject); - - HibernateIdentityObjectCredentialType passwordType = new HibernateIdentityObjectCredentialType("PASSWORD"); - - session.save(passwordType); - - HibernateIdentityObjectCredential pass1 = new HibernateIdentityObjectCredential(); - PasswordCredential passwordValue = new PasswordCredential("user"); - pass1.setType(passwordType); - pass1.setTextValue(passwordValue.getEncodedValue().toString()); - userUserObject.addCredential(pass1); - - session.save(pass1); - - HibernateIdentityObjectCredential pass2 = new HibernateIdentityObjectCredential(); - passwordValue = new PasswordCredential("admin"); - pass2.setType(passwordType); - pass2.setTextValue(passwordValue.getEncodedValue().toString()); - adminUserObject.addCredential(pass2); - - - session.save(pass2); - - HibernateIdentityObjectRelationshipType membership = new HibernateIdentityObjectRelationshipType("JBOSS_IDENTITY_MEMBERSHIP"); - - session.save(membership); - - HibernateIdentityObjectRelationship rel1 = new HibernateIdentityObjectRelationship(membership, adminGroupObject, adminUserObject); - HibernateIdentityObjectRelationship rel2 = new HibernateIdentityObjectRelationship(membership, userGroupObject, adminUserObject); - HibernateIdentityObjectRelationship rel3 = new HibernateIdentityObjectRelationship(membership, userGroupObject, userUserObject); - - session.save(rel1); - session.save(rel2); - session.save(rel3); - - session.flush(); - - tx.commit(); -} -finally -{ - if (session != null) { - session.close(); - } -} Modified: idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/HibernatePopulator.java =================================================================== --- idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/HibernatePopulator.java 2009-11-13 11:00:24 UTC (rev 938) +++ idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/HibernatePopulator.java 2009-11-13 11:22:34 UTC (rev 939) @@ -45,15 +45,12 @@ private boolean doChecking; - private String setupLocation; - private Configuration config; private SessionFactory sessionFactory; public HibernatePopulator(boolean doChecking, Configuration config) { this.doChecking = doChecking; - this.setupLocation = setupLocation; this.config = config; } 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-11-13 11:00:24 UTC (rev 938) +++ idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java 2009-11-13 11:22:34 UTC (rev 939) @@ -3,22 +3,15 @@ */ package org.jboss.identity.idm.integration.jboss5; -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; import javax.naming.NamingException; -import javax.sql.DataSource; import javax.transaction.TransactionManager; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.resolver.DialectFactory; import org.jboss.identity.idm.api.IdentitySessionFactory; import org.jboss.identity.idm.api.cfg.IdentityConfiguration; import org.jboss.identity.idm.common.exception.IdentityException; @@ -165,10 +158,6 @@ deployHibernateSessionFactory(context); } - if (datasource != null) { - checkTargetDB(datasource); - } - if (needToInitializeDBFromScript()) { SQLPopulator sqlPopulator = new SQLPopulator(datasource, SQLScript, exitSQL); sqlPopulator.populateSchema(); @@ -297,51 +286,4 @@ return false; } - private int getDatabaseMajorVersion(DatabaseMetaData meta) - { - try - { - Method gdbmvMethod = DatabaseMetaData.class.getMethod("getDatabaseMajorVersion", null); - return ((Integer)gdbmvMethod.invoke(meta, null)).intValue(); - } - catch (NoSuchMethodException nsme) - { - return 0; - } - catch (Throwable t) - { - logger.info("could not get database version from JDBC metadata"); - return 0; - } - } - - - 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.buildDialect(null, conn); - logger.fine("Detected dialect " + dialectName + ", database is (" + databaseName + "," + databaseMajorVersion + ")"); - } catch (Exception e) { - logger.warning(e.getMessage()); - } - finally - { - if (conn != null) { - try { - conn.close(); - } catch (SQLException e) { - logger.log(Level.SEVERE, "error in closing the connection", e); - } - } - } - } - }