fix inconsistency of Step related class/file names

as is: StepUnzip(step_unzip.cc), SignatureStep(signature_step.cc)
to be: StepUnzip(step_unzip.cc), StepSignature(step_signature.cc)

Change-Id: I920056464d1e359a615b158e41477c56b56d9b0e
Signed-off-by: Wonguk Jeong <wonguk.jeong@samsung.com>

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 625fa25..c4a3b0c 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -3,7 +3,7 @@ SET(SRCS
   src/app_installer.cc
   src/context_installer.cc
   src/step/step_unzip.cc
-  src/step/signature_step.cc
+  src/step/step_signature.cc
   src/utils.cc
 )
 # Target - definition

diff --git a/common/include/step/signature_step.h b/common/include/step/step_signature.h
similarity index 71%
rename from common/include/step/signature_step.h
rename to common/include/step/step_signature.h
index bed912d..a583e7c 100644 (file)
--- a/common/include/step/signature_step.h
+++ b/common/include/step/step_signature.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by an apache 2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef COMMON_STEP_SIGNATURE_SIGNATURE_STEP_H_
-#define COMMON_STEP_SIGNATURE_SIGNATURE_STEP_H_
+#ifndef COMMON_STEP_STEP_SIGNATURE_H_
+#define COMMON_STEP_STEP_SIGNATURE_H_
 
 #include "context_installer.h"
 #include "step.h"
 
 namespace common {
 
-class SignatureStep : public Step {
+class StepSignature : public Step {
  public:
   using Step::Step;
 
@@ -21,4 +21,4 @@ class SignatureStep : public Step {
 
 }  // namespace common
 
-#endif  // COMMON_STEP_SIGNATURE_SIGNATURE_STEP_H_
+#endif  // COMMON_STEP_STEP_SIGNATURE_H_

diff --git a/common/src/step/signature_step.cc b/common/src/step/step_signature.cc
similarity index 84%
rename from common/src/step/signature_step.cc
rename to common/src/step/step_signature.cc
index 4e6a244..fcb65a9 100644 (file)
--- a/common/src/step/signature_step.cc
+++ b/common/src/step/step_signature.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an apache 2.0 license that can be
 // found in the LICENSE file.
 
-#include <step/signature_step.h>
+#include <step/step_signature.h>
 
 #include <boost/filesystem/path.hpp>
 
@@ -14,7 +14,7 @@ namespace bf = boost::filesystem;
 
 namespace common {
 
-int SignatureStep::process(ContextInstaller* context) {
+int StepSignature::process(ContextInstaller* context) {
   return (signature::SignatureValidator::Check(bf::path(context->unpack_directory()))
       == signature::SignatureValidator::INVALID) ? -1 : 0;
 }

diff --git a/wgt/src/wgt_backend.cc b/wgt/src/wgt_backend.cc
index 28ae202..d331ed7 100644 (file)
--- a/wgt/src/wgt_backend.cc
+++ b/wgt/src/wgt_backend.cc
@@ -14,7 +14,7 @@
 
 #include "include/app_installer.h"
 #include "include/step/step_unzip.h"
-#include "include/step/signature_step.h"
+#include "include/step/step_signature.h"
 
 int main(int argc, char **argv) {
   /* get request data */
@@ -38,9 +38,9 @@ int main(int argc, char **argv) {
       Installer->AddStep(step_unpack);
 
       // FIXME: unique_ptr because steps are not freed in installer.
-      std::unique_ptr<common::SignatureStep> signature_step(
-          new common::SignatureStep);
-      Installer->AddStep(signature_step.get());
+      std::unique_ptr<common::StepSignature> step_signature(
+          new common::StepSignature);
+      Installer->AddStep(step_signature.get());
 
       Installer->Run();
       break;