Merge branch 'master' into jenkins_with_weblogic

# Conflicts:
#	WebContent/WEB-INF/weblogic.xml

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

@@ -2,20 +2,22 @@
 # Examples
 # - H2              : org.hibernate.dialect.H2Dialect
 # - oracle10g     : org.hibernate.dialect.Oracle10gDialect
+# - oracle12c     : org.hibernate.dialect.Oracle12cDialect
+# - MySQL5       : org.hibernate.dialect.MySQL5Dialect
 # - MySQL8       : org.hibernate.dialect.MySQL8Dialect
 # - MariaDB 10.3 : org.hibernate.dialect.MariaDB103Dialect
-hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+hibernate.dialect=org.hibernate.dialect.Oracle12cDialect
 
 # eLink default functions
 # set System property in real system
 #inst.Name=${HOSTNAME}
-inst.Name=elinkSvr11
-eai.jdbc.Name=NDAPIGW_APP_NXA
-eai.rmiport=10211
-eai.rmiserviceport=10212
+inst.Name=agwSvr11
+eai.jdbc.Name=jdbc/dsOBP_AGW
+eai.rmiport=30111
+eai.rmiserviceport=30112
 eai.systemmode=D
 # EAI FEP MCI GW ...
 eai.systemtype=API
-eai.tableowner=ndapigw
+eai.tableowner=AGWADM
 eai.server.extractor=[0,2],[0,2],[-2]
 

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

@@ -18,7 +18,9 @@ shutdown.wait.intervalms=1000
 # message function
 # use default options
 # async queue
-use.internal.queue=true
+// below false to test Weblogic JMS, jwhong
+#use.internal.queue=true
+use.internal.queue=false
 # sync-async mapping
 use.internal.topic=true
 # restore mapping

WebContent/WEB-INF/web.xml

@@ -34,7 +34,18 @@
     	<param-name>contextConfigLocation</param-name>
     	<param-value>/WEB-INF/applicationContext.xml</param-value>
     </context-param>
-    
+
+	<!-- Weblogic 14.1.2 서블릿 설정 -->
+<!--
+ 	<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>
+ -->    
     <!-- oAuth 2.0 인증서버 설정 -->
     <servlet>
 		<servlet-name>authserver</servlet-name>
@@ -60,17 +71,17 @@
 	</filter-mapping>
 	
 	<!-- Dynamic REST API 어댑터 설정 -->
-<!--    <servlet>-->
-<!--        <description/>-->
-<!--        <servlet-name>RestApiDynamicInAdapter</servlet-name>-->
-<!--        <servlet-class>com.eactive.eai.adapter.http.dynamic.RestApiAdapterMain</servlet-class>-->
-<!--        <load-on-startup>2</load-on-startup>-->
-<!--    </servlet>-->
-<!--    <servlet-mapping>-->
-<!--        <servlet-name>RestApiDynamicInAdapter</servlet-name>-->
-<!--        <url-pattern>/API/*</url-pattern>-->
-<!--        <url-pattern>/api/*</url-pattern>-->
-<!--    </servlet-mapping>-->
+    <servlet>
+        <description/>
+        <servlet-name>RestApiDynamicInAdapter</servlet-name>
+        <servlet-class>com.eactive.eai.adapter.http.dynamic.RestApiAdapterMain</servlet-class>
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>RestApiDynamicInAdapter</servlet-name>
+        <url-pattern>/API/*</url-pattern>
+        <url-pattern>/api/*</url-pattern>
+    </servlet-mapping>
     
 <!--    
     <listener>

WebContent/WEB-INF/weblogic.xml

@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<weblogic-web-app xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.oracle.com/weblogic/weblogic-web-app">
-
-	<context-root>/</context-root>
-	<session-descriptor>
-		<timeout-secs>1800</timeout-secs>
-		<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 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.bea.com/ns/weblogic/90" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd http://www.bea.com/ns/weblogic/90 http://www.bea.com/ns/weblogic/90/weblogic-web-app.xsd">
+  <context-root>/</context-root>
+  <session-descriptor>
+    <timeout-secs>1800</timeout-secs>
+	<cookie-name>JSESSIONID_ONL</cookie-name>
+  	<persistent-store-type>replicated_if_clustered</persistent-store-type>
+  </session-descriptor>
+  <container-descriptor>
+    <prefer-application-packages>
+      <packate-name>org.apach.ignite.*</packate-name>
+      <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>