Skip to content

Commit a39ec1c

Browse files
MikeSchumacherCapgeminiGuentherJulianMansour Dukhan
authored
Add tags, detailed description and tutorial links to config files (#1500)
* #1403 changed pciture and added text to make it very clear what plugins should be installed * Adjust documentation (#1491) * fixed some types and links and corrected some parts of the documentation * adjust angular client guide * fixed typo * fixed requested changes * #1463 added options for tags, detailed descriptions and links to xsd * #1463 added new version to constants and generation to pom * #1463 updated version, rearranged newly added xsd elements, updated method getTrigger in configurationReader * #1463 adpated xsd to not have a weird method, made config version non-backwards compatible, changed config reader to read single trigger * #1463 schema version upgraded from 2.x to 2.3 in templates.xml and context.xml added new explanation attribute to the first Increment in templates.xml added links attribute to context.xml * #1463 spell correction of some explanation attributes * #1463 modified from v4.0 to v2.3 in pom.xml explanation correction for crud_java_server_app templates.xml link added to crud_java_server_app context.xml * #1463 changed versions of configs * #1463 changed config versions * #1463 removed core changes for now * added back linebreaks at file endings * #1463 removed trigger node from xsd * #1463 changed version attributes in xsds and added templateengine node from v4.0 to v5.0 * #1463 changed xsd to get a list of triggers for now, added new schema versions with upgrades * #1500 fixed failing tests, adressed requested changes, removed some tests for now * #1463 re-added accidently deleted v2.2 schema, changed versions of config files to latest versions * #1463 re-removed 2.2 schema, added missing version to upgrader * deleted unnecessary files * removed unnecessary changes * added new xsd version back to pom * readded template version 5.0 to version enum * fixed pom error * fix compilation errors * fix syntax error in context.xml * changed contextconfiguration 3.0 schema * added ignore to tests * fix whitespaces in templates.xml Co-authored-by: GuentherJulian <[email protected]> Co-authored-by: Mansour Dukhan <[email protected]> Co-authored-by: Julian Günther <[email protected]>
1 parent 36ab7ce commit a39ec1c

File tree

50 files changed

+1057
-873
lines changed

Some content is hidden

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

50 files changed

+1057
-873
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
3-
4-
5-
6-
2+
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
73
<trigger id="crud_angular_client_app" type="java">
84
<matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+)Eto">
9-
<variableAssignment type="regex" key="rootPackage" value="1"/>
10-
<variableAssignment type="regex" key="domain" value="3"/>
11-
<variableAssignment type="regex" key="component" value="4"/>
12-
<variableAssignment type="regex" key="etoName" value="5"/>
5+
<variableAssignment type="regex" key="rootPackage" value="1" />
6+
<variableAssignment type="regex" key="domain" value="3" />
7+
<variableAssignment type="regex" key="component" value="4" />
8+
<variableAssignment type="regex" key="etoName" value="5" />
139
</matcher>
1410
</trigger>
15-
16-
17-
18-
19-
</contextConfiguration>
11+
<links>
12+
<link url="https://github.com/devonfw/cobigen/wiki/howto_angular-client-generation"></link>
13+
</links>
14+
</contextConfiguration>
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,47 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
4-
2+
<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0">
53
<templates>
6-
<templateExtension ref="${variables.etoName#lower_case}-dialog.component.ts" mergeStrategy="tsmerge"/>
7-
<templateExtension ref="${variables.etoName#lower_case}-grid.component.ts" mergeStrategy="tsmerge"/>
8-
<templateExtension ref="${variables.etoName#lower_case}-alert.component.ts" mergeStrategy="tsmerge"/>
9-
<templateExtension ref="${variables.etoName#lower_case}.service.ts" mergeStrategy="tsmerge"/>
10-
<templateExtension ref="app.module.ts" mergeStrategy="tsmerge"/>
11-
<templateExtension ref="es.json" mergeStrategy="jsonmerge"/>
12-
<templateExtension ref="en.json" mergeStrategy="jsonmerge"/>
13-
<templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override"/>
14-
<templateExtension ref="nav-bar.component.html" mergeStrategy="html-ng*"/>
4+
<templateExtension ref="${variables.etoName#lower_case}-dialog.component.ts" mergeStrategy="tsmerge" />
5+
<templateExtension ref="${variables.etoName#lower_case}-grid.component.ts" mergeStrategy="tsmerge" />
6+
<templateExtension ref="${variables.etoName#lower_case}-alert.component.ts" mergeStrategy="tsmerge" />
7+
<templateExtension ref="${variables.etoName#lower_case}.service.ts" mergeStrategy="tsmerge" />
8+
<templateExtension ref="app.module.ts" mergeStrategy="tsmerge" />
9+
<templateExtension ref="es.json" mergeStrategy="jsonmerge" />
10+
<templateExtension ref="en.json" mergeStrategy="jsonmerge" />
11+
<templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override" />
12+
<templateExtension ref="nav-bar.component.html" mergeStrategy="html-ng*" />
1513
</templates>
16-
1714
<templateScans>
1815
<templateScan name="ts_scan" templatePath="templates" destinationPath="" />
1916
</templateScans>
20-
2117
<increments>
22-
<increment name="devon4ng-app" description="CRUD devon4ng Angular App">
23-
<incrementRef ref="app_angular_i18n"/>
24-
<incrementRef ref="app_angular_devon4ng_component"/>
18+
<increment name="devon4ng-app" description="CRUD devon4ng Angular App" explanation="Creates Angular stack CRUD service.">
19+
<incrementRef ref="app_angular_i18n" />
20+
<incrementRef ref="app_angular_devon4ng_component" />
2521
</increment>
26-
2722
<increment name="app_angular_i18n" description="Angular i18n">
28-
<templateRef ref="es.json"/>
29-
<templateRef ref="en.json"/>
23+
<templateRef ref="es.json" />
24+
<templateRef ref="en.json" />
3025
</increment>
3126
<increment name="app_angular_devon4ng_component" description="Angular devon4ng Component">
32-
<templateRef ref="${variables.etoName#lower_case}-dialog.component.html"/>
33-
<templateRef ref="${variables.etoName#lower_case}-dialog.component.ts"/>
34-
<templateRef ref="${variables.etoName#lower_case}-dialog.component.spec.ts"/>
35-
<templateRef ref="${variables.etoName#lower_case}-grid.component.html"/>
36-
<templateRef ref="${variables.etoName#lower_case}-grid.component.scss"/>
37-
<templateRef ref="${variables.etoName#lower_case}-grid.component.ts"/>
38-
<templateRef ref="${variables.etoName#lower_case}-grid.component.spec.ts"/>
39-
<templateRef ref="${variables.etoName#lower_case}-alert.component.html"/>
40-
<templateRef ref="${variables.etoName#lower_case}-alert.component.scss"/>
41-
<templateRef ref="${variables.etoName#lower_case}-alert.component.ts"/>
42-
<templateRef ref="${variables.etoName#lower_case}-alert.component.spec.ts"/>
43-
<templateRef ref="${variables.etoName#lower_case}.service.ts"/>
44-
<templateRef ref="${variables.etoName#lower_case}.service.spec.ts"/>
45-
<templateRef ref="${variables.etoName#lower_case}-routing.module.ts"/>
46-
<templateRef ref="${variables.etoName#lower_case}.module.ts"/>
47-
<templateRef ref="app.module.ts"/>
48-
<templateRef ref="app-routing.module.ts"/>
49-
<templateRef ref="nav-bar.component.html"/>
27+
<templateRef ref="${variables.etoName#lower_case}-dialog.component.html" />
28+
<templateRef ref="${variables.etoName#lower_case}-dialog.component.ts" />
29+
<templateRef ref="${variables.etoName#lower_case}-dialog.component.spec.ts" />
30+
<templateRef ref="${variables.etoName#lower_case}-grid.component.html" />
31+
<templateRef ref="${variables.etoName#lower_case}-grid.component.scss" />
32+
<templateRef ref="${variables.etoName#lower_case}-grid.component.ts" />
33+
<templateRef ref="${variables.etoName#lower_case}-grid.component.spec.ts" />
34+
<templateRef ref="${variables.etoName#lower_case}-alert.component.html" />
35+
<templateRef ref="${variables.etoName#lower_case}-alert.component.scss" />
36+
<templateRef ref="${variables.etoName#lower_case}-alert.component.ts" />
37+
<templateRef ref="${variables.etoName#lower_case}-alert.component.spec.ts" />
38+
<templateRef ref="${variables.etoName#lower_case}.service.ts" />
39+
<templateRef ref="${variables.etoName#lower_case}.service.spec.ts" />
40+
<templateRef ref="${variables.etoName#lower_case}-routing.module.ts" />
41+
<templateRef ref="${variables.etoName#lower_case}.module.ts" />
42+
<templateRef ref="app.module.ts" />
43+
<templateRef ref="app-routing.module.ts" />
44+
<templateRef ref="nav-bar.component.html" />
5045
</increment>
5146
</increments>
52-
</templatesConfiguration>
47+
</templatesConfiguration>
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
3-
4-
5-
2+
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
63
<trigger id="crud_ionic_client_app" type="java">
74
<matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+)Eto">
8-
<variableAssignment type="regex" key="rootPackage" value="1"/>
9-
<variableAssignment type="regex" key="domain" value="3"/>
10-
<variableAssignment type="regex" key="component" value="4"/>
11-
<variableAssignment type="regex" key="etoName" value="5"/>
5+
<variableAssignment type="regex" key="rootPackage" value="1" />
6+
<variableAssignment type="regex" key="domain" value="3" />
7+
<variableAssignment type="regex" key="component" value="4" />
8+
<variableAssignment type="regex" key="etoName" value="5" />
129
</matcher>
1310
</trigger>
14-
15-
16-
</contextConfiguration>
11+
<links>
12+
<link url="https://github.com/devonfw/cobigen/wiki/howto_ionic-client-generation"></link>
13+
</links>
14+
</contextConfiguration>
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,68 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
4-
2+
<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0">
53
<templates>
6-
<templateExtension ref="${variables.etoName#lower_case}-detail.page.ts" mergeStrategy="tsmerge"/>
7-
<templateExtension ref="${variables.etoName#lower_case}-list.page.ts" mergeStrategy="tsmerge_override"/>
8-
<templateExtension ref="app.component.ts" mergeStrategy="tsmerge_override"/>
9-
<templateExtension ref="app.module.ts" mergeStrategy="tsmerge_override"/>
10-
<templateExtension ref="${variables.etoName#lower_case}-rest.service.ts" mergeStrategy="tsmerge_override"/>
4+
<templateExtension ref="${variables.etoName#lower_case}-detail.page.ts" mergeStrategy="tsmerge" />
5+
<templateExtension ref="${variables.etoName#lower_case}-list.page.ts" mergeStrategy="tsmerge_override" />
6+
<templateExtension ref="app.component.ts" mergeStrategy="tsmerge_override" />
7+
<templateExtension ref="app.module.ts" mergeStrategy="tsmerge_override" />
8+
<templateExtension ref="${variables.etoName#lower_case}-rest.service.ts" mergeStrategy="tsmerge_override" />
119
<templateExtension ref="${variables.etoName#lower_case}.ts" />
1210
<templateExtension ref="${variables.etoName#lower_case}-search-criteria.ts" />
1311
<templateExtension ref="paginated-list-to.ts" />
1412
<templateExtension ref="pageable.ts" />
1513
<templateExtension ref="sort.ts" />
16-
<templateExtension ref="environment.android.ts" mergeStrategy="tsmerge_override"/>
17-
<templateExtension ref="environment.prod.ts" mergeStrategy="tsmerge_override"/>
18-
<templateExtension ref="environment.ts" mergeStrategy="tsmerge_override"/>
19-
<templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override"/>
20-
<templateExtension ref="${variables.etoName#lower_case}-detail.page.html" mergeStrategy="html-ng*"/>
21-
<templateExtension ref="${variables.etoName#lower_case}-list.page.html" mergeStrategy="html-ng*"/>
22-
<templateExtension ref="es.json" mergeStrategy="jsonmerge_override"/>
23-
<templateExtension ref="en.json" mergeStrategy="jsonmerge_override"/>
24-
<templateExtension ref="business-operator.service.ts" mergeStrategy="tsmerge_override"/>
14+
<templateExtension ref="environment.android.ts" mergeStrategy="tsmerge_override" />
15+
<templateExtension ref="environment.prod.ts" mergeStrategy="tsmerge_override" />
16+
<templateExtension ref="environment.ts" mergeStrategy="tsmerge_override" />
17+
<templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override" />
18+
<templateExtension ref="${variables.etoName#lower_case}-detail.page.html" mergeStrategy="html-ng*" />
19+
<templateExtension ref="${variables.etoName#lower_case}-list.page.html" mergeStrategy="html-ng*" />
20+
<templateExtension ref="es.json" mergeStrategy="jsonmerge_override" />
21+
<templateExtension ref="en.json" mergeStrategy="jsonmerge_override" />
22+
<templateExtension ref="business-operator.service.ts" mergeStrategy="tsmerge_override" />
2523
</templates>
26-
2724
<templateScans>
28-
<templateScan templatePath="templates" destinationPath="src/main/java"/>
25+
<templateScan templatePath="templates" destinationPath="src/main/java" />
2926
</templateScans>
30-
3127
<increments>
32-
<increment name="devon4ng-app" description="CRUD devon4ng Ionic App">
33-
<incrementRef ref="app_ionic_structure"/>
34-
<incrementRef ref="ionic_routing"/>
35-
<incrementRef ref="ionic_i18n"/>
36-
<incrementRef ref="ionic_component"/>
37-
<incrementRef ref="ionic_theme"/>
28+
<increment name="devon4ng-app" description="CRUD devon4ng Ionic App" explanation="Creates Ionic stack CRUD service.">
29+
<incrementRef ref="app_ionic_structure" />
30+
<incrementRef ref="ionic_routing" />
31+
<incrementRef ref="ionic_i18n" />
32+
<incrementRef ref="ionic_component" />
33+
<incrementRef ref="ionic_theme" />
3834
</increment>
3935
<increment name="app_ionic_structure" description="Ionic devon4ng environments">
4036
<templateRef ref="environment.android.ts" />
4137
<templateRef ref="environment.prod.ts" />
4238
<templateRef ref="environment.ts" />
4339
</increment>
4440
<increment name="ionic_routing" description="Ionic routing">
45-
<templateRef ref="app-routing.module.ts"/>
41+
<templateRef ref="app-routing.module.ts" />
4642
</increment>
4743
<increment name="ionic_i18n" description="Ionic i18n">
48-
<templateRef ref="es.json"/>
49-
<templateRef ref="en.json"/>
44+
<templateRef ref="es.json" />
45+
<templateRef ref="en.json" />
5046
</increment>
5147
<increment name="ionic_component" description="Ionic List">
52-
<templateRef ref="${variables.etoName#lower_case}.ts"/>
53-
<templateRef ref="${variables.etoName#lower_case}-search-criteria.ts"/>
54-
<templateRef ref="paginated-list-to.ts"/>
55-
<templateRef ref="app.component.ts"/>
56-
<templateRef ref="app.module.ts"/>
57-
<templateRef ref="pageable.ts"/>
58-
<templateRef ref="sort.ts"/>
59-
<templateRef ref="${variables.etoName#lower_case}-rest.service.ts"/>
60-
<templateRef ref="${variables.etoName#lower_case}-list.page.ts"/>
61-
<templateRef ref="${variables.etoName#lower_case}-list.page.html"/>
62-
<templateRef ref="${variables.etoName#lower_case}-list.page.scss"/>
63-
<templateRef ref="${variables.etoName#lower_case}-detail.page.ts"/>
64-
<templateRef ref="${variables.etoName#lower_case}-detail.page.html"/>
65-
<templateRef ref="${variables.etoName#lower_case}-detail.page.scss"/>
66-
<templateRef ref="business-operator.service.ts"/>
48+
<templateRef ref="${variables.etoName#lower_case}.ts" />
49+
<templateRef ref="${variables.etoName#lower_case}-search-criteria.ts" />
50+
<templateRef ref="paginated-list-to.ts" />
51+
<templateRef ref="app.component.ts" />
52+
<templateRef ref="app.module.ts" />
53+
<templateRef ref="pageable.ts" />
54+
<templateRef ref="sort.ts" />
55+
<templateRef ref="${variables.etoName#lower_case}-rest.service.ts" />
56+
<templateRef ref="${variables.etoName#lower_case}-list.page.ts" />
57+
<templateRef ref="${variables.etoName#lower_case}-list.page.html" />
58+
<templateRef ref="${variables.etoName#lower_case}-list.page.scss" />
59+
<templateRef ref="${variables.etoName#lower_case}-detail.page.ts" />
60+
<templateRef ref="${variables.etoName#lower_case}-detail.page.html" />
61+
<templateRef ref="${variables.etoName#lower_case}-detail.page.scss" />
62+
<templateRef ref="business-operator.service.ts" />
6763
</increment>
6864
<increment name="ionic_theme" description="Ionic theme">
69-
<templateRef ref="variables.scss"/>
65+
<templateRef ref="variables.scss" />
7066
</increment>
7167
</increments>
7268
</templatesConfiguration>
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
3-
4-
2+
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
53
<trigger id="crud_java_ea_uml" type="xml">
6-
<containerMatcher type="xpath" value="./uml:Model//packagedElement[@xmi:type='uml:Class']"/>
4+
<containerMatcher type="xpath" value="./uml:Model//packagedElement[@xmi:type='uml:Class']" />
75
<matcher type="xpath" value="self::node()[@xmi:type='uml:Class']/ancestor::uml:Model">
8-
<variableAssignment type="xpath" key="rootPackage"
9-
value="self::node()/ancestor::packagedElement/packagedElement/@name"/>
10-
<variableAssignment type="xpath" key="component"
11-
value="self::node()/ancestor::packagedElement/packagedElement/packagedElement/@name"/>
12-
<variableAssignment type="xpath" key="className" value="self::node()/@name"/>
6+
<variableAssignment type="xpath" key="rootPackage" value="self::node()/ancestor::packagedElement/packagedElement/@name" />
7+
<variableAssignment type="xpath" key="component" value="self::node()/ancestor::packagedElement/packagedElement/packagedElement/@name" />
8+
<variableAssignment type="xpath" key="className" value="self::node()/@name" />
139
</matcher>
1410
</trigger>
15-
16-
</contextConfiguration>
11+
</contextConfiguration>
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
4-
2+
<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0">
53
<templates>
6-
<templateExtension ref="${variables.className}Entity.java" mergeStrategy="javamerge"/>
4+
<templateExtension ref="${variables.className}Entity.java" mergeStrategy="javamerge" />
75
</templates>
8-
96
<templateScans>
10-
<templateScan templatePath="templates" destinationPath="src/main"/>
7+
<templateScan templatePath="templates" destinationPath="src/main" />
118
</templateScans>
12-
139
<increments>
14-
<increment name="xml_uml_entity" description="Entity infrastructure">
15-
<templateRef ref="${variables.className}Entity.java"/>
16-
<templateRef ref="${variables.className}.java"/>
17-
<templateRef ref="ApplicationEntity.java"/>
18-
<templateRef ref="ApplicationPersistenceEntity.java"/>
10+
<increment name="xml_uml_entity" description="Entity infrastructure" explanation="Creates Entity java classes to CRUD from schema.">
11+
<templateRef ref="${variables.className}Entity.java" />
12+
<templateRef ref="${variables.className}.java" />
13+
<templateRef ref="ApplicationEntity.java" />
14+
<templateRef ref="ApplicationPersistenceEntity.java" />
1915
</increment>
2016
</increments>
21-
</templatesConfiguration>
17+
</templatesConfiguration>
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
3-
2+
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
43
<trigger id="crud_java_server_app_complex" type="java">
5-
<containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api"
6-
retrieveObjectsRecursively="false"/>
4+
<containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
75
<matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
8-
<variableAssignment type="regex" key="rootPackage" value="1"/>
9-
<variableAssignment type="regex" key="domain" value="3"/>
10-
<variableAssignment type="regex" key="component" value="4"/>
11-
<variableAssignment type="regex" key="entityName" value="5"/>
6+
<variableAssignment type="regex" key="rootPackage" value="1" />
7+
<variableAssignment type="regex" key="domain" value="3" />
8+
<variableAssignment type="regex" key="component" value="4" />
9+
<variableAssignment type="regex" key="entityName" value="5" />
1210
</matcher>
1311
</trigger>
14-
15-
16-
17-
</contextConfiguration>
12+
</contextConfiguration>

0 commit comments

Comments
 (0)