Merge branch 'develop' of https://github.com/ethanhann/InEngine.NET into develop

ethanhann · ethanhann · commit bdfe7c17758e · 2015-01-19T23:24:35.000-05:00
diff --git a/IntegrationEngine.Client/IntegrationEngine.Client.csproj b/IntegrationEngine.Client/IntegrationEngine.Client.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,6 +8,8 @@
     <RootNamespace>IntegrationEngine.Client</RootNamespace>
     <AssemblyName>IntegrationEngine.Client</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,7 +24,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <OutputPath>lib\net45\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -34,6 +36,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\configuration\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Client.cs" />
     <Compile Include="EndpointName.cs" />
@@ -51,4 +56,5 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
 </Project>
diff --git a/IntegrationEngine.Client/Properties/AssemblyInfo.cs b/IntegrationEngine.Client/Properties/AssemblyInfo.cs
@@ -1,27 +1,4 @@
 ﻿using System.Reflection;
 using System.Runtime.CompilerServices;
 
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
 [assembly: AssemblyTitle("IntegrationEngine.Client")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("ethanhann")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj b/IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj
@@ -31,7 +31,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Externalconsole>true</Externalconsole>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/IntegrationEngine/Api/Controllers/CronTriggerController.cs b/IntegrationEngine/Api/Controllers/CronTriggerController.cs
@@ -49,7 +49,7 @@ public IHttpActionResult PutCronTrigger(string id, CronTrigger trigger)
                 BadRequest(ModelState);
             Repository.Update(trigger);
             EngineScheduler.ScheduleJobWithCronTrigger(trigger);
-            return StatusCode(HttpStatusCode.NoContent);
+            return Ok(Repository.SelectById(trigger.Id));
         }
 
         // POST api/CronTrigger
diff --git a/IntegrationEngine/Api/Controllers/SimpleTriggerController.cs b/IntegrationEngine/Api/Controllers/SimpleTriggerController.cs
@@ -53,7 +53,7 @@ public IHttpActionResult PutSimpleTrigger(string id, SimpleTrigger trigger)
                 BadRequest(ModelState);
             Repository.Update(trigger);
             EngineScheduler.ScheduleJobWithSimpleTrigger(trigger);
-            return StatusCode(HttpStatusCode.NoContent);
+            return Ok(Repository.SelectById(trigger.Id));
         }
 
         // POST api/SimpleTrigger
diff --git a/IntegrationEngine/EngineHostConfiguration.cs b/IntegrationEngine/EngineHostConfiguration.cs
@@ -165,8 +165,8 @@ public void SetupElasticClient()
 
         public void Shutdown()
         {
-            var scheduler = Container.Resolve<IScheduler>();
-            scheduler.Shutdown();
+            var engineScheduler = Container.Resolve<IEngineScheduler>();
+            engineScheduler.Shutdown();
         }
     }
 }
diff --git a/IntegrationEngine/IntegrationEngine.csproj b/IntegrationEngine/IntegrationEngine.csproj
@@ -30,7 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Externalconsole>true</Externalconsole>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -147,6 +147,7 @@
     <Compile Include="Configuration\NLogAdapterConfiguration.cs" />
     <Compile Include="Configuration\MessageQueueConfiguration.cs" />
     <Compile Include="Configuration\WebApiConfiguration.cs" />
+    <Compile Include="Scheduler\TriggerListener.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MessageQueue\IMessageQueueClient.cs" />
     <Compile Include="MessageQueue\RabbitMQClient.cs" />
@@ -204,7 +205,5 @@
   </ItemGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <ItemGroup />
-  <ItemGroup>
-    <Folder Include="DataAnnotations\" />
-  </ItemGroup>
+  <ItemGroup />
 </Project>
