GENERATE: check project's name.

check project's name.(Issue:
https://bugs.tizen.org/jira/browse/TDIST-522)

Change-Id: I6547d14b336b579fe21cabfe9c12d79e174e2e37
Signed-off-by: Taeyoung Son <taeyoung2.son@samsung.com>

diff --git a/org.tizen.cli/META-INF/MANIFEST.MF b/org.tizen.cli/META-INF/MANIFEST.MF
index 00700bf..11d303d 100755 (executable)
--- a/org.tizen.cli/META-INF/MANIFEST.MF
+++ b/org.tizen.cli/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Require-Bundle: org.tizen.web.common,
  org.tizen.common.verrari,
  org.tizen.common.verrari.realm,
  org.tizen.common.builder,
- org.tizen.web.builder
+ org.tizen.web.builder,
+ org.tizen.common.project
 Bundle-ClassPath: .,
  lib/ant.jar,
  lib/commons-cli-1.2.jar

diff --git a/org.tizen.cli/src/org/tizen/cli/exec/gen/Main.java b/org.tizen.cli/src/org/tizen/cli/exec/gen/Main.java
index 77475db..ce53fc6 100644 (file)
--- a/org.tizen.cli/src/org/tizen/cli/exec/gen/Main.java
+++ b/org.tizen.cli/src/org/tizen/cli/exec/gen/Main.java
@@ -27,13 +27,13 @@
 */
 package org.tizen.cli.exec.gen;
 
-import java.io.File;
-import java.text.MessageFormat;
-
-import static org.tizen.cli.exec.LaunchOptionConstants.OPT_NAME;
-import static org.tizen.cli.exec.LaunchOptionConstants.OPT_PATH;
 import static org.tizen.cli.exec.LaunchOptionConstants.DESC_NAME;
 import static org.tizen.cli.exec.LaunchOptionConstants.DESC_PATH;
+import static org.tizen.cli.exec.LaunchOptionConstants.OPT_NAME;
+import static org.tizen.cli.exec.LaunchOptionConstants.OPT_PATH;
+
+import java.io.File;
+import java.text.MessageFormat;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.OptionBuilder;
@@ -43,6 +43,7 @@ import org.tizen.cli.exec.Help;
 import org.tizen.common.core.command.Prompter;
 import org.tizen.common.core.command.prompter.ChoiceOption;
 import org.tizen.common.core.command.prompter.Option;
+import org.tizen.common.project.util.ProjectValidationUtil;
 import org.tizen.common.util.ObjectUtil;
 import org.tizen.common.util.StringUtil;
 import org.tizen.web.project.wizard.cli.command.ProjectGenCommand;
@@ -60,7 +61,6 @@ Main
 extends AbstractLauncher
 {
 
-
        /**
         * Entry point for cli main
         * 
@@ -96,6 +96,11 @@ extends AbstractLauncher
                String name = cmdLine.getOptionValue( OPT_NAME );
                String path = cmdLine.getOptionValue( OPT_PATH );
 
+        if (!ProjectValidationUtil.isValidNameForAppID(name)) {
+            prompter.error(Messages.getString("Web.ERROR_MSG_INVALID_PROJECT_NAME"));
+            return;
+        }
+
                logger.trace( "set user input options" );
                command.setProjectName( name );
                command.setTargetPath( new File(StringUtil.isEmpty(path) ? "." : path).getAbsolutePath() );

diff --git a/org.tizen.cli/src/org/tizen/cli/exec/gen/messages.properties b/org.tizen.cli/src/org/tizen/cli/exec/gen/messages.properties
index 303e86a..443ab46 100644 (file)
--- a/org.tizen.cli/src/org/tizen/cli/exec/gen/messages.properties
+++ b/org.tizen.cli/src/org/tizen/cli/exec/gen/messages.properties
@@ -16,4 +16,5 @@ NativeMain.DESC_CMD_MAKEFILE=Create build files.
 NativeMain.DESC_MAKE_PROJECTTYPE=Specify a project type ({0} | {1} | {2})
 NativeMain.DESC_MAKE_BINARY=Specify a output binary name (Default: <project folder name>)
 NativeMain.DESC_FORCE=Overwrite existing files
-NativeMain.MAKE_CREATE_SUCCESS=A makefile was created successfully in {0}.\nTo build a project, run native-make in {0}.
\ No newline at end of file
+NativeMain.MAKE_CREATE_SUCCESS=A makefile was created successfully in {0}.\nTo build a project, run native-make in {0}.
+Web.ERROR_MSG_INVALID_PROJECT_NAME=Invalid character is used in the project name.
\ No newline at end of file

diff --git a/package/build.linux b/package/build.linux
index 2622ba4..5710d65 100755 (executable)
--- a/package/build.linux
+++ b/package/build.linux
@@ -49,6 +49,7 @@ build()
 
     SRC_LIST="
     org.eclipse.osgi_*
+    org.tizen.common.project_*
     org.tizen.web.common_*
     "