December 2013 - Topia-commits - mailman.cloud.codelutin.com

r2930 - in trunk: . topia-it/src/test/java/org/nuiton/topia/it/legacy/framework topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/persistence
by athimel＠users.nuiton.org 18 Dec '13

18 Dec '13

Author: athimel Date: 2013-12-18 11:28:57 +0100 (Wed, 18 Dec 2013) New Revision: 2930 Url: http://nuiton.org/projects/topia/repository/revisions/2930 Log: refs #2969 Revert update to Hibernate 4.3.0.Final Modified: trunk/pom.xml trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HibernateProvider.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-18 10:19:45 UTC (rev 2929) +++ trunk/pom.xml 2013-12-18 10:28:57 UTC (rev 2930) @@ -240,7 +240,7 @@ <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <processorPluginVersion>1.3</processorPluginVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>4.3.0.Final</hibernateVersion> + <hibernateVersion>4.2.8.Final</hibernateVersion> <sl4jVersion>1.7.5</sl4jVersion> <h2Version>1.3.172</h2Version> <hamcrestVersion>1.3</hamcrestVersion> Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java 2013-12-18 10:19:45 UTC (rev 2929) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java 2013-12-18 10:28:57 UTC (rev 2930) @@ -36,11 +36,11 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; -import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator; -import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.service.UnknownUnwrapTypeException; +import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.Configurable; import org.hibernate.service.spi.Stoppable; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2013-12-18 10:19:45 UTC (rev 2929) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2013-12-18 10:28:57 UTC (rev 2930) @@ -28,11 +28,11 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; -import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator; -import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.service.UnknownUnwrapTypeException; +import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.Configurable; import org.hibernate.service.spi.Stoppable; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java 2013-12-18 10:19:45 UTC (rev 2929) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java 2013-12-18 10:28:57 UTC (rev 2930) @@ -48,7 +48,6 @@ import org.hibernate.event.spi.PreUpdateEventListener; import org.hibernate.event.spi.SaveOrUpdateEvent; import org.hibernate.event.spi.SaveOrUpdateEventListener; -import org.hibernate.persister.entity.EntityPersister; import org.nuiton.topia.TopiaDaoSupplier; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaHibernateSessionRegistry; @@ -137,11 +136,11 @@ } } - @Override - public boolean requiresPostCommitHanding(EntityPersister persister) { - // TODO AThimel 17/12/13 I don't know what to return - return false; - } +// @Override +// public boolean requiresPostCommitHanding(EntityPersister persister) { +// // TODO AThimel 17/12/13 I don't know what to return +// return false; +// } /* Chargement */ 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-12-18 10:19:45 UTC (rev 2929) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-12-18 10:28:57 UTC (rev 2930) @@ -28,14 +28,15 @@ import com.google.common.base.Supplier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.SessionFactory; -import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; import org.hibernate.dialect.Dialect; -import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; +import org.hibernate.service.ServiceRegistry; +import org.hibernate.service.ServiceRegistryBuilder; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; import org.hibernate.tool.hbm2ddl.TableMetadata; import org.nuiton.topia.TopiaContextFactory; @@ -171,11 +172,16 @@ public static boolean isSchemaExist(TopiaHibernateSupport topiaHibernateSupport, String entityName) { - SessionFactory sessionFactory = topiaHibernateSupport.getHibernateFactory(); - SessionFactory.SessionFactoryOptions sessionFactoryOptions = sessionFactory.getSessionFactoryOptions(); - StandardServiceRegistry standardServiceRegistry = sessionFactoryOptions.getServiceRegistry(); - ConnectionProviderSupplier connectionProviderSupplier = new ConnectionProviderSupplier(standardServiceRegistry); + SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) topiaHibernateSupport.getHibernateFactory(); + ServiceRegistryImplementor serviceRegistry = sessionFactoryImplementor.getServiceRegistry(); + ConnectionProviderSupplier connectionProviderSupplier = new ConnectionProviderSupplier(serviceRegistry); + // TODO AThimel 18/12/13 Check this code compatibility with Hibernate 4.3.0.Final +// SessionFactory sessionFactory = topiaHibernateSupport.getHibernateFactory(); +// SessionFactory.SessionFactoryOptions sessionFactoryOptions = sessionFactory.getSessionFactoryOptions(); +// StandardServiceRegistry standardServiceRegistry = sessionFactoryOptions.getServiceRegistry(); +// ConnectionProviderSupplier connectionProviderSupplier = new ConnectionProviderSupplier(standardServiceRegistry); + boolean exist = false; try { @@ -394,11 +400,16 @@ Configuration configuration = topiaHibernateSupport.getHibernateConfiguration(); - SessionFactory sessionFactory = topiaHibernateSupport.getHibernateFactory(); - SessionFactory.SessionFactoryOptions sessionFactoryOptions = sessionFactory.getSessionFactoryOptions(); - StandardServiceRegistry standardServiceRegistry = sessionFactoryOptions.getServiceRegistry(); - ConnectionProviderSupplier connectionProviderSupplier = new ConnectionProviderSupplier(standardServiceRegistry); + SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) topiaHibernateSupport.getHibernateFactory(); + ServiceRegistryImplementor serviceRegistry = sessionFactoryImplementor.getServiceRegistry(); + ConnectionProviderSupplier connectionProviderSupplier = new ConnectionProviderSupplier(serviceRegistry); + // TODO AThimel 18/12/13 Check this code compatibility with Hibernate 4.3.0.Final +// SessionFactory sessionFactory = topiaHibernateSupport.getHibernateFactory(); +// SessionFactory.SessionFactoryOptions sessionFactoryOptions = sessionFactory.getSessionFactoryOptions(); +// StandardServiceRegistry standardServiceRegistry = sessionFactoryOptions.getServiceRegistry(); +// ConnectionProviderSupplier connectionProviderSupplier = new ConnectionProviderSupplier(standardServiceRegistry); + try { ConnectionProvider connectionProvider = @@ -467,10 +478,16 @@ */ @Deprecated protected static ConnectionProvider getConnectionProvider(Configuration configuration) { - StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); Properties properties = configuration.getProperties(); - StandardServiceRegistry standardServiceRegistry = builder.applySettings(properties).build(); - ConnectionProvider result = standardServiceRegistry.getService(ConnectionProvider.class); + ServiceRegistryBuilder builder = new ServiceRegistryBuilder().applySettings(properties); + ServiceRegistry serviceRegistry = builder.buildServiceRegistry(); + ConnectionProvider result = serviceRegistry.getService(ConnectionProvider.class); + + // TODO AThimel 18/12/13 Check this code compatibility with Hibernate 4.3.0.Final +// StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); +// Properties properties = configuration.getProperties(); +// StandardServiceRegistry standardServiceRegistry = builder.applySettings(properties).build(); +// ConnectionProvider result = standardServiceRegistry.getService(ConnectionProvider.class); return result; } @@ -514,30 +531,38 @@ public static class ConnectionProviderSupplier implements Supplier<ConnectionProvider>, Closeable { - protected StandardServiceRegistry standardServiceRegistry; + protected ServiceRegistry serviceRegistry; + // TODO AThimel 18/12/13 Check this code compatibility with Hibernate 4.3.0.Final +// protected StandardServiceRegistry standardServiceRegistry; + protected ConnectionProvider connectionProvider; protected final boolean inlineRegistry; - public ConnectionProviderSupplier(StandardServiceRegistry standardServiceRegistry) { + public ConnectionProviderSupplier(ServiceRegistry standardServiceRegistry) { inlineRegistry = false; - this.standardServiceRegistry = standardServiceRegistry; + this.serviceRegistry = standardServiceRegistry; } public ConnectionProviderSupplier(Configuration configuration) { inlineRegistry = true; - StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); Properties properties = configuration.getProperties(); - this.standardServiceRegistry = builder.applySettings(properties).build(); + ServiceRegistryBuilder builder = new ServiceRegistryBuilder().applySettings(properties); + this.serviceRegistry = builder.buildServiceRegistry(); + // TODO AThimel 18/12/13 Check this code compatibility with Hibernate 4.3.0.Final +// StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); +// Properties properties = configuration.getProperties(); +// this.standardServiceRegistry = builder.applySettings(properties).build(); + } @Override public ConnectionProvider get() { if (connectionProvider == null) { - connectionProvider = standardServiceRegistry.getService(ConnectionProvider.class); + connectionProvider = serviceRegistry.getService(ConnectionProvider.class); } return connectionProvider; } @@ -545,7 +570,9 @@ @Override public void close() throws IOException { if (inlineRegistry) { - StandardServiceRegistryBuilder.destroy(standardServiceRegistry); + ServiceRegistryBuilder.destroy(serviceRegistry); + // TODO AThimel 18/12/13 Check this code compatibility with Hibernate 4.3.0.Final +// StandardServiceRegistryBuilder.destroy(standardServiceRegistry); } } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HibernateProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HibernateProvider.java 2013-12-18 10:19:45 UTC (rev 2929) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HibernateProvider.java 2013-12-18 10:28:57 UTC (rev 2930) @@ -36,14 +36,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.SessionFactory; -import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; -import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; import org.hibernate.service.ServiceRegistry; +import org.hibernate.service.ServiceRegistryBuilder; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.Stoppable; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaNotFoundException; @@ -207,7 +207,12 @@ if (hibernateSessionFactory != null) { hibernateSessionFactory.close(); // close connection provider if possible (http://nuiton.org/issues/2757) - ConnectionProvider service = hibernateSessionFactory.getSessionFactoryOptions().getServiceRegistry().getService(ConnectionProvider.class); + SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) hibernateSessionFactory; + ServiceRegistryImplementor serviceRegistry = sessionFactoryImplementor.getServiceRegistry(); + ConnectionProvider service = serviceRegistry.getService(ConnectionProvider.class); + + // TODO AThimel 18/12/13 Check this code compatibility with Hibernate 4.3.0.Final +// ConnectionProvider service = hibernateSessionFactory.getSessionFactoryOptions().getServiceRegistry().getService(ConnectionProvider.class); if (service instanceof Stoppable) { Stoppable stoppable = (Stoppable) service; stoppable.stop(); @@ -220,12 +225,19 @@ if (hibernateSessionFactory == null) { // init service registry - StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); Properties properties = getHibernateConfiguration().getProperties(); - StandardServiceRegistry standardServiceRegistry = builder.applySettings(properties).build(); + ServiceRegistryBuilder builder = new ServiceRegistryBuilder().applySettings(properties); + ServiceRegistry serviceRegistry = builder.buildServiceRegistry(); - hibernateSessionFactory = getHibernateConfiguration().buildSessionFactory(standardServiceRegistry); + hibernateSessionFactory = getHibernateConfiguration().buildSessionFactory(serviceRegistry); + // TODO AThimel 18/12/13 Check this code compatibility with Hibernate 4.3.0.Final +// StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); +// Properties properties = getHibernateConfiguration().getProperties(); +// StandardServiceRegistry standardServiceRegistry = builder.applySettings(properties).build(); +// +// hibernateSessionFactory = getHibernateConfiguration().buildSessionFactory(standardServiceRegistry); + // we can't reuse original serviceRegistry instance // we must call getServiceRegistry on factory to get a working one ServiceRegistry serviceRegistryInit = ((SessionFactoryImplementor) hibernateSessionFactory).getServiceRegistry();

