Author: tchemit Date: 2013-12-20 16:27:05 +0100 (Fri, 20 Dec 2013) New Revision: 2950 Url: http://nuiton.org/projects/topia/repository/revisions/2950 Log: fix build Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationConstants.java Removed: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaContextFactory.java Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/TopiaConfigurationHelper.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TestHelper.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java trunk/topia-junit/src/main/java/org/nuiton/topia/junit/AbstractDatabaseResource.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HibernateProvider.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaApplicationContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Collector.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/DBMapping.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaSqlQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/TopiaConfigurationHelper.java =================================================================== --- trunk/topia-it/src/main/java/org/nuiton/topia/it/TopiaConfigurationHelper.java 2013-12-20 14:59:42 UTC (rev 2949) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/TopiaConfigurationHelper.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; -import org.nuiton.topia.persistence.TopiaContextFactory; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.topia.it.legacy.TopiaTestEntityEnum; import org.nuiton.topia.junit.ConfigurationHelper; @@ -103,7 +103,7 @@ configuration.load(stream); configuration.setProperty( - TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, + TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, TopiaTestEntityEnum.getImplementationClassesAsString()); return configuration; } Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TestHelper.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TestHelper.java 2013-12-20 14:59:42 UTC (rev 2949) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TestHelper.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -31,7 +31,7 @@ import org.junit.Ignore; import org.nuiton.topia.persistence.TopiaApplicationContext; import org.nuiton.topia.persistence.TopiaApplicationContextCache; -import org.nuiton.topia.persistence.TopiaContextFactory; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.topia.persistence.TopiaNotFoundException; import org.nuiton.util.FileUtil; @@ -150,7 +150,7 @@ configuration.load(stream); configuration.setProperty( - TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, + TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, TopiaTestEntityEnum.getImplementationClassesAsString()); return configuration; } Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java 2013-12-20 14:59:42 UTC (rev 2949) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -31,7 +31,7 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.persistence.TopiaContextFactory; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.internal.TopiaConnectionProvider; import org.nuiton.topia.it.legacy.TopiaDatabase; @@ -79,7 +79,7 @@ "jdbc:h2:file:" + dbPath); // give a fake db path (we will make sure it is never create after hibernate usage). - configuration.setProperty(TopiaContextFactory.CONFIG_URL, + configuration.setProperty(TopiaConfigurationConstants.CONFIG_URL, "jdbc:h2:file:" + dbPathFake); } }; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java 2013-12-20 14:59:42 UTC (rev 2949) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -30,7 +30,7 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.persistence.TopiaContextFactory; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.topia.it.legacy.TopiaDatabase; import org.nuiton.topia.it.legacy.TopiaTestTopiaPersistenceContext; import org.nuiton.topia.it.legacy.test.entities.Person; @@ -53,7 +53,7 @@ @Override protected void onDbConfigurationCreate(Properties configuration, File testDir, String dbPath) { configuration.setProperty( - TopiaContextFactory.CONFIG_URL, "jdbc:h2:file:" + dbPath + "-source"); + TopiaConfigurationConstants.CONFIG_URL, "jdbc:h2:file:" + dbPath + "-source"); } }; @@ -65,7 +65,7 @@ @Override protected void onDbConfigurationCreate(Properties configuration, File testDir, String dbPath) { configuration.setProperty( - TopiaContextFactory.CONFIG_URL, "jdbc:h2:file:" + dbPath + "-target"); + TopiaConfigurationConstants.CONFIG_URL, "jdbc:h2:file:" + dbPath + "-target"); } }; Modified: trunk/topia-junit/src/main/java/org/nuiton/topia/junit/AbstractDatabaseResource.java =================================================================== --- trunk/topia-junit/src/main/java/org/nuiton/topia/junit/AbstractDatabaseResource.java 2013-12-20 14:59:42 UTC (rev 2949) +++ trunk/topia-junit/src/main/java/org/nuiton/topia/junit/AbstractDatabaseResource.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -30,9 +30,9 @@ import org.hibernate.cfg.Configuration; import org.junit.rules.TestWatcher; import org.junit.runner.Description; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.topia.persistence.internal.AbstractTopiaApplicationContext; import org.nuiton.topia.persistence.HibernateProvider; -import org.nuiton.topia.persistence.TopiaContextFactory; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaPersistenceContext; @@ -116,7 +116,7 @@ stream.close(); } dbConfiguration.setProperty( - TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, + TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, getImplementationClassesAsString()); // make sure we always use a different directory @@ -127,7 +127,7 @@ log.debug("dbPath = " + dbPath); } dbConfiguration.setProperty( - TopiaContextFactory.CONFIG_URL, "jdbc:h2:file:" + dbPath); + TopiaConfigurationConstants.CONFIG_URL, "jdbc:h2:file:" + dbPath); onDbConfigurationCreate(dbConfiguration, testBasedir, dbPath); 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-20 14:59:42 UTC (rev 2949) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HibernateProvider.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -106,7 +106,7 @@ // ajout des repertoires contenant les mappings hibernate String[] dirs = getProperty( - TopiaContextFactory.CONFIG_PERSISTENCE_DIRECTORIES, "").split(","); + TopiaConfigurationConstants.CONFIG_PERSISTENCE_DIRECTORIES, "").split(","); for (String dir : dirs) { dir = dir.trim(); if (StringUtils.isNotEmpty(dir)) { @@ -133,7 +133,7 @@ } String listPersistenceClasses = getProperty( - TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, ""); + TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, ""); String[] classes = listPersistenceClasses.split(","); for (String classname : classes) { @@ -183,7 +183,7 @@ // constructor. Difficult to use this behavior, need to have // TOPIA_PERSISTENCE_PROPERTIES_FILE in config. Properties propertiesFromClasspath = - TopiaUtil.getProperties(getProperty(TopiaContextFactory.CONFIG_PERSISTENCE_PROPERTIES_FILE)); + TopiaUtil.getProperties(getProperty(TopiaConfigurationConstants.CONFIG_PERSISTENCE_PROPERTIES_FILE)); if (!propertiesFromClasspath.isEmpty()) { if (log.isDebugEnabled()) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java 2013-12-20 14:59:42 UTC (rev 2949) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -36,7 +36,6 @@ import com.google.common.base.Function; import com.google.common.collect.Lists; -import org.nuiton.topia.persistence.internal.AbstractTopiaApplicationContext; /** * This class will provide a TopiaApplicationContext cache. Its usage is not necessary, contexts can be directly created @@ -69,7 +68,7 @@ * @return an opened instance of XyzTopiaApplicationContext * @throws TopiaNotFoundException if any pb */ - public static <C extends AbstractTopiaApplicationContext> C getContext( + public static <C extends TopiaApplicationContext> C getContext( Properties config, Function<Properties, C> createContextFunction) throws TopiaNotFoundException { // Put all properties from a hierarchy in the current properties object. @@ -108,7 +107,7 @@ public static List<String> getRegisteredContextUrls() { List<String> result = Lists.newArrayList(); for (Properties e : contextCache.keySet()) { - result.add(e.getProperty(TopiaContextFactory.CONFIG_URL)); + result.add(e.getProperty(TopiaConfigurationConstants.CONFIG_URL)); } return result; } Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationConstants.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationConstants.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationConstants.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -0,0 +1,61 @@ +package org.nuiton.topia.persistence; + +import org.hibernate.cfg.Environment; + +/** + * Created on 12/20/13. + * + * @author Tony Chemit <chemit@codelutin.com> + * @since 3.0 + */ +public interface TopiaConfigurationConstants { + + String CONFIG_DEFAULT_SCHEMA = Environment.DEFAULT_SCHEMA; + + String CONFIG_USER = Environment.USER; + + String CONFIG_PASS = Environment.PASS; + + String CONFIG_DRIVER = Environment.DRIVER; + + String CONFIG_DIALECT = Environment.DIALECT; + + String CONFIG_CONNECTION_PROVIDER = Environment.CONNECTION_PROVIDER; + + String CONFIG_BYTECODE_PROVIDER = Environment.BYTECODE_PROVIDER; + + String CONFIG_CURRENT_SESSION_CONTEXT_CLASS = Environment.CURRENT_SESSION_CONTEXT_CLASS; + + String CONFIG_GENERATE_STATISTICS = Environment.GENERATE_STATISTICS; + + String CONFIG_FORMAT_SQL = Environment.FORMAT_SQL; + + String CONFIG_HBM2DDL_AUTO = Environment.HBM2DDL_AUTO; + + String CONFIG_POOL_SIZE = Environment.POOL_SIZE; + + String CONFIG_SHOW_SQL = Environment.SHOW_SQL; + + String CONFIG_URL = Environment.URL; + + @Deprecated + String CONFIG_PERSISTENCE_DIRECTORIES = + "topia.persistence.directories"; + + String CONFIG_PERSISTENCE_CLASSES = + "topia.persistence.classes"; + + String CONFIG_PERSISTENCE_PROPERTIES_FILE = + "topia.persistence.properties.file"; + + /** + * Configuration directive to change topia Ids generation strategy. + * <p/> + * Expected value is an fqn to a class which implements + * {@link TopiaIdFactory} + * + * @since 3.0 + */ + String CONFIG_PERSISTENCE_TOPIA_ID_FACTORY_CLASS_NAME = + "topia.persistence.topiaIdFactoryClassName"; +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationConstants.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaContextFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaContextFactory.java 2013-12-20 14:59:42 UTC (rev 2949) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaContextFactory.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -1,93 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.topia.persistence; - -import org.hibernate.cfg.Environment; - -/** - * TODO-FD20100507 : Need javadoc + translate the one on methods. - * <p/> - * Created: 3 janv. 2006 21:19:37 - * - * @author poussin <poussin@codelutin.com> - * @author tchemit <tchemit@codelutin.com> - * @version $Id$ - */ -@Deprecated -public class TopiaContextFactory { - - private static final String DEFAULT_CONFIG_PROPERTIES = - "TopiaContextImpl.properties"; - - public final static String CONFIG_DEFAULT_SCHEMA = Environment.DEFAULT_SCHEMA; - - public final static String CONFIG_USER = Environment.USER; - - public final static String CONFIG_PASS = Environment.PASS; - - public final static String CONFIG_DRIVER = Environment.DRIVER; - - public final static String CONFIG_DIALECT = Environment.DIALECT; - - public final static String CONFIG_CONNECTION_PROVIDER = Environment.CONNECTION_PROVIDER; - - public final static String CONFIG_BYTECODE_PROVIDER = Environment.BYTECODE_PROVIDER; - - public final static String CONFIG_CURRENT_SESSION_CONTEXT_CLASS = Environment.CURRENT_SESSION_CONTEXT_CLASS; - - public final static String CONFIG_GENERATE_STATISTICS = Environment.GENERATE_STATISTICS; - - public final static String CONFIG_FORMAT_SQL = Environment.FORMAT_SQL; - - public final static String CONFIG_HBM2DDL_AUTO = Environment.HBM2DDL_AUTO; - - public final static String CONFIG_POOL_SIZE = Environment.POOL_SIZE; - - public final static String CONFIG_SHOW_SQL = Environment.SHOW_SQL; - - public final static String CONFIG_URL = Environment.URL; - - public final static String CONFIG_PERSISTENCE_DIRECTORIES = - "topia.persistence.directories"; - - public final static String CONFIG_PERSISTENCE_CLASSES = - "topia.persistence.classes"; - - public final static String CONFIG_PERSISTENCE_PROPERTIES_FILE = - "topia.persistence.properties.file"; - - /** - * Configuration directive to change topia Ids generation strategy. - * <p/> - * Expected value is an fqn to a class which implements - * {@link org.nuiton.topia.persistence.TopiaIdFactory} - * - * @since 3.0 - */ - public final static String CONFIG_PERSISTENCE_TOPIA_ID_FACTORY_CLASS_NAME = - "topia.persistence.topiaIdFactoryClassName"; - -} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaApplicationContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaApplicationContext.java 2013-12-20 14:59:42 UTC (rev 2949) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaApplicationContext.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -35,7 +35,7 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.nuiton.topia.persistence.TopiaApplicationContext; -import org.nuiton.topia.persistence.TopiaContextFactory; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaNotFoundException; import org.nuiton.topia.persistence.TopiaPersistenceContext; @@ -101,8 +101,8 @@ public AbstractTopiaApplicationContext(Map<String, String> configuration) { Map<String, String> configurationCopy = Maps.newHashMap(); configurationCopy.putAll(configuration); - if ( ! configuration.containsKey(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES)) { - configurationCopy.put(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, getImplementationClassesAsString()); + if ( ! configuration.containsKey(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES)) { + configurationCopy.put(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, getImplementationClassesAsString()); } this.configuration = ImmutableMap.copyOf(configurationCopy); this.topiaServiceSupport = new TopiaServiceSupportImpl(this); @@ -144,7 +144,7 @@ protected TopiaIdFactory getTopiaIdFactory() { if (topiaIdFactory == null) { String topiaIdFactoryClassName = - getConfiguration().get(TopiaContextFactory.CONFIG_PERSISTENCE_TOPIA_ID_FACTORY_CLASS_NAME); + getConfiguration().get(TopiaConfigurationConstants.CONFIG_PERSISTENCE_TOPIA_ID_FACTORY_CLASS_NAME); if (StringUtils.isEmpty(topiaIdFactoryClassName)) { topiaIdFactory = new DefaultTopiaIdFactory(); } else { @@ -299,7 +299,7 @@ @Override public String getSchemaName() { // TODO AThimel 02/08/13 I absolutely don't know if it works - return getConfiguration().get(TopiaContextFactory.CONFIG_DEFAULT_SCHEMA); + return getConfiguration().get(TopiaConfigurationConstants.CONFIG_DEFAULT_SCHEMA); } @Override Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Collector.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Collector.java 2013-12-20 14:59:42 UTC (rev 2949) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Collector.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -166,11 +166,11 @@ this.collector = collector; } - protected Deque<TopiaEntity> getStack() { + public Deque<TopiaEntity> getStack() { return stack; } - protected Collection<TopiaEntity> getAlreadyExplored() { + public Collection<TopiaEntity> getAlreadyExplored() { return alreadyExplored; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/DBMapping.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/DBMapping.java 2013-12-20 14:59:42 UTC (rev 2949) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/DBMapping.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -338,12 +338,12 @@ // } size = sqlSupport.findSingleResult(new TopiaSqlQuery<BigInteger>() { @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { return connection.prepareStatement(sql); } @Override - protected BigInteger prepareResult(ResultSet set) throws SQLException { + public BigInteger prepareResult(ResultSet set) throws SQLException { return set.getBigDecimal(0).unscaledValue(); // TODO AThimel 23/11/13 Don't know if it may work or not } }); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaSqlQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaSqlQuery.java 2013-12-20 14:59:42 UTC (rev 2949) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaSqlQuery.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -53,7 +53,7 @@ * @return the statement containing the query to execute * @throws SQLException if any problem */ - protected abstract PreparedStatement prepareQuery(Connection connection) throws SQLException; + public abstract PreparedStatement prepareQuery(Connection connection) throws SQLException; /** * given a result set, extract the data. @@ -62,7 +62,7 @@ * @return the data extracted from the current set, or {@code null} * @throws SQLException if any prob */ - protected abstract O prepareResult(ResultSet set) throws SQLException; + public abstract O prepareResult(ResultSet set) throws SQLException; /** * A hook to obtain the result set just after the query execute. @@ -71,7 +71,7 @@ * @throws SQLException if any prob * @since 2.6.4 */ - protected void afterExecuteQuery(ResultSet set) throws SQLException { + public void afterExecuteQuery(ResultSet set) throws SQLException { // by default do nothing } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java 2013-12-20 14:59:42 UTC (rev 2949) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java 2013-12-20 15:27:05 UTC (rev 2950) @@ -39,7 +39,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; import org.hibernate.tool.hbm2ddl.TableMetadata; -import org.nuiton.topia.persistence.TopiaContextFactory; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.topia.persistence.support.TopiaHibernateSupport; import org.nuiton.topia.persistence.TopiaNotFoundException; import org.nuiton.topia.persistence.TopiaEntity; @@ -498,7 +498,7 @@ * @return schema name */ public static String getSchemaName(Configuration config) { - return config.getProperty(TopiaContextFactory.CONFIG_DEFAULT_SCHEMA); + return config.getProperty(TopiaConfigurationConstants.CONFIG_DEFAULT_SCHEMA); } public static Map<String, Object> convertPropertiesArrayToMap(Object... propertyNamesAndValues) throws IllegalArgumentException {