Revert "js圧縮"

This reverts commit d58210f2a4984fca06fed015f04ed61a100fc618.

diff --git a/src/init.bat b/src/init.bat
index e3118cc..e720c07 100644 (file)
--- a/src/init.bat
+++ b/src/init.bat
@@ -4,6 +4,6 @@ call ..\..\uap\bin\init.bat
 
 set DEV_DIR=..\..\dev
 
-set ANT_VER=apache-ant-1.10.13
+set ANT_VER=apache-ant-1.10.9
 set ANT_HOME=%DEV_DIR%\%ANT_VER%
 set PATH=%PATH%;%ANT_HOME%\bin;

diff --git a/src/minify/jccall.bat b/src/minify/jccall.bat_ｻﾝﾌﾟﾙ
similarity index 100%
rename from src/minify/jccall.bat
rename to src/minify/jccall.bat_ｻﾝﾌﾟﾙ

diff --git a/src/minify/noconv.bat b/src/minify/noconv.bat
deleted file mode 100644 (file)
index f0bcd83..0000000
--- a/src/minify/noconv.bat
+++ /dev/null
@@ -1,27 +0,0 @@
-@echo off
-
-cd /d %~dp0
-type nul > log2.txt
-
-call C:\opengionV8\uap\bin\init.bat
-
-set CLASSPATH=.;classes;%CLASSPATH%;*
-
-set SRCDIR=%~dp0script
-set OUTDIR=%~dp0jsp
-
-rem ==========================================================================
-rem \88³\8fk\95Ï\8a·\82ð\8ds\82í\82È\82¢¤min.js min.css \82Ƥjquery- \82Å\8en\82Ü\82ȩ́²Ù\82ͤ\90æ\82ɺËß°\82·\82é¡
-rem ºËß°\8c³\82ÌÀ²Ñ½ÀÝÌß\82ª\90V\82µ\82¢\82©¤\90V\8bĶ²Ù\82Ì\8fê\8d\87\82É\8ds\82¢\82Ü\82·¡backup Ì«ÙÀÞ\82Í\8f\9c\8aO
-rem robocopy ºËß°\8c³Ì«ÙÀÞ ºËß°\90æÌ«ÙÀÞ [\91Î\8fÛ̧²Ù\96¼ \81c] [µÌß¼®Ý]
-rem µÌß¼®Ý: /XD dirs... Ì«ÙÀÞ(ÃÞ¨Ú¸ÄØ)\82ð\8f\9c\8aO
-rem       : /E \8bó\82ÌÃÞ¨Ú¸ÄØ\82ð\8aÜ\82Þ»ÌÞÃÞ¨Ú¸ÄØ\82ðºËß°
-rem       : /XO \8cÃ\82¢(Older)̧²Ù\82ð\8f\9c\8aO
-rem       : /COPY:ºËß°Ì×¸Þ    ºËß°Ì׸Þ:D=ÃÞ°À A=\91®\90« T=À²Ñ½ÀÝÌß
-rem       : /DCOPY:ºËß°Ì×¸Þ   ÃÞ¨Ú¸ÄØ\82ɺËß°\82·\82é\8fî\95ñ T= À²Ñ½ÀÝÌß
-rem       : /NP ºËß°\82Ì\8a®\97¹\97¦\82ð\95\\8e¦\82µ\82È\82¢
-rem       : /LOG+:̧²Ù Û¸Þ̧²Ù\82É\8fo\97Í(\92Ç\8bL)
-
-robocopy %SRCDIR% %OUTDIR% *.min.js *.min.css *.map jquery-*.* /XD backup /E /XO /COPY:DAT /DCOPY:T /NP /LOG+:log1.txt
-
-pause

