Rename include files with `common` suffix

The reason oc_acl_common.h and oc_cred_common.h have the
suffix common is because the code contained in the headers
is common to both the public and private APIs. Using the
suffix common is meaningless to the user of the iotivity-lite
framework.  What are the headers "common" to from the user
perspective?

For this reason the following files have been renamed
  include/oc_acl_common.h --> include/oc_acl.h
  include/oc_cred_common.h --> include/oc_cred.h
  security/oc_acl.h --> security/oc_acl_internal.h
  security/oc_cred.h --> security/oc_cred_internal.h

This removes the confusing "common" suffix while adding
the "internal" suffix for code that is already considered
internal to the framework.

The #include has been changed to reflect the new file name.

Change-Id: I15df170f1172e3781dcf42e7716700f1bdea629a
Signed-off-by: George Nash <george.nash@intel.com>

api/oc_collection.c

@@ -25,7 +25,7 @@
 #endif /* OC_COLLECTIONS_IF_CREATE */
 #include "util/oc_memb.h"
 #ifdef OC_SECURITY
-#include "security/oc_acl.h"
+#include "security/oc_acl_internal.h"
 #endif /* OC_SECURITY */
 
 OC_MEMB(oc_collections_s, oc_collection_t, OC_MAX_NUM_COLLECTIONS);

api/oc_main.c

@@ -35,8 +35,8 @@
 #endif /* OC_COLLECTIONS && OC_SERVER && OC_COLLECTIONS_IF_CREATE */
 
 #ifdef OC_SECURITY
-#include "security/oc_acl.h"
-#include "security/oc_cred.h"
+#include "security/oc_acl_internal.h"
+#include "security/oc_cred_internal.h"
 #include "security/oc_doxm.h"
 #include "security/oc_pstat.h"
 #include "security/oc_store.h"

api/oc_ri.c

@@ -53,7 +53,7 @@
 #endif /* OC_COLLECTIONS && OC_SERVER */
 
 #ifdef OC_SECURITY
-#include "security/oc_acl.h"
+#include "security/oc_acl_internal.h"
 #include "security/oc_tls.h"
 #endif /* OC_SECURITY */
 

include/oc_obt.h

@@ -19,9 +19,9 @@
 #ifndef OC_OBT_H
 #define OC_OBT_H
 
-#include "oc_acl_common.h"
+#include "oc_acl.h"
 #include "oc_api.h"
-#include "oc_cred_common.h"
+#include "oc_cred.h"
 #include "oc_pki.h"
 #include "oc_uuid.h"
 

messaging/coap/observe.c

@@ -56,7 +56,7 @@
 
 #include "oc_buffer.h"
 #ifdef OC_SECURITY
-#include "security/oc_acl.h"
+#include "security/oc_acl_internal.h"
 #include "security/oc_pstat.h"
 #endif /* OC_SECURITY */
 

port/windows/vs2015/IoTivity-lite.vcxproj

@@ -219,6 +219,7 @@
     <ClInclude Include="..\..\..\api\oc_session_events_internal.h" />
     <ClInclude Include="..\..\..\deps\tinycbor\src\cbor.h" />
     <ClInclude Include="..\..\..\deps\tinycbor\src\cborjson.h" />
+    <ClInclude Include="..\..\..\include\oc_acl.h" />
     <ClInclude Include="..\..\..\include\oc_api.h" />
     <ClInclude Include="..\..\..\include\oc_base64.h" />
     <ClInclude Include="..\..\..\include\oc_blockwise.h" />
@@ -226,8 +227,10 @@
     <ClInclude Include="..\..\..\include\oc_buffer_settings.h" />
     <ClInclude Include="..\..\..\include\oc_client_state.h" />
     <ClInclude Include="..\..\..\include\oc_clock_util.h" />
+    <ClInclude Include="..\..\..\include\oc_cloud.h" />
     <ClInclude Include="..\..\..\include\oc_collection.h" />
     <ClInclude Include="..\..\..\include\oc_core_res.h" />
+    <ClInclude Include="..\..\..\include\oc_cred.h" />
     <ClInclude Include="..\..\..\include\oc_discovery.h" />
     <ClInclude Include="..\..\..\include\oc_endpoint.h" />
     <ClInclude Include="..\..\..\include\oc_helpers.h" />
@@ -241,6 +244,7 @@
     <ClInclude Include="..\..\..\include\oc_session_events.h" />
     <ClInclude Include="..\..\..\include\oc_session_state.h" />
     <ClInclude Include="..\..\..\include\oc_signal_event_loop.h" />
