Merge pull request #239 in CORE/base-third from ~HARRISON/base-third:release/10.0 to release/10.0

* commit '844edf1b51f0da65256869755630a2cb98a508e1':
  修改文件名 fine-hibernate
  REPORT-18917 嵌入式部署10.0报错404+部署后模板访问空白 解决 serviceloader 加载冲突的问题。 解决 third - hibernate 读取嵌入式 hibernate 的问题。

fine-hibernate/src/com/fr/third/org/hibernate/cfg/Environment.java

@@ -192,7 +192,7 @@ public final class Environment implements AvailableSettings {
 		GLOBAL_PROPERTIES.setProperty( USE_REFLECTION_OPTIMIZER, Boolean.FALSE.toString() );
 
 		try {
-			InputStream stream = ConfigHelper.getResourceAsStream( "/hibernate.properties" );
+			InputStream stream = ConfigHelper.getResourceAsStream( "/fine-hibernate.properties" );
 			try {
 				GLOBAL_PROPERTIES.load(stream);
 				LOG.propertiesLoaded( ConfigurationHelper.maskOut( GLOBAL_PROPERTIES, PASS ) );