From 1af5d32b813e07e8f74def721fdf1d68a53909ed Mon Sep 17 00:00:00 2001
From: "gyeongseok.seo" <gyeongseok.seo@samsung.com>
Date: Thu, 21 Mar 2013 12:23:46 +0900
Subject: [PATCH] [Title] Fixed - java runtime option [Desc.] -Djava.ext.dirs
 options remove [Issue] #8810

Change-Id: Ib0b017fcd39427bf11d2c915a4ee5f9776595d3d
---
 org.tizen.cli/doc/install/bin_/web-debug.bat     |  7 ++++++-
 org.tizen.cli/doc/install/bin_/web-gen.bat       |  7 ++++++-
 org.tizen.cli/doc/install/bin_/web-install.bat   |  7 ++++++-
 org.tizen.cli/doc/install/bin_/web-list.bat      |  7 ++++++-
 org.tizen.cli/doc/install/bin_/web-packaging.bat |  7 ++++++-
 org.tizen.cli/doc/install/bin_/web-run.bat       |  7 ++++++-
 org.tizen.cli/doc/install/bin_/web-signing.bat   |  7 ++++++-
 org.tizen.cli/doc/install/bin_/web-template.bat  |  7 ++++++-
 org.tizen.cli/doc/install/bin_/web-uninstall.bat |  7 ++++++-
 org.tizen.cli/doc/install/bin_/webtizen.bat      | 10 +++++++++-
 10 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/org.tizen.cli/doc/install/bin_/web-debug.bat b/org.tizen.cli/doc/install/bin_/web-debug.bat
index 2c77872..dc1a859 100644
--- a/org.tizen.cli/doc/install/bin_/web-debug.bat
+++ b/org.tizen.cli/doc/install/bin_/web-debug.bat
@@ -17,6 +17,9 @@ set CLI_HOME=%SDK_PATH%\tools\ide
 
 set MAIN=org.tizen.cli.exec.debug.Main
 
+set classpath=
+FOR %%i IN ("%CLI_HOME%\lib\*.jar") DO ( call:CONCAT %%i )
+
 set OPT_TRACE=
 set OPT_LOGGING=-Dlog4j.configuration=log4j.xml
 set OPT_PRG_NAME=-Dcli.name=%SCRIPT%
@@ -26,7 +29,7 @@ set READ_ARG="n"
 FOR %%W IN ( %* ) DO ( call:parseArg %%W )
 
 set OPT=%OPT_TRACE% %OPT_LOGGING% %OPT_PRG_NAME%
-set EXEC=java -cp %CLI_HOME%\conf -Djava.ext.dirs=%CLI_HOME%\lib %OPT% %MAIN% %*
+set EXEC=java -cp %CLI_HOME%\conf;%classpath% %OPT% %MAIN% %*
 
 IF NOT "" == "%OPT_TRACE%" ( echo Command :%EXEC% )
 
@@ -53,3 +56,5 @@ goto:eof
     set READ_ARG="y"
     goto END_STEP
 
+:CONCAT
+    set classpath=%classpath%%1;
diff --git a/org.tizen.cli/doc/install/bin_/web-gen.bat b/org.tizen.cli/doc/install/bin_/web-gen.bat
index dd708f1..4564693 100644
--- a/org.tizen.cli/doc/install/bin_/web-gen.bat
+++ b/org.tizen.cli/doc/install/bin_/web-gen.bat
@@ -17,6 +17,9 @@ set CLI_HOME=%SDK_PATH%\tools\ide
 
 set MAIN=org.tizen.cli.exec.gen.Main
 
+set classpath=
+FOR %%i IN ("%CLI_HOME%\lib\*.jar") DO ( call:CONCAT %%i )
+
 set OPT_TRACE=
 set OPT_LOGGING=-Dlog4j.configuration=log4j.xml
 set OPT_PRG_NAME=-Dcli.name=%SCRIPT%
@@ -26,7 +29,7 @@ set READ_ARG="n"
 FOR %%W IN ( %* ) DO ( call:parseArg %%W )
 
 set OPT=%OPT_TRACE% %OPT_LOGGING% %OPT_PRG_NAME%
-set EXEC=java -cp %CLI_HOME%\conf -Djava.ext.dirs=%CLI_HOME%\lib %OPT% %MAIN% %*
+set EXEC=java -cp %CLI_HOME%\conf;%classpath% %OPT% %MAIN% %*
 
 IF NOT "" == "%OPT_TRACE%" ( echo Command :%EXEC% )
 
