March 2011 - Topia-commits - mailman.cloud.codelutin.com

r2237 - in trunk: topia-persistence/src/main/java/org/nuiton/topia topia-service-security topia-service-security/src/main/java/org/nuiton/topia/taas
by sletellier＠users.nuiton.org 30 Mar '11

30 Mar '11

Author: sletellier Date: 2011-03-30 18:47:45 +0200 (Wed, 30 Mar 2011) New Revision: 2237 Url: http://nuiton.org/repositories/revision/topia/2237 Log: - Use clone of property to initialize context - Add svn:ignore Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java trunk/topia-service-security/ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2011-03-25 17:45:33 UTC (rev 2236) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2011-03-30 16:47:45 UTC (rev 2237) @@ -137,17 +137,18 @@ // Resolve problem with hibernate which used iterator to get properties // and so only values from the current properties object and not all // hierarchy + Properties cloned = new Properties(); for (String key : config.stringPropertyNames()) { - config.setProperty(key, config.getProperty(key)); + cloned.setProperty(key, config.getProperty(key)); } - TopiaContext result = contextCache.get(config); + TopiaContext result = contextCache.get(cloned); // useless test, context is automatically removed from Factory when closed if (result == null/* || result.isClosed()*/) { - result = new TopiaContextImpl(config); + result = new TopiaContextImpl(cloned); if (log.isDebugEnabled()) { log.debug("instantiate new topiaContext : " + result); } - contextCache.put((Properties) config.clone(), result); + contextCache.put(cloned, result); } else if (log.isDebugEnabled()) { log.debug("topiaContext found : " + result); } Property changes on: trunk/topia-service-security ___________________________________________________________________ Modified: svn:ignore - *.ipr .classpath *.iws .project *.iml .settings target + *.ipr *.iws .classpath .project target .settings 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 2011-03-25 17:45:33 UTC (rev 2236) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2011-03-30 16:47:45 UTC (rev 2237) @@ -38,8 +38,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; -import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; @@ -57,16 +55,24 @@ import org.nuiton.topia.taas.entities.TaasUserImpl; import org.nuiton.topia.taas.event.TaasAccessEntity; import org.nuiton.topia.taas.event.TaasEntityVetoable; -import org.nuiton.topia.taas.jaas.*; +import org.nuiton.topia.taas.jaas.TaasConfiguration; +import org.nuiton.topia.taas.jaas.TaasLoginModule; +import org.nuiton.topia.taas.jaas.TaasPermission; +import org.nuiton.topia.taas.jaas.TaasPolicy; +import org.nuiton.topia.taas.jaas.TaasPrincipalWrapper; +import org.nuiton.topia.taas.jaas.TaasSubjectFinder; +import org.nuiton.topia.taas.jaas.TaasSubjectFinderImpl; import javax.security.auth.Subject; import javax.security.auth.login.Configuration; import java.lang.reflect.Constructor; -import java.net.URL; -import java.net.URLClassLoader; import java.security.AccessController; import java.security.Permission; -import java.util.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.Set; import static org.nuiton.topia.taas.TaasUtil.getPrincipalNames; @@ -105,15 +111,10 @@ private TaasSubjectFinder subjectFinder; - /** Contructeur par d�faut */ + /** Contructeur par defaut */ public TaasService() { } - /* - * (non-Javadoc) - * @see org.nuiton.topia.framework.TopiaService#getPersistenceClasses() - */ - @Override public Class<?>[] getPersistenceClasses() { return new Class<?>[]{ @@ -123,31 +124,21 @@ }; } - /* - * (non-Javadoc) - * @see org.nuiton.topia.framework.TopiaService#getServiceName() - */ - @Override public String getServiceName() { return SERVICE_NAME; } - /* - * (non-Javadoc) - * @see org.nuiton.topia.framework.TopiaService#preInit(org.nuiton.topia.framework.TopiaContextImplementor) - */ - @Override public boolean preInit(TopiaContextImplementor context) { rootContext = context; try { - org.hibernate.cfg.Configuration configuration = - rootContext.getHibernateConfiguration(); + Properties config = + (Properties)rootContext.getConfig().clone(); // Recuperation du parametre pour l'evenemnt - String eventString = configuration.getProperty(SERVICE_EVENT); + String eventString = config.getProperty(SERVICE_EVENT); if (eventString != null && !"".equals(eventString)) { Class<?> eventClass = Class.forName(eventString); Constructor<?> eventConstructor = eventClass.getConstructor(TaasService.class); @@ -157,7 +148,7 @@ } // Recuperation du parametre pour le subject - String subjectString = configuration.getProperty(SERVICE_SUBJECT); + String subjectString = config.getProperty(SERVICE_SUBJECT); if (subjectString != null && !"".equals(subjectString)) { Class<?> subjectClass = Class.forName(subjectString); subjectFinder = (TaasSubjectFinder) subjectClass.newInstance(); @@ -165,10 +156,12 @@ subjectFinder = new TaasSubjectFinderImpl(); } - // Recupere un context root sans securite - Properties config = rootContext.getConfig(); +// // Recupere un context root sans securite +// Properties config = rootContext.getConfig(); + // Hack to not reload this service config.remove("topia.service.taas"); + String persistences = config.getProperty("topia.persistence.classes"); for (Class<?> klass : getPersistenceClasses()) { persistences += "," + klass.getName(); @@ -215,16 +208,11 @@ context.addTopiaTransactionVetoable(this); } - /* - * (non-Javadoc) - * @see org.nuiton.topia.framework.TopiaService#postInit(org.nuiton.topia.framework.TopiaContextImplementor) - */ - @Override public boolean postInit(TopiaContextImplementor context) { policy.installPolicy(); - // Si pas de configuration autre que celle par d�faut + // Si pas de configuration autre que celle par defaut if (Configuration.getConfiguration() == null) { Configuration.setConfiguration( new TaasConfiguration(SERVICE_NAME, this));

