Merge branch 'staging' into 'master'

- context.xml 백업 및 삭제

See merge request eapim/eapim-admin!4

.gitignore

@@ -10,6 +10,7 @@ WebContent/generated/
 bin/
 tmp/
 *.iml
+*.ipr
 *.tmp
 *.bak
 *.swp
@@ -236,4 +237,6 @@ gradle-app.setting
 
 *.patch
 Doc/
-docs
+docs
+build-gf63.sh
+gradle-gf63.sh

WebContent/META-INF/context-kjb-mysql.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context sessionCookieName="RMS_JSESSIONID">
+
+	<!-- jdbc/dsOBP_AGW -->
+	<Resource name="dsDOBP_AGW" auth="Container"
+		type="javax.sql.DataSource" maxTotal="10" initialSize="10"
+		maxIdle="10" maxActive="10" maxWaitMillis="10000"
+		poolPreparedStatements="true" validationQuery="SELECT 1"
+		validationInterval="600000" username="apigw" password="apigw"
+		driverClassName="com.mysql.cj.jdbc.Driver"
+		url="jdbc:mysql://192.168.240.177:3306/apigw" />
+		
+	<!-- jdbc/dsOBP_EMS -->
+	<Resource name="dsDOBP_EMS" auth="Container"
+		type="javax.sql.DataSource" maxTotal="10" initialSize="10"
+		maxIdle="10" maxActive="10" maxWaitMillis="10000"
+		poolPreparedStatements="true" validationQuery="SELECT 1"
+		validationInterval="600000" username="apims" password="apims"
+		driverClassName="com.mysql.cj.jdbc.Driver"
+		url="jdbc:mysql://192.168.240.177:3306/apims" />
+
+</Context>

WebContent/META-INF/persistence.xml

@@ -0,0 +1,30 @@
+<persistence-unit name="elink-ems">
+	<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+	<jta-data-source>jdbc/dsOBP_EMS</jta-data-source>
+	<properties>
+		<property name="hibernate.dialect"
+			value="org.hibernate.dialect.Oracle12cDialect" />
+		<property name="javax.persistence.validation.mode"
+			value="NONE" />
+		<property name="eclipselink.weaving.validation" value="false" />
+	</properties>
+	<class>com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusiness
+	</class>
+	<class>com.eactive.eai.data.entity.onl.unifbwk.UnifBwkTp</class>
+	<exclude-unlisted-classes>false</exclude-unlisted-classes>
+</persistence-unit>
+<persistence-unit name="elink-apigw">
+	<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+	<jta-data-source>jdbc/dsOBP_EMS</jta-data-source>
+	<properties>
+		<property name="hibernate.dialect"
+			value="org.hibernate.dialect.Oracle12cDialect" />
+		<property name="javax.persistence.validation.mode"
+			value="NONE" />
+		<property name="eclipselink.weaving.validation" value="false" />
+	</properties>
+	<class>com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusiness
+	</class>
+	<class>com.eactive.eai.data.entity.onl.unifbwk.UnifBwkTp</class>
+	<exclude-unlisted-classes>false</exclude-unlisted-classes>
+</persistence-unit>

WebContent/WEB-INF/applicationContext-datasource-DEV.xml

@@ -24,15 +24,15 @@
     class="com.eactive.eai.rms.common.datasource.DataSourceType"
     p:name="APIGW"
     p:text="APIGW"
-    p:schema="ndapigw"
+    p:schema="AGWADM"
     p:dynamic="true"    
     p:online="true"    
-    p:jndiName="NDAPIGW_APP_NXA"
+    p:jndiName="jdbc/dsOBP_AGW"
     p:render="ONL,COM"
     />
   <!-- java:comp/env/ -->
 
-  <bean
+  <!-- <bean
           id="BAP"
           class="com.eactive.eai.rms.common.datasource.DataSourceType"
           p:name="BAP"
