From 860cf39d83436436e73fa3ddf1a7d28c513ecf1a Mon Sep 17 00:00:00 2001
From: thkim <thkim@tenspace.co.kr>
Date: Thu, 2 May 2024 14:24:52 +0900
Subject: [PATCH] build: main branch test and update .gitignore

---
 .classpath                                    | 24 +++++++++----------
 .gitignore                                    |  4 ++++
 .../egovProps/globals.properties              |  3 +--
 .../clipreport4/DataConnection.properties     |  3 ++-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.classpath b/.classpath
index 91edb929..083c27c2 100644
--- a/.classpath
+++ b/.classpath
@@ -36,19 +36,6 @@
 	<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/javaproj-1.0.6.jar"/>
 	<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/xdoclet-1.2.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v8.5"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_admin/src/main/webapp/WEB-INF/lib/ClipReport4.0-1.0.0.301.jar"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_admin/src/main/webapp/WEB-INF/lib/jxl.jar"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_eGov/src/main/webapp/WEB-INF/lib/gt-api-14.5.jar"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_eGov/src/main/webapp/WEB-INF/lib/gt-data-14.5.jar"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_eGov/src/main/webapp/WEB-INF/lib/gt-main-14.5.jar"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_eGov/src/main/webapp/WEB-INF/lib/gt-metadata-14.5.jar"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_eGov/src/main/webapp/WEB-INF/lib/gt-opengis-14.5.jar"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_eGov/src/main/webapp/WEB-INF/lib/gt-referencing-14.5.jar"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_eGov/src/main/webapp/WEB-INF/lib/gt-shapefile-14.5.jar"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_eGov/src/main/webapp/WEB-INF/lib/ICERTSecu_JDK18.jar"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_eGov/src/main/webapp/WEB-INF/lib/OpenXLS.jar"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_eGov/src/main/webapp/WEB-INF/lib/OrgService.jar"/>
-	<classpathentry kind="lib" path="D:/app_geoinfo/app/eclipse/workspace/geoinfo_eGov/src/main/webapp/WEB-INF/lib/ClipReport4.0-Common.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -59,5 +46,16 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/ClipReport4.0-1.0.0.301.jar"/>
+	<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/ClipReport4.0-Common.jar"/>
+	<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-api-14.5.jar"/>
+	<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-data-14.5.jar"/>
+	<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-main-14.5.jar"/>
+	<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-metadata-14.5.jar"/>
+	<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-opengis-14.5.jar"/>
+	<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-referencing-14.5.jar"/>
+	<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/gt-shapefile-14.5.jar"/>
+	<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/jxl.jar"/>
+	<classpathentry kind="lib" path="D:/git/dbnt/kict/geoinfo/old/old-geoinfo-or-kr-user/src/main/webapp/WEB-INF/lib/OpenXLS.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
index 31c821f7..9d44c062 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,7 @@ local.properties
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*
+
+# thkim
+.classpath
+.project
\ No newline at end of file
diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties
index 13772769..b2f25f44 100644
--- a/src/main/resources/egovframework/egovProps/globals.properties
+++ b/src/main/resources/egovframework/egovProps/globals.properties
@@ -4,8 +4,7 @@
 
 # Oracle
 Oracle.Driver=oracle.jdbc.driver.OracleDriver
-Oracle.Url=jdbc:oracle:thin:@127.0.0.1:1521:ORAGEODEV
-#Oracle.Url=jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV
+Oracle.Url=jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV
 Oracle.ID=geoinfo
 Oracle.Password=geoinfo
 
diff --git a/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties b/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties
index 4a4a328a..6e0ab351 100644
--- a/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties
+++ b/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties
@@ -14,7 +14,8 @@ dataconnection1.version=
 #dataconnection1.url=jdbc:oracle:thin:@192.168.0.29:1521:xe
 #dataconnection1.url=jdbc:oracle:thin:@192.168.0.8:1521:orcl
 #dataconnection1.url=jdbc:oracle:thin:@192.168.10.18:3452:orcl
-dataconnection1.url=jdbc:oracle:thin:@127.0.0.1:1521:ORAGEODEV
+dataconnection1.url=jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV
+#dataconnection1.url=jdbc:oracle:thin:@127.0.0.1:1521:ORAGEODEV
 dataconnection1.user=geoinfo
 dataconnection1.password=geoinfo
 dataconnection1.encoding=