Major header movement

- Used IWYU to reorganize headers
- Dropped PHP support
- Updated tests

14 files changed, 67 insertions, 1681 deletions

diff --git a/src/bindings/CMakeLists.txt b/src/bindings/CMakeLists.txt
index 667bfb9..ca5b774 100644
--- a/src/bindings/CMakeLists.txt
+++ b/src/bindings/CMakeLists.txt
@@ -23,7 +23,6 @@ if (SWIG_FOUND)
 		INCLUDE(${SWIG_USE_FILE})
 		add_subdirectory(swig/java)
 		add_subdirectory(swig/csharp)
-		add_subdirectory(swig/php)
 	else()
 		message(STATUS "SWIG version 2.0.5 is required, found ${SWIG_VERSION} - skipping java wrapper generation")
 	endif()
diff --git a/src/bindings/swig/csharp/uscxml.i b/src/bindings/swig/csharp/uscxml.i
index 6f4f214..988c541 100644
--- a/src/bindings/swig/csharp/uscxml.i
+++ b/src/bindings/swig/csharp/uscxml.i
@@ -140,6 +140,18 @@ WRAP_THROW_EXCEPTION(uscxml::Interpreter::interpret);
 %include "../../../uscxml/Interpreter.h"
 %include "../../../uscxml/concurrency/BlockingQueue.h"
 
+%include "../../../uscxml/messages/Blob.h"
+%include "../../../uscxml/messages/Data.h"
+%include "../../../uscxml/messages/Event.h"
+%include "../../../uscxml/messages/InvokeRequest.h"
+%include "../../../uscxml/messages/SendRequest.h"
+
+%include "../../../uscxml/plugins/DataModel.h"
+%include "../../../uscxml/plugins/EventHandler.h"
+%include "../../../uscxml/plugins/ExecutableContent.h"
+%include "../../../uscxml/plugins/Invoker.h"
+%include "../../../uscxml/plugins/IOProcessor.h"
+
 %include "../wrapped/WrappedInvoker.h"
 %include "../wrapped/WrappedDataModel.h"
 %include "../wrapped/WrappedExecutableContent.h"
diff --git a/src/bindings/swig/java/CMakeLists.txt b/src/bindings/swig/java/CMakeLists.txt
index 3a7e9e0..f00d903 100644
--- a/src/bindings/swig/java/CMakeLists.txt
+++ b/src/bindings/swig/java/CMakeLists.txt
@@ -69,6 +69,7 @@ if (ANT_EXECUTABLE)
 		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/contrib/java
 		COMMENT "Creating the jar ...")
 	
+	set_target_properties(java PROPERTIES FOLDER "Bindings")
 else()
 	message(STATUS "Could not find ant binary - will not build jars")
 endif()
\ No newline at end of file
diff --git a/src/bindings/swig/java/uscxml.i b/src/bindings/swig/java/uscxml.i
index 64dfdd5..880b02d 100644
--- a/src/bindings/swig/java/uscxml.i
+++ b/src/bindings/swig/java/uscxml.i
@@ -101,6 +101,18 @@ WRAP_THROW_EXCEPTION(uscxml::Interpreter::interpret);
 %include "../../../uscxml/Interpreter.h"
 %include "../../../uscxml/concurrency/BlockingQueue.h"
 
+%include "../../../uscxml/messages/Blob.h"
+%include "../../../uscxml/messages/Data.h"
+%include "../../../uscxml/messages/Event.h"
+%include "../../../uscxml/messages/InvokeRequest.h"
+%include "../../../uscxml/messages/SendRequest.h"
+
+%include "../../../uscxml/plugins/DataModel.h"
+%include "../../../uscxml/plugins/EventHandler.h"
+%include "../../../uscxml/plugins/ExecutableContent.h"
+%include "../../../uscxml/plugins/Invoker.h"
+%include "../../../uscxml/plugins/IOProcessor.h"
+
 %include "../wrapped/WrappedInvoker.h"
 %include "../wrapped/WrappedDataModel.h"
 %include "../wrapped/WrappedExecutableContent.h"
