diff --git a/.gitignore b/.gitignore index ea8c4bf..be237e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target +path.txt \ No newline at end of file diff --git a/2_apply.bat b/2_apply.bat index dcbc3ae..fed4a40 100644 --- a/2_apply.bat +++ b/2_apply.bat @@ -1,90 +1,140 @@ @echo off setlocal enabledelayedexpansion +rem # ---------------------------------------------------------------------- +rem # ȯ°æ ¼³Á¤: path.txt¿¡¼­ ÀÌŬ¸³½º °æ·Î¸¦ ÀÐ°í ¿öÅ©½ºÆäÀ̽º °æ·Î¸¦ ¼³Á¤ÇÕ´Ï´Ù. +rem # ---------------------------------------------------------------------- -set source_prefix=src\main\webapp\ -set target_prefix=C:\Users\dbnt\eclipse-workspace\.metadata\.plugins\org.eclipse.wst.server.core\tmp0\wtpwebapps\geoinfo_admin\ -set target_directory=C:\Users\dbnt\git\dbnt\geoinfo.or.kr\old-geoinfo-or-kr-admin\ +rem # target_directory¸¦ ÇöÀç ¹èÄ¡ ÆÄÀÏÀÌ ½ÇÇàµÇ´Â °æ·Î·Î ¼³Á¤ÇÕ´Ï´Ù. +set "target_directory=%~dp0" +set "path_file=%target_directory%path.txt" +set "eclipse_path=" -rem For 192.168.10.20 -hostname | find "DESKTOP-9C42CR8" > nul -if %errorlevel% == 0 ( - set target_prefix=D:\app_geoinfo\app\eclipse\workspace\.metadata\.plugins\org.eclipse.wst.server.core\tmp0\wtpwebapps\old-geoinfo-or-kr-admin\ - set target_directory=D:\app_geoinfo\app\eclipse\workspace\old-geoinfo-or-kr-admin\ -) else ( - echo goodbye +rem # path.txt ÆÄÀÏÀÌ Á¸ÀçÇÏ´ÂÁö È®ÀÎÇÕ´Ï´Ù. +if not exist "%path_file%" ( + echo [ERROR] "%path_file%"À» ãÀ» ¼ö ¾ø½À´Ï´Ù. ½ºÅ©¸³Æ®¸¦ Á¾·áÇÕ´Ï´Ù. + pause + exit /b ) +rem # path.txt¿¡¼­ 'eclipse='·Î ½ÃÀÛÇÏ´Â ¶óÀÎÀ» ã¾Æ ÀÌŬ¸³½º °æ·Î¸¦ ¼³Á¤ÇÕ´Ï´Ù. +for /f "tokens=1,* delims==" %%a in ('findstr /b "eclipse=" "%path_file%"') do ( + set "eclipse_path=%%b" +) +if not defined eclipse_path ( + echo [ERROR] "%path_file%"¿¡¼­ ÀÌŬ¸³½º °æ·Î¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù. + pause + exit /b +) + +rem # ÀÌŬ¸³½º ¼³Á¤ ÆÄÀÏ °æ·Î¸¦ ¸¸µì´Ï´Ù. +set "prefs_file=!eclipse_path!\configuration\.settings\org.eclipse.ui.ide.prefs" + +if not exist "!prefs_file!" ( + echo [ERROR] Eclipse ¼³Á¤ ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù: "!prefs_file!" + pause + exit /b +) + +rem # ¼³Á¤ ÆÄÀÏ¿¡¼­ ÃÖ±Ù ¿öÅ©½ºÆäÀ̽º ¸ñ·ÏÀ» Àоî¿É´Ï´Ù. +for /f "tokens=1,* delims==" %%a in ('findstr /b "RECENT_WORKSPACES=" "!prefs_file!"') do ( + set "workspaces_line=%%b" +) + +rem # \nÀ» °ø¹éÀ¸·Î ġȯÇÏ¿© ¿©·¯ °æ·Î°¡ ÀÖÀ» °æ¿ì ù ¹øÂ° °æ·Î¸¸ °¡Á®¿É´Ï´Ù. +set "workspaces_line_cleaned=!workspaces_line:\n= !" +for /f "tokens=1" %%w in ("!workspaces_line_cleaned!") do ( + set "workspace_path=%%w" +) + +rem # °æ·Î¿¡ Æ÷ÇÔµÈ À̽ºÄÉÀÌÇÁ ¹®ÀÚ(\\)¸¦ ´ÜÀÏ ¹é½½·¡½Ã(\)·Î º¯°æÇÕ´Ï´Ù. +set "workspace_path=!workspace_path:\\=\!" + +rem # µå¶óÀÌºê °æ·Î Çü½ÄÀÌ 'D\:\'¿Í °°ÀÌ À߸øµÈ °æ¿ì 'D:\'·Î ¹Ù·ÎÀâ½À´Ï´Ù. +set "drive_letter=!workspace_path:~0,1!" +if /i "!workspace_path:~1,2!" == "\:" ( + set "workspace_path=!drive_letter!:!workspace_path:~3!" +) + +rem # ÃÖÁ¾ target_prefix¸¦ ¼³Á¤ÇÕ´Ï´Ù. +set "target_prefix=!workspace_path!\.metadata\.plugins\org.eclipse.wst.server.core\tmp0\wtpwebapps\geoinfo_admin\" + +explorer "!target_prefix!" + +echo target_prefix: "!target_prefix!" + +set "source_prefix=src\main\webapp\" + +echo --- File Copy Script Start (Robust Version) --- +echo. + +rem for ·çÇÁ´Â °¢ ÁÙÀ» ¼­ºê·çƾÀ¸·Î ³Ñ±â´Â ¿ªÇÒ¸¸ ¼öÇà for /f "delims=" %%i in (admin_list.txt) do ( - set line=%%i - - if "!line:~-5!" == ".java" ( - echo Skip - ) else if "!line:~-4!" == ".xml" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - :: "src\main\resources\" Á¦°Å - set relative_path=!relative_path:*src\main\resources\=! - set target_file=%target_prefix%WEB-INF\classes\!relative_path! - ) else if "!line:~-4!" == ".jsp" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".css" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".png" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".svg" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-3!" == ".js" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".svg" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".reb" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".png" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-6!" == ".woff2" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-5!" == ".woff" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".otf" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-11!" == ".properties" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".gif" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) - - - rem Copy the source file to the target location, overwriting if necessary - echo Copying "!source_file!" to "!target_file!" - xcopy /i /Y "!source_file!" "!target_file!" + call :processLine "%%i" ) -rem pause \ No newline at end of file +echo. +echo --- All operations completed. --- +pause +goto :eof + + +rem ====================================================== +rem :processLine ¼­ºê·çƾ - ½ÇÁ¦ ÆÄÀÏ Ã³¸® ·ÎÁ÷ +rem ====================================================== +:processLine +set "line=%~1" + +rem ·çÇÁ ½ÃÀÛ ½Ã º¯¼ö ÃʱâÈ­ +set "source_file=" +set "target_file=" +set "relative_path=" + +rem #À¸·Î ½ÃÀÛÇÏ´Â ÁÖ¼® ¶óÀÎ °Ç³Ê¶Ù±â +if "!line:~0,1!" == "#" ( + echo [SKIP] Comment: !line! + goto :eof +) + +echo [PROCESS] !line! + +rem .java ÆÄÀÏ °Ç³Ê¶Ù±â +if "!line:~-5!" == ".java" ( + echo [SKIP] Java source file. + goto :eof +) + +set "source_file=%target_directory%!line!" +set "relative_path=!line:%source_prefix%=!" + +rem .xml ÆÄÀÏÀº WEB-INF\classes °æ·Î·Î ó¸® +if "!line:~-4!" == ".xml" ( + set "relative_path=!line:*src\main\resources\=!" + set "target_file=%target_prefix%WEB-INF\classes\!relative_path!" +) else ( + rem ±× ¿Ü ¸ðµç ÆÄÀÏ Ã³¸® + set "target_file=%target_prefix%!relative_path!" +) + +rem --- [¼öÁ¤µÈ ºÎºÐ] ÆÄÀÏ º¹»ç ½ÇÇà ¹× °á°ú Ãâ·Â --- +if defined source_file ( + if exist "!source_file!" ( + echo [COPY] + echo FROM: "!source_file!" + echo TO: "!target_file!" + xcopy /i /Y "!source_file!" "!target_file!" > nul + + rem xcopy ¼º°ø ¿©ºÎ È®ÀÎ (errorlevelÀÌ 0ÀÌ¸é ¼º°ø) + if !errorlevel! == 0 ( + echo -> SUCCESS + ) else ( + echo -> FAILED (Error Code: !errorlevel!) + ) + ) else ( + echo [ERROR] Source file not found: "!source_file!" + ) +) + +echo. +goto :eof \ No newline at end of file diff --git a/SUCCESS b/SUCCESS new file mode 100644 index 0000000..e3d49c4 --- /dev/null +++ b/SUCCESS @@ -0,0 +1 @@ + - diff --git a/admin_list.txt b/admin_list.txt index b820422..8dbfbdd 100644 --- a/admin_list.txt +++ b/admin_list.txt @@ -9,3 +9,6 @@ src\main\java\geoinfo\admins\chLog\DownloadAppController.java src\main\java\geoinfo\admins\notice\NoticeMngController.java src\main\java\geoinfo\admins\user\GeneralUserMngController.java src\main\java\geoinfo\com\file\FileController.java + + +src\main\webapp\WEB-INF\views\admins\constructionProjectManagement\left.jsp \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp index 1ac8888..28c43a4 100644 --- a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp @@ -77,9 +77,11 @@ img { border:0; } + -