diff --git a/IntegrationEngine/Scheduler/CronTrigger.cs b/IntegrationEngine/Scheduler/CronTrigger.cs
@@ -24,7 +24,7 @@ public class CronTrigger : ICronTrigger, ICronTriggerReadOnly, IHasStateDescript
         [ElasticProperty(OptOut = true)]
         public string CronExpressionDescription { get { return ExpressionDescriptor.GetDescription(CronExpressionString); } }
         [ElasticProperty(OptOut = true)]
-        public TimeZoneInfo TimeZoneInfo { get { return TimeZoneInfo.FindSystemTimeZoneById(TimeZoneId); } }
+        public TimeZoneInfo TimeZoneInfo { get { return TimeZoneId.GetTimeZoneInfo(); } }
         [ElasticProperty(OptOut = true)]
         public string StateDescription { get { return StateId.GetStateDescription(); } }
     }
diff --git a/IntegrationEngine/Scheduler/EngineScheduler.cs b/IntegrationEngine/Scheduler/EngineScheduler.cs
@@ -5,6 +5,7 @@
 using IntegrationEngine.Model;
 using Quartz;
 using IntegrationEngine.MessageQueue;
+using Quartz.Impl.Matchers;
 
 namespace IntegrationEngine.Scheduler
 {
@@ -15,13 +16,23 @@ public class EngineScheduler : IEngineScheduler
         public IMessageQueueClient MessageQueueClient { get; set; }
 
         public EngineScheduler()
-        {}
+        {
+        }
 
         public void Start()
         {
+            var triggerListener = new TriggerListener();
+            var mgr = Scheduler.ListenerManager;
+            mgr.AddTriggerListener(triggerListener, GroupMatcher<TriggerKey>.AnyGroup());
             Scheduler.Start();
         }
 
+        public void Shutdown()
+        {
+         //   Scheduler.ListenerManager.RemoveTriggerListener();
+            Scheduler.Shutdown();
+        }
+
         public Type GetRegisteredJobTypeByName(string jobTypeName)
         {
             var jobTypes = IntegrationJobTypes.Where(x => x.FullName == jobTypeName);
@@ -41,6 +52,7 @@ public IJobDetail JobDetailFactory(Type jobType)
             jobDetailsDataMap.Put("IntegrationJob", integrationJob);
             return JobBuilder.Create<IntegrationJobDispatcherJob>()
                 .SetJobData(jobDetailsDataMap)
+                .StoreDurably(true)
                 .WithIdentity(jobType.Name, jobType.Namespace)
                 .Build();
         }
diff --git a/IntegrationEngine/Scheduler/IEngineScheduler.cs b/IntegrationEngine/Scheduler/IEngineScheduler.cs
@@ -12,5 +12,6 @@ public interface IEngineScheduler
         void ScheduleJobWithSimpleTrigger(SimpleTrigger triggerDefinition);
         bool IsJobTypeRegistered(string jobTypeName);
         Type GetRegisteredJobTypeByName(string jobTypeName);
+        void Shutdown();
     }
 }
diff --git a/IntegrationEngine/Scheduler/TriggerListener.cs b/IntegrationEngine/Scheduler/TriggerListener.cs
@@ -0,0 +1,28 @@
+﻿using Quartz;
+
+namespace IntegrationEngine.Scheduler
+{
+    public class TriggerListener : ITriggerListener
+    {
+        public string Name { get { return this.GetType().FullName;} } 
+
+        public void TriggerComplete(ITrigger trigger, IJobExecutionContext context, SchedulerInstruction triggerInstructionCode)
+        {
+        }
+
+        public void TriggerFired(ITrigger trigger, IJobExecutionContext context)
+        {
+            
+        }
+
+        public void TriggerMisfired(ITrigger trigger)
+        {
+            
+        }
+
+        public bool VetoJobExecution(ITrigger trigger, IJobExecutionContext context)
+        {
+            return false;
+        }
+    }
+}
diff --git a/IntegrationEngine/Scheduler/TriggerPropertyExtension.cs b/IntegrationEngine/Scheduler/TriggerPropertyExtension.cs
@@ -8,5 +8,12 @@ public static string GetStateDescription(this int value)
         {
             return ((Quartz.TriggerState)value).ToString();
         }
