[svn] commit: r599 - in /branches/parkinglot: ./ src/bin/ src/bin/bind-cfgd/ src/bin/bind10/ src/bin/cfgmgr/ src/lib/config/python/

[BIND 10 source code commits]

Author: jelte
Date: Thu Jan 28 21:20:05 2010
New Revision: 599

Log:
move step 1:
renamed src/bin/bind-cfgd to src/bin/cfgmgr
moved src/lib/config/python/bind-cfgd.py to src/bin/cfgmgr/b10-cfgmgr

Added:
    branches/parkinglot/src/bin/cfgmgr/
      - copied from r598, branches/parkinglot/src/bin/bind-cfgd/
    branches/parkinglot/src/bin/cfgmgr/b10-cfgmgr.in
      - copied, changed from r598, branches/parkinglot/src/bin/bind-cfgd/bind-cfgd.in
    branches/parkinglot/src/bin/cfgmgr/b10-cfgmgr.py
      - copied unchanged from r598, branches/parkinglot/src/lib/config/python/bind-cfgd.py
Removed:
    branches/parkinglot/src/bin/bind-cfgd/
    branches/parkinglot/src/bin/cfgmgr/bind-cfgd.in
    branches/parkinglot/src/lib/config/python/bind-cfgd.py
Modified:
    branches/parkinglot/configure.ac
    branches/parkinglot/src/bin/Makefile.am
    branches/parkinglot/src/bin/bind10/bind10.in
    branches/parkinglot/src/bin/bind10/bind10.py
    branches/parkinglot/src/bin/cfgmgr/Makefile.am

Modified: branches/parkinglot/configure.ac
==============================================================================
--- branches/parkinglot/configure.ac (original)
+++ branches/parkinglot/configure.ac Thu Jan 28 21:20:05 2010
@@ -148,7 +148,7 @@
                  src/bin/bind10/Makefile
                  src/bin/cmd-ctrld/Makefile
                  src/bin/bindctl/Makefile
-                 src/bin/bind-cfgd/Makefile
+                 src/bin/cfgmgr/Makefile
                  src/bin/host/Makefile
                  src/bin/msgq/Makefile
                  src/bin/parkinglot/Makefile
@@ -164,7 +164,7 @@
                  src/lib/dns/Makefile
                  src/lib/dns/cpp/Makefile
                ])
-AC_OUTPUT([src/bin/bind-cfgd/bind-cfgd
+AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr
            src/bin/cmd-ctrld/cmd-ctrld
            src/bin/bind10/bind10
            src/bin/bind10/bind10_test
@@ -173,7 +173,7 @@
            src/bin/msgq/msgq_test
            src/bin/parkinglot/config.h
           ], [
-           chmod +x src/bin/bind-cfgd/bind-cfgd
+           chmod +x src/bin/cfgmgr/b10-cfgmgr
            chmod +x src/bin/cmd-ctrld/cmd-ctrld
            chmod +x src/bin/bind10/bind10
            chmod +x src/bin/bindctl/bindctl

Modified: branches/parkinglot/src/bin/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/Makefile.am (original)
+++ branches/parkinglot/src/bin/Makefile.am Thu Jan 28 21:20:05 2010
@@ -1,1 +1,1 @@
-SUBDIRS = bind10 bindctl bind-cfgd msgq parkinglot host cmd-ctrld
+SUBDIRS = bind10 bindctl cfgmgr msgq parkinglot host cmd-ctrld

Modified: branches/parkinglot/src/bin/bind10/bind10.in
==============================================================================
--- branches/parkinglot/src/bin/bind10/bind10.in (original)
+++ branches/parkinglot/src/bin/bind10/bind10.in Thu Jan 28 21:20:05 2010
@@ -5,7 +5,7 @@
 
 BIND10_PATH=@abs_top_srcdir@/src/bin/bind10
 
-PATH=@abs_top_srcdir@/src/bin/msgq:@abs_top_srcdir@/src/bin/parkinglot:@abs_top_srcdir@/src/bin/bind-cfgd:@abs_top_srcdir@/src/bin/cmd-ctrld:$PATH
+PATH=@abs_top_srcdir@/src/bin/msgq:@abs_top_srcdir@/src/bin/parkinglot:@abs_top_srcdir@/src/bin/cfgmgr:@abs_top_srcdir@/src/bin/cmd-ctrld:$PATH
 export PATH
 
 PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:@abs_top_srcdir@/src/lib/config/python

Modified: branches/parkinglot/src/bin/bind10/bind10.py
==============================================================================
--- branches/parkinglot/src/bin/bind10/bind10.py (original)
+++ branches/parkinglot/src/bin/bind10/bind10.py Thu Jan 28 21:20:05 2010
@@ -152,19 +152,19 @@
 
         # start the configuration manager
         if self.verbose:
-            sys.stdout.write("Starting bind-cfgd\n")
-        try:
-            bind_cfgd = ProcessInfo("bind-cfgd", "bind-cfgd")
+            sys.stdout.write("Starting b10-cfgmgr\n")
+        try:
+            bind_cfgd = ProcessInfo("b10-cfgmgr", "b10-cfgmgr")
         except Exception as e:
             c_channel.process.kill()
-            return "Unable to start bind-cfgd; " + str(e)
+            return "Unable to start b10-cfgmgr; " + str(e)
         self.processes[bind_cfgd.pid] = bind_cfgd
         if self.verbose:
-            sys.stdout.write("Started bind-cfgd (PID %d)\n" % bind_cfgd.pid)
+            sys.stdout.write("Started b10-cfgmgr (PID %d)\n" % bind_cfgd.pid)
 
         # TODO: once this interface is done, replace self.cc_session
         # by this one
-        # sleep until bind-cfgd is fully up and running, this is a good place
+        # sleep until b10-cfgmgr is fully up and running, this is a good place
         # to have a (short) timeout on synchronized groupsend/receive
         time.sleep(1)
         if self.verbose:

Modified: branches/parkinglot/src/bin/cfgmgr/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/cfgmgr/Makefile.am (original)
+++ branches/parkinglot/src/bin/cfgmgr/Makefile.am Thu Jan 28 21:20:05 2010
@@ -1,3 +1,3 @@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
-pkglibexec_SCRIPTS = bind-cfgd
+pkglibexec_SCRIPTS = b10-cfgmgr