1 0

r2236 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/framework topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings
by sletellier＠users.nuiton.org 25 Mar '11

25 Mar '11

Author: sletellier Date: 2011-03-25 18:45:33 +0100 (Fri, 25 Mar 2011) New Revision: 2236 Url: http://nuiton.org/repositories/revision/topia/2236 Log: - Add getSchema method utility - Get version take care of db schema Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.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 2011-03-25 16:14:11 UTC (rev 2235) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2011-03-25 17:45:33 UTC (rev 2236) @@ -59,6 +59,8 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(TopiaUtil.class); + public final static String HIBERNATE_DEFAULT_SCHEMA = "hibernate.default_schema"; + /** * Permet de récupérer le fichier de propriété ayant le nom passé en * argument. @@ -281,4 +283,14 @@ return true; } + + /** + * Return hibernate schema name + * + * @param config of hibernate + * @return schema name + */ + public static String getSchemaName(Configuration config) { + return config.getProperty(HIBERNATE_DEFAULT_SCHEMA); + } } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2011-03-25 16:14:11 UTC (rev 2235) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2011-03-25 17:45:33 UTC (rev 2236) @@ -36,6 +36,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaUtil; import org.nuiton.util.Version; import org.nuiton.util.VersionUtil; @@ -135,8 +136,14 @@ public static Version getVersion(TopiaContext tx, String tableName) { try { - GetVersionWork work = new GetVersionWork(tableName); - ((TopiaContextImplementor) tx).getHibernate().doWork(work); + TopiaContextImplementor txImpl = (TopiaContextImplementor) tx; + Configuration hibernateConfiguration = txImpl.getHibernateConfiguration(); + + // Get schema name + String schemaName = TopiaUtil.getSchemaName(hibernateConfiguration); + + GetVersionWork work = new GetVersionWork(schemaName, tableName); + txImpl.getHibernate().doWork(work); Version v = work.getVersion(); return v; } catch (TopiaException e) { @@ -149,14 +156,21 @@ protected Version version; private final String tableName; + private final String schemaName; - public GetVersionWork(String tableName) { + public GetVersionWork(String schemaName, String tableName) { this.tableName = tableName; + this.schemaName = schemaName; } @Override public void execute(Connection connection) throws SQLException { - PreparedStatement st = connection.prepareStatement("select " + TMSVersion.PROPERTY_VERSION + " from " + tableName + ";"); + + String fullTableName = (schemaName == null ? + tableName : schemaName + "." + tableName); + + + PreparedStatement st = connection.prepareStatement("select " + TMSVersion.PROPERTY_VERSION + " from " + fullTableName + ";"); try { ResultSet set = st.executeQuery();

1 0

r2235 - in trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration: . mappings
by sletellier＠users.nuiton.org 25 Mar '11

25 Mar '11

Author: sletellier Date: 2011-03-25 17:14:11 +0100 (Fri, 25 Mar 2011) New Revision: 2235 Url: http://nuiton.org/repositories/revision/topia/2235 Log: Improve logs on migrations 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/TopiaMigrationEngine.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.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 2011-03-25 16:12:59 UTC (rev 2234) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2011-03-25 16:14:11 UTC (rev 2235) @@ -190,12 +190,13 @@ int index = 0; int max = sqls.length; for (String sql : sqls) { + index++; long t0 = System.nanoTime(); if (log.isInfoEnabled()) { String message = ""; if (showProgression) { - message = _("topia.migration.start.sql", ++index, max); + message = _("topia.migration.start.sql", index, max); } if (showSql) { message += "\n" + sql; @@ -213,7 +214,7 @@ } if (log.isDebugEnabled()) { String message; - message = _("topia.migration.end.sql", ++index, max, StringUtil.convertTime(System.nanoTime() - t0)); + message = _("topia.migration.end.sql", index, max, StringUtil.convertTime(System.nanoTime() - t0)); log.debug(message); } } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-03-25 16:12:59 UTC (rev 2234) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-03-25 16:14:11 UTC (rev 2235) @@ -548,6 +548,12 @@ // recuperation de la version de la base v = getVersion(versionTableExist, TMSVersionDAO.TABLE_NAME); + + if (log.isWarnEnabled()) { + if (v == null) { + log.warn("Version not found on table " + TMSVersionDAO.TABLE_NAME); + } + } return; } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2011-03-25 16:12:59 UTC (rev 2234) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2011-03-25 16:14:11 UTC (rev 2235) @@ -163,8 +163,12 @@ if (set.next()) { version = VersionUtil.valueOf(set.getString(1)); } + } catch (SQLException eee) { + if (log.isErrorEnabled()) { + log.error("Could not find version", eee); + } + version = null; } finally { - st.close(); } }