1 0

r2929 - trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration
by tchemit＠users.nuiton.org 18 Dec '13

18 Dec '13

Author: tchemit Date: 2013-12-18 11:19:45 +0100 (Wed, 18 Dec 2013) New Revision: 2929 Url: http://nuiton.org/projects/topia/repository/revisions/2929 Log: fixes #2968: Can't execute sql script while migration Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2013-12-18 10:17:28 UTC (rev 2928) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2013-12-18 10:19:45 UTC (rev 2929) @@ -214,7 +214,7 @@ } PreparedStatement sta = connection.prepareStatement(sql); try { - sta.executeUpdate(); + sta.execute(); } finally { sta.close(); }

1 0

r2928 - in trunk: . src/site src/site/rst src/site/rst/user
by tchemit＠users.nuiton.org 18 Dec '13

18 Dec '13

Author: tchemit Date: 2013-12-18 11:17:28 +0100 (Wed, 18 Dec 2013) New Revision: 2928 Url: http://nuiton.org/projects/topia/repository/revisions/2928 Log: refs #1146: Update/clean all site documentation Modified: trunk/pom.xml trunk/src/site/rst/index.rst trunk/src/site/rst/user/howto.rst.vm trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-18 09:48:00 UTC (rev 2927) +++ trunk/pom.xml 2013-12-18 10:17:28 UTC (rev 2928) @@ -427,4 +427,46 @@ <excludeDefaults>true</excludeDefaults> </reporting> + <profiles> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-info</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + </plugins> + </reporting> + + </profile> + </profiles> </project> Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2013-12-18 09:48:00 UTC (rev 2927) +++ trunk/src/site/rst/index.rst 2013-12-18 10:17:28 UTC (rev 2928) @@ -35,7 +35,10 @@ ToPIA, pour Tools for Portable and Independant Architecture, est un framework d'abstraction des plateformes techniques. +|RECOMMENDED| +ToPIA est en cours de refonte (version 3.0). Pour plus d'informations, `suivez le guide de migration`_. + C'est à dire ? ~~~~~~~~~~~~~~ @@ -145,3 +148,7 @@ .. _ToPIA-service-migration: ./topia-service-migration .. _ToPIA-service-replication: ./topia-service-replication .. _ToPIA-service-security: ./topia-service-security + +.. _suivez le guide de migration: ./migrate_to_3.0.html + +.. |RECOMMENDED| image:: recommended.png \ No newline at end of file Modified: trunk/src/site/rst/user/howto.rst.vm =================================================================== --- trunk/src/site/rst/user/howto.rst.vm 2013-12-18 09:48:00 UTC (rev 2927) +++ trunk/src/site/rst/user/howto.rst.vm 2013-12-18 10:17:28 UTC (rev 2928) @@ -89,7 +89,7 @@ <defaultPackage>org.nuiton.topiatest</defaultPackage> <extractedPackages>org.nuiton.topiatest</extractedPackages> <templates> - org.nuiton.topia.generator.TopiaMetaTransformer + org.nuiton.topia.templates.TopiaMetaTransformer </templates> </configuration> <goals> @@ -119,7 +119,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.5.2</version> + <version>${project.version}</version> <scope>compile</scope> </dependency> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-12-18 09:48:00 UTC (rev 2927) +++ trunk/src/site/site_fr.xml 2013-12-18 10:17:28 UTC (rev 2928) @@ -68,13 +68,13 @@ <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + img="http://maven-site.forge.codelutin.com/common/0.2/images/logos/restructuredt…"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> + img="http://maven-site.forge.codelutin.com/common/0.2/images/logos/jrst-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> + img="http://maven-site.forge.codelutin.com/common/0.2/images/logos/argouml-logo.…"/> </poweredBy> @@ -82,11 +82,11 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + src="http://maven-site.forge.codelutin.com/common/0.2/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + href="http://maven-site.forge.codelutin.com/common/0.2/css/mavenpom-site.css"/> </head> <breadcrumbs> @@ -95,10 +95,10 @@ <menu name="Documentation" inherit="top"> <item name="Présentation" href="index.html" /> + <item name="Migration vers ToPIA 3.0" href="migrate_to_3.0.html" /> <item name="Utilisation" href="user/howto.html" /> <item name="Génération des modèles" href="user/ModelGeneration.html"/> <item name="Tag values" href="user/tagvalues.html" /> - <item name="TopiaQuery" href="user/TopiaQuery.html"/> <item name="FAQ" href="user/FAQ.html"/> </menu> @@ -141,7 +141,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",user/howto.html,user/ModelGenerator.html," + scmwebeditor_skipDefaultFiles="true"> </div> </footer> </body>

