[svn] commit: r601 - in /branches/parkinglot/src/bin: bind10/bind10.py parkinglot/Makefile.am parkinglot/b10-parkinglot.cc parkinglot/b10-parkinglot.h parkinglot/main.cc parkinglot/parkinglot.cc parkinglot/parkinglot.h

[BIND 10 source code commits]

Author: jelte
Date: Thu Jan 28 21:44:27 2010
New Revision: 601

Log:
move step 3:
rename parkinglot binary to b10-parkinglot

Added:
    branches/parkinglot/src/bin/parkinglot/b10-parkinglot.cc
      - copied, changed from r598, branches/parkinglot/src/bin/parkinglot/parkinglot.cc
    branches/parkinglot/src/bin/parkinglot/b10-parkinglot.h
      - copied unchanged from r598, branches/parkinglot/src/bin/parkinglot/parkinglot.h
Removed:
    branches/parkinglot/src/bin/parkinglot/parkinglot.cc
    branches/parkinglot/src/bin/parkinglot/parkinglot.h
Modified:
    branches/parkinglot/src/bin/bind10/bind10.py
    branches/parkinglot/src/bin/parkinglot/Makefile.am
    branches/parkinglot/src/bin/parkinglot/main.cc

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:44:27 2010
@@ -177,16 +177,16 @@
         # XXX: this must be read from the configuration manager in the future
         # XXX: we hardcode port 5300
         if self.verbose:
-            sys.stdout.write("Starting parkinglot on port 5300\n")
-        try:
-            parkinglot = ProcessInfo("parkinglot", ["parkinglot", "-p", "5300"])
+            sys.stdout.write("Starting b10-parkinglot on port 5300\n")
+        try:
+            parkinglot = ProcessInfo("b10-parkinglot", ["b10-parkinglot", "-p", "5300"])
         except Exception as e:
             c_channel.process.kill()
             bind_cfgd.process.kill()
-            return "Unable to start parkinglot; " + str(e)
+            return "Unable to start b10-parkinglot; " + str(e)
         self.processes[parkinglot.pid] = parkinglot
         if self.verbose:
-            sys.stdout.write("Started parkinglot (PID %d)\n" % parkinglot.pid)
+            sys.stdout.write("Started b10-parkinglot (PID %d)\n" % parkinglot.pid)
 
         # start the b10-cmdctl
         # XXX: we hardcode port 8080

Modified: branches/parkinglot/src/bin/parkinglot/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/parkinglot/Makefile.am (original)
+++ branches/parkinglot/src/bin/parkinglot/Makefile.am Thu Jan 28 21:44:27 2010
@@ -2,16 +2,16 @@
 
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
-pkglibexec_PROGRAMS = parkinglot
+pkglibexec_PROGRAMS = b10-parkinglot
 
-parkinglot_SOURCES = common.cc common.h zoneset.h zoneset.cc parkinglot.cc
-parkinglot_SOURCES += parkinglot.h main.cc
-parkinglot_SOURCES += data_source_plot.h data_source_plot.cc
-parkinglot_SOURCES += data_source.h data_source.cc
-parkinglot_SOURCES += builtin.h builtin.cc
-parkinglot_LDADD =  $(top_builddir)/src/lib/dns/cpp/.libs/libdns.a
-parkinglot_LDADD += $(top_builddir)/src/lib/config/cpp/libclient.a
-parkinglot_LDADD += $(top_builddir)/src/lib/cc/cpp/libcc.a
+b10_parkinglot_SOURCES = b10-parkinglot.cc b10-parkinglot.h
+b10_parkinglot_SOURCES += common.cc common.h zoneset.h zoneset.cc main.cc
+b10_parkinglot_SOURCES += data_source_plot.h data_source_plot.cc
+b10_parkinglot_SOURCES += data_source.h data_source.cc
+b10_parkinglot_SOURCES += builtin.h builtin.cc
+b10_parkinglot_LDADD =  $(top_builddir)/src/lib/dns/cpp/.libs/libdns.a
+b10_parkinglot_LDADD += $(top_builddir)/src/lib/config/cpp/libclient.a
+b10_parkinglot_LDADD += $(top_builddir)/src/lib/cc/cpp/libcc.a
 
 # TODO: don't install this here
 bin_PROGRAMS = builtin_bench

Modified: branches/parkinglot/src/bin/parkinglot/main.cc
==============================================================================
--- branches/parkinglot/src/bin/parkinglot/main.cc (original)
+++ branches/parkinglot/src/bin/parkinglot/main.cc Thu Jan 28 21:44:27 2010
@@ -35,7 +35,7 @@
 #include <config/cpp/ccsession.h>
 
 #include "zoneset.h"
-#include "parkinglot.h"
+#include "b10-parkinglot.h"
 
 #include "common.h"