Started JavaScriptCore datamodel

11 files changed, 14 insertions, 18 deletions

diff --git a/src/uscxml/plugins/Plugins.cpp b/src/uscxml/plugins/Plugins.cpp
index 04b5b99..ba27728 100644
--- a/src/uscxml/plugins/Plugins.cpp
+++ b/src/uscxml/plugins/Plugins.cpp
@@ -3,9 +3,9 @@
 namespace uscxml {
 
 #ifdef BUILD_AS_PLUGINS
-PLUMA_PROVIDER_SOURCE(DataModel, 1, 1);
-PLUMA_PROVIDER_SOURCE(IOProcessor, 1, 1);
-PLUMA_PROVIDER_SOURCE(Invoker, 1, 1);
+PLUMA_PROVIDER_SOURCE(DataModelImpl, 1, 1);
+PLUMA_PROVIDER_SOURCE(IOProcessorImpl, 1, 1);
+PLUMA_PROVIDER_SOURCE(InvokerImpl, 1, 1);
 #endif
 
 }
\ No newline at end of file
diff --git a/src/uscxml/plugins/Plugins.h b/src/uscxml/plugins/Plugins.h
index 56dd1e2..1e6ac0b 100644
--- a/src/uscxml/plugins/Plugins.h
+++ b/src/uscxml/plugins/Plugins.h
@@ -7,9 +7,9 @@
 namespace uscxml {
 
 #ifdef BUILD_AS_PLUGINS
-PLUMA_PROVIDER_HEADER(IOProcessor);
-PLUMA_PROVIDER_HEADER(Invoker);
-PLUMA_PROVIDER_HEADER(DataModel);
+PLUMA_PROVIDER_HEADER(IOProcessorImpl);
+PLUMA_PROVIDER_HEADER(InvokerImpl);
+PLUMA_PROVIDER_HEADER(DataModelImpl);
 #endif
 
 }
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
index 7c8ef08..4a217be 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
@@ -61,9 +61,6 @@ void JSCDataModel::setEvent(const Event& event) {
 Data JSCDataModel::getStringAsData(const std::string& content) {
 }
 
-Data JSCDataModel::getValueAsData(const JSC::Handle<JSC::Value>& value) {
-}
-
 bool JSCDataModel::validate(const std::string& location, const std::string& schema) {
 	return true;
 }
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
index 68aca1f..aa57e0f 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
@@ -46,7 +46,6 @@ public:
 	virtual void assign(const std::string& location, const Data& data);
 
 	virtual Data getStringAsData(const std::string& content);
-	virtual Data getValueAsData(const JSC::Handle<JSC::Value>& value);
 
 	virtual std::string evalAsString(const std::string& expr);
 	virtual bool evalAsBool(const std::string& expr);
@@ -63,7 +62,7 @@ protected:
 };
 
 #ifdef BUILD_AS_PLUGINS
-PLUMA_INHERIT_PROVIDER(JSCDataModel, DataModel);
+PLUMA_INHERIT_PROVIDER(JSCDataModel, DataModelImpl);
 #endif
 
 }
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
index 7e7bb8d..bcc9052 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
@@ -86,7 +86,7 @@ protected:
 };
 
 #ifdef BUILD_AS_PLUGINS
-PLUMA_INHERIT_PROVIDER(V8DataModel, DataModel);
+PLUMA_INHERIT_PROVIDER(V8DataModel, DataModelImpl);
 #endif
 
 }
diff --git a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h
index 1d5a454..9a10dc7 100644
--- a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h
+++ b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h
@@ -58,7 +58,7 @@ protected:
 };
 
 #ifdef BUILD_AS_PLUGINS
-PLUMA_INHERIT_PROVIDER(SWIDataModel, DataModel);
+PLUMA_INHERIT_PROVIDER(SWIDataModel, DataModelImpl);
 #endif
 
 }
diff --git a/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.h b/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.h
index 29f950f..aca54ec 100644
--- a/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.h
+++ b/src/uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.h
@@ -99,7 +99,7 @@ protected:
 };
 
 #ifdef BUILD_AS_PLUGINS
-PLUMA_INHERIT_PROVIDER(OSGInvoker, Invoker);
+PLUMA_INHERIT_PROVIDER(OSGInvoker, InvokerImpl);
 #endif
 
 }
diff --git a/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.h b/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.h
index bbea7d6..4b230c1 100644
--- a/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.h
+++ b/src/uscxml/plugins/invoker/heartbeat/HeartbeatInvoker.h
@@ -45,7 +45,7 @@ protected:
 };
   
 #ifdef BUILD_AS_PLUGINS
-PLUMA_INHERIT_PROVIDER(HeartbeatInvoker, Invoker);
+PLUMA_INHERIT_PROVIDER(HeartbeatInvoker, InvokerImpl);
 #endif
 
 }
diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
index 95de9b2..62851e3 100644
--- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
+++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
@@ -38,7 +38,7 @@ protected:
 };
 
 #ifdef BUILD_AS_PLUGINS
-PLUMA_INHERIT_PROVIDER(USCXMLInvoker, Invoker);
+PLUMA_INHERIT_PROVIDER(USCXMLInvoker, InvokerImpl);
 #endif
 
 }
diff --git a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h
index c5f9656..d54160e 100644
--- a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h
+++ b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h
@@ -63,7 +63,7 @@ protected:
 };
 
 #ifdef BUILD_AS_PLUGINS
-PLUMA_INHERIT_PROVIDER(UmundoInvoker, Invoker);
+PLUMA_INHERIT_PROVIDER(UmundoInvoker, InvokerImpl);
 #endif
 
 }
diff --git a/src/uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.h b/src/uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.h
index c90bf79..d07bab5 100644
--- a/src/uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.h
+++ b/src/uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.h
@@ -101,7 +101,7 @@ private:
 };
 
 #ifdef BUILD_AS_PLUGINS
-PLUMA_INHERIT_PROVIDER(EventIOProcessor, IOProcessor);
+PLUMA_INHERIT_PROVIDER(EventIOProcessor, IOProcessorImpl);
 #endif
 
 }