Changed getNames signature from set to list

7 files changed, 32 insertions, 19 deletions

diff --git a/src/uscxml/plugins/datamodel/CMakeLists.txt b/src/uscxml/plugins/datamodel/CMakeLists.txt
index 4e5ef00..f04cb78 100644
--- a/src/uscxml/plugins/datamodel/CMakeLists.txt
+++ b/src/uscxml/plugins/datamodel/CMakeLists.txt
@@ -23,6 +23,8 @@ if (BUILD_DM_ECMA)
 				"../Plugins.cpp")
 			target_link_libraries(datamodel_jsc  uscxml ${JSC_LIBRARY})
 			set_target_properties(datamodel_jsc PROPERTIES FOLDER "Plugin DataModel")
+			set_target_properties(datamodel_jsc PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+			set_target_properties(datamodel_jsc PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 		else()		
 			list (APPEND USCXML_FILES ${JSC_DATAMODEL})
 			list (APPEND USCXML_FILES ${JSC_DOM})
@@ -56,6 +58,8 @@ if (BUILD_DM_ECMA)
 					"../Plugins.cpp")
 				target_link_libraries(datamodel_v8 uscxml ${V8_LIBRARY})
 				set_target_properties(datamodel_v8 PROPERTIES FOLDER "Plugin DataModel")
+				set_target_properties(datamodel_v8 PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+				set_target_properties(datamodel_v8 PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 			else()
 				list (APPEND USCXML_FILES ${V8_DATAMODEL})
 				list (APPEND USCXML_FILES ${V8_DOM})
@@ -77,7 +81,10 @@ if (BUILD_AS_PLUGINS)
 	add_library(datamodel_null SHARED ${NULL_DATAMODEL} "../Plugins.cpp")
 	target_link_libraries(datamodel_null uscxml)
 	set_target_properties(datamodel_null PROPERTIES FOLDER "Plugin DataModel")
-	set_target_properties(datamodel_null PROPERTIES COMPILE_FLAGS "-DPLUGIN_EXPORTS")
+	set_target_properties(datamodel_null PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+	set_target_properties(datamodel_null PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
+	
+	
 else()
 	list (APPEND USCXML_FILES ${NULL_DATAMODEL})
 endif()
@@ -96,6 +103,8 @@ if (BUILD_DM_XPATH)
 		add_library(datamodel_xpath SHARED ${XPATH_DATAMODEL} "../Plugins.cpp")
 		target_link_libraries(datamodel_xpath uscxml)
 		set_target_properties(datamodel_xpath PROPERTIES FOLDER "Plugin DataModel")
+		set_target_properties(datamodel_xpath PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(datamodel_xpath PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${XPATH_DATAMODEL})
 	endif()
@@ -132,6 +141,8 @@ if (SWI_FOUND AND BUILD_DM_PROLOG)
 			${CURSES_LIBRARIES}
 			${SWI_LIBRARY})
 		set_target_properties(datamodel_swi PROPERTIES FOLDER "Plugin DataModel")
+		set_target_properties(datamodel_swi PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(datamodel_swi PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${SWI_DATAMODEL})
 	endif()
@@ -156,6 +167,8 @@ if (BUILD_DM_PROMELA)
 			"../Plugins.cpp")
 		target_link_libraries(datamodel_promela uscxml)
 		set_target_properties(datamodel_promela PROPERTIES FOLDER "Plugin DataModel")
+		set_target_properties(datamodel_promela PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+		set_target_properties(datamodel_promela PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib")
 	else()
 		list (APPEND USCXML_FILES ${PROMELA_DATAMODEL})
 	endif()
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
index 7443439..82882f0 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
@@ -42,9 +42,9 @@ public:
 	virtual ~JSCDataModel();
 	virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("ecmascript");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("ecmascript");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
index a0a1b09..5bfca93 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
@@ -43,9 +43,9 @@ public:
 	virtual ~V8DataModel();
 	virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("ecmascript");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("ecmascript");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/datamodel/null/NULLDataModel.h b/src/uscxml/plugins/datamodel/null/NULLDataModel.h
index 7ce9fde..162ffdb 100644
--- a/src/uscxml/plugins/datamodel/null/NULLDataModel.h
+++ b/src/uscxml/plugins/datamodel/null/NULLDataModel.h
@@ -40,9 +40,9 @@ public:
 	virtual ~NULLDataModel();
 	virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("null");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("null");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h
index 0e17f4b..f022811 100644
--- a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h
+++ b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h
@@ -54,9 +54,9 @@ public:
 	virtual ~SWIDataModel();
 	virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("prolog");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("prolog");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h
index 6d7d505..cbbf570 100644
--- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h
+++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h
@@ -35,9 +35,9 @@ public:
 	virtual ~PromelaDataModel();
 	virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("promela");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("promela");
 		return names;
 	}
 
diff --git a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.h b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.h
index ac041f9..d18d05a 100644
--- a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.h
+++ b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.h
@@ -85,9 +85,9 @@ public:
 	virtual ~XPathDataModel();
 	virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter);
 
-	virtual std::set<std::string> getNames() {
-		std::set<std::string> names;
-		names.insert("xpath");
+	virtual std::list<std::string> getNames() {
+		std::list<std::string> names;
+		names.push_back("xpath");
 		return names;
 	}