Author: bdaw Date: 2009-02-03 05:32:25 -0500 (Tue, 03 Feb 2009) New Revision: 298 Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateTestBase.java Log: - improve how HibernateEntityManagerFactory is constructetd in Hibernate store Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-02-02 22:36:02 UTC (rev 297) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-02-03 10:32:25 UTC (rev 298) @@ -171,13 +171,14 @@ supportedFeatures = new FeaturesMetaDataImpl(configurationMD, supportedIdentityObjectSearchControls, true, new HashSet<String>()); - String persistenceUnit = configurationMD.getOptionSingleValue(PERSISTENCE_UNIT); String populateMembershipTypes = configurationMD.getOptionSingleValue(POPULATE_MEMBERSHIP_TYPES); String populateIdentityObjectTypes = configurationMD.getOptionSingleValue(POPULATE_IDENTITY_OBJECT_TYPES); - HibernateEntityManager em = bootstrapHibernateEntityManager(persistenceUnit); + emFactory = bootstrapHibernateEntityManager(configurationMD); + HibernateEntityManager em = (HibernateEntityManager)emFactory.createEntityManager(); + // Attribute mappings - helper structures for (IdentityObjectTypeMetaData identityObjectTypeMetaData : configurationMD.getSupportedIdentityTypes()) @@ -300,17 +301,18 @@ } // this is separate method to allow easier testing - protected HibernateEntityManager bootstrapHibernateEntityManager(String persistenceUnit) throws IdentityException + protected HibernateEntityManagerFactory bootstrapHibernateEntityManager(IdentityStoreConfigurationMetaData configurationMD) throws IdentityException { + + String persistenceUnit = configurationMD.getOptionSingleValue(PERSISTENCE_UNIT); + if (persistenceUnit == null) { throw new IdentityException("Persistence Unit not defined for IdentityStore: " + getId()); } - emFactory = (HibernateEntityManagerFactory)Persistence.createEntityManagerFactory(persistenceUnit); + return (HibernateEntityManagerFactory)Persistence.createEntityManagerFactory(persistenceUnit); - return (HibernateEntityManager)emFactory.createEntityManager(); - } Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java 2009-02-02 22:36:02 UTC (rev 297) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java 2009-02-03 10:32:25 UTC (rev 298) @@ -61,7 +61,12 @@ return em; } + public HibernateEntityManagerFactory getHibernateEntityManagerFactory() + { + return emFactory; + } + public void start() throws Exception { try { logger.info("Starting in-memory HSQL database for unit tests"); Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-02-02 22:36:02 UTC (rev 297) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-02-03 10:32:25 UTC (rev 298) @@ -38,6 +38,7 @@ import org.jboss.identity.idm.impl.api.SimpleAttribute; import org.jboss.identity.idm.exception.IdentityException; import org.hibernate.ejb.HibernateEntityManager; +import org.hibernate.ejb.HibernateEntityManagerFactory; import java.util.Map; import java.io.File; @@ -91,9 +92,9 @@ } @Override - protected HibernateEntityManager bootstrapHibernateEntityManager(String persistenceUnit) throws IdentityException + protected HibernateEntityManagerFactory bootstrapHibernateEntityManager(IdentityStoreConfigurationMetaData configurationMD) throws IdentityException { - return em; + return emFactory; } }; Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateTestBase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateTestBase.java 2009-02-02 22:36:02 UTC (rev 297) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateTestBase.java 2009-02-03 10:32:25 UTC (rev 298) @@ -27,6 +27,7 @@ import java.util.logging.Logger; import org.hibernate.ejb.HibernateEntityManager; +import org.hibernate.ejb.HibernateEntityManagerFactory; import org.jboss.identity.idm.impl.store.hibernate.HibernateModelTestCase; import org.jboss.identity.idm.impl.HibernateTestSupport; @@ -42,7 +43,11 @@ protected HibernateEntityManager em; + protected HibernateEntityManagerFactory emFactory; + + + public HibernateTestBase(String testName) { super(testName); } @@ -51,6 +56,7 @@ protected void setUp() throws Exception { super.setUp(); hibernateSupport.start(); + emFactory = hibernateSupport.getHibernateEntityManagerFactory(); em = hibernateSupport.getHibernateEntityManager(); }