1 0

r2927 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by athimel＠users.nuiton.org 18 Dec '13

18 Dec '13

Author: athimel Date: 2013-12-18 10:48:00 +0100 (Wed, 18 Dec 2013) New Revision: 2927 Url: http://nuiton.org/projects/topia/repository/revisions/2927 Log: fixes #2970 Remove unecessary hardcoded or parameterized types in AbstractTopiaDao Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-12-17 16:02:49 UTC (rev 2926) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-12-18 09:48:00 UTC (rev 2927) @@ -390,163 +390,96 @@ protected long count(String hql, Map<String, Object> hqlParameters) { Preconditions.checkArgument(hql.toLowerCase().trim().startsWith("select count(")); - Long result = findUnique(hql, hqlParameters, Long.class); + Long result = findUnique(hql, hqlParameters); return result; } - protected E findUnique(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException { - E result = findUnique(hql, hqlParameters, getEntityClass()); - return result; - } - - protected E findUniqueOrNull(String hql, Map<String, Object> hqlParameters) throws TopiaNonUniqueResultException { - E result = findUniqueOrNull(hql, hqlParameters, getEntityClass()); - return result; - } - - protected Optional<E> tryFindUnique(String hql, Map<String, Object> hqlParameters) { - Optional<E> result = tryFindUnique(hql, hqlParameters, getEntityClass()); - return result; - } - - protected E findFirst(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException { - E result = findFirst(hql, hqlParameters, getEntityClass()); - return result; - } - - protected E findFirstOrNull(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { - E result = findFirstOrNull(hql, hqlParameters, getEntityClass()); - return result; - } - - protected Optional<E> tryFindFirst(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { - Optional<E> result = tryFindFirst(hql, hqlParameters, getEntityClass()); - return result; - } - - protected E findAny(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException { - E result = findAny(hql, hqlParameters, getEntityClass()); - return result; - } - - protected E findAnyOrNull(String hql, Map<String, Object> hqlParameters) { - E result = findAnyOrNull(hql, hqlParameters, getEntityClass()); - return result; - } - - protected Optional<E> tryFindAny(String hql, Map<String, Object> hqlParameters) { - Optional<E> result = tryFindAny(hql, hqlParameters, getEntityClass()); - return result; - } - - protected <R> R findUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) throws TopiaNoResultException, TopiaNonUniqueResultException { - R result = findUniqueOrNull(hql, hqlParameters, type); + protected <K> K findUnique(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException, TopiaNonUniqueResultException { + K result = findUniqueOrNull(hql, hqlParameters); if (result == null) { throw new TopiaNoResultException(hql, hqlParameters); } return result; } - protected <R> Optional<R> tryFindUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) throws TopiaNonUniqueResultException { - R uniqueOrNull = findUniqueOrNull(hql, hqlParameters, type); - Optional<R> result = Optional.fromNullable(uniqueOrNull); + protected <K> Optional<K> tryFindUnique(String hql, Map<String, Object> hqlParameters) throws TopiaNonUniqueResultException { + K uniqueOrNull = findUniqueOrNull(hql, hqlParameters); + Optional<K> result = Optional.fromNullable(uniqueOrNull); return result; } - protected <R> R findUniqueOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) throws TopiaNonUniqueResultException { - List<R> results = find(hql, hqlParameters, type, 0, 1); + protected <K> K findUniqueOrNull(String hql, Map<String, Object> hqlParameters) throws TopiaNonUniqueResultException { + List<K> results = find(hql, hqlParameters, 0, 1); // If there is more than 1 result, throw an exception if (results.size() > 1) { throw new TopiaNonUniqueResultException(hql, hqlParameters); } // otherwise return the first one, or null - R result = Iterables.getOnlyElement(results, null); + K result = Iterables.getOnlyElement(results, null); return result; } - protected <R> R findFirst(String hql, Map<String, Object> hqlParameters, Class<R> type) throws QueryMissingOrderException { - R result = findFirstOrNull(hql, hqlParameters, type); + protected <K> K findFirst(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { + K result = findFirstOrNull(hql, hqlParameters); if (result == null) { throw new TopiaNoResultException(hql, hqlParameters); } return result; } - protected <R> Optional<R> tryFindFirst(String hql, Map<String, Object> hqlParameters, Class<R> type) throws QueryMissingOrderException { - R firstOrNull = findFirstOrNull(hql, hqlParameters, type); - Optional<R> result = Optional.fromNullable(firstOrNull); + protected <K> Optional<K> tryFindFirst(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { + K firstOrNull = findFirstOrNull(hql, hqlParameters); + Optional<K> result = Optional.fromNullable(firstOrNull); return result; } - protected <R> R findFirstOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) throws QueryMissingOrderException { + protected <K> K findFirstOrNull(String hql, Map<String, Object> hqlParameters) throws QueryMissingOrderException { if ( ! hql.toLowerCase().contains("order by")) { throw new QueryMissingOrderException(hql, hqlParameters); } - R result = findAnyOrNull(hql, hqlParameters, type); + K result = findAnyOrNull(hql, hqlParameters); return result; } - protected <R> R findAny(String hql, Map<String, Object> hqlParameters, Class<R> type) throws TopiaNoResultException { - R result = findAnyOrNull(hql, hqlParameters, type); + protected <K> K findAny(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException { + K result = findAnyOrNull(hql, hqlParameters); if (result == null) { throw new TopiaNoResultException(hql, hqlParameters); } return result; } - protected <R> Optional<R> tryFindAny(String hql, Map<String, Object> hqlParameters, Class<R> type) { - R anyOrNull = findAnyOrNull(hql, hqlParameters, type); - Optional<R> result = Optional.fromNullable(anyOrNull); + protected <K> Optional<K> tryFindAny(String hql, Map<String, Object> hqlParameters) { + K anyOrNull = findAnyOrNull(hql, hqlParameters); + Optional<K> result = Optional.fromNullable(anyOrNull); return result; } - protected <R> R findAnyOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) { + protected <K> K findAnyOrNull(String hql, Map<String, Object> hqlParameters) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); - List<R> results = find(hql, hqlParameters, type, 0, 0); - R result = Iterables.getOnlyElement(results, null); + List<K> results = find(hql, hqlParameters, 0, 0); + K result = Iterables.getOnlyElement(results, null); return result; } - protected List<E> findAll(String hql, Map<String, Object> hqlParameters) { + protected <K> List<K> findAll(String hql, Map<String, Object> hqlParameters) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); - List<E> result = topiaJpaSupport.findAll(hql, hqlParameters); + List<K> result = topiaJpaSupport.findAll(hql, hqlParameters); return result; } - protected List<E> find(String hql, Map<String, Object> hqlParameters, int startIndex, int endIndex) { + protected <K> List<K> find(String hql, Map<String, Object> hqlParameters, int startIndex, int endIndex) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); - List<E> result = topiaJpaSupport.find(hql, startIndex, endIndex, hqlParameters); + List<K> result = topiaJpaSupport.find(hql, startIndex, endIndex, hqlParameters); return result; } - protected List<E> find(String hql, Map<String, Object> hqlParameters, TopiaPagerBean pager) { - List<E> result = find(hql, hqlParameters, getEntityClass(), pager); - return result; - } - - protected <R> List<R> findAll(String hql, Map<String, Object> hqlParameters, Class<R> type) { + protected <K> List<K> find(String hql, Map<String, Object> hqlParameters, TopiaPagerBean pager) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); - Preconditions.checkNotNull(type); - List<R> result = topiaJpaSupport.findAll(hql, hqlParameters); - return result; - } - - protected <R> List<R> find(String hql, Map<String, Object> hqlParameters, Class<R> type, int startIndex, int endIndex) { - Preconditions.checkNotNull(hql); - Preconditions.checkNotNull(hqlParameters); - Preconditions.checkNotNull(type); - List<R> result = topiaJpaSupport.find(hql, startIndex, endIndex, hqlParameters); - return result; - } - - protected <R> List<R> find(String hql, Map<String, Object> hqlParameters, Class<R> type, TopiaPagerBean pager) { - Preconditions.checkNotNull(hql); - Preconditions.checkNotNull(hqlParameters); - Preconditions.checkNotNull(type); Preconditions.checkNotNull(pager); if (StringUtils.isNotBlank(pager.getSortColumn())) { @@ -556,7 +489,7 @@ } } - List<R> result = topiaJpaSupport.find( + List<K> result = topiaJpaSupport.find( hql, (int) pager.getRecordStartIndex(), (int) pager.getRecordEndIndex() - 1, @@ -565,26 +498,19 @@ return result; } - protected Iterable<E> findAllLazy(String hql, Map<String, Object> hqlParameters) { - Iterable<E> result = findAllLazy(hql, hqlParameters, getEntityClass()); - return result; - } + protected <K> Iterable<K> findAllLazy(String hql, Map<String, Object> hqlParameters) { - protected <R> Iterable<R> findAllLazy(String hql, Map<String, Object> hqlParameters, Class<R> type) { - Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); - Preconditions.checkNotNull(type); - final Iterator<R> iterator = new FindAllIterator<E, R>(this, - type, + final Iterator<K> iterator = new FindAllIterator<E, K>(this, batchSize, hql, hqlParameters); - Iterable<R> result = new Iterable<R>() { + Iterable<K> result = new Iterable<K>() { @Override - public Iterator<R> iterator() { + public Iterator<K> iterator() { return iterator; } }; @@ -667,13 +593,12 @@ // return meta; // } - public static class FindAllIterator<E extends TopiaEntity, R> implements Iterator<R> { + public static class FindAllIterator<E extends TopiaEntity, K> implements Iterator<K> { - protected Iterator<R> data; + protected Iterator<K> data; protected final AbstractTopiaDao<E> dao; - protected final Class<R> type; protected final String hql; @@ -682,12 +607,10 @@ protected TopiaPagerBean pager; public FindAllIterator(AbstractTopiaDao<E> dao, - Class<R> type, int batchSize, String hql, Map<String, Object> params) { this.dao = dao; - this.type = type; this.hql = hql; this.params = params; @@ -717,7 +640,7 @@ } - public R next() { + public K next() { if (!hasNext()) { throw new NoSuchElementException(); } @@ -731,11 +654,12 @@ PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); // load new window of data - data = dao.find(hql, params, type, pager).iterator(); + List<K> values = dao.find(hql, params, pager); + data = values.iterator(); } - R next = data.next(); + K next = data.next(); return next; } @@ -1011,13 +935,13 @@ @Override public List<String> findAllIds() { String hqlWithSelectClause = "select topiaId " + hql; - return topiaDAO.findAll(hqlWithSelectClause, hqlParameters, String.class); + return topiaDAO.findAll(hqlWithSelectClause, hqlParameters); } @Override public List<String> findIds(int startIndex, int endIndex) { String hqlWithSelectClause = "select topiaId " + hql; - return topiaDAO.find(hqlWithSelectClause, hqlParameters, String.class, startIndex, endIndex); + return topiaDAO.find(hqlWithSelectClause, hqlParameters, startIndex, endIndex); } }