diff --git a/src/bindings/swig/php/CMakeLists.txt b/src/bindings/swig/php/CMakeLists.txt
deleted file mode 100644
index 3884a7f..0000000
--- a/src/bindings/swig/php/CMakeLists.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-# generate PHP module
-
-find_package(PHP5)
-if(PHP5_FOUND)
-	include_directories(${PHP5_INCLUDE_PATH})
-else()
-	message(STATUS "No PHP5 libraries found - not building php module")
-	return()
-endif()
-
-# copied from cmake's FindPHP4.cmake and adapted
-if(APPLE)
-	# this is a hack for now
-  set(PHP_MODULE_CXX_FLAGS "${CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS} -Wno-unused-label -Wl,-flat_namespace")
-  foreach(symbol
-		__efree
-		__emalloc
-		__estrdup
-		__estrndup
-		__object_init
-		__object_init_ex
-		__zend_get_parameters_array_ex
-		__zend_list_find
-		__zval_copy_ctor
-		__zval_copy_ctor_func
-		_add_property_zval_ex
-		_alloc_globals
-		_compiler_globals
-		_convert_to_double
-		_convert_to_long
-		_convert_to_boolean
-		__convert_to_string
-		_gc_remove_zval_from_buffer
-		_call_user_function
-		_executor_globals
-		_zend_get_constant
-		_zend_lookup_class
-		_zend_register_long_constant
-		_zval_is_true
-		_zend_error
-		_zend_hash_find
-		__zend_hash_add_or_update
-		_zend_register_internal_class_ex
-		_zend_register_list_destructors_ex
-		_zend_register_resource
-		_zend_rsrc_list_get_rsrc_type
-		_zend_wrong_param_count
-		_zend_throw_exception
-		_zval_used_for_init
-		)
-    set(PHP_MODULE_CXX_FLAGS
-      "${PHP_MODULE_CXX_FLAGS},-U,${symbol}")
-  endforeach()
-endif()
-
-#message(FATAL_ERROR "PHP_LDFLAGS: ${PHP_LDFLAGS}")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${PHP_INCLUDE_DIRS})
-
-SET(CMAKE_SWIG_FLAGS "")
-
-# we need ; to produce a space with the package .. weird
-SET_SOURCE_FILES_PROPERTIES(uscxml.i PROPERTIES CPLUSPLUS ON)
-
-SWIG_ADD_MODULE(uscxmlNativePHP php5 uscxml.i)
-foreach(PHP_LIBRARY ${PHP_LIBRARIES})
-#	SWIG_LINK_LIBRARIES(uscxmlNativePHP ${PHP_LIBRARY})
-endforeach()
-SWIG_LINK_LIBRARIES(uscxmlNativePHP uscxml)
-
-if (APPLE)
-	set_target_properties(uscxmlNativePHP PROPERTIES LINK_FLAGS ${PHP_MODULE_CXX_FLAGS})
-endif()
-
-set(PHP_COMPILE_FLAGS "-DSWIG")
-
-if (PHP_ZTS_ENABLED)
-	# we are only building php bindings for unices anyhow
-	set(PHP_COMPILE_FLAGS "${PHP_COMPILE_FLAGS} -DZTS")
-	set(PHP_COMPILE_FLAGS "${PHP_COMPILE_FLAGS} -DPTHREADS")
-endif()
-if (PHP_DEBUG_ENABLED)
-	set(PHP_COMPILE_FLAGS "${PHP_COMPILE_FLAGS} -DZEND_DEBUG")	
-endif()
-
-set(USCXML_LANGUAGE_BINDINGS "php ${USCXML_LANGUAGE_BINDINGS}")
-
-ADD_CUSTOM_COMMAND(
-	TARGET uscxmlNativePHP
-	POST_BUILD
-	COMMAND ${CMAKE_COMMAND} -E copy 
-		${CMAKE_CURRENT_BINARY_DIR}/uscxmlNativePHP.php
-		${PROJECT_SOURCE_DIR}/src/bindings/swig/php/uscxmlNativePHP.php
-)
-
-set_target_properties(uscxmlNativePHP PROPERTIES COMPILE_FLAGS ${PHP_COMPILE_FLAGS})
-set_target_properties(uscxmlNativePHP PROPERTIES FOLDER "Bindings")
-set(USCXML_LANGUAGE_BINDINGS ${USCXML_LANGUAGE_BINDINGS} PARENT_SCOPE)
-
diff --git a/src/bindings/swig/php/test.php b/src/bindings/swig/php/test.php
deleted file mode 100644
index f0c9e06..0000000
--- a/src/bindings/swig/php/test.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-require_once('uscxmlNativePHP.php');
-
-// $exts = get_loaded_extensions();	
-// foreach ($exts as $e)
-// {
-// 	echo "Name: ".$e." --";
-// 	print_r(get_extension_funcs($e));
-// }
-
-class MyMonitor extends InterpreterMonitor {
-	function beforeExitingStates($interpreter,$statesToExit) {
-		print "MyMonitor.beforeExitingStates()\n";
-	}
-	function afterExitingStates($interpreter) {
-		print "MyMonitor.afterExitingStates()\n";
-	}
-	function beforeEnteringStates($interpreter,$statesToEnter) {
-		print "MyMonitor.beforeEnteringStates()\n";
-	}
-	function afterEnteringStates($interpreter) {
-		print "MyMonitor.afterEnteringStates()\n";
-	}
-	function onStableConfiguration($interpreter) {
-		print "MyMonitor.onStableConfiguration()\n";
-	}
-	function beforeCompletion($interpreter) {
-		print "MyMonitor.beforeCompletion()\n";
-	}
-	function afterCompletion($interpreter) {
-		print "MyMonitor.afterCompletion()\n";
-	}
-	function beforeMicroStep($interpreter) {
-		print "MyMonitor.beforeMicroStep()\n";
-	}
-	function beforeTakingTransitions($interpreter,$transitions) {
-		print "MyMonitor.beforeTakingTransitions()\n";
-	}
-}
-
-$monitor = new MyMonitor();
-
-// run interpreter in blocking mode
-$interpreter = Interpreter::fromURI('https://raw.github.com/tklab-tud/uscxml/master/test/samples/uscxml/test-ecmascript.scxml');
-$interpreter->addMonitor($monitor);
-$interpreter->interpret();
-
-// start interpreter as a thread
-$interpreter = Interpreter::fromURI('https://raw.github.com/tklab-tud/uscxml/master/test/samples/uscxml/test-invoked.scxml');
-$parentQueue = new ParentQueue();
-$interpreter->setParentQueue($parentQueue);
-$interpreter->start();
-
-while($interpreter->isRunning()) {
-	$event = $parentQueue->pop();
-	print("Name: " . $event->getName() . "\n");
-	print("Type: " . $event->getType() . "\n");
-	print("Origin: " . $event->getOrigin() . "\n");
-	print("OriginType: " . $event->getOriginType() . "\n");
-	print("Content " . strlen($event->getContent()) . "bytes: \n'" . $event->getContent() . "'\n");
-
-	$namelist = $event->getNameList();
-	print("Namelist ".$namelist->size()." elements: \n");
-	$keys = $event->getNameListKeys();
-	for ($i = 0; $i < $keys->size(); $i++) {
-		print($keys->get($i) . "\t" . $namelist->get($keys->get($i)) . "\n");
-	}
-
-	$params = $event->getParams();
-	print("Params ". $params->size() ." elements: \n");
-	$keys = $event->getParamKeys();
-	for ($i = 0; $i < $keys->size(); $i++) {
-		print($keys->get($i)."\n");
-		$paramList = $params->get($keys->get($i));
-		for ($j = 0; $j < $paramList->size(); $j++) {
-			print("\t" . $paramList->get($i) . "\n");
-		}
-	}
-	
-}
-
-?>
\ No newline at end of file
diff --git a/src/bindings/swig/php/uscxml.i b/src/bindings/swig/php/uscxml.i
deleted file mode 100644
index 38421c6..0000000
--- a/src/bindings/swig/php/uscxml.i
+++ /dev/null
@@ -1,182 +0,0 @@
-%module(directors="1", allprotected="1") uscxmlNativePHP
-
-// import swig typemaps
-%include "stl.i"
-
-// macros from cmake
-%import "uscxml/config.h"
-
-// disable warning related to unknown base class
-#pragma SWIG nowarn=401
-
-%rename(c_array) array;
-%rename(equals) operator==; 
-%rename(isValid) operator bool;
-%ignore operator!=;
-%ignore operator<;
-%ignore operator=;
-%ignore operator[];
-%ignore operator std::list<Data>;
-%ignore operator std::string;
-%ignore operator std::map<std::string,Data>;
-%ignore operator<<;
-
-%template(StringMap) std::map<std::string, std::string>;
-%template(StringVector) std::vector<std::string>;
-%template(Params) std::map<std::string, std::vector<std::string> >;
-
-//**************************************************
-// This ends up in the generated wrapper code
-//**************************************************
-
-%{
-#include "../../../uscxml/Message.h"
-#include "../../../uscxml/Interpreter.h"
-#include "../../../uscxml/concurrency/BlockingQueue.h"
-#include "../../../uscxml/DOMUtils.h"
-
-using namespace uscxml;
-
-%}
-
-// Add this to the very top of the generated wrapper code
-
-%insert("begin") %{
-void*** tsrm_ls;
-%}
-
-%feature("director") uscxml::InterpreterMonitor;
-
-%ignore uscxml::NumAttr;
-%ignore uscxml::SCXMLParser;
-%ignore uscxml::InterpreterImpl;
-
-//***********************************************
-// Beautify interpreter class
-//***********************************************
-
-%ignore uscxml::Interpreter::getDelayQueue();
-
-%extend uscxml::Interpreter {
-	std::vector<std::string> getConfiguration() {
-		std::vector<std::string> config;
-		Arabica::XPath::NodeSet<std::string> configNodes = self->getConfiguration();
-		for (int i = 0; i < configNodes.size(); i++) {
-			config.push_back(ATTR(configNodes[i], "id"));
-		}
-		return config;		
-	}
-}
-%ignore uscxml::Interpreter::getConfiguration();
-
-%extend uscxml::Interpreter {
-	std::vector<std::string> getBasicConfiguration() {
-		std::vector<std::string> config;
-		Arabica::XPath::NodeSet<std::string> configNodes = self->getBasicConfiguration();
-		for (int i = 0; i < configNodes.size(); i++) {
-			config.push_back(ATTR(configNodes[i], "id"));
-		}
-		return config;		
-	}
-}
-%ignore uscxml::Interpreter::getBasicConfiguration();
-
-%extend uscxml::Interpreter {
-	bool isState(const std::string stateId) {
-		Arabica::DOM::Node<std::string> state = self->getState(stateId);
-		return self->isState(state);
-	}
-}
-%ignore uscxml::Interpreter::isState(Arabica::DOM::Node<std::string>);
-
-%extend uscxml::Interpreter {
-	bool isPseudoState(const std::string stateId) {
-		Arabica::DOM::Node<std::string> state = self->getState(stateId);
-		return self->isPseudoState(state);
-	}
-}
-%ignore uscxml::Interpreter::isPseudoState(Arabica::DOM::Node<std::string>);
-
-%extend uscxml::Interpreter {
-	bool isTransitionTarget(const std::string stateId) {
-		Arabica::DOM::Node<std::string> state = self->getState(stateId);
-		return self->isTransitionTarget(state);
-	}
-}
-%ignore uscxml::Interpreter::isTransitionTarget(Arabica::DOM::Node<std::string>);
-
-%extend uscxml::Interpreter {
-	bool isTargetless(const std::string stateId) {
-		Arabica::DOM::Node<std::string> state = self->getState(stateId);
-		return self->isTargetless(state);
-	}
-}
-%ignore uscxml::Interpreter::isTargetless(Arabica::DOM::Node<std::string>);
-
-%extend uscxml::Interpreter {
-	bool isAtomic(const std::string stateId) {
-		Arabica::DOM::Node<std::string> state = self->getState(stateId);
-		return self->isAtomic(state);
-	}
-}
-%ignore uscxml::Interpreter::isAtomic(Arabica::DOM::Node<std::string>);
-
-%extend uscxml::Interpreter {
-	bool isInitial(const std::string stateId) {
-		Arabica::DOM::Node<std::string> state = self->getState(stateId);
-		return self->isInitial(state);
-	}
-}
-%ignore uscxml::Interpreter::isInitial(Arabica::DOM::Node<std::string>);
-
-%extend uscxml::Interpreter {
-	bool isFinal(const std::string stateId) {
-		Arabica::DOM::Node<std::string> state = self->getState(stateId);
-		return self->isFinal(state);
-	}
-}
-%ignore uscxml::Interpreter::isFinal(Arabica::DOM::Node<std::string>);
-
-%extend uscxml::Interpreter {
-	bool isHistory(const std::string stateId) {
-		Arabica::DOM::Node<std::string> state = self->getState(stateId);
-		return self->isHistory(state);
-	}
-}
-%ignore uscxml::Interpreter::isHistory(Arabica::DOM::Node<std::string>);
-
-%extend uscxml::Interpreter {
-	bool isParallel(const std::string stateId) {
-		Arabica::DOM::Node<std::string> state = self->getState(stateId);
-		return self->isParallel(state);
-	}
-}
-%ignore uscxml::Interpreter::isParallel(Arabica::DOM::Node<std::string>);
-
-%extend uscxml::Interpreter {
-	bool isCompound(const std::string stateId) {
-		Arabica::DOM::Node<std::string> state = self->getState(stateId);
-		return self->isCompound(state);
-	}
-}
-%ignore uscxml::Interpreter::isCompound(Arabica::DOM::Node<std::string>);
-
-%extend uscxml::Interpreter {
-	bool isDescendant(const std::string stateId1, const std::string stateId2) {
-		Arabica::DOM::Node<std::string> state1 = self->getState(stateId1);
-		Arabica::DOM::Node<std::string> state2 = self->getState(stateId2);
-		return self->isDescendant(state1, state2);
-	}
-}
-%ignore uscxml::Interpreter::isDescendant(Arabica::DOM::Node<std::string>);
-
-//***********************************************
-// Parse the header file to generate wrappers
-//***********************************************
-
-%include "../../../uscxml/Common.h"
-%include "../../../uscxml/Message.h"
-%include "../../../uscxml/Interpreter.h"
-%include "../../../uscxml/concurrency/BlockingQueue.h"
-
-%template(ParentQueue) uscxml::concurrency::BlockingQueue<uscxml::SendRequest>;
diff --git a/src/bindings/swig/php/uscxmlNativePHP.php b/src/bindings/swig/php/uscxmlNativePHP.php
deleted file mode 100644
index 3aba5be..0000000
--- a/src/bindings/swig/php/uscxmlNativePHP.php
+++ /dev/null
@@ -1,1313 +0,0 @@
-<?php
-
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG
- * interface file instead.
- * ----------------------------------------------------------------------------- */
-
-// Try to load our extension if it's not already loaded.
-if (!extension_loaded('uscxmlNativePHP')) {
-  if (strtolower(substr(PHP_OS, 0, 3)) === 'win') {
-    if (!dl('php_uscxmlNativePHP.dll')) return;
-  } else {
-    // PHP_SHLIB_SUFFIX gives 'dylib' on MacOS X but modules are 'so'.
-    if (PHP_SHLIB_SUFFIX === 'dylib') {
-      if (!dl('uscxmlNativePHP.so')) return;
-    } else {
-      if (!dl('uscxmlNativePHP.'.PHP_SHLIB_SUFFIX)) return;
-    }
-  }
-}
-
-
-
-abstract class uscxmlNativePHP {
-	const CAN_NOTHING = 0;
-
-	const CAN_BASIC_HTTP = 1;
-
-	const CAN_GENERIC_HTTP = 2;
-}
-
-/* PHP Proxy Classes */
-class StringMap {
-	public $_cPtr=null;
-	protected $_pData=array();
-
-	function __set($var,$value) {
-		if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value);
-		$this->_pData[$var] = $value;
-	}
-
-	function __isset($var) {
-		if ($var === 'thisown') return true;
-		return array_key_exists($var, $this->_pData);
-	}
-
-	function __get($var) {
-		if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr);
-		return $this->_pData[$var];
-	}
-
-	function __construct($arg1=null) {
-		if (is_resource($arg1) && get_resource_type($arg1) === '_p_std__mapT_std__string_std__string_t') {
-			$this->_cPtr=$arg1;
-			return;
-		}
-		switch (func_num_args()) {
-		case 0: $this->_cPtr=new_StringMap(); break;
-		default: $this->_cPtr=new_StringMap($arg1);
-		}
-	}
-
-	function size() {
-		return StringMap_size($this->_cPtr);
-	}
-
-	function clear() {
-		StringMap_clear($this->_cPtr);
-	}
-
-	function get($key) {
-		return StringMap_get($this->_cPtr,$key);
-	}
-
-	function set($key,$x) {
-		StringMap_set($this->_cPtr,$key,$x);
-	}
-
-	function del($key) {
-		StringMap_del($this->_cPtr,$key);
-	}
-
-	function has_key($key) {
-		return StringMap_has_key($this->_cPtr,$key);
-	}
-
-	function is_empty() {
-		return StringMap_is_empty($this->_cPtr);
-	}
-}
-
-class StringVector {
-	public $_cPtr=null;
-	protected $_pData=array();
-
-	function __set($var,$value) {
-		if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value);
-		$this->_pData[$var] = $value;
-	}
-
-	function __isset($var) {
-		if ($var === 'thisown') return true;
-		return array_key_exists($var, $this->_pData);
-	}
-
-	function __get($var) {
-		if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr);
-		return $this->_pData[$var];
-	}
-
-	function __construct($n=null) {
-		if (is_resource($n) && get_resource_type($n) === '_p_std__vectorT_std__string_t') {
-			$this->_cPtr=$n;
-			return;
-		}
-		switch (func_num_args()) {
-		case 0: $this->_cPtr=new_StringVector(); break;
-		default: $this->_cPtr=new_StringVector($n);
-		}
-	}
-
-	function size() {
-		return StringVector_size($this->_cPtr);
-	}
-
-	function capacity() {
-		return StringVector_capacity($this->_cPtr);
-	}
-
-	function reserve($n) {
-		StringVector_reserve($this->_cPtr,$n);
-	}
-
-	function clear() {
-		StringVector_clear($this->_cPtr);
-	}
-
-	function push($x) {
-		StringVector_push($this->_cPtr,$x);
-	}
-
-	function is_empty() {
-		return StringVector_is_empty($this->_cPtr);
-	}
-
-	function pop() {
-		return StringVector_pop($this->_cPtr);
-	}
-
-	function get($i) {
-		return StringVector_get($this->_cPtr,$i);
-	}
-
-	function set($i,$val) {
-		StringVector_set($this->_cPtr,$i,$val);
-	}
-}
-
-class Params {
-	public $_cPtr=null;
-	protected $_pData=array();
-
-	function __set($var,$value) {
-		if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value);
-		$this->_pData[$var] = $value;
-	}
-
-	function __isset($var) {
-		if ($var === 'thisown') return true;
-		return array_key_exists($var, $this->_pData);
-	}
-
-	function __get($var) {
-		if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr);
-		return $this->_pData[$var];
-	}
-
-	function __construct($arg1=null) {
-		if (is_resource($arg1) && get_resource_type($arg1) === '_p_std__mapT_std__string_std__vectorT_std__string_t_t') {
-			$this->_cPtr=$arg1;
-			return;
-		}
-		switch (func_num_args()) {
-		case 0: $this->_cPtr=new_Params(); break;
-		default: $this->_cPtr=new_Params($arg1);
-		}
-	}
-
-	function size() {
-		return Params_size($this->_cPtr);
-	}
-
-	function clear() {
-		Params_clear($this->_cPtr);
-	}
-
-	function get($key) {
-		$r=Params_get($this->_cPtr,$key);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new StringVector($r);
-		}
-		return $r;
-	}
-
-	function set($key,$x) {
-		Params_set($this->_cPtr,$key,$x);
-	}
-
-	function del($key) {
-		Params_del($this->_cPtr,$key);
-	}
-
-	function has_key($key) {
-		return Params_has_key($this->_cPtr,$key);
-	}
-
-	function is_empty() {
-		return Params_is_empty($this->_cPtr);
-	}
-}
-
-class Blob {
-	public $_cPtr=null;
-	protected $_pData=array();
-
-	function __set($var,$value) {
-		$func = 'Blob_'.$var.'_set';
-		if (function_exists($func)) return call_user_func($func,$this->_cPtr,$value);
-		if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value);
-		$this->_pData[$var] = $value;
-	}
-
-	function __isset($var) {
-		if (function_exists('Blob_'.$var.'_set')) return true;
-		if ($var === 'thisown') return true;
-		return array_key_exists($var, $this->_pData);
-	}
-
-	function __get($var) {
-		$func = 'Blob_'.$var.'_get';
-		if (function_exists($func)) return call_user_func($func,$this->_cPtr);
-		if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr);
-		return $this->_pData[$var];
-	}
-
-	function __construct($size_or_data,$size=null,$mimeType=null,$adopt=false) {
-		if (is_resource($size_or_data) && get_resource_type($size_or_data) === '_p_uscxml__Blob') {
-			$this->_cPtr=$size_or_data;
-			return;
-		}
-		switch (func_num_args()) {
-		case 1: $this->_cPtr=new_Blob($size_or_data); break;
-		case 2: $this->_cPtr=new_Blob($size_or_data,$size); break;
-		default: $this->_cPtr=new_Blob($size_or_data,$size,$mimeType,$adopt);
-		}
-	}
-
-	function md5() {
-		return Blob_md5($this->_cPtr);
-	}
-
-	function base64() {
-		return Blob_base64($this->_cPtr);
-	}
-
-	function fromBase64($base64) {
-		$r=Blob_fromBase64($this->_cPtr,$base64);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new Blob($r);
-		}
-		return $r;
-	}
-}
-
-class Data {
-	public $_cPtr=null;
-	protected $_pData=array();
-
-	function __set($var,$value) {
-		$func = 'Data_'.$var.'_set';
-		if (function_exists($func)) return call_user_func($func,$this->_cPtr,$value);
-		if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value);
-		$this->_pData[$var] = $value;
-	}
-
-	function __isset($var) {
-		if (function_exists('Data_'.$var.'_set')) return true;
-		if ($var === 'thisown') return true;
-		return array_key_exists($var, $this->_pData);
-	}
-
-	function __get($var) {
-		$func = 'Data_'.$var.'_get';
-		if (function_exists($func)) return call_user_func($func,$this->_cPtr);
-		if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr);
-		return $this->_pData[$var];
-	}
-
-	const VERBATIM = 0;
-
-	const INTERPRETED = Data_INTERPRETED;
-
-	function __construct($atom__or_data_or_dom=null,$type__or_size=null,$mimeType=null,$adopt=null) {
-		if (is_resource($atom__or_data_or_dom) && get_resource_type($atom__or_data_or_dom) === '_p_uscxml__Data') {
-			$this->_cPtr=$atom__or_data_or_dom;
-			return;
-		}
-		switch (func_num_args()) {
-		case 0: $this->_cPtr=new_Data(); break;
-		case 1: $this->_cPtr=new_Data($atom__or_data_or_dom); break;
-		case 2: $this->_cPtr=new_Data($atom__or_data_or_dom,$type__or_size); break;
-		case 3: $this->_cPtr=new_Data($atom__or_data_or_dom,$type__or_size,$mimeType); break;
-		default: $this->_cPtr=new_Data($atom__or_data_or_dom,$type__or_size,$mimeType,$adopt);
-		}
-	}
-
-	function isValid() {
-		return Data_isValid($this->_cPtr);
-	}
-
-	function hasKey($key) {
-		return Data_hasKey($this->_cPtr,$key);
-	}
-
-	static function fromJSON($jsonString) {
-		$r=Data_fromJSON($jsonString);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new Data($r);
-		}
-		return $r;
-	}
-
-	static function toJSON($data) {
-		return Data_toJSON($data);
-	}
-
-	static function fromXML($xmlString) {
-		$r=Data_fromXML($xmlString);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new Data($r);
-		}
-		return $r;
-	}
-
-	function toDocument() {
-		return Data_toDocument($this->_cPtr);
-	}
-
-	function toXMLString() {
-		return Data_toXMLString($this->_cPtr);
-	}
-
-	function getCompound() {
-		return Data_getCompound($this->_cPtr);
-	}
-
-	function setCompound($compound) {
-		Data_setCompound($this->_cPtr,$compound);
-	}
-
-	function getArray() {
-		return Data_getArray($this->_cPtr);
-	}
-
-	function setArray($array) {
-		Data_setArray($this->_cPtr,$array);
-	}
-
-	function getAtom() {
-		return Data_getAtom($this->_cPtr);
-	}
-
-	function setAtom($atom) {
-		Data_setAtom($this->_cPtr,$atom);
-	}
-
-	function getType() {
-		return Data_getType($this->_cPtr);
-	}
-
-	function setType($type) {
-		Data_setType($this->_cPtr,$type);
-	}
-}
-
-class Event {
-	public $_cPtr=null;
-	protected $_pData=array();
-
-	function __set($var,$value) {
-		$func = 'Event_'.$var.'_set';
-		if (function_exists($func)) return call_user_func($func,$this->_cPtr,$value);
-		if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value);
-		$this->_pData[$var] = $value;
-	}
-
-	function __isset($var) {
-		if (function_exists('Event_'.$var.'_set')) return true;
-		if ($var === 'thisown') return true;
-		return array_key_exists($var, $this->_pData);
-	}
-
-	function __get($var) {
-		if ($var === 'data') return new Data(Event_data_get($this->_cPtr));
-		$func = 'Event_'.$var.'_get';
-		if (function_exists($func)) return call_user_func($func,$this->_cPtr);
-		if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr);
-		return $this->_pData[$var];
-	}
-
-	const INTERNAL = 1;
-
-	const EXTERNAL = 2;
-
-	const PLATFORM = 3;
-
-	function __construct($name_or_xmlString=null,$type=null) {
-		if (is_resource($name_or_xmlString) && get_resource_type($name_or_xmlString) === '_p_uscxml__Event') {
-			$this->_cPtr=$name_or_xmlString;
-			return;
-		}
-		switch (func_num_args()) {
-		case 0: $this->_cPtr=new_Event(); break;
-		case 1: $this->_cPtr=new_Event($name_or_xmlString); break;
-		default: $this->_cPtr=new_Event($name_or_xmlString,$type);
-		}
-	}
-
-	function getName() {
-		return Event_getName($this->_cPtr);
-	}
-
-	function setName($name) {
-		Event_setName($this->_cPtr,$name);
-	}
-
-	function getEventType() {
-		return Event_getEventType($this->_cPtr);
-	}
-
-	function setEventType($type) {
-		Event_setEventType($this->_cPtr,$type);
-	}
-
-	function getOrigin() {
-		return Event_getOrigin($this->_cPtr);
-	}
-
-	function setOrigin($origin) {
-		Event_setOrigin($this->_cPtr,$origin);
-	}
-
-	function getOriginType() {
-		return Event_getOriginType($this->_cPtr);
-	}
-
-	function setOriginType($originType) {
-		Event_setOriginType($this->_cPtr,$originType);
-	}
-
-	function getDOM() {
-		return Event_getDOM($this->_cPtr);
-	}
-
-	function setDOM($dom) {
-		Event_setDOM($this->_cPtr,$dom);
-	}
-
-	function getRaw() {
-		return Event_getRaw($this->_cPtr);
-	}
-
-	function setRaw($raw) {
-		Event_setRaw($this->_cPtr,$raw);
-	}
-
-	function getContent() {
-		return Event_getContent($this->_cPtr);
-	}
-
-	function setContent($content) {
-		Event_setContent($this->_cPtr,$content);
-	}
-
-	function getXML() {
-		return Event_getXML($this->_cPtr);
-	}
-
-	function setXML($xml) {
-		Event_setXML($this->_cPtr,$xml);
-	}
-
-	function getSendId() {
-		return Event_getSendId($this->_cPtr);
-	}
-
-	function setSendId($sendId) {
-		Event_setSendId($this->_cPtr,$sendId);
-	}
-
-	function getInvokeId() {
-		return Event_getInvokeId($this->_cPtr);
-	}
-
-	function setInvokeId($invokeId) {
-		Event_setInvokeId($this->_cPtr,$invokeId);
-	}
-
-	function getData() {
-		$r=Event_getData($this->_cPtr);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new Data($r);
-		}
-		return $r;
-	}
-
-	function setData($data) {
-		Event_setData($this->_cPtr,$data);
-	}
-
-	function initContent($content) {
-		Event_initContent($this->_cPtr,$content);
-	}
-
-	static function fromXML($xmlString) {
-		$r=Event_fromXML($xmlString);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new Event($r);
-		}
-		return $r;
-	}
-
-	function toDocument() {
-		return Event_toDocument($this->_cPtr);
-	}
-
-	function toXMLString() {
-		return Event_toXMLString($this->_cPtr);
-	}
-
-	function getNameList() {
-		return Event_getNameList($this->_cPtr);
-	}
-
-	function getParams() {
-		return Event_getParams($this->_cPtr);
-	}
-
-	static function getParam($params,$name,$target) {
-		return Event_getParam($params,$name,$target);
-	}
-}
-
-class InvokeRequest extends Event {
-	public $_cPtr=null;
-
-	function __set($var,$value) {
-		$func = 'InvokeRequest_'.$var.'_set';
-		if (function_exists($func)) return call_user_func($func,$this->_cPtr,$value);
-		if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value);
-		Event::__set($var,$value);
-	}
-
-	function __isset($var) {
-		if (function_exists('InvokeRequest_'.$var.'_set')) return true;
-		if ($var === 'thisown') return true;
-		return Event::__isset($var);
-	}
-
-	function __get($var) {
-		$func = 'InvokeRequest_'.$var.'_get';
-		if (function_exists($func)) return call_user_func($func,$this->_cPtr);
-		if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr);
-		return Event::__get($var);
-	}
-
-	function __construct($event=null) {
-		if (is_resource($event) && get_resource_type($event) === '_p_uscxml__InvokeRequest') {
-			$this->_cPtr=$event;
-			return;
-		}
-		switch (func_num_args()) {
-		case 0: $this->_cPtr=new_InvokeRequest(); break;
-		default: $this->_cPtr=new_InvokeRequest($event);
-		}
-	}
-
-	function getType() {
-		return InvokeRequest_getType($this->_cPtr);
-	}
-
-	function setType($type) {
-		InvokeRequest_setType($this->_cPtr,$type);
-	}
-
-	function getSource() {
-		return InvokeRequest_getSource($this->_cPtr);
-	}
-
-	function setSource($src) {
-		InvokeRequest_setSource($this->_cPtr,$src);
-	}
-
-	function isAutoForwarded() {
-		return InvokeRequest_isAutoForwarded($this->_cPtr);
-	}
-
-	function setAutoForwarded($autoForward) {
-		InvokeRequest_setAutoForwarded($this->_cPtr,$autoForward);
-	}
-
-	static function fromXML($xmlString) {
-		$r=InvokeRequest_fromXML($xmlString);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new InvokeRequest($r);
-		}
-		return $r;
-	}
-
-	function toDocument() {
-		return InvokeRequest_toDocument($this->_cPtr);
-	}
-
-	function toXMLString() {
-		return InvokeRequest_toXMLString($this->_cPtr);
-	}
-}
-
-class SendRequest extends Event {
-	public $_cPtr=null;
-
-	function __set($var,$value) {
-		$func = 'SendRequest_'.$var.'_set';
-		if (function_exists($func)) return call_user_func($func,$this->_cPtr,$value);
-		if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value);
-		Event::__set($var,$value);
-	}
-
-	function __isset($var) {
-		if (function_exists('SendRequest_'.$var.'_set')) return true;
-		if ($var === 'thisown') return true;
-		return Event::__isset($var);
-	}
-
-	function __get($var) {
-		$func = 'SendRequest_'.$var.'_get';
-		if (function_exists($func)) return call_user_func($func,$this->_cPtr);
-		if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr);
-		return Event::__get($var);
-	}
-
-	function __construct($event=null) {
-		if (is_resource($event) && get_resource_type($event) === '_p_uscxml__SendRequest') {
-			$this->_cPtr=$event;
-			return;
-		}
-		switch (func_num_args()) {
-		case 0: $this->_cPtr=new_SendRequest(); break;
-		default: $this->_cPtr=new_SendRequest($event);
-		}
-	}
-
-	function getTarget() {
-		return SendRequest_getTarget($this->_cPtr);
-	}
-
-	function setTarget($target) {
-		SendRequest_setTarget($this->_cPtr,$target);
-	}
-
-	function getType() {
-		return SendRequest_getType($this->_cPtr);
-	}
-
-	function setType($type) {
-		SendRequest_setType($this->_cPtr,$type);
-	}
-
-	function getDelayMs() {
-		return SendRequest_getDelayMs($this->_cPtr);
-	}
-
-	function setDelayMs($delayMs) {
-		SendRequest_setDelayMs($this->_cPtr,$delayMs);
-	}
-
-	static function fromXML($xmlString) {
-		$r=SendRequest_fromXML($xmlString);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new SendRequest($r);
-		}
-		return $r;
-	}
-
-	function toDocument() {
-		return SendRequest_toDocument($this->_cPtr);
-	}
-
-	function toXMLString() {
-		return SendRequest_toXMLString($this->_cPtr);
-	}
-}
-
-class InterpreterOptions {
-	public $_cPtr=null;
-	protected $_pData=array();
-
-	function __set($var,$value) {
-		$func = 'InterpreterOptions_'.$var.'_set';
-		if (function_exists($func)) return call_user_func($func,$this->_cPtr,$value);
-		if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value);
-		$this->_pData[$var] = $value;
-	}
-
-	function __isset($var) {
-		if (function_exists('InterpreterOptions_'.$var.'_set')) return true;
-		if ($var === 'thisown') return true;
-		return array_key_exists($var, $this->_pData);
-	}
-
-	function __get($var) {
-		if ($var === 'additionalParameters') return new StringMap(InterpreterOptions_additionalParameters_get($this->_cPtr));
-		$func = 'InterpreterOptions_'.$var.'_get';
-		if (function_exists($func)) return call_user_func($func,$this->_cPtr);
-		if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr);
-		return $this->_pData[$var];
-	}
-	function __construct($h) {
-		$this->_cPtr=$h;
-	}
-
-	function isValid() {
-		return InterpreterOptions_isValid($this->_cPtr);
-	}
-
-	static function printUsageAndExit($progName) {
-		InterpreterOptions_printUsageAndExit($progName);
-	}
-
-	static function fromCmdLine($argc,$argv) {
-		$r=InterpreterOptions_fromCmdLine($argc,$argv);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new InterpreterOptions($r);
-		}
-		return $r;
-	}
-
-	function getCapabilities() {
-		return InterpreterOptions_getCapabilities($this->_cPtr);
-	}
-}
-
-class Interpreter {
-	public $_cPtr=null;
-	protected $_pData=array();
-
-	function __set($var,$value) {
-		if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value);
-		$this->_pData[$var] = $value;
-	}
-
-	function __isset($var) {
-		if ($var === 'thisown') return true;
-		return array_key_exists($var, $this->_pData);
-	}
-
-	function __get($var) {
-		if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr);
-		return $this->_pData[$var];
-	}
-
-	static function fromDOM($dom) {
-		$r=Interpreter_fromDOM($dom);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new Interpreter($r);
-		}
-		return $r;
-	}
-
-	static function fromXML($xml) {
-		$r=Interpreter_fromXML($xml);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new Interpreter($r);
-		}
-		return $r;
-	}
-
-	static function fromURI($uri) {
-		$r=Interpreter_fromURI($uri);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new Interpreter($r);
-		}
-		return $r;
-	}
-
-	static function fromInputSource($source) {
-		$r=Interpreter_fromInputSource($source);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new Interpreter($r);
-		}
-		return $r;
-	}
-
-	function __construct($impl_or_other=null) {
-		if (is_resource($impl_or_other) && get_resource_type($impl_or_other) === '_p_uscxml__Interpreter') {
-			$this->_cPtr=$impl_or_other;
-			return;
-		}
-		switch (func_num_args()) {
-		case 0: $this->_cPtr=new_Interpreter(); break;
-		default: $this->_cPtr=new_Interpreter($impl_or_other);
-		}
-	}
-
-	function isValid() {
-		return Interpreter_isValid($this->_cPtr);
-	}
-
-	function equals($other) {
-		return Interpreter_equals($this->_cPtr,$other);
-	}
-
-	function start() {
-		Interpreter_start($this->_cPtr);
-	}
-
-	function join() {
-		Interpreter_join($this->_cPtr);
-	}
-
-	function isRunning() {
-		return Interpreter_isRunning($this->_cPtr);
-	}
-
-	function interpret() {
-		Interpreter_interpret($this->_cPtr);
-	}
-
-	function addMonitor($monitor) {
-		Interpreter_addMonitor($this->_cPtr,$monitor);
-	}
-
-	function removeMonitor($monitor) {
-		Interpreter_removeMonitor($this->_cPtr,$monitor);
-	}
-
-	function setBaseURI($baseURI) {
-		Interpreter_setBaseURI($this->_cPtr,$baseURI);
-	}
-
-	function getBaseURI() {
-		return Interpreter_getBaseURI($this->_cPtr);
-	}
-
-	function setNameSpaceInfo($namespaceInfo) {
-		Interpreter_setNameSpaceInfo($this->_cPtr,$namespaceInfo);
-	}
-
-	function getNameSpaceInfo() {
-		$r=Interpreter_getNameSpaceInfo($this->_cPtr);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new StringMap($r);
-		}
-		return $r;
-	}
-
-	function setCmdLineOptions($params) {
-		Interpreter_setCmdLineOptions($this->_cPtr,$params);
-	}
-
-	function getCmdLineOptions() {
-		$r=Interpreter_getCmdLineOptions($this->_cPtr);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new Data($r);
-		}
-		return $r;
-	}
-
-	function getHTTPServlet() {
-		return Interpreter_getHTTPServlet($this->_cPtr);
-	}
-
-	function getDataModel() {
-		return Interpreter_getDataModel($this->_cPtr);
-	}
-
-	function setParentQueue($parentQueue) {
-		Interpreter_setParentQueue($this->_cPtr,$parentQueue);
-	}
-
-	function setFactory($factory) {
-		Interpreter_setFactory($this->_cPtr,$factory);
-	}
-
-	function getFactory() {
-		return Interpreter_getFactory($this->_cPtr);
-	}
-
-	function getXPathPrefix() {
-		return Interpreter_getXPathPrefix($this->_cPtr);
-	}
-
-	function getXMLPrefix() {
-		return Interpreter_getXMLPrefix($this->_cPtr);
-	}
-
-	function getNSContext() {
-		return Interpreter_getNSContext($this->_cPtr);
-	}
-
-	function getXMLPrefixForNS($ns) {
-		return Interpreter_getXMLPrefixForNS($this->_cPtr,$ns);
-	}
-
-	function receiveInternal($event) {
-		Interpreter_receiveInternal($this->_cPtr,$event);
-	}
-
-	function receive($event,$toFront=false) {
-		Interpreter_receive($this->_cPtr,$event,$toFront);
-	}
-
-	function getCurrentEvent() {
-		$r=Interpreter_getCurrentEvent($this->_cPtr);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new Event($r);
-		}
-		return $r;
-	}
-
-	function setConfiguration($states) {
-		Interpreter_setConfiguration($this->_cPtr,$states);
-	}
-
-	function setInvokeRequest($req) {
-		Interpreter_setInvokeRequest($this->_cPtr,$req);
-	}
-
-	function getState($stateId) {
-		return Interpreter_getState($this->_cPtr,$stateId);
-	}
-
-	function getStates($stateIds) {
-		return Interpreter_getStates($this->_cPtr,$stateIds);
-	}
-
-	function getDocument() {
-		return Interpreter_getDocument($this->_cPtr);
-	}
-
-	function setCapabilities($capabilities) {
-		Interpreter_setCapabilities($this->_cPtr,$capabilities);
-	}
-
-	function setName($name) {
-		Interpreter_setName($this->_cPtr,$name);
-	}
-
-	function getName() {
-		return Interpreter_getName($this->_cPtr);
-	}
-
-	function getSessionId() {
-		return Interpreter_getSessionId($this->_cPtr);
-	}
-
-	function getIOProcessors() {
-		return Interpreter_getIOProcessors($this->_cPtr);
-	}
-
-	function getInvokers() {
-		return Interpreter_getInvokers($this->_cPtr);
-	}
-
-	function runOnMainThread($fps,$blocking=true) {
-		return Interpreter_runOnMainThread($this->_cPtr,$fps,$blocking);
-	}
-
-	static function isMember($node,$set) {
-		return Interpreter_isMember($node,$set);
-	}
-
-	function dump() {
-		Interpreter_dump($this->_cPtr);
-	}
-
-	function hasLegalConfiguration() {
-		return Interpreter_hasLegalConfiguration($this->_cPtr);
-	}
-
-	function isLegalConfiguration($config) {
-		return Interpreter_isLegalConfiguration($this->_cPtr,$config);
-	}
-
-	static function tokenizeIdRefs($idRefs) {
-		return Interpreter_tokenizeIdRefs($idRefs);
-	}
-
-	static function spaceNormalize($text) {
-		return Interpreter_spaceNormalize($text);
-	}
-
-	function getInitialStates($state=null) {
-		switch (func_num_args()) {
-		case 0: $r=Interpreter_getInitialStates($this->_cPtr); break;
-		default: $r=Interpreter_getInitialStates($this->_cPtr,$state);
-		}
-		return $r;
-	}
-
-	static function getChildStates($state) {
-		return Interpreter_getChildStates($state);
-	}
-
-	static function getParentState($element) {
-		return Interpreter_getParentState($element);
-	}
-
-	static function getAncestorElement($node,$tagName) {
-		return Interpreter_getAncestorElement($node,$tagName);
-	}
-
-	function getTargetStates($transition) {
-		return Interpreter_getTargetStates($this->_cPtr,$transition);
-	}
-
-	function getSourceState($transition) {
-		return Interpreter_getSourceState($this->_cPtr,$transition);
-	}
-
-	static function filterChildElements($tagname_or_tagName,$node_or_nodeSet) {
-		return Interpreter_filterChildElements($tagname_or_tagName,$node_or_nodeSet);
-	}
-
-	function findLCCA($states) {
-		return Interpreter_findLCCA($this->_cPtr,$states);
-	}
-
-	function getProperAncestors($s1,$s2) {
-		return Interpreter_getProperAncestors($this->_cPtr,$s1,$s2);
-	}
-
-	function getImpl() {
-		return Interpreter_getImpl($this->_cPtr);
-	}
-
-	static function getInstances() {
-		return Interpreter_getInstances();
-	}
-
-	function getConfiguration() {
-		$r=Interpreter_getConfiguration($this->_cPtr);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new StringVector($r);
-		}
-		return $r;
-	}
-
-	function getBasicConfiguration() {
-		$r=Interpreter_getBasicConfiguration($this->_cPtr);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new StringVector($r);
-		}
-		return $r;
-	}
-
-	function isState($stateId=null) {
-		switch (func_num_args()) {
-		case 0: $r=Interpreter_isState($this->_cPtr); break;
-		default: $r=Interpreter_isState($this->_cPtr,$stateId);
-		}
-		return $r;
-	}
-
-	function isPseudoState($stateId=null) {
-		switch (func_num_args()) {
-		case 0: $r=Interpreter_isPseudoState($this->_cPtr); break;
-		default: $r=Interpreter_isPseudoState($this->_cPtr,$stateId);
-		}
-		return $r;
-	}
-
-	function isTransitionTarget($stateId=null) {
-		switch (func_num_args()) {
-		case 0: $r=Interpreter_isTransitionTarget($this->_cPtr); break;
-		default: $r=Interpreter_isTransitionTarget($this->_cPtr,$stateId);
-		}
-		return $r;
-	}
-
-	function isTargetless($stateId=null) {
-		switch (func_num_args()) {
-		case 0: $r=Interpreter_isTargetless($this->_cPtr); break;
-		default: $r=Interpreter_isTargetless($this->_cPtr,$stateId);
-		}
-		return $r;
-	}
-
-	function isAtomic($stateId=null) {
-		switch (func_num_args()) {
-		case 0: $r=Interpreter_isAtomic($this->_cPtr); break;
-		default: $r=Interpreter_isAtomic($this->_cPtr,$stateId);
-		}
-		return $r;
-	}
-
-	function isInitial($state_or_stateId) {
-		return Interpreter_isInitial($this->_cPtr,$state_or_stateId);
-	}
-
-	function isFinal($stateId=null) {
-		switch (func_num_args()) {
-		case 0: $r=Interpreter_isFinal($this->_cPtr); break;
-		default: $r=Interpreter_isFinal($this->_cPtr,$stateId);
-		}
-		return $r;
-	}
-
-	function isHistory($stateId=null) {
-		switch (func_num_args()) {
-		case 0: $r=Interpreter_isHistory($this->_cPtr); break;
-		default: $r=Interpreter_isHistory($this->_cPtr,$stateId);
-		}
-		return $r;
-	}
-
-	function isParallel($stateId=null) {
-		switch (func_num_args()) {
-		case 0: $r=Interpreter_isParallel($this->_cPtr); break;
-		default: $r=Interpreter_isParallel($this->_cPtr,$stateId);
-		}
-		return $r;
-	}
-
-	function isCompound($stateId=null) {
-		switch (func_num_args()) {
-		case 0: $r=Interpreter_isCompound($this->_cPtr); break;
-		default: $r=Interpreter_isCompound($this->_cPtr,$stateId);
-		}
-		return $r;
-	}
-
-	function isDescendant($s2_or_stateId1,$stateId2=null) {
-		switch (func_num_args()) {
-		case 1: $r=Interpreter_isDescendant($this->_cPtr,$s2_or_stateId1); break;
-		default: $r=Interpreter_isDescendant($this->_cPtr,$s2_or_stateId1,$stateId2);
-		}
-		return $r;
-	}
-}
-
-class InterpreterMonitor {
-	public $_cPtr=null;
-	protected $_pData=array();
-
-	function __set($var,$value) {
-		if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value);
-		$this->_pData[$var] = $value;
-	}
-
-	function __isset($var) {
-		if ($var === 'thisown') return true;
-		return array_key_exists($var, $this->_pData);
-	}
-
-	function __get($var) {
-		if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr);
-		return $this->_pData[$var];
-	}
-
-	function onStableConfiguration($interpreter) {
-		InterpreterMonitor_onStableConfiguration($this->_cPtr,$interpreter);
-	}
-
-	function beforeCompletion($interpreter) {
-		InterpreterMonitor_beforeCompletion($this->_cPtr,$interpreter);
-	}
-
-	function afterCompletion($interpreter) {
-		InterpreterMonitor_afterCompletion($this->_cPtr,$interpreter);
-	}
-
-	function beforeMicroStep($interpreter) {
-		InterpreterMonitor_beforeMicroStep($this->_cPtr,$interpreter);
-	}
-
-	function beforeTakingTransitions($interpreter,$transitions) {
-		InterpreterMonitor_beforeTakingTransitions($this->_cPtr,$interpreter,$transitions);
-	}
-
-	function beforeEnteringStates($interpreter,$statesToEnter) {
-		InterpreterMonitor_beforeEnteringStates($this->_cPtr,$interpreter,$statesToEnter);
-	}
-
-	function afterEnteringStates($interpreter) {
-		InterpreterMonitor_afterEnteringStates($this->_cPtr,$interpreter);
-	}
-
-	function beforeExitingStates($interpreter,$statesToExit) {
-		InterpreterMonitor_beforeExitingStates($this->_cPtr,$interpreter,$statesToExit);
-	}
-
-	function afterExitingStates($interpreter) {
-		InterpreterMonitor_afterExitingStates($this->_cPtr,$interpreter);
-	}
-
-	function __construct($res=null) {
-		if (is_resource($res) && get_resource_type($res) === '_p_uscxml__InterpreterMonitor') {
-			$this->_cPtr=$res;
-			return;
-		}
-		if (get_class($this) === 'InterpreterMonitor') {
-			$_this = null;
-		} else {
-			$_this = $this;
-		}
-		$this->_cPtr=new_InterpreterMonitor($_this);
-	}
-}
-
-class ParentQueue {
-	public $_cPtr=null;
-	protected $_pData=array();
-
-	function __set($var,$value) {
-		if ($var === 'thisown') return swig_uscxmlNativePHP_alter_newobject($this->_cPtr,$value);
-		$this->_pData[$var] = $value;
-	}
-
-	function __isset($var) {
-		if ($var === 'thisown') return true;
-		return array_key_exists($var, $this->_pData);
-	}
-
-	function __get($var) {
-		if ($var === 'thisown') return swig_uscxmlNativePHP_get_newobject($this->_cPtr);
-		return $this->_pData[$var];
-	}
-
-	function __construct($res=null) {
-		if (is_resource($res) && get_resource_type($res) === '_p_uscxml__concurrency__BlockingQueueT_uscxml__SendRequest_t') {
-			$this->_cPtr=$res;
-			return;
-		}
-		$this->_cPtr=new_ParentQueue();
-	}
-
-	function push($elem) {
-		ParentQueue_push($this->_cPtr,$elem);
-	}
-
-	function push_front($elem) {
-		ParentQueue_push_front($this->_cPtr,$elem);
-	}
-
-	function pop() {
-		$r=ParentQueue_pop($this->_cPtr);
-		if (is_resource($r)) {
-			$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
-			if (class_exists($c)) return new $c($r);
-			return new SendRequest($r);
-		}
-		return $r;
-	}
-
-	function isEmpty() {
-		return ParentQueue_isEmpty($this->_cPtr);
-	}
-}
-
-
-?>
diff --git a/src/bindings/swig/uscxml_ignores.i b/src/bindings/swig/uscxml_ignores.i
index 38b3e9e..c5bf88b 100644
--- a/src/bindings/swig/uscxml_ignores.i
+++ b/src/bindings/swig/uscxml_ignores.i
@@ -93,6 +93,7 @@
 %ignore uscxml::DataModel::DataModel(const DataModel&);
 %ignore uscxml::DataModel::eval(const Arabica::DOM::Element<std::string>&, const std::string&);
 %ignore uscxml::DataModel::evalAsBool(const Arabica::DOM::Node<std::string>&, const std::string&);
