egovframe-runtime v4.0.0 FINAL

eGovFramework · Mar 2, 2022 · ab5bef1 · ab5bef1
1 parent cefb242
commit ab5bef1
Show file tree

Hide file tree

Showing 95 changed files with 853 additions and 1,305 deletions.
diff --git a/Batch/org.egovframe.rte.bat.core/pom.xml b/Batch/org.egovframe.rte.bat.core/pom.xml
@@ -1,40 +1,42 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.egovframe.rte</groupId>
     <artifactId>org.egovframe.rte.bat.core</artifactId>
     <packaging>jar</packaging>
     <version>4.0.0</version>
     <name>org.egovframe.rte.bat.core</name>
     <description>The eGovernment Standard Framework</description>
-    <url>http://www.egovframe.go.kr</url>
+    <url>https://www.egovframe.go.kr</url>
 
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
 
     <properties>
-        <spring.maven.artifact.version>5.2.5.RELEASE</spring.maven.artifact.version>
-        <batch.maven.artifact.version>4.2.2.RELEASE</batch.maven.artifact.version>
+        <spring.maven.artifact.version>5.3.6</spring.maven.artifact.version>
+        <batch.maven.artifact.version>4.3.2</batch.maven.artifact.version>
         <org.egovframe.rte.version>4.0.0</org.egovframe.rte.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
-	<repositories>
-		<repository>
-			<id>egovframe</id>
-			<url>http://maven.egovframe.go.kr/maven/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>egovframe</id>
+            <url>https://maven.egovframe.go.kr/maven/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 
     <dependencies>
         <dependency>
@@ -298,9 +300,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
-            <version>1.4</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+            <version>2.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -321,33 +323,26 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!--
-        <dependency>
-        <groupId>org.quartz-scheduler</groupId>
-        <artifactId>quartz-jobs</artifactId>
-        <version>2.2.1</version>
-        </dependency>
-        -->
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>2.7</version>
         </dependency>
     </dependencies>
 
     <build>
         <defaultGoal>install</defaultGoal>
         <directory>${basedir}/target</directory>