1 0

r2926 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/persistence/util topia-service-migration/src/main/java/org/nuiton/topia/migration topia-service-replication/src/test/java/org/nuiton/topia/replication topia-service-security/src/main/java/org/nuiton/topia/security topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization topia-service-security/src/main/java/org/nuiton/topia/security/entitie
by athimel＠users.nuiton.org 17 Dec '13

17 Dec '13

Author: athimel Date: 2013-12-17 17:02:49 +0100 (Tue, 17 Dec 2013) New Revision: 2926 Url: http://nuiton.org/projects/topia/repository/revisions/2926 Log: p***** static [final] No more 'to use log facility, just put in your code: log.info("...");' Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 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-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -67,7 +67,6 @@ */ public class TopiaUtil { - /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(TopiaUtil.class); /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -64,7 +64,6 @@ */ public class TopiaEntityHelper { - /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(TopiaEntityHelper.class); /** Le pattern d'une reference sur une association */ Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -52,7 +52,7 @@ public abstract class AbstractTopiaMigrationCallback { /** Logger */ - static private Log log = LogFactory.getLog(AbstractTopiaMigrationCallback.class); + private static final Log log = LogFactory.getLog(AbstractTopiaMigrationCallback.class); /** @return the available versions from the call back */ public abstract Version[] getAvailableVersions(); Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -47,7 +47,7 @@ public abstract class TopiaMigrationCallbackByMethod extends AbstractTopiaMigrationCallback { /** Logger */ - static private Log log = LogFactory.getLog(TopiaMigrationCallbackByMethod.class); + private static final Log log = LogFactory.getLog(TopiaMigrationCallbackByMethod.class); @Override protected void migrateForVersion(Version version, Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -66,9 +66,9 @@ */ public abstract class AbstractTopiaReplicationServiceTest extends Assert { - static protected AbstractTopiaApplicationContext sourceContext; + protected static AbstractTopiaApplicationContext sourceContext; - static protected TopiaPersistenceContext sourcePC; + protected static TopiaPersistenceContext sourcePC; protected AbstractTopiaApplicationContext destinationContext; @@ -76,13 +76,13 @@ protected ReplicationModel model; - static protected boolean init; + protected static boolean init; - static private Long testsTimeStamp; + private static Long testsTimeStamp; - static private File testsBasedir; + private static File testsBasedir; - static private final String TEST_BASEDIR = "target%1$ssurefire-tests%1$s%2$td_%2$tm_%2$tY%1$s%2$tH_%2$tM_%2$tS"; + private static final String TEST_BASEDIR = "target%1$ssurefire-tests%1$s%2$td_%2$tm_%2$tY%1$s%2$tH_%2$tM_%2$tS"; protected static final Function<Properties,AbstractTopiaApplicationContext> CREATE_TOPIA_TEST_APPLICATION_CONTEXT = new Function<Properties, AbstractTopiaApplicationContext>() { @Override Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -80,11 +80,11 @@ PetImpl.class.getName() + "," + RaceImpl.class.getName(); - static protected Person person, person2; + protected static Person person, person2; - static protected Pet pet, pet2; + protected static Pet pet, pet2; - static protected Race race, race2; + protected static Race race, race2; protected static File tesDir; Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -75,11 +75,11 @@ PetImpl.class.getName() + "," + RaceImpl.class.getName(); - static protected Person person, person2; + protected static Person person, person2; - static protected Pet pet, pet2, pet3; + protected static Pet pet, pet2, pet3; - static protected Race race, race2, race3; + protected static Race race, race2, race3; protected static File tesDir; Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -75,11 +75,11 @@ protected static final String entitiesList = PersonImpl.class.getName() + "," + PetImpl.class.getName() + "," + RaceImpl.class.getName(); - static protected Person person, person2; + protected static Person person, person2; - static protected Pet pet, pet2, pet3; + protected static Pet pet, pet2, pet3; - static protected Race race, race2, race3; + protected static Race race, race2, race3; protected static File tesDir; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -84,8 +84,7 @@ public class TopiaSecurityServiceImpl implements TopiaSecurityService, TopiaTransactionVetoable { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TopiaSecurityServiceImpl.class); + private static final Log log = LogFactory.getLog(TopiaSecurityServiceImpl.class); /* Context ToPIA */ Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -48,7 +48,7 @@ public class TopiaAssociationAuthorizationImpl extends TopiaAssociationAuthorizationAbstract { - static private Log log = LogFactory.getLog(TopiaAssociationAuthorizationImpl.class); + private static final Log log = LogFactory.getLog(TopiaAssociationAuthorizationImpl.class); private static final long serialVersionUID = 1L; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -37,8 +37,7 @@ */ public class TopiaUserImpl extends TopiaUserAbstract { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TopiaUserImpl.class); + private static final Log log = LogFactory.getLog(TopiaUserImpl.class); private static final long serialVersionUID = 1L; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -43,8 +43,7 @@ */ public class TopiaSecurityFactoryFilter { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TopiaSecurityUtil.class); + private static final Log log = LogFactory.getLog(TopiaSecurityUtil.class); private static final long serialVersionUID = 1L; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -70,8 +70,7 @@ */ public class TopiaSecurityUtil { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TopiaSecurityUtil.class); + private static final Log log = LogFactory.getLog(TopiaSecurityUtil.class); public static final int LOAD = 0x1; public static final String LOAD_TEXT = "LOAD"; @@ -132,7 +131,7 @@ * @param ch ? * @return ? */ - static public String digestSHAHex(String ch){ + public static String digestSHAHex(String ch){ if(ch == null){ return null; } Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -92,7 +92,7 @@ */ public class TaasService implements TopiaService, TopiaTransactionVetoable { - static private Log log = LogFactory.getLog(TaasService.class); + private static final Log log = LogFactory.getLog(TaasService.class); public static final String SERVICE_NAME = "taas"; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -60,8 +60,8 @@ */ public class TaasUtil { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TaasUtil.class); + + private static final Log log = LogFactory.getLog(TaasUtil.class); public static final int LOAD = 0x1; public static final String LOAD_TEXT = "LOAD"; @@ -109,7 +109,7 @@ * @param ch la chaine a traiter * @return le checksum SHA en mode hexadecimal */ - static public String digestSHAHex(String ch){ + public static String digestSHAHex(String ch){ if(ch == null){ return null; } Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -804,7 +804,7 @@ return classes; } - static public final Comparator<ObjectModelClass> + public static final Comparator<ObjectModelClass> OBJECT_MODEL_CLASS_COMPARATOR = new Comparator<ObjectModelClass>() {

