updated todo

diff --git a/TODO b/TODO
index 0aa3213..8b8df22 100644 (file)
--- a/TODO
+++ b/TODO
@@ -11,6 +11,7 @@ For 0.11
 - update database to support zone column 
 - no reason for pluginloader to track sources.  core already does it.
 - create docs for all plugins (README)
+- handle badly formed messages properly (ie not crash) in websocketsink
 
 Other:
 - grep all the TODOs in the code and do them

diff --git a/plugins/murphyplugin/CMakeLists.txt b/plugins/murphyplugin/CMakeLists.txt
index eccd4c9..7439b9c 100644 (file)
--- a/plugins/murphyplugin/CMakeLists.txt
+++ b/plugins/murphyplugin/CMakeLists.txt
@@ -11,12 +11,12 @@ if(qtmainloop)
     pkg_check_modules(MURPHY_QT REQUIRED murphy-qt)
 
     set(include_dirs ${include_dirs} ${MURPHY_QT_INCLUDE_DIRS})
-    set(link_libraries ${link_libraries} ${MURPHY_QT_LIBRARIES})
+       set(murphy_libraries ${murphy_libraries} ${MURPHY_QT_LIBRARIES})
 else(qtmainloop)
     pkg_check_modules(MURPHY_GLIB REQUIRED murphy-glib)
 
     set(include_dirs ${include_dirs} ${MURPHY_GLIB_INCLUDE_DIRS})
-    set(link_libraries ${link_libraries} ${MURPHY_GLIB_LIBRARIES})
+       set(murphy_libraries ${murphy_libraries} ${MURPHY_GLIB_LIBRARIES})
 endif(qtmainloop)
 
 
@@ -27,7 +27,7 @@ link_directories(${CMAKE_CURRENT_BINARY_DIR}/lib ${MURPHY_COMMON_LIBRARY_DIRS})
 
 add_library(murphysourceplugin MODULE ${murphysourceplugin_sources})
 set_target_properties(murphysourceplugin PROPERTIES PREFIX "")
-target_link_libraries(murphysourceplugin amb ${MURPHY_COMMON_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries})
+target_link_libraries(murphysourceplugin amb ${MURPHY_COMMON_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${murphy_libraries})
 
 install(TARGETS murphysourceplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker)
 

diff --git a/plugins/websocketsink/protocol b/plugins/websocketsink/protocol
index ea37448..5250b11 100644 (file)
--- a/plugins/websocketsink/protocol
+++ b/plugins/websocketsink/protocol
@@ -1,7 +1,7 @@
 Example protocol messages
 
 Property changed event:
-{"type":"valuechanged","name":"VehicleSpeed","data":"217","transactionid":"d293f670-f0b3-11e1-aff1-0800200c9a66", "timestamp":"1354521964.60253","sequence":"0"}1354521964.25081", "sequence": "0" }
+{"type":"valuechanged","name":"VehicleSpeed","data":"217","transactionid":"d293f670-f0b3-11e1-aff1-0800200c9a66", "timestamp":"1354521964.60253","sequence":"0"}
 
 Get property request: 
 {"type":"method","name":"get","data":["VehicleSpeed"],"transactionid":"d293f670-f0b3-11e1-aff1-0800200c9a66"}