@@ -42,24 +42,24 @@
           p:online="true"
           p:jndiName="NDAPIMS_APP_NXA"
           p:render="BAP,COM"
-  />
+  /> -->
   <!-- RMS_DEFAULT -->
   <bean
     id="MONITORING"
     class="com.eactive.eai.rms.common.datasource.DataSourceType"
     p:name="MONITORING"
     p:text="MONITORING"
-    p:schema="ndapims"
+    p:schema="EMSADM"
     p:dynamic="false"
     p:online="false"    
-    p:jndiName="NDAPIMS_APP_NXA"
+    p:jndiName="jdbc/dsOBP_EMS"
     />        
     
   <!-- BATCH(EAI)    --> 
 
 
   <!-- META --> 
-  <bean
+  <!-- <bean
     id="META"
     class="com.eactive.eai.rms.common.datasource.DataSourceType"
     p:name="META"
@@ -68,10 +68,10 @@
     p:dynamic="false"
     p:online="false"    
     p:jndiName="NDAPIMS_APP_NXA"
-    />   
+    /> -->   
 
   <!--IM --> 
-  <bean
+  <!-- <bean
     id="IM"
     class="com.eactive.eai.rms.common.datasource.DataSourceType"
     p:name="IM"
@@ -80,6 +80,6 @@
     p:dynamic="false"
     p:online="false"    
     p:jndiName="API_APP_NXA"
-    />   
+    />    -->
     
 </beans>

WebContent/WEB-INF/applicationContext-datasource-PROD.xml

@@ -27,12 +27,12 @@
     p:schema="apigw"
     p:dynamic="true"    
     p:online="true"    
-    p:jndiName="APIGW_APP_NXA"
+    p:jndiName="jdbc/dsOBP_AGW"
     p:render="ONL,COM"
     />
   <!-- java:comp/env/ -->
   
-  <bean
+  <!-- <bean
           id="BAP"
           class="com.eactive.eai.rms.common.datasource.DataSourceType"
           p:name="BAP"
@@ -42,7 +42,7 @@
           p:online="true"
           p:jndiName="APIMS_APP_NXA"
           p:render="BAP,COM"
-  />
+  /> -->
      
   <!-- RMS_DEFAULT -->
   <bean
@@ -53,14 +53,14 @@
     p:schema="apims"
     p:dynamic="false"
     p:online="false"    
-    p:jndiName="APIMS_APP_NXA"
+    p:jndiName="jdbc/dsOBP_EMS"
     />        
     
   <!-- BATCH(EAI)    --> 
 
 
   <!-- META --> 
-  <bean
+  <!-- <bean
     id="META"
     class="com.eactive.eai.rms.common.datasource.DataSourceType"
     p:name="META"
@@ -69,10 +69,10 @@
     p:dynamic="false"
     p:online="false"    
     p:jndiName="APIMS_APP_NXA"
-    />   
+    /> -->   
 
   <!--IM --> 
-  <bean
+  <!-- <bean
     id="IM"
     class="com.eactive.eai.rms.common.datasource.DataSourceType"
     p:name="IM"
@@ -81,6 +81,6 @@
     p:dynamic="false"
     p:online="false"    
     p:jndiName="API_APP_NXA"
-    />   
+    /> -->   
     
 </beans>

WebContent/WEB-INF/applicationContext-datasource-STG.xml

@@ -24,15 +24,15 @@
     class="com.eactive.eai.rms.common.datasource.DataSourceType"
     p:name="APIGW"
     p:text="APIGW"
-    p:schema="dapigw"
+    p:schema="AGWADM"
     p:dynamic="true"    
     p:online="true"    
-    p:jndiName="DAPIGW_APP_NXA"
+    p:jndiName="jdbc/dsOBP_AGW"
     p:render="ONL,COM"
     />
   <!-- java:comp/env/ -->
   
-  <bean
+  <!-- <bean
           id="BAP"
           class="com.eactive.eai.rms.common.datasource.DataSourceType"
           p:name="BAP"
