Changed getNames signature from set to list

20 files changed, 138 insertions, 86 deletions

diff --git a/src/uscxml/plugins/invoker/CMakeLists.txt b/src/uscxml/plugins/invoker/CMakeLists.txt
index 301f04a..f12a7a6 100644
--- a/src/uscxml/plugins/invoker/CMakeLists.txt
+++ b/src/uscxml/plugins/invoker/CMakeLists.txt
@@ -13,6 +13,8 @@ if (BUILD_AS_PLUGINS)
 		"../Plugins.cpp")
 	target_link_libraries(invoker_sample uscxml)
 	set_target_properties(invoker_sample PROPERTIES FOLDER "Plugin Invoker")
+	set_target_properties(invoker_sample PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+	set_target_properties(invoker_sample PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 else()
 	list (APPEND USCXML_FILES ${SAMPLE_INVOKER})
 endif()
@@ -32,6 +34,8 @@ if (BUILD_AS_PLUGINS)
 		"../Plugins.cpp")
 	target_link_libraries(invoker_dirmon uscxml)
 	set_target_properties(invoker_dirmon PROPERTIES FOLDER "Plugin Invoker")
+	set_target_properties(invoker_dirmon PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+	set_target_properties(invoker_dirmon PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 else()
 	list (APPEND USCXML_FILES ${DIRMON_INVOKER})
 endif()
@@ -71,6 +75,8 @@ if (BUILD_AS_PLUGINS)
 		"../Plugins.cpp")
 	target_link_libraries(invoker_xhtml uscxml)
 	set_target_properties(invoker_xhtml PROPERTIES FOLDER "Plugin Invoker")
+	set_target_properties(invoker_xhtml PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+	set_target_properties(invoker_xhtml PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 else()
 	list (APPEND USCXML_FILES ${XHTML_INVOKER})
 endif()
@@ -90,6 +96,8 @@ if (BUILD_AS_PLUGINS)
 		"../Plugins.cpp")
 	target_link_libraries(invoker_system uscxml)
 	set_target_properties(invoker_system PROPERTIES FOLDER "Plugin Invoker")
+	set_target_properties(invoker_system PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+	set_target_properties(invoker_system PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 else()
 	list (APPEND USCXML_FILES ${SYSTEM_INVOKER})
 endif()
@@ -111,6 +119,8 @@ if (EXPECT_FOUND AND TCL_FOUND)
 			"../Plugins.cpp")
 		target_link_libraries(invoker_expect uscxml ${EXPECT_LIBRARY} ${TCL_LIBRARY})
 		set_target_properties(invoker_expect PROPERTIES FOLDER "Plugin Invoker")
+		set_target_properties(invoker_expect PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(invoker_expect PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${EXPECT_INVOKER})
 	endif()
@@ -133,6 +143,8 @@ if (CURL_HAS_SMTP)
 			"../Plugins.cpp")
 		target_link_libraries(invoker_smtp uscxml)
 		set_target_properties(invoker_smtp PROPERTIES FOLDER "Plugin Invoker")
+		set_target_properties(invoker_smtp PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(invoker_smtp PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${SMTP_INVOKER})
 	endif()
@@ -154,6 +166,8 @@ if (BUILD_AS_PLUGINS)
 		"../Plugins.cpp")
 	target_link_libraries(invoker_imap uscxml)
 	set_target_properties(invoker_imap PROPERTIES FOLDER "Plugin Invoker")
+	set_target_properties(invoker_imap PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+	set_target_properties(invoker_imap PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 else()
 	list (APPEND USCXML_FILES ${IMAP_INVOKER})
 endif()
@@ -174,6 +188,8 @@ if (SQLITE3_FOUND)
 			"../Plugins.cpp")
 		target_link_libraries(invoker_sqlite3 uscxml)
 		set_target_properties(invoker_sqlite3 PROPERTIES FOLDER "Plugin Invoker")
+		set_target_properties(invoker_sqlite3 PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(invoker_sqlite3 PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${SQLITE3_INVOKER})
 	endif()
@@ -196,6 +212,8 @@ if (FFMPEG_FOUND)
 			"../Plugins.cpp")
 		target_link_libraries(invoker_ffmpeg uscxml ${FFMPEG_LIBRARIES})
 		set_target_properties(invoker_ffmpeg PROPERTIES FOLDER "Plugin Invoker")
+		set_target_properties(invoker_ffmpeg PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(invoker_ffmpeg PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${FFMPEG_INVOKER})
 	endif()
@@ -221,6 +239,8 @@ if (LIBPURPLE_FOUND)
 			"../Plugins.cpp")
 		target_link_libraries(invoker_im uscxml ${LIBPURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${ICONV_LIBRARIES})
 		set_target_properties(invoker_im PROPERTIES FOLDER "Plugin Invoker")
+		set_target_properties(invoker_im PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(invoker_im PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${LIBPURPLE_INVOKER})
 	endif()
@@ -243,6 +263,8 @@ if (LIBICAL_FOUND)
 			"../Plugins.cpp")
 		target_link_libraries(invoker_calendar uscxml ${LIBICAL_LIBRARIES})
 		set_target_properties(invoker_calendar PROPERTIES FOLDER "Plugin Invoker")
+		set_target_properties(invoker_calendar PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(invoker_calendar PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${CALENDAR_INVOKER})
 	endif()
@@ -266,6 +288,8 @@ if (CORELOCATION_LIBRARY AND OFF)
 			"../Plugins.cpp")
 		target_link_libraries(invoker_location uscxml)
 		set_target_properties(invoker_location PROPERTIES FOLDER "Plugin Invoker")
+		set_target_properties(invoker_location PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(invoker_location PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${LOCATION_INVOKER})
 	endif()
@@ -301,6 +325,8 @@ if (UMUNDO_FOUND AND PROTOBUF_FOUND)
 			debug ${PROTOBUF_LIBRARY_DEBUG})
 		endif()
 		set_target_properties(invoker_umundo PROPERTIES FOLDER "Plugin Invoker")
+		set_target_properties(invoker_umundo PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(invoker_umundo PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${UMUNDO_INVOKER})
 	endif()
@@ -319,9 +345,10 @@ if (BUILD_AS_PLUGINS)
 		invoker_uscxml SHARED 
 		${USCXML_INVOKER}
 		"../Plugins.cpp")
-	target_link_libraries(invoker_uscxml 
-		uscxml)
-		set_target_properties(invoker_uscxml PROPERTIES FOLDER "Plugin Invoker")
+	target_link_libraries(invoker_uscxml uscxml)
+	set_target_properties(invoker_uscxml PROPERTIES FOLDER "Plugin Invoker")
+	set_target_properties(invoker_uscxml PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+	set_target_properties(invoker_uscxml PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 else()
 	list (APPEND USCXML_FILES ${USCXML_INVOKER})
 endif()
@@ -342,6 +369,8 @@ if (BUILD_AS_PLUGINS)
 	target_link_libraries(invoker_httpserver 
 		uscxml)
 		set_target_properties(invoker_httpserver PROPERTIES FOLDER "Plugin Invoker")
+		set_target_properties(invoker_httpserver PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(invoker_httpserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 else()
 	list (APPEND USCXML_FILES ${HTTPSERVLET_INVOKER})
 endif()
@@ -362,6 +391,8 @@ if (BUILD_AS_PLUGINS)
 		"../Plugins.cpp")
 	target_link_libraries(invoker_heartbeat uscxml)
 	set_target_properties(invoker_heartbeat PROPERTIES FOLDER "Plugin Invoker")
+	set_target_properties(invoker_heartbeat PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+	set_target_properties(invoker_heartbeat PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 else()
 	list (APPEND USCXML_FILES ${HEARTBEAT_INVOKER})
 endif()
@@ -385,6 +416,8 @@ if (OPENSCENEGRAPH_FOUND AND OPENGL_FOUND)
 			${OPENGL_LIBRARIES}
 			uscxml)
 			set_target_properties(invoker_openscenegraph PROPERTIES FOLDER "Plugin Invoker")
+			set_target_properties(invoker_openscenegraph PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+			set_target_properties(invoker_openscenegraph PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${OPENSCENEGRAPH_INVOKER})
 	endif()
@@ -405,6 +438,8 @@ if (OPENSCENEGRAPH_FOUND AND OPENGL_FOUND)
 			${OPENGL_LIBRARIES}
 			uscxml)
 			set_target_properties(invoker_openscenegraph_convert PROPERTIES FOLDER "Plugin Invoker")
+			set_target_properties(invoker_openscenegraph_convert PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+			set_target_properties(invoker_openscenegraph_convert PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${OPENSCENEGRAPH_CONVERTER_INVOKER})
 	endif()
@@ -449,6 +484,8 @@ if (OPENAL_FOUND AND (LIBSNDFILE_FOUND OR AUDIOTOOLBOX_FOUND))
 				uscxml)
 		endif()	
 		set_target_properties(invoker_openal PROPERTIES FOLDER "Plugin Invoker")
+		set_target_properties(invoker_openal PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(invoker_openal PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
   	list (APPEND USCXML_FILES ${OPENAL_INVOKER})
 	endif()
@@ -472,13 +509,17 @@ if (MILES_FOUND)
 			"../Plugins.cpp")
 		target_link_libraries(invoker_miles 
 			${MILES_LIBRARIES}
-			${OPENAL_LIBRARY}
 			${JPEG_LIBRARIES}
 			uscxml)
 			if (ICONV_FOUND)
 				target_link_libraries(invoker_miles ${ICONV_LIBRARIES})
 			endif()
+			if (OPENAL_FOUND)
+				target_link_libraries(invoker_miles ${OPENAL_LIBRARY})
+			endif()
 		set_target_properties(invoker_miles PROPERTIES FOLDER "Plugin Invoker")
+		set_target_properties(invoker_miles PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(invoker_miles PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
   	list (APPEND USCXML_FILES ${MILES_INVOKER})
 	endif()
@@ -501,6 +542,8 @@ if (UMUNDO_FOUND AND OFF)
 			"../Plugins.cpp")
 		target_link_libraries(invoker_voicexml uscxml)
 		set_target_properties(invoker_voicexml PROPERTIES FOLDER "Plugin Invoker")
+		set_target_properties(invoker_voicexml PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(invoker_voicexml PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${VXML_INVOKER})
 	endif()
diff --git a/src/uscxml/plugins/invoker/audio/OpenALInvoker.h b/src/uscxml/plugins/invoker/audio/OpenALInvoker.h
index 9771f6b..98524ed 100644
--- a/src/uscxml/plugins/invoker/audio/OpenALInvoker.h
+++ b/src/uscxml/plugins/invoker/audio/OpenALInvoker.h
@@ -61,11 +61,11 @@ public:
 	virtual ~OpenALInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("openal");
-		names.insert("spatial-audio");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#openal");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("openal");
+		names.push_back("spatial-audio");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#openal");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/expect/ExpectInvoker.h b/src/uscxml/plugins/invoker/expect/ExpectInvoker.h
index 902885e..25a2517 100644
--- a/src/uscxml/plugins/invoker/expect/ExpectInvoker.h
+++ b/src/uscxml/plugins/invoker/expect/ExpectInvoker.h
@@ -44,10 +44,10 @@ public:
 	virtual ~ExpectInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("expect");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#expect");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("expect");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#expect");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.h b/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.h
index 7725ec9..964681b 100644
--- a/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.h
+++ b/src/uscxml/plugins/invoker/ffmpeg/FFMPEGInvoker.h
@@ -40,10 +40,10 @@ public:
 	virtual ~FFMPEGInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("ffmpeg");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#ffmpeg");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("ffmpeg");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#ffmpeg");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h b/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h
index 9c3f873..78929c6 100644
--- a/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h
+++ b/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h
@@ -97,11 +97,11 @@ public:
 	virtual ~DirMonInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("dirmon");
-		names.insert("DirectoryMonitor");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#dirmon");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("dirmon");
+		names.push_back("DirectoryMonitor");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#dirmon");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.h b/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.h
index cda0ad3..af06e23 100644
--- a/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.h
+++ b/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.h
@@ -44,11 +44,11 @@ public:
 	virtual ~OSGInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("3d");
-		names.insert("scenegraph");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#3d");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("3d");
+		names.push_back("scenegraph");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#3d");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.h b/src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.h
index a632a19..10e6fc9 100644
--- a/src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.h
+++ b/src/uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.h
@@ -36,12 +36,12 @@ public:
 	virtual ~OSGConverter();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("osgconverter");
-		names.insert("osgconvert");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#osgconverter");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#osgconvert");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("osgconverter");
+		names.push_back("osgconvert");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#osgconverter");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#osgconvert");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.h b/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.h
index c44e362..a024181 100644
--- a/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.h
+++ b/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.h
@@ -34,10 +34,10 @@ public:
 	virtual ~HeartbeatInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("heartbeat");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#heartbeat");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("heartbeat");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#heartbeat");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/http/HTTPServletInvoker.h b/src/uscxml/plugins/invoker/http/HTTPServletInvoker.h
index 7fb2438..59c25ca 100644
--- a/src/uscxml/plugins/invoker/http/HTTPServletInvoker.h
+++ b/src/uscxml/plugins/invoker/http/HTTPServletInvoker.h
@@ -35,10 +35,10 @@ public:
 	virtual ~HTTPServletInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("httpservlet");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#httpserver");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("httpservlet");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#httpserver");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/im/IMInvoker.h b/src/uscxml/plugins/invoker/im/IMInvoker.h
index a3f129a..85c156e 100644
--- a/src/uscxml/plugins/invoker/im/IMInvoker.h
+++ b/src/uscxml/plugins/invoker/im/IMInvoker.h
@@ -72,11 +72,11 @@ public:
 	virtual ~IMInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("im");
-		names.insert("instant-messaging");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#instant-messaging");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("im");
+		names.push_back("instant-messaging");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#instant-messaging");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/imap/IMAPInvoker.h b/src/uscxml/plugins/invoker/imap/IMAPInvoker.h
index b1da324..1f80e57 100644
--- a/src/uscxml/plugins/invoker/imap/IMAPInvoker.h
+++ b/src/uscxml/plugins/invoker/imap/IMAPInvoker.h
@@ -37,10 +37,10 @@ public:
 	virtual ~IMAPInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("imap");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#imap");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("imap");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#imap");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp
index b29e827..720cab3 100644
--- a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp
+++ b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp
@@ -49,6 +49,7 @@ MilesSessionInvoker::MilesSessionInvoker() {
 	miles_init();
 
 	_isRunning = false;
+	_imageSeq = 0;
 	num_connected = 0;
 }
 
@@ -446,7 +447,15 @@ void MilesSessionInvoker::processEventThumbnail(const std::string& origin, const
 		returnEvent(ev);
 		return;
 	}
-	URL imageURL("emptyface.jpg");
+	
+	_imageSeq++;
+	if (_imageSeq > 4)
+		_imageSeq = 1;
+	
+	std::stringstream testImageName;
+	testImageName << "test" << _imageSeq << ".jpeg";
+	
+	URL imageURL(testImageName.str());
 	imageURL.toAbsolute(_interpreter->getBaseURI());
 	std::stringstream ssImage;
 	ssImage << imageURL;
diff --git a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.h b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.h
index 84bf280..148be68 100644
--- a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.h
+++ b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.h
@@ -63,10 +63,10 @@ public:
 	virtual ~MilesSessionInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("miles");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#miles");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("miles");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#miles");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/sample/SampleInvoker.h b/src/uscxml/plugins/invoker/sample/SampleInvoker.h
index 16e4df1..562ebd6 100644
--- a/src/uscxml/plugins/invoker/sample/SampleInvoker.h
+++ b/src/uscxml/plugins/invoker/sample/SampleInvoker.h
@@ -34,10 +34,10 @@ public:
 	virtual ~SampleInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("sample");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#sample");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("sample");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#sample");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
index f26955e..7d10bf1 100644
--- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
+++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
@@ -47,12 +47,12 @@ public:
 	USCXMLInvoker();
 	virtual ~USCXMLInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("scxml");
-		names.insert("uscxml");
-		names.insert("http://www.w3.org/TR/scxml");
-		names.insert("http://www.w3.org/TR/scxml/");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("scxml");
+		names.push_back("uscxml");
+		names.push_back("http://www.w3.org/TR/scxml");
+		names.push_back("http://www.w3.org/TR/scxml/");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/smtp/SMTPInvoker.h b/src/uscxml/plugins/invoker/smtp/SMTPInvoker.h
index 2ae5482..5975b4b 100644
--- a/src/uscxml/plugins/invoker/smtp/SMTPInvoker.h
+++ b/src/uscxml/plugins/invoker/smtp/SMTPInvoker.h
@@ -36,10 +36,10 @@ public:
 	virtual ~SMTPInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("smtp");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#smtp");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("smtp");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#smtp");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/sqlite3/Sqlite3Invoker.h b/src/uscxml/plugins/invoker/sqlite3/Sqlite3Invoker.h
index e024fd7..b6e5031 100644
--- a/src/uscxml/plugins/invoker/sqlite3/Sqlite3Invoker.h
+++ b/src/uscxml/plugins/invoker/sqlite3/Sqlite3Invoker.h
@@ -34,10 +34,10 @@ public:
 	virtual ~Sqlite3Invoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("sqlite3");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#sqlite3");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("sqlite3");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#sqlite3");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/system/SystemInvoker.h b/src/uscxml/plugins/invoker/system/SystemInvoker.h
index 5be04eb..a3d1451 100644
--- a/src/uscxml/plugins/invoker/system/SystemInvoker.h
+++ b/src/uscxml/plugins/invoker/system/SystemInvoker.h
@@ -34,10 +34,10 @@ public:
 	virtual ~SystemInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("system");
-		names.insert("http://uscxml.tk.informatik.tu-darmstadt.de/#system");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("system");
+		names.push_back("http://uscxml.tk.informatik.tu-darmstadt.de/#system");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h
index 9c64886..1c5c9a3 100644
--- a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h
+++ b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h
@@ -43,11 +43,11 @@ public:
 	virtual ~UmundoInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("umundo");
-		names.insert("http://umundo.tk.informatik.tu-darmstadt.de/");
-		names.insert("http://umundo.tk.informatik.tu-darmstadt.de");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("umundo");
+		names.push_back("http://umundo.tk.informatik.tu-darmstadt.de/");
+		names.push_back("http://umundo.tk.informatik.tu-darmstadt.de");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.h b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.h
index 03b9116..b1a9c5a 100644
--- a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.h
+++ b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.h
@@ -34,10 +34,10 @@ public:
 	virtual ~XHTMLInvoker();
 	virtual boost::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("xhtml");
-		names.insert("http://www.w3.org/1999/xhtml");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("xhtml");
+		names.push_back("http://www.w3.org/1999/xhtml");
 		return names;
 	}