-        <finalName>${artifactId}-${version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
         <pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.8.1</version>
                     <configuration>
-                        <source>1.7</source>
-                        <target>1.7</target>
+                        <source>1.8</source>
+                        <target>1.8</target>
                         <encoding>UTF-8</encoding>
                     </configuration>
                 </plugin>
@@ -389,6 +384,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -404,7 +400,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
                 <configuration>
-                    <skipTests>false</skipTests>
+                    <skipTests>true</skipTests>
                     <forkMode>once</forkMode>
                     <reportFormat>xml</reportFormat>
                     <excludes>
@@ -419,6 +415,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>emma-maven-plugin</artifactId>
+                <version>1.0-alpha-3</version>
                 <inherited>true</inherited>
             </plugin>
             <!-- JavaDoc -->
@@ -440,7 +437,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.2</version>
                 <reportSets>
                     <reportSet>
                         <id>sunlink</id>
@@ -450,7 +447,7 @@
                         <inherited>true</inherited>
                         <configuration>
                             <links>
-                                <link>http://docs.oracle.com/javase/6/docs/api/</link>
+                                <link>https://docs.oracle.com/javase/6/docs/api/</link>
                             </links>
                         </configuration>
                     </reportSet>
@@ -463,8 +460,8 @@
                 <inherited>true</inherited>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>surefire-report-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
                 <inherited>true</inherited>
                 <reportSets>
                     <reportSet>

diff --git a/....core/src/main/java/org/egovframe/rte/bat/core/item/database/EgovJdbcBatchItemWriter.java b/....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/...govframe/rte/bat/core/item/database/support/EgovMethodMapItemPreparedStatementSetter.java b/...govframe/rte/bat/core/item/database/support/EgovMethodMapItemPreparedStatementSetter.java
@@ -45,6 +45,7 @@ public class EgovMethodMapItemPreparedStatementSetter<T> extends EgovItemPrepare
 	/**
 	 * params 만큼 돌면서 sqlType별로 PreparedStatement에 자동셋팅시킴
 	 */
+	@Override
 	public void setValues(T item, PreparedStatement ps, String[] params, String[] sqlTypes, Map<String, Method> methodMap) throws SQLException {
 		EgovReflectionSupport<T> reflector = new EgovReflectionSupport<T>();
 

diff --git a/...e/src/main/java/org/egovframe/rte/bat/core/item/file/EgovPartitionFlatFileItemWriter.java b/...e/src/main/java/org/egovframe/rte/bat/core/item/file/EgovPartitionFlatFileItemWriter.java
@@ -102,7 +102,7 @@ public class EgovPartitionFlatFileItemWriter<T> 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/.../main/java/org/egovframe/rte/bat/core/item/file/transform/EgovDelimitedLineTokenizer.java b/.../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/...a/org/egovframe/rte/bat/core/item/file/transform/EgovEscapableDelimitedLineTokenizer.java b/...a/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/...rg.egovframe.rte.bat.core/src/main/java/org/egovframe/rte/bat/item/DefaultItemReader.java b/...rg.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
@@ -1,26 +1,27 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.egovframe.rte</groupId>
     <artifactId>org.egovframe.rte.fdl.access</artifactId>
     <packaging>jar</packaging>
     <version>4.0.0</version>
     <name>org.egovframe.rte.fdl.access</name>
     <description>The eGovernment Standard Framework</description>
-    <url>http://www.egovframe.go.kr</url>
+    <url>https://www.egovframe.go.kr</url>
 
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
 
     <properties>
-        <spring.maven.artifact.version>5.2.5.RELEASE</spring.maven.artifact.version>
+        <spring.maven.artifact.version>5.3.6</spring.maven.artifact.version>
         <org.egovframe.rte.version>4.0.0</org.egovframe.rte.version>
-        <spring.security.maven.artifact.version>5.2.2.RELEASE</spring.security.maven.artifact.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
     <dependencies>
@@ -44,11 +45,6 @@
             <artifactId>spring-context-support</artifactId>
             <version>${spring.maven.artifact.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>${spring.security.maven.artifact.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -70,7 +66,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.19</version>
+            <version>5.1.31</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -106,16 +102,16 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <directory>${basedir}/target</directory>
-        <finalName>${artifactId}-${version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
         <pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.8.1</version>
                     <configuration>
-                        <source>1.7</source>
-                        <target>1.7</target>
+                        <source>1.8</source>
+                        <target>1.8</target>
                         <encoding>UTF-8</encoding>
                     </configuration>
                 </plugin>
@@ -157,6 +153,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -170,6 +167,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
                 <configuration>
                     <skipTests>true</skipTests>
                     <forkMode>once</forkMode>
@@ -186,6 +184,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>emma-maven-plugin</artifactId>
+                <version>1.0-alpha-3</version>
                 <inherited>true</inherited>
             </plugin>
             <!-- JavaDoc -->
@@ -207,7 +206,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.2</version>
                 <reportSets>
                     <reportSet>
                         <id>sunlink</id>
@@ -217,7 +216,7 @@
                         <inherited>true</inherited>
                         <configuration>
                             <links>
-                                <link>http://docs.oracle.com/javase/6/docs/api/</link>
+                                <link>https://docs.oracle.com/javase/6/docs/api/</link>
                             </links>
                         </configuration>
                     </reportSet>
@@ -230,8 +229,8 @@
                 <inherited>true</inherited>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>surefire-report-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
                 <inherited>true</inherited>
                 <reportSets>
                     <reportSet>

diff --git a/...c/main/java/org/egovframe/rte/fdl/access/config/EgovAccessConfigBeanDefinitionParser.java b/...c/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 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" +
@@ -132,7 +132,7 @@ protected void doParse(Element element, ParserContext parserContext, BeanDefinit
                 "       </mvc:interceptors>\n" +
                 "   </beans>\n" +
                 "</beans>";
-        //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 #####");
 
     }