FIX: Remove mvp and rule engine stabilization fixes (#2188)

backend/Origam.Rule/RuleEngine.cs

@@ -41,6 +41,7 @@
 using Origam.Rule.Xslt;
 using Origam.Service.Core;
 using Origam.Workbench;
+using System.Data.Common;
 
 namespace Origam.Rule
 {
@@ -981,9 +982,13 @@ public void ProcessRuleQueue()
 							}
 						}
 					}
-					catch
+					catch (Exception e)
 					{
 						row.CancelEdit();
+						if (log.IsErrorEnabled)
+						{
+							log.Error("Exception ocurred during evaluation of rule queue", e);
+						}
 						_ruleQueue.Clear();
 						throw;
 					}

backend/Origam.Rule/Xslt/CompiledXsltEngine.cs

@@ -71,9 +71,13 @@ internal override object GetTransform(string xsl)
         public override void Transform(object engine, XsltArgumentList xslArg, XPathDocument sourceXpathDoc, IXmlContainer resultDoc)
         {
             XslCompiledTransform xslt = engine as XslCompiledTransform;
-            Mvp.Xml.Common.Xsl.XslReader xslReader = new Mvp.Xml.Common.Xsl.XslReader(xslt);
-            xslReader.StartTransform(new Mvp.Xml.Common.Xsl.XmlInput(sourceXpathDoc), xslArg);
-            resultDoc.Load(xslReader);
+            MemoryStream stream = new MemoryStream();
+            xslt.Transform(sourceXpathDoc, xslArg, stream);
+            stream.Position = 0;
+            using (XmlReader reader = XmlReader.Create(stream))
+            {
+                resultDoc.Load(reader);
+            }
         }
 
         public override void Transform(object engine, XsltArgumentList xslArg, XPathDocument sourceXpathDoc, XmlTextWriter xwr)

backend/Origam.Schema.EntityModel/Data Structure/DataStructureRule.cs

@@ -60,6 +60,20 @@ public int Priority
 
 		public Guid DataStructureEntityId;
 
+		private string entityName;
+
+		public String EntityName
+		{
+			get
+			{
+				if (entityName == null)
+				{
+					entityName = Entity.Name;
+				}
+				return entityName;
+			}
+		}
+
 		[TypeConverter(typeof(DataQueryEntityConverter))]
 		[RefreshProperties(RefreshProperties.Repaint)]
         [XmlReference("entity", "DataStructureEntityId")]

backend/Origam.Schema.EntityModel/Data Structure/DataStructureRuleSet.cs

@@ -95,7 +95,7 @@ public ArrayList Rules(string entityName)
 			var result = new ArrayList();
 			foreach(DataStructureRule rule in Rules())
 			{
-				if(rule.Entity.Name == entityName 
+				if(rule.EntityName == entityName 
 				&& rule.RuleDependencies.Count == 0)
 				{
 					result.Add(rule);

backend/Origam.Workflow/ProfilingTools.cs

@@ -177,6 +177,7 @@ public void Start(int hash)
 
         public Stopwatch Stop(int hash)
         {
+            if (!runningOperations.ContainsKey(hash)) return new Stopwatch();
             Stopwatch stopwatch = runningOperations[hash].Stopwatch;
             stopwatch.Stop();
             runningOperations.Remove(hash);