Merge remote-tracking branch 'origin/rest' into front_page

pengm2ng · May 30, 2021 · 78ceffc · 78ceffc
2 parents 02ebd6c + 59fb88e
commit 78ceffc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/jmt_webapp/src/main/java/dao/map/KakaoMapProviderDAO.java b/jmt_webapp/src/main/java/dao/map/KakaoMapProviderDAO.java
@@ -35,7 +35,7 @@ public List<String> findPlace(String placeName) {
 
  try {
 
- File file = new File("../webapps/ROOT/resources/kakaoKey.txt");
+ File file = new File("../webapps/ROOT/WEB-INF/resources/kakaoKey.txt");
  BufferedReader inFiles
 
  = new BufferedReader(new InputStreamReader(new FileInputStream(file.getAbsolutePath()), "UTF8"));

diff --git a/jmt_webapp/src/main/java/jdbc/DBCPInit.java b/jmt_webapp/src/main/java/jdbc/DBCPInit.java
@@ -36,7 +36,7 @@ public void init() throws ServletException {
  private void initConnectionPool() {
 
  try {
- File file = new File("../webapps/ROOT/resources/pk.txt");
+ File file = new File("../webapps/ROOT/WEB-INF/resources/pk.txt");
  FileInputStream is = new FileInputStream(file);
  InputStreamReader isr = new InputStreamReader(is);
  BufferedReader br = new BufferedReader(isr);