빌드 스크립트 수정 및 기타 작업

.idea/compiler.xml

@@ -5,5 +5,19 @@
   </component>
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="ajc" />
+    <bytecodeTargetLevel>
+      <module name="ppcb-root.BATWeb.main" target="1.8" />
+      <module name="ppcb-root.BATWeb.test" target="1.8" />
+      <module name="ppcb-root.IIMWeb.main" target="1.8" />
+      <module name="ppcb-root.IIMWeb.test" target="1.8" />
+      <module name="ppcb-root.ONLFramework.main" target="1.8" />
+      <module name="ppcb-root.ONLFramework.test" target="1.8" />
+      <module name="ppcb-root.ONLRMSClient.main" target="1.8" />
+      <module name="ppcb-root.ONLRMSClient.test" target="1.8" />
+      <module name="ppcb-root.ONLWeb.main" target="1.8" />
+      <module name="ppcb-root.ONLWeb.test" target="1.8" />
+      <module name="ppcb-root.RMSWeb.main" target="1.8" />
+      <module name="ppcb-root.RMSWeb.test" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file

.idea/encodings.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/ONLFramework/src/main/java/com/eactive/eai/adapter/socket2/protocol/SocketAdapterServer.java" charset="EUC-KR" />
+    <file url="file://$PROJECT_DIR$/RMSWeb/src/main/java/com/eactive/eai/rms/common/startup/AppInitializer.java" charset="EUC-KR" />
+  </component>
+</project>
\ No newline at end of file

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>

.idea/vcs.xml

@@ -2,11 +2,8 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/BATWeb" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/IIMWeb" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/ONLFramework" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/ONLRMSClient" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/ONLWeb" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/RMSWeb" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/BAPWeb" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/EAISIMWeb" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/SIMWeb" vcs="Git" />
   </component>
 </project>
\ No newline at end of file

BATWeb @ b00f437d

-Subproject commit d8aad14437c020048f806e5645536cb33c678999
+Subproject commit b00f437d580954af71bb14a1523a7993602a5e9a

IIMWeb @ 5af08089

-Subproject commit 9f33bb42e4294ec7a5d52c796baeaed3483b75ae
+Subproject commit 5af08089b0167441c871bca710e988f9ec61e559

ONLFramework @ 9536d1b9

-Subproject commit 76d87a4f455d005f6847b15a6346e04eca2071a7
+Subproject commit 9536d1b91f41a58235a962daac94cd68c0b5b8fc

ONLRMSClient @ d9203097

-Subproject commit 578468288396edd76f990f1676d0059f19df0d37
+Subproject commit d9203097a53feada102693b468497535c6b91a42

ONLWeb @ 69ca4b4e

-Subproject commit b53dc6ce7608344c75a15eb9e1feee5e7a7114d8
+Subproject commit 69ca4b4e1444860425f5740412aaae5e677a1cc8

RMSWeb @ 0d3dea94

-Subproject commit 494a17c695be9031804f16d686f4cd5f8a4a16db
+Subproject commit 0d3dea9451574ce6da3a736ef234624b9fc3e8b5

build.gradle

@@ -7,6 +7,7 @@ allprojects {
 
     repositories {
         mavenCentral()
+        jcenter()
     }
 }
 
@@ -16,10 +17,10 @@ subprojects {
     apply plugin: 'eclipse'
     sourceCompatibility = 1.8
 
-    compileJava.options.encoding = 'UTF-8'
+    compileJava.options.encoding = 'ms949'
 
     tasks.withType(JavaCompile){
-        options.encoding = 'UTF-8'
+        options.encoding = 'ms949'
     }
 
     ext {
@@ -50,7 +51,8 @@ subprojects {
         implementation "org.springframework:spring-webmvc-portlet:${springVersion}"
 
         implementation group: 'org.postgresql', name: 'postgresql', version: '42.2.8'
-        compile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.3.0'
+        implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.3.0'
+        implementation group: 'com.oracle', name: 'ojdbc6', version: '11.2.0.3'
 
         testCompile group: 'junit', name: 'junit', version: '4.12'
 

readme.md

@@ -21,3 +21,21 @@ git submodule update --init --recursive
 git submodule foreach git checkout master
 git submodule foreach git pull origin master
 ```
+
+### 참고1. add submodule
+```shell
+git submodule add http://192.168.10.130/elink/v3.6/ONLFramework.git
+git submodule add http://192.168.10.130/elink/v3.6/ONLRMSClient.git
+git submodule add http://192.168.10.130/elink/v3.6/ONLWeb.git
+git submodule add http://192.168.10.130/elink/v3.6/RMSWeb.git
+git submodule add http://192.168.10.130/elink/v3.6/IIMWeb.git
+git submodule add http://192.168.10.130/elink/v3.6/BATWeb.git
+git submodule add http://192.168.10.130/elink/v3.6/BAPWeb.git
+git submodule add http://192.168.10.130/elink/v3.6/SIMWeb.git
+git submodule add http://192.168.10.130/elink/v3.6/EAISIMWeb.git
+git submodule foreach git checkout master
+```
+### 참고2. submodule 일괄 commit
+git submodule foreach git add -A .
+git submodule foreach "git commit -m 'change something' || :"
+git submodule foreach git push origin master
\ No newline at end of file

settings.gradle

-rootProject.name = 'ppcb-root'
+rootProject.name = 'elink'
 include 'BATWeb'
 include 'IIMWeb'
 include 'ONLFramework'