diff --git a/docs-core/pom.xml b/docs-core/pom.xml index d5f915ab..6db59fe5 100644 --- a/docs-core/pom.xml +++ b/docs-core/pom.xml @@ -28,7 +28,7 @@ org.hibernate - hibernate-validator + hibernate-c3p0 diff --git a/docs-core/src/main/java/com/sismics/util/jpa/DbOpenHelper.java b/docs-core/src/main/java/com/sismics/util/jpa/DbOpenHelper.java index 47f687c7..6ac6e64d 100644 --- a/docs-core/src/main/java/com/sismics/util/jpa/DbOpenHelper.java +++ b/docs-core/src/main/java/com/sismics/util/jpa/DbOpenHelper.java @@ -1,21 +1,11 @@ package com.sismics.util.jpa; -import com.google.common.base.Strings; -import com.google.common.io.CharStreams; -import com.sismics.docs.core.util.ConfigUtil; -import com.sismics.util.ResourceUtil; -import org.hibernate.HibernateException; -import org.hibernate.JDBCException; -import org.hibernate.engine.jdbc.internal.FormatStyle; -import org.hibernate.engine.jdbc.internal.Formatter; -import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.engine.jdbc.spi.SqlStatementLogger; -import org.hibernate.service.ServiceRegistry; -import org.hibernate.tool.hbm2ddl.ConnectionHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.*; +import java.io.File; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Writer; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; @@ -26,6 +16,22 @@ import java.util.Collections; import java.util.List; import java.util.ResourceBundle; +import org.hibernate.HibernateException; +import org.hibernate.JDBCException; +import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; +import org.hibernate.engine.jdbc.internal.FormatStyle; +import org.hibernate.engine.jdbc.internal.Formatter; +import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.hibernate.engine.jdbc.spi.SqlStatementLogger; +import org.hibernate.service.ServiceRegistry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.base.Strings; +import com.google.common.io.CharStreams; +import com.sismics.docs.core.util.ConfigUtil; +import com.sismics.util.ResourceUtil; + /** * A helper to update the database incrementally. * @@ -37,10 +43,10 @@ public abstract class DbOpenHelper { */ private static final Logger log = LoggerFactory.getLogger(DbOpenHelper.class); - private final ConnectionHelper connectionHelper; - private final SqlStatementLogger sqlStatementLogger; + private final JdbcConnectionAccess jdbcConnectionAccess; + private final List exceptions = new ArrayList(); private Formatter formatter; @@ -51,9 +57,8 @@ public abstract class DbOpenHelper { public DbOpenHelper(ServiceRegistry serviceRegistry) throws HibernateException { final JdbcServices jdbcServices = serviceRegistry.getService(JdbcServices.class); - connectionHelper = new SuppliedConnectionProviderConnectionHelper(jdbcServices.getConnectionProvider()); - sqlStatementLogger = jdbcServices.getSqlStatementLogger(); + jdbcConnectionAccess = jdbcServices.getBootstrapJdbcConnectionAccess(); formatter = (sqlStatementLogger.isFormat() ? FormatStyle.DDL : FormatStyle.NONE).getFormatter(); } @@ -67,8 +72,7 @@ public abstract class DbOpenHelper { try { try { - connectionHelper.prepare(true); - connection = connectionHelper.getConnection(); + connection = jdbcConnectionAccess.obtainConnection(); } catch (SQLException sqle) { exceptions.add(sqle); log.error("Unable to get database metadata", sqle); @@ -120,7 +124,7 @@ public abstract class DbOpenHelper { stmt.close(); stmt = null; } - connectionHelper.release(); + jdbcConnectionAccess.releaseConnection(connection); } catch (Exception e) { exceptions.add(e); log.error("Unable to close connection", e); diff --git a/docs-core/src/main/java/com/sismics/util/jpa/EMF.java b/docs-core/src/main/java/com/sismics/util/jpa/EMF.java index 01287b9e..c0073ce3 100644 --- a/docs-core/src/main/java/com/sismics/util/jpa/EMF.java +++ b/docs-core/src/main/java/com/sismics/util/jpa/EMF.java @@ -11,10 +11,10 @@ import java.util.Properties; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Environment; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.service.ServiceRegistry; -import org.hibernate.service.ServiceRegistryBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +36,7 @@ public final class EMF { Environment.verifyProperties(properties); ConfigurationHelper.resolvePlaceHolders(properties); - ServiceRegistry reg = new ServiceRegistryBuilder().applySettings(properties).buildServiceRegistry(); + ServiceRegistry reg = new StandardServiceRegistryBuilder().applySettings(properties).build(); DbOpenHelper openHelper = new DbOpenHelper(reg) { @@ -85,12 +85,16 @@ public final class EMF { String dbFile = dbDirectory.resolve("docs").toAbsolutePath().toString(); props.put("hibernate.connection.url", "jdbc:h2:file:" + dbFile + ";CACHE_SIZE=65536"); props.put("hibernate.connection.username", "sa"); - props.put("hibernate.hbm2ddl.auto", "none"); + props.put("hibernate.hbm2ddl.auto", ""); props.put("hibernate.dialect", "org.hibernate.dialect.HSQLDialect"); props.put("hibernate.show_sql", "false"); props.put("hibernate.format_sql", "false"); props.put("hibernate.max_fetch_depth", "5"); props.put("hibernate.cache.use_second_level_cache", "false"); + props.put("hibernate.c3p0.min_size", "1"); + props.put("hibernate.c3p0.max_size", "10"); + props.put("hibernate.c3p0.timeout", "0"); + props.put("hibernate.c3p0.max_statements", "0"); return props; } diff --git a/docs-core/src/main/java/com/sismics/util/jpa/ManagedProvidedConnectionHelper.java b/docs-core/src/main/java/com/sismics/util/jpa/ManagedProvidedConnectionHelper.java deleted file mode 100644 index 452b692e..00000000 --- a/docs-core/src/main/java/com/sismics/util/jpa/ManagedProvidedConnectionHelper.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * 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 Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ - -package com.sismics.util.jpa; - -import org.hibernate.cfg.Environment; -import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; -import org.hibernate.internal.util.config.ConfigurationHelper; -import org.hibernate.service.ServiceRegistryBuilder; -import org.hibernate.service.internal.StandardServiceRegistryImpl; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.tool.hbm2ddl.ConnectionHelper; - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Properties; - -/** - * A {@link ConnectionHelper} implementation based on an internally - * built and managed {@link ConnectionProvider}. - * - * @author Steve Ebersole - */ -class ManagedProviderConnectionHelper implements ConnectionHelper { - private Properties cfgProperties; - private StandardServiceRegistryImpl serviceRegistry; - private Connection connection; - - public ManagedProviderConnectionHelper(Properties cfgProperties) { - this.cfgProperties = cfgProperties; - } - - @Override - public void prepare(boolean needsAutoCommit) throws SQLException { - serviceRegistry = createServiceRegistry(cfgProperties); - connection = serviceRegistry.getService(ConnectionProvider.class).getConnection(); - if (needsAutoCommit && !connection.getAutoCommit()) { - connection.commit(); - connection.setAutoCommit(true); - } - } - - private static StandardServiceRegistryImpl createServiceRegistry(Properties properties) { - Environment.verifyProperties(properties); - ConfigurationHelper.resolvePlaceHolders(properties); - return (StandardServiceRegistryImpl) new ServiceRegistryBuilder().applySettings(properties).buildServiceRegistry(); - } - - @Override - public Connection getConnection() throws SQLException { - return connection; - } - - @Override - public void release() throws SQLException { - try { - releaseConnection(); - } finally { - releaseServiceRegistry(); - } - } - - private void releaseConnection() throws SQLException { - if (connection != null) { - try { - new SqlExceptionHelper().logAndClearWarnings(connection); - } finally { - try { - serviceRegistry.getService(ConnectionProvider.class).closeConnection(connection); - } finally { - connection = null; - } - } - } - } - - private void releaseServiceRegistry() { - if (serviceRegistry != null) { - try { - serviceRegistry.destroy(); - } finally { - serviceRegistry = null; - } - } - } -} diff --git a/docs-core/src/main/java/com/sismics/util/jpa/SessionUtil.java b/docs-core/src/main/java/com/sismics/util/jpa/SessionUtil.java deleted file mode 100644 index 02e54ba7..00000000 --- a/docs-core/src/main/java/com/sismics/util/jpa/SessionUtil.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.sismics.util.jpa; - -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.ejb.HibernateEntityManagerFactory; - -/** - * Hibernate session utilities. - * - * @author jtremeaux - */ -public final class SessionUtil { - /** - * Private constructor. - */ - private SessionUtil() { - } - - /** - * Returns an instance of the current session. - * - * @return Instance of the current session - */ - public static Session getCurrentSession() { - SessionFactory sessionFactory = ((HibernateEntityManagerFactory) EMF.get()).getSessionFactory(); - return sessionFactory.getCurrentSession(); - } -} \ No newline at end of file diff --git a/docs-core/src/main/java/com/sismics/util/jpa/SuppliedConnectionProviderConnectionHelper.java b/docs-core/src/main/java/com/sismics/util/jpa/SuppliedConnectionProviderConnectionHelper.java deleted file mode 100644 index 0da68386..00000000 --- a/docs-core/src/main/java/com/sismics/util/jpa/SuppliedConnectionProviderConnectionHelper.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * 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 Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - * - */ - -package com.sismics.util.jpa; - -import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.tool.hbm2ddl.ConnectionHelper; - -import java.sql.Connection; -import java.sql.SQLException; - -/** - * A {@link ConnectionHelper} implementation based on a provided - * {@link ConnectionProvider}. Essentially, ensures that the connection - * gets cleaned up, but that the provider itself remains usable since it - * was externally provided to us. - * - * @author Steve Ebersole - */ -class SuppliedConnectionProviderConnectionHelper implements ConnectionHelper { - private ConnectionProvider provider; - private Connection connection; - private boolean toggleAutoCommit; - - public SuppliedConnectionProviderConnectionHelper(ConnectionProvider provider) { - this.provider = provider; - } - - @Override - public void prepare(boolean needsAutoCommit) throws SQLException { - connection = provider.getConnection(); - toggleAutoCommit = needsAutoCommit && !connection.getAutoCommit(); - if ( toggleAutoCommit ) { - try { - connection.commit(); - } - catch( Throwable ignore ) { - // might happen with a managed connection - } - connection.setAutoCommit( true ); - } - } - - @Override - public Connection getConnection() throws SQLException { - return connection; - } - - @Override - public void release() throws SQLException { - // we only release the connection - if ( connection != null ) { - new SqlExceptionHelper().logAndClearWarnings( connection ); - if ( toggleAutoCommit ) { - connection.setAutoCommit( false ); - } - provider.closeConnection( connection ); - connection = null; - } - } -} diff --git a/docs-core/src/test/java/com/sismics/docs/core/dao/jpa/TestJpa.java b/docs-core/src/test/java/com/sismics/docs/core/dao/jpa/TestJpa.java index 0dc8d675..8abad9c7 100644 --- a/docs-core/src/test/java/com/sismics/docs/core/dao/jpa/TestJpa.java +++ b/docs-core/src/test/java/com/sismics/docs/core/dao/jpa/TestJpa.java @@ -3,7 +3,7 @@ package com.sismics.docs.core.dao.jpa; import com.sismics.docs.BaseTransactionalTest; import com.sismics.docs.core.model.jpa.User; import com.sismics.docs.core.util.TransactionUtil; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git a/docs-core/src/test/java/com/sismics/docs/core/util/TestEncryptUtil.java b/docs-core/src/test/java/com/sismics/docs/core/util/TestEncryptUtil.java index 39477e5f..68dbbe8b 100644 --- a/docs-core/src/test/java/com/sismics/docs/core/util/TestEncryptUtil.java +++ b/docs-core/src/test/java/com/sismics/docs/core/util/TestEncryptUtil.java @@ -5,8 +5,7 @@ import java.io.InputStream; import javax.crypto.Cipher; import javax.crypto.CipherInputStream; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.google.common.base.Strings; diff --git a/docs-core/src/test/java/com/sismics/docs/core/util/TestFileUtil.java b/docs-core/src/test/java/com/sismics/docs/core/util/TestFileUtil.java index 7ec18c99..7e04aaf2 100644 --- a/docs-core/src/test/java/com/sismics/docs/core/util/TestFileUtil.java +++ b/docs-core/src/test/java/com/sismics/docs/core/util/TestFileUtil.java @@ -11,7 +11,7 @@ import com.google.common.io.Resources; import com.sismics.docs.core.model.jpa.File; import com.sismics.util.mime.MimeType; -import junit.framework.Assert; +import org.junit.Assert; /** * Test of the file entity utilities. diff --git a/docs-core/src/test/java/com/sismics/util/TestDateUtil.java b/docs-core/src/test/java/com/sismics/util/TestDateUtil.java index 797904b6..4c587881 100644 --- a/docs-core/src/test/java/com/sismics/util/TestDateUtil.java +++ b/docs-core/src/test/java/com/sismics/util/TestDateUtil.java @@ -1,6 +1,6 @@ package com.sismics.util; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git a/docs-core/src/test/java/com/sismics/util/TestImageUtil.java b/docs-core/src/test/java/com/sismics/util/TestImageUtil.java index d6c62703..6d980aaa 100644 --- a/docs-core/src/test/java/com/sismics/util/TestImageUtil.java +++ b/docs-core/src/test/java/com/sismics/util/TestImageUtil.java @@ -1,6 +1,6 @@ package com.sismics.util; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git a/docs-core/src/test/java/com/sismics/util/TestResourceUtil.java b/docs-core/src/test/java/com/sismics/util/TestResourceUtil.java index c780dcf6..10518fc4 100644 --- a/docs-core/src/test/java/com/sismics/util/TestResourceUtil.java +++ b/docs-core/src/test/java/com/sismics/util/TestResourceUtil.java @@ -1,6 +1,6 @@ package com.sismics.util; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import java.util.List; diff --git a/docs-core/src/test/resources/hibernate.properties b/docs-core/src/test/resources/hibernate.properties index edd32f92..2c068af9 100644 --- a/docs-core/src/test/resources/hibernate.properties +++ b/docs-core/src/test/resources/hibernate.properties @@ -2,9 +2,13 @@ hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:mem:docs hibernate.connection.username=sa hibernate.connection.password= -hibernate.hbm2ddl.auto=none +hibernate.hbm2ddl.auto= hibernate.dialect=org.hibernate.dialect.HSQLDialect hibernate.show_sql=true hibernate.format_sql=false hibernate.max_fetch_depth=5 hibernate.cache.use_second_level_cache=false +hibernate.c3p0.min_size=1 +hibernate.c3p0.max_size=10 +hibernate.c3p0.timeout=0 +hibernate.c3p0.max_statements=0 \ No newline at end of file diff --git a/docs-parent/pom.xml b/docs-parent/pom.xml index 7dbec5a4..30badbc7 100644 --- a/docs-parent/pom.xml +++ b/docs-parent/pom.xml @@ -20,20 +20,20 @@ 2.6 2.4 1.4 - 18.0 + 19.0 1.2.16 1.6.4 1.6.6 - 4.7 - 1.4.190 + 4.12 + 1.4.191 2.22.1 0.3m 4.2.0 4.2 - 2.0.0-RC2 - 1.53 + 2.0.0-RC3 + 1.54 2.9.1 - 4.1.0.Final + 5.0.7.Final 3.1.0 1.0.5 4.2.1 @@ -48,11 +48,10 @@ 1.8 2.10 - 2.4 - 2.5.2 + 2.6 2.7 2.6 - 2.18.1 + 2.19.1 9.2.13.v20150730 @@ -306,7 +305,7 @@ org.hibernate - hibernate-validator + hibernate-c3p0 ${org.hibernate.hibernate.version} diff --git a/docs-stress/src/main/java/com/sismics/docs/stress/Main.java b/docs-stress/src/main/java/com/sismics/docs/stress/Main.java index 788af740..6ee460ef 100644 --- a/docs-stress/src/main/java/com/sismics/docs/stress/Main.java +++ b/docs-stress/src/main/java/com/sismics/docs/stress/Main.java @@ -17,7 +17,7 @@ import javax.ws.rs.core.Form; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response.Status; -import junit.framework.Assert; +import org.junit.Assert; import org.glassfish.jersey.client.ClientResponse; import org.glassfish.jersey.media.multipart.FormDataMultiPart; diff --git a/docs-web-common/src/test/java/com/sismics/docs/rest/util/TestValidationUtil.java b/docs-web-common/src/test/java/com/sismics/docs/rest/util/TestValidationUtil.java index 4d5a289a..d9eb4cc5 100644 --- a/docs-web-common/src/test/java/com/sismics/docs/rest/util/TestValidationUtil.java +++ b/docs-web-common/src/test/java/com/sismics/docs/rest/util/TestValidationUtil.java @@ -2,7 +2,7 @@ package com.sismics.docs.rest.util; import com.sismics.rest.exception.ClientException; import com.sismics.rest.util.ValidationUtil; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git a/docs-web/pom.xml b/docs-web/pom.xml index 744c698e..048cc060 100644 --- a/docs-web/pom.xml +++ b/docs-web/pom.xml @@ -88,7 +88,7 @@ com.twelvemonkeys.servlet servlet - + com.sismics.docs diff --git a/docs-web/src/dev/resources/hibernate.properties b/docs-web/src/dev/resources/hibernate.properties index 0f7dfbdd..7e4efc32 100644 --- a/docs-web/src/dev/resources/hibernate.properties +++ b/docs-web/src/dev/resources/hibernate.properties @@ -2,9 +2,13 @@ hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:mem:docs hibernate.connection.username=sa hibernate.connection.password= -hibernate.hbm2ddl.auto=none +hibernate.hbm2ddl.auto= hibernate.dialect=org.hibernate.dialect.HSQLDialect hibernate.show_sql=false hibernate.format_sql=false hibernate.max_fetch_depth=5 hibernate.cache.use_second_level_cache=false +hibernate.c3p0.min_size=1 +hibernate.c3p0.max_size=10 +hibernate.c3p0.timeout=0 +hibernate.c3p0.max_statements=0 \ No newline at end of file diff --git a/docs-web/src/test/java/com/sismics/docs/rest/TestSecurity.java b/docs-web/src/test/java/com/sismics/docs/rest/TestSecurity.java index c9a8005e..a05571fd 100644 --- a/docs-web/src/test/java/com/sismics/docs/rest/TestSecurity.java +++ b/docs-web/src/test/java/com/sismics/docs/rest/TestSecurity.java @@ -6,7 +6,7 @@ import javax.ws.rs.core.Form; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.commons.lang.StringUtils; import org.junit.Test; diff --git a/docs-web/src/test/resources/hibernate.properties b/docs-web/src/test/resources/hibernate.properties index edd32f92..2c068af9 100644 --- a/docs-web/src/test/resources/hibernate.properties +++ b/docs-web/src/test/resources/hibernate.properties @@ -2,9 +2,13 @@ hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:mem:docs hibernate.connection.username=sa hibernate.connection.password= -hibernate.hbm2ddl.auto=none +hibernate.hbm2ddl.auto= hibernate.dialect=org.hibernate.dialect.HSQLDialect hibernate.show_sql=true hibernate.format_sql=false hibernate.max_fetch_depth=5 hibernate.cache.use_second_level_cache=false +hibernate.c3p0.min_size=1 +hibernate.c3p0.max_size=10 +hibernate.c3p0.timeout=0 +hibernate.c3p0.max_statements=0 \ No newline at end of file