djb-eapim/eapim-online
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/KJB_DEV/eapim-bundle/bundles/251211/eapim-online_incremental_2025-11-15.bundle into jenkins_with_weblogic

Browse Source 
# Conflicts:
#	WebContent/WEB-INF/web.xml
This commit is contained in:
Rinjae
2025-12-11 15:35:34 +09:00
parent e71190ee8e 0553ec7a59
commit fafd8d6c6e
37 changed files with 1906 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/WEB-INF/authserver-servlet.xml
+2
View File
@@ -21,6 +21,8 @@
base-package="com.eactive.eai.authserver" />
<context:component-scan
base-package="com.eactive.eai.adapter" />
<context:component-scan
base-package="com.eactive.eai.manage" />
<context:annotation-config />
<mvc:annotation-driven />
<mvc:default-servlet-handler />
WebContent/WEB-INF/web.xml
+6 -5
View File
@@ -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/>
@@ -34,7 +34,9 @@
<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>
@@ -43,7 +45,7 @@
<servlet-name>default</servlet-name>
<url-pattern>/static/*</url-pattern>
</servlet-mapping>
-->
<!-- oAuth 2.0 인증서버 설정 -->
<servlet>
<servlet-name>authserver</servlet-name>
@@ -69,7 +71,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>
@@ -80,8 +82,7 @@
<url-pattern>/API/*</url-pattern>
<url-pattern>/api/*</url-pattern>
</servlet-mapping>
-->
<!--
<listener>
<listener-class>com.eactive.eai.adapter.http.async.AppContextListener</listener-class>
WebContent/error.jsp
+22
View File
@@ -1,5 +1,26 @@
<%@page import="com.eactive.eai.common.util.MessageUtil"%>
<%@ page import="java.io.*, java.util.*"%>
<%@ page language="java" contentType="text/html;charset=utf-8" isErrorPage="true"%>
<%
Integer statusCode = (Integer) request.getAttribute("_authServerStatusCode");
if (statusCode != null) {
response.setStatus(statusCode);
}
String code;
if (statusCode != null && statusCode == 401) {
code = MessageUtil.ERROR_CODE_AUTH_FAIL;
} else if (statusCode != null && statusCode == 404) {
code = MessageUtil.ERROR_CODE_SERVICE_NOT_FOUND;
} else {
code = MessageUtil.ERROR_CODE_AP_ERROR;
}
String message = (String)request.getAttribute("errorMessage");
String jsonErrorMessage = MessageUtil.makeJsonErrorMessage(code, message);
out.println(jsonErrorMessage);
%>
<%--
<html>
<head>
<title>Error</title>
@@ -16,3 +37,4 @@
</body>
</html>
<% response.setStatus(200); %>
--%>