Major header movement

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

11 files changed, 36 insertions, 45 deletions

diff --git a/embedding/csharp/embedding/embedding.suo b/embedding/csharp/embedding/embedding.suo
deleted file mode 100644
index 3c8cd31..0000000
--- a/embedding/csharp/embedding/embedding.suo
+++ /dev/null
diff --git a/embedding/csharp/embedding/embedding.userprefs b/embedding/csharp/embedding/embedding.userprefs
deleted file mode 100644
index 681be08..0000000
--- a/embedding/csharp/embedding/embedding.userprefs
+++ /dev/null
@@ -1,12 +0,0 @@
-<Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="embedding/Program.cs">
-    <Files>
-      <File FileName="embedding/Program.cs" Line="16" Column="40" />
-    </Files>
-  </MonoDevelop.Ide.Workbench>
-  <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore />
-  </MonoDevelop.Ide.DebuggingService.Breakpoints>
-  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
-</Properties>
\ No newline at end of file
diff --git a/embedding/csharp/embedding/embedding.sln b/embedding/csharp/uSCXMLEmbedding.sln
index 0f9a49e..6c3a244 100644
--- a/embedding/csharp/embedding/embedding.sln
+++ b/embedding/csharp/uSCXMLEmbedding.sln
@@ -1,7 +1,7 @@
 

 Microsoft Visual Studio Solution File, Format Version 11.00

 # Visual Studio 2010

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "embedding", "embedding\embedding.csproj", "{75E5EE93-513B-45DA-AD50-64C570AAD0C0}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Examples", "uSCXMLEmbedding\Examples.csproj", "{A186DC8C-0655-49D4-A1DB-3C23A24DAA5E}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -9,10 +9,10 @@ Global
 		Release|x86 = Release|x86

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{75E5EE93-513B-45DA-AD50-64C570AAD0C0}.Debug|x86.ActiveCfg = Debug|x86

-		{75E5EE93-513B-45DA-AD50-64C570AAD0C0}.Debug|x86.Build.0 = Debug|x86

-		{75E5EE93-513B-45DA-AD50-64C570AAD0C0}.Release|x86.ActiveCfg = Release|x86

-		{75E5EE93-513B-45DA-AD50-64C570AAD0C0}.Release|x86.Build.0 = Release|x86

+		{A186DC8C-0655-49D4-A1DB-3C23A24DAA5E}.Debug|x86.ActiveCfg = Debug|x86

+		{A186DC8C-0655-49D4-A1DB-3C23A24DAA5E}.Debug|x86.Build.0 = Debug|x86

+		{A186DC8C-0655-49D4-A1DB-3C23A24DAA5E}.Release|x86.ActiveCfg = Release|x86

+		{A186DC8C-0655-49D4-A1DB-3C23A24DAA5E}.Release|x86.Build.0 = Release|x86

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/embedding/csharp/embedding/embedding/embedding.csproj b/embedding/csharp/uSCXMLEmbedding/Examples.csproj
index ca54bd4..b1579bf 100644
--- a/embedding/csharp/embedding/embedding/embedding.csproj
+++ b/embedding/csharp/uSCXMLEmbedding/Examples.csproj
@@ -5,11 +5,11 @@
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

     <ProductVersion>8.0.30703</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{75E5EE93-513B-45DA-AD50-64C570AAD0C0}</ProjectGuid>

+    <ProjectGuid>{A186DC8C-0655-49D4-A1DB-3C23A24DAA5E}</ProjectGuid>

     <OutputType>Exe</OutputType>

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>embedding</RootNamespace>

-    <AssemblyName>embedding</AssemblyName>

+    <RootNamespace>uSCXMLEmbedding</RootNamespace>

+    <AssemblyName>uSCXMLEmbedding</AssemblyName>

     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <TargetFrameworkProfile>Client</TargetFrameworkProfile>

     <FileAlignment>512</FileAlignment>

@@ -23,12 +23,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <EnvironmentVariables>

-      <EnvironmentVariables>

-        <Variable name="DYLD_FALLBACK_LIBRARY_PATH" value="/Users/sradomski/Documents/TK/Code/uscxml/build/cli/lib/csharp" />

-        <Variable name="MONO_LOG_LEVEL" value="debug" />

-      </EnvironmentVariables>

-    </EnvironmentVariables>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

     <PlatformTarget>x86</PlatformTarget>

@@ -47,19 +41,18 @@
     <Reference Include="Microsoft.CSharp" />

     <Reference Include="System.Data" />

     <Reference Include="System.Xml" />

-    <Reference Include="uscxmlCSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

+    <Reference Include="uscxmlCSharp">

       <HintPath>C:\Users\sradomski\Desktop\build\uscxml\lib\uscxmlCSharp.dll</HintPath>

     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="TestExecutableContent.cs" />

-    <Compile Include="TestInterpreterMonitor.cs" />

-    <Compile Include="TestIOProc.cs" />

     <Compile Include="Program.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="TestDataModel.cs" />

-    <Compile Include="TestInvoker.cs" />

+    <Compile Include="Extensions\SampleDataModel.cs" />

+    <Compile Include="Extensions\SampleExecutableContent.cs" />

+    <Compile Include="Extensions\SampleInterpreterMonitor.cs" />

+    <Compile Include="Extensions\SampleInvoker.cs" />

+    <Compile Include="Extensions\SampleIOProc.cs" />

   </ItemGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/embedding/csharp/embedding/embedding/TestDataModel.cs b/embedding/csharp/uSCXMLEmbedding/Extensions/SampleDataModel.cs
