From 294f15f364b4ee0640bddad4df49d15c00b5e437 Mon Sep 17 00:00:00 2001 From: Jihun Ha Date: Thu, 17 Sep 2015 14:20:14 +0900 Subject: [PATCH] Modify permissions for files in Things Manager All files with "Excutable bit" has been changed into "Non-executable bit" (755 -> 664) And, I've modified typo strings in con-client and con-server applications Change-Id: I6498d22b96fadd078e0ae9a05e782dfccb84bb07 Signed-off-by: Jihun Ha Reviewed-on: https://gerrit.iotivity.org/gerrit/2615 Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka --- .../sampleapp/linux/configuration/ConfigurationCollection.cpp | 0 .../sampleapp/linux/configuration/ConfigurationCollection.h | 0 .../sampleapp/linux/configuration/FactorySetCollection.cpp | 0 .../sampleapp/linux/configuration/FactorySetCollection.h | 0 .../sampleapp/linux/configuration/MaintenanceCollection.cpp | 0 .../sampleapp/linux/configuration/MaintenanceCollection.h | 0 .../sampleapp/linux/configuration/bootstrapserver.cpp | 0 service/things-manager/sampleapp/linux/configuration/con-client.cpp | 6 ++---- service/things-manager/sampleapp/linux/configuration/con-server.cpp | 6 ++---- service/things-manager/sampleapp/linux/groupaction/groupserver.cpp | 0 service/things-manager/sdk/inc/GroupManager.h | 0 service/things-manager/sdk/inc/GroupSynchronization.h | 0 service/things-manager/sdk/inc/ThingsConfiguration.h | 0 service/things-manager/sdk/inc/ThingsMaintenance.h | 0 service/things-manager/sdk/src/ThingsConfiguration.cpp | 0 service/things-manager/sdk/src/ThingsMaintenance.cpp | 0 16 files changed, 4 insertions(+), 8 deletions(-) mode change 100755 => 100644 service/things-manager/sampleapp/linux/configuration/ConfigurationCollection.cpp mode change 100755 => 100644 service/things-manager/sampleapp/linux/configuration/ConfigurationCollection.h mode change 100755 => 100644 service/things-manager/sampleapp/linux/configuration/FactorySetCollection.cpp mode change 100755 => 100644 service/things-manager/sampleapp/linux/configuration/FactorySetCollection.h mode change 100755 => 100644 service/things-manager/sampleapp/linux/configuration/MaintenanceCollection.cpp mode change 100755 => 100644 service/things-manager/sampleapp/linux/configuration/MaintenanceCollection.h mode change 100755 => 100644 service/things-manager/sampleapp/linux/configuration/bootstrapserver.cpp mode change 100755 => 100644 service/things-manager/sampleapp/linux/configuration/con-client.cpp mode change 100755 => 100644 service/things-manager/sampleapp/linux/configuration/con-server.cpp mode change 100755 => 100644 service/things-manager/sampleapp/linux/groupaction/groupserver.cpp mode change 100755 => 100644 service/things-manager/sdk/inc/GroupManager.h mode change 100755 => 100644 service/things-manager/sdk/inc/GroupSynchronization.h mode change 100755 => 100644 service/things-manager/sdk/inc/ThingsConfiguration.h mode change 100755 => 100644 service/things-manager/sdk/inc/ThingsMaintenance.h mode change 100755 => 100644 service/things-manager/sdk/src/ThingsConfiguration.cpp mode change 100755 => 100644 service/things-manager/sdk/src/ThingsMaintenance.cpp diff --git a/service/things-manager/sampleapp/linux/configuration/ConfigurationCollection.cpp b/service/things-manager/sampleapp/linux/configuration/ConfigurationCollection.cpp old mode 100755 new mode 100644 diff --git a/service/things-manager/sampleapp/linux/configuration/ConfigurationCollection.h b/service/things-manager/sampleapp/linux/configuration/ConfigurationCollection.h old mode 100755 new mode 100644 diff --git a/service/things-manager/sampleapp/linux/configuration/FactorySetCollection.cpp b/service/things-manager/sampleapp/linux/configuration/FactorySetCollection.cpp old mode 100755 new mode 100644 diff --git a/service/things-manager/sampleapp/linux/configuration/FactorySetCollection.h b/service/things-manager/sampleapp/linux/configuration/FactorySetCollection.h old mode 100755 new mode 100644 diff --git a/service/things-manager/sampleapp/linux/configuration/MaintenanceCollection.cpp b/service/things-manager/sampleapp/linux/configuration/MaintenanceCollection.cpp old mode 100755 new mode 100644 diff --git a/service/things-manager/sampleapp/linux/configuration/MaintenanceCollection.h b/service/things-manager/sampleapp/linux/configuration/MaintenanceCollection.h old mode 100755 new mode 100644 diff --git a/service/things-manager/sampleapp/linux/configuration/bootstrapserver.cpp b/service/things-manager/sampleapp/linux/configuration/bootstrapserver.cpp old mode 100755 new mode 100644 diff --git a/service/things-manager/sampleapp/linux/configuration/con-client.cpp b/service/things-manager/sampleapp/linux/configuration/con-client.cpp old mode 100755 new mode 100644 index a7a67e9..b59e983 --- a/service/things-manager/sampleapp/linux/configuration/con-client.cpp +++ b/service/things-manager/sampleapp/linux/configuration/con-client.cpp @@ -27,7 +27,6 @@ #include #include "OCPlatform.h" #include "OCApi.h" -//#include "ThingsManager.h" #include "ThingsConfiguration.h" #include "ThingsMaintenance.h" #include "GroupManager.h" @@ -41,7 +40,6 @@ pthread_mutex_t mutex_lock = PTHREAD_MUTEX_INITIALIZER; const int SUCCESS_RESPONSE = 0; -//static ThingsManager* g_thingsmanager; static GroupManager* g_groupmanager; static ThingsConfiguration* g_thingsConf; static ThingsMaintenance* g_thingsMnt; @@ -312,7 +310,7 @@ int main(int argc, char* argv[]) cout << "(1) Find all resources(URI: /oic/con, /oic/mnt, /factoryset)" << std::endl; cout << "(2) Find all groups" << std::endl; cout << "(3) Get a Configuration resource" << std::endl; - cout << "(4) Update a region attribute value" << std::endl; + cout << "(4) Update a device name attribute value" << std::endl; cout << "(5) FactoryReset (for the group)" << std::endl; cout << "(6) Reboot (for the group)" << std::endl; cout << "(10) Show Configuration Units" << std::endl; @@ -459,7 +457,7 @@ int main(int argc, char* argv[]) continue; } - std::cout << "For example, change region resource's value" << std::endl; + std::cout << "For example, change a device name" << std::endl; std::cout << g_configurationCollection->uri() << std::endl; std::map< ConfigurationName, ConfigurationValue > configurations; diff --git a/service/things-manager/sampleapp/linux/configuration/con-server.cpp b/service/things-manager/sampleapp/linux/configuration/con-server.cpp old mode 100755 new mode 100644 index 136b22f..0a67a09 --- a/service/things-manager/sampleapp/linux/configuration/con-server.cpp +++ b/service/things-manager/sampleapp/linux/configuration/con-server.cpp @@ -51,7 +51,6 @@ std::string defaultLocationName; std::string defaultRegion; std::string defaultCurrency; -//static ThingsManager* g_thingsmanager; static ThingsConfiguration* g_thingsConf; // Forward declaring the entityHandler (Configuration) @@ -239,7 +238,7 @@ void onBootstrap(const HeaderOptions& headerOptions, const OCRepresentation& rep defaultRegion = rep.getValue< std::string >("r"); defaultCurrency = rep.getValue< std::string >("c"); - std::cout << "\tSystemTime : " << defaultDeviceName << std::endl; + std::cout << "\DeviceName : " << defaultDeviceName << std::endl; std::cout << "\tLocation : " << defaultLocation << std::endl; std::cout << "\tLocationName : " << defaultLocationName << std::endl; std::cout << "\tCurrency : " << defaultCurrency << std::endl; @@ -257,7 +256,6 @@ int main() OCPlatform::Configure(cfg); g_thingsConf = new ThingsConfiguration(); - //g_thingsDiag = new ThingsMaintenance(); //************************************************************** if (getuid() != 0) @@ -283,7 +281,7 @@ int main() std::cout << endl << endl << "(0) Quit" << std::endl; std::cout << "(1) Bootstrap" << std::endl; - std::cout << "(2) Create Configuration Resources" << std::endl; + std::cout << "(2) Create Configuration/Maintenance Resources" << std::endl; cin >> g_Steps; diff --git a/service/things-manager/sampleapp/linux/groupaction/groupserver.cpp b/service/things-manager/sampleapp/linux/groupaction/groupserver.cpp old mode 100755 new mode 100644 diff --git a/service/things-manager/sdk/inc/GroupManager.h b/service/things-manager/sdk/inc/GroupManager.h old mode 100755 new mode 100644 diff --git a/service/things-manager/sdk/inc/GroupSynchronization.h b/service/things-manager/sdk/inc/GroupSynchronization.h old mode 100755 new mode 100644 diff --git a/service/things-manager/sdk/inc/ThingsConfiguration.h b/service/things-manager/sdk/inc/ThingsConfiguration.h old mode 100755 new mode 100644 diff --git a/service/things-manager/sdk/inc/ThingsMaintenance.h b/service/things-manager/sdk/inc/ThingsMaintenance.h old mode 100755 new mode 100644 diff --git a/service/things-manager/sdk/src/ThingsConfiguration.cpp b/service/things-manager/sdk/src/ThingsConfiguration.cpp old mode 100755 new mode 100644 diff --git a/service/things-manager/sdk/src/ThingsMaintenance.cpp b/service/things-manager/sdk/src/ThingsMaintenance.cpp old mode 100755 new mode 100644 -- 2.7.4