Merge comsat-servlet and comsat-webactors #3338
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For details see #3324.
Also the project directory is renamed to
comsatand thebenchmark_config.jsonis adjusted slightly.The changes are:
setup-generic.shbuild script.gradlework similarly to the Maven profiles was unsuccessful - I'm able to import dependencies conditionally but the conditional compile was not that easy. I don't know if this will cause problems.