@@ -53,3 +56,5 @@ goto:eof
     set READ_ARG="y"
     goto END_STEP
 
+:CONCAT
+    set classpath=%classpath%%1;
diff --git a/org.tizen.cli/doc/install/bin_/web-install.bat b/org.tizen.cli/doc/install/bin_/web-install.bat
index f3b72cd..1fbcf52 100644
--- a/org.tizen.cli/doc/install/bin_/web-install.bat
+++ b/org.tizen.cli/doc/install/bin_/web-install.bat
@@ -17,6 +17,9 @@ set CLI_HOME=%SDK_PATH%\tools\ide
 
 set MAIN=org.tizen.cli.exec.install.Main
 
+set classpath=
+FOR %%i IN ("%CLI_HOME%\lib\*.jar") DO ( call:CONCAT %%i )
+
 set OPT_TRACE=
 set OPT_LOGGING=-Dlog4j.configuration=log4j.xml
 set OPT_PRG_NAME=-Dcli.name=%SCRIPT%
@@ -26,7 +29,7 @@ set READ_ARG="n"
 FOR %%W IN ( %* ) DO ( call:parseArg %%W )
 
 set OPT=%OPT_TRACE% %OPT_LOGGING% %OPT_PRG_NAME%
-set EXEC=java -cp %CLI_HOME%\conf -Djava.ext.dirs=%CLI_HOME%\lib %OPT% %MAIN% %*
+set EXEC=java -cp %CLI_HOME%\conf;%classpath% %OPT% %MAIN% %*
 
 IF NOT "" == "%OPT_TRACE%" ( echo Command :%EXEC% )
 
@@ -54,3 +57,5 @@ goto:eof
     set READ_ARG="y"
     goto END_STEP
 
+:CONCAT
+    set classpath=%classpath%%1;
diff --git a/org.tizen.cli/doc/install/bin_/web-list.bat b/org.tizen.cli/doc/install/bin_/web-list.bat
index 7648e0b..a50ce2d 100644
--- a/org.tizen.cli/doc/install/bin_/web-list.bat
+++ b/org.tizen.cli/doc/install/bin_/web-list.bat
@@ -17,6 +17,9 @@ set CLI_HOME=%SDK_PATH%\tools\ide
 
 set MAIN=org.tizen.cli.exec.query.Main
 
+set classpath=
+FOR %%i IN ("%CLI_HOME%\lib\*.jar") DO ( call:CONCAT %%i )
+
 set OPT_TRACE=
 set OPT_LOGGING=-Dlog4j.configuration=log4j.xml
 set OPT_PRG_NAME=-Dcli.name=%SCRIPT%
@@ -26,7 +29,7 @@ set READ_ARG="n"
 FOR %%W IN ( %* ) DO ( call:parseArg %%W )
 
 set OPT=%OPT_TRACE% %OPT_LOGGING% %OPT_PRG_NAME%
-set EXEC=java -cp %CLI_HOME%\conf -Djava.ext.dirs=%CLI_HOME%\lib %OPT% %MAIN% %*
+set EXEC=java -cp %CLI_HOME%\conf;%classpath% %OPT% %MAIN% %*
 
 IF NOT "" == "%OPT_TRACE%" ( echo Command :%EXEC% )
 
@@ -53,3 +56,5 @@ goto:eof
     set READ_ARG="y"
     goto END_STEP
 
+:CONCAT
+    set classpath=%classpath%%1;
diff --git a/org.tizen.cli/doc/install/bin_/web-packaging.bat b/org.tizen.cli/doc/install/bin_/web-packaging.bat
index a308f91..218fd1b 100644
--- a/org.tizen.cli/doc/install/bin_/web-packaging.bat
+++ b/org.tizen.cli/doc/install/bin_/web-packaging.bat
@@ -17,6 +17,9 @@ set CLI_HOME=%SDK_PATH%\tools\ide
 
 set MAIN=org.tizen.cli.exec.wgt.Main
 
+set classpath=
+FOR %%i IN ("%CLI_HOME%\lib\*.jar") DO ( call:CONCAT %%i )
+
 set OPT_TRACE=
 set OPT_LOGGING=-Dlog4j.configuration=log4j.xml
 set OPT_PRG_NAME=-Dcli.name=%SCRIPT%