@@ -42,7 +42,7 @@
           p:online="true"
           p:jndiName="DAPIMS_APP_NXA"
           p:render="BAP,COM"
-  />
+  /> -->
      
   <!-- RMS_DEFAULT -->
   <bean
@@ -50,17 +50,17 @@
     class="com.eactive.eai.rms.common.datasource.DataSourceType"
     p:name="MONITORING"
     p:text="MONITORING"
-    p:schema="dapims"
+    p:schema="EMSADM"
     p:dynamic="false"
     p:online="false"    
-    p:jndiName="DAPIMS_APP_NXA"
+    p:jndiName="jdbc/dsOBP_EMS"
     />        
     
   <!-- BATCH(EAI)    --> 
 
 
   <!-- META --> 
-  <bean
+  <!-- <bean
     id="META"
     class="com.eactive.eai.rms.common.datasource.DataSourceType"
     p:name="META"
@@ -69,10 +69,10 @@
     p:dynamic="false"
     p:online="false"    
     p:jndiName="DAPIMS_APP_NXA"
-    />   
+    /> -->   
 
   <!--IM --> 
-  <bean
+  <!-- <bean
     id="IM"
     class="com.eactive.eai.rms.common.datasource.DataSourceType"
     p:name="IM"
@@ -81,6 +81,6 @@
     p:dynamic="false"
     p:online="false"    
     p:jndiName="API_APP_NXA"
-    />   
+    /> -->   
     
 </beans>

WebContent/WEB-INF/applicationContext-jpa.xml

@@ -93,7 +93,7 @@
 		<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.PostgreSQL10Dialect}
+		<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/properties/env.D.properties

@@ -6,11 +6,11 @@ db.vendor=mariadb
 # - oracle10g : org.hibernate.dialect.Oracle10gDialect
 # - MySQL8 : org.hibernate.dialect.MySQL8Dialect
 # - MariaDB 10.3 : org.hibernate.dialect.MariaDB103Dialect
-hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+hibernate.dialect=org.hibernate.dialect.Oracle12cDialect
 
 # Priority of the was -D option
 inst.Name=apimsSvr11
-eai.tableowner=apims
+eai.tableowner=EMSADM
 # P/T/D/S
 eai.systemmode=D
 eai.drmode=N

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

@@ -6,13 +6,13 @@ db.vendor=mariadb
 # - oracle10g : org.hibernate.dialect.Oracle10gDialect
 # - MySQL8 : org.hibernate.dialect.MySQL8Dialect
 # - MariaDB 10.3 : org.hibernate.dialect.MariaDB103Dialect
-hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+hibernate.dialect=org.hibernate.dialect.Oracle12cDialect
 
 # Priority of the was -D option
-inst.Name=apimsSvr11
-eai.tableowner=apims
+inst.Name=admSvr11
+eai.tableowner=EMSADM
 # P/T/D/S
 eai.systemmode=D
 eai.drmode=N
 # black / blue / green / orange / yellow 
-theme.color=orange
+theme.color=orange

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

@@ -6,13 +6,13 @@ db.vendor=mariadb
 # - oracle10g : org.hibernate.dialect.Oracle10gDialect
 # - MySQL8 : org.hibernate.dialect.MySQL8Dialect
 # - MariaDB 10.3 : org.hibernate.dialect.MariaDB103Dialect
-hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+hibernate.dialect=org.hibernate.dialect.Oracle12cDialect
 
 # Priority of the was -D option
-inst.Name=apimsSvr11
-eai.tableowner=apims
+inst.Name=admSvr11
+eai.tableowner=EMSADM
 # P/T/D/S
-eai.systemmode=D
+eai.systemmode=T
 eai.drmode=N
 # black / blue / green / orange / yellow 
 theme.color=green

WebContent/WEB-INF/web.xml

@@ -63,7 +63,7 @@
 	</filter-mapping>
  -->
  
