4.3.x branch 내용 병합 #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

eGovFrameSupport merged 10 commits into main from 4.3.x

Mar 6, 2025

.github/ISSUE_TEMPLATE/amendment_request.yml

This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     title: "[Bug]: "
     labels: ["bug", "triage"]
     assignees:
-      - ohorange21
+      - rukegithub
     body:
       - type: markdown
         attributes:
@@ Expand Down @@

.github/ISSUE_TEMPLATE/feature_request.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,9 +1,9 @@
  
    name: 기능 요구 및 의견 Feature Request

    description: 기능 요구나 기타 의견을 이슈로 등록하는 템플릿입니다. Suggest an idea for improving eGovFrame.

    name: 기능 요구 Feature Request

    description: 기능 요구를 이슈로 등록하는 템플릿입니다. Suggest a new feature for improving eGovFrame.

    title: "[기능요구(Feature)]: "

    labels: ["feature"]

    assignees:

      - ohorange21

      - rukegithub

    body:

      - type: markdown

        attributes:

.github/ISSUE_TEMPLATE/improvement_plan.yml

-Original file line number
+Diff line change
@@ -0,0 +1,55 @@
+    name: 발전 방안 제안 Improvement Plan
+    description: 발전 방안을 이슈로 등록하는 템플릿입니다. Suggest a new plan for improving eGovFrame.
+    title: "[발전 방안 제안(Improvement Plan)]: "
+    labels: ["Improvement"]
+    assignees:
+      - yongfire38
+    body:
+      - type: markdown
+        attributes:
+          value: |
+            시간을 내어 의견을 작성해 주셔서 감사합니다. Thank you for taking the time to fill out a request.
+      - type: input
+        id: idea-name
+        attributes:
+          label: 아이디어명 Idea Name
+        validations:
+          required: true
+      - type: textarea
+        id: idea-summary
+        attributes:
+          label: 아이디어 요약 Idea Summary
+          description: 과제 내용을 300자 이내로 간결하게 요약 및 정의해 주세요 Please summarize and define your content in 300 characters or less
+          placeholder: 예) 게시판 첨부기능 추가 Example) Adding a bulletin board attachment
+        validations:
+          required: true
+      - type: textarea
+        id: suggestion-background
+        attributes:
+          label: 제안배경 Suggestion Background
+          description: 아이디어를 제안하게 된 배경 및 필요성을 기술해 주세요. Please describe the background and need for the idea.
+          placeholder: 아이디어를 제안하게 된 배경은 다음과 같습니다. The background to suggesting the idea is as follows.
+        validations:
+          required: true
+      - type: textarea
+        id: expectations
+        attributes:
+          label: 기대효과 Expectations
+          description: 아이디어의 실현 가능성과 예상되는 기대효과를 제시하여 주세요. Please describe the expected impact and outcome of the idea.
+          placeholder: 해당 아이디어의 기대효과는 다음과 같습니다. Here are the expected effects of this idea.
+        validations:
+          required: false
+      - type: textarea
+        id: free-writing
+        attributes:
+          label: 자유기술 Free Writing
+          description: 추가 기재하고 싶은 항목 및 내용을 자유롭게 기재하여 주세요. Please feel free to add anything else you'd like to include.
+        validations:
+          required: false
+      - type: textarea
+        id: reference
+        attributes:
+          label: 참고문헌 Reference
+          description: 참고문헌이 있는 경우 작성하여 주세요. If you have references, please include them.
+        validations:
+          required: false

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -33,4 +33,5 @@ target/ @@
     .DS_Store
     # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml #
-    hs_err_pid*
+    hs_err_pid*
+    bin/

