OpenSim -> Halcyon

src/console.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 '''
-RestConsole -- Implements a remote console using Rest to the OpenSim Services
+RestConsole -- Implements a remote console using Rest to the Halcyon Services
 
 @author:     Mike Dickson
 @copyright:  2013 InWorldz, LLC. All rights reserved.

src/inworldz/maestro/Region.py

@@ -36,7 +36,7 @@ def __init__(self, uuid, record={}):
         ServiceBase.__init__(self, uuid, record)
         self.props = DefaultProperties.instance()
         dbconfig = self.props.getCoreDbConfig()
-        self.exe_name = "OpenSim.exe"
+        self.exe_name = "Halcyon.exe"
 #        self.exe_args = "--console rest"
         self.exe_args = ""
 

src/inworldz/maestro/System.py

@@ -128,7 +128,7 @@ def process_list(self):
 #    if (len(p.cmdline()) <= 0):
 #        continue
 #    cmdline = p.cmdline()[0]
-#    if os.path.basename(cmdline) == "OpenSim.exe":
+#    if os.path.basename(cmdline) == "Halcyon.exe":
 #        print cmdline
 #        print os.path.dirname(cmdline)
 #        print p.pid

src/inworldz/util/network.py

@@ -137,11 +137,11 @@ def OpenAllFirewallPorts(
 
     for i in range(maxRegionSlots):
         print "Opening UDP port {0} on firewall".format(startingUdpPort + i);
-        FWOpenPort("OpenSim UDP {0}".format(i), startingUdpPort + i, 
+        FWOpenPort("Halcyon UDP {0}".format(i), startingUdpPort + i, 
                    NET_FW_IP_PROTOCOL_UDP, NET_FW_SCOPE_ALL, NET_FW_IP_VERSION_ANY)
 
         print "Opening TCP port {0} on firewall".format(startingHttpPort + i)
-        FWOpenPort("OpenSim TCP {0}".format(i), startingHttpPort + i,
+        FWOpenPort("Halcyon TCP {0}".format(i), startingHttpPort + i,
                    NET_FW_IP_PROTOCOL_TCP, NET_FW_SCOPE_ALL, NET_FW_IP_VERSION_ANY)
 
     FWOpenSubnet("Backend Subnet", backendSubnet);

src/inworldz/util/provision.py

@@ -94,7 +94,7 @@ def _findRegionProcess(slotnum):
             continue
         cmdline = p.cmdline()[0]
         if ((os.path.dirname(cmdline) == bindir) and
-            (os.path.basename(cmdline) == "OpenSim.exe")):
+            (os.path.basename(cmdline) == "Halcyon.exe")):
             return (p)
     return None
 

tests/CreateRegion.py

@@ -7,7 +7,7 @@
 result = session.api.Console.Command("show users")
 print result
 
-region = session.api.Region.GetByName("OpenSim Test")
+region = session.api.Region.GetByName("Halcyon Test")
 print result
 
 session.api.Region.Restart(region)

tests/UpdateGridServices.py

@@ -7,7 +7,7 @@
 result = session.api.Console.Command("show users")
 print result
 
-region = session.api.Region.GetByName("OpenSim Test")
+region = session.api.Region.GetByName("Halcyon Test")
 print result
 
 session.api.Region.Restart(region)

tests/ZooKeeperTestClient.py

@@ -7,7 +7,7 @@
 result = session.api.Console.Command("show users")
 print result
 
-region = session.api.Region.GetByName("OpenSim Test")
+region = session.api.Region.GetByName("Halcyon Test")
 print result
 
 session.api.Region.Restart(region)