merge

WebContent/WEB-INF/web.xml

@@ -2,7 +2,7 @@
 <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"
+	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">
 	
     <description/>
@@ -69,8 +69,7 @@
 	</filter-mapping>
 	
 	<!-- Dynamic REST API 어댑터 설정 -->
-<!-- 
+<!--     <servlet>
-    <servlet>
         <description/>
         <servlet-name>RestApiDynamicInAdapter</servlet-name>
         <servlet-class>com.eactive.eai.adapter.http.dynamic.RestApiAdapterMain</servlet-class>
@@ -82,6 +81,7 @@
         <url-pattern>/api/*</url-pattern>
     </servlet-mapping>
  -->
+ 
 <!--    
     <listener>
         <listener-class>com.eactive.eai.adapter.http.async.AppContextListener</listener-class>

WebContent/WEB-INF/weblogic-web.xml

@@ -34,7 +34,7 @@
     	<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>