diff --git a/uap/webapps/gf/bat/gitDiff/FileDiffDB_V8.bat b/uap/webapps/gf/bat/gitDiff/FileDiffDB_V8.bat
new file mode 100644 (file)
index 0000000..b8254b4
--- /dev/null
+++ b/uap/webapps/gf/bat/gitDiff/FileDiffDB_V8.bat
@@ -0,0 +1,31 @@
+echo off
+call ..\init.bat
+
+set TEMP=%CD%
+set BASEDIR=C:\TEMP\webapps\db_V8
+
+set FROM1=C:\openGion_git\opengionV8\uap\webapps\gf\db
+set FROM2=C:\opengionV8\uap\webapps\gf\db
+
+set OUTPATH=gf\db
+
+call MAIN_FileOmit.bat
+
+
+set FROM1=C:\openGion_git\opengionV8\uap\webapps\ge\db
+set FROM2=C:\opengionV8\uap\webapps\ge\db
+
+set OUTPATH=ge\db
+
+call MAIN_FileOmit.bat
+
+
+set FROM1=C:\openGion_git\opengionV8\uap\webapps\gg\db
+set FROM2=C:\opengionV8\uap\webapps\gg\db
+
+set OUTPATH=gg\db
+
+call MAIN_FileOmit.bat
+
+pause
+

diff --git a/uap/webapps/gf/bat/gitDiff/FileDiff_DEV02.bat b/uap/webapps/gf/bat/gitDiff/FileDiff_DEV02.bat
new file mode 100644 (file)
index 0000000..ac99bd0
--- /dev/null
+++ b/uap/webapps/gf/bat/gitDiff/FileDiff_DEV02.bat
@@ -0,0 +1,64 @@
+echo off
+call ..\init.bat
+
+rem \8dX\90V\93ú\81A\83T\83C\83Y\82Å\94»\92è
+rem set DIFF_CLMS=Length,Modify
+rem set USE_MD5=false
+
+rem \93à\97e\82Ì\83n\83b\83V\83\85\82Å\94»\92è
+set DIFF_CLMS=MD5
+set USE_MD5=true
+
+rem =======================================================
+
+set TEMP=%CD%
+set BASEDIR=C:\TEMP\webapps\dev02
+
+set FROM1=\\mis-dev02\UAP\opengionV8\uap\webapps\gf
+set FROM2=C:\opengionV8\uap\webapps\gf
+
+set OUTPATH=gf
+echo \81y%OUTPATH%\81z
+
+call MAIN_CALL.bat
+ren %BASEDIR%\only1.txt dev02_gf.txt
+ren %BASEDIR%\only2.txt only2_gf.txt
+
+rem ========================
+
+set FROM1=\\mis-dev02\UAP\opengionV8\uap\webapps\ge
+set FROM2=C:\opengionV8\uap\webapps\ge
+
+set OUTPATH=ge
+echo \81y%OUTPATH%\81z
+
+call MAIN_CALL.bat
+ren %BASEDIR%\only1.txt dev02_ge.txt
+ren %BASEDIR%\only2.txt only2_ge.txt
+
+rem ========================
+
+set FROM1=\\mis-dev02\UAP\opengionV8\uap\webapps\gg
+set FROM2=C:\opengionV8\uap\webapps\gg
+
+set OUTPATH=gg
+echo \81y%OUTPATH%\81z
+
+call MAIN_CALL.bat
+ren %BASEDIR%\only1.txt dev02_gg.txt
+ren %BASEDIR%\only2.txt only2_gg.txt
+
+rem ========================
+
+set FROM1=\\mis-dev02\UAP\opengionV8\src
+set FROM2=C:\opengionV8\src
+
+set OUTPATH=src
+echo \81y%OUTPATH%\81z
+
+call MAIN_CALL.bat
+ren %BASEDIR%\only1.txt dev02_src.txt
+ren %BASEDIR%\only2.txt only2_src.txt
+
+pause
+

