Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1502 config upgrade #1528

Merged
merged 42 commits into from
Jul 4, 2022
Merged

1502 config upgrade #1528

Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f0ac1d5
Adjust documentation (#1491)
GuentherJulian Mar 10, 2022
d50efe5
changed eclipse repository to https
maybeec Mar 23, 2022
c90973d
Merge branch 'template-set-deployables' of https://github.com/devonfw…
GuentherJulian Apr 12, 2022
afa4009
Merge branch 'template-set-deployables' of https://github.com/devonfw…
GuentherJulian Apr 27, 2022
99d0412
Merge branch 'template-set-deployables' of https://github.com/devonfw…
GuentherJulian Apr 27, 2022
ac142b3
implemented draft for template set upgrader
GuentherJulian Apr 27, 2022
de42673
trigger getting converted to xml
EduardKrieger May 3, 2022
e32c2f9
context will be splitted, pom generation in progress
EduardKrieger May 3, 2022
366015c
removed useless fields
EduardKrieger May 3, 2022
00ea9f7
removed some comments
EduardKrieger May 3, 2022
b03f97a
implemented some test
EduardKrieger May 5, 2022
962fc72
upgrader implemented
EduardKrieger May 10, 2022
07df50c
added backup folder for old templates
EduardKrieger May 10, 2022
d4409aa
added ignore to templatesetupgradetests
EduardKrieger May 11, 2022
1414163
added ignore to templatesetupgradetests
EduardKrieger May 11, 2022
deff99f
chaanged upgrading process and changed the tests of the upgrade
EduardKrieger Jun 3, 2022
107583c
test for sucessful backup
EduardKrieger Jun 3, 2022
fed6aeb
changed test to use multiple context files
EduardKrieger Jun 14, 2022
2d85462
#1502 changed context version of reader test files to lates compatible
MikeSchumacherCapgemini Jun 14, 2022
faa4d39
changed context version in the jars from the test files
EduardKrieger Jun 14, 2022
f64a021
reworked upgrade step to work with the upgrade prozess to 3.0
EduardKrieger Jun 14, 2022
f81c815
#1502 fixed latest context version in javaplugin integration test
MikeSchumacherCapgemini Jun 14, 2022
50da8b6
Merge branch '1502_config_upgrade' of https://github.com/EduardKriege…
MikeSchumacherCapgemini Jun 14, 2022
691bffa
#1502 fixed some more context versions in tests
MikeSchumacherCapgemini Jun 14, 2022
46ad6b3
moved template upgrade process out of the abstract class
EduardKrieger Jun 14, 2022
e8dfe31
Merge branch '1502_config_upgrade' of https://github.com/EduardKriege…
EduardKrieger Jun 14, 2022
e5641ca
implemented requested changes
EduardKrieger Jun 15, 2022
7e38e28
removed some files
EduardKrieger Jun 16, 2022
8a22fbb
Merge branch 'master' into 1502_config_upgrade
EduardKrieger Jun 16, 2022
dbf2ac7
the requested changes have been added
EduardKrieger Jun 21, 2022
29bff44
changed use of validate process for the readers
EduardKrieger Jun 21, 2022
0398156
Merge branch 'template-set-deployables' into 1502_config_upgrade
EduardKrieger Jun 21, 2022
35b5b29
removed log
EduardKrieger Jun 21, 2022
541aa4d
removed import
EduardKrieger Jun 21, 2022
e4bb73f
#1502 added tags to template sets
jan-vcapgemini Jun 23, 2022
b3fd84b
used correct formatting for few files
EduardKrieger Jun 23, 2022
ae0b497
#1502 addressed requested changes
MikeSchumacherCapgemini Jun 28, 2022
9f22aeb
#1502 replaced generic exceptions with CobigenRuntimeExceptions
MikeSchumacherCapgemini Jun 28, 2022
bfe0ba2
#1502 applied proper code reformat
jan-vcapgemini Jul 1, 2022
3b2cdce
#1502 fixed template set upgrader and tests
jan-vcapgemini Jul 1, 2022
d5654b2
#1502 fixed template set upgrader and tests
jan-vcapgemini Jul 1, 2022
ef431dc
#1502 fixed template set upgrader and tests
jan-vcapgemini Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...test/resources/testdata/templatesproject/templates-devon4j/src/main/templates/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="crud_java_server_app" type="java" templateFolder="crud_java_server_app">
<containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api"
Expand All @@ -11,4 +11,7 @@
<variableAssignment type="regex" key="entityName" value="5"/>
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
30 changes: 0 additions & 30 deletions cobigen-eclipse/cobigen-eclipse-feature/.project
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions cobigen-eclipse/cobigen-eclipse-test/.classpath
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions cobigen-eclipse/cobigen-eclipse-test/.project
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion ...clipse/cobigen-eclipse-test/src/main/resources/ClassPathLoadingTest/templates/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
<trigger id="test" type="java" templateFolder="templates">
<matcher type="fqn" value=".*">
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
5 changes: 4 additions & 1 deletion ...ipse/cobigen-eclipse-test/src/main/resources/CobiGenJavaWrapperTest/templates/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
<trigger id="test" type="java" templateFolder="templates">
<containerMatcher type="package" value=".*" />
<matcher type="fqn" value=".*">
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
5 changes: 4 additions & 1 deletion ...cobigen-eclipse-test/src/main/resources/MultipleMatchingTriggerTest/templates/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
<trigger id="trigger1" type="java" templateFolder="templates1">
<matcher type="fqn" value=".*">
</matcher>
Expand All @@ -8,4 +8,7 @@
<matcher type="fqn" value=".*">
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
5 changes: 4 additions & 1 deletion cobigen-eclipse/cobigen-eclipse-test/src/main/resources/OpenAPITest/templates/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="crud_openapi_java_server_app" type="openapi" templateFolder="templates">
<containerMatcher type="element" value="openAPIFile"/>
Expand Down Expand Up @@ -29,4 +29,7 @@
<variableAssignment type="property" key="entityName" value="name"/>
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
5 changes: 4 additions & 1 deletion ...ipse/cobigen-eclipse-test/src/main/resources/VelocityGenerationTest/templates/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="testBasicGeneration" type="java" templateFolder="testBasicGeneration">
<matcher type="fqn" value="(.+)\.Input">
<variableAssignment type="regex" key="package" value="1"/>
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
25 changes: 0 additions & 25 deletions cobigen-eclipse/cobigen-eclipse-updatesite/.project
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions cobigen-eclipse/cobigen-eclipse/.classpath
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions cobigen-eclipse/cobigen-eclipse/.project
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions ...es/testdata/systemtest/Devon4JTemplateTest/templates-classloading-testclasses/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="test" type="java" templateFolder="templates1">
<matcher type="fqn" value=".*">
</matcher>
</trigger>

<tags>
<tag name="bla" />
</tags>

</contextConfiguration>
5 changes: 4 additions & 1 deletion .../testdata/systemtest/Devon4JTemplateTest/templates-devon4j/src/main/templates/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="crud_java_server_app" type="java" templateFolder="crud_java_server_app">
<containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api"
Expand All @@ -11,4 +11,7 @@
<variableAssignment type="regex" key="entityName" value="5"/>
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
5 changes: 4 additions & 1 deletion .../src/test/resources/testdata/systemtest/Devon4JTemplateTest/templates-nomatch/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
7 changes: 5 additions & 2 deletions ...ces/testdata/systemtest/Oasp4JTemplateTest/templates-classloading-testclasses/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="test" type="java" templateFolder="templates1">
<matcher type="fqn" value=".*">
</matcher>
</trigger>

<tags>
<tag name="bla" />
</tags>

</contextConfiguration>
5 changes: 4 additions & 1 deletion ...t/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-nomatch/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
5 changes: 4 additions & 1 deletion ...st/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-oasp4j/context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">

<trigger id="crud_java_server_app" type="java" templateFolder="crud_java_server_app">
<containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false"/>
Expand All @@ -10,4 +10,7 @@
<variableAssignment type="regex" key="entityName" value="5"/>
</matcher>
</trigger>
<tags>
<tag name="bla" />
</tags>
</contextConfiguration>
Loading