From 8f16edb7f000bd354768f9bff9eafb6587772c2b Mon Sep 17 00:00:00 2001 From: kochetkov Date: Wed, 18 Sep 2024 15:56:19 +0300 Subject: [PATCH] disable bpmn --- backend/pom.xml | 24 - config/patches/default.cli | 3 +- .../modules/webbpm/webbpm-routing.module.ts | 40 +- pom.xml | 32 +- .../{main_page.page => main.page} | 2 +- .../main_process/main_process.bpmn2 | 822 ------------------ 6 files changed, 37 insertions(+), 886 deletions(-) rename resources/src/main/resources/business-model/main_process/{main_page.page => main.page} (99%) delete mode 100644 resources/src/main/resources/business-model/main_process/main_process.bpmn2 diff --git a/backend/pom.xml b/backend/pom.xml index 720b531..fe7bd16 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -103,30 +103,6 @@ ru.cg.webbpm.modules inject - - ru.cg.webbpm.modules.bpmn - bpmn-workflow-api - - - ru.cg.webbpm.modules.bpmn - bpmn-workflow-jbpm-api - - - ru.cg.webbpm.modules.bpmn - bpmn-workflow-jbpm - - - ru.cg.webbpm.modules.bpmn - bpmn-beans - - - ru.cg.webbpm.modules.bpmn - bpmn-variable-condition-adapter - - - ru.cg.webbpm.modules.bpmn - bpmn-deploy - ru.cg.webbpm.modules webkit-rpc diff --git a/config/patches/default.cli b/config/patches/default.cli index a965cb0..207fa05 100644 --- a/config/patches/default.cli +++ b/config/patches/default.cli @@ -61,4 +61,5 @@ xa-data-source add \ /system-property=webbpm.security.session.active.count:add(value="20") /system-property=gar.enable:add(value=false) /system-property=security.password.regex:add(value="^((?=(.*\\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$") -/system-property=fias.enable:add(value=false) \ No newline at end of file +/system-property=fias.enable:add(value=false) +/system-property=bpmn.enable:add(value=false) diff --git a/frontend/src/ts/modules/webbpm/webbpm-routing.module.ts b/frontend/src/ts/modules/webbpm/webbpm-routing.module.ts index 853adb1..3fae21a 100644 --- a/frontend/src/ts/modules/webbpm/webbpm-routing.module.ts +++ b/frontend/src/ts/modules/webbpm/webbpm-routing.module.ts @@ -1,38 +1,14 @@ import {NgModule} from "@angular/core"; import {RouterModule, Routes} from "@angular/router"; -import {HomeComponent} from "./component/home.component"; -import { - AuthenticationGuard, - HistoryLocationGuard, - TaskPageRouteResolver, - ConfirmExitGuard -} from "@webbpm/base-package"; -import {DYNAMIC_ROUTING} from "../../page.routing"; -import {TaskComponent} from "./../app/component/task.component"; -import {TaskNotFoundComponent} from "./../app/component/task-not-found.component"; +import {AuthenticationGuard, ConfirmExitGuard} from "@webbpm/base-package"; const webbpmRoutes: Routes = [ { path: '', - component: HomeComponent, + loadChildren: 'generated-sources/page-main.module#PagemainModule', canActivate: [AuthenticationGuard, ConfirmExitGuard], pathMatch: 'full', }, - { - path: 'process/:processInstanceId/task/:taskId', - component: TaskComponent, - children: DYNAMIC_ROUTING, - canActivate: [HistoryLocationGuard], - resolve: { - taskPage: TaskPageRouteResolver - }, - runGuardsAndResolvers: "always" - }, - { - path: 'process/task-not-found', - component: TaskNotFoundComponent, - canActivate: [AuthenticationGuard] - }, { path: '**', redirectTo: '', @@ -40,12 +16,12 @@ const webbpmRoutes: Routes = [ ]; @NgModule({ - imports: [RouterModule.forRoot(webbpmRoutes, { - useHash: true, - onSameUrlNavigation: "reload" - })], - exports: [RouterModule] -}) + imports: [RouterModule.forRoot(webbpmRoutes, { + useHash: true, + onSameUrlNavigation: "reload" + })], + exports: [RouterModule] + }) export class WebbpmRoutingModule { } diff --git a/pom.xml b/pom.xml index 8342be9..5996c28 100644 --- a/pom.xml +++ b/pom.xml @@ -43,12 +43,32 @@ ru.cg.webbpm.packages.base backend 3.175.1-8427v4-SNAPSHOT - - - ervu_secret.ervu_secret - backend - ${project.version} - classes + + + ru.cg.webbpm.modules.bpmn + bpmn-workflow-api + + + ru.cg.webbpm.modules.bpmn + bpmn-workflow-jbpm-api + + + ru.cg.webbpm.modules.bpmn + bpmn-workflow-jbpm + + + ru.cg.webbpm.modules.bpmn + bpmn-deploy + + + ru.cg.webbpm.modules.bpmn + bpmn-beans + + + ru.cg.webbpm.modules.bpmn + bpmn-variable-condition-adapter + + ervu_secret.ervu_secret diff --git a/resources/src/main/resources/business-model/main_process/main_page.page b/resources/src/main/resources/business-model/main_process/main.page similarity index 99% rename from resources/src/main/resources/business-model/main_process/main_page.page rename to resources/src/main/resources/business-model/main_process/main.page index 451b5c9..cd3220c 100644 --- a/resources/src/main/resources/business-model/main_process/main_page.page +++ b/resources/src/main/resources/business-model/main_process/main.page @@ -1,6 +1,6 @@ - 8ecf306d-370d-4e44-86f9-18daa13a2118 + main 3.172.7 diff --git a/resources/src/main/resources/business-model/main_process/main_process.bpmn2 b/resources/src/main/resources/business-model/main_process/main_process.bpmn2 deleted file mode 100644 index 0a92296..0000000 --- a/resources/src/main/resources/business-model/main_process/main_process.bpmn2 +++ /dev/null @@ -1,822 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - _8950F9F9-76D1-4895-A75E-956C9F382F99 - - - _E99476FE-92EF-49B1-821D-34CBE717DEFE - _E59077C9-1732-4AA5-8ADC-AA3CA4602AF1 - - - - - - _A013FE37-A99A-4114-B4B8-1D98127751E6_GroupIdInputX - _A013FE37-A99A-4114-B4B8-1D98127751E6_SkippableInputX - _A013FE37-A99A-4114-B4B8-1D98127751E6_TaskNameInputX - - - - - _A013FE37-A99A-4114-B4B8-1D98127751E6_TaskNameInputX - - main_page - _A013FE37-A99A-4114-B4B8-1D98127751E6_TaskNameInputX - - - - _A013FE37-A99A-4114-B4B8-1D98127751E6_GroupIdInputX - - - _A013FE37-A99A-4114-B4B8-1D98127751E6_GroupIdInputX - - - - _A013FE37-A99A-4114-B4B8-1D98127751E6_SkippableInputX - - true - _A013FE37-A99A-4114-B4B8-1D98127751E6_SkippableInputX - - - - - - _E59077C9-1732-4AA5-8ADC-AA3CA4602AF1 - _B1923E58-CB3E-41CD-B13C-AEBFA6280C39 - _CE023794-964A-4CF0-B2BC-C440E46E0505 - _8A9DA184-C841-48DB-9252-C97A34B28EE3 - _7BE1C79E-67E5-47F7-997A-6F0C5F2AE44A - _EF2318D8-8063-4F29-ADAB-7DD52CB21B66 - - - - _B1923E58-CB3E-41CD-B13C-AEBFA6280C39 - - - - - - _CE023794-964A-4CF0-B2BC-C440E46E0505 - _A2FD7D24-1466-4252-9DA1-3C9B3FB35DE6 - - - - - - - _081ED5EC-2AAE-48A5-AD60-79D347DA46FA_TaskNameInputX - - WebBPMTask - _081ED5EC-2AAE-48A5-AD60-79D347DA46FA_TaskNameInputX - - - - - - - - _4DFA8A70-4343-4574-A789-4897BBC8BBF9 - _A2FD7D24-1466-4252-9DA1-3C9B3FB35DE6 - _507FDBEE-52ED-415B-8A0F-99D63E3C24E5 - _CD6E3F9A-73B8-4D8C-83F5-AC34231E58ED - _8950F9F9-76D1-4895-A75E-956C9F382F99 - _7E55387A-BD94-4ABC-B29F-BEF4DED91230 - - - - _7E55387A-BD94-4ABC-B29F-BEF4DED91230 - _E99476FE-92EF-49B1-821D-34CBE717DEFE - - - - - - - _77A252FD-5879-468A-B479-CD82B97C9062_TaskNameInputX - - WebBPMTask - _77A252FD-5879-468A-B479-CD82B97C9062_TaskNameInputX - - - - - - - _8A9DA184-C841-48DB-9252-C97A34B28EE3 - _929F2F94-C458-474E-9B91-711269694F0C - - - - - - - _682D206E-5BAE-49B7-AAA5-4E0F9876F54F_TaskNameInputX - - WebBPMTask - _682D206E-5BAE-49B7-AAA5-4E0F9876F54F_TaskNameInputX - - - - - - - - _929F2F94-C458-474E-9B91-711269694F0C - _8E851A88-5578-44C0-A443-C40A630DAA64 - - - - - - - _584F6FA2-6EA7-4BB4-9828-F0C249A85466_TaskNameInputX - - WebBPMTask - _584F6FA2-6EA7-4BB4-9828-F0C249A85466_TaskNameInputX - - - - - - _8E851A88-5578-44C0-A443-C40A630DAA64 - _96ADACD9-6B73-475B-9F37-4009B0E9E8C8 - - - - - - - _3869CE5B-1912-4ADA-BE47-4EC604AC9B1E_TaskNameInputX - - WebBPMTask - _3869CE5B-1912-4ADA-BE47-4EC604AC9B1E_TaskNameInputX - - - - - - _96ADACD9-6B73-475B-9F37-4009B0E9E8C8 - _B5504569-9161-422D-801E-D8B87B1EF42F - - - - - - - _63298230-35AF-4D90-8F06-E85E79358794_TaskNameInputX - - WebBPMTask - _63298230-35AF-4D90-8F06-E85E79358794_TaskNameInputX - - - - - - _B5504569-9161-422D-801E-D8B87B1EF42F - _CD6E3F9A-73B8-4D8C-83F5-AC34231E58ED - - - - - - - _E5313421-3661-4DE2-B2C4-36FC20452266_TaskNameInputX - - WebBPMTask - _E5313421-3661-4DE2-B2C4-36FC20452266_TaskNameInputX - - - - - - - _7BE1C79E-67E5-47F7-997A-6F0C5F2AE44A - _4EE09E65-20EA-48AA-BEC5-D5F6C456ACE5 - - - - - - - _01A2D763-A7F7-4E2E-9526-C60319FD2C30_TaskNameInputX - - WebBPMTask - _01A2D763-A7F7-4E2E-9526-C60319FD2C30_TaskNameInputX - - - - - - - - _4EE09E65-20EA-48AA-BEC5-D5F6C456ACE5 - _4DFA8A70-4343-4574-A789-4897BBC8BBF9 - - - - - - - _F80FBCEB-B0E4-45E0-9965-320FF229F45B_TaskNameInputX - - WebBPMTask - _F80FBCEB-B0E4-45E0-9965-320FF229F45B_TaskNameInputX - - - - - - - _70EFDFE0-B462-49AE-93D7-EC65FF9690BD - _34FA75DB-A421-47A8-821A-78F505D25989 - - - - - - - _75BF8DBE-29C2-437C-AD2A-8EB0B5A31965_TaskNameInputX - - WebBPMTask - _75BF8DBE-29C2-437C-AD2A-8EB0B5A31965_TaskNameInputX - - - - - - - - _34FA75DB-A421-47A8-821A-78F505D25989 - _C9203C88-EA91-4AFE-8E7D-F7E87B7F8EFA - - - - - - - _BF21F32F-D703-423C-A722-C2BF5F2810D7_TaskNameInputX - - WebBPMTask - _BF21F32F-D703-423C-A722-C2BF5F2810D7_TaskNameInputX - - - - - - _EF2318D8-8063-4F29-ADAB-7DD52CB21B66 - _70EFDFE0-B462-49AE-93D7-EC65FF9690BD - - - - - - - _9639FD50-F761-4963-ADBF-8397C2D41D06_TaskNameInputX - - WebBPMTask - _9639FD50-F761-4963-ADBF-8397C2D41D06_TaskNameInputX - - - - - - _C9203C88-EA91-4AFE-8E7D-F7E87B7F8EFA - _507FDBEE-52ED-415B-8A0F-99D63E3C24E5 - - - - - - - _0CF0AE55-CCD0-4AE8-879D-8C483FD8CA8C_TaskNameInputX - - WebBPMTask - _0CF0AE55-CCD0-4AE8-879D-8C483FD8CA8C_TaskNameInputX - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - _jiTNwFPZEe-z9JrZ7m_Jiw - _jiTNwFPZEe-z9JrZ7m_Jiw - -