+%ignore uscxml::DataModel::evalAsBool(const std::string&);
 %ignore uscxml::DataModel::throwErrorExecution(const std::string&);
 %ignore uscxml::DataModel::throwErrorPlatform(const std::string&);
 %ignore uscxml::DataModel::init(const Arabica::DOM::Element<std::string>&, const Arabica::DOM::Document<std::string>&, const std::string&);
@@ -174,9 +175,11 @@
 %ignore uscxml::Event::getFirstDOMElement;
 %ignore uscxml::Event::dom;
 %ignore uscxml::Event::getDOM();
+%ignore uscxml::Event::setDOM(const Arabica::DOM::Node<std::string>&);
 %ignore uscxml::Event::setDOM(const Arabica::DOM::Document<std::string>&);
 %ignore uscxml::Event::toDocument();
 %ignore uscxml::Event::getParams();
+%ignore uscxml::Event::getParam;
 
 // Data
 
diff --git a/src/bindings/swig/wrapped/WrappedDataModel.h b/src/bindings/swig/wrapped/WrappedDataModel.h
index 0d0630c..013f22c 100644
--- a/src/bindings/swig/wrapped/WrappedDataModel.h
+++ b/src/bindings/swig/wrapped/WrappedDataModel.h
@@ -20,8 +20,15 @@
 #ifndef WRAPPEDDATAMODEL_H_DBAAD6AF
 #define WRAPPEDDATAMODEL_H_DBAAD6AF
 