@@ -26,7 +29,7 @@ set READ_ARG="n"
 FOR %%W IN ( %* ) DO ( call:parseArg %%W )
 
 set OPT=%OPT_TRACE% %OPT_LOGGING% %OPT_PRG_NAME%
-set EXEC=java -cp %CLI_HOME%\conf -Djava.ext.dirs=%CLI_HOME%\lib %OPT% %MAIN% %*
+set EXEC=java -cp %CLI_HOME%\conf;%classpath% %OPT% %MAIN% %*
 
 IF NOT "" == "%OPT_TRACE%" ( echo Command :%EXEC% )
 
@@ -53,3 +56,5 @@ goto:eof
     set READ_ARG="y"
     goto END_STEP
 
+:CONCAT
+    set classpath=%classpath%%1;
diff --git a/org.tizen.cli/doc/install/bin_/web-run.bat b/org.tizen.cli/doc/install/bin_/web-run.bat
index 8ee2afc..ca0df3b 100644
--- a/org.tizen.cli/doc/install/bin_/web-run.bat
+++ b/org.tizen.cli/doc/install/bin_/web-run.bat
@@ -17,6 +17,9 @@ set CLI_HOME=%SDK_PATH%\tools\ide
 
 set MAIN=org.tizen.cli.exec.run.Main
 
+set classpath=
+FOR %%i IN ("%CLI_HOME%\lib\*.jar") DO ( call:CONCAT %%i )
+
 set OPT_TRACE=
 set OPT_LOGGING=-Dlog4j.configuration=log4j.xml
 set OPT_PRG_NAME=-Dcli.name=%SCRIPT%
@@ -26,7 +29,7 @@ set READ_ARG="n"
 FOR %%W IN ( %* ) DO ( call:parseArg %%W )
 
 set OPT=%OPT_TRACE% %OPT_LOGGING% %OPT_PRG_NAME%
-set EXEC=java -cp %CLI_HOME%\conf -Djava.ext.dirs=%CLI_HOME%\lib %OPT% %MAIN% %*
+set EXEC=java -cp %CLI_HOME%\conf;%classpath% %OPT% %MAIN% %*
 
 IF NOT "" == "%OPT_TRACE%" ( echo Command :%EXEC% )
 
@@ -53,3 +56,5 @@ goto:eof
     set READ_ARG="y"
     goto END_STEP
 
+:CONCAT
+    set classpath=%classpath%%1;
diff --git a/org.tizen.cli/doc/install/bin_/web-signing.bat b/org.tizen.cli/doc/install/bin_/web-signing.bat
index d311341..a794c70 100644
--- a/org.tizen.cli/doc/install/bin_/web-signing.bat
+++ b/org.tizen.cli/doc/install/bin_/web-signing.bat
@@ -17,6 +17,9 @@ set CLI_HOME=%SDK_PATH%\tools\ide
 
 set MAIN=org.tizen.cli.exec.sign.Main
 
+set classpath=
+FOR %%i IN ("%CLI_HOME%\lib\*.jar") DO ( call:CONCAT %%i )
+
 set OPT_TRACE=
 set OPT_LOGGING=-Dlog4j.configuration=log4j.xml
 set OPT_PRG_NAME=-Dcli.name=%SCRIPT%
@@ -26,7 +29,7 @@ set READ_ARG="n"
 FOR %%W IN ( %* ) DO ( call:parseArg %%W )
 
 set OPT=%OPT_TRACE% %OPT_LOGGING% %OPT_PRG_NAME%
-set EXEC=java -cp %CLI_HOME%\conf -Djava.ext.dirs=%CLI_HOME%\lib %OPT% %MAIN% %*
+set EXEC=java -cp %CLI_HOME%\conf;%classpath% %OPT% %MAIN% %*
 
 IF NOT "" == "%OPT_TRACE%" ( echo Command :%EXEC% )
 
@@ -53,3 +56,5 @@ goto:eof
     set READ_ARG="y"
     goto END_STEP
 
+:CONCAT
+    set classpath=%classpath%%1;
diff --git a/org.tizen.cli/doc/install/bin_/web-template.bat b/org.tizen.cli/doc/install/bin_/web-template.bat
index 7438844..0669a16 100755
--- a/org.tizen.cli/doc/install/bin_/web-template.bat
+++ b/org.tizen.cli/doc/install/bin_/web-template.bat
@@ -17,6 +17,9 @@ set CLI_HOME=%SDK_PATH%\tools\ide
 
 set MAIN=org.tizen.cli.exec.template.ClientMain
 
