Merge branch 'devs/to-oracle' into develop

# Conflicts:
#	src/main/resources/logback-dev.xml
#	src/main/resources/logback.xml

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/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/dsDOBP_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/dsDOBP_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-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>

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'
 

src/main/resources/logback-dev.xml

@@ -5,6 +5,17 @@
 	<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/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,10 +27,6 @@
 			</fileNamePattern>
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
-		<encoder>
-			<charset>MS949</charset>
-			<pattern>${LOG_PATTERN}</pattern>
-		</encoder>
 	</appender>
 
 	<appender name="ACCESS_APPENDER"
@@ -31,10 +38,6 @@
 				${LOG_HOME}/${PREFIX}_access.log-%d{yyyy-MM-dd}
 			</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
-			<charset>MS949</charset>
-			<pattern>${LOG_PATTERN}</pattern>
-		</encoder>
 	</appender>
 	<appender name="SMS_APPENDER"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -46,10 +49,6 @@
 			</fileNamePattern>
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
-		<encoder>
-			<charset>MS949</charset>
-			<pattern>-%msg%n</pattern>
-		</encoder>
 	</appender>
 	<appender name="QUERY_APPENDER"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -61,10 +60,6 @@
 			</fileNamePattern>
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
-		<encoder>
-			<charset>MS949</charset>
-			<pattern>${LOG_PATTERN}</pattern>
-		</encoder>
 	</appender>
 	<appender name="DYNAMIC_APPENDER"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -75,19 +70,15 @@
 				${LOG_HOME}/${PREFIX}_dynamic.log-%d{yyyy-MM-dd}
 			</fileNamePattern>
 			<maxHistory>10</maxHistory>
-		</rollingPolicy>		
-		<encoder>
-			<charset>MS949</charset>
-			<pattern>${LOG_PATTERN}</pattern>
-		</encoder>
+		</rollingPolicy>
 	</appender>
 	
 	<logger name="com.eactive.eai.rms.onl.server" level="ERROR" />
 	<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" />
 	
 	
 	
@@ -153,5 +144,6 @@
 	<root>
 		<level value="DEBUG" />
 		<appender-ref ref="STDOUT" />
+		<appender-ref ref="CONSOLE" />
 	</root>
 </configuration>

src/main/resources/logback.xml

@@ -16,10 +16,6 @@
 			</fileNamePattern>
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
-		<encoder>
-			<charset>MS949</charset>
-			<pattern>${LOG_PATTERN}</pattern>
-		</encoder>
 	</appender>
 
 	<appender name="ACCESS_APPENDER"
@@ -31,10 +27,6 @@
 				${LOG_HOME}/${PREFIX}_access.log-%d{yyyy-MM-dd}
 			</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
-			<charset>MS949</charset>
-			<pattern>${LOG_PATTERN}</pattern>
-		</encoder>
 	</appender>
 	<appender name="SMS_APPENDER"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -46,10 +38,6 @@
 			</fileNamePattern>
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
-		<encoder>
-			<charset>MS949</charset>
-			<pattern>-%msg%n</pattern>
-		</encoder>
 	</appender>
 	<appender name="QUERY_APPENDER"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -61,10 +49,6 @@
 			</fileNamePattern>
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
-		<encoder>
-			<charset>MS949</charset>
-			<pattern>${LOG_PATTERN}</pattern>
-		</encoder>
 	</appender>
 	<appender name="DYNAMIC_APPENDER"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -75,11 +59,7 @@
 				${LOG_HOME}/${PREFIX}_dynamic.log-%d{yyyy-MM-dd}
 			</fileNamePattern>
 			<maxHistory>10</maxHistory>
-		</rollingPolicy>		
-		<encoder>
-			<charset>MS949</charset>
-			<pattern>${LOG_PATTERN}</pattern>
-		</encoder>
+		</rollingPolicy>
 	</appender>
 	
 	<logger name="com.eactive.eai.rms.onl.server" level="${LOG_LEVEL}" />