Skip to content

Commit 682c064

Browse files
sebersolesebersole
committed
HHH-10178 - Move Geronimo JTA jar to provided configuration (non-transitive)
(cherry picked from commit 4793ca3)
1 parent d3d88cf commit 682c064

File tree

12 files changed

+91
-52
lines changed

12 files changed

+91
-52
lines changed

‎hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.sql.SQLException;
1010

1111
import org.hibernate.internal.CoreMessageLogger;
12+
import org.hibernate.internal.log.ConnectionPoolingLogger;
1213

1314
import org.jboss.logging.annotations.Cause;
1415
import org.jboss.logging.annotations.LogMessage;
@@ -25,7 +26,7 @@
2526
* New messages must be added after the last message defined to ensure message codes are unique.
2627
*/
2728
@MessageLogger(projectCode = "HHH")
28-
public interface C3P0MessageLogger extends CoreMessageLogger {
29+
public interface C3P0MessageLogger extends ConnectionPoolingLogger {
2930

3031
/**
3132
* Log a message (WARN) about conflicting {@code hibernate.c3p0.XYZ} and {@code c3p0.XYZ} settings

‎hibernate-core/hibernate-core.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ dependencies {
1515
compile( libraries.javassist )
1616
compile( libraries.antlr )
1717
compile( libraries.jandex )
18-
compile( libraries.jta )
1918

2019
// We need dom4j for a number of things temporarily:
2120
// 1) (unsupported) EntityMode.DOM4J support
@@ -26,9 +25,10 @@ dependencies {
2625

2726
antlr( libraries.antlr )
2827

29-
provided( libraries.ant )
28+
provided( libraries.jta )
3029
provided( libraries.jacc )
3130
provided( libraries.validation )
31+
provided( libraries.ant )
3232
provided( libraries.classmate )
3333

3434
testCompile( project(':hibernate-testing') )

‎hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
2020
import org.hibernate.cfg.AvailableSettings;
2121
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
22-
import org.hibernate.internal.CoreLogging;
23-
import org.hibernate.internal.CoreMessageLogger;
22+
import org.hibernate.internal.log.ConnectionPoolingLogger;
2423
import org.hibernate.internal.util.config.ConfigurationHelper;
2524
import org.hibernate.service.UnknownUnwrapTypeException;
2625
import org.hibernate.service.spi.Configurable;
@@ -44,7 +43,7 @@
4443
public class DriverManagerConnectionProviderImpl
4544
implements ConnectionProvider, Configurable, Stoppable, ServiceRegistryAwareService {
4645

47-
private static final CoreMessageLogger log = CoreLogging.messageLogger( DriverManagerConnectionProviderImpl.class );
46+
private static final ConnectionPoolingLogger log = ConnectionPoolingLogger.CONNECTIONS_LOGGER;
4847

4948
public static final String MIN_SIZE = "hibernate.connection.min_pool_size";
5049
public static final String INITIAL_SIZE = "hibernate.connection.initial_pool_size";

‎hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public interface CoreMessageLogger extends BasicLogger {
6767
void autoCommitMode(boolean autocommit);
6868

6969
@LogMessage(level = WARN)
70-
@Message(value = "JTASessionContext being used with JDBCTransactionFactory; auto-flush will not operate correctly with getCurrentSession()",
70+
@Message(value = "JTASessionContext being used with JDBC transactions; auto-flush will not operate correctly with getCurrentSession()",
7171
id = 8)
7272
void autoFlushWillNotWork();
7373

@@ -96,10 +96,6 @@ public interface CoreMessageLogger extends BasicLogger {
9696
@Message(value = "Calling joinTransaction() on a non JTA EntityManager", id = 27)
9797
void callingJoinTransactionOnNonJtaEntityManager();
9898

99-
@LogMessage(level = INFO)
100-
@Message(value = "Cleaning up connection pool [%s]", id = 30)
101-
void cleaningUpConnectionPool(String url);
102-
10399
@LogMessage(level = DEBUG)
104100
@Message(value = "Closing", id = 31)
105101
void closing();
@@ -160,10 +156,6 @@ public interface CoreMessageLogger extends BasicLogger {
160156
@Message(value = "Configuring from XML document", id = 45)
161157
void configuringFromXmlDocument();
162158

163-
@LogMessage(level = INFO)
164-
@Message(value = "Connection properties: %s", id = 46)
165-
void connectionProperties(Properties connectionProps);
166-
167159
@LogMessage(level = INFO)
168160
@Message(value = "Connections obtained: %s", id = 48)
169161
void connectionsObtained(long connectCount);
@@ -483,20 +475,9 @@ void JavaSqlTypesMappedSameCodeMultipleTimes(
483475
@Message(value = "%s = false breaks the EJB3 specification", id = 144)
484476
void jdbcAutoCommitFalseBreaksEjb3Spec(String autocommit);
485477

486-
@LogMessage(level = WARN)
487-
@Message(value = "No JDBC Driver class was specified by property %s", id = 148)
488-
void jdbcDriverNotSpecified(String driver);
489-
490-
@LogMessage(level = INFO)
491-
@Message(value = "JDBC isolation level: %s", id = 149)
492-
void jdbcIsolationLevel(String isolationLevelToString);
493-
494478
@Message(value = "JDBC rollback failed", id = 151)
495479
String jdbcRollbackFailed();
496480

497-
@Message(value = "JDBC URL was not specified by property %s", id = 152)
498-
String jdbcUrlNotSpecified(String url);
499-
500481
@LogMessage(level = INFO)
501482
@Message(value = "JNDI InitialContext properties:%s", id = 154)
502483
void jndiInitialContextProperties(Hashtable hash);
@@ -992,10 +973,6 @@ void unableToCloseOutputFile(
992973
@Message(value = "IOException occurred closing output stream", id = 292)
993974
void unableToCloseOutputStream(@Cause IOException e);
994975

995-
@LogMessage(level = WARN)
996-
@Message(value = "Problem closing pooled connection", id = 293)
997-
void unableToClosePooledConnection(@Cause SQLException e);
998-
999976
@LogMessage(level = ERROR)
1000977
@Message(value = "Could not close session", id = 294)
1001978
void unableToCloseSession(@Cause HibernateException e);
@@ -1437,16 +1414,6 @@ void usingDefaultIdGeneratorSegmentValue(
14371414
@Message(value = "Using dialect: %s", id = 400)
14381415
void usingDialect(Dialect dialect);
14391416

1440-
@LogMessage(level = INFO)
1441-
@Message(value = "using driver [%s] at URL [%s]", id = 401)
1442-
void usingDriver(
1443-
String driverClassName,
1444-
String url);
1445-
1446-
@LogMessage(level = WARN)
1447-
@Message(value = "Using Hibernate built-in connection pool (not for production use!)", id = 402)
1448-
void usingHibernateBuiltInConnectionPool();
1449-
14501417
@LogMessage(level = ERROR)
14511418
@Message(value = "Don't use old DTDs, read the Hibernate 3.x Migration Guide!", id = 404)
14521419
void usingOldDtd();

‎hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionPoolingLogger.java‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
/*
2+
* Hibernate, Relational Persistence for Idiomatic Java
3+
*
4+
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
5+
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
6+
*/
7+
package org.hibernate.internal.log;
8+
9+
import java.sql.SQLException;
10+
import java.util.Properties;
11+
12+
import org.jboss.logging.BasicLogger;
13+
import org.jboss.logging.Logger;
14+
import org.jboss.logging.annotations.Cause;
15+
import org.jboss.logging.annotations.LogMessage;
16+
import org.jboss.logging.annotations.Message;
17+
import org.jboss.logging.annotations.MessageLogger;
18+
import org.jboss.logging.annotations.ValidIdRange;
19+
20+
import static org.jboss.logging.Logger.Level.INFO;
21+
import static org.jboss.logging.Logger.Level.WARN;
22+
23+
/**
24+
* @author Steve Ebersole
25+
*/
26+
@MessageLogger( projectCode = "HHH" )
27+
@ValidIdRange( min = 10001001, max = 10001500 )
28+
public interface ConnectionPoolingLogger extends BasicLogger {
29+
/**
30+
* Static access to the logging instance
31+
*/
32+
public static final ConnectionPoolingLogger CONNECTIONS_LOGGER = Logger.getMessageLogger(
33+
ConnectionPoolingLogger.class,
34+
"org.hibernate.orm.connections"
35+
);
36+
37+
@LogMessage(level = INFO)
38+
@Message(value = "Connection properties: %s", id = 10001001)
39+
void connectionProperties(Properties connectionProps);
40+
41+
@LogMessage(level = WARN)
42+
@Message(value = "Using Hibernate built-in connection pool (not for production use!)", id = 10001002)
43+
void usingHibernateBuiltInConnectionPool();
44+
45+
@LogMessage(level = INFO)
46+
@Message(value = "Autocommit mode: %s", id = 10001003)
47+
void autoCommitMode(boolean autocommit);
48+
49+
@Message(value = "JDBC URL was not specified by property %s", id = 10001004)
50+
String jdbcUrlNotSpecified(String url);
51+
52+
@LogMessage(level = INFO)
53+
@Message(value = "using driver [%s] at URL [%s]", id = 10001005)
54+
void usingDriver(String driverClassName, String url);
55+
56+
@LogMessage(level = WARN)
57+
@Message(value = "No JDBC Driver class was specified by property %s", id = 10001006)
58+
void jdbcDriverNotSpecified(String driver);
59+
60+
@LogMessage(level = INFO)
61+
@Message(value = "JDBC isolation level: %s", id = 10001007)
62+
void jdbcIsolationLevel(String isolationLevelToString);
63+
64+
@LogMessage(level = INFO)
65+
@Message(value = "Cleaning up connection pool [%s]", id = 10001008)
66+
void cleaningUpConnectionPool(String url);
67+
68+
@LogMessage(level = WARN)
69+
@Message(value = "Problem closing pooled connection", id = 10001009)
70+
void unableToClosePooledConnection(@Cause SQLException e);
71+
}

‎hibernate-ehcache/hibernate-ehcache.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
dependencies {
88
compile project( ':hibernate-core' )
99
compile( libraries.ehcache )
10+
provided( libraries.jta )
1011

1112
testCompile project( ':hibernate-testing' )
1213
}

‎hibernate-entitymanager/hibernate-entitymanager.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ dependencies {
2222
compile( libraries.dom4j )
2323
compile( libraries.commons_annotations )
2424
compile( libraries.jpa )
25-
compile( libraries.jta )
2625
compile( libraries.javassist )
2726

27+
provided( libraries.jta )
28+
2829
provided( "javax.enterprise:cdi-api:1.1-PFD" )
2930

3031
testCompile( project(':hibernate-testing') )

‎hibernate-envers/hibernate-envers.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ dependencies {
1010
compile( project( ':hibernate-core' ) )
1111
compile( project( ':hibernate-entitymanager' ) )
1212

13+
provided( libraries.jta )
14+
1315
provided( [group: 'org.hibernate', name: 'hibernate-tools', version: '3.2.0.ga'] )
1416
provided( libraries.ant )
1517
provided( project( ':hibernate-jpamodelgen' ) )

‎hibernate-infinispan/hibernate-infinispan.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ dependencies {
1818
compile( libraries.infinispan )
1919
compile( libraries.rhq )
2020

21+
provided( libraries.jta )
22+
2123
testCompile project( ':hibernate-testing' )
2224
testCompile( libraries.infinispan_test )
2325
testCompile( libraries.jboss_common_core )

‎hibernate-osgi/hibernate-osgi.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ dependencies {
4444

4545
compile( project( ':hibernate-core' ) )
4646
compile( project( ':hibernate-entitymanager' ) )
47+
compile( libraries.jta )
4748

4849
// MUST use 4.3.1! 4.3.0 was compiled with "-target jsr14".
4950
// http://blog.osgi.org/2012/10/43-companion-code-for-java-7.html

0 commit comments

Comments
 (0)