index bfcfd30..4d70594 100644
--- a/embedding/csharp/embedding/embedding/TestDataModel.cs
+++ b/embedding/csharp/uSCXMLEmbedding/Extensions/SampleDataModel.cs
@@ -6,11 +6,11 @@ using org.uscxml;
 

 namespace EmbeddedDataModel

 {

-    class TestDataModel : DataModel

+    class SampleDataModel : DataModel

     {

         public override DataModel create(Interpreter interpreter)

         {

-            return new TestDataModel();

+            return new SampleDataModel();

         }

 

         public override void eval(string scriptElem, string expr)

diff --git a/embedding/csharp/embedding/embedding/TestExecutableContent.cs b/embedding/csharp/uSCXMLEmbedding/Extensions/SampleExecutableContent.cs
index 199445b..a86776f 100644
--- a/embedding/csharp/embedding/embedding/TestExecutableContent.cs
+++ b/embedding/csharp/uSCXMLEmbedding/Extensions/SampleExecutableContent.cs
@@ -6,7 +6,7 @@ using org.uscxml;
 

 namespace embedding

 {

-    class TestExecutableContent : ExecutableContent

+    class SampleExecutableContent : ExecutableContent

     {

         public override string getLocalName()

         {

@@ -25,7 +25,7 @@ namespace embedding
 

         public override ExecutableContent create(Interpreter interpreter) 

         {

-            return new TestExecutableContent();

+            return new SampleExecutableContent();

         }

 

 

diff --git a/embedding/csharp/embedding/embedding/TestIOProc.cs b/embedding/csharp/uSCXMLEmbedding/Extensions/SampleIOProc.cs
index 1c00034..5abbf37 100644
--- a/embedding/csharp/embedding/embedding/TestIOProc.cs
+++ b/embedding/csharp/uSCXMLEmbedding/Extensions/SampleIOProc.cs
@@ -6,8 +6,13 @@ using org.uscxml;
 

 namespace embedding

 {

-    class TestIOProc : IOProcessor

+    class SampleIOProc : IOProcessor

     {

+        public override IOProcessor create(Interpreter interpreter)

+        {

+            return new SampleIOProc();

+        }

+

         public override DataNative getDataModelVariables()

         {

             DataNative data = new DataNative();

diff --git a/embedding/csharp/embedding/embedding/TestInterpreterMonitor.cs b/embedding/csharp/uSCXMLEmbedding/Extensions/SampleInterpreterMonitor.cs
index 03eb9d6..2a2f561 100644
--- a/embedding/csharp/embedding/embedding/TestInterpreterMonitor.cs
+++ b/embedding/csharp/uSCXMLEmbedding/Extensions/SampleInterpreterMonitor.cs
@@ -6,7 +6,7 @@ using org.uscxml;
 

 namespace embedding

 {

-    class TestInterpreterMonitor : InterpreterMonitor

+    class SampleInterpreterMonitor : InterpreterMonitor

     {

         public override void afterCompletion(Interpreter interpreter) { }

         public override void afterMicroStep(Interpreter interpreter) { }

diff --git a/embedding/csharp/embedding/embedding/TestInvoker.cs b/embedding/csharp/uSCXMLEmbedding/Extensions/SampleInvoker.cs
index 11493d3..f5fb363 100644
--- a/embedding/csharp/embedding/embedding/TestInvoker.cs
+++ b/embedding/csharp/uSCXMLEmbedding/Extensions/SampleInvoker.cs
@@ -6,8 +6,13 @@ using org.uscxml;
 

 namespace EmbeddedInvoker

 {

-    class TestInvoker : Invoker

+    class SampleInvoker : Invoker

     {

+        public override Invoker create(Interpreter interpreter)

+        {

+            return new SampleInvoker();

+        }

+

         public override DataNative getDataModelVariables()

         {

             DataNative data = new DataNative();

diff --git a/embedding/csharp/embedding/embedding/Program.cs b/embedding/csharp/uSCXMLEmbedding/Program.cs
index 3b5a28c..559d28f 100644
--- a/embedding/csharp/embedding/embedding/Program.cs
+++ b/embedding/csharp/uSCXMLEmbedding/Program.cs
@@ -28,8 +28,8 @@ namespace embedding
                 SetDllDirectory("C:\\Users\\sradomski\\Desktop\\build\\uscxml\\lib\\csharp");

             }

 

-            Interpreter interpreter = Interpreter.fromXML("<scxml><state id=\"foo\" final=\"true\" /></scxml>");

-            interpreter.addMonitor(new TestInterpreterMonitor());

+            Interpreter interpreter = Interpreter.fromXML("<scxml><state id=\"f oo\" final=\"true\" /></scxml>");

+            interpreter.addMonitor(new SampleInterpreterMonitor());

             interpreter.interpret();

         }

     }

diff --git a/embedding/csharp/embedding/embedding/Properties/AssemblyInfo.cs b/embedding/csharp/uSCXMLEmbedding/Properties/AssemblyInfo.cs
index bd9015e..141c1cf 100644
--- a/embedding/csharp/embedding/embedding/Properties/AssemblyInfo.cs
+++ b/embedding/csharp/uSCXMLEmbedding/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 

 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

-[assembly: AssemblyTitle("embedding")]

+[assembly: AssemblyTitle("uSCXMLEmbedding")]

 [assembly: AssemblyDescription("")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("embedding")]

+[assembly: AssemblyProduct("uSCXMLEmbedding")]

 [assembly: AssemblyCopyright("Copyright ©  2014")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]

 

 // The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("0d270ead-e8cf-4cc1-a2c8-fa123e71812c")]

+[assembly: Guid("5bcfdd5c-6567-40dd-b4ea-3a9d3c64076a")]

 

 // Version information for an assembly consists of the following four values:

 //