commit 31b5c2f2a5814164725d316c4b578be75e7629b5
author Jeff Thompson <jefft0@gmail.com> Sat Oct 12 15:13:16 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Sat Oct 12 15:13:16 2013 -0700
tree 5dd118fdb8b8c02ebce21ef94e2f69adaa2b8475
parent 27b2bf902ffca5d6b1a725c7774d18b8d2477c9d

encoding: Move oid support from security/certificate to encoding.

include/Makefile.am

diff --git a/include/Makefile.am b/include/Makefile.am
index f3a7493..06d98aa 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,5 +1,5 @@
 # "make install" will install these in the install include directory, for example
-# /usr/local/include/ndn-cpp/name.hpp.
+# /usr/local/ndn-cpp/name.hpp.
 # These files are included by the application with, for example
 # #include <ndn-cpp/namp.hpp>
 # Internal include headers are not put in this public install directory.
@@ -27,15 +27,15 @@
   ndn-cpp/node.hpp \
   ndn-cpp/publisher-public-key-digest.hpp \
   ndn-cpp/sha256-with-rsa-signature.hpp \
-  ndn-cpp/encoding/element-listener.hpp \
   ndn-cpp/encoding/binary-xml-wire-format.hpp \
+  ndn-cpp/encoding/element-listener.hpp \
+  ndn-cpp/encoding/oid.hpp \
   ndn-cpp/encoding/wire-format.hpp \
   ndn-cpp/security/security-common.hpp \
   ndn-cpp/security/key-chain.hpp \
   ndn-cpp/security/security-exception.hpp \
   ndn-cpp/security/certificate/certificate.hpp \
   ndn-cpp/security/certificate/identity-certificate.hpp \
-  ndn-cpp/security/certificate/oid.hpp \
   ndn-cpp/security/certificate/public-key.hpp \
   ndn-cpp/security/encryption/encryption-manager.hpp \
   ndn-cpp/security/identity/basic-identity-storage.hpp \

include/Makefile.in

diff --git a/include/Makefile.in b/include/Makefile.in
index 8f4827a..0ede7e9 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 # "make install" will install these in the install include directory, for example
-# /usr/local/include/ndn-cpp/name.hpp.
+# /usr/local/ndn-cpp/name.hpp.
 # These files are included by the application with, for example
 # #include <ndn-cpp/namp.hpp>
 # Internal include headers are not put in this public install directory.
@@ -344,15 +344,15 @@
   ndn-cpp/node.hpp \
   ndn-cpp/publisher-public-key-digest.hpp \
   ndn-cpp/sha256-with-rsa-signature.hpp \
-  ndn-cpp/encoding/element-listener.hpp \
   ndn-cpp/encoding/binary-xml-wire-format.hpp \
+  ndn-cpp/encoding/element-listener.hpp \
+  ndn-cpp/encoding/oid.hpp \
   ndn-cpp/encoding/wire-format.hpp \
   ndn-cpp/security/security-common.hpp \
   ndn-cpp/security/key-chain.hpp \
   ndn-cpp/security/security-exception.hpp \
   ndn-cpp/security/certificate/certificate.hpp \
   ndn-cpp/security/certificate/identity-certificate.hpp \
-  ndn-cpp/security/certificate/oid.hpp \
   ndn-cpp/security/certificate/public-key.hpp \
   ndn-cpp/security/encryption/encryption-manager.hpp \
   ndn-cpp/security/identity/basic-identity-storage.hpp \

include/ndn-cpp/encoding/oid.hpp

diff --git a/include/ndn-cpp/security/certificate/oid.hpp b/include/ndn-cpp/encoding/oid.hpp
similarity index 100%
rename from include/ndn-cpp/security/certificate/oid.hpp
rename to include/ndn-cpp/encoding/oid.hpp

include/ndn-cpp/security/certificate/public-key.hpp

diff --git a/include/ndn-cpp/security/certificate/public-key.hpp b/include/ndn-cpp/security/certificate/public-key.hpp
index 7db3f49..fa8724f 100644
--- a/include/ndn-cpp/security/certificate/public-key.hpp
+++ b/include/ndn-cpp/security/certificate/public-key.hpp
@@ -10,7 +10,7 @@
 #define	NDN_PUBLIC_KEY_HPP
 
 #include "../../util/blob.hpp"
-#include "oid.hpp"
+#include "../../encoding/oid.hpp"
 #include "../security-common.hpp"
 
 namespace ndn {