Skip to content

Commit ec9ff93

Browse files
ethanhannethanhann
committed
Merge branch 'master' of github.com:ethanhann/IntegrationEngine
2 parents ba84723 + 3cfad7f commit ec9ff93

File tree

12 files changed

+111
-35
lines changed

12 files changed

+111
-35
lines changed

‎IntegrationEngine.Core/package.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>IntegrationEngine.Core</id>
5-
<version>1.4.1</version>
5+
<version>2.0.0-alpha1</version>
66
<title>InEngine.NET Core</title>
77
<authors>Ethan Hann</authors>
88
<owners>Ethan Hann</owners>
@@ -19,7 +19,7 @@
1919
<dependencies>
2020
<dependency id="Elasticsearch.Net" version="1.3.1"/>
2121
<dependency id="EntityFramework" version="6.1.2" />
22-
<dependency id="IntegrationEngine.Model" version="1.4.1" />
22+
<dependency id="IntegrationEngine.Model" version="2.0.0-alpha1" />
2323
<dependency id="log4net" version="2.0.3" />
2424
<dependency id="MySql.Data" version="6.9.5" />
2525
<dependency id="MySql.Data.Entity" version="6.9.5" />

‎IntegrationEngine.Model/package.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>IntegrationEngine.Model</id>
5-
<version>1.4.1</version>
5+
<version>2.0.0-alpha1</version>
66
<title>InEngine.NET Model</title>
77
<authors>Ethan Hann</authors>
88
<owners>Ethan Hann</owners>

‎IntegrationEngine/package.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>IntegrationEngine</id>
5-
<version>1.4.1</version>
5+
<version>2.0.0-alpha1</version>
66
<title>InEngine.NET</title>
77
<authors>Ethan Hann</authors>
88
<owners>Ethan Hann</owners>
@@ -22,8 +22,8 @@
2222
<dependency id="EntityFramework" version="6.1.2" />
2323
<dependency id="Funq" version="1.0.0" />
2424
<dependency id="fx.configuration" version="0.4.0" />
25-
<dependency id="IntegrationEngine.Core" version="1.4.1" />
26-
<dependency id="IntegrationEngine.Model" version="1.4.1" />
25+
<dependency id="IntegrationEngine.Core" version="2.0.0-alpha1" />
26+
<dependency id="IntegrationEngine.Model" version="2.0.0-alpha1" />
2727
<dependency id="log4net" version="2.0.3" />
2828
<dependency id="Microsoft.AspNet.Cors" version="5.2.2" />
2929
<dependency id="Microsoft.AspNet.WebApi.Client" version="5.2.2" />

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#IntegrationEngine
22