-#include "../../../uscxml/Message.h"
-#include "../../../uscxml/Factory.h"
+#include <vector>
+#include <list>
+#include <ostream>
+#include <string>
+
+#include <DOM/Document.hpp>
+#include <DOM/io/Stream.hpp>
+
+#include "../../../uscxml/plugins/DataModel.h"
 #include "../../../uscxml/Interpreter.h"
 
 namespace uscxml {
diff --git a/src/bindings/swig/wrapped/WrappedExecutableContent.h b/src/bindings/swig/wrapped/WrappedExecutableContent.h
index fb09e54..e00704a 100644
--- a/src/bindings/swig/wrapped/WrappedExecutableContent.h
+++ b/src/bindings/swig/wrapped/WrappedExecutableContent.h
@@ -20,6 +20,13 @@
 #ifndef WRAPPEDEXECUTABLECONTENT_H_F690F480
 #define WRAPPEDEXECUTABLECONTENT_H_F690F480
 
+#include <vector>
+#include <ostream>
+#include <string>
+
+#include <DOM/Document.hpp>
+#include <DOM/io/Stream.hpp>
+
 #include "../../../uscxml/Message.h"
 #include "../../../uscxml/Factory.h"
 #include "../../../uscxml/Interpreter.h"
diff --git a/src/bindings/swig/wrapped/WrappedIOProcessor.h b/src/bindings/swig/wrapped/WrappedIOProcessor.h
index 716d9f4..1d134dc 100644
--- a/src/bindings/swig/wrapped/WrappedIOProcessor.h
+++ b/src/bindings/swig/wrapped/WrappedIOProcessor.h
@@ -20,6 +20,14 @@
 #ifndef WRAPPEDIOPROCESSOR_H_AE98064A
 #define WRAPPEDIOPROCESSOR_H_AE98064A
 
+#include <vector>
+#include <list>
+#include <ostream>
+#include <string>
+
+#include <DOM/Document.hpp>
+#include <DOM/io/Stream.hpp>
+
 #include "../../../uscxml/Message.h"
 #include "../../../uscxml/Factory.h"
 #include "../../../uscxml/Interpreter.h"
diff --git a/src/bindings/swig/wrapped/WrappedInterpreterMonitor.h b/src/bindings/swig/wrapped/WrappedInterpreterMonitor.h
index 57372ea..0aac660 100644
--- a/src/bindings/swig/wrapped/WrappedInterpreterMonitor.h
+++ b/src/bindings/swig/wrapped/WrappedInterpreterMonitor.h
@@ -20,6 +20,13 @@
 #ifndef WRAPPEDINTERPRETERMONITOR_H_F5C83A0D
 #define WRAPPEDINTERPRETERMONITOR_H_F5C83A0D
 
+#include <vector>
+#include <list>
+#include <ostream>
+#include <string>
+
+#include <DOM/Document.hpp>
+#include <DOM/io/Stream.hpp>
 
 #include "../../../uscxml/Message.h"
 #include "../../../uscxml/Factory.h"
diff --git a/src/bindings/swig/wrapped/WrappedInvoker.h b/src/bindings/swig/wrapped/WrappedInvoker.h
index ff56b15..b3ff200 100644
--- a/src/bindings/swig/wrapped/WrappedInvoker.h
+++ b/src/bindings/swig/wrapped/WrappedInvoker.h
@@ -20,6 +20,14 @@
 #ifndef WRAPPEDINVOKER_H_F9725D47
 #define WRAPPEDINVOKER_H_F9725D47
 
+#include <vector>
+#include <list>
+#include <ostream>
+#include <string>
+
+#include <DOM/Document.hpp>
+#include <DOM/io/Stream.hpp>
+
 #include "../../../uscxml/Message.h"
 #include "../../../uscxml/Factory.h"
 #include "../../../uscxml/Interpreter.h"