1 0

r2925 - in trunk: . topia-it/src/main/resources topia-it/src/test/java/org/nuiton/topia/it/legacy/framework topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/persistence
by athimel＠users.nuiton.org 17 Dec '13

17 Dec '13

Author: athimel Date: 2013-12-17 16:56:08 +0100 (Tue, 17 Dec 2013) New Revision: 2925 Url: http://nuiton.org/projects/topia/repository/revisions/2925 Log: fixes #2969 Update to Hibernate 4.3.0.Final Modified: trunk/pom.xml trunk/topia-it/src/main/resources/TopiaContextImpl.properties trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HibernateProvider.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 09:33:06 UTC (rev 2924) +++ trunk/pom.xml 2013-12-17 15:56:08 UTC (rev 2925) @@ -240,7 +240,7 @@ <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <processorPluginVersion>1.3</processorPluginVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>4.2.8.Final</hibernateVersion> + <hibernateVersion>4.3.0.Final</hibernateVersion> <sl4jVersion>1.7.5</sl4jVersion> <h2Version>1.3.172</h2Version> <hamcrestVersion>1.3</hamcrestVersion> Modified: trunk/topia-it/src/main/resources/TopiaContextImpl.properties =================================================================== --- trunk/topia-it/src/main/resources/TopiaContextImpl.properties 2013-12-12 09:33:06 UTC (rev 2924) +++ trunk/topia-it/src/main/resources/TopiaContextImpl.properties 2013-12-17 15:56:08 UTC (rev 2925) @@ -31,4 +31,7 @@ hibernate.connection.password= hibernate.connection.driver_class=org.h2.Driver # tchemit 2010-11-28 : comment this line, each test must define his own db path -#hibernate.connection.url=jdbc:h2:file:target/surefire-workdir/h2data \ No newline at end of file +#hibernate.connection.url=jdbc:h2:file:target/surefire-workdir/h2data + +# AThimel 16/12/2013 : Uncomment the next line to tests the ToPIA connection provider +#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java 2013-12-12 09:33:06 UTC (rev 2924) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java 2013-12-17 15:56:08 UTC (rev 2925) @@ -28,7 +28,7 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Properties; @@ -36,10 +36,13 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; +import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator; +import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.config.ConfigurationHelper; -import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator; -import org.hibernate.service.jdbc.connections.internal.DriverManagerConnectionProviderImpl; +import org.hibernate.service.UnknownUnwrapTypeException; +import org.hibernate.service.spi.Configurable; +import org.hibernate.service.spi.Stoppable; /** * Customized connection provider. @@ -47,7 +50,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.5.3 */ -public class TopiaConnectionProviderHardCoded extends DriverManagerConnectionProviderImpl { +public class TopiaConnectionProviderHardCoded implements ConnectionProvider, Configurable, Stoppable { private String url; @@ -55,35 +58,57 @@ private Integer isolation; - private final ArrayList pool = new ArrayList(); + /** + * Our pool of connections which are not closed and availables. + */ + protected final List<Connection> pool; private int poolSize; + private boolean stopped; + private int checkedOut = 0; private boolean autocommit; - /** Logger. */ + /** + * Logger. + */ private static final Log log = LogFactory.getLog(TopiaConnectionProviderHardCoded.class); + public TopiaConnectionProviderHardCoded() { + pool = new ArrayList<Connection>(); + } + @Override public void configure(Map configurationValues) throws HibernateException { - String driverClass = (String)configurationValues.get(Environment.DRIVER); poolSize = ConfigurationHelper.getInt(Environment.POOL_SIZE, configurationValues, 20); //default pool size 20 - log.info("Using Hibernate built-in connection pool (not for production use!)"); - log.info("Hibernate connection pool size: " + poolSize); + if (log.isDebugEnabled()) { + log.debug("Connection pool size: " + poolSize); + } autocommit = ConfigurationHelper.getBoolean(Environment.AUTOCOMMIT, configurationValues); - log.info("autocommit mode: " + autocommit); + if (log.isDebugEnabled()) { + log.debug("autocommit mode: " + autocommit); + } isolation = ConfigurationHelper.getInteger(Environment.ISOLATION, configurationValues); - if (isolation != null) - log.info("JDBC isolation level: " + Environment.isolationLevelToString(isolation)); + if (isolation != null) { + if (log.isDebugEnabled()) { + log.debug("JDBC isolation level: " + + Environment.isolationLevelToString(isolation)); + } + } + String driverClass = ConfigurationHelper.getString(Environment.DRIVER, configurationValues); if (driverClass == null) { - log.warn("no JDBC Driver class was specified by property " + Environment.DRIVER); + + if (log.isWarnEnabled()) { + log.warn("no JDBC Driver class was specified by property " + + Environment.DRIVER); + } } else { try { // trying via forName() first to be as close to DriverManager's semantics @@ -103,7 +128,7 @@ // the real directory where db is and then make sure hibernate always // use the connection provider... String directory = - (String)configurationValues.get(TopiaConnectionProviderTest.TEST_URL); + (String) configurationValues.get(TopiaConnectionProviderTest.TEST_URL); url = directory; // url = props.getProperty(Environment.URL); @@ -116,19 +141,24 @@ connectionProps = ConnectionProviderInitiator.getConnectionProperties(configurationValues); - log.info("using driver: " + driverClass + " at URL: " + url); - // if debug level is enabled, then log the password, otherwise mask it if (log.isDebugEnabled()) { - log.info("connection properties: " + connectionProps); - } else if (log.isInfoEnabled()) { - log.info("connection properties: " + ConfigurationHelper.maskOut(connectionProps, "password")); + log.debug("using driver: " + driverClass + " at URL: " + url); } + + // if debug level is enabled, then log the password, otherwise mask it + if (log.isTraceEnabled()) { + log.debug("connection properties: " + connectionProps); + } else if (log.isDebugEnabled()) { + log.debug("connection properties: " + + ConfigurationHelper.maskOut(connectionProps, "password")); + } } @Override public Connection getConnection() throws SQLException { - if (log.isTraceEnabled()) + if (log.isTraceEnabled()) { log.trace("total checked-out connections: " + checkedOut); + } synchronized (pool) { if (!pool.isEmpty()) { @@ -137,11 +167,13 @@ log.trace("using pooled JDBC connection, pool size: " + last); } checkedOut++; - Connection pooled = (Connection) pool.remove(last); - if (isolation != null) + Connection pooled = pool.remove(last); + if (isolation != null) { pooled.setTransactionIsolation(isolation.intValue()); - if (pooled.getAutoCommit() != autocommit) + } + if (pooled.getAutoCommit() != autocommit) { pooled.setAutoCommit(autocommit); + } return pooled; } } @@ -183,28 +215,51 @@ @Override protected void finalize() throws Throwable { + if (!stopped) { + stop(); + } super.finalize(); - close(); } - public void close() { + @Override + public void stop() { - log.info("cleaning up connection pool: " + url); + if (log.isDebugEnabled()) { + log.debug("cleaning up connection pool: " + url); + } - Iterator iter = pool.iterator(); - while (iter.hasNext()) { + for (Connection connection : pool) { try { - ((Connection) iter.next()).close(); + connection.close(); } catch (SQLException sqle) { - log.warn("problem closing pooled connection", sqle); + if (log.isWarnEnabled()) { + log.warn("problem closing pooled connection", sqle); + } } } pool.clear(); - + stopped = true; } @Override public boolean supportsAggressiveRelease() { return false; } + + @Override + public boolean isUnwrappableAs(Class unwrapType) { + return ConnectionProvider.class.equals(unwrapType) || + getClass().isAssignableFrom(unwrapType); + } + + @Override + @SuppressWarnings({"unchecked"}) + public <T> T unwrap(Class<T> unwrapType) { + if (ConnectionProvider.class.equals(unwrapType) || + getClass().isAssignableFrom(unwrapType)) { + return (T) this; + } else { + throw new UnknownUnwrapTypeException(unwrapType); + } + } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2013-12-12 09:33:06 UTC (rev 2924) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2013-12-17 15:56:08 UTC (rev 2925) @@ -28,11 +28,11 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; +import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator; +import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.service.UnknownUnwrapTypeException; -import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.Configurable; import org.hibernate.service.spi.Stoppable; @@ -123,7 +123,6 @@ @Override public void configure(Map configurationValues) throws HibernateException { - String driverClass = (String) configurationValues.get(Environment.DRIVER); poolSize = ConfigurationHelper.getInt(Environment.POOL_SIZE, configurationValues, 20); //default pool size 20 if (log.isDebugEnabled()) { @@ -131,8 +130,9 @@ } autocommit = ConfigurationHelper.getBoolean(Environment.AUTOCOMMIT, configurationValues); - if (log.isDebugEnabled()) + if (log.isDebugEnabled()) { log.debug("autocommit mode: " + autocommit); + } isolation = ConfigurationHelper.getInteger(Environment.ISOLATION, configurationValues); if (isolation != null) { @@ -142,6 +142,7 @@ } } + String driverClass = ConfigurationHelper.getString(Environment.DRIVER, configurationValues); if (driverClass == null) { if (log.isWarnEnabled()) { @@ -165,8 +166,7 @@ url = (String) configurationValues.get(Environment.URL); if (url == null) { - String msg = "JDBC URL was not specified by property " + - Environment.URL; + String msg = "JDBC URL was not specified by property " + Environment.URL; if (log.isErrorEnabled()) { log.error(msg); } @@ -179,6 +179,7 @@ if (log.isDebugEnabled()) { log.debug("using driver: " + driverClass + " at URL: " + url); } + // if debug level is enabled, then log the password, otherwise mask it if (log.isTraceEnabled()) { log.debug("connection properties: " + connectionProps); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java 2013-12-12 09:33:06 UTC (rev 2924) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java 2013-12-17 15:56:08 UTC (rev 2925) @@ -48,6 +48,7 @@ import org.hibernate.event.spi.PreUpdateEventListener; import org.hibernate.event.spi.SaveOrUpdateEvent; import org.hibernate.event.spi.SaveOrUpdateEventListener; +import org.hibernate.persister.entity.EntityPersister; import org.nuiton.topia.TopiaDaoSupplier; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaHibernateSessionRegistry; @@ -136,6 +137,12 @@ } } + @Override + public boolean requiresPostCommitHanding(EntityPersister persister) { + // TODO AThimel 17/12/13 I don't know what to return + return false; + } + /* Chargement */ @Override 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-12-12 09:33:06 UTC (rev 2924) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-12-17 15:56:08 UTC (rev 2925) @@ -28,14 +28,14 @@ import com.google.common.base.Supplier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.SessionFactory; +import org.hibernate.boot.registry.StandardServiceRegistry; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; import org.hibernate.dialect.Dialect; -import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; -import org.hibernate.service.ServiceRegistry; -import org.hibernate.service.ServiceRegistryBuilder; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; import org.hibernate.tool.hbm2ddl.TableMetadata; import org.nuiton.topia.TopiaContextFactory; @@ -165,15 +165,17 @@ * base. * * @param topiaHibernateSupport the Hibernate support required for this operation - * @param entityName le nom de l'entite a tester + * @param entityName le nom de l'entite a tester * @return <tt>true</tt> si le schema de la table existe * @since 2.6.4 */ public static boolean isSchemaExist(TopiaHibernateSupport topiaHibernateSupport, String entityName) { - ConnectionProviderSupplier connectionProviderSupplier = - new ConnectionProviderSupplier(((SessionFactoryImplementor) topiaHibernateSupport.getHibernateFactory()).getServiceRegistry()); + SessionFactory sessionFactory = topiaHibernateSupport.getHibernateFactory(); + SessionFactory.SessionFactoryOptions sessionFactoryOptions = sessionFactory.getSessionFactoryOptions(); + StandardServiceRegistry standardServiceRegistry = sessionFactoryOptions.getServiceRegistry(); + ConnectionProviderSupplier connectionProviderSupplier = new ConnectionProviderSupplier(standardServiceRegistry); boolean exist = false; @@ -310,7 +312,7 @@ * * @param configuration hibernate db configuration * @return {@code true} if there is no schema for any of the dealed entities, - * {@code false} otherwise. + * {@code false} otherwise. * @since 2.5.3 */ public static boolean isSchemaEmpty(Configuration configuration) { @@ -339,7 +341,7 @@ if (testTable == null) { throw new IllegalArgumentException( "could not find entity with name " + - classMapping.getClassName()); + classMapping.getClassName()); } @@ -353,9 +355,9 @@ if (log.isDebugEnabled()) { log.debug("Existing table found " + - testTable.getName() + " for entity " + - classMapping.getClassName() + - ", db is not empty."); + testTable.getName() + " for entity " + + classMapping.getClassName() + + ", db is not empty."); } return false; @@ -386,15 +388,17 @@ * * @param topiaHibernateSupport the Hibernate support required for this operation * @return {@code true} if there is no schema for any of the dealed entities, - * {@code false} otherwise. + * {@code false} otherwise. * @since 2.5.3 */ public static boolean isSchemaEmpty(TopiaHibernateSupport topiaHibernateSupport) { Configuration configuration = topiaHibernateSupport.getHibernateConfiguration(); - ConnectionProviderSupplier connectionProviderSupplier = - new ConnectionProviderSupplier(((SessionFactoryImplementor) topiaHibernateSupport.getHibernateFactory()).getServiceRegistry()); + SessionFactory sessionFactory = topiaHibernateSupport.getHibernateFactory(); + SessionFactory.SessionFactoryOptions sessionFactoryOptions = sessionFactory.getSessionFactoryOptions(); + StandardServiceRegistry standardServiceRegistry = sessionFactoryOptions.getServiceRegistry(); + ConnectionProviderSupplier connectionProviderSupplier = new ConnectionProviderSupplier(standardServiceRegistry); try { @@ -417,7 +421,7 @@ if (testTable == null) { throw new IllegalArgumentException( "could not find entity with name " + - classMapping.getClassName()); + classMapping.getClassName()); } @@ -430,9 +434,9 @@ if (log.isDebugEnabled()) { log.debug("Existing table found " + - testTable.getName() + " for entity " + - classMapping.getClassName() + - ", db is not empty."); + testTable.getName() + " for entity " + + classMapping.getClassName() + + ", db is not empty."); } return false; @@ -464,9 +468,11 @@ */ @Deprecated protected static ConnectionProvider getConnectionProvider(Configuration configuration) { - ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings( - configuration.getProperties()).buildServiceRegistry(); - return serviceRegistry.getService(ConnectionProvider.class); + StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); + Properties properties = configuration.getProperties(); + StandardServiceRegistry standardServiceRegistry = builder.applySettings(properties).build(); + ConnectionProvider result = standardServiceRegistry.getService(ConnectionProvider.class); + return result; } /** @@ -509,27 +515,30 @@ public static class ConnectionProviderSupplier implements Supplier<ConnectionProvider>, Closeable { - protected ServiceRegistry serviceRegistry; + protected StandardServiceRegistry standardServiceRegistry; protected ConnectionProvider connectionProvider; protected final boolean inlineRegistry; - public ConnectionProviderSupplier(ServiceRegistry serviceRegistry) { + public ConnectionProviderSupplier(StandardServiceRegistry standardServiceRegistry) { inlineRegistry = false; - this.serviceRegistry = serviceRegistry; + this.standardServiceRegistry = standardServiceRegistry; } public ConnectionProviderSupplier(Configuration configuration) { inlineRegistry = true; - this.serviceRegistry = new ServiceRegistryBuilder().applySettings( - configuration.getProperties()).buildServiceRegistry(); + + StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); + Properties properties = configuration.getProperties(); + this.standardServiceRegistry = builder.applySettings(properties).build(); + } @Override public ConnectionProvider get() { if (connectionProvider == null) { - connectionProvider = serviceRegistry.getService(ConnectionProvider.class); + connectionProvider = standardServiceRegistry.getService(ConnectionProvider.class); } return connectionProvider; } @@ -537,7 +546,7 @@ @Override public void close() throws IOException { if (inlineRegistry) { - ServiceRegistryBuilder.destroy(serviceRegistry); + StandardServiceRegistryBuilder.destroy(standardServiceRegistry); } } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HibernateProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HibernateProvider.java 2013-12-12 09:33:06 UTC (rev 2924) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HibernateProvider.java 2013-12-17 15:56:08 UTC (rev 2925) @@ -36,13 +36,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.SessionFactory; +import org.hibernate.boot.registry.StandardServiceRegistry; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; +import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; import org.hibernate.service.ServiceRegistry; -import org.hibernate.service.ServiceRegistryBuilder; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.Stoppable; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaNotFoundException; @@ -206,7 +207,7 @@ if (hibernateSessionFactory != null) { hibernateSessionFactory.close(); // close connection provider if possible (http://nuiton.org/issues/2757) - ConnectionProvider service = ((SessionFactoryImplementor) hibernateSessionFactory).getServiceRegistry().getService(ConnectionProvider.class); + ConnectionProvider service = hibernateSessionFactory.getSessionFactoryOptions().getServiceRegistry().getService(ConnectionProvider.class); if (service instanceof Stoppable) { Stoppable stoppable = (Stoppable) service; stoppable.stop(); @@ -219,10 +220,11 @@ if (hibernateSessionFactory == null) { // init service registry - ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings( - getHibernateConfiguration().getProperties()).buildServiceRegistry(); + StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); + Properties properties = getHibernateConfiguration().getProperties(); + StandardServiceRegistry standardServiceRegistry = builder.applySettings(properties).build(); - hibernateSessionFactory = getHibernateConfiguration().buildSessionFactory(serviceRegistry); + hibernateSessionFactory = getHibernateConfiguration().buildSessionFactory(standardServiceRegistry); // we can't reuse original serviceRegistry instance // we must call getServiceRegistry on factory to get a working one

