From 4521a4d3006db9065e674bf40bfc618f92fba7dd Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Mon, 30 Dec 2024 12:11:35 +0900
Subject: [PATCH] Merge branch 'tolag3'

---
 ...t.properties => globals_svrtest.properties} |  0
 src/main/webapp/META-INF/context.xml           |  4 ++--
 .../clipreport4/DataConnection.properties      | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename src/main/resources/egovframework/egovProps/{globals_svr_test.properties => globals_svrtest.properties} (100%)

diff --git a/src/main/resources/egovframework/egovProps/globals_svr_test.properties b/src/main/resources/egovframework/egovProps/globals_svrtest.properties
similarity index 100%
rename from src/main/resources/egovframework/egovProps/globals_svr_test.properties
rename to src/main/resources/egovframework/egovProps/globals_svrtest.properties
diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
index ba606de9..10156738 100644
--- a/src/main/webapp/META-INF/context.xml
+++ b/src/main/webapp/META-INF/context.xml
@@ -27,13 +27,13 @@
 		auth="Container"
 		driverClassName="oracle.jdbc.driver.OracleDriver"
 		username="FAIRNETUR"
-		password="FAIRNETUR@#$"
+		password="FAIRNETUR!@#$"
 		type="javax.sql.DataSource"
 		url="jdbc:oracle:thin:@211.245.106.125:1521/XE"
 		factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
 	/>
 	<Resource
-		name="jndi/svr_test"
+		name="jndi/svrtest"
 		auth="Container"
 		driverClassName="oracle.jdbc.driver.OracleDriver"
 		username="FAIRNETUR"
diff --git a/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties b/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties
index efee84dd..c88250cc 100644
--- a/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties
+++ b/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties
@@ -20,15 +20,15 @@ dataconnection1.decoding=
 ################################# \uac1c\ubc1c #################################
 
 ################################# \uc2e4\uc11c\ubc84 #################################
-dataconnection1.conntype=jdbc
-dataconnection1.type=Oracle
-dataconnection1.dbname=XE
-dataconnection1.version=
-dataconnection1.url=jdbc:oracle:thin:@211.245.106.125:1521:XE
-dataconnection1.user=FAIRNETUR
-dataconnection1.password=FAIRNETUR!@#$
-dataconnection1.encoding=
-dataconnection1.decoding=
+#dataconnection1.conntype=jdbc
+#dataconnection1.type=Oracle
+#dataconnection1.dbname=XE
+#dataconnection1.version=
+#dataconnection1.url=jdbc:oracle:thin:@211.245.106.125:1521:XE
+#dataconnection1.user=FAIRNETUR
+#dataconnection1.password=FAIRNETUR!@#$
+#dataconnection1.encoding=
+#dataconnection1.decoding=
 ################################# \uc2e4\uc11c\ubc84 #################################
 
 dataconnection2.conntype=jdbc