diff --git a/pom.xml b/pom.xml
index 368a1328..b15437dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,32 +29,19 @@
-
- central
- https://repo.maven.apache.org/maven2/
-
- true
-
-
- false
-
-
-
-
- eclipse-oxygen-releases
- Eclipse Oxygen Releases
- https://repo.eclipse.org/content/repositories/oxygen-releases/
+
+ mvn2s
+ https://repo1.maven.org/maven2/
true
- false
+ true
- eclipse-neon-releases
- Eclipse Neon Releases
- https://repo.eclipse.org/content/repositories/neon-releases/
+ egovframe
+ https://maven.egovframe.go.kr/maven/
true
@@ -62,41 +49,31 @@
false
-
-
- osgeo
- OSGeo Release Repository
- https://repo.osgeo.org/repository/release/
- false
- true
-
-
-
- jaspersoft-repo
- https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/
-
- true
-
-
- false
-
-
-
-
- egovframe
- http://www.egovframe.go.kr/maven/
-
- true
-
-
- false
-
-
+
+ osgeo
+ OSGeo Release Repository
+ https://repo.osgeo.org/repository/release/
+ false
+ true
+
+
+ osgeo-snapshot
+ OSGeo Snapshot Repository
+ https://repo.osgeo.org/repository/snapshot/
+ true
+
+ false
+
+
+
+ jaspersoft-third-party
+ https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/
+
-
+
org.apache.ws.xmlrpc
xmlrpc
@@ -128,6 +105,7 @@
egovframework.rte.fdl.idgnr
${egovframework.rte.version}
+
egovframework.rte
egovframework.rte.fdl.property
@@ -224,6 +202,7 @@
7.0.53
+
commons-dbcp
commons-dbcp
@@ -315,11 +294,7 @@
slf4j-log4j12
${org.slf4j-version}
-
- log4j
- log4j
- 1.3alpha-8
-
+
org.lazyluke
log4jdbc-remix
@@ -359,13 +334,6 @@
1.10
-
-
- egovframework.rte
- egovframework.rte.fdl.property
- 2.7.0
-
-
log4j
@@ -429,12 +397,11 @@
26Dec2008
-
org.jdom
jdom
- 2.0.2
+ 1.1.3
@@ -449,7 +416,6 @@
json
20180813
-
javax.websocket
javax.websocket-api
@@ -473,13 +439,107 @@
com.googlecode.json-simple
json-simple
- 1.1.1
+ 1.1
+
+
+ org.apache.commons
+ commons-lang3
+ 3.12.0
+
+
+
+
+ com.oracle.database.jdbc
+ ojdbc8
+ 23.2.0.0
+
+
+
+
+ commons-dbcp
+ commons-dbcp
+ 1.4
+
+
+
+
+ org.picocontainer
+ picocontainer
+ 1.2
+
+
+
+
+
+
+ org.geotools.ogc
+ net.opengis.fes
+ 11.0
+
+
+ org.geotools
+ gt-referencing
+
+
+
+
+
+
+
+ xalan
+ xalan
+ 2.7.2
+
+
+ xerces
+ xercesImpl
+ 2.12.0
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.1
+
+
+ org.glassfish.jaxb
+ txw2
+ 2.3.1
+
+
+ org.glassfish.jaxb
+ jaxb-runtime
+ 2.3.1
+
+
+ org.glassfish.jaxb
+ txw2
+
+
+
+
+ commons-lang
+ commons-lang
+ 2.6
+
+
+
+ net.sf.json-lib
+ json-lib
+ 2.4 jdk15
+
+ commons-logging
+ commons-logging
+
+
+
+
com.lowagie
itext
2.1.7.js2
+ compile
@@ -492,6 +552,13 @@
org.geotools
gt-main
${geotools.version}
+
+
+
+ org.jdom
+ jdom
+
+
org.geotools
@@ -519,25 +586,68 @@
${geotools.version}
- org.geotools
- gt-api
- ${geotools.version}
+ org.geotools
+ gt-swing
+ ${geotools.version}
+
+
+ org.jdom
+ jdom
+
+
+ org.geotools
+ gt-coverage
+
+
+ javax.media
+ jai_imageio
+
+
+ org.geotools
+ gt-imageio
+
+
+ org.geotools
+ gt-imageio-ext-gdal
+
+
+
+
+
+
+ org.jdom
+ jdom
+ 1.1.3
+
+
+
+ org.geotools
+ gt-coverage
+ ${geotools.version}
+
+
+ org.geotools
+ gt-metadata
+
+
- org.geotools
- gt-metadata
- ${geotools.version}
+ javax.media
+ jai_imageio
+ 1.1
+
- org.geotools
- gt-swing
- ${geotools.version}
-
+ org.geotools
+ gt-imageio-ext-gdal
+ ${geotools.version}
+
org.geotools
gt-render
@@ -547,6 +657,13 @@
org.geotools
gt-shapefile
${geotools.version}
+
+
+
+ org.jdom
+ jdom
+
+
org.geotools.xsd
@@ -608,27 +725,265 @@
org.geotools
gt-wms
${geotools.version}
+
+
+ org.geotools
+ gt-metadata
+ ${geotools.version}
+
+
+ org.geotools.xsd
+ gt-xsd-wfs
+ ${geotools.version}
+
+
+ org.geotools
+ gt-metadata
+
+
+
+
+ org.geotools
+ gt-xml
+ ${geotools.version}
+
+
+ org.geotools.xsd
+ gt-xsd-wfs
+
+
+
+
+ org.geotools
+ gt-graph
+ ${geotools.version}
+
+
+ org.geotools
+ gt-metadata
+
+
+
+
+ org.geotools
+ gt-api
+ ${geotools.version}
+
+
+ org.geotools.xsd
+ gt-xsd-fes
+ ${geotools.version}
+
+
+ org.geotools.xsd
+ gt-xsd-gml3
+ ${geotools.version}
+
+
+ org.geotools
+ gt-metadata
+
+
+
+
+ org.geotools.xsd
+ gt-xsd-ows
+ ${geotools.version}
+
+
+ org.geotools
+ gt-api
+
+
+
+
+ org.geotools
+ gt-shapefile-old
+ ${geotools.version}
+
+
+ javax.vecmath
+ vecmath
+
+
+
+
+
+ xml-apis
+ xml-apis
+ 1.0.b2
+
+
+
+
+ commons-collections
+ commons-collections
+ 3.1
+
+
+
+
+ junit
+ junit
+ 4.4
+ test
+
+
+
+
+ postgresql
+ postgresql
+ 8.4-701.jdbc3
+
+
+
+
+ mysql
+ mysql-connector-java
+ 5.1.17
+
+
+
+
+ commons-httpclient
+ commons-httpclient
+ 3.1
+
+
+
+
+ commons-codec
+ commons-codec
+ 1.2
+
+
+
+
+ commons-io
+ commons-io
+ 2.1
+
+
+
+
+ commons-collections
+ commons-collections
+ 3.2.1
+
+
+
+
+ log4j
+ log4j
+ 1.2.14
+
+
+
+
+ org.osgeo
+ proj4j
+ 0.1.0
+
+
+
+
+ com.jhlabs
+ javaproj
+ 1.0
+
+
+
+
+ com.oracle.database.security
+ oraclepki
+ 11.2.0.4
+
+
+
+ org.apache.tomcat
+ tomcat-catalina
+ 7.0.53
+ provided
+
+
org.eclipse.emf
org.eclipse.emf.ecore
2.9.1-v20130827-0309
-
+
+
+ ojdbc6
+ ojdbc6
+ 1.0.0
+
+
+
+ ICERTSecu_JDK18
+ ICERTSecu_JDK18
+ 1.0.0
+
+
+
+
+
+ com.ictway
+ shape-and-image-maker
+ 1.0.0
+
+
+
+ com.ictway
+ shape-maker-only
+ 1.0.0
+
+
+
+ com.ictway
+ ows-projection
+ 1.0.0
+
+
+
+ ictway
+ ictway
+ 1.0.0
+
+
+
+ comm
+ comm
+ 1.0.0
+
+
+
+ com.clipsoft
+ com-clipsoft
+ 1.0.0
+
+
+
+ com.clipsoft
+ com-clipsoft-google
+ 1.0.0
+
+
+
diff --git a/src/main/resources/egovframework/egovProps/globals.properties.sample b/src/main/resources/egovframework/egovProps/globals.properties.sample
index 5ee13edf..f09b90e1 100644
--- a/src/main/resources/egovframework/egovProps/globals.properties.sample
+++ b/src/main/resources/egovframework/egovProps/globals.properties.sample
@@ -1,47 +1,29 @@
##############################################
-################### DB\uad00\ub828 ###################
+################### DB관련 ###################
##############################################
# Oracle
Oracle.Driver=oracle.jdbc.driver.OracleDriver
-
################################################################
-# Oracle.Url=jdbc:oracle:thin:@192.168.0.8:3452:orcl is prod
-#Oracle.Url=jdbc:oracle:thin:@192.168.0.8:3452:orcl
# dbnt devlop server
-Oracle.Url=jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV
-# develop local server
-#Oracle.Url=jdbc:oracle:thin:@192.168.86.2:1521:xe
-# thkim local test
-#Oracle.Url=jdbc:oracle:thin:@127.0.0.1:1521:ORAGEODEV
-#Oracle.Url=jdbc:oracle:thin:@vas2.com:1521:ORAGEODEV
+Oracle.Url=jdbc:oracle:thin:@10.dbnt.co.kr:1521:ORAGEODEV
################################################################
-
-#Oracle.Url=jdbc:oracle:thin:@192.168.0.29:1521:xe
-#Oracle.Url=jdbc:oracle:thin:@192.168.0.71:1521:orcl
-#Oracle.Url=jdbc:oracle:thin:@220.121.145.78:7080:xe
-#Oracle.Url=jdbc:oracle:thin:@localhost:1521:orcl
-#Oracle.Url=jdbc:oracle:thin:@218.232.234.162:1521:ORAGEO
Oracle.ID=geoinfo
Oracle.Password=geoinfo
-# thkim local test
-#Oracle.Password=dbnt060928!rlaxogh
-#Oracle.Password=!!kictgis1234
###############################################
-################### \ud30c\uc77c\uad00\ub828 ###################
+################### 파일관련 ###################
###############################################
-#Geoinfo.FilePath=D:\\Tomcat6\\geoinfoEgov\\webapps\\geoinfo\\files\\
Geoinfo.FilePath=D:\\app_geoinfo\\app\\files\\
-#\uac80\uc0c9\uc720\ud1b5 3\ucc28\uc6d0
+#검색유통 3차원
#Geoinfo.FilePath3D=files\\4dim\\2014\\
Geoinfo.FilePath3D=D:\\app_geoinfo\\app\\files\\4dim\\2014\\
-#\uc804\ubb38\uac00\uc758\uacac
+#전문가의견
Geoinfo.Report=files\\report\\
-#\uc785\ub825\uc2dc\uc2a4\ud15c
+#입력시스템
Geoinfo.WebFilePath=files\\web\\
Globals.FileExtImg=.jpeg,.jpg,.bmp,.tiff,.gif,.png
@@ -53,4 +35,6 @@ Globals.FileExtZip=.hwp,.pdf,.zip,.xls,.xlsx,.ppt,.pptx
###############################################
JWT.secret_key=RnrxhWlQksportalSystem!@!@$#@!@#@!$12442321
# The token expires in 1,800,000 milliseconds, which is equal to 30 minutes.
-JWT.access_expired=1800000
\ No newline at end of file
+JWT.access_expired=1800000
+O2MAP.wms.url=http://10.dbnt.co.kr:2936/o2map/services/wms
+LOCAL.wms.url=http://10.dbnt.co.kr:2936/o2map/services/wms
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/classes/comm.utils.jar b/src/main/webapp/WEB-INF/classes/comm.utils.jar
new file mode 100644
index 00000000..0f47cf9e
Binary files /dev/null and b/src/main/webapp/WEB-INF/classes/comm.utils.jar differ
diff --git a/src/main/webapp/WEB-INF/classes/ictway.jar b/src/main/webapp/WEB-INF/classes/ictway.jar
new file mode 100644
index 00000000..0dbd1374
Binary files /dev/null and b/src/main/webapp/WEB-INF/classes/ictway.jar differ
diff --git a/src/main/webapp/com/css/common.v2.0.css b/src/main/webapp/com/css/common.v2.0.css
index 0271bc92..b2b09e97 100644
--- a/src/main/webapp/com/css/common.v2.0.css
+++ b/src/main/webapp/com/css/common.v2.0.css
@@ -6832,7 +6832,7 @@ ul.faq-q > li textarea {
resize: none;
margin: 0;
}
-.drilling .drilling .input-box.error {
+.drilling .input-box.error {
border: 2px solid red;
}
.drilling .check-box {
diff --git a/src/main/webapp/com/css/sass/common.v2.0.scss b/src/main/webapp/com/css/sass/common.v2.0.scss
index 0987f273..9a4f4384 100644
--- a/src/main/webapp/com/css/sass/common.v2.0.scss
+++ b/src/main/webapp/com/css/sass/common.v2.0.scss
@@ -1,6 +1,6 @@
/* ---------------------------------- */
body {
- margin: 0;
+ margin: 0;
padding: 0;
}
// Name: common.css