1 0

r2234 - trunk/topia-service-security/src/main/xmi
by sletellier＠users.nuiton.org 25 Mar '11

25 Mar '11

Author: sletellier Date: 2011-03-25 17:12:59 +0100 (Fri, 25 Mar 2011) New Revision: 2234 Url: http://nuiton.org/repositories/revision/topia/2234 Log: Remove lazy on relation between TaasUser and TaasPrincipal Modified: trunk/topia-service-security/src/main/xmi/TopiaSecurity.properties Modified: trunk/topia-service-security/src/main/xmi/TopiaSecurity.properties =================================================================== --- trunk/topia-service-security/src/main/xmi/TopiaSecurity.properties 2011-03-25 11:52:41 UTC (rev 2233) +++ trunk/topia-service-security/src/main/xmi/TopiaSecurity.properties 2011-03-25 16:12:59 UTC (rev 2234) @@ -24,3 +24,5 @@ ### model.tagvalue.java.lang.String=text model.tagvalue.java.util.Set=serializable + +org.nuiton.topia.taas.entities.TaasUser.attribute.principals.tagvalue.lazy=false \ No newline at end of file

1 0

r2233 - trunk
by tchemit＠users.nuiton.org 25 Mar '11

25 Mar '11

Author: tchemit Date: 2011-03-25 12:52:41 +0100 (Fri, 25 Mar 2011) New Revision: 2233 Url: http://nuiton.org/repositories/revision/topia/2233 Log: Evolution #1424: Updates to i18n 2.3.2 Evolution #1425: Updates to nuiton-utils 2.1 Evolution #1426: Updates to eugene 2.3.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-18 11:59:46 UTC (rev 2232) +++ trunk/pom.xml 2011-03-25 11:52:41 UTC (rev 2233) @@ -254,10 +254,10 @@ <projectId>topia</projectId>  - <eugeneVersion>2.3.2</eugeneVersion> - <nuitonUtilsVersion>2.0</nuitonUtilsVersion> + <eugeneVersion>2.3.3</eugeneVersion> + <nuitonUtilsVersion>2.1</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> - <nuitonI18nVersion>2.3.1</nuitonI18nVersion> + <nuitonI18nVersion>2.3.2</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> <hibernateVersion>3.3.2.GA</hibernateVersion>

1 0

r2232 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 18 Mar '11

18 Mar '11

Author: tchemit Date: 2011-03-18 12:59:46 +0100 (Fri, 18 Mar 2011) New Revision: 2232 Url: http://nuiton.org/repositories/revision/topia/2232 Log: fix authors Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.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 2011-03-17 14:13:57 UTC (rev 2231) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2011-03-18 11:59:46 UTC (rev 2232) @@ -22,18 +22,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ - -/******************************************************************************* - * TopiaUtil.java - * - * Created: 28 déc. 2005 20:28:57 - * - * @author poussin <poussin(a)codelutin.com> - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ package org.nuiton.topia.framework; import org.apache.commons.logging.Log; @@ -62,7 +50,8 @@ /** * TODO-fdesbois-20100507 : Need javadoc + translations for existing methods. * - * @author poussin <poussin(a)codelutin.com> + * @author bpoussin <poussin(a)codelutin.com> + * @author tchemit <chemit(a)codelutin.com> * @version $Id$ */ public class TopiaUtil {

1 0

r2231 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by echatellier＠users.nuiton.org 17 Mar '11

17 Mar '11

Author: echatellier Date: 2011-03-17 15:13:57 +0100 (Thu, 17 Mar 2011) New Revision: 2231 Url: http://nuiton.org/repositories/revision/topia/2231 Log: Add if (log.isInfoEnabled()) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.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 2011-03-17 14:06:40 UTC (rev 2230) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2011-03-17 14:13:57 UTC (rev 2231) @@ -177,9 +177,11 @@ PersistentClass classMapping = configuration.getClassMapping(entityName); if (classMapping == null) { - Iterator<?> itr = configuration.getClassMappings(); - while (itr.hasNext()) { - log.info("available mapping " + itr.next()); + if (log.isInfoEnabled()) { + Iterator<?> itr = configuration.getClassMappings(); + while (itr.hasNext()) { + log.info("available mapping " + itr.next()); + } } throw new IllegalArgumentException( "could not find entity with name " + entityName);

1 0

r2230 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/framework topia-service-migration/src/main/java/org/nuiton/topia/migration
by tchemit＠users.nuiton.org 17 Mar '11

17 Mar '11

