From: Bon-Yong Lee Date: Tue, 27 Nov 2012 07:07:44 +0000 (+0900) Subject: [Title] fix script bug and add realm.jar X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f398145adccc104112aab2648f765982153014e;p=sdk%2Ftools%2Fcli.git [Title] fix script bug and add realm.jar [Desc.] [Issue] --- diff --git a/org.tizen.cli/doc/install/bin_/web-template b/org.tizen.cli/doc/install/bin_/web-template index 7673f9d..8b8b18d 100755 --- a/org.tizen.cli/doc/install/bin_/web-template +++ b/org.tizen.cli/doc/install/bin_/web-template @@ -24,7 +24,7 @@ for ARG in "$@" ; do ARGS="$ARGS $(escapeSpace $ARG)" done -OPT="$OPT -Dtizen.template.realm=file://$DIR_HOME/realm/config.json" +OPT="$OPT -Dtizen.template.realm=file:///$DIR_HOME/realm/config.json" EXEC="java -cp $CLASSPATH $OPT $MAIN $ARGS" diff --git a/org.tizen.cli/doc/install/bin_/web-template.bat b/org.tizen.cli/doc/install/bin_/web-template.bat index f022e7c..719f2ae 100644 --- a/org.tizen.cli/doc/install/bin_/web-template.bat +++ b/org.tizen.cli/doc/install/bin_/web-template.bat @@ -25,7 +25,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 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% %* IF NOT "" == "%OPT_TRACE%" ( echo Command :%EXEC% ) diff --git a/org.tizen.cli/doc/install/realm/realm.jar b/org.tizen.cli/doc/install/realm/realm.jar new file mode 100644 index 0000000..6157c38 Binary files /dev/null and b/org.tizen.cli/doc/install/realm/realm.jar differ diff --git a/org.tizen.cli/src/org/tizen/cli/exec/template/ClientMain.java b/org.tizen.cli/src/org/tizen/cli/exec/template/ClientMain.java index 4457457..28952dd 100755 --- a/org.tizen.cli/src/org/tizen/cli/exec/template/ClientMain.java +++ b/org.tizen.cli/src/org/tizen/cli/exec/template/ClientMain.java @@ -120,6 +120,7 @@ implements ILaunchOptions } catch ( final Throwable e ) { + logger.error( "Error :", e ); getPrompter().error( "Invalid realm!! Check realm and its contents :" + urlStr ); return ; } diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32 index 6d9645a..2d89e21 100755 --- a/package/build.ubuntu-32 +++ b/package/build.ubuntu-32 @@ -87,6 +87,8 @@ install() ;; esac cp -r $PROJECT_HOME/doc/install/conf $TARGET/conf + cp -r $PROJECT_HOME/doc/install/sample $TARGET/sample + cp -r $PROJECT_HOME/doc/install/realm $TARGET/realm cp -r $LIB/* $TARGET/lib cp dist/*.jar $TARGET/lib } diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64 index 6d9645a..2d89e21 100755 --- a/package/build.ubuntu-64 +++ b/package/build.ubuntu-64 @@ -87,6 +87,8 @@ install() ;; esac cp -r $PROJECT_HOME/doc/install/conf $TARGET/conf + cp -r $PROJECT_HOME/doc/install/sample $TARGET/sample + cp -r $PROJECT_HOME/doc/install/realm $TARGET/realm cp -r $LIB/* $TARGET/lib cp dist/*.jar $TARGET/lib } diff --git a/package/changelog b/package/changelog index c7ec162..cca0ea6 100644 --- a/package/changelog +++ b/package/changelog @@ -1,4 +1,4 @@ -* 1.0.24 +* 1.0.25 - Template with CLI == bylee 2012-11-25 16:59 * 1.0.22 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index a6f28e9..5351d0a 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version:1.0.24 +Version:1.0.25 Maintainer: Bon-Yong Lee, gyeongseok seo Package: web-cli