[svn] commit: r871 - in /branches/jelte-configuration/src: bin/auth/main.cc bin/parkinglot/main.cc lib/config/cpp/ccsession.cc lib/config/cpp/ccsession.h lib/config/cpp/data_def.cc lib/config/cpp/data_def.h lib/config/cpp/data_def_unittests.cc

[BIND 10 source code commits]

Author: jelte
Date: Thu Feb 18 14:49:42 2010
New Revision: 871

Log:
put ModuleCCSession and ModuleSpec in namespace isc::config

Modified:
    branches/jelte-configuration/src/bin/auth/main.cc
    branches/jelte-configuration/src/bin/parkinglot/main.cc
    branches/jelte-configuration/src/lib/config/cpp/ccsession.cc
    branches/jelte-configuration/src/lib/config/cpp/ccsession.h
    branches/jelte-configuration/src/lib/config/cpp/data_def.cc
    branches/jelte-configuration/src/lib/config/cpp/data_def.h
    branches/jelte-configuration/src/lib/config/cpp/data_def_unittests.cc

Modified: branches/jelte-configuration/src/bin/auth/main.cc
==============================================================================
--- branches/jelte-configuration/src/bin/auth/main.cc (original)
+++ branches/jelte-configuration/src/bin/auth/main.cc Thu Feb 18 14:49:42 2010
@@ -106,9 +106,9 @@
         } else {
             specfile = std::string(AUTH_SPECFILE_LOCATION);
         }
-        ModuleCCSession cs = ModuleCCSession(specfile,
-                                           my_config_handler,
-                                           my_command_handler);
+        isc::config::ModuleCCSession cs = isc::config::ModuleCCSession(specfile,
+                                                                       my_config_handler,
+                                                                       my_command_handler);
     
         // main server loop
         fd_set fds;

Modified: branches/jelte-configuration/src/bin/parkinglot/main.cc
==============================================================================
--- branches/jelte-configuration/src/bin/parkinglot/main.cc (original)
+++ branches/jelte-configuration/src/bin/parkinglot/main.cc Thu Feb 18 14:49:42 2010
@@ -110,7 +110,9 @@
         } else {
             specfile = std::string(PARKINGLOT_SPECFILE_LOCATION);
         }
-        ModuleCCSession cs = ModuleCCSession(specfile, my_config_handler, my_command_handler);
+        isc::config::ModuleCCSession cs = isc::config::ModuleCCSession(specfile,
+                                                                       my_config_handler,
+                                                                       my_command_handler);
     
         // main server loop
         fd_set fds;

Modified: branches/jelte-configuration/src/lib/config/cpp/ccsession.cc
==============================================================================
--- branches/jelte-configuration/src/lib/config/cpp/ccsession.cc (original)
+++ branches/jelte-configuration/src/lib/config/cpp/ccsession.cc Thu Feb 18 14:49:42 2010
@@ -45,10 +45,10 @@
 
 using isc::data::Element;
 using isc::data::ElementPtr;
-using isc::data::ModuleSpec;
 using isc::data::ParseError;
-using isc::data::ModuleSpecError;
-using namespace isc::data;
+
+namespace isc {
+namespace config {
 
 void
 ModuleCCSession::read_module_specification(const std::string& filename) {
@@ -156,3 +156,5 @@
     return 0;
 }
 
+}
+}

Modified: branches/jelte-configuration/src/lib/config/cpp/ccsession.h
==============================================================================
--- branches/jelte-configuration/src/lib/config/cpp/ccsession.h (original)
+++ branches/jelte-configuration/src/lib/config/cpp/ccsession.h Thu Feb 18 14:49:42 2010
@@ -22,6 +22,9 @@
 #include <config/data_def.h>
 #include <cc/session.h>
 #include <cc/data.h>
+
+namespace isc {
+namespace config {
 
 class ModuleCCSession {
 public:
@@ -75,13 +78,15 @@
     
     std::string module_name_;
     isc::cc::Session session_;
-    isc::data::ModuleSpec module_specification_;
+    ModuleSpec module_specification_;
     isc::data::ElementPtr config_;
 
     isc::data::ElementPtr(*config_handler_)(isc::data::ElementPtr new_config);
     isc::data::ElementPtr(*command_handler_)(isc::data::ElementPtr command);
 };
 
+}
+}
 #endif // __CCSESSION_H
 
 // Local Variables:

Modified: branches/jelte-configuration/src/lib/config/cpp/data_def.cc
==============================================================================
--- branches/jelte-configuration/src/lib/config/cpp/data_def.cc (original)
+++ branches/jelte-configuration/src/lib/config/cpp/data_def.cc Thu Feb 18 14:49:42 2010
@@ -25,7 +25,7 @@
 // todo: add more context to thrown ModuleSpecErrors?
 
 namespace isc {
-namespace data {
+namespace config {
 
 //
 // static functions

Modified: branches/jelte-configuration/src/lib/config/cpp/data_def.h
==============================================================================
--- branches/jelte-configuration/src/lib/config/cpp/data_def.h (original)
+++ branches/jelte-configuration/src/lib/config/cpp/data_def.h Thu Feb 18 14:49:42 2010
@@ -20,7 +20,9 @@
 
 #include <sstream>
 
-namespace isc { namespace data {
+using namespace isc::data;
+
+namespace isc { namespace config {
 
     ///
     /// A standard ModuleSpec exception that is thrown when a

Modified: branches/jelte-configuration/src/lib/config/cpp/data_def_unittests.cc
==============================================================================
--- branches/jelte-configuration/src/lib/config/cpp/data_def_unittests.cc (original)
+++ branches/jelte-configuration/src/lib/config/cpp/data_def_unittests.cc Thu Feb 18 14:49:42 2010
@@ -23,6 +23,7 @@
 #include "data_def_unittests_config.h"
 
 using namespace isc::data;
+using namespace isc::config;
 
 std::string specfile(const std::string name) {
     return std::string(TEST_DATA_PATH) + "/" + name;