[svn] commit: r600 - in /branches/parkinglot: ./ src/bin/ src/bin/bind10/ src/bin/bindctl/ src/bin/cmd-ctrld/ src/bin/cmdctl/

[BIND 10 source code commits]

Author: jelte
Date: Thu Jan 28 21:36:25 2010
New Revision: 600

Log:
move step 2:
renamed src/bin/cmd-ctrld to src/bin/cmdctl
renamed src/bin/cmd-ctrld/cmd-ctrld.in to src/bin/cmdctl/b10-cmdctl.in
renamed src/bin/cmd-ctrld/cmd-ctrld.py to src/bin/cmdctl/b10-cmdctl.py


Added:
    branches/parkinglot/src/bin/cmdctl/
      - copied from r598, branches/parkinglot/src/bin/cmd-ctrld/
    branches/parkinglot/src/bin/cmdctl/b10-cmdctl.in
      - copied, changed from r598, branches/parkinglot/src/bin/cmd-ctrld/cmd-ctrld.in
    branches/parkinglot/src/bin/cmdctl/b10-cmdctl.py
      - copied unchanged from r598, branches/parkinglot/src/bin/cmd-ctrld/cmd-ctrld.py
Removed:
    branches/parkinglot/src/bin/cmd-ctrld/
    branches/parkinglot/src/bin/cmdctl/cmd-ctrld.in
    branches/parkinglot/src/bin/cmdctl/cmd-ctrld.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/bindctl/bindctl.py
    branches/parkinglot/src/bin/cmdctl/Makefile.am

Modified: branches/parkinglot/configure.ac
==============================================================================
--- branches/parkinglot/configure.ac (original)
+++ branches/parkinglot/configure.ac Thu Jan 28 21:36:25 2010
@@ -146,7 +146,7 @@
                  src/Makefile
                  src/bin/Makefile
                  src/bin/bind10/Makefile
-                 src/bin/cmd-ctrld/Makefile
+                 src/bin/cmdctl/Makefile
                  src/bin/bindctl/Makefile
                  src/bin/cfgmgr/Makefile
                  src/bin/host/Makefile
@@ -165,7 +165,7 @@
                  src/lib/dns/cpp/Makefile
                ])
 AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr
-           src/bin/cmd-ctrld/cmd-ctrld
+           src/bin/cmdctl/b10-cmdctl
            src/bin/bind10/bind10
            src/bin/bind10/bind10_test
            src/bin/bindctl/bindctl
@@ -174,7 +174,7 @@
            src/bin/parkinglot/config.h
           ], [
            chmod +x src/bin/cfgmgr/b10-cfgmgr
-           chmod +x src/bin/cmd-ctrld/cmd-ctrld
+           chmod +x src/bin/cmdctl/b10-cmdctl
            chmod +x src/bin/bind10/bind10
            chmod +x src/bin/bindctl/bindctl
            chmod +x src/bin/msgq/msgq

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

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:36:25 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/cfgmgr:@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/cmdctl:$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:36:25 2010
@@ -188,20 +188,20 @@
         if self.verbose:
             sys.stdout.write("Started parkinglot (PID %d)\n" % parkinglot.pid)
 
-        # start the cmd-ctrld
+        # start the b10-cmdctl
         # XXX: we hardcode port 8080
         if self.verbose:
-            sys.stdout.write("Starting cmd-ctrld on port 8080\n")
-        try:
-            cmd_ctrld = ProcessInfo("cmd-ctrld", ['cmd-ctrld'])
+            sys.stdout.write("Starting b10-cmdctl on port 8080\n")
+        try:
+            cmd_ctrld = ProcessInfo("b10-cmdctl", ['b10-cmdctl'])
         except Exception as e:
             c_channel.process.kill()
             bind_cfgd.process.kill()
             parkinglot.process.kill()
-            return "Unable to start cmd-ctrld; " + str(e)
+            return "Unable to start b10-cmdctl; " + str(e)
         self.processes[cmd_ctrld.pid] = cmd_ctrld
         if self.verbose:
-            sys.stdout.write("Started cmd-ctrld (PID %d)\n" % cmd_ctrld.pid)
+            sys.stdout.write("Started b10-cmdctl (PID %d)\n" % cmd_ctrld.pid)
 
         self.runnable = True
 

Modified: branches/parkinglot/src/bin/bindctl/bindctl.py
==============================================================================
--- branches/parkinglot/src/bin/bindctl/bindctl.py (original)
+++ branches/parkinglot/src/bin/bindctl/bindctl.py Thu Jan 28 21:36:25 2010
@@ -73,6 +73,6 @@
         tool.run()
     except Exception as e:
         print(e)
-        print("Failed to connect with cmd-ctrld module, is it running?")
+        print("Failed to connect with b10-cmdctl module, is it running?")
 
 

Modified: branches/parkinglot/src/bin/cmdctl/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/cmdctl/Makefile.am (original)
+++ branches/parkinglot/src/bin/cmdctl/Makefile.am Thu Jan 28 21:36:25 2010
@@ -1,1 +1,1 @@
-bin_SCRIPTS = cmd-ctrld cmd-ctrld.py
+bin_SCRIPTS = b10-cmdctl b10-cmdctl.py