Author: tchemit Date: 2011-03-17 15:06:40 +0100 (Thu, 17 Mar 2011) New Revision: 2230 Url: http://nuiton.org/repositories/revision/topia/2230 Log: improve migration code (use a unique db connection for dbempty code) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.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 2011-03-17 13:33:29 UTC (rev 2229) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2011-03-17 14:06:40 UTC (rev 2230) @@ -222,4 +222,72 @@ return exist; } + + /** + * Test if the db associated to the given {@code configuration} contaisn any of + * the dealed entities. + * + * @param configuration hibernate db configuration + * @return {@code true} if there is no schema for any of the dealed entities, + * {@code false} otherwise. + * @since 2.5.3 + */ + public static boolean isSchemaEmpty(Configuration configuration) { + + try { + + ConnectionProvider connectionProvider = + ConnectionProviderFactory.newConnectionProvider( + configuration.getProperties()); + + Dialect dialect = Dialect.getDialect(configuration.getProperties()); + + Connection connection = null; + try { + connection = connectionProvider.getConnection(); + + DatabaseMetadata meta = new DatabaseMetadata(connection, dialect); + + Iterator<?> itr = configuration.getClassMappings(); + while (itr.hasNext()) { + PersistentClass classMapping = (PersistentClass) itr.next(); + Table testTable = classMapping.getTable(); + + if (testTable == null) { + throw new IllegalArgumentException( + "could not find entity with name " + classMapping.getClassName()); + } + + + TableMetadata tmd = meta.getTableMetadata( + testTable.getName(), testTable.getSchema(), + testTable.getCatalog(), testTable.isQuoted()); + + if (tmd != null) { + //table exist + + + if (log.isDebugEnabled()) { + log.debug("Existing table found " + + testTable.getName() + " for entity " + + classMapping.getClassName() + + ", db is not empty."); + } + + return false; + } + } + + } finally { + if (connection != null) { + connection.close(); + } + } + + } catch (SQLException e) { + log.error("Cant connect to database", e); + } + + return true; + } } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-03-17 13:33:29 UTC (rev 2229) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-03-17 14:06:40 UTC (rev 2230) @@ -46,7 +46,6 @@ import org.nuiton.util.VersionUtil; import org.nuiton.util.VersionUtil.VersionComparator; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Properties; @@ -92,7 +91,7 @@ /** * A flag to know if none of the dealed entities tables exists in db. - * + * * @since 2.5.3 */ protected boolean dbEmpty; @@ -312,11 +311,11 @@ } if (dbEmpty) { - + // db is empty (no table, no migration to apply) return true; } - + if (versionTableExist && dbVersion.equals(version)) { if (log.isInfoEnabled()) { log.info(_("topia.migration.skip.migration.db.is.up.to.date")); @@ -605,42 +604,19 @@ */ protected boolean detectDbEmpty() { - boolean result = true; - + try { + boolean result; // get db real hibernate configuration Configuration rootConfiguration = rootContext.getHibernateConfiguration(); - // get all dealed classes - List<Class<?>> persistenceClasses = - new ArrayList<Class<?>>(rootContext.getPersistenceClasses()); - - // remove the tmsversion class - persistenceClasses.remove(TMSVersion.class); - - for (Class<?> persistenceClass : persistenceClasses) { - - boolean tableExist = - TopiaUtil.isSchemaExist(rootConfiguration, - persistenceClass.getName() - ); - if (tableExist) { - - // at least one table exists - result = false; - - if (log.isDebugEnabled()) { - log.debug("Detected table for " + persistenceClass); - } - break; - } - } + result = TopiaUtil.isSchemaEmpty(rootConfiguration); + return result; } catch (TopiaNotFoundException e) { throw new RuntimeException(e); } - return result; } protected Version getVersion(boolean versionTableExist, String tableName) {

1 0

r2229 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 17 Mar '11

17 Mar '11

