From 1af08214b38690bff770740c9f12145ea07edbb1 Mon Sep 17 00:00:00 2001 From: jei007 <51683963+jei007@users.noreply.github.com> Date: Wed, 19 Apr 2023 08:33:24 +0900 Subject: [PATCH 01/13] Update TypedListTest.java --- .../rte/itl/integration/message/typed/TypedListTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/message/typed/TypedListTest.java b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/message/typed/TypedListTest.java index fb8e9169..c0efaab5 100644 --- a/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/message/typed/TypedListTest.java +++ b/Integration/org.egovframe.rte.itl.integration/src/test/java/org/egovframe/rte/itl/integration/message/typed/TypedListTest.java @@ -706,7 +706,7 @@ public void testToArray() throws Exception // null try { - list.toArray(null); + list.toArray((Object[])null); fail(); } catch (NullPointerException e) From 680c4562996bb77608e0407a67459b202192b488 Mon Sep 17 00:00:00 2001 From: jei007 <51683963+jei007@users.noreply.github.com> Date: Wed, 19 Apr 2023 08:51:35 +0900 Subject: [PATCH 02/13] Add files via upload --- .../logs/daily/dailyRollingSample.log | 1 + 1 file changed, 1 insertion(+) create mode 100644 Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log diff --git a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log b/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log new file mode 100644 index 00000000..6e9ed32b --- /dev/null +++ b/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log @@ -0,0 +1 @@ +2023-04-19 08:50:06,311 DEBUG [dailyLogger] DailyRollingFileAppender - file change test From 80d2e5fbc2ae02bca18d48bc2af486716aafc5bf Mon Sep 17 00:00:00 2001 From: jei007 <51683963+jei007@users.noreply.github.com> Date: Wed, 19 Apr 2023 08:53:08 +0900 Subject: [PATCH 03/13] Delete dailyRollingSample.log.2021-05-10-10-08-00 --- .../logs/daily/dailyRollingSample.log.2021-05-10-10-08-00 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-05-10-10-08-00 diff --git a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-05-10-10-08-00 b/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-05-10-10-08-00 deleted file mode 100644 index 4531fd9a..00000000 --- a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-05-10-10-08-00 +++ /dev/null @@ -1 +0,0 @@ -2021-05-10 10:08:00,879 DEBUG [dailyLogger] DailyRollingFileAppender - file change test From 3a4b48ea9af083de271dfa9cd3ed9e6ebbbf6d1b Mon Sep 17 00:00:00 2001 From: jei007 <51683963+jei007@users.noreply.github.com> Date: Wed, 19 Apr 2023 08:53:15 +0900 Subject: [PATCH 04/13] Delete dailyRollingSample.log.2021-06-21-13-20-12 --- .../logs/daily/dailyRollingSample.log.2021-06-21-13-20-12 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-12 diff --git a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-12 b/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-12 deleted file mode 100644 index 4fada912..00000000 --- a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-12 +++ /dev/null @@ -1 +0,0 @@ -2021-06-21 13:20:12,481 DEBUG [dailyLogger] DailyRollingFileAppender test From 628619d07ff719663b3dafa9b3d6fdc519a78fc1 Mon Sep 17 00:00:00 2001 From: jei007 <51683963+jei007@users.noreply.github.com> Date: Wed, 19 Apr 2023 08:53:21 +0900 Subject: [PATCH 05/13] Delete dailyRollingSample.log.2021-06-21-13-20-13 --- .../logs/daily/dailyRollingSample.log.2021-06-21-13-20-13 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-13 diff --git a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-13 b/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-13 deleted file mode 100644 index 41f79b53..00000000 --- a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-13 +++ /dev/null @@ -1 +0,0 @@ -2021-06-21 13:20:13,488 DEBUG [dailyLogger] DailyRollingFileAppender - file change test From e3c453787d036a24bca32efbe19f912224bdd15a Mon Sep 17 00:00:00 2001 From: jei007 <51683963+jei007@users.noreply.github.com> Date: Wed, 19 Apr 2023 08:53:26 +0900 Subject: [PATCH 06/13] Delete dailyRollingSample.log.2021-06-21-13-20-32 --- .../logs/daily/dailyRollingSample.log.2021-06-21-13-20-32 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-32 diff --git a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-32 b/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-32 deleted file mode 100644 index b444a80a..00000000 --- a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-32 +++ /dev/null @@ -1 +0,0 @@ -2021-06-21 13:20:32,210 DEBUG [dailyLogger] DailyRollingFileAppender test From 3de958a5ccb87cd060e8fe96c5ea5eecabfbf9f5 Mon Sep 17 00:00:00 2001 From: jei007 <51683963+jei007@users.noreply.github.com> Date: Wed, 19 Apr 2023 08:53:32 +0900 Subject: [PATCH 07/13] Delete dailyRollingSample.log.2021-06-21-13-20-33 --- .../logs/daily/dailyRollingSample.log.2021-06-21-13-20-33 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-33 diff --git a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-33 b/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-33 deleted file mode 100644 index 7b16af53..00000000 --- a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-06-21-13-20-33 +++ /dev/null @@ -1 +0,0 @@ -2021-06-21 13:20:33,225 DEBUG [dailyLogger] DailyRollingFileAppender - file change test From 67401ee64676037134c51dc68b056b271a70bbe2 Mon Sep 17 00:00:00 2001 From: jei007 <51683963+jei007@users.noreply.github.com> Date: Wed, 19 Apr 2023 08:53:37 +0900 Subject: [PATCH 08/13] Delete dailyRollingSample.log.2021-12-13-14-35-08 --- .../logs/daily/dailyRollingSample.log.2021-12-13-14-35-08 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-12-13-14-35-08 diff --git a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-12-13-14-35-08 b/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-12-13-14-35-08 deleted file mode 100644 index 4dfdf623..00000000 --- a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-12-13-14-35-08 +++ /dev/null @@ -1 +0,0 @@ -2021-12-13 14:35:08,725 DEBUG [dailyLogger] DailyRollingFileAppender test From 9645e0760025c45895532f8672dc0c70ea1dd4da Mon Sep 17 00:00:00 2001 From: jei007 <51683963+jei007@users.noreply.github.com> Date: Wed, 19 Apr 2023 08:53:42 +0900 Subject: [PATCH 09/13] Delete dailyRollingSample.log.2021-12-13-14-35-09 --- .../logs/daily/dailyRollingSample.log.2021-12-13-14-35-09 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-12-13-14-35-09 diff --git a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-12-13-14-35-09 b/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-12-13-14-35-09 deleted file mode 100644 index 75a3bd14..00000000 --- a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-12-13-14-35-09 +++ /dev/null @@ -1 +0,0 @@ -2021-12-13 14:35:09,734 DEBUG [dailyLogger] DailyRollingFileAppender - file change test From 45fb1724827d7305332fb0c72750adb10f79e1af Mon Sep 17 00:00:00 2001 From: jei007 <51683963+jei007@users.noreply.github.com> Date: Wed, 19 Apr 2023 08:53:47 +0900 Subject: [PATCH 10/13] Delete dailyRollingSample.log.2021-12-20-09-44-24 --- .../logs/daily/dailyRollingSample.log.2021-12-20-09-44-24 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-12-20-09-44-24 diff --git a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-12-20-09-44-24 b/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-12-20-09-44-24 deleted file mode 100644 index 057f6e3b..00000000 --- a/Foundation/org.egovframe.rte.fdl.logging/logs/daily/dailyRollingSample.log.2021-12-20-09-44-24 +++ /dev/null @@ -1 +0,0 @@ -2021-12-20 09:44:24,339 DEBUG [dailyLogger] DailyRollingFileAppender test From be01114665b96ad4f945fbdfdd489cac24164331 Mon Sep 17 00:00:00 2001 From: jei007 <51683963+jei007@users.noreply.github.com> Date: Mon, 24 Apr 2023 10:09:00 +0900 Subject: [PATCH 11/13] Update EgovEmailEventNoticeTrigger.java --- .../brte/sample/example/event/EgovEmailEventNoticeTrigger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Batch/org.egovframe.rte.bat.core/src/test/java/org/egovframe/brte/sample/example/event/EgovEmailEventNoticeTrigger.java b/Batch/org.egovframe.rte.bat.core/src/test/java/org/egovframe/brte/sample/example/event/EgovEmailEventNoticeTrigger.java index 44b7403b..39361335 100644 --- a/Batch/org.egovframe.rte.bat.core/src/test/java/org/egovframe/brte/sample/example/event/EgovEmailEventNoticeTrigger.java +++ b/Batch/org.egovframe.rte.bat.core/src/test/java/org/egovframe/brte/sample/example/event/EgovEmailEventNoticeTrigger.java @@ -129,7 +129,7 @@ private void postMail(String recipients[], String subject, String message, Strin boolean debug = false; - java.security.Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider()); + Security.addProvider(Security.getProvider("SunJSSE")); String SMTP_HOST_NAME = "gmail-smtp.l.google.com"; // Properties 설정 From 4fca523d39e30236adc893d6c072ca0c75415658 Mon Sep 17 00:00:00 2001 From: jei007 <51683963+jei007@users.noreply.github.com> Date: Mon, 24 Apr 2023 10:21:19 +0900 Subject: [PATCH 12/13] Update FilehandlingServiceTest.java --- .../filehandling/FilehandlingServiceTest.java | 341 ++++-------------- 1 file changed, 79 insertions(+), 262 deletions(-) diff --git a/Foundation/org.egovframe.rte.fdl.filehandling/src/test/java/org/egovframe/rte/fdl/filehandling/FilehandlingServiceTest.java b/Foundation/org.egovframe.rte.fdl.filehandling/src/test/java/org/egovframe/rte/fdl/filehandling/FilehandlingServiceTest.java index 0f9303f8..7f6f7c9a 100644 --- a/Foundation/org.egovframe.rte.fdl.filehandling/src/test/java/org/egovframe/rte/fdl/filehandling/FilehandlingServiceTest.java +++ b/Foundation/org.egovframe.rte.fdl.filehandling/src/test/java/org/egovframe/rte/fdl/filehandling/FilehandlingServiceTest.java @@ -15,49 +15,36 @@ */ package org.egovframe.rte.fdl.filehandling; -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.URL; -import java.util.Iterator; -import java.util.List; - import org.apache.commons.io.FileSystemUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.io.LineIterator; -import org.apache.commons.vfs2.CacheStrategy; -import org.apache.commons.vfs2.FileContent; -import org.apache.commons.vfs2.FileName; -import org.apache.commons.vfs2.FileObject; -import org.apache.commons.vfs2.FileSystemManager; -import org.apache.commons.vfs2.FileSystemOptions; -import org.apache.commons.vfs2.FilesCache; -import org.apache.commons.vfs2.Selectors; -import org.apache.commons.vfs2.VFS; +import org.apache.commons.vfs2.*; import org.apache.commons.vfs2.auth.StaticUserAuthenticator; import org.apache.commons.vfs2.impl.DefaultFileSystemConfigBuilder; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider; +import org.egovframe.rte.fdl.logging.util.EgovResourceReleaser; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.*; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.Iterator; +import java.util.List; + import static org.junit.Assert.*; /** * FileServiceTest is TestCase of File Handling Service * @author Seongjong Yoon */ -//@RunWith(SpringJUnit4ClassRunner.class) -//@ContextConfiguration(locations = {"classpath*:spring/context-*.xml" }) public class FilehandlingServiceTest { private static final Logger LOGGER = LoggerFactory.getLogger(FilehandlingServiceTest.class); - private String filename = ""; private String text = ""; private String tmppath = ""; @@ -68,23 +55,19 @@ public void onSetUp() throws Exception { filename = "test.txt"; text = "test입니다."; tmppath = "tmp"; - + LOGGER.debug("System's temporary directory : {}", EgovFileUtil.getTmpDirectory()); - - absoluteFilePath = EgovFileUtil.getTmpDirectory() + "/testing.txt"; - + + absoluteFilePath = EgovFileUtil.getTmpDirectory() + "/testing.txt"; EgovFileUtil.cd(System.getProperty("user.dir")); } /** * 특정 위치에 파일을 생성하고 필요에 따라 생성한 파일을 캐싱한다. - * - * @throws Exception */ @Test public void testCeateFile() throws Exception { FileSystemManager manager = VFS.getManager(); - FileObject baseDir = manager.resolveFile(System.getProperty("user.dir")); final FileObject file = manager.resolveFile(baseDir, "testfolder/file1.txt"); @@ -100,14 +83,10 @@ public void testCeateFile() throws Exception { /** * 특정 위치에 존재하는 파일에 접근하여 파일 내용을 수정한다. * 파일 위치는 절대 경로 또는 상대 경로 등 다양한 형식을 지원한다. - * - * @throws Exception */ @Test - public void testAccessFile() throws Exception { - + public void testAccessFile() throws IOException { FileSystemManager manager = VFS.getManager(); - FileObject baseDir = manager.resolveFile(System.getProperty("user.dir")); FileObject file = manager.resolveFile(baseDir, "testfolder/file1.txt"); @@ -125,84 +104,60 @@ public void testAccessFile() throws Exception { // 파일 쓰기 String string = "test입니다."; OutputStream os = fileContent.getOutputStream(); - try { os.write(string.getBytes()); os.flush(); } finally { - if (os != null) { - try { - os.close(); - } catch (Exception ignore) { - // no-op - } - } + EgovResourceReleaser.close(os); } assertNotSame(0, fileContent.getSize()); // 파일 읽기 - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); FileObject writtenFile = manager.resolveFile(baseDir, "testfolder/file1.txt"); FileContent writtenContents = writtenFile.getContent(); InputStream is = writtenContents.getInputStream(); - try { BufferedReader reader = new BufferedReader(new InputStreamReader(is)); - - String line = ""; + String line; while ((line = reader.readLine()) != null) { sb.append(line); } } finally { - if (is != null) { - try { - is.close(); - } catch (Exception ignore) { - // no-op - } - } + EgovResourceReleaser.close(is); } - - // 파일내용 검증 assertEquals(sb.toString(), string); } /** * 캐싱 기능을 사용하여, 생성하거나 수정할 파일을 메모리 상에 로딩함으로써 * 파일 접근 시에 소요되는 시간을 단축한다. - * - * @throws Exception */ @Test - public void testCaching() throws Exception { + public void testCaching() throws IOException { String path = FilehandlingServiceTest.class.getResource("").getPath(); String testFolder = path + "/testfolder"; FileSystemManager manager = VFS.getManager(); - FileObject scratchFolder = manager.resolveFile(testFolder); // testfolder 내의 모든 파일 삭제 scratchFolder.delete(Selectors.EXCLUDE_SELF); - + FileObject file = manager.resolveFile(path + "/testfolder/dummy.txt"); file.createFile(); // 캐싱 Manager 생성 DefaultFileSystemManager fs = new DefaultFileSystemManager(); fs.setFilesCache(manager.getFilesCache()); - - // zip, jar, tgz, tar, tbz2, file if (!fs.hasProvider("file")) { fs.addProvider("file", new DefaultLocalFileProvider()); } - fs.setCacheStrategy(CacheStrategy.ON_RESOLVE); fs.init(); // 캐싱 객체 생성 FileObject foBase2 = fs.resolveFile(testFolder); LOGGER.debug("## scratchFolder.getName().getPath() : {}", scratchFolder.getName().getPath()); - FileObject cachedFolder = foBase2.resolveFile(scratchFolder.getName().getPath()); // 파일이 존재하지 않음 @@ -212,28 +167,23 @@ public void testCaching() throws Exception { // 파일생성 scratchFolder.resolveFile("file1.txt").createFile(); - // 파일 존재함 - // BUT cachedFolder 에는 파일이 존재하지 않음 + // 파일 존재, cachedFolder 에는 파일이 존재하지 않음 fos = cachedFolder.getChildren(); assertFalse(contains(fos, "file1.txt")); // 새로고침 cachedFolder.refresh(); + // 파일이 존재함 fos = cachedFolder.getChildren(); assertTrue(contains(fos, "file1.txt")); - } /** * 파일 생성 테스트. - * - * @throws Exception */ @Test - public void testWriteFile() throws Exception { - - // delete file + public void testWriteFile() throws IOException { if (EgovFileUtil.isExistsFile(filename)) { EgovFileUtil.delete(new File(filename)); } @@ -244,13 +194,9 @@ public void testWriteFile() throws Exception { /** * 파일 생성 테스트. - * - * @throws Exception */ @Test - public void testWriteFileWithAbsolutePath() throws Exception { - - // delete file + public void testWriteFileWithAbsolutePath() throws IOException { if (EgovFileUtil.isExistsFile(absoluteFilePath)) { EgovFileUtil.delete(new File(absoluteFilePath)); } @@ -261,60 +207,39 @@ public void testWriteFileWithAbsolutePath() throws Exception { /** * 파일 읽기 테스트. - * - * @throws Exception */ @Test - public void testReadFile() throws Exception { - + public void testReadFile() throws IOException { if (!EgovFileUtil.isExistsFile(filename)) { EgovFileUtil.writeFile(filename, text, "UTF-8"); } - assertEquals(EgovFileUtil.readFile(new File(filename), "UTF-8"), text); - //LOGGER.debug(EgovFileUtil.readTextFile(filename, false)); - List lines = FileUtils.readLines(new File(filename), "UTF-8"); - LOGGER.debug(lines.toString()); - String string = lines.get(0); - assertEquals(text, string); } /** * 파일 읽기 테스트. - * - * @throws Exception */ @Test - public void testReadFileWithAbsolutePath() throws Exception { - + public void testReadFileWithAbsolutePath() throws IOException { if (!EgovFileUtil.isExistsFile(absoluteFilePath)) { EgovFileUtil.writeFile(absoluteFilePath, text, "UTF-8"); } - assertEquals(EgovFileUtil.readFile(new File(absoluteFilePath), "UTF-8"), text); - //LOGGER.debug(EgovFileUtil.readTextFile(filename, false)); - List lines = FileUtils.readLines(new File(absoluteFilePath), "UTF-8"); - LOGGER.debug(lines.toString()); - String string = lines.get(0); - assertEquals(text, string); } /** * 파일 복사 테스트. - * - * @throws Exception */ @Test - public void testCp() throws Exception { - + public void testCp() throws IOException { if (!EgovFileUtil.isExistsFile(filename)) { EgovFileUtil.writeFile(filename, text); } @@ -326,15 +251,12 @@ public void testCp() throws Exception { EgovFileUtil.readFile(new File(tmppath + "/" + filename), "UTF-8") ); } - + /** * 파일 복사 테스트. - * - * @throws Exception */ @Test - public void testCpWithAbsolutePath() throws Exception { - + public void testCpWithAbsolutePath() throws IOException { if (!EgovFileUtil.isExistsFile(absoluteFilePath)) { EgovFileUtil.writeFile(absoluteFilePath, text); } @@ -347,15 +269,11 @@ public void testCpWithAbsolutePath() throws Exception { ); } - /** * 파일 이동 테스트. - * - * @throws Exception */ @Test - public void testMv() throws Exception { - + public void testMv() throws IOException { if (!EgovFileUtil.isExistsFile(tmppath + "/" + filename)) { EgovFileUtil.writeFile(tmppath + "/" + filename, text); } @@ -370,69 +288,50 @@ public void testMv() throws Exception { /** * 파일 터치 테스트. - * - * @throws Exception */ @Test - public void testTouch() throws Exception { - - String path = tmppath + "/movedfile.txt"; - FileObject file = EgovFileUtil.getFileObject(path); + public void testTouch() throws IOException { + String path = tmppath + "/movedfile.txt"; + FileObject file = EgovFileUtil.getFileObject(path); + long lastModifyTime = file.getContent().getLastModifiedTime(); - long setTime = EgovFileUtil.touch(path); - - assertNotEquals(file.getContent().getLastModifiedTime(), setTime); + long setTime = EgovFileUtil.touch(path); + assertNotEquals(lastModifyTime, setTime); } /** * 파일 확장자 처리 테스트. - * - * @throws Exception */ @Test - public void testGetFileExtension() throws Exception { - + public void testGetFileExtension() { assertTrue(EgovFileUtil.isExistsFile(filename)); assertEquals(EgovFileUtil.getFileExtension(filename), "txt"); - } /** * 파일 존재 유무 테스트. - * - * @throws Exception */ @Test - public void testIsExistsFile() throws Exception { - + public void testIsExistsFile() { assertTrue(EgovFileUtil.isExistsFile(filename)); - } /** * 파일명 확인 테스트. - * - * @throws Exception */ @Test - public void testStripFilename() throws Exception { - + public void testStripFilename() { assertTrue(EgovFileUtil.isExistsFile(filename)); assertEquals("test", EgovFileUtil.stripFilename(filename)); - } /** * 파일 삭제 테스트. - * - * @throws Exception */ @Test - public void testRm() throws Exception { - + public void testRm() throws IOException { String tmptarget = tmppath; - if (!EgovFileUtil.isExistsFile(tmptarget)) { EgovFileUtil.writeFile(tmptarget, text); } @@ -445,25 +344,17 @@ public void testRm() throws Exception { /** * 디렉토리 변경 테스트. - * - * @throws Exception */ @Test - public void testCd() throws Exception { - + public void testCd() throws IOException { String path = "/Users/EGOV/"; FileName foldername = EgovFileUtil.getFileObject(path).getName(); - EgovFileUtil.cd(""); String uri = EgovFileUtil.pwd().getURI(); - LOGGER.debug("EgovFileUtil.pwd().getURI() : {}", uri); - LOGGER.debug("foldername.getURI() : {}", foldername.getURI()); - assertFalse(foldername.getURI().equals(uri)); EgovFileUtil.cd(path); - uri = EgovFileUtil.pwd().getURI(); LOGGER.debug("EgovFileUtil.pwd().getURI() : {}", uri); LOGGER.debug("foldername.getURI() : {}", foldername.getURI()); @@ -472,16 +363,12 @@ public void testCd() throws Exception { /** * Stream 테스트. - * - * @throws Exception */ @Test - public void testIOUtils() throws Exception { - InputStream in = new URL("http://jakarta.apache.org").openStream(); + public void testIOUtils() throws IOException { + InputStream in = new URL("https://commons.apache.org/").openStream(); try { - - assertFalse(IOUtils.toString(in).equals("")); - + assertNotEquals("", IOUtils.toString(in, StandardCharsets.UTF_8)); } finally { IOUtils.closeQuietly(in); } @@ -489,119 +376,78 @@ public void testIOUtils() throws Exception { /** * FileSystemUtils 테스트. - * - * @throws Exception */ @Test - public void testFileSystemUtils() throws Exception { - - try { - long freeSpace = FileSystemUtils.freeSpaceKb("C:/"); - - assertTrue(freeSpace > 0); - - } catch (Exception e) { - LOGGER.error("error: {}", e.getCause()); - } + public void testFileSystemUtils() throws IOException { + long freeSpace = FileSystemUtils.freeSpaceKb("C:/"); + assertTrue(freeSpace > 0); } /** * GREP 테스트. - * - * @throws Exception */ @Test - public void testGrep() throws Exception { - - try { - String[] search = {"abcdefg", "efghijklmn", "12", "3"}; - - List lists = EgovFileUtil.grep(search, "\\d{1,2}"); - - for (Iterator it = lists.iterator(); it.hasNext();) { - LOGGER.info(it.next()); - } - - - lists = EgovFileUtil.grep(new File("pom.xml"), "org.egovframe.rte"); - - for (Iterator it = lists.iterator(); it.hasNext();) { - LOGGER.info(it.next()); - } - + public void testGrep() throws IOException { + String[] search = {"abcdefg", "efghijklmn", "12", "3"}; + List lists = EgovFileUtil.grep(search, "\\d{1,2}"); + for (Iterator it = lists.iterator(); it.hasNext();) { + LOGGER.info(it.next()); + } - } catch (Exception e) { - LOGGER.error("error: {}", e.getCause()); - } + lists = EgovFileUtil.grep(new File("pom.xml"), "org.egovframe.rte"); + for (Iterator it = lists.iterator(); it.hasNext();) { + LOGGER.info(it.next()); + } } /** * Line iterator 테스트. - * - * @throws Exception */ @Test - public void testLineIterator() throws Exception { - + public void testLineIterator() throws IOException { String[] string = { - "", - " 4.0.0", - " org.egovframe.rte", - " org.egovframe.rte.fdl.filehandling", - " jar", - " 4.0.0", - " org.egovframe.rte.fdl.filehandling" + " 4.0.0", + " org.egovframe.rte", + " org.egovframe.rte.fdl.filehandling", + " 4.2.0", + " jar", + " org.egovframe.rte.fdl.filehandling" }; - try { - File file = new File("pom.xml"); - - LineIterator it = FileUtils.lineIterator(file, "UTF-8"); + File file = new File("pom.xml"); + LineIterator it = FileUtils.lineIterator(file, "UTF-8"); - try { - LOGGER.debug("############################# LineIterator ###############################"); - - for (int i = 0; it.hasNext(); i++) { - String line = it.nextLine(); - LOGGER.info(line); - - assertEquals(string[i], line); - } - } finally { - LineIterator.closeQuietly(it); - } - - } catch (Exception e) { - LOGGER.error("error: {}", e.getCause()); - } + try { + for (int i = 0; i < string.length; i++) { + String line = it.nextLine(); + assertEquals(string[i], line); + } + } finally { + LineIterator.closeQuietly(it); + } } @Test - public void testUserAuthentication() throws Exception { + public void testUserAuthentication() throws IOException { StaticUserAuthenticator auth = new StaticUserAuthenticator(null, "username", "password"); FileSystemOptions opts = new FileSystemOptions(); DefaultFileSystemConfigBuilder.getInstance().setUserAuthenticator(opts, auth); FileSystemManager manager = VFS.getManager(); - FileObject baseDir = manager.resolveFile(System.getProperty("user.dir")); FileObject file = manager.resolveFile(baseDir, "testfolder/file1.txt"); FileObject fo = manager.resolveFile(file.getName().getPath(), opts); - fo.createFile(); - } @Test - public void testCaching1() throws Exception { + public void testCaching1() throws IOException { String testFolder = FilehandlingServiceTest.class.getResource(".").getPath(); - LOGGER.debug("testFolder = {}", testFolder); - FileSystemManager manager = VFS.getManager(); - EgovFileUtil.writeFile(testFolder + "/file1.txt", text, "UTF-8"); /* @@ -613,54 +459,30 @@ public void testCaching1() throws Exception { */ DefaultFileSystemManager fs = new DefaultFileSystemManager(); fs.setFilesCache(manager.getFilesCache()); - - // zip, jar, tgz, tar, tbz2, file if (!fs.hasProvider("file")) { fs.addProvider("file", new DefaultLocalFileProvider()); } - // StandardFileSystemManager fs = new StandardFileSystemManager(); - fs.setCacheStrategy(CacheStrategy.ON_RESOLVE); fs.init(); - // 캐싱 객체 생성 - //FileObject foBase2 = fs.resolveFile(testFolder); LOGGER.debug("####1"); FileObject cachedFile = fs.toFileObject(new File(testFolder + "/file1.txt")); LOGGER.debug("####2"); - FilesCache filesCache = fs.getFilesCache(); LOGGER.debug("####3"); filesCache.putFile(cachedFile); FileObject obj = filesCache.getFile(cachedFile.getFileSystem(), cachedFile.getName()); - // FileObject baseFile = fs.getBaseFile(); - // LOGGER.debug("### cachedFile.getContent().getSize() is {}", cachedFile.getContent().getSize()); - - - // long fileSize = cachedFile.getContent().getSize(); - // LOGGER.debug("#########size is {}", fileSize); - // FileObject cachedFile1 = cachedFile.resolveFile("file2.txt"); - - // FileObject scratchFolder = manager.resolveFile(testFolder); - // scratchFolder.delete(Selectors.EXCLUDE_SELF); - EgovFileUtil.delete(new File(testFolder + "/file1.txt")); - - // obj.createFile(); - - // LOGGER.debug("#########obj is {}", obj.toString()); - // LOGGER.debug("#########size is {}", obj.getContent().getSize()); LOGGER.debug("#########file is {}", obj.exists()); fs.close(); } @Test - public void testCaching3() throws Exception { + public void testCaching3() throws IOException { FileSystemManager manager = VFS.getManager(); - String testFolder = FilehandlingServiceTest.class.getResource(".").getPath(); FileObject scratchFolder = manager.resolveFile(testFolder + "/testfolder"); @@ -673,21 +495,16 @@ public void testCaching3() throws Exception { // check if the cache still holds the right instance FileObject dir22 = scratchFolder.resolveFile("file2.txt"); - assertTrue(dir2 == dir22); - - // check if the cache still holds the right instance - /* FileObject dir1_2 = scratchFolder.resolveFile("file1.txt"); - assertFalse(dir1 == dir1_2);*/ + assertSame(dir2, dir22); } private boolean contains(FileObject[] fos, String string) { - for (int i = 0; i < fos.length; i++) { - if (string.equals(fos[i].getName().getBaseName())) { + for (FileObject fo : fos) { + if (string.equals(fo.getName().getBaseName())) { LOGGER.debug("# {}", string); return true; } } - LOGGER.debug("# {} should be seen", string); return false; } From 1da6c027548dd9049c1f47a5cebcf62f18488359 Mon Sep 17 00:00:00 2001 From: jei007 Date: Mon, 24 Apr 2023 18:06:40 +0900 Subject: [PATCH 13/13] egovframe-runtime v4.1.0 FINAL --- .idea/encodings.xml | 37 +- .idea/jarRepositories.xml | 5 + .idea/misc.xml | 3 + Batch/org.egovframe.rte.bat.core/pom.xml | 68 +- .../reader/EgovCompositeCursorReader.java | 11 +- .../reader/EgovCompositeFileReader.java | 11 +- .../reader/EgovCompositePagingReader.java | 11 +- .../database/EgovJdbcBatchItemWriter.java | 15 +- .../database/EgovMyBatisBatchItemWriter.java | 15 +- .../database/EgovMyBatisPagingItemReader.java | 10 +- .../EgovItemPreparedStatementSetter.java | 3 +- ...vMethodMapItemPreparedStatementSetter.java | 5 +- .../core/item/file/EgovByteReaderFactory.java | 3 +- .../item/file/EgovFlatFileByteReader.java | 13 +- .../core/item/file/EgovIndexFileReader.java | 27 +- .../core/item/file/EgovIndexFileWriter.java | 24 +- .../file/EgovPartitionFlatFileItemWriter.java | 15 +- .../item/file/mapping/EgovObjectMapper.java | 3 +- .../transform/EgovDelimitedLineTokenizer.java | 3 +- .../EgovEscapableDelimitedLineTokenizer.java | 5 +- .../file/transform/EgovFieldExtractor.java | 7 +- .../EgovFixedByteLengthTokenizer.java | 5 +- .../transform/EgovFixedByteTokenizer.java | 7 +- .../EgovFixedLengthLineAggregator.java | 5 +- .../transform/EgovFixedLengthTokenizer.java | 5 +- .../core/launch/support/EgovBatchRunner.java | 20 +- .../launch/support/EgovCommandLineRunner.java | 24 +- .../launch/support/EgovSchedulerRunner.java | 5 +- .../reflection/EgovReflectionSupport.java | 9 +- .../rte/bat/core/step/ShellScriptSupport.java | 3 +- .../rte/bat/core/step/TaskletDeleteStep.java | 4 +- .../rte/bat/exception/EgovBatchException.java | 5 +- .../rte/bat/item/DefaultItemReader.java | 16 +- .../rte/bat/item/DefaultItemWriter.java | 11 +- .../bat/support/EgovJobVariableListener.java | 9 +- .../rte/bat/support/EgovResourceVariable.java | 5 +- .../bat/support/EgovStepVariableListener.java | 9 +- .../sample/common/domain/person/Person.java | 4 +- .../common/domain/person/PersonService.java | 4 +- .../common/domain/trade/CustomerCredit.java | 2 +- .../CustomerCreditIncreaseProcessor.java | 4 +- .../domain/trade/CustomerCreditRowMapper.java | 4 +- .../trade/GeneratingTradeItemReader.java | 3 +- .../common/domain/trade/JdbcTradeDao.java | 4 +- .../sample/common/domain/trade/Trade.java | 4 +- .../common/domain/trade/TradeProcessor.java | 1 - .../common/domain/trade/TradeRowMapper.java | 4 +- .../common/domain/trade/TradeWriter.java | 14 +- .../event/EgovEmailEventNoticeTrigger.java | 20 +- .../event/EgovSmsEventNoticeTrigger.java | 5 +- .../EgovEventNoticeCallProcessor.java | 5 +- .../listener/EgovSampleChunkPreProcessor.java | 1 - .../listener/EgovSampleJobPostProcessor.java | 2 +- .../listener/EgovSampleJobPreProcessor.java | 2 +- .../listener/EgovSampleStepPostProcessor.java | 2 +- .../listener/EgovSampleStepPreProcessor.java | 2 +- .../listener/EgovSkipCheckingListener.java | 2 +- .../support/EgovColumnRangePartitioner.java | 9 +- .../example/support/EgovDummyItemWriter.java | 4 +- .../example/support/EgovErrorLogTasklet.java | 4 +- .../EgovItemTrackingTradeItemWriter.java | 12 +- .../EgovPartitionFlatFileItemWriter.java | 22 +- .../support/EgovStagingItemProcessor.java | 9 +- .../support/EgovStagingItemReader.java | 13 +- .../support/EgovStagingItemWriter.java | 12 +- .../test/EgovBatchRunnerFunctionalTests.java | 15 +- ...EgovEventNoticeTriggerFunctionalTests.java | 7 +- ...vJobGroupDelegatingJobFunctionalTests.java | 8 +- .../EgovLogManagementFunctionalTests.java | 8 +- .../test/EgovParallelJobFunctionalTests.java | 11 +- .../test/EgovParallelStepFunctionalTests.java | 14 +- .../EgovPartitionFileFunctionalTests.java | 17 +- ...PartitionFileToOneFileFunctionalTests.java | 13 +- .../EgovPartitionJdbcFunctionalTests.java | 20 +- .../EgovPostProcessorFunctionalTests.java | 6 +- .../test/EgovPreProcessorFunctionalTests.java | 6 +- .../test/EgovRepositoryFunctionalTests.java | 17 +- .../test/EgovRetrySampleFunctionalTests.java | 7 +- .../EgovSyncDelegatingJobFunctionalTests.java | 8 +- .../test/EgovTaskletJobFunctionalTests.java | 8 +- .../test/EgovAbstractIoSampleTests.java | 13 +- ...positeItemWriterSampleFunctionalTests.java | 24 +- .../EgovDelegatingJobFunctionalTests.java | 6 +- .../test/EgovDelimitedFunctionalTests.java | 3 +- .../test/EgovFixedLengthFunctionalTests.java | 3 +- .../test/EgovJdbcCursorFunctionalTests.java | 5 +- .../test/EgovJdbcPagingFunctionalTests.java | 5 +- .../EgovMultiResourceFunctionalTests.java | 1 - .../EgovRestartFileSampleFunctionalTests.java | 10 +- .../testcase/test/EgovXMLFunctionalTests.java | 3 +- .../core/item/database/EgovMybatisTest.java | 9 +- .../file/EgovIndexFileReaderWriterTest.java | 9 +- .../EgovDelimitedLineTokenizerTest.java | 6 +- ...ovEscapableDelimitedLineTokenizerTest.java | 9 +- .../support/EgovSchedulerRunnerTest.java | 4 +- .../rte/bat/core/step/EgovDeleteStepTest.java | 9 +- .../core/step/EgovShellScriptStepTest.java | 9 +- .../bat/core/step/TaskletCreateDataStep.java | 18 +- .../rte/bat/core/tasklet/DummyTasklet.java | 4 - .../rte/bat/domain/CustomerCredit.java | 3 +- .../rte/bat/domain/CustomerCreditMore.java | 3 +- .../CustomerCreditIncreaseProcessor.java | 9 +- .../bat/exception/EgovBatchExceptionTest.java | 9 +- .../egovframe/rte/bat/mapper/EmpMapper.java | 2 - .../rte/bat/mapper/EmpProcessor.java | 4 +- .../rte/bat/mapper/EmpProcessor2.java | 4 +- .../org/egovframe/rte/bat/mapper/EmpVO2.java | 3 - .../support/EgovJobVariableListenerTest.java | 9 +- .../bat/support/EgovResourceVariableTest.java | 9 +- .../support/EgovStepVariableListenerTest.java | 9 +- .../support/tasklet/TaskletStepResource.java | 5 +- .../support/tasklet/TaskletStepResource2.java | 5 +- .../spring/launch/context-scheduler.xml | 17 +- .../index/csvData_NDX_20171101090712.csv | 4 - .../index/csvData_NDX_20171101090812.csv | 4 - .../index/csvData_NDX_20171101090912.csv | 4 - .../index/csvData_NDX_20171101091012.csv | 4 - .../index/csvData_NDX_20171101091112.csv | 4 - .../index/csvData_NDX_20171101091113.csv | 4 - .../index/csvData_NDX_20171101091114.csv | 4 - .../index/csvData_NDX_20171101091115.csv | 4 - .../index/csvData_NDX_20171101091116.csv | 4 - .../index/csvData_NDX_20171101091117.csv | 4 - .../index/csvData_NDX_20171101091118.csv | 4 - .../index/csvData_NDX_20171101091119.csv | 4 - .../index/csvData_NDX_20171101091120.csv | 4 - .../index/csvData_NDX_20171101091121.csv | 4 - .../index/csvData_NDX_20171101091122.csv | 4 - .../index/csvData_NDX_20171101091123.csv | 4 - .../index/csvData_NDX_20171101091124.csv | 4 - .../index/csvData_NDX_20171101091125.csv | 4 - .../index/csvData_NDX_20171101091126.csv | 4 - .../index/csvData_NDX_20171101091127.csv | 4 - .../index/csvData_NDX_20171101091128.csv | 4 - .../index/csvData_NDX_20171101091129.csv | 4 - .../index/csvData_NDX_20171101091130.csv | 4 - .../index/csvData_NDX_20171101091131.csv | 4 - .../index/csvData_NDX_20171101091132.csv | 4 - .../index/csvData_NDX_20171101091133.csv | 4 - .../index/csvData_NDX_20171101091134.csv | 4 - .../index/csvData_NDX_20171101091135.csv | 4 - .../index/csvData_NDX_20171101091136.csv | 4 - .../index/csvData_NDX_20171101091137.csv | 4 - .../index/csvData_NDX_20171101091138.csv | 4 - .../index/csvData_NDX_20171101091139.csv | 4 - .../index/csvData_NDX_20171101091140.csv | 4 - .../index/csvData_NDX_20171101091141.csv | 4 - .../index/csvData_NDX_20171101091142.csv | 4 - .../index/csvData_NDX_20171101091143.csv | 4 - .../index/csvData_NDX_20171101091144.csv | 4 - .../index/csvData_NDX_20171101091145.csv | 4 - .../index/csvData_NDX_20171101091146.csv | 4 - .../index/csvData_NDX_20171101091147.csv | 4 - .../index/csvData_NDX_20171101091148.csv | 4 - .../index/csvData_NDX_20171101091149.csv | 4 - .../index/csvData_NDX_20171101091150.csv | 4 - .../index/csvData_NDX_20171101091151.csv | 4 - .../index/csvData_NDX_20171101091152.csv | 4 - .../index/csvData_NDX_20171101091153.csv | 4 - .../index/csvData_NDX_20171101091154.csv | 4 - .../index/csvData_NDX_20171101091155.csv | 4 - .../index/csvData_NDX_20171101091156.csv | 4 - .../index/csvData_NDX_20171101091157.csv | 4 - .../index/csvData_NDX_20171101091158.csv | 4 - .../index/csvData_NDX_20171101091159.csv | 4 - .../index/csvData_NDX_20171101091160.csv | 4 - .../src/test/resources/testdata/runHsqlDB.sh | 0 .../org.egovframe.rte.fdl.access/pom.xml | 79 +- .../bean/AccessDataSourceFactoryBean.java | 5 +- .../access/bean/AuthorityMapFactoryBean.java | 5 +- .../bean/AuthorityResourceMetadata.java | 7 +- .../access/bean/AuthorityUserFactoryBean.java | 2 +- .../access/bean/ResourceMapFactoryBean.java | 5 +- .../access/bean/RoleAndUrlFactoryBean.java | 2 +- .../EgovAccessConfigBeanDefinitionParser.java | 3 +- .../interceptor/EgovAccessInterceptor.java | 17 +- .../access/interceptor/EgovAccessUtil.java | 3 +- .../access/service/EgovUserDetailsHelper.java | 11 +- .../access/service/impl/EgovAccessDao.java | 6 +- .../service/impl/EgovAccessServiceImpl.java | 3 +- .../main/resources/META-INF/spring.schemas | 4 +- ...access-4.0.0.xsd => egov-access-4.1.0.xsd} | 0 .../META-INF/spring/context-access.xml | 2 +- .../META-INF/spring/test-config.xml | 0 .../META-INF/spring/test-jdbc.properties | 0 .../test/{resource => resources}/log4j2.xml | 0 Foundation/org.egovframe.rte.fdl.cmmn/pom.xml | 84 +- .../rte/fdl/cmmn/AbstractServiceImpl.java | 171 - .../rte/fdl/cmmn/EgovAbstractServiceImpl.java | 8 +- .../fdl/cmmn/aspect/ExceptionTransfer.java | 9 +- .../rte/fdl/cmmn/exception/BaseException.java | 3 +- .../cmmn/exception/BaseRuntimeException.java | 3 +- .../fdl/cmmn/exception/EgovBizException.java | 3 +- .../rte/fdl/cmmn/exception/FdlException.java | 3 +- .../manager/AbsExceptionHandleManager.java | 144 - .../AbstractExceptionHandleManager.java | 3 +- .../rte/fdl/cmmn/trace/LeaveaTrace.java | 5 +- .../trace/manager/AbsTraceHandleManager.java | 147 - .../manager/AbstractTraceHandleManager.java | 3 +- .../rte/bsl/exception/HelloServiceImpl.java | 3 - .../ServiceExceptionHandlerTests.java | 11 +- .../SimpleMappingExceptionResolverTest.java | 15 +- .../rte/fdl/cmmn/FdlExceptionTest.java | 3 +- .../rte/fdl/cmmn/FdlExceptionTestService.java | 5 +- .../fdl/cmmn/aspectj/AspectjJunitTest.java | 5 +- .../concurrentmap/CacheableServiceImpl.java | 1 - .../cache/concurrentmap/CacheableTest.java | 9 +- .../cache/ehcache/CacheableServiceImpl.java | 1 - .../fdl/cmmn/cache/ehcache/CacheableTest.java | 10 +- .../fdl/cmmn/cnamespace/CNameSpaceTest.java | 4 +- .../SampleServiceExceptionHandler.java | 5 +- .../profiles/SpringAnnotationProfileTest.java | 18 +- .../cmmn/profiles/SpringXmlProfileTest.java | 6 +- .../rte/fdl/cmmn/setter/SetterTest.java | 4 +- .../handler/EgovServiceExceptionHandler.java | 8 +- .../OthersServiceExceptionHandler.java | 1 - .../org/egovframe/rte/mail/SimpleSSLMail.java | 7 +- .../spring/egovframework-fdl-exception.xml | 2 +- .../test/resources/spring/context-aspect.xml | 22 +- .../test/resources/spring/context-common.xml | 11 +- .../resources/spring/context-profiles.xml | 4 +- .../org.egovframe.rte.fdl.crypto/pom.xml | 67 +- .../fdl/cryptography/EgovPasswordEncoder.java | 30 +- .../EgovCryptoConfigBeanDefinitionParser.java | 4 +- .../rte/fdl/cryptography/impl/ARIACipher.java | 3 +- .../impl/EgovARIACryptoServiceImpl.java | 15 +- .../impl/EgovEnvCryptoServiceImpl.java | 9 +- .../impl/EgovGeneralCryptoServiceImpl.java | 16 +- .../main/resources/META-INF/spring.schemas | 4 +- ...crypto-4.0.0.xsd => egov-crypto-4.1.0.xsd} | 0 .../EgovARIACryptoServiceTest.java | 22 +- .../fdl/cryptography/EgovARIAErrorTest.java | 3 +- .../fdl/cryptography/EgovARIAFileTest.java | 20 +- .../rte/fdl/cryptography/EgovARIATest.java | 12 +- .../cryptography/EgovDigestServiceTest.java | 8 +- .../cryptography/EgovEnvCryptoAdminTest.java | 11 +- .../cryptography/EgovEnvCryptoUserTest.java | 7 +- .../cryptography/EgovEvnCryptoConfigTest.java | 12 +- .../EgovGeneralCryptoServiceTest.java | 24 +- .../META-INF/spring/config/context-crypto.xml | 9 +- .../META-INF/spring/config/crypto-config.xml | 9 +- .../META-INF/spring/context-crypto.xml | 25 +- .../resources/META-INF/spring/password.xml | 4 +- .../org.egovframe.rte.fdl.excel/pom.xml | 119 +- .../rte/fdl/excel/EgovExcelService.java | 4 +- .../fdl/excel/impl/EgovExcelServiceDAO.java | 5 +- .../fdl/excel/impl/EgovExcelServiceImpl.java | 42 +- .../excel/impl/EgovExcelServiceMapper.java | 5 +- .../fdl/excel/util/AbstractPOIExcelView.java | 12 +- .../rte/fdl/excel/util/EgovExcelUtil.java | 28 +- .../fdl/excel/EgovExcelControllerTest.java | 11 +- .../rte/fdl/excel/EgovExcelServiceTest.java | 538 +- .../rte/fdl/excel/EgovExcelUploadTest.java | 13 +- .../fdl/excel/EgovExcelXSSFServiceTest.java | 545 +- .../fdl/excel/EgovPOIExcelControllerTest.java | 11 +- .../rte/fdl/excel/EgovPOIExcelUploadTest.java | 13 +- .../download/CategoryExcelController.java | 11 +- .../fdl/excel/download/CategoryExcelView.java | 13 +- .../download/CategoryPOIExcelController.java | 11 +- .../excel/download/CategoryPOIExcelView.java | 16 +- .../excel/upload/EgovExcelBigTestMapping.java | 7 +- .../excel/upload/EgovExcelTestMapping.java | 9 +- .../rte/fdl/excel/vo/PersonHourVO.java | 3 +- .../META-INF/spring/context-excel.xml | 6 +- .../testdata/template/template.xls | Bin 22528 -> 0 bytes .../testdata/template/template.xlsx | Bin 10434 -> 0 bytes .../testdata/template/template1.xls | Bin 20992 -> 22528 bytes .../testdata/template/template1.xlsx | Bin 11449 -> 10434 bytes .../testdata/template/template2.xls | Bin 20992 -> 25600 bytes .../testdata/template/template2.xlsx | Bin 10206 -> 13009 bytes .../testdata/testGetCellContents.xls | Bin 0 -> 22016 bytes .../testdata/testGetCellContents.xlsx | Bin 0 -> 6900 bytes .../testdata/testModifyCellAttribute.xls | Bin 0 -> 22016 bytes .../testdata/testModifyCellAttribute.xlsx | Bin 0 -> 6953 bytes .../testdata/testModifyCellContents.xls | Bin 0 -> 4096 bytes .../testdata/testModifyCellContents.xlsx | Bin 0 -> 3403 bytes .../testdata/testModifyDocAttribute.xls | Bin 0 -> 4608 bytes .../testdata/testModifyDocAttribute.xlsx | Bin 0 -> 3776 bytes .../testdata/testUseTemplate1.xls | Bin 0 -> 22528 bytes .../testdata/testUseTemplate1.xlsx | Bin 0 -> 8152 bytes .../testdata/testUseTemplate2.xls | Bin 22016 -> 17920 bytes .../testdata/testUseTemplate2.xlsx | Bin 8050 -> 9707 bytes .../testdata/testWriteExcelFile.xls | Bin 4608 -> 4608 bytes .../testdata/testWriteExcelFile.xlsx | Bin 4033 -> 4019 bytes .../testdata/testWriteExcelFileAttribute.xls | Bin 4096 -> 4096 bytes .../testdata/testWriteExcelFileAttribute.xlsx | Bin 3817 -> 3786 bytes .../pom.xml | 54 +- .../rte/fdl/filehandling/EgovFileUtil.java | 39 +- .../filehandling/FilehandlingServiceTest.java | 297 +- .../{tmp => }/test.txt | 0 .../tmp/movedfile.txt | 1 + .../org.egovframe.rte.fdl.idgnr/pom.xml | 68 +- .../rte/fdl/idgnr/EgovIdGnrService.java | 3 +- .../impl/AbstractDataBlockIdGnrService.java | 7 +- .../idgnr/impl/AbstractDataIdGnrService.java | 8 +- .../fdl/idgnr/impl/AbstractIdGnrService.java | 7 +- .../idgnr/impl/EgovSequenceIdGnrService.java | 9 +- .../impl/EgovSequenceIdGnrServiceImpl.java | 9 +- .../fdl/idgnr/impl/EgovTableIdGnrService.java | 10 +- .../idgnr/impl/EgovTableIdGnrServiceImpl.java | 10 +- .../fdl/idgnr/impl/EgovUUIdGnrService.java | 11 +- .../idgnr/impl/EgovUUIdGnrServiceImpl.java | 19 +- .../egovframe/rte/fdl/idgnr/Base64Test.java | 5 +- .../idgnr/EgovSequenceIdGnrServiceTest.java | 26 +- .../fdl/idgnr/EgovTableIdGnrServiceTest.java | 25 +- .../EgovTableIdGnrServiceWithThreadTest.java | 22 +- .../rte/fdl/idgnr/EgovUUIdGnrServiceTest.java | 16 +- .../src/test/resources/spring/jdbc.properties | 21 +- .../SMTP_Manual.txt | 33 - .../logs/daily/dailyRollingSample.log | 2 +- .../org.egovframe.rte.fdl.logging/pom.xml | 136 +- .../remote/log4j2.xml | 22 - .../runSocketServer.bat | 1 - .../runSocketServer.sh | 1 - .../fdl/logging/db/EgovConnectionFactory.java | 2 +- .../logging/util/EgovResourceReleaser.java | 6 +- .../fdl/logging/AdvancedLogTargetTest.java | 76 - .../fdl/logging/AdvancedNetLogTargetTest.java | 82 - .../rte/fdl/logging/Log4j2FilterTest.java | 20 +- .../fdl/logging/Log4j2FlowTracingTest.java | 7 +- .../rte/fdl/logging/LogLayoutTest.java | 28 +- .../rte/fdl/logging/LogLevelTest.java | 31 +- .../rte/fdl/logging/LogTargetTest.java | 17 +- .../rte/fdl/logging/LoggerHierarchyTest.java | 11 +- .../rte/fdl/logging/LoggerMatchingTest.java | 19 +- .../rte/fdl/logging/MethodLoggingTest.java | 5 +- .../rte/fdl/logging/Slf4JLoggerTest.java | 13 +- .../fdl/logging/sample/service/SomeVO.java | 4 +- .../service/impl/LogTestServiceImpl.java | 5 +- .../rte/fdl/logging/util/LogFileUtil.java | 6 +- .../META-INF/spring/context-common.xml | 6 +- .../resources/META-INF/spring/jdbc.properties | 5 +- .../META-INF/testdata/dialect/db2l.sql | 64 - .../META-INF/testdata/dialect/hsqldb.sql | 16 - .../META-INF/testdata/dialect/mssql.sql | 62 - .../META-INF/testdata/dialect/mysql.sql | 68 - .../META-INF/testdata/dialect/oracle.sql | 70 - .../META-INF/testdata/dialect/postgresql.sql | 65 - .../org.egovframe.rte.fdl.property/pom.xml | 62 +- .../rte/fdl/property/EgovPropertyService.java | 4 +- .../rte/fdl/property/db/DbPropertySource.java | 3 +- .../property/db/DbPropertySourceDelegate.java | 5 +- .../impl/EgovPropertyServiceImpl.java | 20 +- .../PropertyServiceAllKeyValGetTest.java | 11 +- .../property/PropertyServiceBasicTest.java | 13 +- .../property/PropertyServiceCharSetTest.java | 8 +- .../property/PropertyServiceExtFileTest.java | 8 +- .../property/PropertyServiceRefreshTest.java | 8 +- .../PropertySourceAnnotationTests.java | 14 +- .../rte/fdl/property/db/context-test.xml | 4 +- .../property/db/propertysource-context.xml | 6 +- .../org.egovframe.rte.fdl.security/pom.xml | 68 +- ...govSecurityConfigBeanDefinitionParser.java | 4 +- .../fdl/security/config/EgovSecurityHttp.java | 12 +- .../fdl/security/config/SecurityConfig.java | 4 +- .../config/SecurityConfigInitializer.java | 18 +- .../internal/AuthoritiesQueryFactoryBean.java | 1 - .../internal/DataSourceFactoryBean.java | 5 +- ...EgovSessionInformationExpiredStrategy.java | 7 +- .../internal/LoginFormUrlFactoryBean.java | 1 - .../config/internal/MapClassFactoryBean.java | 1 - .../RequestMatcherTypeFactoryBean.java | 1 - .../internal/UsersQueryFactoryBean.java | 1 - ...ilterInvocationSecurityMetadataSource.java | 16 +- .../LookupAttributesMethodReplacer.java | 7 +- .../MethodResourcesMapFactoryBean.java | 7 +- .../intercept/UrlResourcesMapFactoryBean.java | 7 +- .../EgovSecuredObjectService.java | 6 +- .../securedobject/impl/SecuredObjectDAO.java | 15 +- .../impl/SecuredObjectServiceImpl.java | 9 +- .../impl/SelfRegexRequestMatcher.java | 4 +- .../DefaultMapUserDetailsMapping.java | 9 +- .../security/userdetails/EgovUserDetails.java | 6 +- .../HierarchyStringsFactoryBean.java | 1 - .../jdbc/EgovJdbcUserDetailsManager.java | 16 +- .../jdbc/EgovUsersByUsernameMapping.java | 12 +- .../util/EgovUserDetailsHelper.java | 11 +- .../main/resources/META-INF/spring.schemas | 4 +- .../spring/security/security-config.xml | 8 +- ...rity-4.0.0.xsd => egov-security-4.1.0.xsd} | 0 .../fdl/security/EgovSecurityConfigTest.java | 28 +- .../fdl/security/EgovSecurityServiceTest.java | 22 +- .../userdetails/CamelCaseUtilTest.java | 4 +- .../userdetails/EgovUserDetailsMapping.java | 10 +- .../META-INF/spring/config-context.xml | 4 +- .../META-INF/spring/context-common.xml | 4 +- .../spring/context-datasource-jdbc.xml | 8 +- .../META-INF/spring/context-security.xml | 88 +- .../resources/META-INF/spring/jdbc.properties | 12 +- .../META-INF/testdata/sample_schema_hsql.sql | 2 - .../org.egovframe.rte.fdl.string/pom.xml | 62 +- .../rte/fdl/string/EgovObjectUtil.java | 4 +- .../rte/fdl/string/EgovStringUtil.java | 8 +- .../rte/fdl/string/EgovDateUtilTest.java | 14 +- .../rte/fdl/string/EgovNumericUtilTest.java | 6 +- .../rte/fdl/string/EgovObjectUtilTest.java | 9 +- .../rte/fdl/string/EgovStringUtilTest.java | 7 +- Foundation/org.egovframe.rte.fdl.xml/pom.xml | 64 +- .../rte/fdl/xml/AbstractXMLUtility.java | 24 +- .../rte/fdl/xml/EgovConcreteSAXFactory.java | 1 - .../rte/fdl/xml/EgovDOMValidatorService.java | 9 +- .../rte/fdl/xml/EgovSAXValidatorService.java | 7 +- .../rte/fdl/xml/error/ErrorChecker.java | 5 +- .../egovframe/rte/fdl/xml/ControlXMLTest.java | 20 +- .../rte/fdl/xml/ehcache/CacheImpl.java | 7 +- .../rte/fdl/xml/ehcache/CacheServer.java | 12 +- .../rte/fdl/xml/ehcache/CacheXMLAgent.java | 15 +- .../rte/fdl/xml/ehcache/CacheXMLTest.java | 26 +- .../test/resources/spring/egovxml.properties | 2 +- .../org.egovframe.rte.itl.integration/pom.xml | 78 +- .../message/simple/SimpleMessage.java | 7 +- .../message/simple/SimpleMessageHeader.java | 4 +- .../integration/message/typed/TypedList.java | 9 +- .../message/typed/TypedListIterator.java | 4 +- .../integration/message/typed/TypedMap.java | 10 +- .../message/typed/TypedMessage.java | 7 +- .../message/typed/TypedMessageHeader.java | 5 +- .../metadata/IntegrationDefinition.java | 7 +- .../metadata/OrganizationDefinition.java | 7 +- .../metadata/RecordTypeDefinition.java | 7 +- .../metadata/RecordTypeFieldDefinition.java | 5 +- .../metadata/ServiceDefinition.java | 5 +- .../metadata/SystemDefinition.java | 7 +- .../dao/IntegrationDefinitionDao.java | 4 +- .../HibernateIntegrationDefinitionDao.java | 7 +- .../HibernateOrganizationDefinitionDao.java | 1 - .../HibernateRecordTypeDefinitionDao.java | 1 - .../HibernateServiceDefinitionDao.java | 6 +- .../HibernateSystemDefinitionDao.java | 5 +- .../integration/support/AbstractService.java | 6 +- .../itl/integration/type/AbstractType.java | 6 +- .../rte/itl/integration/type/ListType.java | 5 +- .../itl/integration/type/PrimitiveType.java | 6 +- .../rte/itl/integration/type/RecordType.java | 9 +- .../support/PrimitiveTypeFactoryBean.java | 1 - .../type/support/TypeLoaderUsingMetadata.java | 17 +- .../message/typed/TypedListTest.java | 22 +- .../message/typed/TypedMapTest.java | 15 +- ...HibernateIntegrationDefinitionDaoTest.java | 19 +- ...ibernateOrganizationDefinitionDaoTest.java | 18 +- .../HibernateRecordTypeDefinitionDaoTest.java | 14 +- .../HibernateServiceDefinitionDaoTest.java | 14 +- .../HibernateSystemDefinitionDaoTest.java | 16 +- .../SpringDatabaseDataSourceConnection.java | 9 +- .../support/AbstractServiceTest.java | 5 +- .../itl/integration/type/ListTypeTest.java | 10 +- .../integration/type/PrimitiveTypeTest.java | 6 +- .../itl/integration/type/RecordTypeTest.java | 9 +- .../support/PrimitiveTypeFactoryBeanTest.java | 9 +- .../support/TypeLoaderUsingMetadataTest.java | 14 +- .../metadata/dao/hibernate/context.xml | 7 - .../src/test/resources/unitils.properties | 9 - .../org.egovframe.rte.itl.webservice/pom.xml | 79 +- .../rte/itl/webservice/EgovWebService.java | 5 +- .../itl/webservice/EgovWebServiceContext.java | 35 +- .../itl/webservice/EgovWebServiceMessage.java | 4 +- .../EgovWebServiceMessageHeader.java | 3 +- .../itl/webservice/EgovWebServiceServlet.java | 4 +- .../rte/itl/webservice/data/MappingInfo.java | 5 +- .../data/WebServiceClientDefinition.java | 9 +- .../data/WebServiceServerDefinition.java | 3 +- ...ibernateWebServiceClientDefinitionDao.java | 1 - ...ibernateWebServiceServerDefinitionDao.java | 1 - .../EgovWebServiceClassLoaderFactoryBean.java | 1 - .../impl/EgovWebServiceClassLoaderImpl.java | 44 +- .../impl/EgovWebServiceClientImpl.java | 30 +- .../service/impl/MessageConverterImpl.java | 13 +- .../service/impl/ServiceBridgeImpl.java | 12 +- .../service/impl/ServiceEndpointInfoImpl.java | 12 +- .../ServiceEndpointInterfaceInfoImpl.java | 16 +- .../webservice/EgovWebServiceContextTest.java | 14 +- .../itl/webservice/EgovWebServiceTest.java | 11 +- ...nateWebServiceClientDefinitionDaoTest.java | 14 +- ...nateWebServiceServerDefinitionDaoTest.java | 14 +- .../SpringDatabaseDataSourceConnection.java | 9 +- .../impl/MessageConverterImplTest.java | 19 +- .../src/test/resources/unitils.properties | 9 - .../org.egovframe.rte.psl.data.jpa/pom.xml | 72 +- .../egovframe/rte/psl/data/jpa/CrudTest.java | 53 +- .../psl/data/jpa/PagingAndSortingTest.java | 44 +- .../rte/psl/data/jpa/QueryMethodTest.java | 19 +- .../rte/psl/data/jpa/RelationshipTest.java | 15 +- .../rte/psl/data/jpa/SimpleTest.java | 34 +- .../rte/psl/data/jpa/domain/Article.java | 3 +- .../rte/psl/data/jpa/domain/Department.java | 6 +- .../rte/psl/data/jpa/domain/Employee.java | 8 +- .../rte/psl/data/jpa/domain/User.java | 10 +- .../rte/psl/data/jpa/domain/UserPK.java | 21 +- .../jpa/repository/ArticleRepository.java | 1 - .../jpa/repository/DepartmentRepository.java | 5 +- .../jpa/repository/EmployeeRepository.java | 1 - .../jpa/repository/UserDetailRepository.java | 7 +- .../data/jpa/repository/UserRepository.java | 6 +- .../META-INF/spring/context-common.xml | 14 +- .../META-INF/spring/context-data-jpa.xml | 11 +- .../META-INF/spring/context-datasource.xml | 22 - .../resources/META-INF/spring/jdbc.properties | 35 +- .../pom.xml | 81 +- .../mongodb/MongoOperationsAnonymousTest.java | 51 +- .../data/mongodb/MongoOperationsAuthTest.java | 43 +- .../psl/data/mongodb/MongoTemplateTest.java | 56 +- .../data/mongodb/PersonRepositoryTest.java | 74 +- .../rte/psl/data/mongodb/domain/Address.java | 1 + .../rte/psl/data/mongodb/domain/Person.java | 44 +- .../psl/data/mongodb/domain/SimplePerson.java | 31 - .../mongodb/repository/PersonRepository.java | 21 +- .../META-INF/spring/context-common.xml | 6 +- .../META-INF/spring/context-data-mongodb.xml | 12 +- .../META-INF/spring/mongo.properties | 7 +- .../org.egovframe.rte.psl.dataaccess/pom.xml | 125 +- .../rte/psl/dataaccess/EgovAbstractDAO.java | 10 +- .../psl/dataaccess/EgovAbstractMapper.java | 9 +- .../rte/psl/dataaccess/mapper/Mapper.java | 8 +- .../CalendarMapperTypeHandler.java | 6 +- .../typehandler/CalendarTypeHandler.java | 4 +- .../StringTimestampTypeHandler.java | 8 +- .../psl/orm/ibatis/SqlMapClientCallback.java | 4 +- .../orm/ibatis/SqlMapClientFactoryBean.java | 13 +- .../orm/ibatis/SqlMapClientOperations.java | 7 +- .../psl/orm/ibatis/SqlMapClientTemplate.java | 13 +- .../support/AbstractLobTypeHandler.java | 14 +- .../support/BlobByteArrayTypeHandler.java | 6 +- .../support/BlobSerializableTypeHandler.java | 12 +- .../ibatis/support/ClobStringTypeHandler.java | 6 +- .../support/SqlMapClientDaoSupport.java | 6 +- .../rte/psl/dataaccess/TestBase.java | 5 +- .../dataaccess/dao/DataTypeTestMapper.java | 1 - .../rte/psl/dataaccess/dao/DeptDAO.java | 5 +- .../rte/psl/dataaccess/dao/DeptMapper.java | 5 +- .../psl/dataaccess/dao/EmpBatchMapper.java | 21 +- .../rte/psl/dataaccess/dao/EmpDAO.java | 21 +- .../psl/dataaccess/dao/EmpGeneralMapper.java | 16 +- .../rte/psl/dataaccess/dao/EmpMapper.java | 18 +- .../rte/psl/dataaccess/dao/JobHistDAO.java | 5 +- .../rte/psl/dataaccess/dao/JobHistMapper.java | 8 +- .../rte/psl/dataaccess/dao/MapTypeDAO.java | 7 +- .../rte/psl/dataaccess/dao/MapTypeMapper.java | 7 +- .../rte/psl/dataaccess/dao/TypeTestDAO.java | 1 - .../psl/dataaccess/dao/TypeTestMapper.java | 1 - .../ibatis/BasicDataAccessTest.java | 17 +- .../rte/psl/dataaccess/ibatis/BatchTest.java | 17 +- .../psl/dataaccess/ibatis/CacheModelTest.java | 17 +- .../ibatis/CallableStatementTest.java | 28 +- .../ibatis/ComplexPropertiesTest.java | 26 +- .../dataaccess/ibatis/CompositeKeyTest.java | 18 +- .../psl/dataaccess/ibatis/DataTypeTest.java | 21 +- .../psl/dataaccess/ibatis/DynamicSQLTest.java | 24 +- .../psl/dataaccess/ibatis/FetchSizeTest.java | 16 +- .../ibatis/InLineParameterTest.java | 18 +- .../psl/dataaccess/ibatis/LobTypeTest.java | 20 +- .../ibatis/MapTypeParameterTest.java | 21 +- .../dataaccess/ibatis/ParameterMapTest.java | 18 +- .../dataaccess/ibatis/RemapResultsTest.java | 20 +- .../dataaccess/ibatis/ReplacedTextTest.java | 20 +- .../psl/dataaccess/ibatis/ResultMapTest.java | 16 +- .../dataaccess/ibatis/ResultsetTypeTest.java | 16 +- .../psl/dataaccess/ibatis/ReuseSQLTest.java | 24 +- .../psl/dataaccess/ibatis/RowHandlerTest.java | 16 +- .../psl/dataaccess/ibatis/SelectKeyTest.java | 16 +- .../psl/dataaccess/ibatis/TimeoutTest.java | 21 +- .../dataaccess/ibatis/TypeHandlerTest.java | 20 +- .../ibatis/WithoutMappingCUDTest.java | 14 +- .../dataaccess/mapper/DepartmentMapper.java | 7 +- .../psl/dataaccess/mapper/EmployerMapper.java | 7 +- .../mybatis/BasicDataMapperTest.java | 17 +- .../dataaccess/mybatis/BatchMapperTest.java | 13 +- .../mybatis/CacheModelMapperTest.java | 17 +- .../mybatis/CallableStatementMapperTest.java | 23 +- .../mybatis/ComplexPropertiesMapperTest.java | 25 +- .../mybatis/CompositeKeyMapperTest.java | 18 +- .../mybatis/DataTypeMapperTest.java | 21 +- .../mybatis/DynamicSQLMapperTest.java | 24 +- .../psl/dataaccess/mybatis/FetchSizeTest.java | 16 +- .../mybatis/InLineParameterTest.java | 18 +- .../psl/dataaccess/mybatis/LobTypeTest.java | 20 +- .../mybatis/MapTypeParameterTest.java | 21 +- .../dataaccess/mybatis/ParameterMapTest.java | 18 +- .../dataaccess/mybatis/RemapResultsTest.java | 19 +- .../dataaccess/mybatis/ReplacedTextTest.java | 20 +- .../mybatis/ResultHandlerMapperTest.java | 16 +- .../psl/dataaccess/mybatis/ResultMapTest.java | 16 +- .../mybatis/ResultsetTypeMapperTest.java | 16 +- .../mybatis/SelectKeyMapperTest.java | 16 +- .../mybatis/mapper/DepartmentMapperTest.java | 14 +- .../mybatis/mapper/EmployerMapperTest.java | 17 +- .../FileWritingResultHandler.java | 17 +- .../rowhandler/FileWritingRowHandler.java | 16 +- .../psl/dataaccess/utils/CamelUtilTest.java | 4 +- .../META-INF/spring/context-datasource.xml | 2 +- .../META-INF/spring/context-mapper.xml | 3 +- .../resources/META-INF/spring/jdbc.properties | 33 +- .../META-INF/testdata/outResultFile.txt | 9037 +++++++++-------- .../org.egovframe.rte.ptl.mvc/pom.xml | 62 +- .../AnnotationCommandMapArgumentResolver.java | 13 +- .../mvc/bind/CommandMapArgumentResolver.java | 11 +- .../EgovRequestMappingHandlerAdapter.java | 7 +- .../AbstractAnnotationExceptionHandler.java | 1 - .../rte/ptl/mvc/filter/HTMLTagFilter.java | 10 +- .../SimpleUrlAnnotationHandlerMapping.java | 4 +- .../rte/ptl/mvc/tags/ui/PaginationTag.java | 11 +- .../mvc/validation/RteGenericValidator.java | 5 +- .../rte/ptl/mvc/async/AsyncReqTest.java | 6 +- .../ptl/mvc/async/AsyncReqTestController.java | 7 +- .../bind/CommandMapArgumentResolverTest.java | 11 +- .../mvc/bind/CommandMapTestController.java | 10 +- .../ptl/mvc/bind/RequestDataBindingTest.java | 12 +- .../exception/AnnotationExceptionHandler.java | 5 +- .../bind/exception/ControllerAdviceTest.java | 8 +- .../mvc/exception/ExceptionResolverTest.java | 11 +- .../rte/ptl/mvc/filter/HTMLTagFilterTest.java | 13 +- .../handler/InterceptorTestController.java | 7 +- .../rte/ptl/mvc/handler/OneInterceptor.java | 7 +- .../rte/ptl/mvc/handler/TwoInterceptor.java | 7 +- .../handler/WebRequestInterceptorTest.java | 13 +- .../ptl/mvc/matrix/MatrixVariableTest.java | 39 +- .../mvcTest/ApplicationContextSetupTest.java | 8 +- .../tags/ui/pagination/PaginationTest.java | 20 +- .../mvc/validation/FormValidationTest.java | 10 +- .../validation/PasswordValidationTest.java | 4 +- pom.xml | 26 +- 620 files changed, 7981 insertions(+), 10627 deletions(-) delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101090712.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101090812.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101090912.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091012.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091112.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091113.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091114.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091115.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091116.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091117.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091118.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091119.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091120.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091121.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091122.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091123.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091124.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091125.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091126.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091127.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091128.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091129.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091130.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091131.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091132.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091133.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091134.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091135.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091136.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091137.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091138.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091139.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091140.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091141.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091142.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091143.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091144.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091145.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091146.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091147.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091148.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091149.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091150.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091151.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091152.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091153.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091154.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091155.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091156.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091157.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091158.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091159.csv delete mode 100644 Batch/org.egovframe.rte.bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101091160.csv mode change 100644 => 100755 Batch/org.egovframe.rte.bat.core/src/test/resources/testdata/runHsqlDB.sh mode change 100644 => 100755 Foundation/org.egovframe.rte.fdl.access/src/main/resources/META-INF/spring.schemas rename Foundation/org.egovframe.rte.fdl.access/src/main/resources/org/egovframe/rte/fdl/access/config/{egov-access-4.0.0.xsd => egov-access-4.1.0.xsd} (100%) rename Foundation/org.egovframe.rte.fdl.access/src/test/{resource => resources}/META-INF/spring/context-access.xml (90%) rename Foundation/org.egovframe.rte.fdl.access/src/test/{resource => resources}/META-INF/spring/test-config.xml (100%) rename Foundation/org.egovframe.rte.fdl.access/src/test/{resource => resources}/META-INF/spring/test-jdbc.properties (100%) rename Foundation/org.egovframe.rte.fdl.access/src/test/{resource => resources}/log4j2.xml (100%) delete mode 100644 Foundation/org.egovframe.rte.fdl.cmmn/src/main/java/org/egovframe/rte/fdl/cmmn/AbstractServiceImpl.java delete mode 100644 Foundation/org.egovframe.rte.fdl.cmmn/src/main/java/org/egovframe/rte/fdl/cmmn/exception/manager/AbsExceptionHandleManager.java delete mode 100644 Foundation/org.egovframe.rte.fdl.cmmn/src/main/java/org/egovframe/rte/fdl/cmmn/trace/manager/AbsTraceHandleManager.java rename Foundation/org.egovframe.rte.fdl.crypto/src/main/resources/org/egovframe/rte/fdl/crypto/config/{egov-crypto-4.0.0.xsd => egov-crypto-4.1.0.xsd} (100%) delete mode 100644 Foundation/org.egovframe.rte.fdl.excel/testdata/template/template.xls delete mode 100644 Foundation/org.egovframe.rte.fdl.excel/testdata/template/template.xlsx rename Foundation/org.egovframe.rte.fdl.filehandling/{tmp => }/test.txt (100%) create mode 100644 Foundation/org.egovframe.rte.fdl.filehandling/tmp/movedfile.txt delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/SMTP_Manual.txt delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/remote/log4j2.xml delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/runSocketServer.bat delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/runSocketServer.sh delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/AdvancedLogTargetTest.java delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/AdvancedNetLogTargetTest.java delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/db2l.sql delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/hsqldb.sql delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/mssql.sql delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/mysql.sql delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/oracle.sql delete mode 100644 Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/postgresql.sql mode change 100644 => 100755 Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/internal/EgovSessionInformationExpiredStrategy.java rename Foundation/org.egovframe.rte.fdl.security/src/main/resources/org/egovframe/rte/fdl/security/config/{egov-security-4.0.0.xsd => egov-security-4.1.0.xsd} (100%) delete mode 100644 Integration/org.egovframe.rte.itl.integration/src/test/resources/unitils.properties delete mode 100644 Integration/org.egovframe.rte.itl.webservice/src/test/resources/unitils.properties delete mode 100644 Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/SimplePerson.java diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 15a15b21..2f624f59 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,4 +1,39 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 712ab9d9..514ca389 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -6,6 +6,11 @@