+    <ClInclude Include="..\..\..\include\oc_swupdate.h" />
     <ClInclude Include="..\..\..\include\oc_uuid.h" />
     <ClInclude Include="..\..\..\include\server_introspection.dat.h" />
     <ClInclude Include="..\..\..\messaging\coap\coap.h" />
@@ -251,9 +255,9 @@
     <ClInclude Include="..\..\..\messaging\coap\oc_coap.h" />
     <ClInclude Include="..\..\..\messaging\coap\separate.h" />
     <ClInclude Include="..\..\..\messaging\coap\transactions.h" />
-    <ClInclude Include="..\..\..\security\oc_acl.h" />
+    <ClInclude Include="..\..\..\security\oc_acl_internal.h" />
     <ClInclude Include="..\..\..\security\oc_certs.h" />
-    <ClInclude Include="..\..\..\security\oc_cred.h" />
+    <ClInclude Include="..\..\..\security\oc_cred_internal.h" />
     <ClInclude Include="..\..\..\security\oc_csr.h" />
     <ClInclude Include="..\..\..\security\oc_doxm.h" />
     <ClInclude Include="..\..\..\security\oc_keypair.h" />

port/windows/vs2015/IoTivity-lite.vcxproj.filters

@@ -558,10 +558,10 @@
     <ClInclude Include="..\..\..\security\oc_sp.h">
       <Filter>Security</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\security\oc_acl.h">
+    <ClInclude Include="..\..\..\security\oc_acl_internal.h">
       <Filter>Security</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\security\oc_cred.h">
+    <ClInclude Include="..\..\..\security\oc_cred_internal.h">
       <Filter>Security</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\security\oc_doxm.h">
@@ -609,6 +609,18 @@
     <ClInclude Include="..\..\..\api\oc_session_events_internal.h">
       <Filter>Core</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\include\oc_acl.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\oc_cloud.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\oc_cred.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\oc_swupdate.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="mbedTLS">

security/oc_acl.c

@@ -16,12 +16,12 @@
 
 #ifdef OC_SECURITY
 
-#include "oc_acl.h"
+#include "oc_acl_internal.h"
 #include "oc_api.h"
 #include "oc_certs.h"
 #include "oc_config.h"
 #include "oc_core_res.h"
-#include "oc_cred.h"
+#include "oc_cred_internal.h"
 #include "oc_doxm.h"
 #include "oc_pstat.h"
 #include "oc_rep.h"

security/oc_acl.h → security/oc_acl_internal.h

@@ -17,7 +17,7 @@
 #ifndef OC_ACL_H
 #define OC_ACL_H
 
-#include "oc_acl_common.h"
+#include "oc_acl.h"
 #include "oc_ri.h"
 #include "oc_uuid.h"
 #include "port/oc_log.h"

security/oc_certs.h

@@ -20,7 +20,7 @@
 #ifdef OC_SECURITY
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/x509_csr.h"
-#include "security/oc_cred.h"
+#include "security/oc_cred_internal.h"
 
 #ifdef __cplusplus
 extern "C"

security/oc_cred.c

@@ -16,12 +16,12 @@
 
 #ifdef OC_SECURITY
 
-#include "oc_cred.h"
 #include "oc_api.h"
 #include "oc_base64.h"
 #include "oc_certs.h"
 #include "oc_config.h"
 #include "oc_core_res.h"
+#include "oc_cred_internal.h"
 #include "oc_doxm.h"
 #include "oc_keypair.h"
 #include "oc_pstat.h"

security/oc_cred.h → security/oc_cred_internal.h

@@ -17,7 +17,7 @@
 #ifndef OC_CRED_H
 #define OC_CRED_H
 
-#include "oc_cred_common.h"
+#include "oc_cred.h"
 #include "oc_ri.h"
 #include "oc_uuid.h"
 #include <stdint.h>

security/oc_csr.h

@@ -21,7 +21,7 @@
 #include "oc_uuid.h"
 #include <stdint.h>
 
-#include "oc_cred.h"
+#include "oc_cred_internal.h"
 #include "oc_ri.h"
 
 #ifdef __cplusplus

security/oc_doxm.c

@@ -17,7 +17,7 @@
 #ifdef OC_SECURITY
 
 #include "oc_doxm.h"
-#include "oc_acl.h"
+#include "oc_acl_internal.h"
 #include "oc_api.h"
 #include "oc_core_res.h"
 #include "oc_pstat.h"

security/oc_obt.c

@@ -21,9 +21,9 @@
 
 #include "oc_obt.h"
 #include "oc_core_res.h"
-#include "security/oc_acl.h"
+#include "security/oc_acl_internal.h"
 #include "security/oc_certs.h"