Author: tchemit Date: 2011-03-17 14:33:29 +0100 (Thu, 17 Mar 2011) New Revision: 2229 Url: http://nuiton.org/repositories/revision/topia/2229 Log: use static import for I18n Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-03-17 13:32:57 UTC (rev 2228) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-03-17 13:33:29 UTC (rev 2229) @@ -55,7 +55,6 @@ import org.hibernate.event.PreUpdateEventListener; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; -import org.nuiton.i18n.I18n; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; @@ -245,15 +244,15 @@ TopiaService service = (TopiaService) newInstance; if (key.equals("topia.service." + service.getServiceName())) { result.put(service.getServiceName(), service); - log.info(I18n._("topia.persistence.service.loaded", + log.info(_("topia.persistence.service.loaded", key, classService)); } else { - log.warn(I18n._("topia.persistence.warn.service.not.loaded", + log.warn(_("topia.persistence.warn.service.not.loaded", key, service.getServiceName())); } } catch (Throwable eee) { String message = - I18n._("topia.persistence.error.service.unknown", + _("topia.persistence.error.service.unknown", key, classService); if (log.isDebugEnabled()) { log.debug(message, eee); @@ -269,7 +268,7 @@ protected void preInitServices(Map<String, TopiaService> services) { for (TopiaService service : services.values()) { if (!service.preInit(this)) { - log.warn(I18n._("topia.persistence.warn.service.not.preInit", + log.warn(_("topia.persistence.warn.service.not.preInit", service.getServiceName())); } } @@ -278,7 +277,7 @@ protected void postInitServices(Map<String, TopiaService> services) { for (TopiaService service : services.values()) { if (!service.postInit(this)) { - log.warn(I18n._("topia.persistence.warn.service.not.postInit", + log.warn(_("topia.persistence.warn.service.not.postInit", service.getServiceName())); } } @@ -343,13 +342,13 @@ result = (E) getService(name); } catch (Exception eee) { throw new TopiaNotFoundException( - I18n._("topia.persistence.error.service.not.retreaved", + _("topia.persistence.error.service.not.retreaved", interfaceService, getProperExceptionMessage(eee)), eee); } if (result == null) { throw new TopiaNotFoundException( - I18n._("topia.persistence.error.service.not.found", + _("topia.persistence.error.service.not.found", interfaceService)); } return result; @@ -363,7 +362,7 @@ String name = getServiceName(interfaceService); result = serviceEnabled(name); } catch (Exception eee) { - String message = I18n._("topia.persistence.warn.service.not.found", + String message = _("topia.persistence.warn.service.not.found", interfaceService, getProperExceptionMessage(eee)); if (log.isDebugEnabled()) { log.debug(message, eee); @@ -464,7 +463,7 @@ getFiresSupport().firePostCreateSchema(this); } catch (HibernateException eee) { throw new TopiaException( - I18n._("topia.persistence.error.create.schema", + _("topia.persistence.error.create.schema", eee.getMessage()), eee); } } @@ -476,7 +475,7 @@ execute(true, false, false, true); } catch (HibernateException eee) { throw new TopiaException( - I18n._("topia.persistence.error.create.schema", + _("topia.persistence.error.create.schema", eee.getMessage()), eee); } } @@ -494,7 +493,7 @@ getFiresSupport().firePostUpdateSchema(this); } catch (HibernateException eee) { throw new TopiaException( - I18n._("topia.persistence.error.update.schema", + _("topia.persistence.error.update.schema", eee.getMessage()), eee); } } @@ -503,7 +502,7 @@ public Session getHibernate() throws TopiaException { if (hibernate == null) { throw new TopiaException( - I18n._("topia.persistence.error.no.hibernate.session")); + _("topia.persistence.error.no.hibernate.session")); } return hibernate; } @@ -683,12 +682,12 @@ throws TopiaException { if (entityClass == null) { throw new IllegalArgumentException( - I18n._("topia.persistence.error.null.param", + _("topia.persistence.error.null.param", "entityClass", "getDAO")); } if (this == getRootContext()) { throw new TopiaException( - I18n._("topia.persistence.error.rootContext.access")); + _("topia.persistence.error.rootContext.access")); } if (getHibernateFactory().getClassMetadata(entityClass) == null && getHibernateFactory().getClassMetadata( @@ -696,10 +695,10 @@ getHibernateFactory().getClassMetadata( entityClass.getName() + "Abstract") == null) { - log.info(I18n._("topia.persistence.supported.classes.for.context", + log.info(_("topia.persistence.supported.classes.for.context", getHibernateFactory().getAllClassMetadata().keySet())); throw new TopiaException( - I18n._("topia.persistence.error.unsupported.class", + _("topia.persistence.error.unsupported.class", entityClass.getName())); } @@ -736,7 +735,7 @@ @Override public TopiaContext beginTransaction() throws TopiaException { - checkClosed(I18n._("topia.persistence.error.context.is.closed")); + checkClosed(_("topia.persistence.error.context.is.closed")); TopiaContextImpl result = new TopiaContextImpl(this); SessionFactory factory = getHibernateFactory(); @@ -770,7 +769,7 @@ } throw new TopiaException( - I18n._("topia.persistence.error.open.transaction.failed", + _("topia.persistence.error.open.transaction.failed", eee.getMessage()), eee); } @@ -786,11 +785,11 @@ @Override public void commitTransaction() throws TopiaException { if (getRootContext() == this) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.unsupported.operation.on.root.context", "commit")); } - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "commit")); @@ -818,7 +817,7 @@ // hibernate = getHibernateFactory().openSession(); // hibernate.setFlushMode(FlushMode.NEVER); } catch (Exception eee) { - throw new TopiaException(I18n._("topia.persistence.error.on.commit", + throw new TopiaException(_("topia.persistence.error.on.commit", eee.getMessage()), eee); } } @@ -826,11 +825,11 @@ @Override public void rollbackTransaction() throws TopiaException { if (equals(getRootContext())) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.unsupported.operation.on.root.context", "rollback")); } - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "rollback")); try { @@ -858,7 +857,7 @@ } catch (HibernateException eee) { throw new TopiaException( - I18n._("topia.persistence.error.on.rollback", + _("topia.persistence.error.on.rollback", eee.getMessage()), eee); } } @@ -866,7 +865,7 @@ @Override public void closeContext() throws TopiaException { // Throw exception if context is already closed - checkClosed(I18n._("topia.persistence.error.context.already.closed")); + checkClosed(_("topia.persistence.error.context.already.closed")); // FD-20100421 : Ano #546 : no need to copy childContext, the // {@link #getChildContext()} provides a thread-safe copy to iterate @@ -928,7 +927,7 @@ @SuppressWarnings({"unchecked"}) @Override public TopiaEntity findByTopiaId(String id) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "findById")); @@ -951,7 +950,7 @@ @Override public List find(String hql, Object... args) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "find")); @@ -974,7 +973,7 @@ result = firesSupport.fireEntitiesLoad(this, result); return result; } catch (HibernateException eee) { - throw new TopiaException(I18n._("topia.persistence.error.on.query", + throw new TopiaException(_("topia.persistence.error.on.query", hql, eee.getMessage()), eee); } } @@ -982,7 +981,7 @@ @Override public List<?> find(String hql, int startIndex, int endIndex, Object... args) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "find")); @@ -1007,7 +1006,7 @@ result = firesSupport.fireEntitiesLoad(this, result); return result; } catch (HibernateException eee) { - throw new TopiaException(I18n._("topia.persistence.error.on.query", + throw new TopiaException(_("topia.persistence.error.on.query", hql, eee.getMessage()), eee); } } @@ -1022,7 +1021,7 @@ */ @Override public int execute(String hql, Object... args) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "find")); @@ -1034,14 +1033,14 @@ int result = query.executeUpdate(); return result; } catch (HibernateException eee) { - throw new TopiaException(I18n._("topia.persistence.error.on.query", + throw new TopiaException(_("topia.persistence.error.on.query", hql, eee.getMessage()), eee); } } @Override public void add(TopiaEntity e) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "add")); @@ -1053,7 +1052,7 @@ @Override public void importXML(Reader xml) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "importXML")); @@ -1067,7 +1066,7 @@ } } catch (DocumentException de) { throw new TopiaException( - I18n._("topia.persistence.error.on.loding.xml.doc", + _("topia.persistence.error.on.loding.xml.doc", de.getMessage()), de); } @@ -1080,7 +1079,7 @@ try { sessionDom4j.replicate(entity, ReplicationMode.EXCEPTION); } catch (HibernateException he) { - log.warn(I18n._("topia.persistence.error.replicate.entity", + log.warn(_("topia.persistence.error.replicate.entity", entity, he.getMessage()), he); } } @@ -1088,14 +1087,14 @@ sessionDom4j.flush(); } else { throw new TopiaException( - I18n._("topia.persistence.error.empty.doc")); + _("topia.persistence.error.empty.doc")); } } @Override public void exportXML(Writer xml, Object... entityAndcondition) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "exportXML")); @@ -1154,10 +1153,10 @@ result.close(); } catch (HibernateException eee) { - throw new TopiaException(I18n._("topia.persistence.error.on.export", + throw new TopiaException(_("topia.persistence.error.on.export", eee.getMessage()), eee); } catch (IOException eee) { - throw new TopiaException(I18n._("topia.persistence.error.on.export", + throw new TopiaException(_("topia.persistence.error.on.export", eee.getMessage()), eee); } } @@ -1165,18 +1164,18 @@ @Override public void replicate(TopiaContext dstCtxt, Object... entityAndCondition) throws TopiaException, IllegalArgumentException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicate")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; dstContextImpl.checkClosed( - I18n._("topia.persistence.error.unsupported.operation.on.closed.context", + _("topia.persistence.error.unsupported.operation.on.closed.context", "replicate")); if (getRootContext().equals(dstContextImpl.getRootContext())) { throw new IllegalArgumentException( - I18n._("topia.persistence.error.replicate.on.same.context")); + _("topia.persistence.error.replicate.on.same.context")); } String[] queries = buildQueries(entityAndCondition); @@ -1194,7 +1193,7 @@ } } } catch (HibernateException eee) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.on.replicate", eee.getMessage()), eee); } @@ -1204,17 +1203,17 @@ public <T extends TopiaEntity> void replicateEntity(TopiaContext dstCtxt, T entity) throws TopiaException, IllegalArgumentException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; - dstContextImpl.checkClosed(I18n._( + dstContextImpl.checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); if (getRootContext().equals(dstContextImpl.getRootContext())) { - throw new IllegalArgumentException(I18n._( + throw new IllegalArgumentException(_( "topia.persistence.error.replicate.on.same.context")); } replicate0(dstContextImpl, entity); @@ -1224,17 +1223,17 @@ public <T extends TopiaEntity> void replicateEntities(TopiaContext dstCtxt, List<T> entities) throws TopiaException, IllegalArgumentException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntities")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; - dstContextImpl.checkClosed(I18n._( + dstContextImpl.checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntities")); if (getRootContext().equals(dstContextImpl.getRootContext())) { - throw new IllegalArgumentException(I18n._( + throw new IllegalArgumentException(_( "topia.persistence.error.replicate.on.same.context")); } replicate0(dstContextImpl, entities.toArray()); @@ -1256,7 +1255,7 @@ */ @Override public void backup(File file, boolean compress) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "backup")); try { @@ -1270,7 +1269,7 @@ query.list(); } catch (Exception eee) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.on.backup", eee.getMessage()), eee); } @@ -1287,7 +1286,7 @@ public void restore(File file) throws TopiaException { // send event getFiresSupport().firePreRestoreSchema(this); - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "restore")); @@ -1320,7 +1319,7 @@ // send event AFTER restore getFiresSupport().firePostRestoreSchema(this); } catch (Exception eee) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.on.restore", sql, eee.getMessage()), eee); } @@ -1346,7 +1345,7 @@ tx.closeContext(); root.finalize(); } catch (Throwable eee) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.on.clear", eee.getMessage()), eee); } } @@ -1359,7 +1358,7 @@ @Override public boolean isSchemaExist(Class<?> clazz) throws TopiaException { - checkClosed(I18n._( + checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); boolean result = TopiaUtil.isSchemaExist(hibernateConfiguration, @@ -1475,7 +1474,7 @@ /** * Build the list of queries from the given parameter - * <code>entityAndCondition>/code>. + * <code>entityAndCondition</code>. * <p/> * If no parameter is given, then build the queries for all entities is db, * with no condition. @@ -1554,7 +1553,7 @@ } } catch (HibernateException eee) { - throw new TopiaException(I18n._( + throw new TopiaException(_( "topia.persistence.error.on.replicate", eee.getMessage()), eee); }