-	<listener>
+ 	<listener>
 		<listener-class>
 			org.springframework.web.context.ContextLoaderListener
 		</listener-class>

WebContent/WEB-INF/weblogic-web.xml

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="servlet-3_0" version="3.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+	<display-name>monitoring</display-name>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>/WEB-INF/applicationContext.xml</param-value>
+	</context-param>
+	<!-- XSS Filter -->	
+	<filter>
+		<filter-name>CrossScriptingFilter</filter-name>
+		<filter-class>com.eactive.eai.rms.common.filter.CrossScriptingFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>CrossScriptingFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+  	
+	<filter>
+	    <filter-name>encodingFilter</filter-name>
+	    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+	     <init-param>
+	       <param-name>encoding</param-name>
+	       <param-value>UTF-8</param-value>
+	   </init-param>
+	   <init-param>
+	       <param-name>forceEncoding</param-name>
+	    <param-value>true</param-value>
+	   </init-param>
+	</filter>
+	<filter>
+	    <filter-name>encodingFilterEUCKR</filter-name>
+	    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+	     <init-param>
+	       <param-name>encoding</param-name>
+	       <param-value>utf-8</param-value>
+	   </init-param>
+	   <init-param>
+	       <param-name>forceEncoding</param-name>
+	    <param-value>true</param-value>
+	   </init-param>
+	</filter>
+	<filter-mapping>
+	  <filter-name>encodingFilterEUCKR</filter-name>
+	  <url-pattern>*.excel</url-pattern>
+	</filter-mapping>
+	<filter-mapping>
+	  <filter-name>encodingFilter</filter-name>
+	  <url-pattern>*.file</url-pattern>
+	</filter-mapping>
+
+<!-- 
+	<filter>
+		<filter-name>MonitoringFrontFilter</filter-name>
+		<filter-class>com.eactive.eai.rms.common.filter.MonitoringFrontFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>MonitoringFrontFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+ -->
+ 
+ 	<servlet>
+		<servlet-name>default</servlet-name>
+		<servlet-class>weblogic.servlet.FileServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>default</servlet-name>
+		<url-pattern>/static/*</url-pattern>
+	</servlet-mapping>
+ 
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
+
+	<servlet>
+		<servlet-name>springapp</servlet-name>
+		<servlet-class>
+			org.springframework.web.servlet.DispatcherServlet
+		</servlet-class>
+		<load-on-startup>1</load-on-startup>
+		<multipart-config>
+			<max-file-size>10485760</max-file-size>
+			<max-request-size>15728640</max-request-size>
+			<file-size-threshold>1048576</file-size-threshold>
+		</multipart-config>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>springapp</servlet-name>
+		<url-pattern>*.do</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>springapp</servlet-name>
+		<url-pattern>*.json</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>springapp</servlet-name>
+		<url-pattern>*.view</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>springapp</servlet-name>
+		<url-pattern>*.excel</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>springapp</servlet-name>
+		<url-pattern>*.file</url-pattern>
+	</servlet-mapping>
+
+	<welcome-file-list>
+		<welcome-file>/emergency.jsp</welcome-file>
+		<!-- <welcome-file>/multiLogin.jsp</welcome-file> -->
+		<!-- <welcome-file>/login.jsp</welcome-file> -->
+		<!--welcome-file>/initech/login_exec.jsp</welcome-file -->
+	</welcome-file-list>
+
+	<error-page>
+		<error-code>404</error-code>
+		<location>/common/errors/error404.jsp</location>
+	</error-page>
+
+	<error-page>
+		<error-code>500</error-code>
+		<location>/common/errors/error500.jsp</location>
+	</error-page>
+
+	<jsp-config>
+		<taglib>
+			<taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri>
+			<taglib-location>/WEB-INF/tld/c.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>http://java.sun.com/jsp/jstl/functions</taglib-uri>
+			<taglib-location>/WEB-INF/tld/fn.tld</taglib-location>
+		</taglib>
+	</jsp-config>
+	
+	<session-config>
+    	<session-timeout>120</session-timeout>
+	</session-config>
+</web-app>

WebContent/WEB-INF/weblogic.xml

@@ -10,4 +10,14 @@
 	<cookie-name>JSESSIONID_EMS</cookie-name>
     <persistent-store-type>replicated_if_clustered</persistent-store-type>
   </session-descriptor>
+  
+  <container-descriptor>
+<prefer-application-packages>
+<package-name>org.slf4j.*</package-name>
+<package-name>ch.qos.logback.*</package-name>
+</prefer-application-packages>
+<prefer-application-resources>
+<resource-name>org/slf4j/impl/StaticLoggerBinder.class</resource-name>
+</prefer-application-resources>
+</container-descriptor>
 </weblogic-web-app>

build.gradle

@@ -16,17 +16,17 @@ def quartzVersion = "2.2.1"
 def queryDslVersion = "5.0.0"
 def hibernateVersion = "5.6.15.Final"
 
-def nexusUrl = "https://nexus.eactive.synology.me:8090"
+/*def nexusUrl = "https://nexus.eactive.synology.me:8090"*/
 //def useOnJboss = false
 
 def generatedJavaDir = "$buildDir/generated/java"
 