+
+        public static TimeZoneInfo GetTimeZoneInfo(this string value)
+        {
+            if (value == null)
+                return TimeZoneInfo.Utc;
+            return TimeZoneInfo.FindSystemTimeZoneById(value);
+        }
     }
 }
diff --git a/doc/getting-started.md b/doc/getting-started.md
@@ -68,9 +68,9 @@ namespace MyProject
 ```
 
 ## Schedule a Job
-Post an HTTP request to the IntegrationServer API's IntegrationJob resource with a _JobType_ of 
+Post an HTTP request to the IntegrationServer API's CronTrigger resource with a _JobType_ of
 "MyProject.MyIntegrationJob" - the full name of the job.  
 
 ```sh
-curl --data "JobType=MyProject.MyIntegrationJob" http://localhost:9001/api/integrationjob
+curl --data "JobType=MyProject.MyIntegrationJob&CronExpressionString=0 4 1 ? * MON-FRI *" http://localhost:9001/api/CronTrigger
 ```

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public IHttpActionResult PutCronTrigger(string id, CronTrigger trigger)`
`49`	`49`	`BadRequest(ModelState);`
`50`	`50`	`Repository.Update(trigger);`
`51`	`51`	`EngineScheduler.ScheduleJobWithCronTrigger(trigger);`
`52`		`- return StatusCode(HttpStatusCode.NoContent);`
	`52`	`+ return Ok(Repository.SelectById(trigger.Id));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`// POST api/CronTrigger`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public IHttpActionResult PutSimpleTrigger(string id, SimpleTrigger trigger)`
`53`	`53`	`BadRequest(ModelState);`
`54`	`54`	`Repository.Update(trigger);`
`55`	`55`	`EngineScheduler.ScheduleJobWithSimpleTrigger(trigger);`
`56`		`- return StatusCode(HttpStatusCode.NoContent);`
	`56`	`+ return Ok(Repository.SelectById(trigger.Id));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// POST api/SimpleTrigger`
Original file line number	Diff line number	Diff line change
`@@ -165,8 +165,8 @@ public void SetupElasticClient()`
`165`	`165`
`166`	`166`	`public void Shutdown()`
`167`	`167`	`{`
`168`		`- var scheduler = Container.Resolve<IScheduler>();`
`169`		`- scheduler.Shutdown();`
	`168`	`+ var engineScheduler = Container.Resolve<IEngineScheduler>();`
	`169`	`+ engineScheduler.Shutdown();`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class CronTrigger : ICronTrigger, ICronTriggerReadOnly, IHasStateDescript`
`24`	`24`	`[ElasticProperty(OptOut = true)]`
`25`	`25`	`public string CronExpressionDescription { get { return ExpressionDescriptor.GetDescription(CronExpressionString); } }`
`26`	`26`	`[ElasticProperty(OptOut = true)]`
`27`		`- public TimeZoneInfo TimeZoneInfo { get { return TimeZoneInfo.FindSystemTimeZoneById(TimeZoneId); } }`
	`27`	`+ public TimeZoneInfo TimeZoneInfo { get { return TimeZoneId.GetTimeZoneInfo(); } }`
`28`	`28`	`[ElasticProperty(OptOut = true)]`
`29`	`29`	`public string StateDescription { get { return StateId.GetStateDescription(); } }`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@ public interface IEngineScheduler`
`12`	`12`	`void ScheduleJobWithSimpleTrigger(SimpleTrigger triggerDefinition);`
`13`	`13`	`bool IsJobTypeRegistered(string jobTypeName);`
`14`	`14`	`Type GetRegisteredJobTypeByName(string jobTypeName);`
	`15`	`+ void Shutdown();`
`15`	`16`	`}`
`16`	`17`	`}`