diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context-kbank-mysql.xml similarity index 100% rename from WebContent/META-INF/context.xml rename to WebContent/META-INF/context-kbank-mysql.xml diff --git a/WebContent/META-INF/context-kjb-mysql.xml b/WebContent/META-INF/context-kjb-mysql.xml new file mode 100644 index 0000000..04cbfb2 --- /dev/null +++ b/WebContent/META-INF/context-kjb-mysql.xml @@ -0,0 +1,22 @@ + + + + + + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/applicationContext-datasource-DEV.xml b/WebContent/WEB-INF/applicationContext-datasource-DEV.xml index 45b8991..5f0bf5c 100644 --- a/WebContent/WEB-INF/applicationContext-datasource-DEV.xml +++ b/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" /> - + /> --> - + /> --> - + /> --> diff --git a/WebContent/WEB-INF/applicationContext-jpa.xml b/WebContent/WEB-INF/applicationContext-jpa.xml index 753b9a0..287b55e 100644 --- a/WebContent/WEB-INF/applicationContext-jpa.xml +++ b/WebContent/WEB-INF/applicationContext-jpa.xml @@ -93,7 +93,7 @@ none true true - ${hibernate.dialect:org.hibernate.dialect.PostgreSQL10Dialect} + ${hibernate.dialect:org.hibernate.dialect.Oracle12cDialect} 100 100 diff --git a/build.gradle b/build.gradle index 9a73829..2405bbe 100644 --- a/build.gradle +++ b/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' diff --git a/src/main/resources/logback-dev.xml b/src/main/resources/logback-dev.xml index e240849..bb3a702 100644 --- a/src/main/resources/logback-dev.xml +++ b/src/main/resources/logback-dev.xml @@ -5,6 +5,17 @@ + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n + + @@ -16,10 +27,6 @@ 10 - - MS949 - ${LOG_PATTERN} - - - MS949 - ${LOG_PATTERN} - @@ -46,10 +49,6 @@ 10 - - MS949 - -%msg%n - @@ -61,10 +60,6 @@ 10 - - MS949 - ${LOG_PATTERN} - @@ -75,19 +70,15 @@ ${LOG_HOME}/${PREFIX}_dynamic.log-%d{yyyy-MM-dd} 10 - - - MS949 - ${LOG_PATTERN} - + - - + + @@ -153,5 +144,6 @@ + \ No newline at end of file diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 6bb28a9..9ee91f6 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -16,10 +16,6 @@ 10 - - MS949 - ${LOG_PATTERN} - - - MS949 - ${LOG_PATTERN} - @@ -46,10 +38,6 @@ 10 - - MS949 - -%msg%n - @@ -61,10 +49,6 @@ 10 - - MS949 - ${LOG_PATTERN} - @@ -75,11 +59,7 @@ ${LOG_HOME}/${PREFIX}_dynamic.log-%d{yyyy-MM-dd} 10 - - - MS949 - ${LOG_PATTERN} - +