diff --git a/uap/webapps/gf/bat/gitDiff/FileDiff_EU63.bat b/uap/webapps/gf/bat/gitDiff/FileDiff_EU63.bat
new file mode 100644 (file)
index 0000000..200f5f9
--- /dev/null
+++ b/uap/webapps/gf/bat/gitDiff/FileDiff_EU63.bat
@@ -0,0 +1,47 @@
+echo off
+call ..\init.bat
+
+rem \8dX\90V\93ú\81A\83T\83C\83Y\82Å\94»\92è
+rem set DIFF_CLMS=Length,Modify
+rem set USE_MD5=false
+
+rem \93à\97e\82Ì\83n\83b\83V\83\85\82Å\94»\92è
+set DIFF_CLMS=MD5
+set USE_MD5=true
+
+rem =======================================================
+
+set TEMP=%CD%
+set BASEDIR=C:\TEMP\webapps\eu63
+
+set FROM1=C:\openGion_git\euromap63\uap\webapps\eu63
+set FROM2=C:\euromap\uap\webapps\eu63
+
+set OUTPATH=eu63
+echo \81y%OUTPATH%\81z
+
+call MAIN_CALL.bat
+ren %BASEDIR%\only1.txt only1_GIT_eu63.txt
+ren %BASEDIR%\only2.txt only2_LOCAL_eu63.txt
+
+rem =======================================================
+set UN_DIR2="|MAIL|REP|GE7"
+
+rem GE\82Ì\8d·\95ª\82ð\8eæ\93¾\82µ\82Ü\82·\81B(euromap\82Ì\83t\83H\83\8b\83_\8aî\8f\80)
+set FROM1=C:\euromap\uap\webapps\ge
+set FROM2=C:\opengionV8\uap\webapps\ge
+
+set OUTPATH=V8ge
+echo \81y%OUTPATH%\81z
+
+call MAIN_CALL.bat
+ren %BASEDIR%\only1.txt only1_EU_ge.txt
+ren %BASEDIR%\only2.txt only2_V8_ge.txt
+
+echo ====================================
+ren %BASEDIR%\ONLY1 ONLY1_GIT
+ren %BASEDIR%\ONLY2 ONLY2_LOCAL
+ren %BASEDIR%\DIFF1 DIFF1_GIT_LOCAL
+ren %BASEDIR%\DIFF2 DIFF2_LOCAL_GIT
+
+pause

diff --git a/uap/webapps/gf/bat/gitDiff/FileDiff_GIT8.bat b/uap/webapps/gf/bat/gitDiff/FileDiff_GIT8.bat
new file mode 100644 (file)
index 0000000..836ca41
--- /dev/null
+++ b/uap/webapps/gf/bat/gitDiff/FileDiff_GIT8.bat
@@ -0,0 +1,55 @@
+echo off
+call ..\init.bat
+
+rem \8dX\90V\93ú\81A\83T\83C\83Y\82Å\94»\92è
+rem set DIFF_CLMS=Length,Modify
+rem set USE_MD5=false
+
+rem \93à\97e\82Ì\83n\83b\83V\83\85\82Å\94»\92è
+set DIFF_CLMS=MD5
+set USE_MD5=true
+
+rem =======================================================
+
+set TEMP=%CD%
+set BASEDIR=C:\TEMP\webapps\gitV8
+
+set FROM1=C:\openGion_git\opengionV8\uap\webapps\gf
+set FROM2=C:\opengionV8\uap\webapps\gf
+
+set OUTPATH=gf
+echo \81y%OUTPATH%\81z
+
+call MAIN_CALL.bat
+ren %BASEDIR%\only1.txt only1_GIT_gf.txt
+ren %BASEDIR%\only2.txt only2_LOCAL_gf.txt
+
+
+set FROM1=C:\openGion_git\opengionV8\uap\webapps\ge
+set FROM2=C:\opengionV8\uap\webapps\ge
+
+set OUTPATH=ge
+echo \81y%OUTPATH%\81z
+
+call MAIN_CALL.bat
+ren %BASEDIR%\only1.txt only1_GIT_ge.txt
+ren %BASEDIR%\only2.txt only2_LOCAL_ge.txt
+
+
+set FROM1=C:\openGion_git\opengionV8\uap\webapps\gg
+set FROM2=C:\opengionV8\uap\webapps\gg
+
+set OUTPATH=gg
+echo \81y%OUTPATH%\81z
+
+call MAIN_CALL.bat
+ren %BASEDIR%\only1.txt only1_GIT_gg.txt
+ren %BASEDIR%\only2.txt only2_LOCAL_gg.txt
+
+echo ====================================
+ren %BASEDIR%\ONLY1 ONLY1_GIT
+ren %BASEDIR%\ONLY2 ONLY2_LOCAL
+ren %BASEDIR%\DIFF1 DIFF1_GIT_LOCAL
+ren %BASEDIR%\DIFF2 DIFF2_LOCAL_GIT
+
+pause

