diff --git a/.github/workflows/pr_labels_check.yml b/.github/workflows/pr_labels_check.yml index 2dba51a28..90c668233 100644 --- a/.github/workflows/pr_labels_check.yml +++ b/.github/workflows/pr_labels_check.yml @@ -22,7 +22,7 @@ jobs: name: Test approved or docs runs-on: ubuntu-latest steps: - - uses: danielchabr/pr-labels-checker@master + - uses: danielchabr/pr-labels-checker@v3.0 id: checkLabel with: hasSome: PR:tested,PR:no testing needed,docs @@ -31,7 +31,7 @@ jobs: name: Merge not blocked runs-on: ubuntu-latest steps: - - uses: danielchabr/pr-labels-checker@master + - uses: danielchabr/pr-labels-checker@v3.0 id: checkLabel with: hasNone: PR:reviewing,work in progress diff --git a/menas-web/Dockerfile b/menas/Dockerfile similarity index 83% rename from menas-web/Dockerfile rename to menas/Dockerfile index 3ffa8c72a..339dd8965 100644 --- a/menas-web/Dockerfile +++ b/menas/Dockerfile @@ -20,10 +20,10 @@ LABEL \ vendor="AbsaOSS" \ copyright="2020 ABSA Group Limited" \ license="Apache License, version 2.0" \ - name="Menas Web" + name="Menas" -ADD start_menas_web.sh /docker-entrypoint.d/start_menas_web.sh +ADD start_menas.sh /docker-entrypoint.d/start_menas.sh COPY nginx.conf nginx.conf -RUN chmod +x /docker-entrypoint.d/start_menas_web.sh && rm -rf /usr/share/nginx/html/* +RUN chmod +x /docker-entrypoint.d/start_menas.sh && rm -rf /usr/share/nginx/html/* COPY ./ui/dist /usr/share/nginx/html/ diff --git a/menas-web/nginx.conf b/menas/nginx.conf similarity index 100% rename from menas-web/nginx.conf rename to menas/nginx.conf diff --git a/menas-web/pom.xml b/menas/pom.xml similarity index 98% rename from menas-web/pom.xml rename to menas/pom.xml index 0d5807de2..1a9f9d5b4 100644 --- a/menas-web/pom.xml +++ b/menas/pom.xml @@ -15,7 +15,7 @@ 4.0.0 - menas-web + menas war @@ -31,7 +31,7 @@ dockerfile-maven-plugin ${dockerfile.maven.version} - ${dockerfile.menas-ui.repository} + ${dockerfile.menas.repository} ${dockerfile.tag} ${dockerfile.base.artifact} diff --git a/menas-web/start_menas_web.sh b/menas/start_menas.sh similarity index 100% rename from menas-web/start_menas_web.sh rename to menas/start_menas.sh diff --git a/menas-web/ui/components/AuditTrail.js b/menas/ui/components/AuditTrail.js similarity index 100% rename from menas-web/ui/components/AuditTrail.js rename to menas/ui/components/AuditTrail.js diff --git a/menas-web/ui/components/Component.js b/menas/ui/components/Component.js similarity index 100% rename from menas-web/ui/components/Component.js rename to menas/ui/components/Component.js diff --git a/menas-web/ui/components/SchemaTable.js b/menas/ui/components/SchemaTable.js similarity index 100% rename from menas-web/ui/components/SchemaTable.js rename to menas/ui/components/SchemaTable.js diff --git a/menas-web/ui/components/app.controller.js b/menas/ui/components/app.controller.js similarity index 100% rename from menas-web/ui/components/app.controller.js rename to menas/ui/components/app.controller.js diff --git a/menas-web/ui/components/app.view.xml b/menas/ui/components/app.view.xml similarity index 100% rename from menas-web/ui/components/app.view.xml rename to menas/ui/components/app.view.xml diff --git a/menas-web/ui/components/auditTrail.fragment.xml b/menas/ui/components/auditTrail.fragment.xml similarity index 100% rename from menas-web/ui/components/auditTrail.fragment.xml rename to menas/ui/components/auditTrail.fragment.xml diff --git a/menas-web/ui/components/dataset/addDataset.fragment.xml b/menas/ui/components/dataset/addDataset.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/addDataset.fragment.xml rename to menas/ui/components/dataset/addDataset.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/CastingConformanceRule/add.fragment.xml b/menas/ui/components/dataset/conformanceRule/CastingConformanceRule/add.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/CastingConformanceRule/add.fragment.xml rename to menas/ui/components/dataset/conformanceRule/CastingConformanceRule/add.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/CastingConformanceRule/display.fragment.xml b/menas/ui/components/dataset/conformanceRule/CastingConformanceRule/display.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/CastingConformanceRule/display.fragment.xml rename to menas/ui/components/dataset/conformanceRule/CastingConformanceRule/display.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/CoalesceConformanceRule/add.fragment.xml b/menas/ui/components/dataset/conformanceRule/CoalesceConformanceRule/add.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/CoalesceConformanceRule/add.fragment.xml rename to menas/ui/components/dataset/conformanceRule/CoalesceConformanceRule/add.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/CoalesceConformanceRule/display.fragment.xml b/menas/ui/components/dataset/conformanceRule/CoalesceConformanceRule/display.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/CoalesceConformanceRule/display.fragment.xml rename to menas/ui/components/dataset/conformanceRule/CoalesceConformanceRule/display.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/ConcatenationConformanceRule/add.fragment.xml b/menas/ui/components/dataset/conformanceRule/ConcatenationConformanceRule/add.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/ConcatenationConformanceRule/add.fragment.xml rename to menas/ui/components/dataset/conformanceRule/ConcatenationConformanceRule/add.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/ConcatenationConformanceRule/display.fragment.xml b/menas/ui/components/dataset/conformanceRule/ConcatenationConformanceRule/display.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/ConcatenationConformanceRule/display.fragment.xml rename to menas/ui/components/dataset/conformanceRule/ConcatenationConformanceRule/display.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/ConformanceRule.js b/menas/ui/components/dataset/conformanceRule/ConformanceRule.js similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/ConformanceRule.js rename to menas/ui/components/dataset/conformanceRule/ConformanceRule.js diff --git a/menas-web/ui/components/dataset/conformanceRule/ConformanceRuleDialog.js b/menas/ui/components/dataset/conformanceRule/ConformanceRuleDialog.js similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/ConformanceRuleDialog.js rename to menas/ui/components/dataset/conformanceRule/ConformanceRuleDialog.js diff --git a/menas-web/ui/components/dataset/conformanceRule/ConformanceRuleForm.js b/menas/ui/components/dataset/conformanceRule/ConformanceRuleForm.js similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/ConformanceRuleForm.js rename to menas/ui/components/dataset/conformanceRule/ConformanceRuleForm.js diff --git a/menas-web/ui/components/dataset/conformanceRule/ConformanceRuleFormFactory.js b/menas/ui/components/dataset/conformanceRule/ConformanceRuleFormFactory.js similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/ConformanceRuleFormFactory.js rename to menas/ui/components/dataset/conformanceRule/ConformanceRuleFormFactory.js diff --git a/menas-web/ui/components/dataset/conformanceRule/DropConformanceRule/add.fragment.xml b/menas/ui/components/dataset/conformanceRule/DropConformanceRule/add.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/DropConformanceRule/add.fragment.xml rename to menas/ui/components/dataset/conformanceRule/DropConformanceRule/add.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/DropConformanceRule/display.fragment.xml b/menas/ui/components/dataset/conformanceRule/DropConformanceRule/display.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/DropConformanceRule/display.fragment.xml rename to menas/ui/components/dataset/conformanceRule/DropConformanceRule/display.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/FillNullsConformanceRule/add.fragment.xml b/menas/ui/components/dataset/conformanceRule/FillNullsConformanceRule/add.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/FillNullsConformanceRule/add.fragment.xml rename to menas/ui/components/dataset/conformanceRule/FillNullsConformanceRule/add.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/FillNullsConformanceRule/display.fragment.xml b/menas/ui/components/dataset/conformanceRule/FillNullsConformanceRule/display.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/FillNullsConformanceRule/display.fragment.xml rename to menas/ui/components/dataset/conformanceRule/FillNullsConformanceRule/display.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/LiteralConformanceRule/add.fragment.xml b/menas/ui/components/dataset/conformanceRule/LiteralConformanceRule/add.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/LiteralConformanceRule/add.fragment.xml rename to menas/ui/components/dataset/conformanceRule/LiteralConformanceRule/add.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/LiteralConformanceRule/display.fragment.xml b/menas/ui/components/dataset/conformanceRule/LiteralConformanceRule/display.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/LiteralConformanceRule/display.fragment.xml rename to menas/ui/components/dataset/conformanceRule/LiteralConformanceRule/display.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/JoinConditionDialog.js b/menas/ui/components/dataset/conformanceRule/MappingConformanceRule/JoinConditionDialog.js similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/JoinConditionDialog.js rename to menas/ui/components/dataset/conformanceRule/MappingConformanceRule/JoinConditionDialog.js diff --git a/menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/JoinConditionDialogFactory.js b/menas/ui/components/dataset/conformanceRule/MappingConformanceRule/JoinConditionDialogFactory.js similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/JoinConditionDialogFactory.js rename to menas/ui/components/dataset/conformanceRule/MappingConformanceRule/JoinConditionDialogFactory.js diff --git a/menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/OutputColumnDialog.js b/menas/ui/components/dataset/conformanceRule/MappingConformanceRule/OutputColumnDialog.js similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/OutputColumnDialog.js rename to menas/ui/components/dataset/conformanceRule/MappingConformanceRule/OutputColumnDialog.js diff --git a/menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/OutputColumnDialogFactory.js b/menas/ui/components/dataset/conformanceRule/MappingConformanceRule/OutputColumnDialogFactory.js similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/OutputColumnDialogFactory.js rename to menas/ui/components/dataset/conformanceRule/MappingConformanceRule/OutputColumnDialogFactory.js diff --git a/menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/add.fragment.xml b/menas/ui/components/dataset/conformanceRule/MappingConformanceRule/add.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/add.fragment.xml rename to menas/ui/components/dataset/conformanceRule/MappingConformanceRule/add.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/display.fragment.xml b/menas/ui/components/dataset/conformanceRule/MappingConformanceRule/display.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/display.fragment.xml rename to menas/ui/components/dataset/conformanceRule/MappingConformanceRule/display.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/joinConditionDialog.fragment.xml b/menas/ui/components/dataset/conformanceRule/MappingConformanceRule/joinConditionDialog.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/joinConditionDialog.fragment.xml rename to menas/ui/components/dataset/conformanceRule/MappingConformanceRule/joinConditionDialog.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/joinConditions.fragment.xml b/menas/ui/components/dataset/conformanceRule/MappingConformanceRule/joinConditions.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/joinConditions.fragment.xml rename to menas/ui/components/dataset/conformanceRule/MappingConformanceRule/joinConditions.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/outputColumnDialog.fragment.xml b/menas/ui/components/dataset/conformanceRule/MappingConformanceRule/outputColumnDialog.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/outputColumnDialog.fragment.xml rename to menas/ui/components/dataset/conformanceRule/MappingConformanceRule/outputColumnDialog.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/outputColumns.fragment.xml b/menas/ui/components/dataset/conformanceRule/MappingConformanceRule/outputColumns.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/MappingConformanceRule/outputColumns.fragment.xml rename to menas/ui/components/dataset/conformanceRule/MappingConformanceRule/outputColumns.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/NegationConformanceRule/add.fragment.xml b/menas/ui/components/dataset/conformanceRule/NegationConformanceRule/add.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/NegationConformanceRule/add.fragment.xml rename to menas/ui/components/dataset/conformanceRule/NegationConformanceRule/add.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/NegationConformanceRule/display.fragment.xml b/menas/ui/components/dataset/conformanceRule/NegationConformanceRule/display.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/NegationConformanceRule/display.fragment.xml rename to menas/ui/components/dataset/conformanceRule/NegationConformanceRule/display.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/RuleColumnDialog.fragment.xml b/menas/ui/components/dataset/conformanceRule/RuleColumnDialog.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/RuleColumnDialog.fragment.xml rename to menas/ui/components/dataset/conformanceRule/RuleColumnDialog.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/RuleColumnDialog.js b/menas/ui/components/dataset/conformanceRule/RuleColumnDialog.js similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/RuleColumnDialog.js rename to menas/ui/components/dataset/conformanceRule/RuleColumnDialog.js diff --git a/menas-web/ui/components/dataset/conformanceRule/RuleColumnDialogFactory.js b/menas/ui/components/dataset/conformanceRule/RuleColumnDialogFactory.js similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/RuleColumnDialogFactory.js rename to menas/ui/components/dataset/conformanceRule/RuleColumnDialogFactory.js diff --git a/menas-web/ui/components/dataset/conformanceRule/SchemaManager.js b/menas/ui/components/dataset/conformanceRule/SchemaManager.js similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/SchemaManager.js rename to menas/ui/components/dataset/conformanceRule/SchemaManager.js diff --git a/menas-web/ui/components/dataset/conformanceRule/SingleColumnConformanceRule/add.fragment.xml b/menas/ui/components/dataset/conformanceRule/SingleColumnConformanceRule/add.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/SingleColumnConformanceRule/add.fragment.xml rename to menas/ui/components/dataset/conformanceRule/SingleColumnConformanceRule/add.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/SingleColumnConformanceRule/display.fragment.xml b/menas/ui/components/dataset/conformanceRule/SingleColumnConformanceRule/display.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/SingleColumnConformanceRule/display.fragment.xml rename to menas/ui/components/dataset/conformanceRule/SingleColumnConformanceRule/display.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/SparkSessionConfConformanceRule/add.fragment.xml b/menas/ui/components/dataset/conformanceRule/SparkSessionConfConformanceRule/add.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/SparkSessionConfConformanceRule/add.fragment.xml rename to menas/ui/components/dataset/conformanceRule/SparkSessionConfConformanceRule/add.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/SparkSessionConfConformanceRule/display.fragment.xml b/menas/ui/components/dataset/conformanceRule/SparkSessionConfConformanceRule/display.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/SparkSessionConfConformanceRule/display.fragment.xml rename to menas/ui/components/dataset/conformanceRule/SparkSessionConfConformanceRule/display.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/UppercaseConformanceRule/add.fragment.xml b/menas/ui/components/dataset/conformanceRule/UppercaseConformanceRule/add.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/UppercaseConformanceRule/add.fragment.xml rename to menas/ui/components/dataset/conformanceRule/UppercaseConformanceRule/add.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/UppercaseConformanceRule/display.fragment.xml b/menas/ui/components/dataset/conformanceRule/UppercaseConformanceRule/display.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/UppercaseConformanceRule/display.fragment.xml rename to menas/ui/components/dataset/conformanceRule/UppercaseConformanceRule/display.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/add/checkpointBox.fragment.xml b/menas/ui/components/dataset/conformanceRule/add/checkpointBox.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/add/checkpointBox.fragment.xml rename to menas/ui/components/dataset/conformanceRule/add/checkpointBox.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/add/commonRuleFields.fragment.xml b/menas/ui/components/dataset/conformanceRule/add/commonRuleFields.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/add/commonRuleFields.fragment.xml rename to menas/ui/components/dataset/conformanceRule/add/commonRuleFields.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/add/inputColumn.fragment.xml b/menas/ui/components/dataset/conformanceRule/add/inputColumn.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/add/inputColumn.fragment.xml rename to menas/ui/components/dataset/conformanceRule/add/inputColumn.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/display/actionMenu.fragment.xml b/menas/ui/components/dataset/conformanceRule/display/actionMenu.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/display/actionMenu.fragment.xml rename to menas/ui/components/dataset/conformanceRule/display/actionMenu.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/display/checkpointBox.fragment.xml b/menas/ui/components/dataset/conformanceRule/display/checkpointBox.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/display/checkpointBox.fragment.xml rename to menas/ui/components/dataset/conformanceRule/display/checkpointBox.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/display/commonRuleFields.fragment.xml b/menas/ui/components/dataset/conformanceRule/display/commonRuleFields.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/display/commonRuleFields.fragment.xml rename to menas/ui/components/dataset/conformanceRule/display/commonRuleFields.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/display/inputColumn.fragment.xml b/menas/ui/components/dataset/conformanceRule/display/inputColumn.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/display/inputColumn.fragment.xml rename to menas/ui/components/dataset/conformanceRule/display/inputColumn.fragment.xml diff --git a/menas-web/ui/components/dataset/conformanceRule/upsert.fragment.xml b/menas/ui/components/dataset/conformanceRule/upsert.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/conformanceRule/upsert.fragment.xml rename to menas/ui/components/dataset/conformanceRule/upsert.fragment.xml diff --git a/menas-web/ui/components/dataset/datasetDetail.controller.js b/menas/ui/components/dataset/datasetDetail.controller.js similarity index 100% rename from menas-web/ui/components/dataset/datasetDetail.controller.js rename to menas/ui/components/dataset/datasetDetail.controller.js diff --git a/menas-web/ui/components/dataset/datasetDetail.view.xml b/menas/ui/components/dataset/datasetDetail.view.xml similarity index 100% rename from menas-web/ui/components/dataset/datasetDetail.view.xml rename to menas/ui/components/dataset/datasetDetail.view.xml diff --git a/menas-web/ui/components/dataset/datasetInfo.fragment.xml b/menas/ui/components/dataset/datasetInfo.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/datasetInfo.fragment.xml rename to menas/ui/components/dataset/datasetInfo.fragment.xml diff --git a/menas-web/ui/components/dataset/datasetMaster.controller.js b/menas/ui/components/dataset/datasetMaster.controller.js similarity index 100% rename from menas-web/ui/components/dataset/datasetMaster.controller.js rename to menas/ui/components/dataset/datasetMaster.controller.js diff --git a/menas-web/ui/components/dataset/datasetMaster.view.xml b/menas/ui/components/dataset/datasetMaster.view.xml similarity index 100% rename from menas-web/ui/components/dataset/datasetMaster.view.xml rename to menas/ui/components/dataset/datasetMaster.view.xml diff --git a/menas-web/ui/components/dataset/monitoring/barChartPopover.fragment.xml b/menas/ui/components/dataset/monitoring/barChartPopover.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/monitoring/barChartPopover.fragment.xml rename to menas/ui/components/dataset/monitoring/barChartPopover.fragment.xml diff --git a/menas-web/ui/components/dataset/monitoring/monitoring.fragment.xml b/menas/ui/components/dataset/monitoring/monitoring.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/monitoring/monitoring.fragment.xml rename to menas/ui/components/dataset/monitoring/monitoring.fragment.xml diff --git a/menas-web/ui/components/dataset/run/runs.fragment.xml b/menas/ui/components/dataset/run/runs.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/run/runs.fragment.xml rename to menas/ui/components/dataset/run/runs.fragment.xml diff --git a/menas-web/ui/components/dataset/schedule/editSchedule.fragment.xml b/menas/ui/components/dataset/schedule/editSchedule.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/schedule/editSchedule.fragment.xml rename to menas/ui/components/dataset/schedule/editSchedule.fragment.xml diff --git a/menas-web/ui/components/dataset/schedule/viewSchedule.fragment.xml b/menas/ui/components/dataset/schedule/viewSchedule.fragment.xml similarity index 100% rename from menas-web/ui/components/dataset/schedule/viewSchedule.fragment.xml rename to menas/ui/components/dataset/schedule/viewSchedule.fragment.xml diff --git a/menas-web/ui/components/external/it/designfuture/chartjs/library-preload.js b/menas/ui/components/external/it/designfuture/chartjs/library-preload.js similarity index 100% rename from menas-web/ui/components/external/it/designfuture/chartjs/library-preload.js rename to menas/ui/components/external/it/designfuture/chartjs/library-preload.js diff --git a/menas-web/ui/components/hdfs/HDFSBrowser.js b/menas/ui/components/hdfs/HDFSBrowser.js similarity index 100% rename from menas-web/ui/components/hdfs/HDFSBrowser.js rename to menas/ui/components/hdfs/HDFSBrowser.js diff --git a/menas-web/ui/components/hdfs/HDFSBrowserRenderer.js b/menas/ui/components/hdfs/HDFSBrowserRenderer.js similarity index 100% rename from menas-web/ui/components/hdfs/HDFSBrowserRenderer.js rename to menas/ui/components/hdfs/HDFSBrowserRenderer.js diff --git a/menas-web/ui/components/home/landingPage.controller.js b/menas/ui/components/home/landingPage.controller.js similarity index 100% rename from menas-web/ui/components/home/landingPage.controller.js rename to menas/ui/components/home/landingPage.controller.js diff --git a/menas-web/ui/components/home/landingPage.view.xml b/menas/ui/components/home/landingPage.view.xml similarity index 100% rename from menas-web/ui/components/home/landingPage.view.xml rename to menas/ui/components/home/landingPage.view.xml diff --git a/menas-web/ui/components/i18n/message.properties b/menas/ui/components/i18n/message.properties similarity index 100% rename from menas-web/ui/components/i18n/message.properties rename to menas/ui/components/i18n/message.properties diff --git a/menas-web/ui/components/login/loginDetail.controller.js b/menas/ui/components/login/loginDetail.controller.js similarity index 100% rename from menas-web/ui/components/login/loginDetail.controller.js rename to menas/ui/components/login/loginDetail.controller.js diff --git a/menas-web/ui/components/login/loginDetail.view.xml b/menas/ui/components/login/loginDetail.view.xml similarity index 100% rename from menas-web/ui/components/login/loginDetail.view.xml rename to menas/ui/components/login/loginDetail.view.xml diff --git a/menas-web/ui/components/mappingTable/addDefaultValue.fragment.xml b/menas/ui/components/mappingTable/addDefaultValue.fragment.xml similarity index 100% rename from menas-web/ui/components/mappingTable/addDefaultValue.fragment.xml rename to menas/ui/components/mappingTable/addDefaultValue.fragment.xml diff --git a/menas-web/ui/components/mappingTable/addMappingTable.fragment.xml b/menas/ui/components/mappingTable/addMappingTable.fragment.xml similarity index 100% rename from menas-web/ui/components/mappingTable/addMappingTable.fragment.xml rename to menas/ui/components/mappingTable/addMappingTable.fragment.xml diff --git a/menas-web/ui/components/mappingTable/mappingTableDetail.controller.js b/menas/ui/components/mappingTable/mappingTableDetail.controller.js similarity index 100% rename from menas-web/ui/components/mappingTable/mappingTableDetail.controller.js rename to menas/ui/components/mappingTable/mappingTableDetail.controller.js diff --git a/menas-web/ui/components/mappingTable/mappingTableDetail.view.xml b/menas/ui/components/mappingTable/mappingTableDetail.view.xml similarity index 100% rename from menas-web/ui/components/mappingTable/mappingTableDetail.view.xml rename to menas/ui/components/mappingTable/mappingTableDetail.view.xml diff --git a/menas-web/ui/components/mappingTable/mappingTableInfo.fragment.xml b/menas/ui/components/mappingTable/mappingTableInfo.fragment.xml similarity index 100% rename from menas-web/ui/components/mappingTable/mappingTableInfo.fragment.xml rename to menas/ui/components/mappingTable/mappingTableInfo.fragment.xml diff --git a/menas-web/ui/components/mappingTable/mappingTableMaster.controller.js b/menas/ui/components/mappingTable/mappingTableMaster.controller.js similarity index 100% rename from menas-web/ui/components/mappingTable/mappingTableMaster.controller.js rename to menas/ui/components/mappingTable/mappingTableMaster.controller.js diff --git a/menas-web/ui/components/mappingTable/mappingTableMaster.view.xml b/menas/ui/components/mappingTable/mappingTableMaster.view.xml similarity index 100% rename from menas-web/ui/components/mappingTable/mappingTableMaster.view.xml rename to menas/ui/components/mappingTable/mappingTableMaster.view.xml diff --git a/menas-web/ui/components/mappingTableSelector.fragment.xml b/menas/ui/components/mappingTableSelector.fragment.xml similarity index 100% rename from menas-web/ui/components/mappingTableSelector.fragment.xml rename to menas/ui/components/mappingTableSelector.fragment.xml diff --git a/menas-web/ui/components/run/runDatasetNameMaster.controller.js b/menas/ui/components/run/runDatasetNameMaster.controller.js similarity index 100% rename from menas-web/ui/components/run/runDatasetNameMaster.controller.js rename to menas/ui/components/run/runDatasetNameMaster.controller.js diff --git a/menas-web/ui/components/run/runDatasetNameMaster.view.xml b/menas/ui/components/run/runDatasetNameMaster.view.xml similarity index 100% rename from menas-web/ui/components/run/runDatasetNameMaster.view.xml rename to menas/ui/components/run/runDatasetNameMaster.view.xml diff --git a/menas-web/ui/components/run/runDatasetVersionMaster.controller.js b/menas/ui/components/run/runDatasetVersionMaster.controller.js similarity index 100% rename from menas-web/ui/components/run/runDatasetVersionMaster.controller.js rename to menas/ui/components/run/runDatasetVersionMaster.controller.js diff --git a/menas-web/ui/components/run/runDatasetVersionMaster.view.xml b/menas/ui/components/run/runDatasetVersionMaster.view.xml similarity index 100% rename from menas-web/ui/components/run/runDatasetVersionMaster.view.xml rename to menas/ui/components/run/runDatasetVersionMaster.view.xml diff --git a/menas-web/ui/components/run/runDetail.controller.js b/menas/ui/components/run/runDetail.controller.js similarity index 100% rename from menas-web/ui/components/run/runDetail.controller.js rename to menas/ui/components/run/runDetail.controller.js diff --git a/menas-web/ui/components/run/runDetail.view.xml b/menas/ui/components/run/runDetail.view.xml similarity index 100% rename from menas-web/ui/components/run/runDetail.view.xml rename to menas/ui/components/run/runDetail.view.xml diff --git a/menas-web/ui/components/run/runMaster.controller.js b/menas/ui/components/run/runMaster.controller.js similarity index 100% rename from menas-web/ui/components/run/runMaster.controller.js rename to menas/ui/components/run/runMaster.controller.js diff --git a/menas-web/ui/components/run/runMaster.view.xml b/menas/ui/components/run/runMaster.view.xml similarity index 100% rename from menas-web/ui/components/run/runMaster.view.xml rename to menas/ui/components/run/runMaster.view.xml diff --git a/menas-web/ui/components/schema/addSchema.fragment.xml b/menas/ui/components/schema/addSchema.fragment.xml similarity index 100% rename from menas-web/ui/components/schema/addSchema.fragment.xml rename to menas/ui/components/schema/addSchema.fragment.xml diff --git a/menas-web/ui/components/schema/schemaDetail.controller.js b/menas/ui/components/schema/schemaDetail.controller.js similarity index 100% rename from menas-web/ui/components/schema/schemaDetail.controller.js rename to menas/ui/components/schema/schemaDetail.controller.js diff --git a/menas-web/ui/components/schema/schemaDetail.view.xml b/menas/ui/components/schema/schemaDetail.view.xml similarity index 100% rename from menas-web/ui/components/schema/schemaDetail.view.xml rename to menas/ui/components/schema/schemaDetail.view.xml diff --git a/menas-web/ui/components/schema/schemaInfo.fragment.xml b/menas/ui/components/schema/schemaInfo.fragment.xml similarity index 100% rename from menas-web/ui/components/schema/schemaInfo.fragment.xml rename to menas/ui/components/schema/schemaInfo.fragment.xml diff --git a/menas-web/ui/components/schema/schemaMaster.controller.js b/menas/ui/components/schema/schemaMaster.controller.js similarity index 100% rename from menas-web/ui/components/schema/schemaMaster.controller.js rename to menas/ui/components/schema/schemaMaster.controller.js diff --git a/menas-web/ui/components/schema/schemaMaster.view.xml b/menas/ui/components/schema/schemaMaster.view.xml similarity index 100% rename from menas-web/ui/components/schema/schemaMaster.view.xml rename to menas/ui/components/schema/schemaMaster.view.xml diff --git a/menas-web/ui/components/schema/selector/SchemaSelectorUtils.js b/menas/ui/components/schema/selector/SchemaSelectorUtils.js similarity index 100% rename from menas-web/ui/components/schema/selector/SchemaSelectorUtils.js rename to menas/ui/components/schema/selector/SchemaSelectorUtils.js diff --git a/menas-web/ui/components/schema/selector/schemaSelector.fragment.xml b/menas/ui/components/schema/selector/schemaSelector.fragment.xml similarity index 100% rename from menas-web/ui/components/schema/selector/schemaSelector.fragment.xml rename to menas/ui/components/schema/selector/schemaSelector.fragment.xml diff --git a/menas-web/ui/components/schema/selector/schemaSelectorDialog.fragment.xml b/menas/ui/components/schema/selector/schemaSelectorDialog.fragment.xml similarity index 100% rename from menas-web/ui/components/schema/selector/schemaSelectorDialog.fragment.xml rename to menas/ui/components/schema/selector/schemaSelectorDialog.fragment.xml diff --git a/menas-web/ui/components/schemaFieldSelector.fragment.xml b/menas/ui/components/schemaFieldSelector.fragment.xml similarity index 100% rename from menas-web/ui/components/schemaFieldSelector.fragment.xml rename to menas/ui/components/schemaFieldSelector.fragment.xml diff --git a/menas-web/ui/components/schemaTable.fragment.xml b/menas/ui/components/schemaTable.fragment.xml similarity index 100% rename from menas-web/ui/components/schemaTable.fragment.xml rename to menas/ui/components/schemaTable.fragment.xml diff --git a/menas-web/ui/components/tables/TableUtils.js b/menas/ui/components/tables/TableUtils.js similarity index 100% rename from menas-web/ui/components/tables/TableUtils.js rename to menas/ui/components/tables/TableUtils.js diff --git a/menas-web/ui/components/tables/groupDialog.fragment.xml b/menas/ui/components/tables/groupDialog.fragment.xml similarity index 100% rename from menas-web/ui/components/tables/groupDialog.fragment.xml rename to menas/ui/components/tables/groupDialog.fragment.xml diff --git a/menas-web/ui/components/tables/sortDialog.fragment.xml b/menas/ui/components/tables/sortDialog.fragment.xml similarity index 100% rename from menas-web/ui/components/tables/sortDialog.fragment.xml rename to menas/ui/components/tables/sortDialog.fragment.xml diff --git a/menas-web/ui/components/types/CronEntryType.js b/menas/ui/components/types/CronEntryType.js similarity index 100% rename from menas-web/ui/components/types/CronEntryType.js rename to menas/ui/components/types/CronEntryType.js diff --git a/menas-web/ui/components/types/NonEmptyArrType.js b/menas/ui/components/types/NonEmptyArrType.js similarity index 100% rename from menas-web/ui/components/types/NonEmptyArrType.js rename to menas/ui/components/types/NonEmptyArrType.js diff --git a/menas-web/ui/components/userInfo.fragment.xml b/menas/ui/components/userInfo.fragment.xml similarity index 100% rename from menas-web/ui/components/userInfo.fragment.xml rename to menas/ui/components/userInfo.fragment.xml diff --git a/menas-web/ui/components/validator/Validator.js b/menas/ui/components/validator/Validator.js similarity index 100% rename from menas-web/ui/components/validator/Validator.js rename to menas/ui/components/validator/Validator.js diff --git a/menas-web/ui/css/style.css b/menas/ui/css/style.css similarity index 100% rename from menas-web/ui/css/style.css rename to menas/ui/css/style.css diff --git a/menas-web/ui/favicon.ico b/menas/ui/favicon.ico similarity index 100% rename from menas-web/ui/favicon.ico rename to menas/ui/favicon.ico diff --git a/menas-web/ui/generic/formatters.js b/menas/ui/generic/formatters.js similarity index 100% rename from menas-web/ui/generic/formatters.js rename to menas/ui/generic/formatters.js diff --git a/menas-web/ui/generic/functions.js b/menas/ui/generic/functions.js similarity index 100% rename from menas-web/ui/generic/functions.js rename to menas/ui/generic/functions.js diff --git a/menas-web/ui/generic/model.js b/menas/ui/generic/model.js similarity index 100% rename from menas-web/ui/generic/model.js rename to menas/ui/generic/model.js diff --git a/menas-web/ui/generic/prop.js b/menas/ui/generic/prop.js similarity index 100% rename from menas-web/ui/generic/prop.js rename to menas/ui/generic/prop.js diff --git a/menas-web/ui/index.html b/menas/ui/index.html similarity index 100% rename from menas-web/ui/index.html rename to menas/ui/index.html diff --git a/menas-web/ui/manifest.json b/menas/ui/manifest.json similarity index 51% rename from menas-web/ui/manifest.json rename to menas/ui/manifest.json index b40622522..951dc444e 100644 --- a/menas-web/ui/manifest.json +++ b/menas/ui/manifest.json @@ -1,5 +1,5 @@ { "sap.app": { - "id": "menas-web" + "id": "menas" } } diff --git a/menas-web/ui/npm-shrinkwrap.json b/menas/ui/npm-shrinkwrap.json similarity index 99% rename from menas-web/ui/npm-shrinkwrap.json rename to menas/ui/npm-shrinkwrap.json index 7723047cb..9df770e0f 100644 --- a/menas-web/ui/npm-shrinkwrap.json +++ b/menas/ui/npm-shrinkwrap.json @@ -1,5 +1,5 @@ { - "name": "menas-web", + "name": "menas", "version": "3.0.0-SNAPSHOT", "lockfileVersion": 1, "requires": true, diff --git a/menas-web/ui/package.json b/menas/ui/package.json similarity index 89% rename from menas-web/ui/package.json rename to menas/ui/package.json index 5edd3acb1..098d63e68 100644 --- a/menas-web/ui/package.json +++ b/menas/ui/package.json @@ -1,7 +1,7 @@ { - "name": "menas-web", + "name": "menas", "version": "3.0.0-SNAPSHOT", - "description": "Menas Client", + "description": "Menas UI Client", "main": "index.html", "author": "ABSA Big Data R&D", "license": "Apache License, Version 2.0", diff --git a/menas-web/ui/service/CheckpointUtils.js b/menas/ui/service/CheckpointUtils.js similarity index 100% rename from menas-web/ui/service/CheckpointUtils.js rename to menas/ui/service/CheckpointUtils.js diff --git a/menas-web/ui/service/DialogFactory.js b/menas/ui/service/DialogFactory.js similarity index 100% rename from menas-web/ui/service/DialogFactory.js rename to menas/ui/service/DialogFactory.js diff --git a/menas-web/ui/service/EntityDialog.js b/menas/ui/service/EntityDialog.js similarity index 100% rename from menas-web/ui/service/EntityDialog.js rename to menas/ui/service/EntityDialog.js diff --git a/menas-web/ui/service/EntityService.js b/menas/ui/service/EntityService.js similarity index 100% rename from menas-web/ui/service/EntityService.js rename to menas/ui/service/EntityService.js diff --git a/menas-web/ui/service/EntityValidationService.js b/menas/ui/service/EntityValidationService.js similarity index 100% rename from menas-web/ui/service/EntityValidationService.js rename to menas/ui/service/EntityValidationService.js diff --git a/menas-web/ui/service/GenericService.js b/menas/ui/service/GenericService.js similarity index 100% rename from menas-web/ui/service/GenericService.js rename to menas/ui/service/GenericService.js diff --git a/menas-web/ui/service/HdfsService.js b/menas/ui/service/HdfsService.js similarity index 100% rename from menas-web/ui/service/HdfsService.js rename to menas/ui/service/HdfsService.js diff --git a/menas-web/ui/service/MessageProvider.js b/menas/ui/service/MessageProvider.js similarity index 100% rename from menas-web/ui/service/MessageProvider.js rename to menas/ui/service/MessageProvider.js diff --git a/menas-web/ui/service/MonitoringService.js b/menas/ui/service/MonitoringService.js similarity index 100% rename from menas-web/ui/service/MonitoringService.js rename to menas/ui/service/MonitoringService.js diff --git a/menas-web/ui/service/OozieService.js b/menas/ui/service/OozieService.js similarity index 100% rename from menas-web/ui/service/OozieService.js rename to menas/ui/service/OozieService.js diff --git a/menas-web/ui/service/PropertiesService.js b/menas/ui/service/PropertiesService.js similarity index 100% rename from menas-web/ui/service/PropertiesService.js rename to menas/ui/service/PropertiesService.js diff --git a/menas-web/ui/service/ResponseUtils.js b/menas/ui/service/ResponseUtils.js similarity index 100% rename from menas-web/ui/service/ResponseUtils.js rename to menas/ui/service/ResponseUtils.js diff --git a/menas-web/ui/service/RestDAO.js b/menas/ui/service/RestDAO.js similarity index 100% rename from menas-web/ui/service/RestDAO.js rename to menas/ui/service/RestDAO.js diff --git a/menas-web/ui/service/RuleService.js b/menas/ui/service/RuleService.js similarity index 100% rename from menas-web/ui/service/RuleService.js rename to menas/ui/service/RuleService.js diff --git a/menas-web/ui/service/RunRestDAO.js b/menas/ui/service/RunRestDAO.js similarity index 100% rename from menas-web/ui/service/RunRestDAO.js rename to menas/ui/service/RunRestDAO.js diff --git a/menas-web/ui/service/RunService.js b/menas/ui/service/RunService.js similarity index 100% rename from menas-web/ui/service/RunService.js rename to menas/ui/service/RunService.js diff --git a/menas-web/ui/service/SchemaFieldSelector.js b/menas/ui/service/SchemaFieldSelector.js similarity index 100% rename from menas-web/ui/service/SchemaFieldSelector.js rename to menas/ui/service/SchemaFieldSelector.js diff --git a/menas-web/ui/service/ValidationResult.js b/menas/ui/service/ValidationResult.js similarity index 100% rename from menas-web/ui/service/ValidationResult.js rename to menas/ui/service/ValidationResult.js diff --git a/menas-web/ui/ui5.yaml b/menas/ui/ui5.yaml similarity index 99% rename from menas-web/ui/ui5.yaml rename to menas/ui/ui5.yaml index 5ff8a0045..548295fd1 100644 --- a/menas-web/ui/ui5.yaml +++ b/menas/ui/ui5.yaml @@ -13,7 +13,7 @@ specVersion: '2.2' metadata: - name: menas-web + name: menas type: application framework: name: OpenUI5 diff --git a/pom.xml b/pom.xml index e1cb29dea..012b8da19 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ plugins-builtin spark-jobs utils - menas-web + menas @@ -200,8 +200,8 @@ true ${project.basedir}/scalastyle-config.xml - docker.io/absaoss/menas - docker.io/absaoss/menas-ui + docker.io/absaoss/menas + docker.io/absaoss/menas-ui ${project.version} docker diff --git a/rest-api/pom.xml b/rest-api/pom.xml index 2f2129ef5..fc5c25ea1 100644 --- a/rest-api/pom.xml +++ b/rest-api/pom.xml @@ -275,7 +275,7 @@ dockerfile-maven-plugin ${dockerfile.maven.version} - ${dockerfile.menas.repository} + ${dockerfile.rest-api.repository} ${dockerfile.tag} ${project.build.finalName}.war