This is an automated email from the ASF dual-hosted git repository.

mrutkowski pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git


The following commit(s) were added to refs/heads/master by this push:
     new 873e168  Deprecating Application in favor of Project (#764)
873e168 is described below

commit 873e1688eb6e305106d992b444c22c6d32652fc2
Author: Priti Desai <pde...@us.ibm.com>
AuthorDate: Fri Mar 2 17:36:29 2018 -0800

    Deprecating Application in favor of Project (#764)
    
    * first draft
    
    * replacing application with project
    
    * removing debug print statement
    
    * undo newline
    
    * need to figure out go fmt into Intellij
    
    * adding newline in md
---
 cmd/export.go                                      |  2 -
 cmd/report.go                                      | 10 ----
 cmd/root.go                                        | 27 ++++-------
 cmd/undeploy.go                                    | 17 -------
 deployers/servicedeployer.go                       | 38 +--------------
 docs/wskdeploy_triggerrule_trigger_bindings.md     | 56 +++++++++++-----------
 parsers/yamlparser.go                              | 43 +++++++----------
 tests/dat/deployment-deploymentreader-test.yml     |  2 +-
 tests/src/integration/dependency/README.md         | 24 +++++-----
 tests/src/integration/flagstests/deployment.yml    |  2 +-
 tests/src/integration/triggerrule/deployment.yml   |  2 +-
 .../deployment-with-application.yaml               | 25 ----------
 .../manifest-with-application.yaml                 | 33 -------------
 .../deployment.yml                                 |  2 +-
 .../yml-deployment-with-yaml-manifest.yml          |  2 +-
 .../actions/hello.js                               |  0
 .../deployment.yaml}                               |  0
 .../manifest.yaml}                                 |  0
 .../validate-application-and-project_test.go       | 16 ++-----
 .../validateSequencesCreation_test.go              |  2 +-
 tests/src/integration/zipaction/deployment.yml     |  2 +-
 tests/usecases/badyaml/deployment.yaml             |  2 +-
 tests/usecases/triggerrule/deployment.yml          |  2 +-
 23 files changed, 80 insertions(+), 229 deletions(-)

