.

src/hos_philips_hue/CMakeLists.txt

@@ -7,7 +7,7 @@ project(hos_philips_hue)
 find_package(catkin REQUIRED COMPONENTS
   hos_core_msgs
   rospy
-  hos_python_json
+  hos_python_utils
 )
 
 ## System dependencies are found with CMake's conventions
@@ -82,7 +82,7 @@ catkin_python_setup()
 catkin_package(
 #  INCLUDE_DIRS include
 #  LIBRARIES hos_philips_hue
-	CATKIN_DEPENDS hos_core_msgs rospy hos_python_json
+	CATKIN_DEPENDS hos_core_msgs rospy hos_python_utils
 #  DEPENDS system_lib
 )
 

src/hos_philips_hue/nodes/test.py

@@ -7,7 +7,7 @@ import rospy
 import json
 import traceback
 from hos_core_msgs.msg import DeviceCommand
-from jsonspec_hos.reference.providers import HOSParamServerProvider
+from hos.utils.schemaloader import SchemaLoader
 from jsonspec.validators import load
 from time import sleep
 
@@ -18,7 +18,7 @@ if __name__ == '__main__':
         rospy.init_node('test', argv=sys.argv, anonymous=True)
         cmdPublisher = rospy.Publisher("/hos/devices/cmd", DeviceCommand, queue_size=10)
         
-        schemaProvider = HOSParamServerProvider()
+        schemaProvider = SchemaLoader()
         stamp = rospy.get_rostime()
         
         msg = DeviceCommand()

src/hos_philips_hue/package.xml

@@ -42,10 +42,10 @@
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>hos_core_msgs</build_depend>
   <build_depend>rospy</build_depend>
-  <build_depend>hos_python_json</build_depend>
+  <build_depend>hos_python_utils</build_depend>
   <run_depend>hos_core_msgs</run_depend>
   <run_depend>rospy</run_depend>
-  <run_depend>hos_python_json</run_depend>
+  <run_depend>hos_python_utils</run_depend>
 
 
   <!-- The export tag contains other, unspecified, tags -->

src/hos_philips_hue/python/hos_huecontroller/huecontroller.py

@@ -10,7 +10,7 @@ from hos_pyhue import pyhue
 from hos_core_msgs.msg import DeviceCommand
 from hos_core_msgs.msg import DeviceStatusUpdate
 from hos_core_msgs.msg import HosStatusUpdate
-from jsonspec_hos.reference.providers import HOSParamServerProvider
+from hos.utils.schemaloader import SchemaLoader
 from jsonspec.validators import load
 from curses.has_key import has_key
 from time import sleep
@@ -55,7 +55,7 @@ class HueController(object):
             rospy.set_param(key_base + "/status_topic", self.status_topic)
             rospy.set_param(key_base + "/cmd_topic", self.cmd_topic)            
         # Create JSON schema provider
-        self.schemaProvider = HOSParamServerProvider()
+        self.schemaProvider = SchemaLoader()
         # Create message publisher
         self.statusPublisher = rospy.Publisher(self.status_topic, DeviceStatusUpdate, queue_size=10)
         self.hosUpdatePublisher = rospy.Publisher(self.hos_update_topic, HosStatusUpdate, queue_size=10)