1 0

r2228 - trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration
by tchemit＠users.nuiton.org 17 Mar '11

17 Mar '11

Author: tchemit Date: 2011-03-17 14:32:57 +0100 (Thu, 17 Mar 2011) New Revision: 2228 Url: http://nuiton.org/repositories/revision/topia/2228 Log: try to solve Anomalie #1399: Database migration must not run if database schema doesn't exists improve migration engine class Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-03-17 09:59:22 UTC (rev 2227) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-03-17 13:32:57 UTC (rev 2228) @@ -31,6 +31,7 @@ import org.hibernate.cfg.Configuration; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.event.TopiaContextAdapter; import org.nuiton.topia.event.TopiaContextEvent; @@ -45,6 +46,7 @@ import org.nuiton.util.VersionUtil; import org.nuiton.util.VersionUtil.VersionComparator; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Properties; @@ -88,6 +90,13 @@ /** Drapeau pour savoir si la base est versionnée ou non */ protected boolean dbNotVersioned; + /** + * A flag to know if none of the dealed entities tables exists in db. + * + * @since 2.5.3 + */ + protected boolean dbEmpty; + /** Un drapeau pour effectuer la migration au demarrage (initialise en pre-init) */ protected boolean migrateOnInit; @@ -198,17 +207,17 @@ log.debug("Use callback - " + callbackStr); } - migrateOnInit = Boolean.valueOf(config.getProperty(MIGRATION_MIGRATE_ON_INIT, "true")); + migrateOnInit = Boolean.valueOf(config.getProperty(MIGRATION_MIGRATE_ON_INIT, String.valueOf(Boolean.TRUE))); if (log.isDebugEnabled()) { log.debug("Migrate on init - " + migrateOnInit); } - showSql = Boolean.valueOf(config.getProperty(MIGRATION_SHOW_SQL, "false")); + showSql = Boolean.valueOf(config.getProperty(MIGRATION_SHOW_SQL, String.valueOf(Boolean.FALSE))); if (log.isDebugEnabled()) { log.debug("Show sql - " + showSql); } - showProgression = Boolean.valueOf(config.getProperty(MIGRATION_SHOW_PROGRESSION, "false")); + showProgression = Boolean.valueOf(config.getProperty(MIGRATION_SHOW_PROGRESSION, String.valueOf(Boolean.FALSE))); if (log.isDebugEnabled()) { log.debug("Show progression - " + showProgression); } @@ -228,7 +237,7 @@ configuration.addClass(aClass); } - versionConfiguration = creaHibernateConfiguration(configuration); + versionConfiguration = createHibernateConfiguration(configuration); init = true; @@ -290,16 +299,28 @@ Version version = callback.getApplicationVersion(); - log.info(_("topia.migration.start.migration", version.getVersion(), dbVersion.getVersion())); + log.info(_("topia.migration.start.migration", + version.getVersion(), + dbVersion.getVersion()) + ); if (log.isDebugEnabled()) { log.debug("Migrate schema to version = " + dbVersion); log.debug("is db not versionned ? = " + dbNotVersioned); + log.debug("is db empty ? = " + dbEmpty); log.debug("TMSVersion exists = " + versionTableExist); } + if (dbEmpty) { + + // db is empty (no table, no migration to apply) + return true; + } + if (versionTableExist && dbVersion.equals(version)) { - log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + if (log.isInfoEnabled()) { + log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + } // la base est a jour return true; } @@ -317,7 +338,9 @@ // on a trouvee une table depreciee tmsVersion avec la bonne version de base // il suffit donc d'enregister la version dans la nouvelle table - log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + if (log.isInfoEnabled()) { + log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + } // la base est a jour mais il faut migrer la table saveApplicationVersion(); return true; @@ -326,7 +349,9 @@ SortedSet<Version> allVersions = new TreeSet<Version>(new VersionComparator()); allVersions.addAll(Arrays.asList(callback.getAvailableVersions())); - log.info(_("topia.migration.available.versions", allVersions)); + if (log.isInfoEnabled()) { + log.info(_("topia.migration.available.versions", allVersions)); + } // tell if migration is needed boolean needToMigrate = false; @@ -343,9 +368,13 @@ ); if (versionsToApply.isEmpty()) { - log.info(_("topia.migration.skip.migration.no.version.to.apply")); + if (log.isInfoEnabled()) { + log.info(_("topia.migration.skip.migration.no.version.to.apply")); + } } else { - log.info(_("topia.migration.migrate.versions", versionsToApply)); + if (log.isInfoEnabled()) { + log.info(_("topia.migration.migrate.versions", versionsToApply)); + } // perform the migration needToMigrate = callback.doMigration(rootContext, @@ -399,7 +428,7 @@ if (log.isDebugEnabled()) { log.debug("Save version = " + version); - log.debug("table exists = " + versionTableExist); + log.debug("Table exists = " + versionTableExist); log.debug("Detected version = " + dbVersion); } @@ -431,7 +460,9 @@ // delete all previous data in table TMSVersionDAO.deleteAll(tx); - log.info(_("topia.migration.saving.db.version", version)); + if (log.isInfoEnabled()) { + log.info(_("topia.migration.saving.db.version", version)); + } // create new version and store it in table TMSVersion tmsVersion = @@ -475,8 +506,9 @@ * Recupere depuis la base les états internes du service : * <p/> * <ul> - * <li>versionTableExist</li> - * <li>dbVersion</li> + * <li>{@link #versionTableExist}</li> + * <li>{@link #dbVersion}</li> + * <li>{@link #dbEmpty}</li> * </ul> */ protected void detectDbVersion() { @@ -490,6 +522,14 @@ return; } + // compute dbempty field value + dbEmpty = detectDbEmpty(); + + if (log.isDebugEnabled()) { + log.debug("Db is empty : " + dbEmpty); + } + + Version v = null; try { @@ -498,6 +538,9 @@ TopiaUtil.isSchemaExist(versionConfiguration, TMSVersion.class.getName()); + // check if at least one class exists in db + + if (log.isDebugEnabled()) { log.debug("Table " + TMSVersionDAO.TABLE_NAME + " exist = " + versionTableExist); } @@ -513,7 +556,7 @@ Configuration conf = new Configuration(); conf.addXML(TMSVersionDAO.LEGACY_MAPPING); - legacyVersionConfiguration = creaHibernateConfiguration(conf); + legacyVersionConfiguration = createHibernateConfiguration(conf); legacyVersionTableExist = TopiaUtil.isSchemaExist(legacyVersionConfiguration, TMSVersion.class.getName()); @@ -552,6 +595,54 @@ } } + /** + * Detects if there is some schema existing for at least one of the dealed + * entity of the underlying db context. + * + * @return {@code true} if there is no schema for any of the dealed entities, + * {@code false} otherwise. + * @since 2.5.3 + */ + protected boolean detectDbEmpty() { + + boolean result = true; + + try { + // get db real hibernate configuration + Configuration rootConfiguration = + rootContext.getHibernateConfiguration(); + + // get all dealed classes + List<Class<?>> persistenceClasses = + new ArrayList<Class<?>>(rootContext.getPersistenceClasses()); + + // remove the tmsversion class + persistenceClasses.remove(TMSVersion.class); + + for (Class<?> persistenceClass : persistenceClasses) { + + boolean tableExist = + TopiaUtil.isSchemaExist(rootConfiguration, + persistenceClass.getName() + ); + if (tableExist) { + + // at least one table exists + result = false; + + if (log.isDebugEnabled()) { + log.debug("Detected table for " + persistenceClass); + } + break; + } + } + } catch (TopiaNotFoundException e) { + throw new RuntimeException(e); + } + + return result; + } + protected Version getVersion(boolean versionTableExist, String tableName) { if (!versionTableExist) { @@ -587,7 +678,26 @@ } } + /** + * Creates the hibernate configuration to be used by the service. + * + * @param configuration the incoming hibernate configuration + * @return the complete configuration usable by the service + * @deprecated since 2.5.3, prefer to use the method {@link #createHibernateConfiguration(Configuration)} + */ + @Deprecated protected Configuration creaHibernateConfiguration(Configuration configuration) { + return createHibernateConfiguration(configuration); + } + + /** + * Creates the hibernate configuration to be used by the service. + * + * @param configuration the incoming hibernate configuration + * @return the complete configuration usable by the service + * @since 2.5.3 + */ + protected Configuration createHibernateConfiguration(Configuration configuration) { Properties config = rootContext.getConfig(); Properties prop = new Properties();

1 0