diff --git a/cmd/export.go b/cmd/export.go
index c6ea0e3..1cf6a59 100644
--- a/cmd/export.go
+++ b/cmd/export.go
@@ -275,6 +275,4 @@ func ExportCmdImp(cmd *cobra.Command, args []string) error {
 
 func init() {
        RootCmd.AddCommand(exportCmd)
-       exportCmd.Flags().StringVarP(&utils.Flags.ProjectPath, "project", "p", 
".", "name of the managed project")
-       exportCmd.Flags().StringVarP(&utils.Flags.ManifestPath, "manifest", 
"m", "", "path to manifest file to save exported data")
 }
diff --git a/cmd/report.go b/cmd/report.go
index c1159e6..787e16a 100644
--- a/cmd/report.go
+++ b/cmd/report.go
@@ -65,16 +65,6 @@ func init() {
        reportCmd.Flags().StringVarP(&wskpropsPath, "wskproppath", "w",
                path.Join(os.Getenv("HOME"), ".wskprops"),
                wski18n.T(wski18n.ID_CMD_FLAG_CONFIG))
-
-       // Here you will define your flags and configuration settings.
-
-       // Cobra supports Persistent Flags which will work for this command
-       // and all subcommands, e.g.:
-       // reportCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-       // Cobra supports local flags which will only run when this command
-       // is called directly, e.g.:
-       // reportCmd.Flags().BoolP("toggle", "t", false, "Help message for 
toggle")
 }
 
 func printDeploymentInfo(client *whisk.Client) error {
diff --git a/cmd/root.go b/cmd/root.go
index aeec488..7225924 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -39,15 +39,15 @@ import (
 var stderr = ""
 var stdout = ""
 
+// Whisk Deploy has root command: wskdeploy
+// wskdeploy is being created using Cobra Library
 var RootCmd = &cobra.Command{
        Use:           "wskdeploy",
        SilenceErrors: true,
        SilenceUsage:  true,
        Short:         wski18n.T(wski18n.ID_CMD_DESC_SHORT_ROOT),
        Long:          wski18n.T(wski18n.ID_CMD_DESC_LONG_ROOT),
-       // Uncomment the following line if your bare application
-       // has an action associated with it:
-       RunE: RootCmdImp,
+       RunE:          RootCmdImp,
 }
 
 func RootCmdImp(cmd *cobra.Command, args []string) error {
@@ -106,22 +106,15 @@ func init() {
 
        cobra.OnInitialize(initConfig)
 
-       // Here you will define your flags and configuration settings.
-       // Cobra supports Persistent Flags, which, if defined here,
-       // will be global for your application.
-
-       // TODO(#682) add in-line descriptions to i18n resource file
-       RootCmd.PersistentFlags().StringVar(&utils.Flags.CfgFile, "config", "", 
wski18n.T(wski18n.ID_CMD_FLAG_CONFIG))
-       // Cobra also supports local flags, which will only run
-       // when this action is called directly.
+       // Defining Persistent Flags of Whisk Deploy Root command (wskdeploy)
+       // Persistent flags are global in terms of its availability and 
acceptable
+       // with any other Whisk Deploy command e.g. undeploy, export, etc.
        // TODO() Publish command, not completed
        // TODO() Report command, not completed
-       // TODO() What does toggle do? adding this flag seems to produce an 
error
-       // TODO() Why are "project" and "manifest" flags NOT persistent?
-       RootCmd.Flags().BoolP("toggle", "t", false, 
wski18n.T(wski18n.ID_CMD_FLAG_TOGGLE_HELP))
-       RootCmd.Flags().StringVarP(&utils.Flags.ProjectPath, "project", "p", 
".", wski18n.T(wski18n.ID_CMD_FLAG_PROJECT))
-       RootCmd.Flags().StringVarP(&utils.Flags.ManifestPath, "manifest", "m", 
"", wski18n.T(wski18n.ID_CMD_FLAG_MANIFEST))
-       RootCmd.Flags().StringVarP(&utils.Flags.DeploymentPath, "deployment", 
"d", "", wski18n.T(wski18n.ID_CMD_FLAG_DEPLOYMENT))
+       RootCmd.PersistentFlags().StringVar(&utils.Flags.CfgFile, "config", "", 
wski18n.T(wski18n.ID_CMD_FLAG_CONFIG))
+       RootCmd.PersistentFlags().StringVarP(&utils.Flags.ProjectPath, 
"project", "p", ".", wski18n.T(wski18n.ID_CMD_FLAG_PROJECT))
+       RootCmd.PersistentFlags().StringVarP(&utils.Flags.ManifestPath, 
"manifest", "m", "", wski18n.T(wski18n.ID_CMD_FLAG_MANIFEST))
+       RootCmd.PersistentFlags().StringVarP(&utils.Flags.DeploymentPath, 
"deployment", "d", "", wski18n.T(wski18n.ID_CMD_FLAG_DEPLOYMENT))
        RootCmd.PersistentFlags().BoolVarP(&utils.Flags.Strict, "strict", "s", 
false, wski18n.T(wski18n.ID_CMD_FLAG_STRICT))
        RootCmd.PersistentFlags().BoolVarP(&utils.Flags.UseInteractive, 
"allow-interactive", "i", false, wski18n.T(wski18n.ID_CMD_FLAG_INTERACTIVE))
        RootCmd.PersistentFlags().BoolVarP(&utils.Flags.Verbose, "verbose", 
"v", false, wski18n.T(wski18n.ID_CMD_FLAG_VERBOSE))
diff --git a/cmd/undeploy.go b/cmd/undeploy.go
index 43048ac..294ddf2 100644
--- a/cmd/undeploy.go
+++ b/cmd/undeploy.go
@@ -18,7 +18,6 @@
 package cmd
 
 import (
-       "github.com/apache/incubator-openwhisk-wskdeploy/utils"
        "github.com/spf13/cobra"
 )
 
@@ -38,20 +37,4 @@ func UndeployCmdImp(cmd *cobra.Command, args []string) error 
{
 
 func init() {
        RootCmd.AddCommand(undeployCmd)
-
-       // Here you will define your flags and configuration settings.
-
-       // Cobra supports Persistent Flags which will work for this command
-       // and all subcommands, e.g.:
-       // undeployCmd.PersistentFlags().String("foo", "", "A help for foo")
-       undeployCmd.PersistentFlags().StringVar(&utils.Flags.CfgFile, "config", 
"", "config file (default is $HOME/.wskdeploy.yaml)")
-
-       // TODO() remove the following flags (here) and add to persistent flags 
in root.go
-       // Cobra supports local flags which will only run when this command
-       // is called directly, e.g.:
-       // undeployCmd.Flags().BoolP("toggle", "t", false, "Help message for 
toggle")=
-       undeployCmd.Flags().BoolP("toggle", "t", false, "Help message for 
toggle")
-       undeployCmd.Flags().StringVarP(&utils.Flags.ProjectPath, "pathpath", 
"p", ".", "path to serverless project")
-       undeployCmd.Flags().StringVarP(&utils.Flags.ManifestPath, "manifest", 
"m", "", "path to manifest file")
-       undeployCmd.Flags().StringVarP(&utils.Flags.DeploymentPath, 
"deployment", "d", "", "path to deployment file")
 }
diff --git a/deployers/servicedeployer.go b/deployers/servicedeployer.go
index 7e96df2..0cea27a 100644
--- a/deployers/servicedeployer.go
+++ b/deployers/servicedeployer.go
@@ -163,15 +163,6 @@ func (deployer *ServiceDeployer) ConstructDeploymentPlan() 
error {
                projectName = manifest.GetProject().Name
        }
 
-       // TODO(#696) delete this warning after deprecating application in 
manifest file
-       if manifest.Application.Name != "" {
-               
wskprint.PrintOpenWhiskWarning(wski18n.T(wski18n.ID_WARN_KEY_DEPRECATED_X_oldkey_X_filetype_X_newkey_X,
-                       map[string]interface{}{
-                               wski18n.KEY_OLD:       
parsers.YAML_KEY_APPLICATION,
-                               wski18n.KEY_NEW:       parsers.YAML_KEY_PROJECT,
-                               wski18n.KEY_FILE_TYPE: wski18n.MANIFEST}))
-       }
-
        // process deployment file
        if utils.FileExists(deployer.DeploymentPath) {
                var deploymentReader = NewDeploymentReader(deployer)
@@ -181,15 +172,6 @@ func (deployer *ServiceDeployer) ConstructDeploymentPlan() 
error {
                        return err
                }
 
-               // TODO(#696) delete this warning after deprecating application 
in deployment file
-               if deploymentReader.DeploymentDescriptor.Application.Name != "" 
{
-                       
wskprint.PrintOpenWhiskWarning(wski18n.T(wski18n.ID_WARN_KEY_DEPRECATED_X_oldkey_X_filetype_X_newkey_X,
-                               map[string]interface{}{
-                                       wski18n.KEY_OLD:       
parsers.YAML_KEY_APPLICATION,
-                                       wski18n.KEY_NEW:       
parsers.YAML_KEY_PROJECT,
-                                       wski18n.KEY_FILE_TYPE: 
wski18n.DEPLOYMENT}))
-               }
-
                // compare the name of the project
                if 
len(deploymentReader.DeploymentDescriptor.GetProject().Packages) != 0 && 
len(projectName) != 0 {
                        projectNameDeploy := 
deploymentReader.DeploymentDescriptor.GetProject().Name
@@ -235,15 +217,6 @@ func (deployer *ServiceDeployer) 
ConstructUnDeploymentPlan() (*DeploymentProject
                projectName = manifest.GetProject().Name
        }
 
-       // TODO(#696) delete this warning after deprecating application in 
manifest file
-       if manifest.Application.Name != "" {
-               
wskprint.PrintOpenWhiskWarning(wski18n.T(wski18n.ID_WARN_KEY_DEPRECATED_X_oldkey_X_filetype_X_newkey_X,
-                       map[string]interface{}{
-                               wski18n.KEY_OLD:       
parsers.YAML_KEY_APPLICATION,
-                               wski18n.KEY_NEW:       parsers.YAML_KEY_PROJECT,
-                               wski18n.KEY_FILE_TYPE: wski18n.MANIFEST}))
-       }
-
        // process deployment file
        if utils.FileExists(deployer.DeploymentPath) {
                var deploymentReader = NewDeploymentReader(deployer)
@@ -252,16 +225,7 @@ func (deployer *ServiceDeployer) 
ConstructUnDeploymentPlan() (*DeploymentProject
                        return deployer.Deployment, err
                }
 
-               // TODO(#696) delete this warning after deprecating application 
in deployment file
-               if deploymentReader.DeploymentDescriptor.Application.Name != "" 
{
-                       
wskprint.PrintOpenWhiskWarning(wski18n.T(wski18n.ID_WARN_KEY_DEPRECATED_X_oldkey_X_filetype_X_newkey_X,
-                               map[string]interface{}{
-                                       wski18n.KEY_OLD:       
parsers.YAML_KEY_APPLICATION,
-                                       wski18n.KEY_NEW:       
parsers.YAML_KEY_PROJECT,
-                                       wski18n.KEY_FILE_TYPE: 
wski18n.DEPLOYMENT}))
-               }
-
-               // compare the name of the application
+               // compare the name of the project
                if 
len(deploymentReader.DeploymentDescriptor.GetProject().Packages) != 0 && 
len(projectName) != 0 {
                        projectNameDeploy := 
deploymentReader.DeploymentDescriptor.GetProject().Name
                        if projectNameDeploy != projectName {
diff --git a/docs/wskdeploy_triggerrule_trigger_bindings.md 
b/docs/wskdeploy_triggerrule_trigger_bindings.md
index 5eac75b..39eba09 100644
--- a/docs/wskdeploy_triggerrule_trigger_bindings.md
+++ b/docs/wskdeploy_triggerrule_trigger_bindings.md
@@ -26,34 +26,34 @@ Let’s use a variant of the [Manifest file from the previous 
example](examples/
 
 #### _Example: “Hello world” Action, Trigger and Rule with no Parameter 
bindings_
 ```yaml
-package:
-  name: hello_world_package
+packages:
+  hello_world_package
   ... # Package keys omitted for brevity
-  actions:
-    hello_world_triggerrule:
-      function: src/hello_plus.js
-      runtime: nodejs
-      inputs:
-        name: string
-        place: string
-        children: integer
-        height: float
-      outputs:
-        greeting: string
-        details: string
-
-  triggers:
-    meetPerson:
-      inputs:
-        name: string
-        place: string
-        children: integer
-        height: float
-
-  rules:
-    meetPersonRule:
-      trigger: meetPerson
-      action: hello_world_triggerrule
+    actions:
+      hello_world_triggerrule:
+        function: src/hello_plus.js
+        runtime: nodejs
+        inputs:
+          name: string
+          place: string
+          children: integer
+          height: float
+        outputs:
+          greeting: string
+          details: string
+
+    triggers:
+      meetPerson:
+        inputs:
+          name: string
+          place: string
+          children: integer
+          height: float
+
+    rules:
+      meetPersonRule:
+        trigger: meetPerson
+        action: hello_world_triggerrule
 ```
 
 ### Deployment file
@@ -61,7 +61,7 @@ Let’s create a Deployment file that is designed to be applied 
to the Manifest
 
 #### _Example: Deployment file that binds parameters to the '```meetPerson```' 
Trigger_
 ```yaml
-application:
+project:
   packages:
       hello_world_package:
         triggers:
diff --git a/parsers/yamlparser.go b/parsers/yamlparser.go
index a9f6806..fb526dd 100644
--- a/parsers/yamlparser.go
+++ b/parsers/yamlparser.go
@@ -25,20 +25,19 @@ import (
 // YAML schema key names
 // DO NOT translate
 const (
-       YAML_KEY_ACTION      = "action"
-       YAML_KEY_ANNOTATION  = "annotoation"
-       YAML_KEY_API         = "api"
-       YAML_KEY_FEED        = "feed"
-       YAML_KEY_MANIFEST    = "manifest"
-       YAML_KEY_NAMESPACE   = "namespace"
-       YAML_KEY_PACKAGES    = "packages"
-       YAML_KEY_PROJECT     = "project"
-       YAML_KEY_RULE        = "rule"
-       YAML_KEY_SEQUENCE    = "sequence"
-       YAML_KEY_TRIGGER     = "trigger"
-       YAML_KEY_APPLICATION = "application" // deprecated
-       YAML_KEY_PACKAGE     = "package"     // deprecated
-       YAML_KEY_SOURCE      = "source"      // deprecated
+       YAML_KEY_ACTION     = "action"
+       YAML_KEY_ANNOTATION = "annotoation"
+       YAML_KEY_API        = "api"
+       YAML_KEY_FEED       = "feed"
+       YAML_KEY_MANIFEST   = "manifest"
+       YAML_KEY_NAMESPACE  = "namespace"
+       YAML_KEY_PACKAGES   = "packages"
+       YAML_KEY_PROJECT    = "project"
+       YAML_KEY_RULE       = "rule"
+       YAML_KEY_SEQUENCE   = "sequence"
+       YAML_KEY_TRIGGER    = "trigger"
+       YAML_KEY_PACKAGE    = "package"
+       YAML_KEY_SOURCE     = "source" // deprecated
 )
 
 // YAML schema key values
@@ -222,9 +221,8 @@ type Project struct {
 }
 
 type YAML struct {
-       Application Project            `yaml:"application"` //used in 
deployment.yaml (being deprecated)
-       Project     Project            `yaml:"project"`     //used in 
deployment.yaml
-       Packages    map[string]Package `yaml:"packages"`    //used in 
deployment.yaml
+       Project  Project            `yaml:"project"`  //used in deployment.yaml
+       Packages map[string]Package `yaml:"packages"` //used in deployment.yaml
        //Package     Package            `yaml:"package"`   // DEPRECATED.  
Should we add warning if found?
        Filepath string //file path of the yaml file
 }
@@ -232,10 +230,7 @@ type YAML struct {
 // function to return Project or Application depending on what is specified in
 // manifest and deployment files
 func (yaml *YAML) GetProject() Project {
-       if yaml.Application.Name == "" {
-               return yaml.Project
-       }
-       return yaml.Application
+       return yaml.Project
 }
 
 func convertPackageName(packageMap map[string]Package) map[string]Package {
@@ -253,11 +248,7 @@ func convertPackageName(packageMap map[string]Package) 
map[string]Package {
 }
 
 func ReadEnvVariable(yaml *YAML) *YAML {
-       if yaml.Application.Name != "" {
-               yaml.Application.Packages = 
convertPackageName(yaml.Application.Packages)
-       } else {
-               yaml.Project.Packages = 
convertPackageName(yaml.Project.Packages)
-       }
+       yaml.Project.Packages = convertPackageName(yaml.Project.Packages)
        yaml.Packages = convertPackageName(yaml.Packages)
        return yaml
 }
diff --git a/tests/dat/deployment-deploymentreader-test.yml 
b/tests/dat/deployment-deploymentreader-test.yml
index fb65134..54d6fdf 100644
--- a/tests/dat/deployment-deploymentreader-test.yml
+++ b/tests/dat/deployment-deploymentreader-test.yml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations under the License.
 #
 
-application:
+project:
   name: AppWithTriggerRule
   packages:
     triggerrule:
diff --git a/tests/src/integration/dependency/README.md 
b/tests/src/integration/dependency/README.md
index 27066eb..741511f 100644
--- a/tests/src/integration/dependency/README.md
+++ b/tests/src/integration/dependency/README.md
@@ -28,18 +28,18 @@ at https://github.com/pritidesai/child-app.
 We can declare this dependency in `manifest.yaml` with:
 
 ```yaml
-package:
-  name: root-app
-  namespace: guest
-  dependencies:
-    child-app:
-      location: github.com/pritidesai/child-app
-  triggers:
-    trigger1:
-  rules:
-    rule1:
-      trigger: trigger1
-      action: child-app/hello
+packages:
+  root-app:
+    namespace: guest
+    dependencies:
+      child-app:
+        location: github.com/pritidesai/child-app
+    triggers:
+      trigger1:
+    rules:
+      rule1:
+        trigger: trigger1
+        action: child-app/hello
 ```
 
 **Note:**
diff --git a/tests/src/integration/flagstests/deployment.yml 
b/tests/src/integration/flagstests/deployment.yml
index a030baf..4076633 100644
--- a/tests/src/integration/flagstests/deployment.yml
+++ b/tests/src/integration/flagstests/deployment.yml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations under the License.
 #
 
-application:
+project:
   name: wskdeploy-samples
 
   packages:
diff --git a/tests/src/integration/triggerrule/deployment.yml 
b/tests/src/integration/triggerrule/deployment.yml
index 5be2729..6f9e214 100644
--- a/tests/src/integration/triggerrule/deployment.yml
+++ b/tests/src/integration/triggerrule/deployment.yml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations under the License.
 #
 
-application:
+project:
   name: wskdeploy-samples
 
   packages:
diff --git 
a/tests/src/integration/validate-application-and-project/deployment-with-application.yaml
 
b/tests/src/integration/validate-application-and-project/deployment-with-application.yaml
deleted file mode 100644
index 81a2e31..0000000
--- 
a/tests/src/integration/validate-application-and-project/deployment-with-application.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
-# license agreements.  See the NOTICE file distributed with this work for 
additional
-# information regarding copyright ownership.  The ASF licenses this file to you
-# under the Apache License, Version 2.0 (the # "License"); you may not use this
-# file except in compliance with the License.  You may obtain a copy of the 
License
-# at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software 
distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations under the License.
-#
-
-application:
-  name: IntegrationTest
-  packages:
-    packageValidatingApplication:
-      actions:
-        hello:
-          inputs:
-            name: Amy
-            place: Paris
diff --git 
a/tests/src/integration/validate-application-and-project/manifest-with-application.yaml
 
b/tests/src/integration/validate-application-and-project/manifest-with-application.yaml
deleted file mode 100644
index 41e2c48..0000000
--- 
a/tests/src/integration/validate-application-and-project/manifest-with-application.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
-# license agreements.  See the NOTICE file distributed with this work for 
additional
-# information regarding copyright ownership.  The ASF licenses this file to you
-# under the Apache License, Version 2.0 (the # "License"); you may not use this
-# file except in compliance with the License.  You may obtain a copy of the 
License
-# at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software 
distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations under the License.
-#
-
-packages:
-    packageValidatingApplication:
-        actions:
-            hello:
-                function: actions/hello.js
-                runtime: nodejs:6
-                inputs:
-                    name:
-                        type: string
-                        description: name of a person
-                    place:
-                        type: string
-                        description: location of a person
-                outputs:
-                    payload:
-                        type: string
-                        description: a simple greeting message, Hello World!
diff --git 
a/tests/src/integration/validate-manifest-deployment-file-extensions/deployment.yml
 
b/tests/src/integration/validate-manifest-deployment-file-extensions/deployment.yml
index 680f569..deb952e 100644
--- 
a/tests/src/integration/validate-manifest-deployment-file-extensions/deployment.yml
+++ 
b/tests/src/integration/validate-manifest-deployment-file-extensions/deployment.yml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations under the License.
 #
 
-application:
+project:
   name: IntegrationTest
   packages:
     ValidateYMLExtension:
diff --git 
a/tests/src/integration/validate-manifest-deployment-file-extensions/yml-deployment-with-yaml-manifest.yml
 
b/tests/src/integration/validate-manifest-deployment-file-extensions/yml-deployment-with-yaml-manifest.yml
index 5cabeb7..54b3400 100644
--- 
a/tests/src/integration/validate-manifest-deployment-file-extensions/yml-deployment-with-yaml-manifest.yml
+++ 
b/tests/src/integration/validate-manifest-deployment-file-extensions/yml-deployment-with-yaml-manifest.yml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations under the License.
 #
 
-application:
+project:
   name: IntegrationTest
   packages:
     ValidateYAMLManifestWithYMLDeployment:
diff --git 
a/tests/src/integration/validate-application-and-project/actions/hello.js 
b/tests/src/integration/validate-project/actions/hello.js
similarity index 100%
rename from 
tests/src/integration/validate-application-and-project/actions/hello.js
rename to tests/src/integration/validate-project/actions/hello.js
diff --git 
a/tests/src/integration/validate-application-and-project/deployment-with-project.yaml
 b/tests/src/integration/validate-project/deployment.yaml
similarity index 100%
rename from 
tests/src/integration/validate-application-and-project/deployment-with-project.yaml
rename to tests/src/integration/validate-project/deployment.yaml
diff --git 
a/tests/src/integration/validate-application-and-project/manifest-with-project.yaml
 b/tests/src/integration/validate-project/manifest.yaml
similarity index 100%
rename from 
tests/src/integration/validate-application-and-project/manifest-with-project.yaml
rename to tests/src/integration/validate-project/manifest.yaml
diff --git 
a/tests/src/integration/validate-application-and-project/validate-application-and-project_test.go
 
b/tests/src/integration/validate-project/validate-application-and-project_test.go
similarity index 65%
rename from 
tests/src/integration/validate-application-and-project/validate-application-and-project_test.go
rename to 
tests/src/integration/validate-project/validate-application-and-project_test.go
index f49e1c4..dd60e10 100644
--- 
a/tests/src/integration/validate-application-and-project/validate-application-and-project_test.go
+++ 
b/tests/src/integration/validate-project/validate-application-and-project_test.go
@@ -26,21 +26,11 @@ import (
        "testing"
 )
 
-var path = 
"/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validate-application-and-project/"
-
-func TestApplicationInDeployment(t *testing.T) {
-       manifestPath := os.Getenv("GOPATH") + path + 
"manifest-with-application.yaml"
-       deploymentPath := os.Getenv("GOPATH") + path + 
"deployment-with-application.yaml"
-       wskdeploy := common.NewWskdeploy()
-       _, err := wskdeploy.Deploy(manifestPath, deploymentPath)
-       assert.Equal(t, nil, err, "Failed to deploy based on the manifest and 
deployment files.")
-       _, err = wskdeploy.Undeploy(manifestPath, deploymentPath)
-       assert.Equal(t, nil, err, "Failed to undeploy based on the manifest and 
deployment files.")
-}
+var path = 
"/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/validate-project/"
 
 func TestProjectInDeployment(t *testing.T) {
-       manifestPath := os.Getenv("GOPATH") + path + 
"manifest-with-project.yaml"
-       deploymentPath := os.Getenv("GOPATH") + path + 
"deployment-with-project.yaml"
+       manifestPath := os.Getenv("GOPATH") + path + "manifest.yaml"
+       deploymentPath := os.Getenv("GOPATH") + path + "deployment.yaml"
        wskdeploy := common.NewWskdeploy()
        _, err := wskdeploy.Deploy(manifestPath, deploymentPath)
        assert.Equal(t, nil, err, "Failed to deploy based on the manifest and 
deployment files.")
diff --git 
a/tests/src/integration/validateSequencesCreation/validateSequencesCreation_test.go
 
b/tests/src/integration/validateSequencesCreation/validateSequencesCreation_test.go
index 6d80336..d1fa748 100644
--- 
a/tests/src/integration/validateSequencesCreation/validateSequencesCreation_test.go
+++ 
b/tests/src/integration/validateSequencesCreation/validateSequencesCreation_test.go
@@ -37,7 +37,7 @@ func composeDeployFiles(count int) (manifestStr string, 
deploymentStr string) {
   name: TestSequencesCreation
   actions:
 `
-       deploymentStr = `application:
+       deploymentStr = `project:
   name: TestSequencesCreationApp
   packages:
     TestSequencesCreation:
diff --git a/tests/src/integration/zipaction/deployment.yml 
b/tests/src/integration/zipaction/deployment.yml
index d181799..d2eb040 100644
--- a/tests/src/integration/zipaction/deployment.yml
+++ b/tests/src/integration/zipaction/deployment.yml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations under the License.
 #
 
-application:
+project:
   name: wskdeploy-samples
   packages:
     zipaction:
diff --git a/tests/usecases/badyaml/deployment.yaml 
b/tests/usecases/badyaml/deployment.yaml
index 6ecae37..9f0a74f 100644
--- a/tests/usecases/badyaml/deployment.yaml
+++ b/tests/usecases/badyaml/deployment.yaml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations under the License.
 #
 
-Application:
+project:
   name: testapp
   namespace: _
   version: 1.0
diff --git a/tests/usecases/triggerrule/deployment.yml 
b/tests/usecases/triggerrule/deployment.yml
index 6fbf6be..448dc9d 100644
--- a/tests/usecases/triggerrule/deployment.yml
+++ b/tests/usecases/triggerrule/deployment.yml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations under the License.
 #
 
-application:
+project:
   name: AppWithTriggerRule
 
   packages:

-- 
To stop receiving notification emails like this one, please contact
mrutkow...@apache.org.

Reply via email to