Skip to content

Commit cadad57

Browse files
authored
Enable 'ImportURI' mechanism for *.cml files (#177)
1 parent b8632b1 commit cadad57

File tree

149 files changed

+2138
-1330
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+2138
-1330
lines changed

org.contextmapper.dsl.repository/category.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
<feature id="org.contextmapper.servicecutter.feature">
1010
<category name="main"/>
1111
</feature>
12-
<bundle id="org.eclipse.emf.henshin.interpreter" version="1.6.0.202001092039">
12+
<bundle id="org.eclipse.emf.henshin.interpreter" version="1.6.0.202002131441">
1313
<category name="main"/>
1414
</bundle>
15-
<bundle id="org.eclipse.emf.henshin.model" version="1.6.0.202001092039">
15+
<bundle id="org.eclipse.emf.henshin.model" version="1.6.0.202002131441">
1616
<category name="main"/>
1717
</bundle>
18-
<bundle id="org.eclipse.emf.henshin.diagram" version="1.6.0.202001092039">
18+
<bundle id="org.eclipse.emf.henshin.diagram" version="1.6.0.202002131441">
1919
<category name="main"/>
2020
</bundle>
21-
<bundle id="org.eclipse.emf.henshin.edit" version="1.6.0.202001092039">
21+
<bundle id="org.eclipse.emf.henshin.edit" version="1.6.0.202002131441">
2222
<category name="main"/>
2323
</bundle>
24-
<bundle id="org.eclipse.emf.henshin.editor" version="1.6.0.202001092039">
24+
<bundle id="org.eclipse.emf.henshin.editor" version="1.6.0.202002131441">
2525
<category name="main"/>
2626
</bundle>
2727
<feature id="org.contextmapper.contextmap.generator.feature" version="0.0.0">

org.contextmapper.dsl.target/org.contextmapper.dsl.target.target

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/"/>
4343
</location>
4444
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
45-
<unit id="org.eclipse.emf.henshin.sdk.feature.group" version="1.6.0.202001092039"/>
45+
<unit id="org.eclipse.emf.henshin.sdk.feature.group" version="1.6.0.202002131441"/>
4646
<repository location="http://download.eclipse.org/modeling/emft/henshin/updates/release/"/>
4747
</location>
4848
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

org.contextmapper.dsl.tests/integ-test-files/ServiceCutter-Services.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@
6363
"Location.name"
6464
],
6565
"direction": "OUTGOING"
66+
},
67+
{
68+
"serviceA": "Service A",
69+
"serviceB": "Service C",
70+
"sharedEntities": [
71+
"Location.name"
72+
],
73+
"direction": "INCOMING"
6674
}
6775
],
6876
"useCaseResponsibility": {

org.contextmapper.dsl.tests/integ-test-files/imports/empty.cml

Whitespace-only changes.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import "./empty.cml"
2+
3+
ContextMap testMap {
4+
5+
}
6+
7+
BoundedContext context1
8+
BoundedContext context2
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import "./other-type.scl"
2+
3+
ContextMap testMap {
4+
5+
}
6+
7+
BoundedContext context1
8+
BoundedContext context2
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
BoundedContext anotherContext
2+
BoundedContext yetAnotherContext
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Aggregate Customers {
2+
"Customer.firstname"
3+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import "./other-contexts.cml"
2+
3+
ContextMap testMap {
4+
5+
}
6+
7+
BoundedContext context1
8+
BoundedContext context2
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import "./other-contexts.cml"
2+
3+
BoundedContext anotherContext
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import "extract-aggregates-by-nfr-test-4-input-2.cml"
2+
3+
ContextMap {
4+
contains CustomerManagement, AnotherContext
5+
6+
CustomerManagement -> AnotherContext {
7+
exposedAggregates = Customers, Addresses
8+
}
9+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
BoundedContext CustomerManagement {
2+
Aggregate Customers {
3+
Entity Customer{
4+
String firstName
5+
String familyName
6+
}
7+
Entity Account {
8+
String iban
9+
String bankName
10+
}
11+
}
12+
13+
Aggregate Addresses {
14+
Entity Address {
15+
String street
16+
}
17+
}
18+
19+
Aggregate AnotherAggregate {
20+
Entity JustAnEntity
21+
}
22+
}
23+
24+
BoundedContext AnotherContext
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import "extract-aggregates-likely-to-change-test-6-input-2.cml"
2+
3+
ContextMap {
4+
contains CustomerManagement, AnotherContext
5+
6+
CustomerManagement -> AnotherContext {
7+
exposedAggregates = Customers
8+
}
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
BoundedContext CustomerManagement {
2+
Aggregate Customers {
3+
likelihoodForChange = OFTEN
4+
5+
Entity Customer{
6+
String firstName
7+
String familyName
8+
}
9+
Entity Account {
10+
String iban
11+
String bankName
12+
}
13+
}
14+
15+
Aggregate Addresses {
16+
likelihoodForChange = OFTEN
17+
Entity Address {
18+
String street
19+
}
20+
}
21+
22+
Aggregate AnotherAggregate {
23+
Entity JustAnEntity
24+
}
25+
}
26+
27+
BoundedContext AnotherContext
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
BoundedContext CustomerManagement
2+
BoundedContext AnotherContext
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import "merge-aggregates-test-7-input-2.cml"
2+
3+
ContextMap {
4+
contains CustomerManagement, AnotherContext
5+
6+
CustomerManagement -> AnotherContext {
7+
exposedAggregates = Customers, Addresses
8+
}
9+
10+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
BoundedContext CustomerManagement {
2+
Aggregate Customers {
3+
Entity Customer{
4+
String firstName
5+
String familyName
6+
}
7+
Entity Account {
8+
String iban
9+
String bankName
10+
}
11+
}
12+
Aggregate Addresses {
13+
Entity Address {
14+
String street
15+
}
16+
}
17+
}
18+
19+
BoundedContext AnotherContext
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import "merge-bounded-contexts-fix-import-test-2.cml"
2+
import "merge-bounded-contexts-fix-import-test-3.cml"
3+
4+
ContextMap testMap {
5+
contains CustomerManagement, AnotherContext
6+
7+
CustomerManagement -> AnotherContext
8+
}
9+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
BoundedContext AnotherContext {
2+
Aggregate AnotherAggregate {
3+
Entity JustAnEntity
4+
}
5+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
BoundedContext CustomerManagement {
2+
Aggregate Customers {
3+
Entity Customer{
4+
String firstName
5+
String familyName
6+
}
7+
Entity Account {
8+
String iban
9+
String bankName
10+
}
11+
}
12+
13+
Aggregate Addresses {
14+
Entity Address {
15+
String street
16+
}
17+
}
18+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import "merge-bounded-contexts-fix-import-test-2.cml"
2+
3+
BoundedContext ContextWithRef2MovedAggregate {
4+
Aggregate JustAnAggregate {
5+
Entity JustAnEntity {
6+
- JustAnEntity ref
7+
}
8+
}
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
BoundedContext CustomerManagement {
2+
Aggregate Customers {
3+
Entity Customer{
4+
String firstName
5+
String familyName
6+
}
7+
Entity Account {
8+
String iban
9+
String bankName
10+
}
11+
}
12+
13+
Aggregate Addresses {
14+
Entity Address {
15+
String street
16+
}
17+
}
18+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
BoundedContext AnotherContext {
2+
Aggregate AnotherAggregate {
3+
Entity JustAnEntity
4+
}
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import "merge-bounded-contexts-multiple-files-test-1.cml"
2+
import "merge-bounded-contexts-multiple-files-test-2.cml"
3+
4+
ContextMap testMap {
5+
contains CustomerManagement, AnotherContext
6+
7+
CustomerManagement -> AnotherContext
8+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import "split-agg-by-entities-test-4-input-2.cml"
2+
3+
ContextMap testMap {
4+
contains CustomerManagement, AnotherContext
5+
6+
CustomerManagement -> AnotherContext {
7+
exposedAggregates = Customers
8+
}
9+
10+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
BoundedContext CustomerManagement {
2+
Aggregate Customers {
3+
Entity Customer{
4+
String firstName
5+
String familyName
6+
}
7+
Entity Account {
8+
String iban
9+
String bankName
10+
}
11+
}
12+
}
13+
14+
BoundedContext AnotherContext
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import "split-bc-by-owner-test-5-input-2.cml"
2+
3+
ContextMap {
4+
contains CustomerManagement, ContractManagement
5+
6+
CustomerManagement -> ContractManagement {
7+
exposedAggregates = Customers, Addresses
8+
}
9+
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
BoundedContext CustomerManagement {
2+
Aggregate Customers {
3+
owner = Team1
4+
Entity Customer{
5+
String firstName
6+
String familyName
7+
}
8+
Entity Account {
9+
String iban
10+
String bankName
11+
}
12+
}
13+
Aggregate Addresses {
14+
owner = Team2
15+
Entity Address {
16+
String street
17+
}
18+
}
19+
}
20+
21+
BoundedContext ContractManagement
22+
23+
BoundedContext Team1 {
24+
type = TEAM
25+
}
26+
27+
BoundedContext Team2 {
28+
type = TEAM
29+
}
30+
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import "split-bc-by-use-cases-test-5-input-2.cml"
2+
3+
ContextMap {
4+
contains CustomerManagement, ContractManagement
5+
6+
CustomerManagement -> ContractManagement {
7+
exposedAggregates = Customers, Addresses
8+
}
9+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
BoundedContext CustomerManagement {
2+
Aggregate Customers {
3+
useCases = testUseCase1
4+
Entity Customer{
5+
String firstName
6+
String familyName
7+
}
8+
Entity Account {
9+
String iban
10+
String bankName
11+
}
12+
}
13+
14+
Aggregate Addresses {
15+
useCases = testUseCase2
16+
Entity Address {
17+
String street
18+
}
19+
}
20+
}
21+
22+
BoundedContext ContractManagement
23+
24+
UseCase testUseCase1
25+
UseCase testUseCase2
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BoundedContext context1

0 commit comments

Comments
 (0)