-repositories {
+/*repositories {
     maven { 
 		url "${nexusUrl}/repository/maven-public/" 
 		allowInsecureProtocol = true
 	}
-}
+}*/
 
 project.webAppDirName = 'WebContent'
 
@@ -47,10 +47,20 @@ compileJava {
 }
 
 war {
-	rootSpec.exclude '**/persistence.xml'
+	def profile = project.findProperty("profile") ?: "tomcat"
+	
+	if (profile == "weblogic") {
+    	webXml = file("WebContent/WEB-INF/weblogic-web.xml")
+	}
+	
+	
+	// rootSpec.exclude '**/persistence.xml'
 	exclude '**/context.xml'
+	archiveFileName = "eapim-admin.war"
+	duplicatesStrategy = DuplicatesStrategy.WARN
 }
 
+
 tasks.withType(JavaCompile) {
 	options.encoding = 'UTF-8'
 }

readme.md

@@ -46,3 +46,11 @@ eLink 모듈을 참조하여 구성되어있으며, 추후 필요 모듈외에
 -Dfile.encoding=utf-8
 -DLOGBACK_LOG_LEVEL=info
 ```
+
+### Gradle 빌드 옵션
+```bash
+# Weblogic 배포용 (테스트 제외)
+gradle build -x test -Pprofile=weblogic
+```
+
+- -Pprofile=weblogic 사용시 weblogic-web.xml 을 web.xml 로 사용 (DefaultServlet 이슈) 

src/main/java/com/eactive/eai/rms/data/config/ConfigurableMultiTenantConnectionProvider.java

@@ -53,12 +53,8 @@ public class ConfigurableMultiTenantConnectionProvider implements MultiTenantCon
 	}
 
 	public Connection changeSchema(Connection connection, String tenantIdentifier) throws SQLException {
-		// connection.setSchema() 를 이용하여 schema를 설정 하려 했으나 postgresql 에서는 대문자로 넣으면 에러가
-		// 발생 한다. 에러가 발생 하지 않게 하려면 applicationContext-datasource.xml 에서 스키마명을 소문자로 변경
-		// 한다.
-		// 일단 schema 설정을 하지 않고 사용
 		String schema = DataSourceTypeManager.getDataSourceType(tenantIdentifier).getSchema();
-		// connection.setSchema(schema);
+		connection.setSchema(schema);
 		log.debug("change schema : {} connection : {}", schema, connection);
 		return connection;
 	}

src/main/java/com/eactive/eai/rms/data/config/EMSTenantConfiguration.java

@@ -1,10 +1,13 @@
 package com.eactive.eai.rms.data.config;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
+import org.hibernate.cfg.AvailableSettings;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan.Filter;
@@ -13,10 +16,12 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.support.SharedEntityManagerBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.TransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import com.eactive.eai.common.dao.Keys;
 import com.eactive.eai.data.jpa.BaseRepositoryImpl;
 import com.eactive.eai.rms.common.datasource.DataSourceTypeManager;
 import com.eactive.eai.rms.data.EMSDataSource;
@@ -31,13 +36,17 @@ public class EMSTenantConfiguration {
 	public LocalContainerEntityManagerFactoryBean entityManagerFactoryForEMS(
 			@Qualifier(DataSourceTypeManager.MONITORING) DataSource dataSource,
 			@Qualifier("hibernateProperties") Properties hibernateProperties) {
-
+		
 		LocalContainerEntityManagerFactoryBean bean = new LocalContainerEntityManagerFactoryBean();
 		bean.setDataSource(dataSource);
 		bean.setPackagesToScan("com.eactive.eai.data", "com.eactive.eai.rms.data", "com.eactive.apim.portal");
 		bean.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
-
 		bean.setJpaProperties(hibernateProperties);
+		
+		Map<String, Object> settings = new HashMap<>();
+		settings.put(AvailableSettings.DEFAULT_SCHEMA, System.getProperty(Keys.TABLE_OWNER_KEY));
+		bean.setJpaPropertyMap(settings);
+		
 		return bean;
 	}
 
@@ -49,5 +58,12 @@ public class EMSTenantConfiguration {
 		jpaTransactionManager.setEntityManagerFactory(entityManagerFactory);
 		return jpaTransactionManager;
 	}
+	
+	@Bean("entityManagerForEMS")
+	public SharedEntityManagerBean entityManager(@Qualifier("entityManagerFactoryForEMS") EntityManagerFactory entityManagerFactory) {
+		SharedEntityManagerBean sharedEntityManagerBean = new SharedEntityManagerBean();
+		sharedEntityManagerBean.setEntityManagerFactory(entityManagerFactory);
+		return sharedEntityManagerBean;
+	}
 
 }

src/main/resources/.gitignore

@@ -0,0 +1 @@
+/logback-rinjae.xml

src/main/resources/logback-dev.xml

@@ -1,9 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <configuration scan="true" scanPeriod="10 seconds">
 	<property name="LOG_PATTERN" value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] \\(%F:%L\\) %-20M -%msg%n" />
+	<property name="PREFIX" value="${inst.Type:-ems}" />
+	<property name="LOG_HOME" value="/Log/App/eapim/${inst.Name:-devSvr00}" />
+	<property name="BACKUP_HOME" value="${LOG_HOME}/backup/" />
+	<property name="LOG_LEVEL" value="${LOGBACK_LOG_LEVEL:-DEBUG}" />
 	<property name="PREFIX" value="${inst.Type:-ems}"></property>
-	<property name="LOG_HOME" value="/log/elink/${PREFIX}/${inst.Name}"></property>
+	<property name="LOG_HOME" value="/Log/apim/${PREFIX}/${inst.Name}"></property>
 	<property name="BACKUP_HOME" value="${LOG_HOME}/backup/"></property>
+	<property name="LOG_LEVEL" value="${LOGBACK_LOG_LEVEL:-DEBUG}" />
+
+
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
 
 	<appender name="STDOUT"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -16,7 +28,6 @@
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
 		<encoder>
-			<charset>MS949</charset>
 			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
@@ -31,7 +42,7 @@
 			</fileNamePattern>
 		</rollingPolicy>
 		<encoder>
-			<charset>MS949</charset>
+			<charset>utf-8</charset>			
 			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
@@ -46,8 +57,8 @@
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
 		<encoder>
-			<charset>MS949</charset>
-			<pattern>-%msg%n</pattern>
+			<charset>utf-8</charset>
+			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
 	<appender name="QUERY_APPENDER"
@@ -61,7 +72,7 @@
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
 		<encoder>
-			<charset>MS949</charset>
+			<charset>utf-8</charset>
 			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
@@ -74,9 +85,20 @@
 				${LOG_HOME}/${PREFIX}_dynamic.log-%d{yyyy-MM-dd}
 			</fileNamePattern>
 			<maxHistory>10</maxHistory>
-		</rollingPolicy>		
+		</rollingPolicy>
 		<encoder>
-			<charset>MS949</charset>
+			<charset>utf-8</charset>
+			<pattern>${LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+	<appender name="HIBERNATE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_HOME}/${PREFIX}_hibernate.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_HOME}/${PREFIX}_hibernate.log-%d{yyyy-MM-dd}</fileNamePattern>
+			<maxHistory>10</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<charset>utf-8</charset>
 			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
@@ -85,10 +107,12 @@
 	<logger name="com.eactive.eai.rms.onl.dashboard" level="ERROR" />
 	<logger name="com.eactive.eai.rms.common.acl.user.BizDao" level="ERROR" />
 	
-	<logger name="org.springframework" level="INFO" />
-	<logger name="org.hibernate" level="INFO" />
-	
-	
+	<logger name="org.springframework" level="DEBUG" />
+	<logger name="org.hibernate" level="DEBUG" >
+		<appender-ref ref="QUERY_APPENDER" />
+		<appender-ref ref="HIBERNATE_APPENDER" />
+	</logger>
+	<logger name="net.sf.ehcache" level="INFO" />
 	
 
 	<logger name="ACCESS_LOGGER" level="DEBUG" >
@@ -152,5 +176,6 @@
 	<root>
 		<level value="DEBUG" />
 		<appender-ref ref="STDOUT" />
+		<appender-ref ref="CONSOLE" />
 	</root>
 </configuration>

src/main/resources/logback.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <configuration scan="true" scanPeriod="10 seconds">
 	<property name="LOG_PATTERN" value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] \\(%F:%L\\) %-20M -%msg%n" />
-	<property name="PREFIX" value="${inst.Type:-ems}"></property>
-	<property name="LOG_HOME" value="/kbklog/online/apims/${inst.Name}"></property>
-	<property name="BACKUP_HOME" value="${LOG_HOME}/backup/"></property>
+	<property name="PREFIX" value="${inst.Type:-ems}" />
+	<property name="LOG_HOME" value="/Log/App/eapim/${inst.Name:-emsSvr00}" />
+	<property name="BACKUP_HOME" value="${LOG_HOME}/backup/" />
 	<property name="LOG_LEVEL" value="${LOGBACK_LOG_LEVEL:-INFO}" />
 
 	<appender name="STDOUT"
@@ -17,7 +17,7 @@
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
 		<encoder>
-			<charset>MS949</charset>
+			<charset>utf-8</charset>
 			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
@@ -32,7 +32,7 @@
 			</fileNamePattern>
 		</rollingPolicy>
 		<encoder>
-			<charset>MS949</charset>
+			<charset>utf-8</charset>
 			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
@@ -47,8 +47,8 @@
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
 		<encoder>
-			<charset>MS949</charset>
-			<pattern>-%msg%n</pattern>
+			<charset>utf-8</charset>
+			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
 	<appender name="QUERY_APPENDER"
@@ -62,7 +62,7 @@
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
 		<encoder>
-			<charset>MS949</charset>
+			<charset>utf-8</charset>
 			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
@@ -75,9 +75,9 @@
 				${LOG_HOME}/${PREFIX}_dynamic.log-%d{yyyy-MM-dd}
 			</fileNamePattern>
 			<maxHistory>10</maxHistory>
-		</rollingPolicy>		
+		</rollingPolicy>
 		<encoder>
-			<charset>MS949</charset>
+			<charset>utf-8</charset>
 			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>