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.

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

1465 custom template location documentation #1545

Closed
wants to merge 10 commits into from
Closed

1465 custom template location documentation #1545

wants to merge 10 commits into from

Conversation

jan-vcapgemini
Copy link
Collaborator

Adresses/Fixes #1465.

Implements

  • Documentation changes

@devonfw/cobigen

GuentherJulian and others added 10 commits March 10, 2022 11:09
* fixed some types and links and corrected some parts of the documentation

* adjust angular client guide

* fixed typo

* fixed requested changes
added new testMergingOverridesExportConst test and resources
* #1496 replaced Runnable with lambda

* #1496 passed activeShell to openInvalidConfigurationErrorDialog

* #1496 created a new thread for Exceptions handled by the ExceptionHandler (getActiveShell returned a wrong thread)

* #1496 re-enabled and fixed testConflictConfiguration test
made sure to check old context.xml case properly (context.xml in template project root)
added new checkForConflict method to ContextConfigurationReader
added processCobiGenWithExpectedError methods to EclipseCobiGenUtils
added new ExceptionHandlingTest

* #1496 added waitUntils of 10 seconds to ExceptionHandlingTest and processCobiGenWithExpectedError
added screenshot to processCobiGenWithExpectedError
added exception message to cleanWorkspace log
replaced Files.exist with Files.isDirectory in ContextConfigurationReader

* #1496 fixed project import and optimized shell handling
added missing .project file
removed waitUntils
removed extra placeholder in debug message
moved syncExec to openInvalidConfigurationErrorDialog method
removed activeShell param from openInvalidConfigurationErrorDialog

* #1496 added new Eclipse test troubleshoot issue

* #1496 removed unnecessary/unused rule
* #430 use annotations of the patchfile, if javamerge_override is set.

* implement merge method and use it to merge class annotation

* merge implementation of fields and methods, and tests

* Update JavaMerger.java

Co-authored-by: Malte Brunnlieb <[email protected]>
…old and new configuration (#1533)

* #1532 fixed HealthCheck not being able to handle a conflict with the old and new configuration
added new ConfigurationConflictException
replaced InvalidConfigurationException with ConfigurationConflictException in checkForConflict method
replaced InvalidConfigurationException with ConfigurationConflictException in testConflictConfiguration test
added new case for conflicted configurations to ExceptionHandler handle method
added catch of ConfigurationConflictException with adjusted message to healthCheckDialog execute

* #1532 replaced File with Path

* #1532 implemented requested changes
moved log message from eclipse to core
# Conflicts:
#	cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/ContextConfigurationReader.java
#	cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/reader/ContextConfigurationReaderTest.java
added CobiGen Home title
updated template folder structure
added template sets folder structure
added separate CobiGen configuration file documentation
moved 'Custom template-set groupIds for lookup' into the CobiGen configuration file topic
renamed 'Custom template-set groupIds for lookup' to 'Template set attributes'
@jan-vcapgemini
Copy link
Collaborator Author

Removed because of mess up with force push.

jan-vcapgemini added a commit to NelsonNew/cobigen that referenced this pull request Apr 19, 2023
added ArtifactRetrieverUtil to core
moved ArtifactRetriever cache handling to new ArtifactRetrieverUtil in core
fixed dependency cycle
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants