Skip to content

Commit a2d0977

Browse files
DokyeongyunDokyeongyun
authored
Merge pull request #245 from Dokyeongyun/develop
2022.05.11. ~ 2022.05.15. Merge
2 parents 7ade7a3 + 011424b commit a2d0977

File tree

210 files changed

+1271
-1149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+1271
-1149
lines changed

‎.classpath‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="bin/main" path="src/main/java">
4-
<attributes>
5-
<attribute name="gradle_scope" value="main"/>
6-
<attribute name="gradle_used_by_scope" value="main,test"/>
7-
</attributes>
8-
</classpathentry>
9-
<classpathentry kind="src" output="bin/main" path="src/main/resources">
10-
<attributes>
11-
<attribute name="gradle_scope" value="main"/>
12-
<attribute name="gradle_used_by_scope" value="main,test"/>
13-
</attributes>
14-
</classpathentry>
15-
<classpathentry kind="src" output="bin/test" path="src/test/java">
16-
<attributes>
17-
<attribute name="gradle_scope" value="test"/>
18-
<attribute name="gradle_used_by_scope" value="test"/>
19-
<attribute name="test" value="true"/>
20-
</attributes>
21-
</classpathentry>
223
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9/"/>
234
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
245
<classpathentry kind="output" path="bin/default"/>

‎.gitignore‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@
44

55
.settings/
66

7-
.project/
7+
.project
88

9-
.classpath/
9+
.classpath
10+
11+
.metadata/*
1012

1113
/report/
1214

1315
/.gradle/
1416

1517
/build/
18+
19+
.vscode/

‎.project‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎Common/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/build/
2+
/bin/

‎Common/build.gradle‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
plugins {
2+
id 'java'
3+
}
4+
5+
repositories {
6+
mavenCentral()
7+
}
8+
9+
dependencies {
10+
11+
// Apache commons pool2
12+
implementation 'commons-io:commons-io:2.8.0'
13+
implementation 'org.apache.commons:commons-pool2:2.11.1'
14+
15+
// Jsch
16+
implementation 'com.jcraft:jsch:0.1.55'
17+
18+
// Logback
19+
implementation 'ch.qos.logback:logback-classic:1.2.3'
20+
}

‎src/main/java/root/common/database/contracts/AbstractDatabase.java‎ renamed to ‎Common/src/main/java/root/common/database/contracts/AbstractDatabase.java‎

File renamed without changes.

‎src/main/java/root/common/database/contracts/AbstractDatabaseConnectionPool.java‎ renamed to ‎Common/src/main/java/root/common/database/contracts/AbstractDatabaseConnectionPool.java‎

File renamed without changes.

‎src/main/java/root/core/domain/JdbcConnectionInfo.java‎ renamed to ‎Common/src/main/java/root/common/database/implement/JdbcConnectionInfo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package root.core.domain;
1+
package root.common.database.implement;
22

33
import lombok.Data;
44
import lombok.NoArgsConstructor;
@@ -31,7 +31,7 @@ public JdbcConnectionInfo(String jdbcDriver, String jdbcUrl, String jdbcId, Stri
3131
this.jdbcValidation = jdbcValidation;
3232
this.jdbcConnections = jdbcConnections;
3333

34-
// TODO 선택된 Oracle Driver Type에 따라서, Driver 값 변경하기, 현재는 임시로 모두 동일한 값 입력
34+
// TODO ���õ� Oracle Driver Type�� ����, Driver �� �����ϱ�, ����� �ӽ÷� ��� ������ �� �Է�
3535
this.jdbcOracleDriver = "oracle.jdbc.driver.OracleDriver";
3636
}
3737

‎src/main/java/root/common/database/implement/JdbcDatabase.java‎ renamed to ‎Common/src/main/java/root/common/database/implement/JdbcDatabase.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66

77
import lombok.Data;
88
import root.common.database.contracts.AbstractDatabase;
9-
import root.core.domain.JdbcConnectionInfo;
109

11-
// TODO Builder Pattern 적용하기
10+
// TODO Builder Pattern �����ϱ�
1211
/**
13-
* Jdbc Driver를 이용해 DBMS와 연결을 수행하는 Class
12+
* Jdbc Driver�� �̿��� DBMS�� ������ �����ϴ� Class
1413
*
1514
* @author DKY
1615
*

‎src/main/java/root/common/database/implement/JdbcDatabaseConnectionPool.java‎ renamed to ‎Common/src/main/java/root/common/database/implement/JdbcDatabaseConnectionPool.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import lombok.extern.slf4j.Slf4j;
1010
import root.common.database.contracts.AbstractDatabaseConnectionPool;
11-
import root.core.domain.JdbcConnectionInfo;
1211

1312
@Slf4j
1413
public class JdbcDatabaseConnectionPool implements AbstractDatabaseConnectionPool {

0 commit comments

Comments
 (0)