-#include "security/oc_cred.h"
+#include "security/oc_cred_internal.h"
 #include "security/oc_doxm.h"
 #include "security/oc_keypair.h"
 #include "security/oc_obt_internal.h"

security/oc_obt_otm_cert.c

@@ -22,8 +22,8 @@
 
 #include "oc_core_res.h"
 #include "oc_obt.h"
-#include "security/oc_acl.h"
-#include "security/oc_cred.h"
+#include "security/oc_acl_internal.h"
+#include "security/oc_cred_internal.h"
 #include "security/oc_doxm.h"
 #include "security/oc_obt_internal.h"
 #include "security/oc_pstat.h"

security/oc_obt_otm_justworks.c

@@ -21,8 +21,8 @@
 
 #include "oc_core_res.h"
 #include "oc_obt.h"
-#include "security/oc_acl.h"
-#include "security/oc_cred.h"
+#include "security/oc_acl_internal.h"
+#include "security/oc_cred_internal.h"
 #include "security/oc_doxm.h"
 #include "security/oc_obt_internal.h"
 #include "security/oc_pstat.h"

security/oc_obt_otm_randompin.c

@@ -21,8 +21,8 @@
 
 #include "oc_core_res.h"
 #include "oc_obt.h"
-#include "security/oc_acl.h"
-#include "security/oc_cred.h"
+#include "security/oc_acl_internal.h"
+#include "security/oc_cred_internal.h"
 #include "security/oc_doxm.h"
 #include "security/oc_obt_internal.h"
 #include "security/oc_pstat.h"

security/oc_pki.c

@@ -20,7 +20,7 @@
 #include "mbedtls/pk.h"
 #include "mbedtls/x509_crt.h"
 #include "oc_certs.h"
-#include "oc_cred.h"
+#include "oc_cred_internal.h"
 #include "oc_store.h"
 #include "oc_tls.h"
 #include "port/oc_connectivity.h"

security/oc_pstat.c

@@ -19,10 +19,10 @@
 #include "api/cloud/oc_cloud_internal.h"
 #include "api/oc_main.h"
 #include "messaging/coap/observe.h"
-#include "oc_acl.h"
+#include "oc_acl_internal.h"
 #include "oc_api.h"
 #include "oc_core_res.h"
-#include "oc_cred.h"
+#include "oc_cred_internal.h"
 #include "oc_doxm.h"
 #include "oc_roles.h"
 #include "oc_sp.h"

security/oc_roles.h

@@ -18,7 +18,7 @@
 #define OC_ROLES_H
 
 #include "oc_api.h"
-#include "oc_cred.h"
+#include "oc_cred_internal.h"
 #include "security/oc_tls.h"
 
 #ifdef __cplusplus

security/oc_store.c

@@ -16,9 +16,9 @@
 
 #ifdef OC_SECURITY
 #include "oc_store.h"
-#include "oc_acl.h"
+#include "oc_acl_internal.h"
 #include "oc_core_res.h"
-#include "oc_cred.h"
+#include "oc_cred_internal.h"
 #include "oc_doxm.h"
 #include "oc_keypair.h"
 #include "oc_pstat.h"

security/oc_svr.c

@@ -17,10 +17,10 @@
 #ifdef OC_SECURITY
 
 #include "oc_svr.h"
-#include "oc_acl.h"
+#include "oc_acl_internal.h"
 #include "oc_api.h"
 #include "oc_core_res.h"
-#include "oc_cred.h"
+#include "oc_cred_internal.h"
 #include "oc_csr.h"
 #include "oc_doxm.h"
 #include "oc_pstat.h"

security/oc_tls.c

@@ -39,13 +39,13 @@
 #include "api/oc_main.h"
 #include "api/oc_session_events_internal.h"
 #include "messaging/coap/observe.h"
-#include "oc_acl.h"
+#include "oc_acl_internal.h"
 #include "oc_api.h"
 #include "oc_buffer.h"
 #include "oc_client_state.h"
 #include "oc_config.h"
 #include "oc_core_res.h"
-#include "oc_cred.h"
+#include "oc_cred_internal.h"
 #include "oc_doxm.h"
 #include "oc_endpoint.h"
 #include "oc_pstat.h"

security/oc_tls.h

@@ -20,7 +20,7 @@
 #include "mbedtls/ssl.h"
 #include "oc_uuid.h"
 #include "port/oc_connectivity.h"
-#include "security/oc_cred.h"
+#include "security/oc_cred_internal.h"
 #include "security/oc_keypair.h"
 #include "util/oc_etimer.h"
 #include "util/oc_list.h"