diff --git a/.classpath b/.classpath index 4311557..716da25 100644 --- a/.classpath +++ b/.classpath @@ -29,6 +29,5 @@ - diff --git a/pom.xml b/pom.xml index 699b355..9a7dedc 100644 --- a/pom.xml +++ b/pom.xml @@ -199,6 +199,12 @@ jackson-databind 2.8.8 + + + junit + junit + 4.12 + diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties index 9d43e47..a795264 100644 --- a/src/main/resources/egovframework/egovProps/globals.properties +++ b/src/main/resources/egovframework/egovProps/globals.properties @@ -27,7 +27,6 @@ Globals.LocalIp = 127.0.0.1 #Globals.Url=jdbc:mysql://127.0.0.1:3306/mago3d - # Postgreql Globals.DbType = postgresql Globals.UserName= postgres diff --git a/src/main/webapp/WEB-INF/classes/log4j2.xml b/src/main/resources/log4j2.xml similarity index 100% rename from src/main/webapp/WEB-INF/classes/log4j2.xml rename to src/main/resources/log4j2.xml diff --git a/src/main/webapp/f4d b/src/main/webapp/f4d index e148e34..2867295 120000 --- a/src/main/webapp/f4d +++ b/src/main/webapp/f4d @@ -1 +1 @@ -D:/DATA/f4d \ No newline at end of file +D:/egov_f4d \ No newline at end of file diff --git a/src/test/java/vo/PageTest.java b/src/test/java/vo/PageTest.java index c151bc4..fd79a45 100644 --- a/src/test/java/vo/PageTest.java +++ b/src/test/java/vo/PageTest.java @@ -4,7 +4,6 @@ import java.util.List; -import org.junit.Ignore; import org.junit.Test; public class PageTest {