3-
[Project Site](http://ethanhann.github.io/IntegrationEngine/)
3+
[Project Site](http://inengine.net/)

‎configuration/IntegrationEngine.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"MessageQueue": {
77
"QueueName": "myqueue",
88
"ExchangeName": "amq.direct",
9-
"UserName": "guest",
10-
"Password": "guest",
9+
"UserName": "inengine",
10+
"Password": "secret",
1111
"HostName": "localhost",
1212
"VirtualHost": "/"
1313
},

‎doc/.bowerrc‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎doc/change-log.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ currentMenu: change-log
55

66
# Change Log
77

8+
## 2.0.0-alpha1
9+
10+
* Features
11+
* Add SimpleTrigger to Model and Web API.
12+
* Add CronTrigger to Model and Web API.
13+
* Remove IntegrationJob from Model and Web API (replaced by SimpleTrigger and CronTrigger).
14+
* Chores
15+
* Setup CI with AppVeyor.
16+
* Bugs
17+
* Config loader no longer mistakenly looks for config.json instead of IntegrationEngine.json.
18+
819
## 1.4.1
920

1021
* Chores
@@ -26,7 +37,7 @@ currentMenu: change-log
2637
## 1.3.2
2738

2839
* Features
29-
* Load jobs from an external assembly that implement IIntegrationJob.
40+
* Schedule jobs from an external assembly that implement IIntegrationJob.
3041
* Develop EngineHost, start engine and load jobs from an external assembly.
3142
* Add repository layer for persisting jobs to a data store.
3243
* Create REST API for creating standard jobs.

‎doc/configuration.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The configuration file has four sections: _WebApi_, _MessageQueue_, _Mail_, and
1313
The _WebApi_ section contains settings for the InEngine.NET's WebApi.
1414
Namely, the hostname and port of the web API.
1515

16-
```
16+
```js
1717
{
1818
// ...
1919
"WebApi": {
@@ -32,14 +32,14 @@ If these settings are not correct, then a connection exception will be thrown wh
3232
A queue called "myqueue" will not exist on a freshly installed RabbitMQ server.
3333
It will need to be created.
3434

35-
```
35+
```js
3636
{
3737
// ...
3838
"MessageQueue": {
3939
"QueueName": "myqueue",
4040
"ExchangeName": "amq.direct",
41-
"UserName": "guest",
42-
"Password": "guest",
41+
"UserName": "inengine",
42+
"Password": "secret",
4343
"HostName": "localhost",
4444
"VirtualHost": "/"
4545
},
@@ -52,7 +52,7 @@ It will need to be created.
5252
The _Elasticsearch_ section contains settings for connecting to a Elasticsearch server.
5353
If these settings are not correct, then a connection exception will be thrown when a job is scheduled.
5454

55-
```
55+
```js
5656
{
5757
// ...
5858
"Elasticsearch": {
@@ -70,7 +70,7 @@ If these settings are not correct, then a connection exception will be thrown wh
7070
The _Mail_ section contains settings for connecting to an SMTP server.
7171
If these settings are not correct, then a connection exception will be thrown when sending an email.
7272

73-
```
73+
```js
7474
{
7575
// ...
7676
"Mail": {
@@ -86,7 +86,7 @@ If these settings are not correct, then a connection exception will be thrown wh
8686
The _Database_ section contains settings for connecting to a either a SQL Server or MySQL server via [Entity Framework](http://msdn.microsoft.com/en-us/data/ef.aspx).
8787
If these settings are not correct, then a connection exception will be thrown when a SQL job runs.
8888

89-
```
89+
```js
9090
{
9191
// ...
9292
"Database": {
@@ -104,7 +104,7 @@ If these settings are not correct, then a connection exception will be thrown wh
104104
## Sample Configuration
105105
This is a sample configuration.
106106

107-
```
107+
```js
108108
{
109109
"WebApi": {
110110
"HostName": "localhost",
@@ -113,8 +113,8 @@ This is a sample configuration.
113113
"MessageQueue": {
114114
"QueueName": "myqueue",
115115
"ExchangeName": "amq.direct",
116-
"UserName": "guest",
117-
"Password": "guest",
116+
"UserName": "inengine",
117+
"Password": "secret",
118118
"HostName": "localhost",
119119
"VirtualHost": "/"
120120
},

‎doc/getting-started.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ currentMenu: getting-started
1818

1919
### Visual Studio
2020
Run the following command in the Package Manager Console.
21-
```
21+
```sh
2222
PM> Install-Package IntegrationEngine
2323
```
2424

@@ -69,8 +69,8 @@ namespace MyProject
6969

7070
## Schedule a Job
7171
Post an HTTP request to the IntegrationServer API's IntegrationJob resource with a _JobType_ of
72-
"MyProject.MyIntegrationJob", the full name of the job.
72+
"MyProject.MyIntegrationJob" - the full name of the job.
7373

74-
```
74+
```sh
7575
curl --data "JobType=MyProject.MyIntegrationJob" http://localhost:9001/api/integrationjob
7676
```

‎doc/web-api.md‎

Lines changed: 74 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,104 @@ currentMenu: web-api
55

66
# Web API
77

8-
## IntegrationJob Endpoint
8+
<h2>CronTrigger Endpoint <small>&ge;2.0.0</small></h2>
9+
10+
The CronTrigger endpoint allows for an integration job to be scheduled by creating and manipulating a Quartz.NET CronTrigger.
11+
12+
### Get a List of CronTriggers
13+
GET api/CronTrigger
14+
```sh
15+
curl http://localhost:9001/api/CronTrigger
16+
```
17+
18+
### Get a Specific CronTrigger by ID
19+
GET api/CronTrigger/ID
20+
```sh
21+
curl http://localhost:9001/api/CronTrigger/ID
22+
```
23+
24+
### Create a New CronTrigger
25+
POST api/CronTrigger
26+
```sh
27+
curl --data "JobType=MyProject.MyIntegrationJob" http://localhost:9001/api/CronTrigger
28+
```
29+
30+
### Update a Specific CronTrigger by ID
31+
PUT api/CronTrigger/ID
32+
```sh
33+
curl -XPUT "JobType=MyProject.ADifferentIntegrationJob" http://localhost:9001/api/CronTrigger/ID
34+
```
35+
36+
### Delete a CronTrigger by ID
37+
DELETE api/CronTrigger/ID
38+
```sh
39+
curl -XDELETE http://localhost:9001/api/CronTrigger/ID
40+
```
41+
42+
<h2>SimpleTrigger Endpoint <small>&ge;2.0.0</small></h2>
43+
44+
The SimpleTrigger endpoint allows for an integration job to be scheduled by creating and manipulating a Quartz.NET SimpleTrigger.
45+
46+
### Get a List of SimpleTriggers
47+
GET api/SimpleTrigger
48+
```sh
49+
curl http://localhost:9001/api/SimpleTrigger
50+
```
51+
52+
### Get a Specific SimpleTrigger by ID
53+
GET api/SimpleTrigger/ID
54+
```sh
55+
curl http://localhost:9001/api/SimpleTrigger/ID
56+
```
57+
58+
### Create a New SimpleTrigger
59+
POST api/SimpleTrigger
60+
```sh
61+
curl --data "JobType=MyProject.MyIntegrationJob" http://localhost:9001/api/SimpleTrigger
62+
```
63+
64+
### Update a Specific SimpleTrigger by ID
65+
PUT api/SimpleTrigger/ID
66+
```sh
67+
curl -XPUT "JobType=MyProject.ADifferentIntegrationJob" http://localhost:9001/api/SimpleTrigger/ID
68+
```
69+
70+
### Delete a SimpleTrigger by ID
71+
DELETE api/SimpleTrigger/ID
72+
```sh
73+
curl -XDELETE http://localhost:9001/api/SimpleTrigger/ID
74+
```
75+
76+
<h2>IntegrationJob Endpoint <small>&le;1.4.1</small></h2>
977

1078
The IntegrationJob endpoint allows for an integration job to be scheduled, updated, and viewed.
1179

1280
### Get a List of Jobs
1381
GET api/IntegrationJob
14-
```
82+
```sh
1583
curl http://localhost:9001/api/IntegrationJob
1684
```
1785

1886
### Get a Specific Job by ID
1987
GET api/IntegrationJob/ID
20-
```
88+
```sh
2189
curl http://localhost:9001/api/IntegrationJob/ID
2290
```
2391

2492
### Create a New Job
2593
POST api/IntegrationJob
26-
```
94+
```sh
2795
curl --data "JobType=MyProject.MyIntegrationJob" http://localhost:9001/api/IntegrationJob
2896
```
2997

3098
### Update a Specific Job by ID
3199
PUT api/IntegrationJob/ID
32-
```
100+
```sh
33101
curl -XPUT "JobType=MyProject.ADifferentIntegrationJob" http://localhost:9001/api/IntegrationJob/ID
34102
```
35103

36104
### Delete a Job by ID
37105
DELETE api/IntegrationJob/ID
38-
```
106+
```sh
39107
curl -XDELETE http://localhost:9001/api/IntegrationJob/ID
40108
```

0 commit comments

Comments
 (0)