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



git-svn-id: svn://bind10.isc.org/svn/bind10/branches/parkinglot@600 e5f2f494-b856-4b98-b285-d166d9295462

configure.ac

@@ -146,7 +146,7 @@ AC_CONFIG_FILES([Makefile
                  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 @@ AC_CONFIG_FILES([Makefile
                  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 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr
            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

src/bin/Makefile.am

@@ -1 +1 @@
-SUBDIRS = bind10 bindctl cfgmgr msgq parkinglot host cmd-ctrld
+SUBDIRS = bind10 bindctl cfgmgr msgq parkinglot host cmdctl

src/bin/bind10/bind10.in

@@ -5,7 +5,7 @@ export PYTHON_EXEC
 
 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

src/bin/bind10/bind10.py

@@ -188,20 +188,20 @@ class BoB:
         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")
+            sys.stdout.write("Starting b10-cmdctl on port 8080\n")
         try:
-            cmd_ctrld = ProcessInfo("cmd-ctrld", ['cmd-ctrld'])
+            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
 

src/bin/bindctl/bindctl.py

@@ -73,6 +73,6 @@ if __name__ == '__main__':
         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?")
 
 

src/bin/cmd-ctrld/Makefile.am

@@ -1 +0,0 @@
-bin_SCRIPTS = cmd-ctrld cmd-ctrld.py

src/bin/cmdctl/Makefile.am

@@ -0,0 +1 @@
+bin_SCRIPTS = b10-cmdctl b10-cmdctl.py

src/bin/cmd-ctrld/cmd-ctrld.in

@@ -3,10 +3,10 @@
 PYTHON_EXEC=${PYTHON_EXEC:-@PYTHON@}
 export PYTHON_EXEC
 
-CMD_CTRLD_PATH=@abs_top_srcdir@/src/bin/cmd-ctrld
+CMD_CTRLD_PATH=@abs_top_srcdir@/src/bin/cmdctl
 PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:${abs_top_src_dir}/lib/cc/python/ISC
 export PYTHONPATH
 
 cd ${CMD_CTRLD_PATH}
-${PYTHON_EXEC} cmd-ctrld.py
+${PYTHON_EXEC} b10-cmdctl.py