+set classpath=
+FOR %%i IN ("%CLI_HOME%\lib\*.jar") DO ( call:CONCAT %%i )
+
 set OPT_TRACE=
 set OPT_LOGGING=-Dlog4j.configuration=log4j.xml
 set OPT_PRG_NAME=-Dcli.name=%SCRIPT%
@@ -26,7 +29,7 @@ set READ_ARG="n"
 FOR %%W IN ( %* ) DO ( call:parseArg %%W )
 
 set OPT=%OPT_TRACE% %OPT_LOGGING% %OPT_PRG_NAME% -Dtizen.template.realm=file://%CLI_HOME%\realm\config.json
-set EXEC=java -cp %CLI_HOME%\conf -Djava.ext.dirs=%CLI_HOME%\lib %OPT% %MAIN% %*
+set EXEC=java -cp %CLI_HOME%\conf;%classpath% %OPT% %MAIN% %*
 
 IF NOT "" == "%OPT_TRACE%" ( echo Command :%EXEC% )
 
@@ -53,3 +56,5 @@ goto:eof
     set READ_ARG="y"
     goto END_STEP
 
+:CONCAT
+    set classpath=%classpath%%1;
diff --git a/org.tizen.cli/doc/install/bin_/web-uninstall.bat b/org.tizen.cli/doc/install/bin_/web-uninstall.bat
index 7ed2b59..20edfa7 100644
--- a/org.tizen.cli/doc/install/bin_/web-uninstall.bat
+++ b/org.tizen.cli/doc/install/bin_/web-uninstall.bat
@@ -17,6 +17,9 @@ set CLI_HOME=%SDK_PATH%\tools\ide
 
 set MAIN=org.tizen.cli.exec.uninstall.Main
 
+set classpath=
+FOR %%i IN ("%CLI_HOME%\lib\*.jar") DO ( call:CONCAT %%i )
+
 set OPT_TRACE=
 set OPT_LOGGING=-Dlog4j.configuration=log4j.xml
 set OPT_PRG_NAME=-Dcli.name=%SCRIPT%
@@ -26,7 +29,7 @@ set READ_ARG="n"
 FOR %%W IN ( %* ) DO ( call:parseArg %%W )
 
 set OPT=%OPT_TRACE% %OPT_LOGGING% %OPT_PRG_NAME%
-set EXEC=java -cp %CLI_HOME%\conf -Djava.ext.dirs=%CLI_HOME%\lib %OPT% %MAIN% %*
+set EXEC=java -cp %CLI_HOME%\conf;%classpath% %OPT% %MAIN% %*
 
 IF NOT "" == "%OPT_TRACE%" ( echo Command :%EXEC% )
 
@@ -53,3 +56,5 @@ goto:eof
     set READ_ARG="y"
     goto END_STEP
 
+:CONCAT
+    set classpath=%classpath%%1;
diff --git a/org.tizen.cli/doc/install/bin_/webtizen.bat b/org.tizen.cli/doc/install/bin_/webtizen.bat
index 676892d..ea95d56 100644
--- a/org.tizen.cli/doc/install/bin_/webtizen.bat
+++ b/org.tizen.cli/doc/install/bin_/webtizen.bat
@@ -117,8 +117,11 @@ REM command excute method
 :_run_command
     FOR %%W IN ( %CMDLINE% ) DO ( call:parseArg %%W )
 
+    set classpath=
+    FOR %%i IN ("%CLI_HOME%\lib\*.jar") DO ( call:CONCAT %%i )
+
     set OPT=%OPT_TRACE% %OPT_LOGGING% %OPT_PRG_NAME%
-    set EXEC=java -cp %CLI_HOME%\conf -Djava.ext.dirs=%CLI_HOME%\lib %OPT% %MAIN% %CMDLINE%
+    set EXEC=java -cp %CLI_HOME%\conf;%classpath% %OPT% %MAIN% %CMDLINE%
 
     IF NOT "" == "%OPT_TRACE%" ( echo Command :%EXEC% )
 
@@ -151,3 +154,8 @@ goto:END_STEP
 REM exit script
 :EXIT_STEP
 goto:eof
+
+REM concatenation lib
+:CONCAT
+    set classpath=%classpath%%1;
+goto:END_STEP
-- 
2.7.4