README.md

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    # 표준프레임워크 개발환경  4.2.0  (egovframe-development)
+    # 표준프레임워크 개발환경  4.3.0  (egovframe-development)
     ![Eclipse](https://img.shields.io/badge/Eclipse-FE7A16.svg?style=for-the-badge&logo=Eclipse&logoColor=white)
     ![java](https://img.shields.io/badge/java-007396?style=for-the-badge&logo=JAVA&logoColor=white)
@@ Expand Down @@

egovframeowk.target/egovframework target.target

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,7 +4,7 @@
  
    <locations>

    <location id="org.eclipse.rcp" path="${eclipse_home}" type="Feature"/>

    <location path="${workspace_loc}" type="Directory"/>

    	<location path="C:\eclipse-jee-2022-12-R-win32-x86_64-RCP-TEST\eclipse" type="Directory"/>

    	<location path="C:\EGOV_DEV\eclipse-ide-2024-03-x64-RCP-TEST\eclipse" type="Directory"/>

    </locations>

    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_45"/>

    </target>

egovframework.bdev.imp.batch/META-INF/MANIFEST.MF

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,20 +2,20 @@ Manifest-Version: 1.0
  
    Bundle-ManifestVersion: 2

    Bundle-Name: eGovFramework Batch

    Bundle-SymbolicName: egovframework.bdev.imp.batch;singleton:=true

    Bundle-Version: 4.2.0.qualifier

    Bundle-Version: 4.3.0.qualifier

    Bundle-Activator: egovframework.bdev.imp.batch.EgovBatchPlugin

    Require-Bundle: org.eclipse.ui,

     org.eclipse.core.runtime,

     org.eclipse.core.resources,

     org.eclipse.ui.ide,

     egovframework.dev.imp.core;bundle-version="4.2.0",

     egovframework.bdev.imp.confmngt;bundle-version="4.2.0",

     egovframework.bdev.imp.ide;bundle-version="4.2.0",

     egovframework.dev.imp.core;bundle-version="4.3.0",

     egovframework.bdev.imp.confmngt;bundle-version="4.3.0",

     egovframework.bdev.imp.ide;bundle-version="4.3.0",

     org.eclipse.jdt.ui,

     org.eclipse.jdt.core,

     org.eclipse.search

    Bundle-ActivationPolicy: lazy

    Bundle-RequiredExecutionEnvironment: JavaSE-11

    Bundle-RequiredExecutionEnvironment: JavaSE-17

    Export-Package: egovframework.bdev.imp.batch.wizards.com,

     egovframework.bdev.imp.batch.wizards.jobcreation.model,

     egovframework.bdev.imp.batch.wizards.joblauncher.model

egovframework.bdev.imp.batch/src/egovframework/bdev/imp/batch/common/BatchMessages.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -27,9 +27,10 @@ @@
      * @see <pre>
      * &lt;&lt; 개정이력(Modification Information) &gt;&gt;
      *
-     *수정일	  	수정자	  수정내용
-     *-----------	------	----------------
-     *2012.07.24	조용현	최초생성
+     * 수정일	  	    수정자	        수정내용
+     * ----------   ------------	----------------
+     * 2012.07.24   조용현            최초생성
+     * 2025.02.26   신용호            항목 추가 (다국어)
      *
      *
      * </pre>
@@ Expand Down Expand Up / @@ -80,6 +81,7 @@ public class BatchMessages extends NLS { @@
     	public static String BatchJobCreationCustomizePage_TITLE;
     	public static String BatchJobCreationCustomizePage_UPDATE_MESSAGE_1;
     	public static String BatchJobCreationCustomizePage_UPDATE_MESSAGE_2;
+    	public static String BatchJobCreationCustomizePage_SELECT_TITLE;
     	public static String BatchJobcreationSelectProjectPage_DESCRIPTION;
     	public static String BatchJobcreationSelectProjectPage_NOTE_CONTENTS;
     	public static String BatchJobcreationSelectProjectPage_TITLE;
@@ Expand Down @@

egovframework.bdev.imp.batch/src/egovframework/bdev/imp/batch/common/messages.properties

-Original file line number
+Diff line change
@@ Expand Up @@
     BatchJobCreationCustomizePage_TITLE=eGovFrame Batch Job
     BatchJobCreationCustomizePage_UPDATE_MESSAGE_1=Modify the information if you need to check the information of the next following \n\n
     BatchJobCreationCustomizePage_UPDATE_MESSAGE_2=Are you sure to save the modifications?
+    BatchJobCreationCustomizePage_SELECT_TITLE=Select
     BatchJobcreationSelectProjectPage_DESCRIPTION=Create new Batch Job File.
     BatchJobcreationSelectProjectPage_NOTE_CONTENTS=Batch Job File can be created only on eGovFrame project. \nSelectable project list above shows only the eGovFrame project.
     BatchJobcreationSelectProjectPage_TITLE=eGovFrame Batch Job
@@ Expand Down @@

egovframework.bdev.imp.batch/src/egovframework/bdev/imp/batch/common/messages_ko.properties

-Original file line number
+Diff line change
@@ Expand Up @@
     BatchJobCreationCustomizePage_TITLE=eGovFrame Batch Job
     BatchJobCreationCustomizePage_UPDATE_MESSAGE_1=\uc758 \uc815\ubcf4\ub97c \uc218\uc815\ud560 \uacbd\uc6b0 \ub2e4\uc74c\uc758 next\uc815\ubcf4\ub97c \ud655\uc778\ud558\uc154\uc57c \ud569\ub2c8\ub2e4.\n\n
     BatchJobCreationCustomizePage_UPDATE_MESSAGE_2=\uc218\uc815\ub41c \uc0ac\ud56d\uc744 \uc800\uc7a5\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
+    BatchJobCreationCustomizePage_SELECT_TITLE=\uc120\ud0dd
     BatchJobcreationSelectProjectPage_DESCRIPTION=\uc2e0\uaddc Batch Job File\uc744 \uc0dd\uc131\ud569\ub2c8\ub2e4.
     BatchJobcreationSelectProjectPage_NOTE_CONTENTS=Batch Job File\uc740 eGovFrame Batch \ud504\ub85c\uc81d\ud2b8\uc5d0\ub9cc \uc0dd\uc131 \uac00\ub2a5\ud558\uba70,\n\uc704\uc758 \ud504\ub85c\uc81d\ud2b8 \ubaa9\ub85d\uc5d0\ub294 eGovFrame Batch \ud504\ub85c\uc81d\ud2b8\ub9cc \ubcf4\uc5ec\uc9d1\ub2c8\ub2e4.
     BatchJobcreationSelectProjectPage_TITLE=eGovFrame Batch Job
@@ Expand Down @@

...egovframework/bdev/imp/batch/wizards/jobcreation/pages/BatchJobCreationCustomizePage.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -54,13 +54,14 @@
  
     * 수정일	  	수정자	  수정내용

     * -----------	------	----------------

     * 2012.07.24	조용현	최초생성

     * 2025.02.26	신용호	셀렉트 박스 기본 한글 메시지 깨짐 수정

     * 

     * 

     *      </pre>

     */

    public class BatchJobCreationCustomizePage extends WizardPage {

    	private final String DEFAULT = "선택"; //$NON-NLS-1$

    	private final String DEFAULT = BatchMessages.BatchJobCreationCustomizePage_SELECT_TITLE; //$NON-NLS-1$ // 선택

    	/** stepAndDecisionCombo에 넣은 문자열(Step / Decision) */

    	private final String STEP = "Step"; //$NON-NLS-1$

.../bdev/imp/batch/wizards/joblauncher/operation/CreateBatchJobLauncherXMLFileOperation.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -22,9 +22,10 @@ @@
      * @see <pre>
      * &lt;&lt; 개정이력(Modification Information) &gt;&gt;
      *
-     *   수정일      수정자           수정내용
-     *  -------    --------    ---------------------------
-     *   2012.07.26  최서윤          최초 생성
+     *  수정일        수정자        수정내용
+     *  ----------  --------    ---------------------------
+     *  2012.07.26  최서윤        최초 생성
+     *  2012.07.26  신용호        표준프레임워크 v4.0 패키지 적용
      *
      *
      * </pre>
@@ Expand Down Expand Up / @@ -184,7 +185,8 @@ private void appendDefaultBeans(Element beansElement){ @@
     		// unique egovBatchRunner id 생성
     		eGovBatchRunnerBean.setAttribute(new Attribute("id", jobExecutorContext.getFileName().split("\\.")[0] + ".egovBatchRunner"));
-    		eGovBatchRunnerBean.setAttribute(new Attribute("class", "egovframework.brte.core.launch.support.EgovBatchRunner"));
+    		// 표준프레임워크 v4.0 패키지명 적용
+    		eGovBatchRunnerBean.setAttribute(new Attribute("class", "org.egovframe.rte.bat.core.launch.support.EgovBatchRunner"));
     		// egovBatchRunner에 JobRepository constructor-arg 추가
     		Element constructorBeanJobRepository = new Element("constructor-arg");
@@ Expand Down @@

egovframework.bdev.imp.batchnature/META-INF/MANIFEST.MF

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,17 +2,17 @@ Manifest-Version: 1.0
  
    Bundle-ManifestVersion: 2

    Bundle-Name: eGovFramework Batch Nature

    Bundle-SymbolicName: egovframework.bdev.imp.batchnature;singleton:=true

    Bundle-Version: 4.2.0.qualifier

    Bundle-Version: 4.3.0.qualifier

    Bundle-Activator: egovframework.bdev.imp.batchnature.EgovBatchNaturePlugin

    Require-Bundle: org.eclipse.ui,

     org.eclipse.core.runtime,

     org.eclipse.core.resources,

     org.eclipse.jdt.core,

     org.eclipse.core.expressions,

     org.eclipse.search,

     egovframework.dev.imp.core;bundle-version="4.2.0",

     egovframework.bdev.imp.ide;bundle-version="4.2.0"

     egovframework.dev.imp.core;bundle-version="4.3.0",

     egovframework.bdev.imp.ide;bundle-version="4.3.0"

    Bundle-ActivationPolicy: lazy

    Bundle-RequiredExecutionEnvironment: JavaSE-11

    Bundle-RequiredExecutionEnvironment: JavaSE-17

    Bundle-Vendor: MOIS

    Automatic-Module-Name: egovframework.bdev.imp.batchnature

0 ....imp.batchnature/examples/pomFile/pom.xml → ...mp.batchnature/examples/pomFile/pom.xml.$

File renamed without changes.

...dev.imp.batchnature/src/egovframework/bdev/imp/batchnature/util/HandlePomXMLFileUtil.java

-Original file line number
+Diff line change
@@ Expand Up @@
     				if (springBatchInfraNoExist) {
     					String xmlStr = "<dependency>" + "\n\t\t\t<groupId>" + "org.springframework.batch" + "</groupId>"
     							+ "\n\t\t\t<artifactId>" + "spring-batch-infrastructure" + "</artifactId>"
-    							+ "\n\t\t\t<version>" + "4.3.8.RELEASE" + "</version>\n\t\t" + "</dependency>" + "\n ";
+    							+ "\n\t\t\t<version>" + "4.3.8" + "</version>\n\t\t" + "</dependency>" + "\n ";
     					XmlUtil.addFirstNode(rootNode, "/project/dependencies", xmlStr, "\n\t\t", "\t");
     				}
     				if (springBatchCoreNoExist) {
     					String xmlStr = "<dependency>" + "\n\t\t\t<groupId>" + "org.springframework.batch" + "</groupId>"
     							+ "\n\t\t\t<artifactId>" + "spring-batch-core" + "</artifactId>" + "\n\t\t\t<version>"
-    							+ "4.3.8.RELEASE" + "</version>\n\t\t" + "</dependency>" + "\n ";
+    							+ "4.3.8" + "</version>\n\t\t" + "</dependency>" + "\n ";
     					XmlUtil.addFirstNode(rootNode, "/project/dependencies", xmlStr, "\n\t\t", "\t");
     				}
@@ Expand Down @@

egovframework.bdev.imp.confmngt/META-INF/MANIFEST.MF

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,11 +2,11 @@ Manifest-Version: 1.0
  
    Bundle-ManifestVersion: 2

    Bundle-Name: eGovFramework Batch Confmngt

    Bundle-SymbolicName: egovframework.bdev.imp.confmngt; singleton:=true

    Bundle-Version: 4.2.0.qualifier

    Bundle-Version: 4.3.0.qualifier

    Bundle-Activator: egovframework.bdev.imp.confmngt.EgovBatchConfMngtPlugin

    Require-Bundle: org.eclipse.ui,

     org.eclipse.core.runtime,

     egovframework.dev.imp.core;bundle-version="4.2.0",

     egovframework.dev.imp.core;bundle-version="4.3.0",

     org.eclipse.jdt.ui,

     org.eclipse.jdt.core,

     org.eclipse.core.resources

    @@ -31,5 +31,5 @@ Export-Package: egovframework.bdev.imp.confmngt;uses:="org.osgi.framework,org.ec
  
     egovframework.bdev.imp.confmngt.preferences.readwrite;uses:="egovframework.bdev.imp.confmngt.preferences.readwrite.model,org.eclipse.swt.widgets,egovframework.bdev.imp.confmngt.preferences.com",

     egovframework.bdev.imp.confmngt.preferences.readwrite.model;uses:="org.eclipse.jface.viewers,org.eclipse.swt.graphics,egovframework.bdev.imp.confmngt.preferences.com.model"

    Bundle-Vendor: MOIS

    Bundle-RequiredExecutionEnvironment: JavaSE-11

    Bundle-RequiredExecutionEnvironment: JavaSE-17

    Automatic-Module-Name: egovframework.bdev.imp.confmngt

egovframework.bdev.imp.ide.feature/build.properties

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

4.3.x branch 내용 병합 #123

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!