Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-8721 CoreMessageLogger conflicts

This commit is contained in:
Brett Meyer 2013-11-19 17:28:35 -05:00
parent 328564e038
commit 40a58173ad
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
View File

@ -1611,17 +1611,19 @@ public interface CoreMessageLogger extends BasicLogger {
) )
void embedXmlAttributesNoLongerSupported(); void embedXmlAttributesNoLongerSupported();
// id=447 is used in 4.3 code // id=447 is used in 4.3
@LogMessage(level = INFO) @LogMessage(level = INFO)
@Message( value = "'javax.persistence.validation.mode' named multiple values : %s", id = 448 ) @Message( value = "'javax.persistence.validation.mode' named multiple values : %s", id = 448 )
void multipleValidationModes(String modes); void multipleValidationModes(String modes);
// id=449 to 451 is used in 4.3
@LogMessage(level = WARN) @LogMessage(level = WARN)
@Message(value = "Exception while loading a class or resource found during scanning", id = 449) @Message(value = "Exception while loading a class or resource found during scanning", id = 452)
void unableToLoadScannedClassOrResource(@Cause Exception e); void unableToLoadScannedClassOrResource(@Cause Exception e);
@LogMessage(level = WARN) @LogMessage(level = WARN)
@Message(value = "Exception while discovering OSGi service implementations : %s", id = 450) @Message(value = "Exception while discovering OSGi service implementations : %s", id = 453)
void unableToDiscoverOsgiService(String service, @Cause Exception e); void unableToDiscoverOsgiService(String service, @Cause Exception e);
} }