diff --git a/.github/actions/setup-maven/action.yaml b/.github/actions/setup-maven/action.yaml index 5dc9780f..7e99f85f 100644 --- a/.github/actions/setup-maven/action.yaml +++ b/.github/actions/setup-maven/action.yaml @@ -12,7 +12,7 @@ runs: cache: 'maven' cache-dependency-path: | pom.xml - libs/pom.xml - tools/pom.xml + lib/pom.xml + tool/pom.xml - shell: bash run: cat ~/.m2/settings.xml diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 4b2945b3..7a2ea3d3 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -1,10 +1,6 @@ --- version: 2 updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - package-ecosystem: "maven" directory: "/" open-pull-requests-limit: 10 @@ -17,8 +13,12 @@ updates: junit-platform: patterns: - "org.junit*" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" - package-ecosystem: "docker" - directory: "/dbs/postgres" + directory: "/db/postgres" schedule: interval: "weekly" - package-ecosystem: "docker" @@ -34,10 +34,9 @@ updates: schedule: interval: "weekly" ignore: - - dependency-name: "ansible-core" + - dependency-name: "*" update-types: - version-update:semver-major - - version-update:semver-minor - package-ecosystem: "pip" directory: "/stack/gear/godel" schedule: diff --git a/.github/workflows/beyond-doubt.yaml b/.github/workflows/beyond-doubt.yaml index 101f30d5..63d677a1 100644 --- a/.github/workflows/beyond-doubt.yaml +++ b/.github/workflows/beyond-doubt.yaml @@ -41,7 +41,7 @@ jobs: docker run --rm --volume $(pwd):$(pwd) --volume ~/.m2:/root/.m2 - --workdir $(pwd)/bakers/ansible + --workdir $(pwd)/baker/ansible ${{ env.IMAGE_NAME }}:${{ matrix.env.dev }} ansible-playbook sources.yaml -e devenv=${{ matrix.env.dev }} @@ -55,7 +55,7 @@ jobs: --volume ~/.docker/config.json:/root/.docker/config.json:ro --env GITHUB_ACTOR=${{ github.actor }} --env GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} - --workdir $(pwd)/bakers/ansible + --workdir $(pwd)/baker/ansible ${{ env.IMAGE_NAME }}:${{ matrix.env.dev }} ansible-playbook images.yaml -v -e devenv=${{ matrix.env.dev }} @@ -107,7 +107,7 @@ jobs: run: >- docker run --rm --volume $(pwd):$(pwd) - --workdir $(pwd)/bakers/ansible + --workdir $(pwd)/baker/ansible ${{ env.IMAGE_NAME }}:${{ matrix.env.dev }} ansible-playbook stacks.yaml -t build -e image_repo=${{ env.IMAGE_REPO }} @@ -116,8 +116,8 @@ jobs: -e opsenv=${{ matrix.env.ops }} - uses: actions/upload-artifact@v4.3.1 with: - name: solution-${{ matrix.purpose }}-${{ matrix.env.ops }} - path: stack/solution/target/image-context + name: product-${{ matrix.purpose }}-${{ matrix.env.ops }} + path: stack/product/target/image-context if-no-files-found: ignore stack-testing: @@ -149,8 +149,8 @@ jobs: - uses: actions/download-artifact@v4.1.2 continue-on-error: true # it's ok because stack building can be skipped with: - name: solution-${{ matrix.purpose }}-${{ matrix.env.ops }} - path: stack/solution/target/image-context + name: product-${{ matrix.purpose }}-${{ matrix.env.ops }} + path: stack/product/target/image-context - name: Run setup-maven uses: ./.github/actions/setup-maven - name: Run ansible-playbook stacks.yaml -t test @@ -159,7 +159,7 @@ jobs: --volume $(pwd):$(pwd) --volume ~/.m2:/root/.m2 --volume /var/run/docker.sock:/var/run/docker.sock - --workdir $(pwd)/bakers/ansible + --workdir $(pwd)/baker/ansible ${{ env.IMAGE_NAME }}:${{ matrix.env.dev }} ansible-playbook stacks.yaml -t test -e image_repo=${{ env.IMAGE_REPO }} @@ -172,7 +172,7 @@ jobs: if: ${{ !cancelled() }} with: name: e2e-test-report-${{ matrix.shard }}-${{ matrix.purpose }}-${{ matrix.env.ops }} - path: tests/e2e/target/surefire-reports/*.xml + path: test/e2e/target/surefire-reports/*.xml if-no-files-found: ignore stack-publishing: @@ -205,15 +205,15 @@ jobs: - uses: actions/download-artifact@v4.1.2 continue-on-error: true # it's ok because stack building can be skipped with: - name: solution-${{ matrix.purpose }}-${{ matrix.env.ops }} - path: stack/solution/target/image-context + name: product-${{ matrix.purpose }}-${{ matrix.env.ops }} + path: stack/product/target/image-context - name: Run ansible-playbook stacks.yaml -t package run: >- docker run --rm --volume $(pwd):$(pwd) --volume /var/run/docker.sock:/var/run/docker.sock --volume ~/.docker/config.json:/root/.docker/config.json:ro - --workdir $(pwd)/bakers/ansible + --workdir $(pwd)/baker/ansible ${{ env.IMAGE_NAME }}:${{ matrix.env.dev }} ansible-playbook stacks.yaml -t package -v -e image_repo=${{ env.IMAGE_REPO }} diff --git a/.github/workflows/convincing.yaml b/.github/workflows/convincing.yaml index c9449403..38a49f4e 100644 --- a/.github/workflows/convincing.yaml +++ b/.github/workflows/convincing.yaml @@ -37,7 +37,7 @@ jobs: docker run --rm --volume $(pwd):$(pwd) --volume ~/.m2:/root/.m2 - --workdir $(pwd)/bakers/ansible + --workdir $(pwd)/baker/ansible ${{ env.IMAGE_NAME }}:${{ matrix.env.dev }} ansible-playbook sources.yaml -e devenv=${{ matrix.env.dev }} @@ -51,7 +51,7 @@ jobs: --volume ~/.docker/config.json:/root/.docker/config.json:ro --env GITHUB_ACTOR=${{ github.actor }} --env GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} - --workdir $(pwd)/bakers/ansible + --workdir $(pwd)/baker/ansible ${{ env.IMAGE_NAME }}:${{ matrix.env.dev }} ansible-playbook images.yaml -v -e devenv=${{ matrix.env.dev }} @@ -77,7 +77,7 @@ jobs: if: ${{ !cancelled() }} with: name: test-coverage-report - path: tools/target/coverage + path: tool/target/coverage if-no-files-found: ignore everything-is-fine: diff --git a/.github/workflows/sanity.yaml b/.github/workflows/sanity.yaml index 5a2cce03..0c62ec49 100644 --- a/.github/workflows/sanity.yaml +++ b/.github/workflows/sanity.yaml @@ -37,7 +37,7 @@ jobs: docker run --rm --volume $(pwd):$(pwd) --volume ~/.m2:/root/.m2 - --workdir $(pwd)/bakers/ansible + --workdir $(pwd)/baker/ansible ${{ env.IMAGE_NAME }}:${{ matrix.env.dev }} ansible-playbook sources.yaml -e devenv=${{ matrix.env.dev }} @@ -47,7 +47,7 @@ jobs: docker run --rm --volume $(pwd):$(pwd) --volume ~/.m2:/root/.m2 - --workdir $(pwd)/bakers/ansible + --workdir $(pwd)/baker/ansible ${{ env.IMAGE_NAME }}:${{ matrix.env.dev }} ansible-playbook binaries.yaml -e devenv=${{ matrix.env.dev }} diff --git a/README.adoc b/README.adoc index c9650d5b..21104af5 100644 --- a/README.adoc +++ b/README.adoc @@ -19,19 +19,19 @@ == Как нанести пользу . Заводим тикет и описываем идею доработки (можно воспользоваться готовыми из <<идеи,списка>>). -. Настраиваем одно из link:envs/dev[поддерживаемых] окружений разработки и фиксируем его в `bakers/ansible/group_vars/all.yaml`. +. Настраиваем одну из link:stack/gear[поддерживаемых] сред разработки и фиксируем её в `baker/ansible/group_vars/all.yaml`. + [source,yaml] ---- # for example -devenv: church +devenv: turing ---- . Выполняем доработку на <<ветки,отдельной>> ветке. . Добиваемся успешного прохождения проверок на локальной машине. + [source,bash] ---- -cd bakers/ansible +cd baker/ansible ansible-playbook sources.yaml ansible-playbook stacks.yaml ---- @@ -75,7 +75,7 @@ ansible-playbook stacks.yaml - Новый инструмент сборки бинарников. Сейчас только Apache Maven. - Новый инструмент управления образами. Сейчас только Docker Engine. - Новый инструмент раскатки стеков. Сейчас только Docker Compose. -- Новое целевое использование (purpose) решения (solution) или снаряжения (gear). +- Новое целевое использование (purpose) продукта (product) или снаряжения (gear). - Новая обвязка построения дерева хешей. Сейчас связка Git и Ansible. === Непредсказуемая сложность diff --git a/apps/lombok.config b/app/lombok.config similarity index 100% rename from apps/lombok.config rename to app/lombok.config diff --git a/apps/pom.xml b/app/pom.xml similarity index 98% rename from apps/pom.xml rename to app/pom.xml index eadef1f0..3528c002 100644 --- a/apps/pom.xml +++ b/app/pom.xml @@ -10,7 +10,7 @@ latest - apps + app ${revision} pom @@ -23,7 +23,7 @@ ${project.groupId} - libs + lib ${revision} import pom diff --git a/apps/sepuling-java/Dockerfile b/app/sepuling-java/Dockerfile similarity index 100% rename from apps/sepuling-java/Dockerfile rename to app/sepuling-java/Dockerfile diff --git a/apps/sepuling-java/pom.xml b/app/sepuling-java/pom.xml similarity index 98% rename from apps/sepuling-java/pom.xml rename to app/sepuling-java/pom.xml index d31292ee..fbeeee92 100644 --- a/apps/sepuling-java/pom.xml +++ b/app/sepuling-java/pom.xml @@ -6,7 +6,7 @@ smecalculus.bezmen - apps + app ${revision} diff --git a/apps/sepuling-java/src/it/java/smecalculus/bezmen/construction/SepulkaClientBeans.java b/app/sepuling-java/src/it/java/smecalculus/bezmen/construction/SepulkaClientBeans.java similarity index 100% rename from apps/sepuling-java/src/it/java/smecalculus/bezmen/construction/SepulkaClientBeans.java rename to app/sepuling-java/src/it/java/smecalculus/bezmen/construction/SepulkaClientBeans.java diff --git a/apps/sepuling-java/src/it/java/smecalculus/bezmen/construction/SepulkaDaoBeans.java b/app/sepuling-java/src/it/java/smecalculus/bezmen/construction/SepulkaDaoBeans.java similarity index 100% rename from apps/sepuling-java/src/it/java/smecalculus/bezmen/construction/SepulkaDaoBeans.java rename to app/sepuling-java/src/it/java/smecalculus/bezmen/construction/SepulkaDaoBeans.java diff --git a/apps/sepuling-java/src/it/java/smecalculus/bezmen/construction/StoragePropsBeans.java b/app/sepuling-java/src/it/java/smecalculus/bezmen/construction/StoragePropsBeans.java similarity index 100% rename from apps/sepuling-java/src/it/java/smecalculus/bezmen/construction/StoragePropsBeans.java rename to app/sepuling-java/src/it/java/smecalculus/bezmen/construction/StoragePropsBeans.java diff --git a/apps/sepuling-java/src/it/java/smecalculus/bezmen/messaging/SepulkaClientIT.java b/app/sepuling-java/src/it/java/smecalculus/bezmen/messaging/SepulkaClientIT.java similarity index 100% rename from apps/sepuling-java/src/it/java/smecalculus/bezmen/messaging/SepulkaClientIT.java rename to app/sepuling-java/src/it/java/smecalculus/bezmen/messaging/SepulkaClientIT.java diff --git a/apps/sepuling-java/src/it/java/smecalculus/bezmen/messaging/SepulkaClientSpringWebTestIT.java b/app/sepuling-java/src/it/java/smecalculus/bezmen/messaging/SepulkaClientSpringWebTestIT.java similarity index 100% rename from apps/sepuling-java/src/it/java/smecalculus/bezmen/messaging/SepulkaClientSpringWebTestIT.java rename to app/sepuling-java/src/it/java/smecalculus/bezmen/messaging/SepulkaClientSpringWebTestIT.java diff --git a/apps/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoIT.java b/app/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoIT.java similarity index 100% rename from apps/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoIT.java rename to app/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoIT.java diff --git a/apps/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisH2IT.java b/app/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisH2IT.java similarity index 100% rename from apps/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisH2IT.java rename to app/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisH2IT.java diff --git a/apps/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisPostgresIT.java b/app/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisPostgresIT.java similarity index 100% rename from apps/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisPostgresIT.java rename to app/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisPostgresIT.java diff --git a/apps/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoSpringDataH2IT.java b/app/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoSpringDataH2IT.java similarity index 100% rename from apps/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoSpringDataH2IT.java rename to app/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoSpringDataH2IT.java diff --git a/apps/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoSpringDataPostgresIT.java b/app/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoSpringDataPostgresIT.java similarity index 100% rename from apps/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoSpringDataPostgresIT.java rename to app/sepuling-java/src/it/java/smecalculus/bezmen/storage/SepulkaDaoSpringDataPostgresIT.java diff --git a/apps/sepuling-java/src/it/resources/logback-test.xml b/app/sepuling-java/src/it/resources/logback-test.xml similarity index 100% rename from apps/sepuling-java/src/it/resources/logback-test.xml rename to app/sepuling-java/src/it/resources/logback-test.xml diff --git a/apps/sepuling-java/src/main/java/smecalculus/bezmen/construction/App.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/construction/App.java similarity index 100% rename from apps/sepuling-java/src/main/java/smecalculus/bezmen/construction/App.java rename to app/sepuling-java/src/main/java/smecalculus/bezmen/construction/App.java diff --git a/apps/sepuling-java/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java similarity index 100% rename from apps/sepuling-java/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java rename to app/sepuling-java/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java diff --git a/apps/sepuling-java/src/main/java/smecalculus/bezmen/messaging/SepulkaClientImpl.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/messaging/SepulkaClientImpl.java similarity index 100% rename from apps/sepuling-java/src/main/java/smecalculus/bezmen/messaging/SepulkaClientImpl.java rename to app/sepuling-java/src/main/java/smecalculus/bezmen/messaging/SepulkaClientImpl.java diff --git a/apps/sepuling-java/src/main/java/smecalculus/bezmen/messaging/springmvc/SepulkaController.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/messaging/springmvc/SepulkaController.java similarity index 100% rename from apps/sepuling-java/src/main/java/smecalculus/bezmen/messaging/springmvc/SepulkaController.java rename to app/sepuling-java/src/main/java/smecalculus/bezmen/messaging/springmvc/SepulkaController.java diff --git a/apps/sepuling-java/src/main/java/smecalculus/bezmen/storage/ContentionException.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/storage/ContentionException.java similarity index 100% rename from apps/sepuling-java/src/main/java/smecalculus/bezmen/storage/ContentionException.java rename to app/sepuling-java/src/main/java/smecalculus/bezmen/storage/ContentionException.java diff --git a/apps/sepuling-java/src/main/java/smecalculus/bezmen/storage/SepulkaDao.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/storage/SepulkaDao.java similarity index 100% rename from apps/sepuling-java/src/main/java/smecalculus/bezmen/storage/SepulkaDao.java rename to app/sepuling-java/src/main/java/smecalculus/bezmen/storage/SepulkaDao.java diff --git a/apps/sepuling-java/src/main/java/smecalculus/bezmen/storage/SepulkaDaoMyBatis.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/storage/SepulkaDaoMyBatis.java similarity index 100% rename from apps/sepuling-java/src/main/java/smecalculus/bezmen/storage/SepulkaDaoMyBatis.java rename to app/sepuling-java/src/main/java/smecalculus/bezmen/storage/SepulkaDaoMyBatis.java diff --git a/apps/sepuling-java/src/main/java/smecalculus/bezmen/storage/SepulkaDaoSpringData.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/storage/SepulkaDaoSpringData.java similarity index 100% rename from apps/sepuling-java/src/main/java/smecalculus/bezmen/storage/SepulkaDaoSpringData.java rename to app/sepuling-java/src/main/java/smecalculus/bezmen/storage/SepulkaDaoSpringData.java diff --git a/apps/sepuling-java/src/main/java/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.java similarity index 100% rename from apps/sepuling-java/src/main/java/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.java rename to app/sepuling-java/src/main/java/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.java diff --git a/apps/sepuling-java/src/main/java/smecalculus/bezmen/storage/springdata/SepulkaRepository.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/storage/springdata/SepulkaRepository.java similarity index 100% rename from apps/sepuling-java/src/main/java/smecalculus/bezmen/storage/springdata/SepulkaRepository.java rename to app/sepuling-java/src/main/java/smecalculus/bezmen/storage/springdata/SepulkaRepository.java diff --git a/apps/sepuling-java/src/main/resources/application.properties b/app/sepuling-java/src/main/resources/application.properties similarity index 100% rename from apps/sepuling-java/src/main/resources/application.properties rename to app/sepuling-java/src/main/resources/application.properties diff --git a/apps/sepuling-java/src/main/resources/reference.conf b/app/sepuling-java/src/main/resources/reference.conf similarity index 100% rename from apps/sepuling-java/src/main/resources/reference.conf rename to app/sepuling-java/src/main/resources/reference.conf diff --git a/apps/sepuling-kotlin/Dockerfile b/app/sepuling-kotlin/Dockerfile similarity index 100% rename from apps/sepuling-kotlin/Dockerfile rename to app/sepuling-kotlin/Dockerfile diff --git a/apps/sepuling-kotlin/pom.xml b/app/sepuling-kotlin/pom.xml similarity index 98% rename from apps/sepuling-kotlin/pom.xml rename to app/sepuling-kotlin/pom.xml index 8f9e04ae..6d9e6721 100644 --- a/apps/sepuling-kotlin/pom.xml +++ b/app/sepuling-kotlin/pom.xml @@ -6,7 +6,7 @@ smecalculus.bezmen - apps + app ${revision} diff --git a/apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/construction/SepulkaClientBeans.kt b/app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/construction/SepulkaClientBeans.kt similarity index 100% rename from apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/construction/SepulkaClientBeans.kt rename to app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/construction/SepulkaClientBeans.kt diff --git a/apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/construction/SepulkaDaoBeans.kt b/app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/construction/SepulkaDaoBeans.kt similarity index 100% rename from apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/construction/SepulkaDaoBeans.kt rename to app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/construction/SepulkaDaoBeans.kt diff --git a/apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/construction/StoragePropsBeans.kt b/app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/construction/StoragePropsBeans.kt similarity index 100% rename from apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/construction/StoragePropsBeans.kt rename to app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/construction/StoragePropsBeans.kt diff --git a/apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/messaging/SepulkaClientIT.kt b/app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/messaging/SepulkaClientIT.kt similarity index 100% rename from apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/messaging/SepulkaClientIT.kt rename to app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/messaging/SepulkaClientIT.kt diff --git a/apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/messaging/SepulkaClientSpringWebTestIT.kt b/app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/messaging/SepulkaClientSpringWebTestIT.kt similarity index 100% rename from apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/messaging/SepulkaClientSpringWebTestIT.kt rename to app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/messaging/SepulkaClientSpringWebTestIT.kt diff --git a/apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoIT.kt b/app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoIT.kt similarity index 100% rename from apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoIT.kt rename to app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoIT.kt diff --git a/apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoMyBatisH2IT.kt b/app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoMyBatisH2IT.kt similarity index 100% rename from apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoMyBatisH2IT.kt rename to app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoMyBatisH2IT.kt diff --git a/apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoMyBatisPostgresIT.kt b/app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoMyBatisPostgresIT.kt similarity index 100% rename from apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoMyBatisPostgresIT.kt rename to app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoMyBatisPostgresIT.kt diff --git a/apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoSpringDataH2IT.kt b/app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoSpringDataH2IT.kt similarity index 100% rename from apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoSpringDataH2IT.kt rename to app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoSpringDataH2IT.kt diff --git a/apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoSpringDataPostgresIT.kt b/app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoSpringDataPostgresIT.kt similarity index 100% rename from apps/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoSpringDataPostgresIT.kt rename to app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/storage/SepulkaDaoSpringDataPostgresIT.kt diff --git a/apps/sepuling-kotlin/src/it/resources/logback-test.xml b/app/sepuling-kotlin/src/it/resources/logback-test.xml similarity index 100% rename from apps/sepuling-kotlin/src/it/resources/logback-test.xml rename to app/sepuling-kotlin/src/it/resources/logback-test.xml diff --git a/apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/construction/App.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/construction/App.kt similarity index 100% rename from apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/construction/App.kt rename to app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/construction/App.kt diff --git a/apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/core/SepulkaServiceImpl.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/core/SepulkaServiceImpl.kt similarity index 100% rename from apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/core/SepulkaServiceImpl.kt rename to app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/core/SepulkaServiceImpl.kt diff --git a/apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/messaging/SepulkaClientImpl.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/messaging/SepulkaClientImpl.kt similarity index 100% rename from apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/messaging/SepulkaClientImpl.kt rename to app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/messaging/SepulkaClientImpl.kt diff --git a/apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/messaging/springmvc/SepulkaController.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/messaging/springmvc/SepulkaController.kt similarity index 100% rename from apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/messaging/springmvc/SepulkaController.kt rename to app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/messaging/springmvc/SepulkaController.kt diff --git a/apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/ContentionException.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/ContentionException.kt similarity index 100% rename from apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/ContentionException.kt rename to app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/ContentionException.kt diff --git a/apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/SepulkaDao.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/SepulkaDao.kt similarity index 100% rename from apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/SepulkaDao.kt rename to app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/SepulkaDao.kt diff --git a/apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/SepulkaDaoMyBatis.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/SepulkaDaoMyBatis.kt similarity index 100% rename from apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/SepulkaDaoMyBatis.kt rename to app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/SepulkaDaoMyBatis.kt diff --git a/apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/SepulkaDaoSpringData.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/SepulkaDaoSpringData.kt similarity index 100% rename from apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/SepulkaDaoSpringData.kt rename to app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/SepulkaDaoSpringData.kt diff --git a/apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.kt similarity index 100% rename from apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.kt rename to app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.kt diff --git a/apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/springdata/SepulkaRepository.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/springdata/SepulkaRepository.kt similarity index 100% rename from apps/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/springdata/SepulkaRepository.kt rename to app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/storage/springdata/SepulkaRepository.kt diff --git a/apps/sepuling-kotlin/src/main/resources/application.properties b/app/sepuling-kotlin/src/main/resources/application.properties similarity index 100% rename from apps/sepuling-kotlin/src/main/resources/application.properties rename to app/sepuling-kotlin/src/main/resources/application.properties diff --git a/apps/sepuling-kotlin/src/main/resources/reference.conf b/app/sepuling-kotlin/src/main/resources/reference.conf similarity index 100% rename from apps/sepuling-kotlin/src/main/resources/reference.conf rename to app/sepuling-kotlin/src/main/resources/reference.conf diff --git a/bakers/ansible/.ansible-lint b/baker/ansible/.ansible-lint similarity index 100% rename from bakers/ansible/.ansible-lint rename to baker/ansible/.ansible-lint diff --git a/bakers/ansible/.gitignore b/baker/ansible/.gitignore similarity index 100% rename from bakers/ansible/.gitignore rename to baker/ansible/.gitignore diff --git a/bakers/ansible/.yamllint.yaml b/baker/ansible/.yamllint.yaml similarity index 100% rename from bakers/ansible/.yamllint.yaml rename to baker/ansible/.yamllint.yaml diff --git a/bakers/ansible/ansible.cfg b/baker/ansible/ansible.cfg similarity index 100% rename from bakers/ansible/ansible.cfg rename to baker/ansible/ansible.cfg diff --git a/bakers/ansible/binaries.yaml b/baker/ansible/binaries.yaml similarity index 93% rename from bakers/ansible/binaries.yaml rename to baker/ansible/binaries.yaml index fc497d41..ce645e1e 100644 --- a/bakers/ansible/binaries.yaml +++ b/baker/ansible/binaries.yaml @@ -7,11 +7,11 @@ ansible.builtin.command: cmd: git hash-object --stdin stdin: | - {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs') }} - {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=apps/' ~ app) }} + {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=lib') }} + {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=app/' ~ app) }} register: image_cid changed_when: false - loop: "{{ solution.apps.values()|flatten|map(attribute='binary') }}" + loop: "{{ product.apps.values()|flatten|map(attribute='binary') }}" loop_control: loop_var: app tags: [always] @@ -33,7 +33,7 @@ changed_when: - image_status.rc != 0 failed_when: false - loop: "{{ solution.apps.values()|flatten }}" + loop: "{{ product.apps.values()|flatten }}" loop_control: loop_var: app label: "{{ app.binary }}" diff --git a/bakers/ansible/images.yaml b/baker/ansible/images.yaml similarity index 79% rename from bakers/ansible/images.yaml rename to baker/ansible/images.yaml index e0ad691a..a9206fc8 100644 --- a/bakers/ansible/images.yaml +++ b/baker/ansible/images.yaml @@ -12,11 +12,11 @@ ansible.builtin.command: cmd: >- docker {{ docker_entity }} inspect - {{ image_ns }}/{{ solution.databases[storage].image }}:{{ solution.databases[storage].cid }} + {{ image_ns }}/{{ product.databases[storage].image }}:{{ product.databases[storage].cid }} register: image_status changed_when: image_status.rc != 0 failed_when: false - loop: "{{ solution.schemas.keys() }}" + loop: "{{ product.schemas.keys() }}" loop_control: loop_var: storage - name: Status commands @@ -27,10 +27,10 @@ ansible.builtin.include_role: name: image vars: - image_tag: "{{ solution.databases[storage].cid }}" - image_name: "{{ image_ns }}/{{ solution.databases[storage].image }}" - image_home: "{{ project.dir }}/dbs/{{ storage }}" - image_key: "{{ solution.databases[storage].image }}" + image_tag: "{{ product.databases[storage].cid }}" + image_name: "{{ image_ns }}/{{ product.databases[storage].image }}" + image_home: "{{ project.dir }}/db/{{ storage }}" + image_key: "{{ product.databases[storage].image }}" image_push: "{{ image_repo != 'local' }}" loop: "{{ image_status.results|select('changed')|map(attribute='storage') }}" loop_control: @@ -46,7 +46,7 @@ mvn --no-snapshot-updates --batch-mode - --projects tools + --projects tool clean antrun:run@coverage chdir: "{{ project.dir }}" @@ -59,7 +59,7 @@ vars: image_tag: "{{ image_tags[app.binary] }}" image_name: "{{ image_ns }}/{{ app.image }}" - image_home: "{{ project.dir }}/apps/{{ app.binary }}" + image_home: "{{ project.dir }}/app/{{ app.binary }}" image_context: target/image-context image_key: "{{ app.image }}" image_push: "{{ image_repo != 'local' }}" diff --git a/bakers/ansible/inventory/aliases.yaml b/baker/ansible/inventory/aliases.yaml similarity index 91% rename from bakers/ansible/inventory/aliases.yaml rename to baker/ansible/inventory/aliases.yaml index 176dbd22..5230392f 100644 --- a/bakers/ansible/inventory/aliases.yaml +++ b/baker/ansible/inventory/aliases.yaml @@ -6,8 +6,8 @@ sources: github: stack: hosts: - solution: gear: + product: all: hosts: db: diff --git a/bakers/ansible/inventory/group_vars/all/envs.yaml b/baker/ansible/inventory/group_vars/all/envs.yaml similarity index 100% rename from bakers/ansible/inventory/group_vars/all/envs.yaml rename to baker/ansible/inventory/group_vars/all/envs.yaml diff --git a/bakers/ansible/inventory/group_vars/all/stacks.yaml b/baker/ansible/inventory/group_vars/all/stacks.yaml similarity index 93% rename from bakers/ansible/inventory/group_vars/all/stacks.yaml rename to baker/ansible/inventory/group_vars/all/stacks.yaml index 6e52263e..4bd93a38 100644 --- a/bakers/ansible/inventory/group_vars/all/stacks.yaml +++ b/baker/ansible/inventory/group_vars/all/stacks.yaml @@ -2,9 +2,9 @@ gear: image: stack/gear -solution: +product: name: "{{ project.name }}" - image: stack/solution + image: stack/product config: file_name: "application.{{ config_exts[ops[opsenv].config.mapping_mode] }}" mapping_mode: "{{ ops[opsenv].config.mapping_mode }}" @@ -20,7 +20,7 @@ solution: databases: postgres: name: "{{ project.name }}" - cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=dbs/postgres')[:7] }}" + cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=db/postgres')[:7] }}" image: database/postgres schemas: postgres: diff --git a/bakers/ansible/inventory/group_vars/all/usages.yaml b/baker/ansible/inventory/group_vars/all/usages.yaml similarity index 94% rename from bakers/ansible/inventory/group_vars/all/usages.yaml rename to baker/ansible/inventory/group_vars/all/usages.yaml index 97de0ebc..cd36aacd 100644 --- a/bakers/ansible/inventory/group_vars/all/usages.yaml +++ b/baker/ansible/inventory/group_vars/all/usages.yaml @@ -1,6 +1,6 @@ --- purpose: toy -usage: +usages: toy: storage: postgres apps: diff --git a/bakers/ansible/inventory/group_vars/all/vars.yaml b/baker/ansible/inventory/group_vars/all/vars.yaml similarity index 100% rename from bakers/ansible/inventory/group_vars/all/vars.yaml rename to baker/ansible/inventory/group_vars/all/vars.yaml diff --git a/bakers/ansible/roles/image/defaults/main.yaml b/baker/ansible/roles/image/defaults/main.yaml similarity index 100% rename from bakers/ansible/roles/image/defaults/main.yaml rename to baker/ansible/roles/image/defaults/main.yaml diff --git a/bakers/ansible/roles/image/tasks/main.yaml b/baker/ansible/roles/image/tasks/main.yaml similarity index 100% rename from bakers/ansible/roles/image/tasks/main.yaml rename to baker/ansible/roles/image/tasks/main.yaml diff --git a/bakers/ansible/sources.yaml b/baker/ansible/sources.yaml similarity index 100% rename from bakers/ansible/sources.yaml rename to baker/ansible/sources.yaml diff --git a/bakers/ansible/stacks.yaml b/baker/ansible/stacks.yaml similarity index 75% rename from bakers/ansible/stacks.yaml rename to baker/ansible/stacks.yaml index f2c31e15..90ce5a84 100644 --- a/bakers/ansible/stacks.yaml +++ b/baker/ansible/stacks.yaml @@ -3,11 +3,11 @@ tags: [images, deps] - name: Capturing - hosts: solution + hosts: product run_once: true tasks: - ansible.builtin.import_tasks: # noqa: name[missing] - file: tasks/solution/status.yaml + file: tasks/product/status.yaml tags: [always] - name: Capturing @@ -22,27 +22,27 @@ hosts: stack run_once: true vars: - stack_dir: "{{ project.dir }}/stack/solution" + stack_dir: "{{ project.dir }}/stack/product" tasks: - ansible.builtin.import_tasks: # noqa: name[missing] - file: tasks/solution/build.yaml + file: tasks/product/build.yaml tags: [build] when: >- - hostvars.solution.stack_status is changed or + hostvars.product.stack_status is changed or hostvars.gear.stack_status is changed - ansible.builtin.import_tasks: # noqa: name[missing] - file: tasks/solution/test.yaml + file: tasks/product/test.yaml tags: [test] when: >- - hostvars.solution.stack_status is changed or + hostvars.product.stack_status is changed or hostvars.gear.stack_status is changed - name: Packaging - hosts: solution + hosts: product run_once: true tasks: - ansible.builtin.import_tasks: # noqa: name[missing] - file: tasks/solution/package.yaml + file: tasks/product/package.yaml tags: [package] when: stack_status is changed diff --git a/bakers/ansible/tasks/gear/build.yaml b/baker/ansible/tasks/gear/build.yaml similarity index 100% rename from bakers/ansible/tasks/gear/build.yaml rename to baker/ansible/tasks/gear/build.yaml diff --git a/bakers/ansible/tasks/gear/package.yaml b/baker/ansible/tasks/gear/package.yaml similarity index 100% rename from bakers/ansible/tasks/gear/package.yaml rename to baker/ansible/tasks/gear/package.yaml diff --git a/bakers/ansible/tasks/gear/status.yaml b/baker/ansible/tasks/gear/status.yaml similarity index 92% rename from bakers/ansible/tasks/gear/status.yaml rename to baker/ansible/tasks/gear/status.yaml index cf50120c..da51e6c3 100644 --- a/bakers/ansible/tasks/gear/status.yaml +++ b/baker/ansible/tasks/gear/status.yaml @@ -3,10 +3,10 @@ ansible.builtin.command: cmd: git hash-object --stdin stdin: | - {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=tools') }} - {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=tests') }} - {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=bakers') }} - {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=stack/gear/{{ devenv }}') }} + {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=tool') }} + {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=test') }} + {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=baker') }} + {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=stack/gear/' ~ devenv) }} register: stack_cid changed_when: false diff --git a/bakers/ansible/tasks/solution/build.yaml b/baker/ansible/tasks/product/build.yaml similarity index 85% rename from bakers/ansible/tasks/solution/build.yaml rename to baker/ansible/tasks/product/build.yaml index e30862db..55302072 100644 --- a/bakers/ansible/tasks/solution/build.yaml +++ b/baker/ansible/tasks/product/build.yaml @@ -12,8 +12,8 @@ - name: Build conf ansible.builtin.template: - src: "{{ stack_dir }}/{{ solution.config.mapping_mode }}.j2" - dest: "{{ stack_dir }}/target/image-context/application.{{ config_exts[solution.config.mapping_mode] }}" + src: "{{ stack_dir }}/{{ product.config.mapping_mode }}.j2" + dest: "{{ stack_dir }}/target/image-context/application.{{ config_exts[product.config.mapping_mode] }}" lstrip_blocks: yes trim_blocks: yes mode: "644" diff --git a/baker/ansible/tasks/product/package.yaml b/baker/ansible/tasks/product/package.yaml new file mode 100644 index 00000000..f99bee31 --- /dev/null +++ b/baker/ansible/tasks/product/package.yaml @@ -0,0 +1,10 @@ +--- +- ansible.builtin.import_role: # noqa: name[missing] + name: image + vars: + image_tag: "{{ product_tag }}" + image_name: "{{ image_ns }}/{{ product.image }}" + image_home: "{{ project.dir }}/stack/product" + image_context: target/image-context + image_key: "{{ product.image }}:{{ purpose }}-{{ opsenv }}" + image_push: "{{ image_repo != 'local' }}" diff --git a/bakers/ansible/tasks/solution/status.yaml b/baker/ansible/tasks/product/status.yaml similarity index 75% rename from bakers/ansible/tasks/solution/status.yaml rename to baker/ansible/tasks/product/status.yaml index f735d81e..40450cd5 100644 --- a/bakers/ansible/tasks/solution/status.yaml +++ b/baker/ansible/tasks/product/status.yaml @@ -3,20 +3,20 @@ ansible.builtin.command: cmd: git hash-object --stdin stdin: | - {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=dbs') }} - {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs') }} - {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=apps') }} - {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=stack/solution') }} + {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=db') }} + {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=lib') }} + {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=app') }} + {{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=stack/product') }} register: stack_cid changed_when: false - name: Declare tag ansible.builtin.set_fact: - solution_tag: "{{ purpose }}-{{ opsenv }}-{{ stack_cid.stdout[:7] }}" + product_tag: "{{ purpose }}-{{ opsenv }}-{{ stack_cid.stdout[:7] }}" - name: Capture status ansible.builtin.command: - cmd: docker {{ docker_entity }} inspect {{ image_ns }}/{{ solution.image }}:{{ solution_tag }} + cmd: docker {{ docker_entity }} inspect {{ image_ns }}/{{ product.image }}:{{ product_tag }} register: stack_status changed_when: - stack_status.rc != 0 diff --git a/bakers/ansible/tasks/solution/test.yaml b/baker/ansible/tasks/product/test.yaml similarity index 97% rename from bakers/ansible/tasks/solution/test.yaml rename to baker/ansible/tasks/product/test.yaml index 0e698e7d..cd163011 100644 --- a/bakers/ansible/tasks/solution/test.yaml +++ b/baker/ansible/tasks/product/test.yaml @@ -27,7 +27,7 @@ --no-snapshot-updates --batch-mode --threads 2 - --projects tests/e2e + --projects test/e2e --activate-profiles {{ purpose }} --also-make clean diff --git a/bakers/ansible/tasks/solution/package.yaml b/bakers/ansible/tasks/solution/package.yaml deleted file mode 100644 index 9ba8afbe..00000000 --- a/bakers/ansible/tasks/solution/package.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- ansible.builtin.import_role: # noqa: name[missing] - name: image - vars: - image_tag: "{{ solution_tag }}" - image_name: "{{ image_ns }}/{{ solution.image }}" - image_home: "{{ project.dir }}/stack/solution" - image_context: target/image-context - image_key: "{{ solution.image }}:{{ purpose }}-{{ opsenv }}" - image_push: "{{ image_repo != 'local' }}" diff --git a/dbs/postgres/Dockerfile b/db/postgres/Dockerfile similarity index 100% rename from dbs/postgres/Dockerfile rename to db/postgres/Dockerfile diff --git a/dbs/postgres/dba/changelog.yaml b/db/postgres/dba/changelog.yaml similarity index 100% rename from dbs/postgres/dba/changelog.yaml rename to db/postgres/dba/changelog.yaml diff --git a/dbs/postgres/dba/database.sql b/db/postgres/dba/database.sql similarity index 100% rename from dbs/postgres/dba/database.sql rename to db/postgres/dba/database.sql diff --git a/dbs/postgres/dba/owner.sql b/db/postgres/dba/owner.sql similarity index 100% rename from dbs/postgres/dba/owner.sql rename to db/postgres/dba/owner.sql diff --git a/dbs/postgres/owner/changelog.yaml b/db/postgres/owner/changelog.yaml similarity index 100% rename from dbs/postgres/owner/changelog.yaml rename to db/postgres/owner/changelog.yaml diff --git a/dbs/postgres/owner/sepulkarium/schema.sql b/db/postgres/owner/sepulkarium/schema.sql similarity index 100% rename from dbs/postgres/owner/sepulkarium/schema.sql rename to db/postgres/owner/sepulkarium/schema.sql diff --git a/dbs/postgres/owner/sepulkarium/tables.sql b/db/postgres/owner/sepulkarium/tables.sql similarity index 100% rename from dbs/postgres/owner/sepulkarium/tables.sql rename to db/postgres/owner/sepulkarium/tables.sql diff --git a/docs/gear.adoc b/doc/gear.adoc similarity index 65% rename from docs/gear.adoc rename to doc/gear.adoc index 7742d725..21ba54ac 100644 --- a/docs/gear.adoc +++ b/doc/gear.adoc @@ -8,10 +8,10 @@ Семантика обвязки подразумевает набор предопределенных абстракций, артефакты которых последовательно конструируются в ходе сборки. Перед началом конструирования выполняются обязательные проверки. Примеры абстракций: исходники (sources), бинарники (binaries), образы (images), стеки (stacks) и другие. Контентная адресация (aka идентификация по содержимому):: -Контентная адресация (content addressability) делает конструирование артефактов *идемпотентным*. Для директорий с исходным кодом вычисляются их контентные идентификаторы (CID's). Затем вычисляются корневые идентификаторы решения и инструментария. Таким образом формируется 2 небольших дерева Меркла, хеши которых подставляются в качестве тегов/классификаторов артефактов соответствующих абстракций. Артефакт реконструируется, только когда его контентный идентификатор изменился. +Контентная адресация (content addressability) делает конструирование артефактов *идемпотентным*. Для директорий с исходным кодом вычисляются их контентные идентификаторы (CID's). Затем вычисляются корневые идентификаторы продукта и снаряжения. Таким образом формируется 2 небольших дерева Меркла, хеши которых подставляются в качестве тегов/классификаторов артефактов соответствующих абстракций. Артефакт реконструируется, только когда его контентный идентификатор изменился. Множественность окружений:: -Инструментарий используется разработчиками в различных окружениях (envs). Ключевые окружения явно выделяются и проверяются в рамках непрерывной интеграции, устаревшие - снимаются с поддержки. +Снаряжение используется разработчиками в различных окружениях. Ключевые окружения явно выделяются и проверяются в рамках непрерывной интеграции, устаревшие - снимаются с поддержки. **** == Консольный интерфейс (CLI) diff --git a/docs/pipeline.adoc b/doc/pipeline.adoc similarity index 84% rename from docs/pipeline.adoc rename to doc/pipeline.adoc index d02cfa05..3f3cef84 100644 --- a/docs/pipeline.adoc +++ b/doc/pipeline.adoc @@ -10,11 +10,11 @@ == Непрерывная интеграция (CI) -Артефакты собираем во всех окружениях, которые поддерживаются для разработчиков. Решение проверяем во всех окружениях, которые поддерживаются для клиентов. +Артефакты собираем во всех окружениях, которые поддерживаются для разработчиков. Продукт проверяем во всех окружениях, которые поддерживаются для клиентов. === В пределах разумного (sanity) -Запускаем анализ зависимостей, линтинг кодовой базы, статический анализ, компиляцию, прогоняем модульные тесты и собираем бинарники. +Запускаем анализ зависимостей, линтинг исходников, статический анализ, компиляцию, прогоняем модульные тесты и собираем бинарники. === Убедительная (convincing) diff --git a/docs/solution.adoc b/doc/product.adoc similarity index 90% rename from docs/solution.adoc rename to doc/product.adoc index d94cbe7e..beff1a73 100644 --- a/docs/solution.adoc +++ b/doc/product.adoc @@ -1,11 +1,11 @@ -= Решение (Solution) += Продукт (Product) Система, реализуемая для клиентов. .Ключевые принципы **** Множественность окружений и назначений:: -Решение используется клиентами в различных окружениях (envs) и в различных сценариях использования (usecases). Ключевые окружения/сценарии явно выделяются и проверяются в рамках непрерывной интеграции, устаревшие - снимаются с поддержки. +Продукт используется клиентами с разными целями (usages) и в различных средах (envs). Ключевые назначения/среды явно выделяются и проверяются в рамках непрерывной интеграции, устаревшие - снимаются с поддержки. Тесты! Тесты! Тесты!:: Тестирование - один из важных или даже самый важный аспект разработки! При тестировании проверяется поведение целевого объекта в различных ситуациях. В зависимости от подхода к подготовке зависимостей целевого объекта тесты можно подразделить на 3 категории. @@ -93,7 +93,7 @@ NOTE: Шаблон проектирования `Object-Relational Mapping`. == Ядро (Core) -image::solution/core.png[] +image::product/core.png[] === Модели и мапперы (models & mappers) diff --git a/docs/solution/core.png b/doc/product/core.png similarity index 100% rename from docs/solution/core.png rename to doc/product/core.png diff --git a/docs/solution/core.puml b/doc/product/core.puml similarity index 100% rename from docs/solution/core.puml rename to doc/product/core.puml diff --git a/libs/abstraction-client/pom.xml b/lib/abstraction-client/pom.xml similarity index 97% rename from libs/abstraction-client/pom.xml rename to lib/abstraction-client/pom.xml index 9055badf..ac4acd11 100644 --- a/libs/abstraction-client/pom.xml +++ b/lib/abstraction-client/pom.xml @@ -6,7 +6,7 @@ smecalculus.bezmen - libs + lib ${revision} diff --git a/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/BezmenClient.java b/lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/BezmenClient.java similarity index 100% rename from libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/BezmenClient.java rename to lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/BezmenClient.java diff --git a/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulingClient.java b/lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulingClient.java similarity index 100% rename from libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulingClient.java rename to lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulingClient.java diff --git a/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaClient.java b/lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaClient.java similarity index 100% rename from libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaClient.java rename to lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaClient.java diff --git a/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageEm.java b/lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageEm.java similarity index 100% rename from libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageEm.java rename to lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageEm.java diff --git a/libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageEmEg.java b/lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageEmEg.java similarity index 100% rename from libs/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageEmEg.java rename to lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageEmEg.java diff --git a/libs/abstraction/pom.xml b/lib/abstraction/pom.xml similarity index 95% rename from libs/abstraction/pom.xml rename to lib/abstraction/pom.xml index 04f6acaf..e972caaf 100644 --- a/libs/abstraction/pom.xml +++ b/lib/abstraction/pom.xml @@ -6,7 +6,7 @@ smecalculus.bezmen - libs + lib ${revision} diff --git a/libs/abstraction/src/main/java/smecalculus/bezmen/configuration/PropsKeeper.java b/lib/abstraction/src/main/java/smecalculus/bezmen/configuration/PropsKeeper.java similarity index 100% rename from libs/abstraction/src/main/java/smecalculus/bezmen/configuration/PropsKeeper.java rename to lib/abstraction/src/main/java/smecalculus/bezmen/configuration/PropsKeeper.java diff --git a/libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaConverter.java b/lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaConverter.java similarity index 100% rename from libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaConverter.java rename to lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaConverter.java diff --git a/libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaMessageDm.java b/lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaMessageDm.java similarity index 100% rename from libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaMessageDm.java rename to lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaMessageDm.java diff --git a/libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaMessageDmEg.java b/lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaMessageDmEg.java similarity index 100% rename from libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaMessageDmEg.java rename to lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaMessageDmEg.java diff --git a/libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaService.java b/lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaService.java similarity index 100% rename from libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaService.java rename to lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaService.java diff --git a/libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaStateDm.java b/lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaStateDm.java similarity index 100% rename from libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaStateDm.java rename to lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaStateDm.java diff --git a/libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaStateDmEg.java b/lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaStateDmEg.java similarity index 100% rename from libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaStateDmEg.java rename to lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaStateDmEg.java diff --git a/libs/abstraction/src/main/java/smecalculus/bezmen/validation/EdgeValidator.java b/lib/abstraction/src/main/java/smecalculus/bezmen/validation/EdgeValidator.java similarity index 100% rename from libs/abstraction/src/main/java/smecalculus/bezmen/validation/EdgeValidator.java rename to lib/abstraction/src/main/java/smecalculus/bezmen/validation/EdgeValidator.java diff --git a/libs/essentials/README.adoc b/lib/essentials/README.adoc similarity index 100% rename from libs/essentials/README.adoc rename to lib/essentials/README.adoc diff --git a/libs/essentials/pom.xml b/lib/essentials/pom.xml similarity index 98% rename from libs/essentials/pom.xml rename to lib/essentials/pom.xml index bd7c66f9..cc19bd93 100644 --- a/libs/essentials/pom.xml +++ b/lib/essentials/pom.xml @@ -6,7 +6,7 @@ smecalculus.bezmen - libs + lib ${revision} diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/configuration/ConfigMappingMode.java b/lib/essentials/src/main/java/smecalculus/bezmen/configuration/ConfigMappingMode.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/configuration/ConfigMappingMode.java rename to lib/essentials/src/main/java/smecalculus/bezmen/configuration/ConfigMappingMode.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/configuration/ConfigProtocolMode.java b/lib/essentials/src/main/java/smecalculus/bezmen/configuration/ConfigProtocolMode.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/configuration/ConfigProtocolMode.java rename to lib/essentials/src/main/java/smecalculus/bezmen/configuration/ConfigProtocolMode.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/configuration/PropsKeeperLightbendConfig.java b/lib/essentials/src/main/java/smecalculus/bezmen/configuration/PropsKeeperLightbendConfig.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/configuration/PropsKeeperLightbendConfig.java rename to lib/essentials/src/main/java/smecalculus/bezmen/configuration/PropsKeeperLightbendConfig.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/configuration/PropsKeeperSpringConfig.java b/lib/essentials/src/main/java/smecalculus/bezmen/configuration/PropsKeeperSpringConfig.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/configuration/PropsKeeperSpringConfig.java rename to lib/essentials/src/main/java/smecalculus/bezmen/configuration/PropsKeeperSpringConfig.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/configuration/ValidationDm.java b/lib/essentials/src/main/java/smecalculus/bezmen/configuration/ValidationDm.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/configuration/ValidationDm.java rename to lib/essentials/src/main/java/smecalculus/bezmen/configuration/ValidationDm.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/configuration/ValidationEm.java b/lib/essentials/src/main/java/smecalculus/bezmen/configuration/ValidationEm.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/configuration/ValidationEm.java rename to lib/essentials/src/main/java/smecalculus/bezmen/configuration/ValidationEm.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnConfigMappingMode.java b/lib/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnConfigMappingMode.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnConfigMappingMode.java rename to lib/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnConfigMappingMode.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnConfigProtocolMode.java b/lib/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnConfigProtocolMode.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnConfigProtocolMode.java rename to lib/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnConfigProtocolMode.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnValidationMode.java b/lib/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnValidationMode.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnValidationMode.java rename to lib/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnValidationMode.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/construction/ConfigBeans.java b/lib/essentials/src/main/java/smecalculus/bezmen/construction/ConfigBeans.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/construction/ConfigBeans.java rename to lib/essentials/src/main/java/smecalculus/bezmen/construction/ConfigBeans.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/construction/ConfigMappingModeCondition.java b/lib/essentials/src/main/java/smecalculus/bezmen/construction/ConfigMappingModeCondition.java similarity index 91% rename from libs/essentials/src/main/java/smecalculus/bezmen/construction/ConfigMappingModeCondition.java rename to lib/essentials/src/main/java/smecalculus/bezmen/construction/ConfigMappingModeCondition.java index fe78ada3..794aa430 100644 --- a/libs/essentials/src/main/java/smecalculus/bezmen/construction/ConfigMappingModeCondition.java +++ b/lib/essentials/src/main/java/smecalculus/bezmen/construction/ConfigMappingModeCondition.java @@ -16,7 +16,7 @@ public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) var attributes = metadata.getAnnotationAttributes(ConditionalOnConfigMappingMode.class.getName()); var expectedMode = (ConfigMappingMode) requireNonNull(attributes).get("value"); var actualMode = context.getEnvironment() - .getProperty("solution.config.mapping.mode", ConfigMappingMode.LIGHTBEND_CONFIG.name()); + .getProperty("product.config.mapping.mode", ConfigMappingMode.LIGHTBEND_CONFIG.name()); return expectedMode.name().equalsIgnoreCase(actualMode); } diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/construction/ConfigProtocolModeCondition.java b/lib/essentials/src/main/java/smecalculus/bezmen/construction/ConfigProtocolModeCondition.java similarity index 91% rename from libs/essentials/src/main/java/smecalculus/bezmen/construction/ConfigProtocolModeCondition.java rename to lib/essentials/src/main/java/smecalculus/bezmen/construction/ConfigProtocolModeCondition.java index 54a9c1e3..14dcc407 100644 --- a/libs/essentials/src/main/java/smecalculus/bezmen/construction/ConfigProtocolModeCondition.java +++ b/lib/essentials/src/main/java/smecalculus/bezmen/construction/ConfigProtocolModeCondition.java @@ -16,7 +16,7 @@ public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) var attributes = metadata.getAnnotationAttributes(ConditionalOnConfigProtocolMode.class.getName()); var expectedMode = (ConfigProtocolMode) requireNonNull(attributes).get("value"); var actualMode = context.getEnvironment() - .getProperty("solution.config.protocol.mode", ConfigProtocolMode.FILE_SYSTEM.name()); + .getProperty("product.config.protocol.mode", ConfigProtocolMode.FILE_SYSTEM.name()); return expectedMode.name().equalsIgnoreCase(actualMode); } diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/construction/ValidationBeans.java b/lib/essentials/src/main/java/smecalculus/bezmen/construction/ValidationBeans.java similarity index 94% rename from libs/essentials/src/main/java/smecalculus/bezmen/construction/ValidationBeans.java rename to lib/essentials/src/main/java/smecalculus/bezmen/construction/ValidationBeans.java index 0e9fac79..a1006fa0 100644 --- a/libs/essentials/src/main/java/smecalculus/bezmen/construction/ValidationBeans.java +++ b/lib/essentials/src/main/java/smecalculus/bezmen/construction/ValidationBeans.java @@ -30,7 +30,7 @@ ValidationPropsMapper validationPropsMapper() { @Bean ValidationDm.ValidationProps validationProps(PropsKeeper keeper, ValidationPropsMapper mapper) { - var validationProps = keeper.read("solution.validation", ValidationEm.ValidationProps.class); + var validationProps = keeper.read("product.validation", ValidationEm.ValidationProps.class); requireNonNull(validationProps.getMode(), "validation mode must not be null"); LOG.info("Read {}", validationProps); return mapper.toDomain(validationProps); diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/construction/ValidationModeCondition.java b/lib/essentials/src/main/java/smecalculus/bezmen/construction/ValidationModeCondition.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/construction/ValidationModeCondition.java rename to lib/essentials/src/main/java/smecalculus/bezmen/construction/ValidationModeCondition.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/validation/EdgeValidatorHibernateValidator.java b/lib/essentials/src/main/java/smecalculus/bezmen/validation/EdgeValidatorHibernateValidator.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/validation/EdgeValidatorHibernateValidator.java rename to lib/essentials/src/main/java/smecalculus/bezmen/validation/EdgeValidatorHibernateValidator.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/validation/ValidationPropsMapper.java b/lib/essentials/src/main/java/smecalculus/bezmen/validation/ValidationPropsMapper.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/validation/ValidationPropsMapper.java rename to lib/essentials/src/main/java/smecalculus/bezmen/validation/ValidationPropsMapper.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/validation/ValueOfEnum.java b/lib/essentials/src/main/java/smecalculus/bezmen/validation/ValueOfEnum.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/validation/ValueOfEnum.java rename to lib/essentials/src/main/java/smecalculus/bezmen/validation/ValueOfEnum.java diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/validation/ValueOfEnumValidator.java b/lib/essentials/src/main/java/smecalculus/bezmen/validation/ValueOfEnumValidator.java similarity index 100% rename from libs/essentials/src/main/java/smecalculus/bezmen/validation/ValueOfEnumValidator.java rename to lib/essentials/src/main/java/smecalculus/bezmen/validation/ValueOfEnumValidator.java diff --git a/libs/essentials/src/main/resources/reference.conf b/lib/essentials/src/main/resources/reference.conf similarity index 82% rename from libs/essentials/src/main/resources/reference.conf rename to lib/essentials/src/main/resources/reference.conf index 96b31c0b..dbc3bc1c 100644 --- a/libs/essentials/src/main/resources/reference.conf +++ b/lib/essentials/src/main/resources/reference.conf @@ -1,4 +1,4 @@ -solution { +product { validation { mode = hibernate_validator } diff --git a/lib/essentials/src/main/resources/validation.properties b/lib/essentials/src/main/resources/validation.properties new file mode 100644 index 00000000..9e3ff0c1 --- /dev/null +++ b/lib/essentials/src/main/resources/validation.properties @@ -0,0 +1 @@ +product.validation.mode=hibernate_validator diff --git a/libs/lombok.config b/lib/lombok.config similarity index 100% rename from libs/lombok.config rename to lib/lombok.config diff --git a/libs/messaging-client/pom.xml b/lib/messaging-client/pom.xml similarity index 98% rename from libs/messaging-client/pom.xml rename to lib/messaging-client/pom.xml index 86add4e4..5a86746e 100644 --- a/libs/messaging-client/pom.xml +++ b/lib/messaging-client/pom.xml @@ -6,7 +6,7 @@ smecalculus.bezmen - libs + lib ${revision} diff --git a/libs/messaging-client/src/main/java/smecalculus/bezmen/messaging/BezmenClientJavaHttp.java b/lib/messaging-client/src/main/java/smecalculus/bezmen/messaging/BezmenClientJavaHttp.java similarity index 100% rename from libs/messaging-client/src/main/java/smecalculus/bezmen/messaging/BezmenClientJavaHttp.java rename to lib/messaging-client/src/main/java/smecalculus/bezmen/messaging/BezmenClientJavaHttp.java diff --git a/libs/messaging/pom.xml b/lib/messaging/pom.xml similarity index 98% rename from libs/messaging/pom.xml rename to lib/messaging/pom.xml index 9d10631e..096b1ae3 100644 --- a/libs/messaging/pom.xml +++ b/lib/messaging/pom.xml @@ -6,7 +6,7 @@ smecalculus.bezmen - libs + lib ${revision} diff --git a/libs/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansIT.java b/lib/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansIT.java similarity index 100% rename from libs/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansIT.java rename to lib/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansIT.java diff --git a/libs/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansLightbendConfigIT.java b/lib/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansLightbendConfigIT.java similarity index 68% rename from libs/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansLightbendConfigIT.java rename to lib/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansLightbendConfigIT.java index 57a8df47..f3381c0f 100644 --- a/libs/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansLightbendConfigIT.java +++ b/lib/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansLightbendConfigIT.java @@ -2,5 +2,5 @@ import org.springframework.test.context.TestPropertySource; -@TestPropertySource(properties = {"solution.config.mapping.mode=lightbend_config"}) +@TestPropertySource(properties = {"product.config.mapping.mode=lightbend_config"}) class MessagingConfigBeansLightbendConfigIT extends MessagingConfigBeansIT {} diff --git a/libs/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansSpringConfigIT.java b/lib/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansSpringConfigIT.java similarity index 68% rename from libs/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansSpringConfigIT.java rename to lib/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansSpringConfigIT.java index 59667f7f..b498dd4d 100644 --- a/libs/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansSpringConfigIT.java +++ b/lib/messaging/src/it/java/smecalculus/bezmen/construction/MessagingConfigBeansSpringConfigIT.java @@ -2,5 +2,5 @@ import org.springframework.test.context.TestPropertySource; -@TestPropertySource(properties = {"solution.config.mapping.mode=spring_config"}) +@TestPropertySource(properties = {"product.config.mapping.mode=spring_config"}) class MessagingConfigBeansSpringConfigIT extends MessagingConfigBeansIT {} diff --git a/libs/messaging/src/it/resources/logback-test.xml b/lib/messaging/src/it/resources/logback-test.xml similarity index 100% rename from libs/messaging/src/it/resources/logback-test.xml rename to lib/messaging/src/it/resources/logback-test.xml diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingDm.java b/lib/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingDm.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingDm.java rename to lib/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingDm.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingDmEg.java b/lib/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingDmEg.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingDmEg.java rename to lib/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingDmEg.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingEm.java b/lib/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingEm.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingEm.java rename to lib/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingEm.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingEmEg.java b/lib/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingEmEg.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingEmEg.java rename to lib/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingEmEg.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingPropsMapper.java b/lib/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingPropsMapper.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingPropsMapper.java rename to lib/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingPropsMapper.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/construction/ConditionalOnMessagingMappingModes.java b/lib/messaging/src/main/java/smecalculus/bezmen/construction/ConditionalOnMessagingMappingModes.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/construction/ConditionalOnMessagingMappingModes.java rename to lib/messaging/src/main/java/smecalculus/bezmen/construction/ConditionalOnMessagingMappingModes.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/construction/ConditionalOnMessagingProtocolModes.java b/lib/messaging/src/main/java/smecalculus/bezmen/construction/ConditionalOnMessagingProtocolModes.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/construction/ConditionalOnMessagingProtocolModes.java rename to lib/messaging/src/main/java/smecalculus/bezmen/construction/ConditionalOnMessagingProtocolModes.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/construction/MappingSpringJmxManagementBeans.java b/lib/messaging/src/main/java/smecalculus/bezmen/construction/MappingSpringJmxManagementBeans.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/construction/MappingSpringJmxManagementBeans.java rename to lib/messaging/src/main/java/smecalculus/bezmen/construction/MappingSpringJmxManagementBeans.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/construction/MappingSpringWebManagementBeans.java b/lib/messaging/src/main/java/smecalculus/bezmen/construction/MappingSpringWebManagementBeans.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/construction/MappingSpringWebManagementBeans.java rename to lib/messaging/src/main/java/smecalculus/bezmen/construction/MappingSpringWebManagementBeans.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/construction/MappingSpringWebMvcBeans.java b/lib/messaging/src/main/java/smecalculus/bezmen/construction/MappingSpringWebMvcBeans.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/construction/MappingSpringWebMvcBeans.java rename to lib/messaging/src/main/java/smecalculus/bezmen/construction/MappingSpringWebMvcBeans.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingBeans.java b/lib/messaging/src/main/java/smecalculus/bezmen/construction/MessagingBeans.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingBeans.java rename to lib/messaging/src/main/java/smecalculus/bezmen/construction/MessagingBeans.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingConfigBeans.java b/lib/messaging/src/main/java/smecalculus/bezmen/construction/MessagingConfigBeans.java similarity index 92% rename from libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingConfigBeans.java rename to lib/messaging/src/main/java/smecalculus/bezmen/construction/MessagingConfigBeans.java index 3042fbe6..23f2c003 100644 --- a/libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingConfigBeans.java +++ b/lib/messaging/src/main/java/smecalculus/bezmen/construction/MessagingConfigBeans.java @@ -26,7 +26,7 @@ MessagingPropsMapper messagingPropsMapper() { @Bean MessagingDm.MessagingProps messagingProps( PropsKeeper keeper, EdgeValidator validator, MessagingPropsMapper mapper) { - var propsEdge = keeper.read("solution.messaging", MessagingEm.MessagingProps.class); + var propsEdge = keeper.read("product.messaging", MessagingEm.MessagingProps.class); validator.validate(propsEdge); LOG.info("Read {}", propsEdge); return mapper.toDomain(propsEdge); diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingMappingModeCondition.java b/lib/messaging/src/main/java/smecalculus/bezmen/construction/MessagingMappingModeCondition.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingMappingModeCondition.java rename to lib/messaging/src/main/java/smecalculus/bezmen/construction/MessagingMappingModeCondition.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingProtocolModeCondition.java b/lib/messaging/src/main/java/smecalculus/bezmen/construction/MessagingProtocolModeCondition.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingProtocolModeCondition.java rename to lib/messaging/src/main/java/smecalculus/bezmen/construction/MessagingProtocolModeCondition.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/construction/ProtocolHttpBeans.java b/lib/messaging/src/main/java/smecalculus/bezmen/construction/ProtocolHttpBeans.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/construction/ProtocolHttpBeans.java rename to lib/messaging/src/main/java/smecalculus/bezmen/construction/ProtocolHttpBeans.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/construction/ProtocolJmxBeans.java b/lib/messaging/src/main/java/smecalculus/bezmen/construction/ProtocolJmxBeans.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/construction/ProtocolJmxBeans.java rename to lib/messaging/src/main/java/smecalculus/bezmen/construction/ProtocolJmxBeans.java diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageMapper.java b/lib/messaging/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageMapper.java similarity index 100% rename from libs/messaging/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageMapper.java rename to lib/messaging/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageMapper.java diff --git a/lib/messaging/src/main/resources/messaging.properties b/lib/messaging/src/main/resources/messaging.properties new file mode 100644 index 00000000..e617e884 --- /dev/null +++ b/lib/messaging/src/main/resources/messaging.properties @@ -0,0 +1,2 @@ +product.messaging.protocol.modes[0]=http +product.messaging.mapping.modes[0]=spring_mvc diff --git a/libs/messaging/src/main/resources/reference.conf b/lib/messaging/src/main/resources/reference.conf similarity index 90% rename from libs/messaging/src/main/resources/reference.conf rename to lib/messaging/src/main/resources/reference.conf index 62c68294..b7611ffc 100644 --- a/libs/messaging/src/main/resources/reference.conf +++ b/lib/messaging/src/main/resources/reference.conf @@ -1,4 +1,4 @@ -solution { +product { messaging { protocol { modes = [http] diff --git a/libs/pom.xml b/lib/pom.xml similarity index 99% rename from libs/pom.xml rename to lib/pom.xml index 516df6a3..810bf83a 100644 --- a/libs/pom.xml +++ b/lib/pom.xml @@ -10,7 +10,7 @@ latest - libs + lib ${revision} pom diff --git a/libs/storage/README.adoc b/lib/storage/README.adoc similarity index 100% rename from libs/storage/README.adoc rename to lib/storage/README.adoc diff --git a/libs/storage/pom.xml b/lib/storage/pom.xml similarity index 98% rename from libs/storage/pom.xml rename to lib/storage/pom.xml index 0df3691b..93cde667 100644 --- a/libs/storage/pom.xml +++ b/lib/storage/pom.xml @@ -6,7 +6,7 @@ smecalculus.bezmen - libs + lib ${revision} diff --git a/libs/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansIT.java b/lib/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansIT.java similarity index 100% rename from libs/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansIT.java rename to lib/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansIT.java diff --git a/libs/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansLightbendConfigIT.java b/lib/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansLightbendConfigIT.java similarity index 67% rename from libs/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansLightbendConfigIT.java rename to lib/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansLightbendConfigIT.java index 9f797ab7..99d2389b 100644 --- a/libs/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansLightbendConfigIT.java +++ b/lib/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansLightbendConfigIT.java @@ -2,5 +2,5 @@ import org.springframework.test.context.TestPropertySource; -@TestPropertySource(properties = {"solution.config.mapping.mode=lightbend_config"}) +@TestPropertySource(properties = {"product.config.mapping.mode=lightbend_config"}) class StorageConfigBeansLightbendConfigIT extends StorageConfigBeansIT {} diff --git a/libs/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansSpringConfigIT.java b/lib/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansSpringConfigIT.java similarity index 68% rename from libs/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansSpringConfigIT.java rename to lib/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansSpringConfigIT.java index ec331432..531240d0 100644 --- a/libs/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansSpringConfigIT.java +++ b/lib/storage/src/it/java/smecalculus/bezmen/construction/StorageConfigBeansSpringConfigIT.java @@ -2,5 +2,5 @@ import org.springframework.test.context.TestPropertySource; -@TestPropertySource(properties = {"solution.config.mapping.mode=spring_config"}) +@TestPropertySource(properties = {"product.config.mapping.mode=spring_config"}) class StorageConfigBeansSpringConfigIT extends StorageConfigBeansIT {} diff --git a/libs/storage/src/it/resources/logback-test.xml b/lib/storage/src/it/resources/logback-test.xml similarity index 100% rename from libs/storage/src/it/resources/logback-test.xml rename to lib/storage/src/it/resources/logback-test.xml diff --git a/libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageDm.java b/lib/storage/src/main/java/smecalculus/bezmen/configuration/StorageDm.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageDm.java rename to lib/storage/src/main/java/smecalculus/bezmen/configuration/StorageDm.java diff --git a/libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageDmEg.java b/lib/storage/src/main/java/smecalculus/bezmen/configuration/StorageDmEg.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageDmEg.java rename to lib/storage/src/main/java/smecalculus/bezmen/configuration/StorageDmEg.java diff --git a/libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageEm.java b/lib/storage/src/main/java/smecalculus/bezmen/configuration/StorageEm.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageEm.java rename to lib/storage/src/main/java/smecalculus/bezmen/configuration/StorageEm.java diff --git a/libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageEmEg.java b/lib/storage/src/main/java/smecalculus/bezmen/configuration/StorageEmEg.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageEmEg.java rename to lib/storage/src/main/java/smecalculus/bezmen/configuration/StorageEmEg.java diff --git a/libs/storage/src/main/java/smecalculus/bezmen/configuration/StoragePropsMapper.java b/lib/storage/src/main/java/smecalculus/bezmen/configuration/StoragePropsMapper.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/configuration/StoragePropsMapper.java rename to lib/storage/src/main/java/smecalculus/bezmen/configuration/StoragePropsMapper.java diff --git a/libs/storage/src/main/java/smecalculus/bezmen/construction/ConditionalOnStorageMappingMode.java b/lib/storage/src/main/java/smecalculus/bezmen/construction/ConditionalOnStorageMappingMode.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/construction/ConditionalOnStorageMappingMode.java rename to lib/storage/src/main/java/smecalculus/bezmen/construction/ConditionalOnStorageMappingMode.java diff --git a/libs/storage/src/main/java/smecalculus/bezmen/construction/MappingMyBatisBeans.java b/lib/storage/src/main/java/smecalculus/bezmen/construction/MappingMyBatisBeans.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/construction/MappingMyBatisBeans.java rename to lib/storage/src/main/java/smecalculus/bezmen/construction/MappingMyBatisBeans.java diff --git a/libs/storage/src/main/java/smecalculus/bezmen/construction/MappingSpringDataBeans.java b/lib/storage/src/main/java/smecalculus/bezmen/construction/MappingSpringDataBeans.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/construction/MappingSpringDataBeans.java rename to lib/storage/src/main/java/smecalculus/bezmen/construction/MappingSpringDataBeans.java diff --git a/libs/storage/src/main/java/smecalculus/bezmen/construction/StorageBeans.java b/lib/storage/src/main/java/smecalculus/bezmen/construction/StorageBeans.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/construction/StorageBeans.java rename to lib/storage/src/main/java/smecalculus/bezmen/construction/StorageBeans.java diff --git a/libs/storage/src/main/java/smecalculus/bezmen/construction/StorageConfigBeans.java b/lib/storage/src/main/java/smecalculus/bezmen/construction/StorageConfigBeans.java similarity index 92% rename from libs/storage/src/main/java/smecalculus/bezmen/construction/StorageConfigBeans.java rename to lib/storage/src/main/java/smecalculus/bezmen/construction/StorageConfigBeans.java index 433fcfa9..4f9c5251 100644 --- a/libs/storage/src/main/java/smecalculus/bezmen/construction/StorageConfigBeans.java +++ b/lib/storage/src/main/java/smecalculus/bezmen/construction/StorageConfigBeans.java @@ -25,7 +25,7 @@ StoragePropsMapper storagePropsMapper() { @Bean StorageProps storageProps(PropsKeeper keeper, EdgeValidator validator, StoragePropsMapper mapper) { - var storageProps = keeper.read("solution.storage", StorageEm.StorageProps.class); + var storageProps = keeper.read("product.storage", StorageEm.StorageProps.class); validator.validate(storageProps); LOG.info("Read {}", storageProps); return mapper.toDomain(storageProps); diff --git a/libs/storage/src/main/java/smecalculus/bezmen/construction/StorageMappingModeCondition.java b/lib/storage/src/main/java/smecalculus/bezmen/construction/StorageMappingModeCondition.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/construction/StorageMappingModeCondition.java rename to lib/storage/src/main/java/smecalculus/bezmen/construction/StorageMappingModeCondition.java diff --git a/libs/storage/src/main/java/smecalculus/bezmen/storage/SepulkaStateEm.java b/lib/storage/src/main/java/smecalculus/bezmen/storage/SepulkaStateEm.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/storage/SepulkaStateEm.java rename to lib/storage/src/main/java/smecalculus/bezmen/storage/SepulkaStateEm.java diff --git a/libs/storage/src/main/java/smecalculus/bezmen/storage/SepulkaStateMapper.java b/lib/storage/src/main/java/smecalculus/bezmen/storage/SepulkaStateMapper.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/storage/SepulkaStateMapper.java rename to lib/storage/src/main/java/smecalculus/bezmen/storage/SepulkaStateMapper.java diff --git a/libs/storage/src/main/java/smecalculus/bezmen/storage/mybatis/UuidTypeHandler.java b/lib/storage/src/main/java/smecalculus/bezmen/storage/mybatis/UuidTypeHandler.java similarity index 100% rename from libs/storage/src/main/java/smecalculus/bezmen/storage/mybatis/UuidTypeHandler.java rename to lib/storage/src/main/java/smecalculus/bezmen/storage/mybatis/UuidTypeHandler.java diff --git a/libs/storage/src/main/resources/reference.conf b/lib/storage/src/main/resources/reference.conf similarity index 97% rename from libs/storage/src/main/resources/reference.conf rename to lib/storage/src/main/resources/reference.conf index ab78d9f8..cfd79e0d 100644 --- a/libs/storage/src/main/resources/reference.conf +++ b/lib/storage/src/main/resources/reference.conf @@ -1,4 +1,4 @@ -solution { +product { storage { protocol { mode = h2 diff --git a/lib/storage/src/main/resources/storage.properties b/lib/storage/src/main/resources/storage.properties new file mode 100644 index 00000000..80790303 --- /dev/null +++ b/lib/storage/src/main/resources/storage.properties @@ -0,0 +1,9 @@ +product.storage.protocol.mode=h2 +product.storage.protocol.h2.url=jdbc:h2:mem:toy;DB_CLOSE_DELAY=-1 +product.storage.protocol.h2.username=toy +product.storage.protocol.h2.password=toy +product.storage.protocol.postgres.url=jdbc:postgresql://localhost:5432/toy +product.storage.protocol.postgres.schema=toy +product.storage.protocol.postgres.username=toy +product.storage.protocol.postgres.password=toy +product.storage.mapping.mode=spring_data diff --git a/libs/storage/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansTest.java b/lib/storage/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansTest.java similarity index 93% rename from libs/storage/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansTest.java rename to lib/storage/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansTest.java index ccf14264..fde38e57 100644 --- a/libs/storage/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansTest.java +++ b/lib/storage/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansTest.java @@ -31,7 +31,7 @@ void shouldValidateConf() { // given StorageProps expectedProps = storageProps(); // and - when(keeperMock.read("solution.storage", StorageProps.class)).thenReturn(expectedProps); + when(keeperMock.read("product.storage", StorageProps.class)).thenReturn(expectedProps); // when config.storageProps(keeperMock, validatorMock, mapper); // then diff --git a/libs/storage/src/test/resources/logback-test.xml b/lib/storage/src/test/resources/logback-test.xml similarity index 100% rename from libs/storage/src/test/resources/logback-test.xml rename to lib/storage/src/test/resources/logback-test.xml diff --git a/libs/essentials/src/main/resources/validation.properties b/libs/essentials/src/main/resources/validation.properties deleted file mode 100644 index eb0968aa..00000000 --- a/libs/essentials/src/main/resources/validation.properties +++ /dev/null @@ -1 +0,0 @@ -solution.validation.mode=hibernate_validator diff --git a/libs/messaging/src/main/resources/messaging.properties b/libs/messaging/src/main/resources/messaging.properties deleted file mode 100644 index 5efb324b..00000000 --- a/libs/messaging/src/main/resources/messaging.properties +++ /dev/null @@ -1,2 +0,0 @@ -solution.messaging.protocol.modes[0]=http -solution.messaging.mapping.modes[0]=spring_mvc diff --git a/libs/storage/src/main/resources/storage.properties b/libs/storage/src/main/resources/storage.properties deleted file mode 100644 index e50341db..00000000 --- a/libs/storage/src/main/resources/storage.properties +++ /dev/null @@ -1,9 +0,0 @@ -solution.storage.protocol.mode=h2 -solution.storage.protocol.h2.url=jdbc:h2:mem:toy;DB_CLOSE_DELAY=-1 -solution.storage.protocol.h2.username=toy -solution.storage.protocol.h2.password=toy -solution.storage.protocol.postgres.url=jdbc:postgresql://localhost:5432/toy -solution.storage.protocol.postgres.schema=toy -solution.storage.protocol.postgres.username=toy -solution.storage.protocol.postgres.password=toy -solution.storage.mapping.mode=spring_data diff --git a/pom.xml b/pom.xml index dbaeeaaf..87f97006 100644 --- a/pom.xml +++ b/pom.xml @@ -10,10 +10,10 @@ latest - libs - apps - tools - tests + lib + app + tool + test diff --git a/stack/solution/Dockerfile b/stack/product/Dockerfile similarity index 100% rename from stack/solution/Dockerfile rename to stack/product/Dockerfile diff --git a/stack/solution/compose.j2 b/stack/product/compose.j2 similarity index 80% rename from stack/solution/compose.j2 rename to stack/product/compose.j2 index 72fc6cda..4f6af712 100644 --- a/stack/solution/compose.j2 +++ b/stack/product/compose.j2 @@ -1,14 +1,14 @@ -name: {{ solution.name }} +name: {{ product.name }} networks: stack_network: configs: stack_config: - file: ./{{ solution.config.file_name }} + file: ./{{ product.config.file_name }} -{% set storage = solution.storages[ops[opsenv].storage.vendor]|combine(ops[opsenv].storage) %} -{% set database = solution.databases[storage.vendor] %} +{% set storage = product.storages[ops[opsenv].storage.vendor]|combine(ops[opsenv].storage) %} +{% set database = product.databases[storage.vendor] %} services: storage: image: {{ storage.image }}:{{ storage.version }}-alpine @@ -48,7 +48,7 @@ services: networks: - stack_network -{% for schema in solution.schemas[storage.vendor] %} +{% for schema in product.schemas[storage.vendor] %} {{ schema.name }}: image: {{ image_ns }}/{{ database.image }}:{{ database.cid }} depends_on: @@ -70,7 +70,7 @@ services: - stack_network {% endfor %} -{% set apps = solution.apps[ops[opsenv].app.lang]|selectattr('service', 'in', usage[purpose].apps) %} +{% set apps = product.apps[ops[opsenv].app.lang]|selectattr('service', 'in', usages[purpose].apps) %} {% for app in apps %} {{ app.service }}: image: {{ image_ns }}/{{ app.image }}:{{ hostvars.app.image_tags[app.binary] }} @@ -78,12 +78,12 @@ services: - 8080:8080 configs: - source: stack_config - target: /home/app/{{ solution.config.file_name }} + target: /home/app/{{ product.config.file_name }} command: >- - --solution.config.mapping.mode={{ solution.config.mapping_mode }} + --product.config.mapping.mode={{ product.config.mapping_mode }} --spring.config.location=optional:file:application.yaml depends_on: - {% for schema in solution.schemas.values()|flatten %} + {% for schema in product.schemas.values()|flatten %} {{ schema.name }}: condition: service_completed_successfully {% endfor %} diff --git a/stack/solution/lightbend_config.j2 b/stack/product/lightbend_config.j2 similarity index 59% rename from stack/solution/lightbend_config.j2 rename to stack/product/lightbend_config.j2 index 0fd50ac1..2114f496 100644 --- a/stack/solution/lightbend_config.j2 +++ b/stack/product/lightbend_config.j2 @@ -1,4 +1,4 @@ -solution { +product { messaging { mapping { modes = [spring_mvc, spring_management] @@ -6,11 +6,11 @@ solution { } storage { protocol { - {% set storage = solution.storages[ops[opsenv].storage.vendor]|combine(ops[opsenv].storage) %} + {% set storage = product.storages[ops[opsenv].storage.vendor]|combine(ops[opsenv].storage) %} mode = {{ storage.vendor }} {{ storage.vendor }} { - url = "jdbc:postgresql://storage:5432/{{ solution.databases[storage.vendor].name }}" - {% set schema = solution.schemas[storage.vendor]|first %} + url = "jdbc:postgresql://storage:5432/{{ product.databases[storage.vendor].name }}" + {% set schema = product.schemas[storage.vendor]|first %} schema = "{{ schema.name }}" username = "{{ storage.owner.username }}" password = "{{ storage.owner.password }}" diff --git a/stack/solution/spring_config.j2 b/stack/product/spring_config.j2 similarity index 56% rename from stack/solution/spring_config.j2 rename to stack/product/spring_config.j2 index 685d4248..3efc7135 100644 --- a/stack/solution/spring_config.j2 +++ b/stack/product/spring_config.j2 @@ -1,15 +1,15 @@ --- -solution: +product: messaging: mapping: modes: [spring_mvc, spring_management] storage: protocol: - {% set storage = solution.storages[ops[opsenv].storage.vendor]|combine(ops[opsenv].storage) %} + {% set storage = product.storages[ops[opsenv].storage.vendor]|combine(ops[opsenv].storage) %} mode: {{ storage.vendor }} {{ storage.vendor }}: - url: "jdbc:postgresql://storage:5432/{{ solution.databases[storage.vendor].name }}" - {% set schema = solution.schemas[storage.vendor]|first %} + url: "jdbc:postgresql://storage:5432/{{ product.databases[storage.vendor].name }}" + {% set schema = product.schemas[storage.vendor]|first %} schema: "{{ schema.name }}" username: "{{ storage.owner.username }}" password: "{{ storage.owner.password }}" diff --git a/test/e2e/README.adoc b/test/e2e/README.adoc new file mode 100644 index 00000000..b5dbc335 --- /dev/null +++ b/test/e2e/README.adoc @@ -0,0 +1 @@ +Сквозные тесты, в которых через публичные интерфейсы проверяется продукт \ No newline at end of file diff --git a/tests/e2e/pom.xml b/test/e2e/pom.xml similarity index 97% rename from tests/e2e/pom.xml rename to test/e2e/pom.xml index 7d5d5c95..91dd1dd6 100644 --- a/tests/e2e/pom.xml +++ b/test/e2e/pom.xml @@ -6,7 +6,7 @@ smecalculus.bezmen - tests + test latest diff --git a/tests/e2e/src/main/java/smecalculus/bezmen/StandBeans.java b/test/e2e/src/main/java/smecalculus/bezmen/StandBeans.java similarity index 100% rename from tests/e2e/src/main/java/smecalculus/bezmen/StandBeans.java rename to test/e2e/src/main/java/smecalculus/bezmen/StandBeans.java diff --git a/tests/e2e/src/test/java/smecalculus/bezmen/FuncSuite.java b/test/e2e/src/test/java/smecalculus/bezmen/FuncSuite.java similarity index 100% rename from tests/e2e/src/test/java/smecalculus/bezmen/FuncSuite.java rename to test/e2e/src/test/java/smecalculus/bezmen/FuncSuite.java diff --git a/tests/e2e/src/test/java/smecalculus/bezmen/ToySuite.java b/test/e2e/src/test/java/smecalculus/bezmen/ToySuite.java similarity index 100% rename from tests/e2e/src/test/java/smecalculus/bezmen/ToySuite.java rename to test/e2e/src/test/java/smecalculus/bezmen/ToySuite.java diff --git a/tests/e2e/src/test/java/smecalculus/bezmen/registration/SepulkaTest.java b/test/e2e/src/test/java/smecalculus/bezmen/registration/SepulkaTest.java similarity index 100% rename from tests/e2e/src/test/java/smecalculus/bezmen/registration/SepulkaTest.java rename to test/e2e/src/test/java/smecalculus/bezmen/registration/SepulkaTest.java diff --git a/tests/e2e/src/test/resources/junit-platform.properties b/test/e2e/src/test/resources/junit-platform.properties similarity index 100% rename from tests/e2e/src/test/resources/junit-platform.properties rename to test/e2e/src/test/resources/junit-platform.properties diff --git a/tests/e2e/src/test/resources/logback-test.xml b/test/e2e/src/test/resources/logback-test.xml similarity index 100% rename from tests/e2e/src/test/resources/logback-test.xml rename to test/e2e/src/test/resources/logback-test.xml diff --git a/tests/pom.xml b/test/pom.xml similarity index 93% rename from tests/pom.xml rename to test/pom.xml index ed1be077..ca485ab0 100644 --- a/tests/pom.xml +++ b/test/pom.xml @@ -10,7 +10,7 @@ latest - tests + test pom @@ -29,14 +29,14 @@ ${project.groupId} - libs + lib ${revision} import pom ${project.groupId} - tools + tool latest import pom diff --git a/tests/e2e/README.adoc b/tests/e2e/README.adoc deleted file mode 100644 index 8a580a75..00000000 --- a/tests/e2e/README.adoc +++ /dev/null @@ -1 +0,0 @@ -Сквозные тесты, в которых через публичные интерфейсы проверяется решение \ No newline at end of file diff --git a/tools/README.adoc b/tool/README.adoc similarity index 100% rename from tools/README.adoc rename to tool/README.adoc diff --git a/tools/pom.xml b/tool/pom.xml similarity index 92% rename from tools/pom.xml rename to tool/pom.xml index a9f6f57a..af0d5951 100644 --- a/tools/pom.xml +++ b/tool/pom.xml @@ -10,7 +10,7 @@ latest - tools + tool pom @@ -142,31 +142,31 @@ - - + + - + - + - + - + - + - + diff --git a/tools/testing/README.adoc b/tool/testing/README.adoc similarity index 100% rename from tools/testing/README.adoc rename to tool/testing/README.adoc diff --git a/tools/testing/pom.xml b/tool/testing/pom.xml similarity index 98% rename from tools/testing/pom.xml rename to tool/testing/pom.xml index 8acbcfa9..b1dd0a53 100644 --- a/tools/testing/pom.xml +++ b/tool/testing/pom.xml @@ -6,7 +6,7 @@ smecalculus.bezmen - tools + tool latest diff --git a/tools/testing/src/main/java/smecalculus/bezmen/messaging/SepulkaClientSpringWebTest.java b/tool/testing/src/main/java/smecalculus/bezmen/messaging/SepulkaClientSpringWebTest.java similarity index 100% rename from tools/testing/src/main/java/smecalculus/bezmen/messaging/SepulkaClientSpringWebTest.java rename to tool/testing/src/main/java/smecalculus/bezmen/messaging/SepulkaClientSpringWebTest.java diff --git a/tools/testing/src/main/java/smecalculus/bezmen/testing/Constants.java b/tool/testing/src/main/java/smecalculus/bezmen/testing/Constants.java similarity index 100% rename from tools/testing/src/main/java/smecalculus/bezmen/testing/Constants.java rename to tool/testing/src/main/java/smecalculus/bezmen/testing/Constants.java diff --git a/tools/testing/src/main/java/smecalculus/bezmen/testing/ShardingExtension.java b/tool/testing/src/main/java/smecalculus/bezmen/testing/ShardingExtension.java similarity index 100% rename from tools/testing/src/main/java/smecalculus/bezmen/testing/ShardingExtension.java rename to tool/testing/src/main/java/smecalculus/bezmen/testing/ShardingExtension.java diff --git a/tools/testing/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/tool/testing/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension similarity index 100% rename from tools/testing/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension rename to tool/testing/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension diff --git a/tools/testing/src/main/resources/schemas/sepulkarium/create.sql b/tool/testing/src/main/resources/schemas/sepulkarium/create.sql similarity index 100% rename from tools/testing/src/main/resources/schemas/sepulkarium/create.sql rename to tool/testing/src/main/resources/schemas/sepulkarium/create.sql diff --git a/tools/testing/src/main/resources/schemas/sepulkarium/drop.sql b/tool/testing/src/main/resources/schemas/sepulkarium/drop.sql similarity index 100% rename from tools/testing/src/main/resources/schemas/sepulkarium/drop.sql rename to tool/testing/src/main/resources/schemas/sepulkarium/drop.sql diff --git a/tools/testing/src/main/resources/schemas/sepulkarium/truncate.sql b/tool/testing/src/main/resources/schemas/sepulkarium/truncate.sql similarity index 100% rename from tools/testing/src/main/resources/schemas/sepulkarium/truncate.sql rename to tool/testing/src/main/resources/schemas/sepulkarium/truncate.sql