Merge branch 'jenkins_with_weblogic'

# Conflicts:
#	WebContent/WEB-INF/properties/env.P.properties

WebContent/WEB-INF/applicationContext-jpa.xml

@@ -41,9 +41,7 @@
 	</context:component-scan>
 	
 	<!-- elink-common 적용 후 추가 -->
-	<context:component-scan
-		base-package="com.eactive.eai.adapter.loader">
-	</context:component-scan>
+	<context:component-scan	base-package="com.eactive.eai.adapter.loader" />
 	<context:component-scan	base-package="com.eactive.eai.common.b2badaptermapping.loader"/>
 	<context:component-scan	base-package="com.eactive.eai.common.b2bextractor.loader"/>
 	<context:component-scan	base-package="com.eactive.eai.common.b2bservice.loader"/>
@@ -66,15 +64,10 @@
 	<context:component-scan	base-package="com.eactive.eai.common.sysdomain.loader"/>
 	<context:component-scan	base-package="com.eactive.eai.common.unifbwk.loader"/>
 	<context:component-scan	base-package="com.eactive.eai.common.usedate.loader"/>
-	<context:component-scan
-		base-package="com.eactive.eai.flowcontrol.jms.loader">
-	</context:component-scan>
-	<context:component-scan
-		base-package="com.eactive.eai.inbound.error.loader">
-	</context:component-scan>
-	<context:component-scan
-			base-package="com.eactive.apim.portal">
-	</context:component-scan>
+	<context:component-scan	base-package="com.eactive.eai.flowcontrol.jms.loader" />
+	<context:component-scan	base-package="com.eactive.eai.inbound.error.loader" />
+	<context:component-scan	base-package="com.eactive.apim.portal" />
+	
 	
 	<bean id="cacheManager"
 		class="org.springframework.cache.ehcache.EhCacheCacheManager">
@@ -92,9 +85,9 @@
 		<!-- schema 를 설정 하지 않으면 RoutingDataSource에 의해 각 설정에 맞는 DB에 접근 한다. -->
 		<prop key="hibernate.hbm2ddl.auto">none</prop>
 		<prop key="hibernate.format_sql">true</prop>
-		<prop key="hibernate.show_sql">true</prop>
-		<prop key="hibernate.dialect">${hibernate.dialect:org.hibernate.dialect.Oracle12cDialect}
-		</prop>
+		<prop key="hibernate.show_sql">false</prop> <!-- true 할경우 STDOUT 출력이 강제됨 -->
+		<prop key="hibernate.type">trace</prop>
+		<prop key="hibernate.dialect">${hibernate.dialect:org.hibernate.dialect.Oracle12cDialect}</prop>
 		<prop key="hibernate.jdbc.batch_size">100</prop>
 		<prop key="hibernate.jdbc.fetch_size">100</prop>
 

WebContent/WEB-INF/applicationContext.xml

@@ -52,8 +52,10 @@
 	</bean>
 <!--	<bean id="passwordEncoder"-->
 <!--		  class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" />-->
-	<bean id="passwordEncoder"
-		  class="org.springframework.security.crypto.password.StandardPasswordEncoder" />
+	<bean id="passwordEncoder"			class="org.springframework.security.crypto.password.StandardPasswordEncoder" />
+	
+	<!-- 광주은행 전용 PasswordEncoder -->
+	<bean id="kjbSafedbPasswordEncoder"	class="com.eactive.ext.kjb.spring.KjbSafedbPasswordEncoder" />
 
   <import resource="applicationContext-datasource-${eai.datasource.type}.xml"/>
   <import resource="applicationContext-jdbc-${eai.datasource.type}.xml"/>

WebContent/WEB-INF/properties/env.P.properties

@@ -14,5 +14,5 @@ eai.tableowner=EMSADM
 # P/T/D/S
 eai.systemmode=P
 eai.drmode=N
-# black / blue / green / orange / yellow 
+# black / blue / green / orange / yellow
 theme.color=blue

WebContent/WEB-INF/weblogic.xml

@@ -13,7 +13,7 @@
   
   <container-descriptor>
     <prefer-application-packages>
-      <packate-name>org.apach.ignite.*</packate-name>
+      <package-name>org.apach.ignite.*</package-name>
       <package-name>org.slf4j.*</package-name>
       <package-name>ch.qos.logback.*</package-name>
     </prefer-application-packages>