1 0

[ANN] - ToPIA 3.0-alpha-7 released
by nuiton.org Release Notification 12 Dec '13

12 Dec '13

The ToPIA team is pleased to announce the topia-3.0-alpha-7 release! Tools for Portable and Independent Architecture : Framework de persistance et de distribution d'application. Documentation of the project can be found here: http://maven-site.nuiton.org/topia Changes ------- Changes in this version include: Fixed Bugs: o fix HqlAndParametersBuilder if a whereClause contains a or Issue: 2959. Thanks to Arnaud Thimel. Resolved by bleny. Changes: o Update Hibernate to 4.2.8.Final Issue: 2957. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton|topia|3.0-alpha-7|jar Have fun! -ToPIA team

1 0

r2924 - in trunk: . topia-it topia-junit topia-persistence topia-service-migration topia-service-replication topia-templates
by maven-release＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 10:33:06 +0100 (Thu, 12 Dec 2013) New Revision: 2924 Url: http://nuiton.org/projects/topia/repository/revisions/2924 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-it/pom.xml trunk/topia-junit/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-templates/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 09:33:00 UTC (rev 2923) +++ trunk/pom.xml 2013-12-12 09:33:06 UTC (rev 2924) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-alpha-7</version> + <version>3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -210,12 +210,12 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-7</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-7 + scm:svn:http://svn.nuiton.org/svn/topia/trunk </developerConnection> <url> - http://nuiton.org/projects/topia/repository/show/tags/topia-3.0-alpha-7 + http://nuiton.org/projects/topia/repository/show/trunk </url> </scm> <distributionManagement> Modified: trunk/topia-it/pom.xml =================================================================== --- trunk/topia-it/pom.xml 2013-12-12 09:33:00 UTC (rev 2923) +++ trunk/topia-it/pom.xml 2013-12-12 09:33:06 UTC (rev 2924) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-7</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-junit/pom.xml =================================================================== --- trunk/topia-junit/pom.xml 2013-12-12 09:33:00 UTC (rev 2923) +++ trunk/topia-junit/pom.xml 2013-12-12 09:33:06 UTC (rev 2924) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-7</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-12-12 09:33:00 UTC (rev 2923) +++ trunk/topia-persistence/pom.xml 2013-12-12 09:33:06 UTC (rev 2924) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-7</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-12-12 09:33:00 UTC (rev 2923) +++ trunk/topia-service-migration/pom.xml 2013-12-12 09:33:06 UTC (rev 2924) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-7</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-12-12 09:33:00 UTC (rev 2923) +++ trunk/topia-service-replication/pom.xml 2013-12-12 09:33:06 UTC (rev 2924) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-7</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2013-12-12 09:33:00 UTC (rev 2923) +++ trunk/topia-templates/pom.xml 2013-12-12 09:33:06 UTC (rev 2924) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-7</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2923 - in tags: . topia-3.0-alpha-7
by maven-release＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 10:33:00 +0100 (Thu, 12 Dec 2013) New Revision: 2923 Url: http://nuiton.org/projects/topia/repository/revisions/2923 Log: [maven-release-plugin] copy for tag topia-3.0-alpha-7 Added: tags/topia-3.0-alpha-7/ Property changes on: tags/topia-3.0-alpha-7 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2922 - in trunk: . topia-it topia-junit topia-persistence topia-service-migration topia-service-replication topia-templates
by maven-release＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 10:32:56 +0100 (Thu, 12 Dec 2013) New Revision: 2922 Url: http://nuiton.org/projects/topia/repository/revisions/2922 Log: [maven-release-plugin] prepare release topia-3.0-alpha-7 Modified: trunk/pom.xml trunk/topia-it/pom.xml trunk/topia-junit/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-templates/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -210,12 +210,12 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-7</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/topia/trunk + scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-7 </developerConnection> <url> - http://nuiton.org/projects/topia/repository/show/trunk + http://nuiton.org/projects/topia/repository/show/tags/topia-3.0-alpha-7 </url> </scm> <distributionManagement> Modified: trunk/topia-it/pom.xml =================================================================== --- trunk/topia-it/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/topia-it/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-junit/pom.xml =================================================================== --- trunk/topia-junit/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/topia-junit/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/topia-persistence/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/topia-service-migration/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/topia-service-replication/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/topia-templates/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0