diff --git a/uap/webapps/gf/bat/gitDiff/FileDiff_TODAY.bat b/uap/webapps/gf/bat/gitDiff/FileDiff_TODAY.bat
new file mode 100644 (file)
index 0000000..edb877e
--- /dev/null
+++ b/uap/webapps/gf/bat/gitDiff/FileDiff_TODAY.bat
@@ -0,0 +1,75 @@
+echo off
+call ..\init.bat
+
+rem =======================================================
+
+set TEMP=%CD%
+
+rem set FROM1=C:\openGion_git\opengionV5\uap\webapps
+set FROM2=C:\openGion_git\opengionV8\uap\webapps
+set FROM3=C:\opengionV8\uap\webapps
+
+set OUTDIR=C:\TEMP\webapps\today
+
+set UNMATCH="DBConfig.xml|web.xml|init.bat|jccall\.bat|\.gitkeep|Thumbs.db|BuildNumber.java|GE12_Param.xml"
+set UNMATCH_DIR="\.git|entries|bat|builds|backup|filetemp|whatsnew|classes|mics|vd|GF9999|opengionAPI*|javadoc|customUserDef"
+
+rem echo FROM1 \82Ì \96{\93ú\8dX\90V\83t\83@\83C\83\8b\82ð\83s\83b\83N\83A\83b\83v\82µ\82Ü\82·\81B
+rem echo %FROM1%
+rem java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess ^
+rem    org.opengion.fukurou.process.Process_FileSearch                 ^
+rem            -start=%FROM1%                                                                          ^
+rem            -inPath=%FROM1%                                                                         ^
+rem            -modify=TODAY                                                                           ^
+rem            #-modify=YESTERDAY                                                                      ^
+rem            #-suffix=".java|.jsp|.txt|.sql|.xml|.js|.css"           ^
+rem            -unmatch=%UNMATCH%                                                                      ^
+rem            -unmatchDir=%UNMATCH_DIR%                                                       ^
+rem            -display=true                                                                           ^
+rem    org.opengion.fukurou.process.Process_FileCopy                   ^
+rem            -inPath=%FROM1%                                                                         ^
+rem            -binary=true                                                                            ^
+rem            -outPath=%OUTDIR%\svnV5                                                         ^
+rem            -keepTimeStamp=true                                                                     ^
+rem                            > svn1_log.txt
+
+echo FROM2 \82Ì \96{\93ú\8dX\90V\83t\83@\83C\83\8b\82ð\83s\83b\83N\83A\83b\83v\82µ\82Ü\82·\81B
+echo %FROM2%
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_FileSearch                 ^
+               -start=%FROM2%                                                                          ^
+               -inPath=%FROM2%                                                                         ^
+               -modify=TODAY                                                                           ^
+               #-modify=YESTERDAY                                                                      ^
+               #-suffix=".java|.jsp|.txt|.sql|.xml|.js|.css"           ^
+               -unmatch=%UNMATCH%                                                                      ^
+               -unmatchDir=%UNMATCH_DIR%                                                       ^
+               -display=true                                                                           ^
+       org.opengion.fukurou.process.Process_FileCopy                   ^
+               -inPath=%FROM2%                                                                         ^
+               -binary=true                                                                            ^
+               -outPath=%OUTDIR%\gitV8                                                         ^
+               -keepTimeStamp=true                                                                     ^
+                               > git1_log.txt
+
+echo FROM3 \82Ì \96{\93ú\8dX\90V\83t\83@\83C\83\8b\82ð\83s\83b\83N\83A\83b\83v\82µ\82Ü\82·\81B
+echo %FROM3%
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_FileSearch                 ^
+               -start=%FROM3%                                                                          ^
+               -inPath=%FROM3%                                                                         ^
+               -modify=TODAY                                                                           ^
+               #-modify=YESTERDAY                                                                      ^
+               #-suffix=".java|.jsp|.txt|.sql|.xml|.js|.css"           ^
+               -unmatch=%UNMATCH%                                                                      ^
+               -unmatchDir=%UNMATCH_DIR%                                                       ^
+               -display=true                                                                           ^
+       org.opengion.fukurou.process.Process_FileCopy                   ^
+               -inPath=%FROM3%                                                                         ^
+               -binary=true                                                                            ^
+               -outPath=%OUTDIR%\localV8                                                       ^
+               -keepTimeStamp=true                                                                     ^
+                               > local_log.txt
+
+
+pause

diff --git a/uap/webapps/gf/bat/gitDiff/MAIN_CALL.bat b/uap/webapps/gf/bat/gitDiff/MAIN_CALL.bat
new file mode 100644 (file)
index 0000000..3b77b90
--- /dev/null
+++ b/uap/webapps/gf/bat/gitDiff/MAIN_CALL.bat
@@ -0,0 +1,127 @@
+echo off
+
+set UNMATCH="DBConfig.xml|web.xml|init.bat|jccall\.bat|\.gitkeep|Thumbs.db|war-tracker"
+set UNMATCH_DIR="\.git|entries|bat|builds|backup|filetemp|whatsnew|classes|mics|vd|GF9999|opengionAPI*|javadoc|customUserDef"
+
+echo FROM1 \82Ì java,jsp \83t\83@\83C\83\8b\82ð\83s\83b\83N\83A\83b\83v\82µ\82Ü\82·\81B
+rem \82»\82Ì\8dÛ\81AinPath \8ew\92è\82Å\81ABIKO\97\93\82É\8b¤\92Ê\83t\83@\83C\83\8b\96¼\82ð\8fo\97Í\82µ\82Ä\82¨\82«\82Ü\82·\81B
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_FileSearch                 ^
+               -start=%FROM1%                                                                          ^
+               -inPath=%FROM1%                                                                         ^
+               #-modify=YESTERDAY                                                                      ^
+               #-suffix=".java|.jsp|.txt|.sql|.xml|.js|.css"           ^
+               -unmatch=%UNMATCH%                                                                      ^
+               -unmatchDir=%UNMATCH_DIR%%UN_DIR2%                                      ^
+               -useMD5=%USE_MD5%                                                                       ^
+               #-display=true                                                                          ^
+       org.opengion.fukurou.process.Process_TableWriter                ^
+               -outfile=%BASEDIR%\FROM1.txt
+
+echo FROM2 \82Ì java,jsp \83t\83@\83C\83\8b\82ð\83s\83b\83N\83A\83b\83v\82µ\82Ü\82·\81B
+rem \82»\82Ì\8dÛ\81AinPath \8ew\92è\82Å\81ABIKO\97\93\82É\8b¤\92Ê\83t\83@\83C\83\8b\96¼\82ð\8fo\97Í\82µ\82Ä\82¨\82«\82Ü\82·\81B
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_FileSearch                 ^
+               -start=%FROM2%                                                                          ^
+               -inPath=%FROM2%                                                                         ^
+               #-suffix=".java|.jsp|.txt|.sql|.xml|.js|.css"           ^
+               -unmatch=%UNMATCH%                                                                      ^
+               -unmatchDir=%UNMATCH_DIR%%UN_DIR2%                                      ^
+               -useMD5=%USE_MD5%                                                                       ^
+               #-display=true                                                                          ^
+       org.opengion.fukurou.process.Process_TableWriter                ^
+               -outfile=%BASEDIR%\FROM2.txt
+
+:DIFF_ONLY
+
+rem FROM1.txt \82Æ FROM2.txt \82ð\94ä\8ar\82µ\81AFROM1 \82Æ FROM2 \82Ì\8d·\82ð\92\8a\8fo\82µ\82Ü\82·\81B
+rem \82»\82Ì\82Æ\82«\81A\94ä\8ar\83L\81[\82Í\81A\8b¤\92Ê\89»\82µ\82½\81ABIKO \97\93\82ð\8ew\92è\82µ\82Ü\82·\81B
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_TableDiff                  ^
+               -infile1=%BASEDIR%\FROM1.txt                                            ^
+               -infile2=%BASEDIR%\FROM2.txt                                            ^
+               -action=DIFF                                                                            ^
+               -keyClms=Biko                                                                           ^
+               -diffClms=%DIFF_CLMS%                                                           ^
+               #-debug=true                                                                            ^
+               #-display=true                                                                          ^
+       org.opengion.fukurou.process.Process_TableWriter                ^
+               -outfile=%BASEDIR%\diff1_log.txt                                        ^
+       org.opengion.fukurou.process.Process_FileCopy                   ^
+               -inPath=%FROM1%                                                                         ^
+               -binary=true                                                                            ^
+               #-inEncode=UTF-8                                                                        ^
+               -outPath=%BASEDIR%\DIFF1\%OUTPATH%                                      ^
+               #-outEncode=UTF-8                                                                       ^
+               -keepTimeStamp=true
+
+
+echo FROM1.txt \82Æ FROM2.txt \82ð\94ä\8ar\82µ\81AFROM1 \82Æ FROM2 \82Ì\8d·\82ð\92\8a\8fo\82µ\82Ü\82·\81B
+rem \82»\82Ì\82Æ\82«\81A\94ä\8ar\83L\81[\82Í\81A\8b¤\92Ê\89»\82µ\82½\81ABIKO \97\93\82ð\8ew\92è\82µ\82Ü\82·\81B
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_TableDiff                  ^
+               -infile1=%BASEDIR%\FROM2.txt                                            ^
+               -infile2=%BASEDIR%\FROM1.txt                                            ^
+               -action=DIFF                                                                            ^
+               -keyClms=Biko                                                                           ^
+               -diffClms=%DIFF_CLMS%                                                           ^
+               #-debug=true                                                                            ^
+               #-display=true                                                                          ^
+       org.opengion.fukurou.process.Process_TableWriter                ^
+               -outfile=%BASEDIR%\diff2_log.txt                                        ^
+       org.opengion.fukurou.process.Process_FileCopy                   ^
+               -inPath=%FROM2%                                                                         ^
+               -binary=true                                                                            ^
+               #-inEncode=UTF-8                                                                        ^
+               -outPath=%BASEDIR%\DIFF2\%OUTPATH%                                      ^
+               #-outEncode=UTF-8                                                                       ^
+               -keepTimeStamp=true
+
+echo FROM1.txt \82Æ FROM2.txt \82ð\94ä\8ar\82µ\81AFROM1 \82Ì\82Ý\82É\91¶\8dÝ\82·\82é\83t\83@\83C\83\8b\82ð\92\8a\8fo\82µ\82Ü\82·\81B
+rem \82»\82Ì\82Æ\82«\81A\94ä\8ar\83L\81[\82Í\81A\8b¤\92Ê\89»\82µ\82½\81ABIKO \97\93\82ð\8ew\92è\82µ\82Ü\82·\81B
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_TableDiff                  ^
+               -infile1=%BASEDIR%\FROM1.txt                                            ^
+               -infile2=%BASEDIR%\FROM2.txt                                            ^
+               -action=ONLY                                                                            ^
+               -keyClms=Biko                                                                           ^
+               -diffClms=%DIFF_CLMS%                                                           ^
+               #-debug=true                                                                            ^
+               #-display=true                                                                          ^
+       org.opengion.fukurou.process.Process_TableWriter                ^
+               -useHeader=false                                                                        ^
+               -useNumber=false                                                                        ^
+               -lineFormat="del \"[File]\""                                            ^
+               -outfile=%BASEDIR%\only1.txt                                            ^
+       org.opengion.fukurou.process.Process_FileCopy                   ^
+               -inPath=%FROM1%                                                                         ^
+               -binary=true                                                                            ^
+               #-inEncode=UTF-8                                                                        ^
+               -outPath=%BASEDIR%\ONLY1\%OUTPATH%                                      ^
+               #-outEncode=UTF-8                                                                       ^
+               -keepTimeStamp=true
+
+echo FROM1.txt \82Æ FROM2.txt \82ð\94ä\8ar\82µ\81AFROM2 \82Ì\82Ý\82É\91¶\8dÝ\82·\82é\83t\83@\83C\83\8b\82ð\92\8a\8fo\82µ\82Ü\82·\81B
+rem \82»\82Ì\82Æ\82«\81A\94ä\8ar\83L\81[\82Í\81A\8b¤\92Ê\89»\82µ\82½\81ABIKO \97\93\82ð\8ew\92è\82µ\82Ü\82·\81B
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_TableDiff                  ^
+               -infile1=%BASEDIR%\FROM2.txt                                            ^
+               -infile2=%BASEDIR%\FROM1.txt                                            ^
+               -action=ONLY                                                                            ^
+               -keyClms=Biko                                                                           ^
+               -diffClms=%DIFF_CLMS%                                                           ^
+               #-debug=true                                                                            ^
+               #-display=true                                                                          ^
+       org.opengion.fukurou.process.Process_TableWriter                ^
+               -useHeader=false                                                                        ^
+               -useNumber=false                                                                        ^
+               -lineFormat="del \"[File]\""                                            ^
+               -outfile=%BASEDIR%\only2.txt                                            ^
+       org.opengion.fukurou.process.Process_FileCopy                   ^
+               -inPath=%FROM2%                                                                         ^
+               -binary=true                                                                            ^
+               #-inEncode=UTF-8                                                                        ^
+               -outPath=%BASEDIR%\ONLY2\%OUTPATH%                                      ^
+               #-outEncode=UTF-8                                                                       ^
+               -keepTimeStamp=true
+

diff --git a/uap/webapps/gf/bat/gitDiff/MAIN_FileOmit.bat b/uap/webapps/gf/bat/gitDiff/MAIN_FileOmit.bat
new file mode 100644 (file)
index 0000000..cf010f6
--- /dev/null
+++ b/uap/webapps/gf/bat/gitDiff/MAIN_FileOmit.bat
@@ -0,0 +1,88 @@
+echo off
+
+set UNMATCH="DBConfig.xml|web.xml|init.bat|jccall\.bat|\.gitkeep|Thumbs.db|war-tracker"
+set UNMATCH_DIR="\.git|entries|bat|builds|backup|filetemp|whatsnew|classes|mics|vd|GF9999|opengionAPI*|javadoc|customUserDef"
+
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_FileSearch                 ^
+               -start=%FROM1%                                                                          ^
+               -inPath=%FROM1%                                                                         ^
+               -suffix=".sql|.xml"                                                                     ^
+               -unmatch=%UNMATCH%                                                                      ^
+               -unmatchDir=%UNMATCH_DIR%                                                       ^
+               -useOmitCmnt=true                                                                       ^
+               -useMD5=true                                                                            ^
+               -encode=UTF-8                                                                           ^
+               #-display=true                                                                          ^
+       org.opengion.fukurou.process.Process_TableWriter                ^
+               -outfile=%BASEDIR%\FROM1.txt
+
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_FileSearch                 ^
+               -start=%FROM2%                                                                          ^
+               -inPath=%FROM2%                                                                         ^
+               -suffix=".sql|.xml"                                                                     ^
+               -unmatch=%UNMATCH%                                                                      ^
+               -unmatchDir=%UNMATCH_DIR%                                                       ^
+               -useOmitCmnt=true                                                                       ^
+               -useMD5=true                                                                            ^
+               -encode=UTF-8                                                                           ^
+               #-display=true                                                                          ^
+       org.opengion.fukurou.process.Process_TableWriter                ^
+               -outfile=%BASEDIR%\FROM2.txt
+
+echo FROM1.txt \82Æ FROM2.txt \82ð\94ä\8ar\82µ\81AFROM1 \82Æ FROM2 \82Ì\8d·\82ð\92\8a\8fo\82µ\82Ü\82·\81B
+rem \82»\82Ì\82Æ\82«\81A\94ä\8ar\83L\81[\82Í\81A\8b¤\92Ê\89»\82µ\82½\81ABIKO \97\93\82ð\8ew\92è\82µ\82Ü\82·\81B
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_TableDiff                  ^
+               -infile1=%BASEDIR%\FROM2.txt                                            ^
+               -infile2=%BASEDIR%\FROM1.txt                                            ^
+               -action=DIFF                                                                            ^
+               -keyClms=Biko                                                                           ^
+               -diffClms=MD5                                                                           ^
+               #-debug=true                                                                            ^
+               #-display=true                                                                          ^
+       org.opengion.fukurou.process.Process_TableWriter                ^
+               -outfile=%BASEDIR%\diff2_log.txt                                        ^
+       org.opengion.fukurou.process.Process_FileCopy                   ^
+               -inPath=%FROM2%                                                                         ^
+               -binary=true                                                                            ^
+               #-inEncode=UTF-8                                                                        ^
+               -outPath=%BASEDIR%\%OUTPATH%                                            ^
+               #-outEncode=UTF-8                                                                       ^
+               -keepTimeStamp=true
+
+echo FROM1.txt \82Æ FROM2.txt \82ð\94ä\8ar\82µ\81AFROM1 \82Ì\82Ý\82É\91¶\8dÝ\82·\82é\83t\83@\83C\83\8b\82ð\92\8a\8fo\82µ\82Ü\82·\81B
+rem \82»\82Ì\82Æ\82«\81A\94ä\8ar\83L\81[\82Í\81A\8b¤\92Ê\89»\82µ\82½\81ABIKO \97\93\82ð\8ew\92è\82µ\82Ü\82·\81B
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_TableDiff                  ^
+               -infile1=%BASEDIR%\FROM1.txt                                            ^
+               -infile2=%BASEDIR%\FROM2.txt                                            ^
+               -action=ONLY                                                                            ^
+               -keyClms=Biko                                                                           ^
+               -diffClms=MD5                                                                           ^
+               #-debug=true                                                                            ^
+               #-display=true                                                                          ^
+       org.opengion.fukurou.process.Process_TableWriter                ^
+               -useHeader=false                                                                        ^
+               -useNumber=false                                                                        ^
+               -lineFormat="del \"[File]\""                                            ^
+               -outfile=%BASEDIR%\only1.txt
+
+echo FROM1.txt \82Æ FROM2.txt \82ð\94ä\8ar\82µ\81AFROM2 \82Ì\82Ý\82É\91¶\8dÝ\82·\82é\83t\83@\83C\83\8b\82ð\92\8a\8fo\82µ\82Ü\82·\81B
+rem \82»\82Ì\82Æ\82«\81A\94ä\8ar\83L\81[\82Í\81A\8b¤\92Ê\89»\82µ\82½\81ABIKO \97\93\82ð\8ew\92è\82µ\82Ü\82·\81B
+java -classpath %CLASSPATH%;%CLS% org.opengion.fukurou.process.MainProcess     ^
+       org.opengion.fukurou.process.Process_TableDiff                  ^
+               -infile1=%BASEDIR%\FROM2.txt                                            ^
+               -infile2=%BASEDIR%\FROM1.txt                                            ^
+               -action=ONLY                                                                            ^
+               -keyClms=Biko                                                                           ^
+               -diffClms=MD5                                                                           ^
+               #-debug=true                                                                            ^
+               #-display=true                                                                          ^
+       org.opengion.fukurou.process.Process_TableWriter                ^
+               -useHeader=false                                                                        ^
+               -useNumber=false                                                                        ^
+               -lineFormat="del \"[File]\""                                            ^
+               -outfile=%BASEDIR%\only2.txt
+