diff --git a/Batch/org.egovframe.rte.bat.core/pom.xml b/Batch/org.egovframe.rte.bat.core/pom.xml index c25d71a7..3acee601 100644 --- a/Batch/org.egovframe.rte.bat.core/pom.xml +++ b/Batch/org.egovframe.rte.bat.core/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.bat.core @@ -8,33 +8,35 @@ 4.0.0 org.egovframe.rte.bat.core The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE - 4.2.2.RELEASE + 5.3.6 + 4.3.2 4.0.0 + UTF-8 + UTF-8 - - - egovframe - http://maven.egovframe.go.kr/maven/ - - true - - - false - - - + + + egovframe + https://maven.egovframe.go.kr/maven/ + + true + + + false + + + @@ -298,9 +300,9 @@ test - commons-dbcp - commons-dbcp - 1.4 + org.apache.commons + commons-dbcp2 + 2.4.0 test @@ -321,24 +323,17 @@ - commons-io commons-io - 2.6 + 2.7 install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -346,8 +341,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -389,6 +384,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -404,7 +400,7 @@ maven-surefire-plugin 2.22.2 - false + true once xml @@ -419,6 +415,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -440,7 +437,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -450,7 +447,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -463,8 +460,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true diff --git a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/database/EgovJdbcBatchItemWriter.java b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/database/EgovJdbcBatchItemWriter.java index bdce5672..073f72cc 100644 --- a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/database/EgovJdbcBatchItemWriter.java +++ b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/database/EgovJdbcBatchItemWriter.java @@ -179,7 +179,7 @@ public Object doInPreparedStatement(PreparedStatement ps) throws SQLException, D } }); - if (assertUpdates) { + if (assertUpdates && (updateCounts != null)) { for (int i = 0; i < updateCounts.length; i++) { int value = updateCounts[i]; if (value == 0) { diff --git a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/database/support/EgovMethodMapItemPreparedStatementSetter.java b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/database/support/EgovMethodMapItemPreparedStatementSetter.java index 85bb9a11..68defb36 100644 --- a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/database/support/EgovMethodMapItemPreparedStatementSetter.java +++ b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/database/support/EgovMethodMapItemPreparedStatementSetter.java @@ -45,6 +45,7 @@ public class EgovMethodMapItemPreparedStatementSetter extends EgovItemPrepare /** * params 만큼 돌면서 sqlType별로 PreparedStatement에 자동셋팅시킴 */ + @Override public void setValues(T item, PreparedStatement ps, String[] params, String[] sqlTypes, Map methodMap) throws SQLException { EgovReflectionSupport reflector = new EgovReflectionSupport(); diff --git a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/file/EgovPartitionFlatFileItemWriter.java b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/file/EgovPartitionFlatFileItemWriter.java index a257bf52..50f01a51 100644 --- a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/file/EgovPartitionFlatFileItemWriter.java +++ b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/file/EgovPartitionFlatFileItemWriter.java @@ -102,7 +102,7 @@ public class EgovPartitionFlatFileItemWriter extends ExecutionContextUserSupp // fileOpenTime : file이 최초로 open 될 때의 시간 private long fileOpenTime = 0; - // fileOpenTime : file이 최종으로 close 될 때의 시간 + // fileCloseTime : file이 최종으로 close 될 때의 시간 private long fileCloseTime = 0; private static final double TIME_PERCENT = 1000.0; diff --git a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/file/transform/EgovDelimitedLineTokenizer.java b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/file/transform/EgovDelimitedLineTokenizer.java index ba357927..3230b5ed 100644 --- a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/file/transform/EgovDelimitedLineTokenizer.java +++ b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/file/transform/EgovDelimitedLineTokenizer.java @@ -62,7 +62,7 @@ public EgovDelimitedLineTokenizer() { * @param delimiter : delimiter로 사용 할 문자열 */ public EgovDelimitedLineTokenizer(String delimiter) { - Assert.state(delimiter != DEFAULT_QUOTE_CHARACTER, "[" + DEFAULT_QUOTE_CHARACTER + "] is not allowed as delimiter for tokenizers."); + Assert.state(!delimiter.equals(DEFAULT_QUOTE_CHARACTER), "[" + DEFAULT_QUOTE_CHARACTER + "] is not allowed as delimiter for tokenizers."); this.delimiter = delimiter; setQuoteCharacter(DEFAULT_QUOTE_CHARACTER); } diff --git a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/file/transform/EgovEscapableDelimitedLineTokenizer.java b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/file/transform/EgovEscapableDelimitedLineTokenizer.java index 28e1f7a8..d97bc691 100644 --- a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/file/transform/EgovEscapableDelimitedLineTokenizer.java +++ b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/core/item/file/transform/EgovEscapableDelimitedLineTokenizer.java @@ -68,7 +68,7 @@ public EgovEscapableDelimitedLineTokenizer() { * @param delimiter : delimiter로 사용 할 문자열 */ public EgovEscapableDelimitedLineTokenizer(String delimiter) { - Assert.state(delimiter != DEFAULT_QUOTE_CHARACTER, "[" + DEFAULT_QUOTE_CHARACTER + "] is not allowed as delimiter for tokenizers."); + Assert.state(!delimiter.equals(DEFAULT_QUOTE_CHARACTER), "[" + DEFAULT_QUOTE_CHARACTER + "] is not allowed as delimiter for tokenizers."); this.delimiter = delimiter; setQuoteCharacter(DEFAULT_QUOTE_CHARACTER); } diff --git a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/item/DefaultItemReader.java b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/item/DefaultItemReader.java index 320e428e..127925bc 100644 --- a/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/item/DefaultItemReader.java +++ b/Batch/org.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/item/DefaultItemReader.java @@ -183,7 +183,9 @@ private void makeReaderConfigValue() { } } this.resource = new FileSystemResource(resourceName); - this.fieldNames = names.split(","); + if (names != null) { + this.fieldNames = names.split(","); + } try { this.voType = Class.forName(type); } catch (ClassNotFoundException e) { diff --git a/Foundation/org.egovframe.rte.fdl.access/pom.xml b/Foundation/org.egovframe.rte.fdl.access/pom.xml index 14f424e0..a7b1b7b7 100644 --- a/Foundation/org.egovframe.rte.fdl.access/pom.xml +++ b/Foundation/org.egovframe.rte.fdl.access/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.fdl.access @@ -8,19 +8,20 @@ 4.0.0 org.egovframe.rte.fdl.access The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 - 5.2.2.RELEASE + UTF-8 + UTF-8 @@ -44,11 +45,6 @@ spring-context-support ${spring.maven.artifact.version} - - org.springframework.security - spring-security-web - ${spring.security.maven.artifact.version} - org.springframework spring-test @@ -70,7 +66,7 @@ mysql mysql-connector-java - 8.0.19 + 5.1.31 junit @@ -106,7 +102,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -114,8 +110,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -157,6 +153,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -170,6 +167,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -186,6 +184,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -207,7 +206,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -217,7 +216,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -230,8 +229,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true diff --git a/Foundation/org.egovframe.rte.fdl.access/src/main/java/org/egovframe/rte/fdl/access/config/EgovAccessConfigBeanDefinitionParser.java b/Foundation/org.egovframe.rte.fdl.access/src/main/java/org/egovframe/rte/fdl/access/config/EgovAccessConfigBeanDefinitionParser.java index 0fe3fc50..0e070187 100644 --- a/Foundation/org.egovframe.rte.fdl.access/src/main/java/org/egovframe/rte/fdl/access/config/EgovAccessConfigBeanDefinitionParser.java +++ b/Foundation/org.egovframe.rte.fdl.access/src/main/java/org/egovframe/rte/fdl/access/config/EgovAccessConfigBeanDefinitionParser.java @@ -101,7 +101,7 @@ protected void doParse(Element element, ParserContext parserContext, BeanDefinit } String mappingPath = element.getAttribute("mappingPath"); - LOGGER.debug("===>>> mappingPath = "+mappingPath); + LOGGER.debug("##### EgovAccessConfigBeanDefinitionParser mappingPath >>> {}", mappingPath); String beanDefinitionBuilderString = "\n" + "\n" + " \n" + ""; - //LOGGER.debug("===>>> "+beanDefinitionBuilderString); + try { parserContext.getReaderContext().getReader().setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD); LOGGER.debug("##### EgovAccessConfigBeanDefinitionParser interceptor httpd load Start #####"); @@ -153,7 +153,7 @@ protected void doParse(Element element, ParserContext parserContext, BeanDefinit } LOGGER.debug("##### EgovAccessConfigBeanDefinitionParser access-config.xml load Start #####"); - parserContext.getReaderContext().getReader().loadBeanDefinitions("classpath*:/META-INF/spring/access/access-config.xml"); + parserContext.getReaderContext().getReader().loadBeanDefinitions("classpath:/META-INF/spring/access/access-config.xml"); LOGGER.debug("##### EgovAccessConfigBeanDefinitionParser access-config.xml load End #####"); } diff --git a/Foundation/org.egovframe.rte.fdl.access/src/test/java/org/egovframe/rte/fdl/access/config/EgovAccessConfigTest.java b/Foundation/org.egovframe.rte.fdl.access/src/test/java/org/egovframe/rte/fdl/access/config/EgovAccessConfigTest.java index d8179f55..6085dcdf 100644 --- a/Foundation/org.egovframe.rte.fdl.access/src/test/java/org/egovframe/rte/fdl/access/config/EgovAccessConfigTest.java +++ b/Foundation/org.egovframe.rte.fdl.access/src/test/java/org/egovframe/rte/fdl/access/config/EgovAccessConfigTest.java @@ -1,8 +1,8 @@ package org.egovframe.rte.fdl.access.config; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import org.egovframe.rte.fdl.access.bean.AuthorityResourceMetadata; +import org.egovframe.rte.fdl.access.interceptor.EgovAccessUtil; +import org.egovframe.rte.fdl.access.service.EgovUserDetailsHelper; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -18,23 +18,22 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import org.egovframe.rte.fdl.access.bean.AuthorityResourceMetadata; -import org.egovframe.rte.fdl.access.interceptor.EgovAccessUtil; -import org.egovframe.rte.fdl.access.service.EgovUserDetailsHelper; + +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations={"classpath*:META-INF/spring/*.xml"}) public class EgovAccessConfigTest { private static final Logger LOGGER = LoggerFactory.getLogger(EgovAccessConfigTest.class); - protected MockHttpServletRequest request; protected MockHttpSession session; - private ApplicationContext context; - @Before - public void setUp() throws Exception{ + public void setUp() { session = new MockHttpSession(); session.setAttribute("accessUser","GNRUSER"); @@ -50,9 +49,9 @@ public void clear(){ } @Test - public void test() throws Exception { + public void test() { - context = new ClassPathXmlApplicationContext(new String[]{"classpath:META-INF/spring/context-access.xml","classpath:META-INF/spring/test-config.xml"}); + ApplicationContext context = new ClassPathXmlApplicationContext("classpath:META-INF/spring/context-access.xml", "classpath:META-INF/spring/test-config.xml"); String[] contextList = context.getBeanDefinitionNames(); for (String bean : contextList) { LOGGER.debug("##### EgovAccessConfigTest context list >>> {} ", context.getBean(bean).getClass()); @@ -64,7 +63,7 @@ public void test() throws Exception { List authorityList = EgovUserDetailsHelper.getAuthorities(); LOGGER.debug("##### EgovAccessConfigTest authorityList : {} #####", authorityList); String authority = ""; - for (String str : authorityList) { + for (String str : Objects.requireNonNull(authorityList)) { authority = str; } diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/pom.xml b/Foundation/org.egovframe.rte.fdl.cmmn/pom.xml index 8b7e0552..9e0d2c4c 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/pom.xml +++ b/Foundation/org.egovframe.rte.fdl.cmmn/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.fdl.cmmn @@ -8,18 +8,20 @@ 4.0.0 org.egovframe.rte.fdl.cmmn The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 + UTF-8 + UTF-8 @@ -58,7 +60,7 @@ org.apache.commons commons-lang3 - 3.9 + 3.10 @@ -88,9 +90,9 @@ - net.sf.ehcache.internal - ehcache-core - 2.10.6 + net.sf.ehcache + ehcache + 2.10.9.2 test @@ -107,9 +109,9 @@ - commons-dbcp - commons-dbcp - 1.4 + org.apache.commons + commons-dbcp2 + 2.4.0 test @@ -141,7 +143,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -149,8 +151,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -192,6 +194,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -207,7 +210,7 @@ maven-surefire-plugin 2.22.2 - false + true once xml @@ -222,6 +225,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -243,7 +247,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -253,7 +257,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -266,8 +270,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true @@ -277,30 +281,6 @@ - - org.apache.maven.plugins diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/bsl/exception/ServiceExceptionHandlerTests.java b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/bsl/exception/ServiceExceptionHandlerTests.java index 15ff5bad..8d44590f 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/bsl/exception/ServiceExceptionHandlerTests.java +++ b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/bsl/exception/ServiceExceptionHandlerTests.java @@ -16,11 +16,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "classpath:/spring/*.xml" }) +@ContextConfiguration(locations = { "classpath*:/spring/*.xml" }) public class ServiceExceptionHandlerTests { - @Resource(name = "helloService") private HelloService helloService; + @Resource(name = "ohterService") private HelloService otherService; @@ -29,15 +29,13 @@ public class ServiceExceptionHandlerTests { @Test public void testBizUnCheckedException() throws Exception { - String name = "world"; - String resultStr ; + String resultStr; resultStr = helloService.sayHello(name); assertEquals("Hello world", resultStr); LeaveaTrace tmpTrace = (LeaveaTrace) applicationContext.getBean("leaveaTrace"); - assertEquals(1, tmpTrace.countOfTheTraceHandlerService()); } @@ -48,7 +46,7 @@ public void testBizException() { helloService.updateMethod(); } catch (Exception be) { assertTrue(be instanceof EgovBizException); - assertTrue(((EgovBizException) be).getWrappedException() instanceof ArithmeticException); + assertTrue(((EgovBizException)be).getWrappedException() instanceof ArithmeticException); assertTrue("해당 데이터가 없습니다.".equals(be.getMessage())); ExceptionTransfer etfer = (ExceptionTransfer) applicationContext.getBean("exceptionTransfer"); assertEquals(2, etfer.countOfTheExceptionHandlerService()); @@ -66,7 +64,6 @@ public void testBiz2Exception() { ExceptionTransfer etfer = (ExceptionTransfer) applicationContext.getBean("exceptionTransfer"); assertEquals(2, etfer.countOfTheExceptionHandlerService()); } - } } diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/FdlExceptionTest.java b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/FdlExceptionTest.java index 3ef824a7..343a573f 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/FdlExceptionTest.java +++ b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/FdlExceptionTest.java @@ -1,9 +1,7 @@ package org.egovframe.rte.fdl.cmmn; import static org.junit.Assert.assertEquals; - import org.egovframe.rte.fdl.cmmn.exception.FdlException; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -15,7 +13,6 @@ @ContextConfiguration(locations = {"classpath*:/META-INF/spring/*.xml"}) public class FdlExceptionTest extends AbstractJUnit4SpringContextTests { - @Autowired private FdlExceptionTestService fdlExceptionTestService; @@ -44,8 +41,7 @@ public void testThrowFdlException() { assertEquals("message", fe.getMessage()); } - // public FdlException(String defaultMessage, Throwable - // wrappedException) + // public FdlException(String defaultMessage, Throwabl wrappedException) try { fdlExceptionTestService.testFdlException(3); } catch (FdlException fe) { @@ -54,8 +50,7 @@ public void testThrowFdlException() { assertEquals("TEST FdlException", ex.getMessage()); } - // public FdlException(String defaultMessage, Object[] - // messageParameters, + // public FdlException(String defaultMessage, Object[] messageParameters, // Throwable wrappedException) try { fdlExceptionTestService.testFdlException(4); @@ -69,10 +64,8 @@ public void testThrowFdlException() { try { fdlExceptionTestService.testFdlException(5); } catch (FdlException fe) { - assertEquals("error.fdl.msg1", fe.getMessageKey()); assertEquals("message1", fe.getMessage()); - } // public FdlException(MessageSource messageSource, String messageKey, @@ -80,13 +73,10 @@ public void testThrowFdlException() { try { fdlExceptionTestService.testFdlException(6); } catch (FdlException fe) { - assertEquals("error.fdl.msg2", fe.getMessageKey()); assertEquals("message2", fe.getMessage()); - Exception ex = (Exception) fe.getCause(); assertEquals("TEST FdlException", ex.getMessage()); - } // public FdlException(MessageSource messageSource, String messageKey, @@ -94,28 +84,21 @@ public void testThrowFdlException() { try { fdlExceptionTestService.testFdlException(7); } catch (FdlException fe) { - assertEquals("error.fdl.msg3", fe.getMessageKey()); assertEquals("메세지3", fe.getMessage()); - Exception ex = (Exception) fe.getCause(); assertEquals("TEST FdlException", ex.getMessage()); - } // public FdlException(MessageSource messageSource, String messageKey, - // Object[] messageParameters, Locale locale, - // Throwable wrappedException) { + // Object[] messageParameters, Locale locale, Throwable wrappedException) { try { fdlExceptionTestService.testFdlException(8); } catch (FdlException fe) { - assertEquals("error.fdl.msg4", fe.getMessageKey()); assertEquals("메세지4 파라미터 추가", fe.getMessage()); - Exception ex = (Exception) fe.getCause(); assertEquals("TEST FdlException", ex.getMessage()); - } // public FdlException(MessageSource messageSource, String messageKey, @@ -123,13 +106,10 @@ public void testThrowFdlException() { try { fdlExceptionTestService.testFdlException(9); } catch (FdlException fe) { - assertEquals("error.fdl.msg5", fe.getMessageKey()); assertEquals("message5 parameter", fe.getMessage()); - Exception ex = (Exception) fe.getCause(); assertEquals("TEST FdlException", ex.getMessage()); - } // public FdlException(MessageSource messageSource, String messageKey, @@ -139,13 +119,10 @@ public void testThrowFdlException() { try { fdlExceptionTestService.testFdlException(10); } catch (FdlException fe) { - assertEquals("error.fdl.msg66", fe.getMessageKey()); assertEquals("default message", fe.getMessage()); - Exception ex = (Exception) fe.getCause(); assertEquals("TEST FdlException", ex.getMessage()); - } // public FdlException(MessageSource messageSource, String messageKey, @@ -155,13 +132,10 @@ public void testThrowFdlException() { try { fdlExceptionTestService.testFdlException(11); } catch (FdlException fe) { - assertEquals("error.fdl.msg6", fe.getMessageKey()); assertEquals("message6 parameter", fe.getMessage()); - Exception ex = (Exception) fe.getCause(); assertEquals("TEST FdlException", ex.getMessage()); - } // public FdlException(MessageSource messageSource, String messageKey, @@ -170,13 +144,10 @@ public void testThrowFdlException() { try { fdlExceptionTestService.testFdlException(12); } catch (FdlException fe) { - assertEquals("error.fdl.msg7", fe.getMessageKey()); assertEquals("메세지7 파라미터", fe.getMessage()); - Exception ex = (Exception) fe.getCause(); assertEquals("TEST FdlException", ex.getMessage()); - } } diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/FdlExceptionTestService.java b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/FdlExceptionTestService.java index ff440220..c1959b29 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/FdlExceptionTestService.java +++ b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/FdlExceptionTestService.java @@ -43,7 +43,7 @@ public void testFdlException(int arg) throws FdlException { case 7: throw new FdlException(messageSource, - "error.fdl.msg3", + "error.fdl.msg3", Locale.KOREAN, new Exception("TEST FdlException")); diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/aspectj/AppConfig.java b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/aspectj/AppConfig.java index 0318d05b..03829cf2 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/aspectj/AppConfig.java +++ b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/aspectj/AppConfig.java @@ -4,7 +4,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; - @Configuration @EnableAspectJAutoProxy(proxyTargetClass = true) public class AppConfig { diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/aspectj/AspectjJunitTest.java b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/aspectj/AspectjJunitTest.java index 84975ed6..2d32793e 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/aspectj/AspectjJunitTest.java +++ b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/java/org/egovframe/rte/fdl/cmmn/aspectj/AspectjJunitTest.java @@ -1,24 +1,18 @@ package org.egovframe.rte.fdl.cmmn.aspectj; -import org.junit.After; import org.junit.AfterClass; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; - import static org.junit.Assert.*; import static org.hamcrest.CoreMatchers.*; -import static org.hamcrest.BaseMatcher.*; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; - @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes= {AppConfig.class, SampleAspect.class},loader=AnnotationConfigContextLoader.class) +@ContextConfiguration(classes= {AppConfig.class, SampleAspect.class}, loader=AnnotationConfigContextLoader.class) public class AspectjJunitTest { @Autowired diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/META-INF/spring/egovframework-fdl-exception.xml b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/META-INF/spring/egovframework-fdl-exception.xml index 583847bb..750d5c9f 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/META-INF/spring/egovframework-fdl-exception.xml +++ b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/META-INF/spring/egovframework-fdl-exception.xml @@ -1,11 +1,10 @@ - + - - true - + message/egovframework-fdl-exception-message diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-cnamespace.xml b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-cnamespace.xml index 518cc4c5..5f42870e 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-cnamespace.xml +++ b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-cnamespace.xml @@ -1,20 +1,13 @@ - + - - + - diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-common.xml b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-common.xml index e310d5c1..03eeae94 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-common.xml +++ b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-common.xml @@ -1,6 +1,7 @@ - + diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-concurrentmap.xml b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-concurrentmap.xml index 03368384..cae56d93 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-concurrentmap.xml +++ b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-concurrentmap.xml @@ -1,11 +1,12 @@ - + diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-profiles.xml b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-profiles.xml index b57e351b..f19d57f9 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-profiles.xml +++ b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/context-profiles.xml @@ -1,10 +1,11 @@ - + - + @@ -12,7 +13,7 @@ - + @@ -31,5 +32,4 @@ - \ No newline at end of file diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/ehcache.xml b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/ehcache.xml index cc3cf931..03766856 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/ehcache.xml +++ b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/ehcache.xml @@ -1,7 +1,8 @@ - + statistics="false" /> - + transactionalMode="off" /> - + memoryStoreEvictionPolicy="FIFO" /> - + memoryStoreEvictionPolicy="LFU" /> + diff --git a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/exception-resolver.xml b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/exception-resolver.xml index f2ace18a..7383be03 100644 --- a/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/exception-resolver.xml +++ b/Foundation/org.egovframe.rte.fdl.cmmn/src/test/resources/spring/exception-resolver.xml @@ -1,5 +1,6 @@ - diff --git a/Foundation/org.egovframe.rte.fdl.crypto/pom.xml b/Foundation/org.egovframe.rte.fdl.crypto/pom.xml index 7fcec51b..aa53df74 100644 --- a/Foundation/org.egovframe.rte.fdl.crypto/pom.xml +++ b/Foundation/org.egovframe.rte.fdl.crypto/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.fdl.crypto @@ -8,17 +8,17 @@ 4.0.0 org.egovframe.rte.fdl.crypto The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 @@ -46,12 +46,12 @@ commons-codec commons-codec - 1.14 + 1.15 commons-io commons-io - 2.6 + 2.7 javax.annotation @@ -102,7 +102,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -110,8 +110,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -153,6 +153,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -166,6 +167,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -182,6 +184,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -203,7 +206,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -213,7 +216,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -226,8 +229,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true @@ -237,30 +240,6 @@ - - org.apache.maven.plugins diff --git a/Foundation/org.egovframe.rte.fdl.crypto/src/test/java/org/egovframe/rte/fdl/cryptography/EgovEnvCryptoAdminTest.java b/Foundation/org.egovframe.rte.fdl.crypto/src/test/java/org/egovframe/rte/fdl/cryptography/EgovEnvCryptoAdminTest.java index 3dbd78b0..eca94508 100644 --- a/Foundation/org.egovframe.rte.fdl.crypto/src/test/java/org/egovframe/rte/fdl/cryptography/EgovEnvCryptoAdminTest.java +++ b/Foundation/org.egovframe.rte.fdl.crypto/src/test/java/org/egovframe/rte/fdl/cryptography/EgovEnvCryptoAdminTest.java @@ -38,8 +38,8 @@ public class EgovEnvCryptoAdminTest { String[] arrCryptoString = { "com", //데이터베이스 접속 계정 "com01", //데이터베이스 접속 패드워드 - "jdbc:log4jdbc:mysql://10.211.55.2:3306/com", //데이터베이스 접속 주소 - "net.sf.log4jdbc.DriverSpy" //데이터베이스 드라이버 + "jdbc:mysql://localhost:3306/com", //데이터베이스 접속 주소 + "com.mysql.jdbc.Driver" //데이터베이스 드라이버 }; //계정암호화키 키 diff --git a/Foundation/org.egovframe.rte.fdl.crypto/src/test/java/org/egovframe/rte/fdl/cryptography/EgovEnvCryptoUserTest.java b/Foundation/org.egovframe.rte.fdl.crypto/src/test/java/org/egovframe/rte/fdl/cryptography/EgovEnvCryptoUserTest.java index 97e71a2b..99674e01 100644 --- a/Foundation/org.egovframe.rte.fdl.crypto/src/test/java/org/egovframe/rte/fdl/cryptography/EgovEnvCryptoUserTest.java +++ b/Foundation/org.egovframe.rte.fdl.crypto/src/test/java/org/egovframe/rte/fdl/cryptography/EgovEnvCryptoUserTest.java @@ -41,8 +41,7 @@ public static void main(String[] args) { "url" //데이터베이스 접속 주소 }; - - LOGGER.info("------------------------------------------------------"); + LOGGER.info("------------------------------------------------------"); ApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"classpath:/META-INF/spring/config/crypto-config.xml"}); EgovEnvCryptoService cryptoService = context.getBean(EgovEnvCryptoServiceImpl.class); LOGGER.info("------------------------------------------------------"); diff --git a/Foundation/org.egovframe.rte.fdl.crypto/src/test/resources/META-INF/spring/config/crypto-config.xml b/Foundation/org.egovframe.rte.fdl.crypto/src/test/resources/META-INF/spring/config/crypto-config.xml index bd65c252..4ee6b26e 100644 --- a/Foundation/org.egovframe.rte.fdl.crypto/src/test/resources/META-INF/spring/config/crypto-config.xml +++ b/Foundation/org.egovframe.rte.fdl.crypto/src/test/resources/META-INF/spring/config/crypto-config.xml @@ -18,7 +18,7 @@ - classpath:/egovframework/rte/fdl/property/messages/properties + classpath:/org/egovframe/rte/fdl/property/messages/properties diff --git a/Foundation/org.egovframe.rte.fdl.crypto/src/test/resources/META-INF/spring/password.xml b/Foundation/org.egovframe.rte.fdl.crypto/src/test/resources/META-INF/spring/password.xml index 3612abcf..8bd06011 100644 --- a/Foundation/org.egovframe.rte.fdl.crypto/src/test/resources/META-INF/spring/password.xml +++ b/Foundation/org.egovframe.rte.fdl.crypto/src/test/resources/META-INF/spring/password.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/Foundation/org.egovframe.rte.fdl.excel/pom.xml b/Foundation/org.egovframe.rte.fdl.excel/pom.xml index 502fe5cf..221a3156 100644 --- a/Foundation/org.egovframe.rte.fdl.excel/pom.xml +++ b/Foundation/org.egovframe.rte.fdl.excel/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.fdl.excel @@ -8,18 +8,20 @@ 4.0.0 org.egovframe.rte.fdl.excel The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 + UTF-8 + UTF-8 @@ -148,13 +150,13 @@ mysql mysql-connector-java - 8.0.19 + 5.1.31 test - commons-dbcp - commons-dbcp - 1.4 + org.apache.commons + commons-dbcp2 + 2.4.0 test @@ -162,7 +164,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -170,8 +172,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -213,6 +215,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -226,6 +229,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -242,6 +246,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -263,7 +268,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -273,7 +278,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -286,8 +291,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true diff --git a/Foundation/org.egovframe.rte.fdl.excel/src/main/java/org/egovframe/rte/fdl/excel/impl/EgovExcelServiceImpl.java b/Foundation/org.egovframe.rte.fdl.excel/src/main/java/org/egovframe/rte/fdl/excel/impl/EgovExcelServiceImpl.java index 7107a844..5355ac73 100644 --- a/Foundation/org.egovframe.rte.fdl.excel/src/main/java/org/egovframe/rte/fdl/excel/impl/EgovExcelServiceImpl.java +++ b/Foundation/org.egovframe.rte.fdl.excel/src/main/java/org/egovframe/rte/fdl/excel/impl/EgovExcelServiceImpl.java @@ -63,7 +63,7 @@ * 2013.05.29 한성곤 mapBeanName property 추가 및 코드 정리 * 2014.05.14 이기하 코드 refactoring 및 mybatis 서비스 추가 * 2017.02.15 장동한 ES-부적절한 예외 처리[CWE-253, CWE-440, CWE-754] - * 2020.08.31 ESFC ES-부적절한 예외 처리[CWE-253, CWE-440, CWE-754] + * 2020.08.31 ESFC ES-부적절한 예외 처리[CWE-253, CWE-440, CWE-754] * */ public class EgovExcelServiceImpl implements EgovExcelService, ApplicationContextAware { @@ -148,14 +148,16 @@ public Workbook createWorkbook(Workbook wb, String filepath) throws IOException LOGGER.debug("make dir {}", FilenameUtils.getFullPath(fullFileName)); FileUtils.forceMkdir(new File(FilenameUtils.getFullPath(fullFileName))); } - FileOutputStream fileOut = new FileOutputStream(fullFileName); + FileOutputStream fileOut = null; LOGGER.debug("EgovExcelServiceImpl.createWorkbook : templatePath is {}", fullFileName); try { LOGGER.debug("ExcelServiceImpl loadExcelObject ..."); - wb.write(fileOut); + fileOut = new FileOutputStream(fullFileName); + wb.write(fileOut); } finally { LOGGER.debug("ExcelServiceImpl loadExcelObject end..."); - fileOut.close(); + if (wb != null) wb.close();; + if (fileOut != null) fileOut.close(); } return wb; } @@ -167,16 +169,20 @@ public Workbook createWorkbook(Workbook wb, String filepath) throws IOException * @throws Exception */ public Workbook loadExcelTemplate(String templateName) throws IOException { - FileInputStream fileIn = new FileInputStream(templateName); - Workbook wb = null; + FileInputStream fileIn = null; + POIFSFileSystem fs = null; + Workbook wb = null; LOGGER.debug("EgovExcelServiceImpl.loadExcelTemplate : templatePath is {}", templateName); try { LOGGER.debug("ExcelServiceImpl loadExcelTemplate ..."); - POIFSFileSystem fs = new POIFSFileSystem(fileIn); + fileIn = new FileInputStream(templateName); + fs = new POIFSFileSystem(fileIn); wb = new HSSFWorkbook(fs); } finally { LOGGER.debug("ExcelServiceImpl loadExcelTemplate end..."); - fileIn.close(); + if (wb != null) wb.close(); + if (fs != null) fs.close(); + if (fileIn != null) fileIn.close(); } return wb; } @@ -189,14 +195,16 @@ public Workbook loadExcelTemplate(String templateName) throws IOException { * @throws Exception */ public XSSFWorkbook loadExcelTemplate(String templateName, XSSFWorkbook wb) throws IOException { - FileInputStream fileIn = new FileInputStream(templateName); + FileInputStream fileIn = null; LOGGER.debug("EgovExcelServiceImpl.loadExcelTemplate(XSSF) : templatePath is {}", templateName); try { LOGGER.debug("ExcelServiceImpl loadExcelTemplate(XSSF) ..."); - wb = new XSSFWorkbook(fileIn); + fileIn = new FileInputStream(templateName); + wb = new XSSFWorkbook(fileIn); } finally { LOGGER.debug("ExcelServiceImpl loadExcelTemplate(XSSF) end..."); - fileIn.close(); + if (wb != null) wb.close(); + if (fileIn != null) fileIn.close(); } return wb; } @@ -207,13 +215,15 @@ public XSSFWorkbook loadExcelTemplate(String templateName, XSSFWorkbook wb) thro * @return Workbook * @throws Exception */ - public Workbook loadWorkbook(String filepath) throws BaseException, IOException { - Workbook wb; - FileInputStream fileIn = new FileInputStream(filepath); + public Workbook loadWorkbook(String filepath) throws IOException { + FileInputStream fileIn = null; + Workbook wb = null; try { + fileIn = new FileInputStream(filepath); wb = loadWorkbook(fileIn); } finally { - fileIn.close(); + if (wb != null) wb.close(); + if (fileIn != null) fileIn.close(); } return wb; } @@ -226,11 +236,13 @@ public Workbook loadWorkbook(String filepath) throws BaseException, IOException * @throws Exception */ public XSSFWorkbook loadWorkbook(String filepath, XSSFWorkbook wb) throws BaseException, IOException { - FileInputStream fileIn = new FileInputStream(filepath); + FileInputStream fileIn = null; try { + fileIn = new FileInputStream(filepath); wb = loadWorkbook(fileIn, wb); } finally { - fileIn.close(); + if (wb != null) wb.close(); + if (fileIn != null) fileIn.close(); } return wb; } @@ -242,13 +254,16 @@ public XSSFWorkbook loadWorkbook(String filepath, XSSFWorkbook wb) throws BaseEx * @throws Exception */ public Workbook loadWorkbook(InputStream fileIn) throws IOException { - Workbook wb; - POIFSFileSystem fs = new POIFSFileSystem(fileIn); + POIFSFileSystem fs = null; + Workbook wb = null; try { LOGGER.debug("ExcelServiceImpl loadWorkbook ..."); + fs = new POIFSFileSystem(fileIn); wb = new HSSFWorkbook(fs); } finally { - fs.close(); + if (wb != null) wb.close(); + if (fs != null) fs.close(); + if (fileIn != null) fileIn.close(); } return wb; } diff --git a/Foundation/org.egovframe.rte.fdl.excel/src/main/java/org/egovframe/rte/fdl/excel/util/EgovExcelUtil.java b/Foundation/org.egovframe.rte.fdl.excel/src/main/java/org/egovframe/rte/fdl/excel/util/EgovExcelUtil.java index 6df6c5fc..00218463 100644 --- a/Foundation/org.egovframe.rte.fdl.excel/src/main/java/org/egovframe/rte/fdl/excel/util/EgovExcelUtil.java +++ b/Foundation/org.egovframe.rte.fdl.excel/src/main/java/org/egovframe/rte/fdl/excel/util/EgovExcelUtil.java @@ -56,7 +56,7 @@ private EgovExcelUtil() { */ public static String getValue(Cell cell) { String result = ""; - if (null == cell || cell.equals(null)) { + if (null == cell) { return ""; } diff --git a/Foundation/org.egovframe.rte.fdl.filehandling/pom.xml b/Foundation/org.egovframe.rte.fdl.filehandling/pom.xml index 1ed159b9..5ef5aea6 100644 --- a/Foundation/org.egovframe.rte.fdl.filehandling/pom.xml +++ b/Foundation/org.egovframe.rte.fdl.filehandling/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.fdl.filehandling @@ -8,18 +8,20 @@ 4.0.0 org.egovframe.rte.fdl.filehandling The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 + UTF-8 + UTF-8 @@ -58,7 +60,7 @@ commons-io commons-io - 2.6 + 2.7 javax.annotation @@ -78,7 +80,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -86,8 +88,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -129,6 +131,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -142,6 +145,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -158,6 +162,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -179,7 +184,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -189,7 +194,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -202,8 +207,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true @@ -213,30 +218,6 @@ - - org.apache.maven.plugins 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 032d9151..0f9303f8 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 @@ -546,7 +546,7 @@ public void testLineIterator() throws Exception { String[] string = { "", + " xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd\">", " 4.0.0", " org.egovframe.rte", " org.egovframe.rte.fdl.filehandling", diff --git a/Foundation/org.egovframe.rte.fdl.idgnr/pom.xml b/Foundation/org.egovframe.rte.fdl.idgnr/pom.xml index a0f4859f..2445f734 100644 --- a/Foundation/org.egovframe.rte.fdl.idgnr/pom.xml +++ b/Foundation/org.egovframe.rte.fdl.idgnr/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.fdl.idgnr @@ -8,18 +8,20 @@ 4.0.0 org.egovframe.rte.fdl.idgnr The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 + UTF-8 + UTF-8 @@ -72,15 +74,15 @@ test - commons-dbcp - commons-dbcp - 1.4 + org.apache.commons + commons-dbcp2 + 2.4.0 test mysql mysql-connector-java - 8.0.19 + 5.1.31 test @@ -89,21 +91,12 @@ 2.5.0 test - - install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -111,8 +104,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -154,6 +147,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -167,6 +161,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -183,6 +178,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -204,7 +200,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -214,7 +210,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -227,8 +223,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true @@ -238,30 +234,6 @@ - - org.apache.maven.plugins diff --git a/Foundation/org.egovframe.rte.fdl.idgnr/src/main/java/org/egovframe/rte/fdl/idgnr/impl/EgovSequenceIdGnrService.java b/Foundation/org.egovframe.rte.fdl.idgnr/src/main/java/org/egovframe/rte/fdl/idgnr/impl/EgovSequenceIdGnrService.java index 14fccaed..30bc9ffa 100644 --- a/Foundation/org.egovframe.rte.fdl.idgnr/src/main/java/org/egovframe/rte/fdl/idgnr/impl/EgovSequenceIdGnrService.java +++ b/Foundation/org.egovframe.rte.fdl.idgnr/src/main/java/org/egovframe/rte/fdl/idgnr/impl/EgovSequenceIdGnrService.java @@ -49,7 +49,6 @@ */ @Deprecated public class EgovSequenceIdGnrService extends AbstractDataIdGnrService { - private static final Logger LOGGER = LoggerFactory.getLogger(EgovSequenceIdGnrService.class); /** @@ -60,28 +59,31 @@ public class EgovSequenceIdGnrService extends AbstractDataIdGnrService { protected BigDecimal getNextBigDecimalIdInner() throws FdlException { LOGGER.debug(messageSource.getMessage("debug.idgnr.sequenceid.query", new String[] { query }, Locale.getDefault())); + Connection conn = null; + PreparedStatement stmt = null; + ResultSet rs = null; + try { - Connection conn = getConnection(); - PreparedStatement stmt = conn.prepareStatement(query); - ResultSet rs = stmt.executeQuery(); - try { - if (rs.next()) { - return rs.getBigDecimal(1); - } else { - LOGGER.error(messageSource.getMessage("error.idgnr.sequenceid.notallocate.id", new String[] {}, Locale.getDefault())); - throw new FdlException(messageSource, "error.idgnr.sequenceid.notallocate.id"); - } - } finally { - //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] - if (rs != null) try { rs.close(); } catch(SQLException ex) {LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage());} - //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] - if (stmt != null) try { stmt.close(); } catch(SQLException ex) {LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage());} - //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] - if (conn != null) try { conn.close(); } catch(SQLException ex) {LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage());} + conn = getConnection(); + stmt = conn.prepareStatement(query); + rs = stmt.executeQuery(); + + if (rs.next()) { + return rs.getBigDecimal(1); + } else { + LOGGER.error(messageSource.getMessage("error.idgnr.sequenceid.notallocate.id", new String[] {}, Locale.getDefault())); + throw new FdlException(messageSource, "error.idgnr.sequenceid.notallocate.id"); } } catch (SQLException e) { LOGGER.error(messageSource.getMessage("error.idgnr.get.connection", new String[] {}, Locale.getDefault())); throw new FdlException(messageSource, "error.idgnr.get.connection", e); + } finally { + //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] + if (rs != null) try { rs.close(); } catch(SQLException ex) { LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage()); } + //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] + if (stmt != null) try { stmt.close(); } catch(SQLException ex) { LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage()); } + //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] + if (conn != null) try { conn.close(); } catch(SQLException ex) { LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage()); } } } @@ -93,28 +95,31 @@ protected BigDecimal getNextBigDecimalIdInner() throws FdlException { protected long getNextLongIdInner() throws FdlException { LOGGER.debug(messageSource.getMessage("debug.idgnr.sequenceid.query", new String[] { query }, Locale.getDefault())); + Connection conn = null; + PreparedStatement stmt = null; + ResultSet rs = null; + try { - Connection conn = getConnection(); - PreparedStatement stmt = conn.prepareStatement(query); - ResultSet rs = stmt.executeQuery(); - try { - if (rs.next()) { - return rs.getLong(1); - } else { - LOGGER.error(messageSource.getMessage("error.idgnr.sequenceid.notallocate.id", new String[] {}, Locale.getDefault())); - throw new FdlException(messageSource, "error.idgnr.sequenceid.notallocate.id"); - } - } finally { - //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] - if (rs != null) try { rs.close(); } catch(SQLException ex) {LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage());} - //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] - if (stmt != null) try { stmt.close(); } catch(SQLException ex) {LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage());} - //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] - if (conn != null) try { conn.close(); } catch(SQLException ex) {LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage());} + conn = getConnection(); + stmt = conn.prepareStatement(query); + rs = stmt.executeQuery(); + + if (rs.next()) { + return rs.getLong(1); + } else { + LOGGER.error(messageSource.getMessage("error.idgnr.sequenceid.notallocate.id", new String[] {}, Locale.getDefault())); + throw new FdlException(messageSource, "error.idgnr.sequenceid.notallocate.id"); } } catch (SQLException e) { LOGGER.error(messageSource.getMessage("error.idgnr.get.connection", new String[] {}, Locale.getDefault())); throw new FdlException(messageSource, "error.idgnr.get.connection", e); + } finally { + //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] + if (rs != null) try { rs.close(); } catch(SQLException ex) { LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage()); } + //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] + if (stmt != null) try { stmt.close(); } catch(SQLException ex) { LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage()); } + //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] + if (conn != null) try { conn.close(); } catch(SQLException ex) { LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage()); } } } diff --git a/Foundation/org.egovframe.rte.fdl.idgnr/src/main/java/org/egovframe/rte/fdl/idgnr/impl/EgovSequenceIdGnrServiceImpl.java b/Foundation/org.egovframe.rte.fdl.idgnr/src/main/java/org/egovframe/rte/fdl/idgnr/impl/EgovSequenceIdGnrServiceImpl.java index e914fe99..cf15f63e 100644 --- a/Foundation/org.egovframe.rte.fdl.idgnr/src/main/java/org/egovframe/rte/fdl/idgnr/impl/EgovSequenceIdGnrServiceImpl.java +++ b/Foundation/org.egovframe.rte.fdl.idgnr/src/main/java/org/egovframe/rte/fdl/idgnr/impl/EgovSequenceIdGnrServiceImpl.java @@ -48,7 +48,6 @@ * */ public class EgovSequenceIdGnrServiceImpl extends AbstractDataIdGnrService { - private static final Logger LOGGER = LoggerFactory.getLogger(EgovSequenceIdGnrServiceImpl.class); /** @@ -59,28 +58,30 @@ public class EgovSequenceIdGnrServiceImpl extends AbstractDataIdGnrService { protected BigDecimal getNextBigDecimalIdInner() throws FdlException { LOGGER.debug(messageSource.getMessage("debug.idgnr.sequenceid.query", new String[] { query }, Locale.getDefault())); + Connection conn = null; + PreparedStatement stmt = null; + ResultSet rs = null; + try { - Connection conn = getConnection(); - PreparedStatement stmt = conn.prepareStatement(query); - ResultSet rs = stmt.executeQuery(); - try { - if (rs.next()) { - return rs.getBigDecimal(1); - } else { - LOGGER.error(messageSource.getMessage("error.idgnr.sequenceid.notallocate.id", new String[] {}, Locale.getDefault())); - throw new FdlException(messageSource, "error.idgnr.sequenceid.notallocate.id"); - } - } finally { - //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397]s - if (rs != null) try { rs.close(); } catch(SQLException ex) {LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage());} - //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] - if (stmt != null) try { stmt.close(); } catch(SQLException ex) {LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage());} - //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] - if (conn != null) try { conn.close(); } catch(SQLException ex) {LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage());} + conn = getConnection(); + stmt = conn.prepareStatement(query); + rs = stmt.executeQuery(); + if (rs.next()) { + return rs.getBigDecimal(1); + } else { + LOGGER.error(messageSource.getMessage("error.idgnr.sequenceid.notallocate.id", new String[] {}, Locale.getDefault())); + throw new FdlException(messageSource, "error.idgnr.sequenceid.notallocate.id"); } } catch (SQLException e) { LOGGER.error(messageSource.getMessage("error.idgnr.get.connection", new String[] {}, Locale.getDefault())); throw new FdlException(messageSource, "error.idgnr.get.connection", e); + } finally { + //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] + if (rs != null) try { rs.close(); } catch(SQLException ex) { LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage()); } + //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] + if (stmt != null) try { stmt.close(); } catch(SQLException ex) { LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage()); } + //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] + if (conn != null) try { conn.close(); } catch(SQLException ex) { LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage()); } } } @@ -92,28 +93,31 @@ protected BigDecimal getNextBigDecimalIdInner() throws FdlException { protected long getNextLongIdInner() throws FdlException { LOGGER.debug(messageSource.getMessage("debug.idgnr.sequenceid.query", new String[] { query }, Locale.getDefault())); + Connection conn = null; + PreparedStatement stmt = null; + ResultSet rs = null; + try { - Connection conn = getConnection(); - PreparedStatement stmt = conn.prepareStatement(query); - ResultSet rs = stmt.executeQuery(); - try { - if (rs.next()) { - return rs.getLong(1); - } else { - LOGGER.error(messageSource.getMessage("error.idgnr.sequenceid.notallocate.id", new String[] {}, Locale.getDefault())); - throw new FdlException(messageSource, "error.idgnr.sequenceid.notallocate.id"); - } - } finally { - //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] - if (rs != null) try { rs.close(); } catch(SQLException ex) {LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage());} - //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] - if (stmt != null) try { stmt.close(); } catch(SQLException ex) {LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage());} - //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] - if (conn != null) try { conn.close(); } catch(SQLException ex) {LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage());} + conn = getConnection(); + stmt = conn.prepareStatement(query); + rs = stmt.executeQuery(); + + if (rs.next()) { + return rs.getLong(1); + } else { + LOGGER.error(messageSource.getMessage("error.idgnr.sequenceid.notallocate.id", new String[] {}, Locale.getDefault())); + throw new FdlException(messageSource, "error.idgnr.sequenceid.notallocate.id"); } } catch (SQLException e) { LOGGER.error(messageSource.getMessage("error.idgnr.get.connection", new String[] {}, Locale.getDefault())); throw new FdlException(messageSource, "error.idgnr.get.connection", e); + } finally { + //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] + if (rs != null) try { rs.close(); } catch(SQLException ex) { LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage()); } + //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] + if (stmt != null) try { stmt.close(); } catch(SQLException ex) { LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage()); } + //2017.02.14 장동한 시큐어코딩(ES)-오류 상황 대응 부재[CWE-390, CWE-397] + if (conn != null) try { conn.close(); } catch(SQLException ex) { LOGGER.error("[SQLException] ResultSet Next Runing : "+ ex.getMessage()); } } } diff --git a/Foundation/org.egovframe.rte.fdl.idgnr/src/main/java/org/egovframe/rte/fdl/idgnr/impl/EgovUUIdGnrServiceImpl.java b/Foundation/org.egovframe.rte.fdl.idgnr/src/main/java/org/egovframe/rte/fdl/idgnr/impl/EgovUUIdGnrServiceImpl.java index b5cd1b46..000f3dcf 100644 --- a/Foundation/org.egovframe.rte.fdl.idgnr/src/main/java/org/egovframe/rte/fdl/idgnr/impl/EgovUUIdGnrServiceImpl.java +++ b/Foundation/org.egovframe.rte.fdl.idgnr/src/main/java/org/egovframe/rte/fdl/idgnr/impl/EgovUUIdGnrServiceImpl.java @@ -37,6 +37,8 @@ import java.net.NetworkInterface; import java.net.SocketException; import java.net.UnknownHostException; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; import java.util.Random; import java.util.StringTokenizer; import java.util.UUID; @@ -185,9 +187,10 @@ public String getNextStringId(String strategyId) throws FdlException { * @param address Config 에 지정된 address 정보 * @throws FdlException IP 정보가 이상한 경우 */ - public void setAddress(String address) throws FdlException { + public void setAddress(String address) throws FdlException, NoSuchAlgorithmException { byte[] addressBytes = new byte[6]; Random random = new Random(); + random = SecureRandom.getInstanceStrong(); random.setSeed(System.currentTimeMillis()); if (null == address) { LOGGER.warn("IDGeneration Service : Using a random number as the base for id's." diff --git a/Foundation/org.egovframe.rte.fdl.logging/pom.xml b/Foundation/org.egovframe.rte.fdl.logging/pom.xml index 1fda67cf..9d76f913 100644 --- a/Foundation/org.egovframe.rte.fdl.logging/pom.xml +++ b/Foundation/org.egovframe.rte.fdl.logging/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.fdl.logging @@ -8,17 +8,19 @@ 4.0.0 org.egovframe.rte.fdl.logging The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 + UTF-8 + UTF-8 @@ -26,15 +28,15 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.17.1 org.apache.logging.log4j log4j-slf4j-impl - 2.13.0 + 2.17.1 - + org.slf4j jcl-over-slf4j @@ -85,6 +87,12 @@ + + org.springframework + spring-context + ${spring.maven.artifact.version} + test + org.aspectj aspectjweaver @@ -110,15 +118,15 @@ test - commons-dbcp - commons-dbcp - 1.4 + org.apache.commons + commons-dbcp2 + 2.4.0 test org.apache.commons commons-lang3 - 3.9 + 3.10 test @@ -159,7 +167,6 @@ - org.hsqldb hsqldb @@ -167,34 +174,10 @@ test @@ -205,18 +188,12 @@ 3.1.1 test - - org.springframework - spring-context - 5.2.5.RELEASE - test - install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -224,8 +201,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -245,7 +222,7 @@ org.hsqldb hsqldb - 2.3.2 + 2.5.0 @@ -267,6 +244,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -280,6 +258,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -296,9 +275,10 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true - + org.apache.maven.plugins maven-javadoc-plugin @@ -317,7 +297,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -327,7 +307,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -340,8 +320,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true @@ -351,30 +331,6 @@ - - org.apache.maven.plugins diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/AdvancedLogTargetTest.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/AdvancedLogTargetTest.java index 11e94ae9..2def5b26 100644 --- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/AdvancedLogTargetTest.java +++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/AdvancedLogTargetTest.java @@ -21,18 +21,15 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { - "classpath:META-INF/spring/context-common.xml", - "classpath:META-INF/spring/context-datasource.xml", - "classpath:META-INF/spring/context-connectionFactory.xml"}) +@ContextConfiguration(locations={"classpath*:META-INF/spring/*.xml"}) public class AdvancedLogTargetTest { - + @Resource(name = "dataSource") DataSource dataSource; - @Value("#{jdbcProperties['usingDBMS']}") + @Value("#{jdbcProperties['usingDBMS']}") private String usingDBMS; - + @Before public void onSetUp() throws Exception { ScriptUtils.executeSqlScript(dataSource.getConnection(), new ClassPathResource("META-INF/testdata/dialect/" + usingDBMS + ".sql")); @@ -55,7 +52,6 @@ public void testJDBCAppender() { logger.fatal("fatal"); // 로그 확인 - // db_log 테이블에 저장된 로그 조회 String sql = "SELECT * FROM db_log"; JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); @@ -66,12 +62,12 @@ public void testJDBCAppender() { // db_log 테이블에 저장된 로그를 콘솔에 출력 LogManager.getLogger("org.egovframe").debug(result); } - + // 저장된 error, fatal 로그의 각 컬럼 확인 assertEquals("ERROR", resultList.get(0).get("level")); assertEquals("dbLogger", resultList.get(0).get("logger")); assertEquals("error", resultList.get(0).get("message")); - + assertEquals("FATAL", resultList.get(1).get("level")); assertEquals("dbLogger", resultList.get(1).get("logger")); assertEquals("fatal", resultList.get(1).get("message")); diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/AdvancedNetLogTargetTest.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/AdvancedNetLogTargetTest.java index 8965c55b..95406812 100644 --- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/AdvancedNetLogTargetTest.java +++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/AdvancedNetLogTargetTest.java @@ -19,22 +19,6 @@ @ContextConfiguration(locations = { "classpath:META-INF/spring/context-common.xml" }) public class AdvancedNetLogTargetTest { - // @BeforeClass - // public static void runRemoteSocketServer() { - // try { - // // Runtime.getRuntime().exec("runSocketServer.bat", null, new File(".")); - // Runtime - // .getRuntime() - // .exec( - // "java -classpath ./lib/log4j-1.3alpha-8-374949.jar org.apache.log4j.net.SimpleSocketServer 4448 ./remote/log4j.xml"); - // } catch (BindException be) { - // LogManager.getLogger("sysoutLogger").debug("이미 SimpleSocketServer 가 떠 있습니다."); - // } catch (Exception e) { - // e.printStackTrace(); - // } - // } - - /** testSocketAppender() 테스트 케이스 실행 방법 * 1. 반드시 classpath에 있는 runSocketServer.bat 를 실행한다. * 2. runSocketServer.bat가 두개 이상 실행되어 있는 경우, 에러를 발생시킨다. @@ -86,14 +70,13 @@ public void testSocketAppender() throws Exception { * logger: level=ERROR, appender=SMTP * */ @Test - public void testSMTPAppender() throws Exception { - + public void testSMTPAppender() { System.setProperty("mail.smtp.starttls.enable", "true"); System.setProperty("mail.smtps.auth", "true"); Logger logger = LogManager.getLogger("mailLogger"); + // 로그 출력 logger.error("SMTPAppender 테스트 test"); - // 받은 메일함 확인 } } diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Log4j2ParameterizedTest.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Log4j2ParameterizedTest.java index 1c37b761..e3b24cb9 100644 --- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Log4j2ParameterizedTest.java +++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/Log4j2ParameterizedTest.java @@ -9,10 +9,8 @@ public class Log4j2ParameterizedTest { Logger logger = LogManager.getLogger(); long startTime; long endTime; - String testStr = "Welcome To eGovFrame"; - - + /** * 아래는 Log4j2에 추가된 Parameterized Logging의 성능을 비교하는 테스트 메소드 * logger: level=TRACE, appender=Console @@ -33,8 +31,7 @@ public void testParameterizedLogging() { logger.debug("## String Concatation 방식 시작시간: " + startTime); logger.debug("## String Concatation 방식 종료시간: " + endTime); logger.debug("## String Concatation 방식 소요시간: " + (endTime - startTime) / 1000.0f + "초"); - - + // Parameterized 방식으로 로깅 startTime = System.currentTimeMillis(); diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/util/LogFileUtil.java b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/util/LogFileUtil.java index b419ebf9..e9ef7ed0 100644 --- a/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/util/LogFileUtil.java +++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/java/org/egovframe/rte/fdl/logging/util/LogFileUtil.java @@ -10,30 +10,6 @@ public class LogFileUtil { public static String getLastLine(File logFile) throws Exception { return getTailLines(logFile, 1)[0]; - // // RandomAccessFile 을 사용하면 임의의 위치로 seek 하여 포인터를 이동할 수 있음, read 모드 - // RandomAccessFile file = new RandomAccessFile(logFile, "r"); - // long fileLength = file.length(); - // boolean isDummy = true; - // // 마지막 위치로 포인터 이동 - // file.seek(fileLength); - // // - // for (int i = 1; i <= fileLength; i++) { - // // 로그 파일의 마지막 라인에 dummy new line 이 들어있음 - // if (file.read() == '\n') { - // if (isDummy == true) { - // isDummy = false; - // // 거꾸로 scan 하며 두번째 뉴라인을 만나면 그 위치에서 readLine 을 하면 원하는 마지막 라인(데이터)임 - // } else { - // return file.readLine(); - // } - // } - // // 뉴라인을 만날때 까지 뒤에서 부터 한 바이트씩 늘려가며 포인터 이동. cf.) seek 는 파일시작지점부터의 - // offset 임에 유의 - // file.seek(fileLength - i); - // } - // // 위에서 최초 로그파일에 1행만 존재하는 경우 dummy 라인만 있고 그 위에 new line 이 없음. - // // 이 때는 파일 포인터가 파일 시작위치에 왔을 것이므로 그냥 readLine 하면 됨. - // return file.readLine(); } public static String[] getTailLines(File logFile, int paramLines) diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-aspect.xml b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-aspect.xml index d3729f5a..37cef111 100644 --- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-aspect.xml +++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-aspect.xml @@ -1,14 +1,14 @@ - - + diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-common.xml b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-common.xml index 92534f11..22ec8aaf 100644 --- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-common.xml +++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-common.xml @@ -1,10 +1,11 @@ - + diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-connectionFactory.xml b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-connectionFactory.xml index 997297e6..5438da70 100644 --- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-connectionFactory.xml +++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-connectionFactory.xml @@ -1,9 +1,10 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"> + diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-datasource.xml b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-datasource.xml index c5ab612b..c2567525 100644 --- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-datasource.xml +++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/context-datasource.xml @@ -1,23 +1,12 @@ - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:jdbc="http://www.springframework.org/schema/jdbc" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd + http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.3.xsd"> - + diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/jdbc.properties b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/jdbc.properties index c2dfeeb3..aaa2fa09 100644 --- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/jdbc.properties +++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/spring/jdbc.properties @@ -1,19 +1,7 @@ # JDBCAppender \ud14c\uc2a4\ud2b8\ub97c \uc704\ud55c \uc815\ubcf4 -#jdbc.driver=com.mysql.jdbc.Driver -#jdbc.dburl=jdbc:mysql://localhost:3306/dataaccess -#jdbc.username=dataaccess -#jdbc.password=dataaccess -#usingDBMS=mysql - jdbc.driver=org.hsqldb.jdbcDriver jdbc.dburl=jdbc:hsqldb:mem:testdb jdbc.username=sa jdbc.password= usingDBMS=hsqldb - -#jdbc.driver=oracle.jdbc.driver.OracleDriver -#jdbc.dburl=jdbc:oracle:thin:@db1:1521:egovfrm -#jdbc.username=rte -#jdbc.password=rte01 -#usingDBMS=oracle \ No newline at end of file diff --git a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/hsqldb.sql b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/hsqldb.sql index b9764a74..6d604ba5 100644 --- a/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/hsqldb.sql +++ b/Foundation/org.egovframe.rte.fdl.logging/src/test/resources/META-INF/testdata/dialect/hsqldb.sql @@ -4,6 +4,7 @@ -- It is intended for HSQLDB. DROP TABLE db_log IF EXISTS; +COMMIT; CREATE TABLE db_log ( eventDate timestamp NOT NULL, @@ -12,6 +13,4 @@ CREATE TABLE db_log ( message LONGVARCHAR, exception LONGVARCHAR ); - ---commit; - +COMMIT; diff --git a/Foundation/org.egovframe.rte.fdl.property/pom.xml b/Foundation/org.egovframe.rte.fdl.property/pom.xml index c47854cf..f8f9d37d 100644 --- a/Foundation/org.egovframe.rte.fdl.property/pom.xml +++ b/Foundation/org.egovframe.rte.fdl.property/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.fdl.property @@ -8,18 +8,20 @@ 4.0.0 org.egovframe.rte.fdl.property The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 + UTF-8 + UTF-8 @@ -85,7 +87,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -93,8 +95,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -136,6 +138,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -149,6 +152,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -165,6 +169,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -186,7 +191,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -196,7 +201,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -209,8 +214,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true @@ -220,30 +225,6 @@ - - org.apache.maven.plugins diff --git a/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/impl/EgovPropertyServiceImpl.java b/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/impl/EgovPropertyServiceImpl.java index a18b27b8..71581b93 100644 --- a/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/impl/EgovPropertyServiceImpl.java +++ b/Foundation/org.egovframe.rte.fdl.property/src/main/java/org/egovframe/rte/fdl/property/impl/EgovPropertyServiceImpl.java @@ -23,6 +23,7 @@ import java.util.Set; import java.util.Vector; +import org.apache.commons.collections.ExtendedProperties; import org.egovframe.rte.fdl.cmmn.exception.FdlException; import org.egovframe.rte.fdl.property.EgovPropertyService; diff --git a/Foundation/org.egovframe.rte.fdl.security/pom.xml b/Foundation/org.egovframe.rte.fdl.security/pom.xml index d545eff8..90c015f3 100644 --- a/Foundation/org.egovframe.rte.fdl.security/pom.xml +++ b/Foundation/org.egovframe.rte.fdl.security/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.fdl.security @@ -8,19 +8,21 @@ 4.0.0 org.egovframe.rte.fdl.security The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 + 5.4.6 4.0.0 - 5.2.3.RELEASE + UTF-8 + UTF-8 @@ -179,7 +181,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -187,8 +189,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -230,6 +232,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -243,6 +246,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -259,6 +263,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -280,7 +285,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -290,7 +295,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -303,8 +308,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true @@ -314,6 +319,7 @@ + org.apache.maven.plugins maven-javadoc-plugin diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/EgovSecurityHttp.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/EgovSecurityHttp.java index 399be455..df888a65 100644 --- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/EgovSecurityHttp.java +++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/EgovSecurityHttp.java @@ -77,7 +77,7 @@ public InputStreamResource getHttp( " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" + " xmlns:context=\"http://www.springframework.org/schema/context\"\n" + " xsi:schemaLocation=\"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd\n" + - " http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-5.2.xsd\n" + + " http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd\n" + " http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.3.xsd\n" + " http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd\">\n" + diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/SecurityConfig.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/SecurityConfig.java index 3ccda5db..7fac1795 100644 --- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/SecurityConfig.java +++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/config/SecurityConfig.java @@ -56,13 +56,14 @@ public class SecurityConfig { private boolean errorIfMaximumExceeded; private String defaultTargetUrl; private boolean alwaysUseDefaultTargetUrl; - private boolean supportPointcut; private boolean sniff; private String xframeOptions; private boolean xssProtection; private boolean cacheControl; private boolean csrf; private String csrfAccessDeniedUrl; + private boolean supportPointcut; + private boolean supportMethod; public String getLoginUrl() { return loginUrl; @@ -144,14 +145,6 @@ public void setHash(String hash) { this.hash = hash; } - public boolean isSupportPointcut() { - return supportPointcut; - } - - public void setSupportPointcut(boolean supportPointcut) { - this.supportPointcut = supportPointcut; - } - public int getConcurrentMaxSessons() { return concurrentMaxSessons; } @@ -244,4 +237,20 @@ public void setCsrfAccessDeniedUrl(String csrfAccessDeniedUrl) { this.csrfAccessDeniedUrl = csrfAccessDeniedUrl; } + public boolean isSupportPointcut() { + return supportPointcut; + } + + public void setSupportPointcut(boolean supportPointcut) { + this.supportPointcut = supportPointcut; + } + + public boolean isSupportMethod() { + return supportMethod; + } + + public void setSupportMethod(boolean supportMethod) { + this.supportMethod = supportMethod; + } + } diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/jdbc/EgovJdbcUserDetailsManager.java b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/jdbc/EgovJdbcUserDetailsManager.java index 5785272b..3530259f 100644 --- a/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/jdbc/EgovJdbcUserDetailsManager.java +++ b/Foundation/org.egovframe.rte.fdl.security/src/main/java/org/egovframe/rte/fdl/security/userdetails/jdbc/EgovJdbcUserDetailsManager.java @@ -61,9 +61,7 @@ public class EgovJdbcUserDetailsManager extends JdbcUserDetailsManager { private static final Logger LOGGER = LoggerFactory.getLogger(EgovJdbcUserDetailsManager.class); - private EgovUserDetails userDetails = null; private EgovUsersByUsernameMapping usersByUsernameMapping; - private String mapClass; private RoleHierarchy roleHierarchy = null; @@ -146,11 +144,11 @@ public EgovUserDetails loadUserByUsername(String username) throws UsernameNotFou } UserDetails obj = users.get(0); - this.userDetails = (EgovUserDetails) obj; + EgovUserDetails userDetails = (EgovUserDetails) obj; Set dbAuthsSet = new HashSet(); - dbAuthsSet.addAll(loadUserAuthorities(this.userDetails.getUsername())); + dbAuthsSet.addAll(loadUserAuthorities(userDetails.getUsername())); List dbAuths = new ArrayList(dbAuthsSet); - addCustomAuthorities(this.userDetails.getUsername(), dbAuths); + addCustomAuthorities(userDetails.getUsername(), dbAuths); if (dbAuths.size() == 0) { throw new UsernameNotFoundException(messages.getMessage("EgovJdbcUserDetailsManager.noAuthority", new Object[] { username }, "User {0} has no GrantedAuthority")); } @@ -159,9 +157,7 @@ public EgovUserDetails loadUserByUsername(String username) throws UsernameNotFou Collection authorities = roleHierarchy.getReachableGrantedAuthorities(dbAuths); // JdbcDaoImpl 클래스의 createUserDetails 메소드 재정의 - return new EgovUserDetails(this.userDetails.getUsername(), - this.userDetails.getPassword(), this.userDetails.isEnabled(), true, - true, true, authorities, this.userDetails.getEgovUserVO()); + return new EgovUserDetails(userDetails.getUsername(), userDetails.getPassword(), userDetails.isEnabled(), true, true, true, authorities, userDetails.getEgovUserVO()); } /** diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/resources/META-INF/spring/security/security-config.xml b/Foundation/org.egovframe.rte.fdl.security/src/main/resources/META-INF/spring/security/security-config.xml index 1651da9d..c9dea494 100644 --- a/Foundation/org.egovframe.rte.fdl.security/src/main/resources/META-INF/spring/security/security-config.xml +++ b/Foundation/org.egovframe.rte.fdl.security/src/main/resources/META-INF/spring/security/security-config.xml @@ -7,8 +7,6 @@ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - - diff --git a/Foundation/org.egovframe.rte.fdl.security/src/main/resources/org/egovframe/rte/fdl/security/messages/message-security_ko.properties b/Foundation/org.egovframe.rte.fdl.security/src/main/resources/org/egovframe/rte/fdl/security/messages/message-security_ko.properties index 69eae695..d27cdbee 100644 --- a/Foundation/org.egovframe.rte.fdl.security/src/main/resources/org/egovframe/rte/fdl/security/messages/message-security_ko.properties +++ b/Foundation/org.egovframe.rte.fdl.security/src/main/resources/org/egovframe/rte/fdl/security/messages/message-security_ko.properties @@ -1,12 +1,12 @@ -error.security.login=로그인 실패입니다. -error.security.login.solution=로그인 실패. 사용자 아이디를 등록하세요. -error.security.login.reason=로그인 실패. 사용자 아이디가 존재하지 않습니다. +error.security.login=\ub85c\uadf8\uc778 \uc2e4\ud328\uc785\ub2c8\ub2e4. +error.security.login.solution=\ub85c\uadf8\uc778 \uc2e4\ud328. \uc0ac\uc6a9\uc790 \uc544\uc774\ub514\ub97c \ub4f1\ub85d\ud558\uc138\uc694. +error.security.login.reason=\ub85c\uadf8\uc778 \uc2e4\ud328. \uc0ac\uc6a9\uc790 \uc544\uc774\ub514\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. -error.security.check.userid=데이터베이스에서 사용자를 읽는중 오류가 발생했습니다. -error.security.check.userid.solution=관리자에게 문의하세요. -error.security.check.userid.reason=DB가 미작동중인것 같습니다. +error.security.check.userid=\ub370\uc774\ud130\ubca0\uc774\uc2a4\uc5d0\uc11c \uc0ac\uc6a9\uc790\ub97c \uc77d\ub294\uc911 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4. +error.security.check.userid.solution=\uad00\ub9ac\uc790\uc5d0\uac8c \ubb38\uc758\ud558\uc138\uc694. +error.security.check.userid.reason=DB\uac00 \ubbf8\uc791\ub3d9\uc911\uc778\uac83 \uac19\uc2b5\ub2c8\ub2e4. -debug.security.data.userid=[DBAuthenticator] 사용자 아이디는 {0} 입니다. -debug.security.data.password=[DBAuthenticator] 비밀번호는 {0} 입니다. +debug.security.data.userid=[DBAuthenticator] \uc0ac\uc6a9\uc790 \uc544\uc774\ub514\ub294 {0} \uc785\ub2c8\ub2e4. +debug.security.data.password=[DBAuthenticator] \ube44\ubc00\ubc88\ud638\ub294 {0} \uc785\ub2c8\ub2e4. -info.security.data.sql=[DBAuthenticator] SQL 쿼리는 {0} 입니다. +info.security.data.sql=[DBAuthenticator] SQL \ucffc\ub9ac\ub294 {0} \uc785\ub2c8\ub2e4. diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/EgovSecurityConfigTest.java b/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/EgovSecurityConfigTest.java index c26c681e..5db3c990 100644 --- a/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/EgovSecurityConfigTest.java +++ b/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/EgovSecurityConfigTest.java @@ -55,16 +55,12 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.jdbc.JdbcTestUtils; - /** * @author sjyoon * */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { - "classpath*:META-INF/spring/context-common.xml", - "classpath*:META-INF/spring/context-datasource-jdbc.xml" - }) +@ContextConfiguration(locations = {"classpath:META-INF/spring/context-common.xml", "classpath:META-INF/spring/context-datasource-jdbc.xml"}) public class EgovSecurityConfigTest { private static final Logger LOGGER = LoggerFactory.getLogger(EgovSecurityConfigTest.class); @@ -80,7 +76,6 @@ public class EgovSecurityConfigTest { @Resource(name = "jdbcProperties") private Properties jdbcProperties; - @Before public void onSetUp() throws Exception { LOGGER.debug("###### EgovSecurityConfigTest.onSetUp START ######"); @@ -94,13 +89,12 @@ public void onSetUp() throws Exception { // 테이블 생성 후 테스트를 위하여 여기서 처리 context = new ClassPathXmlApplicationContext( new String[] { - "classpath*:META-INF/spring/context-common.xml", - "classpath*:META-INF/spring/context-datasource-jdbc.xml", - "classpath*:META-INF/spring/config-context.xml", + "classpath:/META-INF/spring/context-common.xml", + "classpath:/META-INF/spring/context-datasource-jdbc.xml", + "classpath:/META-INF/spring/config-context.xml" }); LOGGER.debug("###### EgovSecurityConfigTest.onSetUp END ######"); - } @After @@ -156,9 +150,8 @@ public void testBeanList() { @Test public void testGetSecurityFilter() { - LogoutFilter logout = getSecurityFilter(LogoutFilter.class); - - assertNotNull(logout); + LogoutFilter logout = getSecurityFilter(LogoutFilter.class); + assertNotNull(logout); } /** @@ -204,13 +197,11 @@ public void testAllowAccessForAuthorizedUser() throws Exception { */ @Test(expected=BadCredentialsException.class) public void testRejectAccessForUnauthorizedUser() throws Exception { - - UsernamePasswordAuthenticationToken login = new UsernamePasswordAuthenticationToken("jimi", "wrongpw"); + UsernamePasswordAuthenticationToken login = new UsernamePasswordAuthenticationToken("jimi", "wrongpw"); AuthenticationManager authManager = (AuthenticationManager) context.getBean(BeanIds.AUTHENTICATION_MANAGER); LOGGER.debug("### jimi's password is wrong!!"); - SecurityContextHolder.getContext().setAuthentication(authManager.authenticate(login)); - + SecurityContextHolder.getContext().setAuthentication(authManager.authenticate(login)); } /** @@ -219,7 +210,6 @@ public void testRejectAccessForUnauthorizedUser() throws Exception { */ @Test public void testMethodAndRoleMapping() throws Exception { - DelegatingMethodSecurityMetadataSource definitionsource = (DelegatingMethodSecurityMetadataSource) context.getBean("delegatingMethodSecurityMetadataSource"); Method method = null; Collection role = null; @@ -235,7 +225,6 @@ public void testMethodAndRoleMapping() throws Exception { assertEquals("ROLE_USER", role.toArray()[0].toString()); LOGGER.debug("## testMethodAndRoleMapping : {} is {}", method.getName(), role.toArray()[0].toString()); - } /** @@ -244,7 +233,6 @@ public void testMethodAndRoleMapping() throws Exception { */ @Test public void testFailedMethodAndRoleMapping() throws Exception { - DelegatingMethodSecurityMetadataSource definitionsource = (DelegatingMethodSecurityMetadataSource) context.getBean("delegatingMethodSecurityMetadataSource"); Method method = null; Collection role = null; @@ -269,7 +257,6 @@ public void testFailedMethodAndRoleMapping() throws Exception { */ @Test public void testURLAndRoleMapping() throws Exception { - FilterSecurityInterceptor interceptor = (FilterSecurityInterceptor) context.getBean("filterSecurityInterceptor"); FilterInvocationSecurityMetadataSource definitionsource = interceptor.getSecurityMetadataSource(); @@ -300,7 +287,6 @@ public void testURLAndRoleMapping() throws Exception { LOGGER.debug("### Pattern Matched url size is {} and Roles are {}", attrs.size(), attrs); assertTrue(attrs.contains(new SecurityConfig("ROLE_RESTRICTED"))); - } /** @@ -325,7 +311,6 @@ public void testFailedURLAndRoleMapping() throws Exception { LOGGER.debug("### Pattern Matched url is none"); assertNull(attrs); - } @@ -335,7 +320,6 @@ public void testFailedURLAndRoleMapping() throws Exception { */ @Test public void testSuccessfulUrlInvocation() throws Exception { - final String loginPage = "/cvpl/EgovCvplLogin.do"; FilterChainProxy filterChainProxy = (FilterChainProxy) context.getBean(BeanIds.SPRING_SECURITY_FILTER_CHAIN); @@ -358,8 +342,6 @@ public void testSuccessfulUrlInvocation() throws Exception { LOGGER.debug("### getErrorMessage {}", response.getErrorMessage()); LOGGER.debug("### getContentAsString {}", response.getContentAsString()); - - ///////////// request = new MockHttpServletRequest(); request.setMethod("GET"); request.setServletPath("/sale/index.do"); @@ -374,7 +356,6 @@ public void testSuccessfulUrlInvocation() throws Exception { LOGGER.debug("### getIncludedUrl {}", response.getIncludedUrl()); LOGGER.debug("### getErrorMessage {}", response.getErrorMessage()); LOGGER.debug("### getContentAsString {}", response.getContentAsString()); - } /** @@ -383,13 +364,8 @@ public void testSuccessfulUrlInvocation() throws Exception { */ @Test public void testFailureUrlInvocation() throws Exception { - - //final String loginPage = "/cvpl/EgovCvplLogin.do"; - FilterChainProxy filterChainProxy = (FilterChainProxy) context.getBean(BeanIds.FILTER_CHAIN_PROXY); - - //////////////// MockHttpServletRequest request = new MockHttpServletRequest(); request.setMethod("GET"); request.setServletPath("/index.do"); @@ -402,8 +378,6 @@ public void testFailureUrlInvocation() throws Exception { assertNull(response.getRedirectedUrl()); LOGGER.debug("### getRedirectedUrl is null"); - - //////////////// request = new MockHttpServletRequest(); request.setMethod("GET"); request.setServletPath("/sale/index.doit"); @@ -415,7 +389,6 @@ public void testFailureUrlInvocation() throws Exception { assertNull(response.getRedirectedUrl()); LOGGER.debug("### getRedirectedUrl is null"); - } /** @@ -424,7 +397,6 @@ public void testFailureUrlInvocation() throws Exception { */ @Test public void testUserDetailsExt() throws Exception { - // 인증되지 않은 사용자 체크 Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); assertFalse(isAuthenticated.booleanValue()); @@ -466,7 +438,6 @@ public void testUserDetailsExt() throws Exception { isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); assertTrue(isAuthenticated.booleanValue()); - // ID : test user = (EgovUserDetailsVO)EgovUserDetailsHelper.getAuthenticatedUser(); @@ -487,7 +458,6 @@ public void testUserDetailsExt() throws Exception { isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); assertTrue(isAuthenticated.booleanValue()); - // ID : test user = (EgovUserDetailsVO)EgovUserDetailsHelper.getAuthenticatedUser(); @@ -516,7 +486,6 @@ public void testUserDetailsExt() throws Exception { assertEquals("19701231", user.getBirthDay()); assertEquals("1234567890123", user.getSsn()); LOGGER.debug("### testUserDetailsExt 사용자 : {}", user.getUserId()); - } /** @@ -543,7 +512,6 @@ public void testAuthoritiesAndRoleHierarchy() throws Exception { assertTrue(authorities.contains("IS_AUTHENTICATED_FULLY")); assertTrue(authorities.contains("IS_AUTHENTICATED_REMEMBERED")); - // 2. authorites 에 ROLE 이 여러개 설정된 경우 for (Iterator it = authorities.iterator(); it.hasNext();) { String auth = it.next(); @@ -554,7 +522,6 @@ public void testAuthoritiesAndRoleHierarchy() throws Exception { String auth = (String) authorities.toArray()[0]; LOGGER.debug("########### user ROLE is {}", auth); - // buyer USER : ROLE_RESTRICTED login = new UsernamePasswordAuthenticationToken("buyer", "buyer"); authManager = (AuthenticationManager) context.getBean(BeanIds.AUTHENTICATION_MANAGER); @@ -595,4 +562,3 @@ public void testAuthoritiesAndRoleHierarchy() throws Exception { } } - diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/userdetails/CamelCaseUtilTest.java b/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/userdetails/CamelCaseUtilTest.java new file mode 100644 index 00000000..6edea882 --- /dev/null +++ b/Foundation/org.egovframe.rte.fdl.security/src/test/java/org/egovframe/rte/fdl/security/userdetails/CamelCaseUtilTest.java @@ -0,0 +1,19 @@ +package org.egovframe.rte.fdl.security.userdetails; + +import static org.junit.Assert.*; + +import org.egovframe.rte.fdl.security.userdetails.util.CamelCaseUtil; +import org.junit.Test; + +public class CamelCaseUtilTest { + + @Test + public void convert2CamelCase() { + assertEquals("repoNameEgovframeRuntime", CamelCaseUtil.convert2CamelCase("REPO_NAME_egovframe_Runtime")); + assertEquals("column1", CamelCaseUtil.convert2CamelCase("column1")); + assertEquals("column1", CamelCaseUtil.convert2CamelCase("column_1")); + assertEquals("column1Test", CamelCaseUtil.convert2CamelCase("column_1_test")); + assertEquals("Column1Test", CamelCaseUtil.convert2CamelCase("_column_1_test_")); + } + +} diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/config-context.xml b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/config-context.xml index ec857d0d..607a44fc 100644 --- a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/config-context.xml +++ b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/config-context.xml @@ -1,10 +1,11 @@ - + http://maven.egovframe.go.kr/schema/egov-security https://maven.egovframe.go.kr/schema/egov-security/egov-security-4.0.0.xsd"> @@ -26,8 +27,6 @@ hash="md5" /> - + diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-common.xml b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-common.xml index 02e6fa5b..edec6dcd 100644 --- a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-common.xml +++ b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-common.xml @@ -1,11 +1,11 @@ - + diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-datasource-jdbc.xml b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-datasource-jdbc.xml index 73c530d4..86947d14 100644 --- a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-datasource-jdbc.xml +++ b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-datasource-jdbc.xml @@ -1,19 +1,13 @@ - + - diff --git a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-security.xml b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-security.xml index 01523691..e78bed2c 100644 --- a/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-security.xml +++ b/Foundation/org.egovframe.rte.fdl.security/src/test/resources/META-INF/spring/context-security.xml @@ -1,8 +1,9 @@ - + @@ -11,47 +12,8 @@ - - - @@ -82,7 +84,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -90,8 +92,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -133,6 +135,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -146,6 +149,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -162,6 +166,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -170,8 +175,6 @@ maven-javadoc-plugin 3.1.1 - private - true 1.8 -Xdoclint:none @@ -185,7 +188,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -195,7 +198,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -208,8 +211,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true @@ -219,30 +222,6 @@ - - org.apache.maven.plugins diff --git a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovObjectUtil.java b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovObjectUtil.java index 6884d3f2..2cffb4ce 100644 --- a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovObjectUtil.java +++ b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovObjectUtil.java @@ -135,7 +135,7 @@ public static Object instantiate(String className, String[] types, Object[] valu * @return Null인경우 true / Null이 아닌경우 false */ public static boolean isNull(Object object) { - return ((object == null) || object.equals(null)); + return (object == null) ? true : false; } } diff --git a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovStringUtil.java b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovStringUtil.java index 4e9f8398..461cfe25 100644 --- a/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovStringUtil.java +++ b/Foundation/org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovStringUtil.java @@ -15,7 +15,6 @@ */ package org.egovframe.rte.fdl.string; -import java.io.IOException; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovStringUtilTest.java b/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovStringUtilTest.java index e6eb345c..675246a5 100644 --- a/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovStringUtilTest.java +++ b/Foundation/org.egovframe.rte.fdl.string/src/test/java/org/egovframe/rte/fdl/string/EgovStringUtilTest.java @@ -43,7 +43,6 @@ public void testPatternMatch() throws Exception { @Test public void testToSubString() throws Exception { String source = "substring test"; - assertEquals("test", EgovStringUtil.toSubString(source, 10)); assertEquals("string", EgovStringUtil.toSubString(source, 3, 9)); } @@ -55,7 +54,6 @@ public void testToSubString() throws Exception { @Test public void testStringTrim() throws Exception { String str = " substring "; - assertEquals("substring", EgovStringUtil.trim(str)); assertEquals("substring ", EgovStringUtil.ltrim(str)); assertEquals(" substring", EgovStringUtil.rtrim(str)); @@ -67,10 +65,8 @@ public void testStringTrim() throws Exception { */ @Test public void testConcatenate() throws Exception { - String str1 = "substring"; String str2 = "test"; - assertEquals("substringtest", EgovStringUtil.concat(str1, str2)); } @@ -83,19 +79,19 @@ public void testFindPattern() throws Exception { String pattern = "\\d{4}-\\d{1,2}-\\d{1,2}"; // 일치하는 pattern 을 찾는다. - Matcher matcher = Pattern.compile(pattern).matcher("2009-02-03"); - assertTrue(matcher.find()); - assertTrue(matcher.matches()); + Matcher matcher = Pattern.compile(pattern).matcher("2009-02-03"); + assertTrue(matcher.find()); + assertTrue(matcher.matches()); - // 일치하는 pattern 을 찾는다. - matcher = Pattern.compile(pattern).matcher("abcdef2009-02-03abcdef"); - assertTrue(matcher.find()); - assertFalse(matcher.matches()); + // 일치하는 pattern 을 찾는다. + matcher = Pattern.compile(pattern).matcher("abcdef2009-02-03abcdef"); + assertTrue(matcher.find()); + assertFalse(matcher.matches()); - // 일치하는 pattern 을 찾지 못한다. - matcher = Pattern.compile(pattern).matcher("abcdef2009-02-A3abcdef"); - assertFalse(matcher.find()); - assertFalse(matcher.matches()); + // 일치하는 pattern 을 찾지 못한다. + matcher = Pattern.compile(pattern).matcher("abcdef2009-02-A3abcdef"); + assertFalse(matcher.find()); + assertFalse(matcher.matches()); } /** @@ -164,17 +160,13 @@ public void testIsAlphaNumeric() throws Exception { @Test public void testNull2void() throws Exception { String source = null; - assertEquals("", EgovStringUtil.null2void(source)); - source = " "; assertEquals("", EgovStringUtil.null2void(source)); - source = ""; assertEquals("", EgovStringUtil.null2void(source)); } - /** * 다양한 형식의 string을 다른 형식으로 변환한다. * 다양한 형식의 데이터를 String 형식으로 변환한다. @@ -219,22 +211,17 @@ public void testNull2string1() throws Exception { assertEquals("", EgovStringUtil.null2string(string, "")); } - public void testEquals(String source, String target) throws Exception { EgovStringUtil.equals(source, target); } - - public void testSearch() throws Exception { String source = "substring test"; String target = "test"; int count = 1; - assertEquals(count, EgovStringUtil.search(source, target)); } - /** * @throws Exception */ @@ -243,24 +230,15 @@ public void testLPad() throws Exception { String source = "test "; int i = 10; char c = 'a'; - String result = EgovStringUtil.lPad(source, i, c); - assertEquals("aaaaatest ", result); - result = EgovStringUtil.lPad(source, i, c, true); assertEquals("aaaaaatest", result); - - source = " test"; - result = EgovStringUtil.rPad(source, i, c); - assertEquals(" testaaaaa", result); result = EgovStringUtil.rPad(source, i, c, true); - assertEquals("testaaaaaa", result); - } /** @@ -293,54 +271,11 @@ public void testAlignString() throws Exception { assertEquals("align", result); assertEquals(i, result.length()); } - /* - public void testAlignLeft() throws Exception { - String source; - int i; - boolean b; - - EgovStringUtil.alignLeft(source, i, b); - } - - public void testAlignRight() throws Exception { - String source; - int i; - - EgovStringUtil.alignRight(source, i); - } - - public void testAlignRight() throws Exception { - String source; - int i; - boolean b; - EgovStringUtil.alignRight(source, i, b); - } - - public void testAlignCenter() throws Exception { - String source; - int i; - - EgovStringUtil.alignCenter(source, i); - } - - public void testAlignCenter() throws Exception { - String source; - int i; - boolean b; - - EgovStringUtil.alignCenter(source, i, b); - } - - public void testCapitalize() throws Exception { - String source; - - EgovStringUtil.capitalize(source); - } -*/ /** * @throws Exception */ + @Test public void testEncodePassword() throws Exception { // 1. try to encode password and compare String encoded1 = EgovStringUtil.encodePassword("password", "MD5"); @@ -377,6 +312,7 @@ public void testDecodeString() throws Exception { /** * @throws Exception */ + @Test public void testSwapFirstLetterCase() throws Exception { // 1. In case, first letter is small letter. try to swap. String swapped = EgovStringUtil.swapFirstLetterCase("password"); @@ -389,6 +325,7 @@ public void testSwapFirstLetterCase() throws Exception { /** * @throws Exception */ + @Test public void testTrim() throws Exception { // 1. try to trim when trimmed string is 'trim' String trimmed = EgovStringUtil.trim("passwordtrimpassword", "trim"); @@ -401,11 +338,11 @@ public void testTrim() throws Exception { /** * @throws Exception */ + @Test public void testGetLastString() throws Exception { // 1. get last string when token is ',' String trimmed = EgovStringUtil.getLastString("password,password", ","); assertEquals("password", trimmed); - // 2. get last string when original doesn't have token. trimmed = EgovStringUtil.getLastString("password,password", "*"); assertEquals("password,password", trimmed); @@ -414,6 +351,7 @@ public void testGetLastString() throws Exception { /** * @throws Exception */ + @Test public void testGetStringArray() throws Exception { // 1. when original string has token, get string array. String[] strings = EgovStringUtil.getStringArray("password,password", ","); @@ -426,6 +364,7 @@ public void testGetStringArray() throws Exception { /** * @throws Exception */ + @Test public void testIsNotEmpty() throws Exception { // 1. check which string is not empty or not assertTrue(EgovStringUtil.isNotEmpty("passwordtrimpassword")); @@ -434,6 +373,7 @@ public void testIsNotEmpty() throws Exception { /** * @throws Exception */ + @Test public void testIsEmpty() throws Exception { // 1. check empty string assertTrue(EgovStringUtil.isEmpty("")); @@ -444,6 +384,7 @@ public void testIsEmpty() throws Exception { /** * @throws Exception */ + @Test public void testReplace() throws Exception { // 1. try to replace ',' to '-' String replaced = EgovStringUtil.replace("password,password", ",", "-"); @@ -454,20 +395,20 @@ public void testReplace() throws Exception { * converts the string representation of a * number to integer type * - public void testString2integer() { - // 1. converts the string representation of a number to integer type - assertEquals(1, StringUtil.string2integer("1")); - } + public void testString2integer() { + // 1. converts the string representation of a number to integer type + assertEquals(1, StringUtil.string2integer("1")); + } - /** + /** * converts integer type to String * - public void testInteger2string() { - // 1. converts integer type to String - assertEquals("1", StringUtil.integer2string(1)); - } + public void testInteger2string() { + // 1. converts integer type to String + assertEquals("1", StringUtil.integer2string(1)); + } - /** + /** * check that str matches the pattern * string * @@ -487,6 +428,7 @@ public void testIsPatternMatching() throws Exception { /** * @throws Exception */ + @Test public void testContainsMaxSequence() throws Exception { // 1. string contains 2 sequences of the same character String str = "password"; @@ -508,6 +450,7 @@ public void testContainsMaxSequence() throws Exception { /** * @throws Exception */ + @Test public void testContainsInvalidChars() throws Exception { // 1. string is empty. String str = ""; @@ -529,49 +472,50 @@ public void testContainsInvalidChars() throws Exception { * [Flow #-16] Positive, Negative Case : check that String contains only * unicode letters or digits * - public void testIsAlphaNumeric() { - // 1. string is empty - String str = ""; - assertTrue(!StringUtil.isAlphaNumeric(str)); - // 2. string is null - str = null; - assertTrue(!StringUtil.isAlphaNumeric(str)); - // 3. strigng consist of only alphabet - str = "abc"; - assertTrue(StringUtil.isAlphaNumeric(str)); - // 4. string has a special character - str = "a-bc"; - assertTrue(!StringUtil.isAlphaNumeric(str)); - // 5. strigng consist of alphabet and number - str = "abc4"; - assertTrue(StringUtil.isAlphaNumeric(str)); - } - - /** + public void testIsAlphaNumeric() { + // 1. string is empty + String str = ""; + assertTrue(!StringUtil.isAlphaNumeric(str)); + // 2. string is null + str = null; + assertTrue(!StringUtil.isAlphaNumeric(str)); + // 3. strigng consist of only alphabet + str = "abc"; + assertTrue(StringUtil.isAlphaNumeric(str)); + // 4. string has a special character + str = "a-bc"; + assertTrue(!StringUtil.isAlphaNumeric(str)); + // 5. strigng consist of alphabet and number + str = "abc4"; + assertTrue(StringUtil.isAlphaNumeric(str)); + } + + /** * [Flow #-17] Positive, Negative Case : check that String contains only * unicode letters * - public void testIsAlpha() { - // 1. string is empty - String str = ""; - assertTrue(!StringUtil.isAlpha(str)); - // 2. string is null - str = null; - assertTrue(!StringUtil.isAlpha(str)); - // 3. strigng consist of only alphabet - str = "abc"; - assertTrue(StringUtil.isAlpha(str)); - // 4. string has a special character - str = "a-bc"; - assertTrue(!StringUtil.isAlpha(str)); - // 5. strigng consist of alphabet and number - str = "abc4"; - assertTrue(!StringUtil.isAlpha(str)); - } -*/ + public void testIsAlpha() { + // 1. string is empty + String str = ""; + assertTrue(!StringUtil.isAlpha(str)); + // 2. string is null + str = null; + assertTrue(!StringUtil.isAlpha(str)); + // 3. strigng consist of only alphabet + str = "abc"; + assertTrue(StringUtil.isAlpha(str)); + // 4. string has a special character + str = "a-bc"; + assertTrue(!StringUtil.isAlpha(str)); + // 5. strigng consist of alphabet and number + str = "abc4"; + assertTrue(!StringUtil.isAlpha(str)); + } + */ /** * @throws Exception */ + @Test public void testIsNumeric() throws Exception { // 1. string is empty String str = ""; @@ -596,6 +540,7 @@ public void testIsNumeric() throws Exception { /** * @throws Exception */ + @Test public void testReverse() throws Exception { // 1. string is null String str = null; @@ -608,30 +553,28 @@ public void testReverse() throws Exception { /** * @throws Exception */ + @Test public void testFillString() throws Exception { String originalStr = "1"; char ch = '0'; int cipers = 6; assertEquals("000001", EgovStringUtil.fillString(originalStr, ch, cipers)); - originalStr = "12345"; cipers = 4; assertNull(EgovStringUtil.fillString(originalStr, ch, cipers)); - } /** * @throws Exception */ + @Test public void testIsEmptyTrimmed() throws Exception { // 1. string is null String str = null; assertTrue(EgovStringUtil.isEmptyTrimmed(str)); - // 2. string is empty string str = " "; assertTrue(EgovStringUtil.isEmptyTrimmed(str)); - // 3. string is not empty string str = "not empty"; assertFalse(EgovStringUtil.isEmptyTrimmed(str)); @@ -640,13 +583,12 @@ public void testIsEmptyTrimmed() throws Exception { /** * @throws Exception */ + @Test public void testGetTokens() throws Exception { // 1. original string String str = "a,b,c,d"; - // 2. get token list assertEquals(4, EgovStringUtil.getTokens(str).size()); } - } diff --git a/Foundation/org.egovframe.rte.fdl.xml/pom.xml b/Foundation/org.egovframe.rte.fdl.xml/pom.xml index d444c6d8..9ae709fa 100644 --- a/Foundation/org.egovframe.rte.fdl.xml/pom.xml +++ b/Foundation/org.egovframe.rte.fdl.xml/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.fdl.xml @@ -8,18 +8,20 @@ 4.0.0 org.egovframe.rte.fdl.xml The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 + UTF-8 + UTF-8 @@ -70,9 +72,9 @@ - net.sf.ehcache.internal - ehcache-core - 2.10.6 + net.sf.ehcache + ehcache + 2.10.9.2 test @@ -81,12 +83,6 @@ - - net.sf.ehcache - ehcache-terracotta - 2.1.1 - test - jaxen jaxen @@ -104,7 +100,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -112,8 +108,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -122,12 +118,12 @@ hibernate3-maven-plugin 3.0 - - - hbm2ddl - annotationconfiguration - - + + + hbm2ddl + annotationconfiguration + + @@ -155,6 +151,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -168,6 +165,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -184,6 +182,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -205,7 +204,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -215,7 +214,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -228,8 +227,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true @@ -239,30 +238,6 @@ - - org.apache.maven.plugins diff --git a/Integration/org.egovframe.rte.itl.integration/pom.xml b/Integration/org.egovframe.rte.itl.integration/pom.xml index d38a5b23..37220ef2 100644 --- a/Integration/org.egovframe.rte.itl.integration/pom.xml +++ b/Integration/org.egovframe.rte.itl.integration/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.itl.integration @@ -8,18 +8,20 @@ 4.0.0 org.egovframe.rte.itl.integration The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 + UTF-8 + UTF-8 @@ -121,7 +123,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -129,8 +131,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -172,6 +174,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -185,6 +188,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -201,6 +205,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -222,7 +227,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -232,7 +237,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -245,8 +250,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true diff --git a/Integration/org.egovframe.rte.itl.integration/src/test/resources/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml b/Integration/org.egovframe.rte.itl.integration/src/test/resources/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml index a90f0f8c..9972aa83 100644 --- a/Integration/org.egovframe.rte.itl.integration/src/test/resources/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml +++ b/Integration/org.egovframe.rte.itl.integration/src/test/resources/org/egovframe/rte/itl/integration/metadata/dao/hibernate/context.xml @@ -26,7 +26,7 @@ - @@ -246,7 +251,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -256,7 +261,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -269,8 +274,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true diff --git a/Integration/org.egovframe.rte.itl.webservice/src/test/resources/org/egovframe/rte/itl/webservice/data/dao/hibernate/context.xml b/Integration/org.egovframe.rte.itl.webservice/src/test/resources/org/egovframe/rte/itl/webservice/data/dao/hibernate/context.xml index 0cb8f8c1..b4173b8c 100644 --- a/Integration/org.egovframe.rte.itl.webservice/src/test/resources/org/egovframe/rte/itl/webservice/data/dao/hibernate/context.xml +++ b/Integration/org.egovframe.rte.itl.webservice/src/test/resources/org/egovframe/rte/itl/webservice/data/dao/hibernate/context.xml @@ -13,7 +13,7 @@ - + diff --git a/Persistence/org.egovframe.rte.psl.data.jpa/pom.xml b/Persistence/org.egovframe.rte.psl.data.jpa/pom.xml index 4a17bfb7..657bc4ac 100644 --- a/Persistence/org.egovframe.rte.psl.data.jpa/pom.xml +++ b/Persistence/org.egovframe.rte.psl.data.jpa/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.psl.data.jpa @@ -8,18 +8,20 @@ 4.0.0 org.egovframe.rte.psl.data.jpa The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 + UTF-8 + UTF-8 @@ -122,48 +124,21 @@ mysql mysql-connector-java - 8.0.19 + 5.1.31 test - commons-dbcp - commons-dbcp - 1.4 + org.apache.commons + commons-dbcp2 + 2.4.0 test - install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -171,8 +146,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -214,6 +189,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -227,6 +203,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -243,6 +220,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -255,14 +233,6 @@ -Xdoclint:none - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - @@ -272,7 +242,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -282,7 +252,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -295,8 +265,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/pom.xml b/Persistence/org.egovframe.rte.psl.data.mongodb/pom.xml index de57d74d..60b12c3f 100644 --- a/Persistence/org.egovframe.rte.psl.data.mongodb/pom.xml +++ b/Persistence/org.egovframe.rte.psl.data.mongodb/pom.xml @@ -1,24 +1,27 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.psl.data.mongodb jar 4.0.0 + org.egovframe.rte.psl.data.mongodb The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 + UTF-8 + UTF-8 @@ -27,35 +30,30 @@ org.egovframe.rte.fdl.cmmn ${org.egovframe.rte.version} - - org.mongodb - mongo-java-driver - 3.11.2 - org.springframework.data spring-data-mongodb 2.2.3.RELEASE - spring-core org.springframework + spring-core - spring-expression org.springframework + spring-expression - spring-beans org.springframework + spring-beans - spring-context org.springframework + spring-context - spring-tx org.springframework + spring-tx org.slf4j @@ -103,7 +101,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -111,8 +109,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -154,6 +152,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -167,6 +166,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -183,6 +183,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -204,7 +205,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -214,7 +215,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -227,8 +228,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true @@ -238,30 +239,6 @@ - - org.apache.maven.plugins diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAnonymousTest.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAnonymousTest.java index 673687c5..2d4721f6 100644 --- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAnonymousTest.java +++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAnonymousTest.java @@ -3,17 +3,14 @@ import static org.junit.Assert.assertEquals; import static org.springframework.data.mongodb.core.query.Criteria.where; -import com.mongodb.MongoClient; - import java.net.UnknownHostException; - +import com.mongodb.MongoClient; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.mongodb.MongoTransactionManager; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Query; @@ -24,6 +21,7 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath*:META-INF/spring/context-common.xml") public class MongoOperationsAnonymousTest { + private static final Logger LOGGER = LoggerFactory.getLogger(MongoOperationsAnonymousTest.class); @Value("#{mongo['mongo.host']}") @@ -46,4 +44,5 @@ public void testBasicOperations() throws UnknownHostException { assertEquals("Joe", person.getName()); mongoOps.dropCollection("person"); } + } diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAuthTest.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAuthTest.java index b6f873b0..f623008f 100644 --- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAuthTest.java +++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoOperationsAuthTest.java @@ -20,6 +20,7 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:/META-INF/spring/context-data-*.xml") public class MongoOperationsAuthTest { + private static final Logger LOGGER = LoggerFactory.getLogger(MongoOperationsAuthTest.class); @Resource(name = "mongoTemplate") @@ -37,4 +38,5 @@ public void testBasicOperations() throws UnknownHostException { assertEquals("Joe", person.getName()); mongoOps.dropCollection("person"); } + } diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoTemplateTest.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoTemplateTest.java index 8aadee57..f9414d6c 100644 --- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoTemplateTest.java +++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/MongoTemplateTest.java @@ -20,6 +20,7 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath*:META-INF/spring/context-data-*.xml") public class MongoTemplateTest { + private static final Logger LOGGER = LoggerFactory.getLogger(MongoTemplateTest.class); @Resource(name = "mongoTemplate") @@ -55,4 +56,5 @@ public void testBasicOperations() { mongoTemplate.dropCollection("person"); } + } diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/PersonRepositoryTest.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/PersonRepositoryTest.java index f81f52a6..fb3c3d05 100644 --- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/PersonRepositoryTest.java +++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/PersonRepositoryTest.java @@ -29,6 +29,7 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath*:META-INF/spring/context-data-*.xml") public class PersonRepositoryTest { + private static final Logger LOGGER = LoggerFactory.getLogger(PersonRepositoryTest.class); @Autowired @@ -121,4 +122,5 @@ public void testQueryAnnotation() { List list = repository.findByThePersonsFirstname("Gildong"); assertEquals(1, list.size()); } + } diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Address.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Address.java index 6da8b3f0..c79cc66f 100644 --- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Address.java +++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Address.java @@ -1,8 +1,8 @@ package org.egovframe.rte.psl.data.mongodb.domain; public class Address { + private String zipCode; - private String address; public String getZipCode() { @@ -20,4 +20,5 @@ public String getAddress() { public void setAddress(String address) { this.address = address; } + } diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Person.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Person.java index a3f7e3b9..84dadfa9 100644 --- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Person.java +++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/Person.java @@ -3,15 +3,12 @@ import org.springframework.data.annotation.Id; public class Person { + @Id private String id; - private String firstname; - private String lastname; - private Address address; - private double[] location; @Override @@ -63,4 +60,5 @@ public double[] getLocation() { public void setLocation(double[] location) { this.location = location; } + } diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/SimplePerson.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/SimplePerson.java index 40781851..97acdfbd 100644 --- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/SimplePerson.java +++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/domain/SimplePerson.java @@ -1,6 +1,7 @@ package org.egovframe.rte.psl.data.mongodb.domain; public class SimplePerson { + private String id; private String name; private int age; @@ -26,4 +27,5 @@ public int getAge() { public String toString() { return "Person [id=" + id + ", name=" + name + ", age=" + age + "]"; } + } diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/repository/PersonRepository.java b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/repository/PersonRepository.java index c613a118..567ebcfc 100644 --- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/repository/PersonRepository.java +++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/java/org/egovframe/rte/psl/data/mongodb/repository/PersonRepository.java @@ -13,6 +13,7 @@ import org.springframework.data.mongodb.repository.Query; public interface PersonRepository extends MongoRepository { + // Query methods List findByLastname(String lastname); @@ -31,4 +32,5 @@ public interface PersonRepository extends MongoRepository { // JSON based query methods @Query("{ 'firstname' : ?0 }") List findByThePersonsFirstname(String firstname); + } diff --git a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/resources/META-INF/spring/context-data-mongodb.xml b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/resources/META-INF/spring/context-data-mongodb.xml index 53c28563..cdd31e30 100644 --- a/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/resources/META-INF/spring/context-data-mongodb.xml +++ b/Persistence/org.egovframe.rte.psl.data.mongodb/src/test/resources/META-INF/spring/context-data-mongodb.xml @@ -5,18 +5,13 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd"> - - + - + - + diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/pom.xml b/Persistence/org.egovframe.rte.psl.dataaccess/pom.xml index e85d2c13..d51448ec 100644 --- a/Persistence/org.egovframe.rte.psl.dataaccess/pom.xml +++ b/Persistence/org.egovframe.rte.psl.dataaccess/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.psl.dataaccess @@ -8,18 +8,20 @@ 4.0.0 org.egovframe.rte.psl.dataaccess The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 + UTF-8 + UTF-8 @@ -109,13 +111,13 @@ org.apache.commons commons-lang3 - 3.9 + 3.10 test - commons-dbcp - commons-dbcp - 1.4 + org.apache.commons + commons-dbcp2 + 2.4.0 test @@ -146,7 +148,7 @@ mysql mysql-connector-java - 8.0.19 + 5.1.31 test --> @@ -188,7 +190,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -196,8 +198,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -239,6 +241,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -252,6 +255,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -268,6 +272,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -289,7 +294,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -299,7 +304,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -312,8 +317,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true @@ -323,30 +328,6 @@ - - org.apache.maven.plugins diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/TestBase.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/TestBase.java index 0a554a7b..83df5873 100644 --- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/TestBase.java +++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/TestBase.java @@ -15,7 +15,7 @@ public class TestBase { protected boolean isTibero = false; protected boolean isAltibase = false; - protected static String usingDBMS = "oracle"; + protected static String usingDBMS = "hsql"; @Resource(name = "jdbcProperties") protected Properties jdbcProperties; diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/RemapResultsTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/RemapResultsTest.java index b5989aa2..b29df845 100644 --- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/RemapResultsTest.java +++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/ibatis/RemapResultsTest.java @@ -8,6 +8,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.logging.Logger; import org.egovframe.rte.psl.dataaccess.TestBase; import org.egovframe.rte.psl.dataaccess.dao.MapTypeDAO; @@ -18,6 +19,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.core.io.ClassPathResource; +import org.springframework.dao.TransientDataAccessResourceException; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.jdbc.UncategorizedSQLException; import org.springframework.jdbc.datasource.init.ScriptUtils; @@ -111,13 +113,14 @@ public void testReplaceTextAllQueryExpectedException() throws Exception { fail("이 라인이 수행될 수 없습니다."); } catch (BadSqlGrammarException be) { assertNotNull(be); + } catch (TransientDataAccessResourceException te) { + assertNotNull(te); } catch (UncategorizedSQLException ue) { // tibero 인 경우 Spring 에서 // UncategorizedSQLException <-- // NestedSQLException <-- TbSQLException 으로 // 처리됨 assertNotNull(ue); - // assertTrue(ue.getCause().getCause() instanceof TbSQLException); } catch (Exception e) { e.printStackTrace(); fail("기대한 exception 이 아닙니다."); diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/utils/CamelUtilTest.java b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/utils/CamelUtilTest.java new file mode 100644 index 00000000..2bc707f8 --- /dev/null +++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/java/org/egovframe/rte/psl/dataaccess/utils/CamelUtilTest.java @@ -0,0 +1,21 @@ +package org.egovframe.rte.psl.dataaccess.utils; + +import static org.junit.Assert.*; + +import org.egovframe.rte.psl.dataaccess.util.CamelUtil; +import org.junit.Test; + +public class CamelUtilTest { + + @Test + public void testConvert2CamelCase() { + String camelString = "camelString"; + String notCamelString = "not_camelString"; + String upperCaseString = "Uppercase"; + + assertEquals(camelString, CamelUtil.convert2CamelCase(camelString)); + assertEquals("notCamelstring", CamelUtil.convert2CamelCase(notCamelString)); + assertEquals("uppercase", CamelUtil.convert2CamelCase(upperCaseString)); + } + +} diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/context-datasource.xml b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/context-datasource.xml index 0acb34ce..b7b452c1 100644 --- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/context-datasource.xml +++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/context-datasource.xml @@ -1,8 +1,9 @@ - + - + diff --git a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/jdbc.properties b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/jdbc.properties index b6c2f4dd..1420ba96 100644 --- a/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/jdbc.properties +++ b/Persistence/org.egovframe.rte.psl.dataaccess/src/test/resources/META-INF/spring/jdbc.properties @@ -29,7 +29,6 @@ usingDBMS=hsql #jdbc.password=rte01 #usingDBMS=altibase - #jdbc.driver=oracle.jdbc.driver.OracleDriver #jdbc.dburl=jdbc:oracle:thin:@localhost:1521:test2 #jdbc.username=test2 diff --git a/Presentation/org.egovframe.rte.ptl.mvc/pom.xml b/Presentation/org.egovframe.rte.ptl.mvc/pom.xml index 15f924f5..a96ad507 100644 --- a/Presentation/org.egovframe.rte.ptl.mvc/pom.xml +++ b/Presentation/org.egovframe.rte.ptl.mvc/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.egovframe.rte org.egovframe.rte.ptl.mvc @@ -8,32 +8,34 @@ 4.0.0 org.egovframe.rte.ptl.mvc The eGovernment Standard Framework - http://www.egovframe.go.kr + https://www.egovframe.go.kr The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt - 5.2.5.RELEASE + 5.3.6 4.0.0 + UTF-8 + UTF-8 - - - egovframe - http://maven.egovframe.go.kr/maven/ - - true - - - false - - - + + + egovframe + https://maven.egovframe.go.kr/maven/ + + true + + + false + + + @@ -67,7 +69,7 @@ commons-validator commons-validator - 1.6 + 1.7 @@ -124,7 +126,7 @@ install ${basedir}/target - ${artifactId}-${version} + ${project.artifactId}-${project.version} @@ -132,8 +134,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -175,6 +177,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -188,6 +191,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true once @@ -204,6 +208,7 @@ org.codehaus.mojo emma-maven-plugin + 1.0-alpha-3 true @@ -225,7 +230,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 sunlink @@ -235,7 +240,7 @@ true - http://docs.oracle.com/javase/6/docs/api/ + https://docs.oracle.com/javase/6/docs/api/ @@ -248,8 +253,8 @@ true - org.codehaus.mojo - surefire-report-maven-plugin + org.apache.maven.plugins + maven-surefire-report-plugin true @@ -259,6 +264,7 @@ + org.apache.maven.plugins maven-javadoc-plugin diff --git a/Presentation/org.egovframe.rte.ptl.mvc/src/main/java/org/egovframe/rte/ptl/mvc/filter/HTMLTagFilterRequestWrapper.java b/Presentation/org.egovframe.rte.ptl.mvc/src/main/java/org/egovframe/rte/ptl/mvc/filter/HTMLTagFilterRequestWrapper.java index a36ac1eb..128f465e 100644 --- a/Presentation/org.egovframe.rte.ptl.mvc/src/main/java/org/egovframe/rte/ptl/mvc/filter/HTMLTagFilterRequestWrapper.java +++ b/Presentation/org.egovframe.rte.ptl.mvc/src/main/java/org/egovframe/rte/ptl/mvc/filter/HTMLTagFilterRequestWrapper.java @@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; +import java.util.Map; /** * HTMLTagFilterRequestWrapper.java @@ -40,38 +41,12 @@ public HTMLTagFilterRequestWrapper(HttpServletRequest request) { public String[] getParameterValues(String parameter) { String[] values = super.getParameterValues(parameter); - if (values == null) { return null; } - for (int i = 0; i < values.length; i++) { if (values[i] != null) { - StringBuffer strBuff = new StringBuffer(); - for (int j = 0; j < values[i].length(); j++) { - char c = values[i].charAt(j); - switch (c) { - case '<': - strBuff.append("<"); - break; - case '>': - strBuff.append(">"); - break; - case '&': - strBuff.append("&"); - break; - case '"': - strBuff.append("""); - break; - case '\'': - strBuff.append("'"); - break; - default: - strBuff.append(c); - break; - } - } - values[i] = strBuff.toString(); + values[i] = getSafeParamData(values[i]); } else { values[i] = null; } @@ -81,36 +56,55 @@ public String[] getParameterValues(String parameter) { public String getParameter(String parameter) { String value = super.getParameter(parameter); - if (value == null) { return null; } + value = getSafeParamData(value); + return value; + } + + public Map getParameterMap() { + Map valueMap = super.getParameterMap(); + String[] values; + for (String key : valueMap.keySet()) { + values = valueMap.get(key); + for (int i = 0; i < values.length; i++) { + if (values[i] != null) { + values[i] = getSafeParamData(values[i]); + } else { + values[i] = null; + } + } + } + return valueMap; + } - StringBuffer strBuff = new StringBuffer(); + public String getSafeParamData(String value) { + StringBuilder stringBuilder = new StringBuilder(); for (int i = 0; i < value.length(); i++) { char c = value.charAt(i); switch (c) { case '<': - strBuff.append("<"); + stringBuilder.append("<"); break; case '>': - strBuff.append(">"); + stringBuilder.append(">"); break; case '&': - strBuff.append("&"); + stringBuilder.append("&"); break; case '"': - strBuff.append("""); + stringBuilder.append("""); break; case '\'': - strBuff.append("'"); + stringBuilder.append("'"); break; default: - strBuff.append(c); + stringBuilder.append(c); break; } } - value = strBuff.toString(); + value = stringBuilder.toString(); return value; } diff --git a/Presentation/org.egovframe.rte.ptl.mvc/src/main/java/org/egovframe/rte/ptl/mvc/tags/ui/PaginationTag.java b/Presentation/org.egovframe.rte.ptl.mvc/src/main/java/org/egovframe/rte/ptl/mvc/tags/ui/PaginationTag.java index 9f29f9a2..d80921c1 100644 --- a/Presentation/org.egovframe.rte.ptl.mvc/src/main/java/org/egovframe/rte/ptl/mvc/tags/ui/PaginationTag.java +++ b/Presentation/org.egovframe.rte.ptl.mvc/src/main/java/org/egovframe/rte/ptl/mvc/tags/ui/PaginationTag.java @@ -22,12 +22,15 @@ import org.egovframe.rte.ptl.mvc.tags.ui.pagination.PaginationManager; import org.egovframe.rte.ptl.mvc.tags.ui.pagination.PaginationRenderer; +import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.TagSupport; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; +import org.springframework.web.servlet.DispatcherServlet; +import org.springframework.web.servlet.support.RequestContextUtils; /** *PaginationTag.java @@ -61,9 +64,12 @@ public int doEndTag() throws JspException { JspWriter out = pageContext.getOut(); PaginationManager paginationManager; WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(pageContext.getServletContext()); + WebApplicationContext ctxd = RequestContextUtils.findWebApplicationContext((HttpServletRequest) pageContext.getRequest(), pageContext.getServletContext()); if (ctx.containsBean("paginationManager")) { paginationManager = (PaginationManager) ctx.getBean("paginationManager"); + } else if (ctxd.containsBean("paginationManager")) { + paginationManager = (PaginationManager) ctxd.getBean("paginationManager"); } else { //bean 정의가 없다면 DefaultPaginationManager를 사용. 빈설정이 없으면 기본 적인 페이징 리스트라도 보여주기 위함. paginationManager = new DefaultPaginationManager(); diff --git a/Presentation/org.egovframe.rte.ptl.mvc/src/main/java/org/egovframe/rte/ptl/mvc/tags/ui/pagination/DefaultPaginationRenderer.java b/Presentation/org.egovframe.rte.ptl.mvc/src/main/java/org/egovframe/rte/ptl/mvc/tags/ui/pagination/DefaultPaginationRenderer.java index a569af36..33087b33 100644 --- a/Presentation/org.egovframe.rte.ptl.mvc/src/main/java/org/egovframe/rte/ptl/mvc/tags/ui/pagination/DefaultPaginationRenderer.java +++ b/Presentation/org.egovframe.rte.ptl.mvc/src/main/java/org/egovframe/rte/ptl/mvc/tags/ui/pagination/DefaultPaginationRenderer.java @@ -55,7 +55,6 @@ public DefaultPaginationRenderer() { @Override public String renderPagination(PaginationInfo paginationInfo, String jsFunction) { - return super.renderPagination(paginationInfo, jsFunction); } diff --git a/Presentation/org.egovframe.rte.ptl.mvc/src/test/java/org/egovframe/rte/ptl/mvc/matrix/MatrixVariableTest.java b/Presentation/org.egovframe.rte.ptl.mvc/src/test/java/org/egovframe/rte/ptl/mvc/matrix/MatrixVariableTest.java index 492d5dc5..b3bc24bd 100644 --- a/Presentation/org.egovframe.rte.ptl.mvc/src/test/java/org/egovframe/rte/ptl/mvc/matrix/MatrixVariableTest.java +++ b/Presentation/org.egovframe.rte.ptl.mvc/src/test/java/org/egovframe/rte/ptl/mvc/matrix/MatrixVariableTest.java @@ -83,7 +83,7 @@ public void resolveArgumentPathVariable() throws Exception { @Test public void resolveArgumentDefaultValue() throws Exception { - assertEquals("2014", resolver.resolveArgument(this.paramYear, this.mavContainer, this.webRequest, null)); + assertEquals("2014", this.resolver.resolveArgument(this.paramYear, this.mavContainer, this.webRequest, null)); } @Test(expected = ServletRequestBindingException.class) @@ -96,7 +96,7 @@ public void resolveArgumentMultipleMatches() throws Exception { @Test(expected = ServletRequestBindingException.class) public void resolveArgumentRequired() throws Exception { - resolver.resolveArgument(this.paramColors, this.mavContainer, this.webRequest, null); + this.resolver.resolveArgument(this.paramColors, this.mavContainer, this.webRequest, null); } @Test diff --git a/pom.xml b/pom.xml index 32d160e7..73b4a985 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,7 @@ org.egovframe.rte.root + Foundation/org.egovframe.rte.fdl.cmmn Foundation/org.egovframe.rte.fdl.crypto @@ -26,8 +27,6 @@ Persistence/org.egovframe.rte.psl.data.jpa Persistence/org.egovframe.rte.psl.data.mongodb - - Presentation/org.egovframe.rte.ptl.mvc