Author: tchemit Date: 2013-04-23 23:25:03 +0200 (Tue, 23 Apr 2013) New Revision: 2710 Url: http://nuiton.org/projects/topia/repository/revisions/2710 Log: fix api Modified: trunk/ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - *.ipr *.iws .classpath *.iml .project target .settings .idea + *.ipr *.iws .classpath *.iml .project target .settings .idea atlassian-ide-plugin.xml Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-04-23 17:45:03 UTC (rev 2709) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-04-23 21:25:03 UTC (rev 2710) @@ -24,19 +24,10 @@ */ package org.nuiton.topia.framework; -import java.net.URL; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Iterator; -import java.util.Properties; -import java.util.StringTokenizer; -import java.util.regex.Pattern; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Configuration; import org.hibernate.dialect.Dialect; -import org.hibernate.internal.SessionFactoryImpl; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; import org.hibernate.service.ServiceRegistry; @@ -51,6 +42,14 @@ import org.nuiton.util.RecursiveProperties; import org.nuiton.util.Resource; +import java.net.URL; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Iterator; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.regex.Pattern; + /** * TODO-fdesbois-20100507 : Need javadoc + translations for existing methods. * @@ -178,7 +177,7 @@ try { TopiaContextImplementor txi = (TopiaContextImplementor) tx; - + Configuration configuration = txi.getHibernateConfiguration(); PersistentClass classMapping = configuration.getClassMapping(entityName); @@ -199,9 +198,8 @@ "could not find entity with name " + entityName); } - SessionFactoryImpl sfi = (SessionFactoryImpl)txi.getHibernateFactory(); - ServiceRegistry serviceRegistry = sfi.getServiceRegistry(); - ConnectionProvider connectionProvider = serviceRegistry.getService(ConnectionProvider.class); + ConnectionProvider connectionProvider = + getConnectionProvider(configuration); Dialect dialect = Dialect.getDialect(configuration.getProperties()); @@ -267,9 +265,8 @@ "could not find entity with name " + entityName); } - ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings( - configuration.getProperties()).buildServiceRegistry(); - ConnectionProvider connectionProvider = serviceRegistry.getService(ConnectionProvider.class); + ConnectionProvider connectionProvider = + getConnectionProvider(configuration); Dialect dialect = Dialect.getDialect(configuration.getProperties()); @@ -313,9 +310,8 @@ try { - ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings( - configuration.getProperties()).buildServiceRegistry(); - ConnectionProvider connectionProvider = serviceRegistry.getService(ConnectionProvider.class); + ConnectionProvider connectionProvider = + getConnectionProvider(configuration); Dialect dialect = Dialect.getDialect(configuration.getProperties()); @@ -369,6 +365,12 @@ return true; } + protected static ConnectionProvider getConnectionProvider(Configuration configuration) { + ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings( + configuration.getProperties()).buildServiceRegistry(); + return serviceRegistry.getService(ConnectionProvider.class); + } + /** * Return hibernate schema name *