From 1428df22af27d3065dfe5f0ce2da010dbff8eaaa Mon Sep 17 00:00:00 2001 From: Alex Nikonov Date: Tue, 30 Jul 2024 09:33:37 +0200 Subject: [PATCH] feat!: rename to interceptor-manager (#71) --- CHANGELOG.md | 54 +++++++++---------- README.md | 14 +++-- pom.xml | 17 +++--- .../InterceptorAdminUiServlet.java | 14 ----- .../DataServiceInterceptor.java | 8 +-- .../DataServiceInterceptorFactory.java | 6 +-- .../InterceptorManagerAdminUiServlet.java | 14 +++++ .../model/ActionHook.java | 6 +-- .../model/HookExecutor.java | 2 +- .../model/HooksRegistry.java | 6 +-- .../InterceptorManagerRestApplication.java} | 12 ++--- .../rest/controller/HooksApiController.java | 4 +- .../controller/HooksInternalController.java | 6 +-- .../HooksSettingsApiController.java | 2 +- .../HooksSettingsInternalController.java | 2 +- .../settings/HookModel.java | 2 +- .../settings/HookSettings.java | 4 +- .../util/HookJarUtils.java | 4 +- .../util/HookManifestUtils.java | 4 +- .../util/PropertiesUtils.java | 2 +- src/main/resources/META-INF/MANIFEST.MF | 4 +- src/main/resources/META-INF/hivemodule.xml | 16 +++--- src/main/resources/plugin.xml | 8 +-- .../WEB-INF/web.xml | 8 +-- .../css/interceptor-admin.css | 0 .../html/.gitkeep | 0 .../images/app-icon.svg | 0 .../js/settings.js | 2 +- .../pages/about.jsp | 0 .../pages/settings.jsp | 6 +-- .../WEB-INF/web.xml | 8 +-- .../util/PropertiesUtilsTest.java | 2 +- 32 files changed, 121 insertions(+), 116 deletions(-) delete mode 100644 src/main/java/ch/sbb/polarion/extension/interceptor/InterceptorAdminUiServlet.java rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/DataServiceInterceptor.java (86%) rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/DataServiceInterceptorFactory.java (96%) create mode 100644 src/main/java/ch/sbb/polarion/extension/interceptor_manager/InterceptorManagerAdminUiServlet.java rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/model/ActionHook.java (96%) rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/model/HookExecutor.java (93%) rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/model/HooksRegistry.java (79%) rename src/main/java/ch/sbb/polarion/extension/{interceptor/rest/InterceptorRestApplication.java => interceptor_manager/rest/InterceptorManagerRestApplication.java} (58%) rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/rest/controller/HooksApiController.java (71%) rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/rest/controller/HooksInternalController.java (84%) rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/rest/controller/HooksSettingsApiController.java (94%) rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/rest/controller/HooksSettingsInternalController.java (97%) rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/settings/HookModel.java (96%) rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/settings/HookSettings.java (85%) rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/util/HookJarUtils.java (96%) rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/util/HookManifestUtils.java (93%) rename src/main/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/util/PropertiesUtils.java (96%) rename src/main/resources/webapp/{interceptor-admin => interceptor-manager-admin}/WEB-INF/web.xml (86%) rename src/main/resources/webapp/{interceptor-admin => interceptor-manager-admin}/css/interceptor-admin.css (100%) rename src/main/resources/webapp/{interceptor-admin => interceptor-manager-admin}/html/.gitkeep (100%) rename src/main/resources/webapp/{interceptor-admin => interceptor-manager-admin}/images/app-icon.svg (100%) rename src/main/resources/webapp/{interceptor-admin => interceptor-manager-admin}/js/settings.js (99%) rename src/main/resources/webapp/{interceptor-admin => interceptor-manager-admin}/pages/about.jsp (100%) rename src/main/resources/webapp/{interceptor-admin => interceptor-manager-admin}/pages/settings.jsp (94%) rename src/main/resources/webapp/{interceptor => interceptor-manager}/WEB-INF/web.xml (90%) rename src/test/java/ch/sbb/polarion/extension/{interceptor => interceptor_manager}/util/PropertiesUtilsTest.java (92%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae2d5ae..19a7727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,80 +1,80 @@ # Changelog -## [2.3.0](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/compare/v2.2.0...v2.3.0) (2024-07-18) +## [2.3.0](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/compare/v2.2.0...v2.3.0) (2024-07-18) ### Features -* app icon added ([#60](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/60)) ([6999a3b](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/6999a3ba90fb18fab7ebc855d3965d5d6e99b991)) -* migration to generic v6.2.0 ([#62](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/62)) ([2d35fc9](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/2d35fc9c71adbc11616093be6658e82cede9c4ff)) -* support for IModuleComment and IWorkRecord ([#65](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/65)) ([e183022](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/e18302269df6bda6e87b8f3ac3f23410efcfcfb4)), closes [#64](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/64) +* app icon added ([#60](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/60)) ([6999a3b](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/6999a3ba90fb18fab7ebc855d3965d5d6e99b991)) +* migration to generic v6.2.0 ([#62](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/62)) ([2d35fc9](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/2d35fc9c71adbc11616093be6658e82cede9c4ff)) +* support for IModuleComment and IWorkRecord ([#65](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/65)) ([e183022](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/e18302269df6bda6e87b8f3ac3f23410efcfcfb4)), closes [#64](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/64) ### Bug Fixes -* **deps:** update dependency ch.sbb.polarion.extensions:ch.sbb.polarion.extension.generic to v6.1.0 ([f327f3c](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/f327f3c5d0fb0704cd621b1b9ffdab8e8a480cd7)) -* **deps:** update dependency ch.sbb.polarion.extensions:ch.sbb.polarion.extension.generic to v6.2.0 ([e1aaac9](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/e1aaac95955441bf598cdbacaa173601125d3684)) -* **deps:** update dependency ch.sbb.polarion.extensions:ch.sbb.polarion.extension.generic to v6.3.0 ([8028b60](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/8028b60d8f5dad297d885c6f7c9bc3f053c4d829)) +* **deps:** update dependency ch.sbb.polarion.extensions:ch.sbb.polarion.extension.generic to v6.1.0 ([f327f3c](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/f327f3c5d0fb0704cd621b1b9ffdab8e8a480cd7)) +* **deps:** update dependency ch.sbb.polarion.extensions:ch.sbb.polarion.extension.generic to v6.2.0 ([e1aaac9](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/e1aaac95955441bf598cdbacaa173601125d3684)) +* **deps:** update dependency ch.sbb.polarion.extensions:ch.sbb.polarion.extension.generic to v6.3.0 ([8028b60](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/8028b60d8f5dad297d885c6f7c9bc3f053c4d829)) -## [2.2.0](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/compare/v2.1.0...v2.2.0) (2024-07-03) +## [2.2.0](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/compare/v2.1.0...v2.2.0) (2024-07-03) ### Features -* about page help generated from README.md ([#53](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/53)) ([f8d482b](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/f8d482b898ff0b59dc8a5f654fd33546b8f7c1fa)) -* migrate to generic v6.0.1 ([#56](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/56)) ([b5eb9dc](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/b5eb9dcb31cc3cbf205326dca94dd7b54c99204f)) +* about page help generated from README.md ([#53](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/53)) ([f8d482b](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/f8d482b898ff0b59dc8a5f654fd33546b8f7c1fa)) +* migrate to generic v6.0.1 ([#56](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/56)) ([b5eb9dc](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/b5eb9dcb31cc3cbf205326dca94dd7b54c99204f)) ### Bug Fixes -* **deps:** update dependency ch.sbb.polarion.extensions:ch.sbb.polarion.extension.generic to v6.0.2 ([5fab00a](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/5fab00abeb4fd130b528bed1868d59346701e725)) -* display version of installed hooks ([#55](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/55)) ([9deb61d](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/9deb61d36ddde6e974645490176d6cc9ced4e96b)) +* **deps:** update dependency ch.sbb.polarion.extensions:ch.sbb.polarion.extension.generic to v6.0.2 ([5fab00a](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/5fab00abeb4fd130b528bed1868d59346701e725)) +* display version of installed hooks ([#55](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/55)) ([9deb61d](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/9deb61d36ddde6e974645490176d6cc9ced4e96b)) -## [2.1.0](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/compare/v2.0.0...v2.1.0) (2024-06-20) +## [2.1.0](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/compare/v2.0.0...v2.1.0) (2024-06-20) ### Features -* Hook should be disabled by default. ([#49](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/49)) ([30409f7](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/30409f734047245a3011798b46b48eda5e678433)) -* the version of hook should not be stored in Java code, but read… ([#50](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/50)) ([d4c78c0](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/d4c78c0ecd87637d006aa0f7e6daadced1807464)) +* Hook should be disabled by default. ([#49](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/49)) ([30409f7](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/30409f734047245a3011798b46b48eda5e678433)) +* the version of hook should not be stored in Java code, but read… ([#50](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/50)) ([d4c78c0](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/d4c78c0ecd87637d006aa0f7e6daadced1807464)) -## [2.0.0](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/compare/v1.1.1...v2.0.0) (2024-06-04) +## [2.0.0](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/compare/v1.1.1...v2.0.0) (2024-06-04) ### ⚠ BREAKING CHANGES * save/delete methods proxy calls improvement, introduced separate pre&post hook methods -* save/delete methods proxy calls improvement, introduced separa… ([#39](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/39)) -* ch.sbb.polarion.extension.generic usage ([#36](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/36)) +* save/delete methods proxy calls improvement, introduced separa… ([#39](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/39)) +* ch.sbb.polarion.extension.generic usage ([#36](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/36)) ### Features -* ch.sbb.polarion.extension.generic usage ([#36](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/36)) ([ca4ca3b](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/ca4ca3b418a2aadce21d2340fa651ee09703c601)) -* save/delete methods proxy calls improvement, introduced separa… ([#39](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/39)) ([3176de3](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/3176de34ea5842b292539b9cd981f3521f7e4af8)) -* save/delete methods proxy calls improvement, introduced separate pre&post hook methods ([3176de3](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/3176de34ea5842b292539b9cd981f3521f7e4af8)) +* ch.sbb.polarion.extension.generic usage ([#36](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/36)) ([ca4ca3b](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/ca4ca3b418a2aadce21d2340fa651ee09703c601)) +* save/delete methods proxy calls improvement, introduced separa… ([#39](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/39)) ([3176de3](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/3176de34ea5842b292539b9cd981f3521f7e4af8)) +* save/delete methods proxy calls improvement, introduced separate pre&post hook methods ([3176de3](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/3176de34ea5842b292539b9cd981f3521f7e4af8)) -## [1.1.1](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/compare/v1.1.0...v1.1.1) (2024-03-05) +## [1.1.1](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/compare/v1.1.0...v1.1.1) (2024-03-05) ### Bug Fixes -* Fix settings save in nested transaction. ([#23](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/23)) ([775269b](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/775269b7c6ad7f05f2275289ba3809e91f698098)) +* Fix settings save in nested transaction. ([#23](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/23)) ([775269b](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/775269b7c6ad7f05f2275289ba3809e91f698098)) -## [1.1.0](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/compare/v1.0.0...v1.1.0) (2024-01-18) +## [1.1.0](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/compare/v1.0.0...v1.1.0) (2024-01-18) ### Features -* one hook can be applied for multiple object instances and example added ([#16](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/16)) ([a68cb06](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/a68cb06045f4fd5d9c27370b79a4f4f47dbc20da)) +* one hook can be applied for multiple object instances and example added ([#16](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/16)) ([a68cb06](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/a68cb06045f4fd5d9c27370b79a4f4f47dbc20da)) ### Bug Fixes -* add missing deployment profiles ([#12](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/12)) ([b8d7102](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/b8d7102d76b49796c9ba313111afff5f928d5f87)) +* add missing deployment profiles ([#12](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/12)) ([b8d7102](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/b8d7102d76b49796c9ba313111afff5f928d5f87)) ## 1.0.0 (2024-01-16) ### Features -* initial implementation ([#2](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues/2)) ([e5f0955](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/commit/e5f095500d039356234a33ec6759b7c0ed8d1707)) +* initial implementation ([#2](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues/2)) ([e5f0955](https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/commit/e5f095500d039356234a33ec6759b7c0ed8d1707)) diff --git a/README.md b/README.md index decc125..9685c21 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ mvn clean package ## Installation to Polarion -To install extension to Polarion `ch.sbb.polarion.extension.interceptor-.jar` -should be copied to `/polarion/extensions/ch.sbb.polarion.extension.interceptor/eclipse/plugins`. +To install extension to Polarion `ch.sbb.polarion.extension.interceptor-manager-.jar` +should be copied to `/polarion/extensions/ch.sbb.polarion.extension.interceptor-manager/eclipse/plugins`. It can be done manually or automated using maven build: ```bash mvn clean install -P install-to-local-polarion @@ -23,16 +23,20 @@ Changes only take effect after restart of Polarion. ## Polarion configuration -### Interceptor settings/customization -Use Administration -> Interceptor -> Settings page to enable/disable or set specific properties for each existing hook. +### Interceptor Manager settings/customization +Use Administration -> Interceptor Manager -> Settings page to enable/disable or set specific properties for each existing hook. ### Hooks installation -Copy hook jar to hooks folder (`/polarion/extensions/ch.sbb.polarion.extension.interceptor/eclipse/plugins/hooks`) and enforce hooks reloading from the settings page or restart Polarion. +Copy hook jar to hooks folder (`/polarion/extensions/ch.sbb.polarion.extension.interceptor-manager/eclipse/plugins/hooks`) and enforce hooks reloading from the settings page or restart Polarion. By default, newly added hooks are disabled and must be enabled manually. ## Upgrade +### Upgrade from version 2.x.x to 3.0.0 +Version 3.0.0 has received significant change - project+package rename. Verify you're using the new subfolder name in the `extensions` folder. +Also, this change prevents previous hooks versions from working. They must be replaced with the new ones built especially for v.3.0.0+. Note that doing this will reset hooks settings tho their default values, so do not forget to backup your actual settings to restore them after update. + ### Upgrade from version 1.x.x to 2.0.0 Version 2.0.0 requires the new hooks model therefore hooks built for 1.x.x will stop working. They must be replaced with the new ones built especially for v.2.0.0+. Also the new version introduced some significant internal settings model changes/improvements which have made old settings data incompatible. This means that during the first run all settings will be reset to their default values (unfortunately revisions history will be lost too). diff --git a/pom.xml b/pom.xml index e9c2946..ef91fe0 100644 --- a/pom.xml +++ b/pom.xml @@ -8,18 +8,18 @@ 6.4.0 - ch.sbb.polarion.extension.interceptor + ch.sbb.polarion.extension.interceptor-manager 2.3.1-SNAPSHOT jar Polarion ALM extension to execute validation during save/delete actions This Polarion extension provides possibility to run custom Java code (via hooks), before Polarion saves/deletes a Work Item, Document, Plan or Test Run. - https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor + https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager The SBB License, Version 1.0 - https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/blob/main/LICENSES/SBB.txt + https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/blob/main/LICENSES/SBB.txt @@ -33,18 +33,19 @@ - scm:git:git://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor.git - scm:git:ssh://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor.git - https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/tree/main + scm:git:git://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager.git + scm:git:ssh://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager.git + https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/tree/main GitHub - https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor/issues + https://github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor-manager/issues - interceptor + interceptor-manager + ch.sbb.polarion.extension.interceptor_manager ${maven-jar-plugin.Extension-Context} diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/InterceptorAdminUiServlet.java b/src/main/java/ch/sbb/polarion/extension/interceptor/InterceptorAdminUiServlet.java deleted file mode 100644 index 08431bd..0000000 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/InterceptorAdminUiServlet.java +++ /dev/null @@ -1,14 +0,0 @@ -package ch.sbb.polarion.extension.interceptor; - -import ch.sbb.polarion.extension.generic.GenericUiServlet; - -import java.io.Serial; - -public class InterceptorAdminUiServlet extends GenericUiServlet { - @Serial - private static final long serialVersionUID = 1652935384860901702L; - - public InterceptorAdminUiServlet() { - super("interceptor-admin"); - } -} diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/DataServiceInterceptor.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/DataServiceInterceptor.java similarity index 86% rename from src/main/java/ch/sbb/polarion/extension/interceptor/DataServiceInterceptor.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/DataServiceInterceptor.java index d4bd1a0..3f5c97a 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/DataServiceInterceptor.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/DataServiceInterceptor.java @@ -1,8 +1,8 @@ -package ch.sbb.polarion.extension.interceptor; +package ch.sbb.polarion.extension.interceptor_manager; -import ch.sbb.polarion.extension.interceptor.model.ActionHook; -import ch.sbb.polarion.extension.interceptor.model.HookExecutor; -import ch.sbb.polarion.extension.interceptor.model.HooksRegistry; +import ch.sbb.polarion.extension.interceptor_manager.model.ActionHook; +import ch.sbb.polarion.extension.interceptor_manager.model.HookExecutor; +import ch.sbb.polarion.extension.interceptor_manager.model.HooksRegistry; import com.polarion.core.util.StringUtils; import com.polarion.core.util.exceptions.UserFriendlyRuntimeException; import com.polarion.core.util.logging.Logger; diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/DataServiceInterceptorFactory.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/DataServiceInterceptorFactory.java similarity index 96% rename from src/main/java/ch/sbb/polarion/extension/interceptor/DataServiceInterceptorFactory.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/DataServiceInterceptorFactory.java index 8178be1..faacd9d 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/DataServiceInterceptorFactory.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/DataServiceInterceptorFactory.java @@ -1,7 +1,7 @@ -package ch.sbb.polarion.extension.interceptor; +package ch.sbb.polarion.extension.interceptor_manager; -import ch.sbb.polarion.extension.interceptor.model.ActionHook; -import ch.sbb.polarion.extension.interceptor.model.HooksRegistry; +import ch.sbb.polarion.extension.interceptor_manager.model.ActionHook; +import ch.sbb.polarion.extension.interceptor_manager.model.HooksRegistry; import com.polarion.platform.persistence.model.IPObject; import org.apache.hivemind.InterceptorStack; import org.apache.hivemind.ServiceInterceptorFactory; diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor_manager/InterceptorManagerAdminUiServlet.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/InterceptorManagerAdminUiServlet.java new file mode 100644 index 0000000..41da5c2 --- /dev/null +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/InterceptorManagerAdminUiServlet.java @@ -0,0 +1,14 @@ +package ch.sbb.polarion.extension.interceptor_manager; + +import ch.sbb.polarion.extension.generic.GenericUiServlet; + +import java.io.Serial; + +public class InterceptorManagerAdminUiServlet extends GenericUiServlet { + @Serial + private static final long serialVersionUID = 1652935384860901702L; + + public InterceptorManagerAdminUiServlet() { + super("interceptor-manager-admin"); + } +} diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/model/ActionHook.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/model/ActionHook.java similarity index 96% rename from src/main/java/ch/sbb/polarion/extension/interceptor/model/ActionHook.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/model/ActionHook.java index 48dca7c..bc28985 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/model/ActionHook.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/model/ActionHook.java @@ -1,10 +1,10 @@ -package ch.sbb.polarion.extension.interceptor.model; +package ch.sbb.polarion.extension.interceptor_manager.model; import ch.sbb.polarion.extension.generic.settings.NamedSettings; import ch.sbb.polarion.extension.generic.settings.NamedSettingsRegistry; import ch.sbb.polarion.extension.generic.settings.SettingId; -import ch.sbb.polarion.extension.interceptor.settings.HookModel; -import ch.sbb.polarion.extension.interceptor.util.HookManifestUtils; +import ch.sbb.polarion.extension.interceptor_manager.settings.HookModel; +import ch.sbb.polarion.extension.interceptor_manager.util.HookManifestUtils; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.polarion.alm.projects.model.IUniqueObject; diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/model/HookExecutor.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/model/HookExecutor.java similarity index 93% rename from src/main/java/ch/sbb/polarion/extension/interceptor/model/HookExecutor.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/model/HookExecutor.java index d4d1172..edf4f66 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/model/HookExecutor.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/model/HookExecutor.java @@ -1,4 +1,4 @@ -package ch.sbb.polarion.extension.interceptor.model; +package ch.sbb.polarion.extension.interceptor_manager.model; import com.polarion.platform.persistence.model.IPObject; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/model/HooksRegistry.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/model/HooksRegistry.java similarity index 79% rename from src/main/java/ch/sbb/polarion/extension/interceptor/model/HooksRegistry.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/model/HooksRegistry.java index ce712f1..71a30e7 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/model/HooksRegistry.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/model/HooksRegistry.java @@ -1,8 +1,8 @@ -package ch.sbb.polarion.extension.interceptor.model; +package ch.sbb.polarion.extension.interceptor_manager.model; import ch.sbb.polarion.extension.generic.settings.NamedSettingsRegistry; -import ch.sbb.polarion.extension.interceptor.settings.HookSettings; -import ch.sbb.polarion.extension.interceptor.util.HookJarUtils; +import ch.sbb.polarion.extension.interceptor_manager.settings.HookSettings; +import ch.sbb.polarion.extension.interceptor_manager.util.HookJarUtils; import com.polarion.core.util.logging.Logger; import java.util.ArrayList; diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/rest/InterceptorRestApplication.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/InterceptorManagerRestApplication.java similarity index 58% rename from src/main/java/ch/sbb/polarion/extension/interceptor/rest/InterceptorRestApplication.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/InterceptorManagerRestApplication.java index 38609cb..b49d98f 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/rest/InterceptorRestApplication.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/InterceptorManagerRestApplication.java @@ -1,16 +1,16 @@ -package ch.sbb.polarion.extension.interceptor.rest; +package ch.sbb.polarion.extension.interceptor_manager.rest; import ch.sbb.polarion.extension.generic.rest.GenericRestApplication; import ch.sbb.polarion.extension.generic.rest.controller.NamedSettingsInternalController; -import ch.sbb.polarion.extension.interceptor.rest.controller.HooksApiController; -import ch.sbb.polarion.extension.interceptor.rest.controller.HooksInternalController; -import ch.sbb.polarion.extension.interceptor.rest.controller.HooksSettingsApiController; -import ch.sbb.polarion.extension.interceptor.rest.controller.HooksSettingsInternalController; +import ch.sbb.polarion.extension.interceptor_manager.rest.controller.HooksApiController; +import ch.sbb.polarion.extension.interceptor_manager.rest.controller.HooksInternalController; +import ch.sbb.polarion.extension.interceptor_manager.rest.controller.HooksSettingsApiController; +import ch.sbb.polarion.extension.interceptor_manager.rest.controller.HooksSettingsInternalController; import org.jetbrains.annotations.NotNull; import java.util.Set; -public class InterceptorRestApplication extends GenericRestApplication { +public class InterceptorManagerRestApplication extends GenericRestApplication { @Override protected @NotNull Set getExtensionControllerSingletons() { diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/rest/controller/HooksApiController.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/controller/HooksApiController.java similarity index 71% rename from src/main/java/ch/sbb/polarion/extension/interceptor/rest/controller/HooksApiController.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/controller/HooksApiController.java index 012c830..c3aed85 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/rest/controller/HooksApiController.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/controller/HooksApiController.java @@ -1,7 +1,7 @@ -package ch.sbb.polarion.extension.interceptor.rest.controller; +package ch.sbb.polarion.extension.interceptor_manager.rest.controller; import ch.sbb.polarion.extension.generic.rest.filter.Secured; -import ch.sbb.polarion.extension.interceptor.model.ActionHook; +import ch.sbb.polarion.extension.interceptor_manager.model.ActionHook; import javax.ws.rs.Path; import java.util.List; diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/rest/controller/HooksInternalController.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/controller/HooksInternalController.java similarity index 84% rename from src/main/java/ch/sbb/polarion/extension/interceptor/rest/controller/HooksInternalController.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/controller/HooksInternalController.java index 370527a..7c6ad3d 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/rest/controller/HooksInternalController.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/controller/HooksInternalController.java @@ -1,8 +1,8 @@ -package ch.sbb.polarion.extension.interceptor.rest.controller; +package ch.sbb.polarion.extension.interceptor_manager.rest.controller; import ch.sbb.polarion.extension.generic.service.PolarionService; -import ch.sbb.polarion.extension.interceptor.model.ActionHook; -import ch.sbb.polarion.extension.interceptor.model.HooksRegistry; +import ch.sbb.polarion.extension.interceptor_manager.model.ActionHook; +import ch.sbb.polarion.extension.interceptor_manager.model.HooksRegistry; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/rest/controller/HooksSettingsApiController.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/controller/HooksSettingsApiController.java similarity index 94% rename from src/main/java/ch/sbb/polarion/extension/interceptor/rest/controller/HooksSettingsApiController.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/controller/HooksSettingsApiController.java index 7942c75..5ad6a44 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/rest/controller/HooksSettingsApiController.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/controller/HooksSettingsApiController.java @@ -1,4 +1,4 @@ -package ch.sbb.polarion.extension.interceptor.rest.controller; +package ch.sbb.polarion.extension.interceptor_manager.rest.controller; import ch.sbb.polarion.extension.generic.rest.filter.Secured; import ch.sbb.polarion.extension.generic.service.PolarionService; diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/rest/controller/HooksSettingsInternalController.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/controller/HooksSettingsInternalController.java similarity index 97% rename from src/main/java/ch/sbb/polarion/extension/interceptor/rest/controller/HooksSettingsInternalController.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/controller/HooksSettingsInternalController.java index 2bfc246..43eec78 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/rest/controller/HooksSettingsInternalController.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/rest/controller/HooksSettingsInternalController.java @@ -1,4 +1,4 @@ -package ch.sbb.polarion.extension.interceptor.rest.controller; +package ch.sbb.polarion.extension.interceptor_manager.rest.controller; import ch.sbb.polarion.extension.generic.rest.controller.NamedSettingsInternalController; import ch.sbb.polarion.extension.generic.settings.NamedSettings; diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/settings/HookModel.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/settings/HookModel.java similarity index 96% rename from src/main/java/ch/sbb/polarion/extension/interceptor/settings/HookModel.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/settings/HookModel.java index 32c9eae..9d51743 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/settings/HookModel.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/settings/HookModel.java @@ -1,4 +1,4 @@ -package ch.sbb.polarion.extension.interceptor.settings; +package ch.sbb.polarion.extension.interceptor_manager.settings; import ch.sbb.polarion.extension.generic.settings.SettingsModel; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/settings/HookSettings.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/settings/HookSettings.java similarity index 85% rename from src/main/java/ch/sbb/polarion/extension/interceptor/settings/HookSettings.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/settings/HookSettings.java index e5649a0..6a0709b 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/settings/HookSettings.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/settings/HookSettings.java @@ -1,7 +1,7 @@ -package ch.sbb.polarion.extension.interceptor.settings; +package ch.sbb.polarion.extension.interceptor_manager.settings; import ch.sbb.polarion.extension.generic.settings.GenericNamedSettings; -import ch.sbb.polarion.extension.interceptor.model.ActionHook; +import ch.sbb.polarion.extension.interceptor_manager.model.ActionHook; import org.jetbrains.annotations.NotNull; public class HookSettings extends GenericNamedSettings { diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/util/HookJarUtils.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/util/HookJarUtils.java similarity index 96% rename from src/main/java/ch/sbb/polarion/extension/interceptor/util/HookJarUtils.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/util/HookJarUtils.java index a9e8f5d..c6f4ede 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/util/HookJarUtils.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/util/HookJarUtils.java @@ -1,6 +1,6 @@ -package ch.sbb.polarion.extension.interceptor.util; +package ch.sbb.polarion.extension.interceptor_manager.util; -import ch.sbb.polarion.extension.interceptor.model.ActionHook; +import ch.sbb.polarion.extension.interceptor_manager.model.ActionHook; import com.polarion.core.util.logging.Logger; import lombok.experimental.UtilityClass; diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/util/HookManifestUtils.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/util/HookManifestUtils.java similarity index 93% rename from src/main/java/ch/sbb/polarion/extension/interceptor/util/HookManifestUtils.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/util/HookManifestUtils.java index 3503b17..dd7bfff 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/util/HookManifestUtils.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/util/HookManifestUtils.java @@ -1,6 +1,6 @@ -package ch.sbb.polarion.extension.interceptor.util; +package ch.sbb.polarion.extension.interceptor_manager.util; -import ch.sbb.polarion.extension.interceptor.model.ActionHook; +import ch.sbb.polarion.extension.interceptor_manager.model.ActionHook; import lombok.experimental.UtilityClass; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/ch/sbb/polarion/extension/interceptor/util/PropertiesUtils.java b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/util/PropertiesUtils.java similarity index 96% rename from src/main/java/ch/sbb/polarion/extension/interceptor/util/PropertiesUtils.java rename to src/main/java/ch/sbb/polarion/extension/interceptor_manager/util/PropertiesUtils.java index 75f1c0c..1b62411 100644 --- a/src/main/java/ch/sbb/polarion/extension/interceptor/util/PropertiesUtils.java +++ b/src/main/java/ch/sbb/polarion/extension/interceptor_manager/util/PropertiesUtils.java @@ -1,4 +1,4 @@ -package ch.sbb.polarion.extension.interceptor.util; +package ch.sbb.polarion.extension.interceptor_manager.util; import lombok.experimental.UtilityClass; diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF index f87c0a5..af53de0 100644 --- a/src/main/resources/META-INF/MANIFEST.MF +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Support-Email: polarion-opensource@sbb.ch -Bundle-Name: Interceptor Extension for Polarion ALM +Bundle-Name: Interceptor Manager Extension for Polarion ALM Require-Bundle: com.polarion.portal.tomcat, com.polarion.alm.ui, com.polarion.alm.tracker, @@ -10,4 +10,4 @@ Require-Bundle: com.polarion.portal.tomcat, org.springframework.spring-web, org.apache.commons.logging, org.apache.hivemind -Export-Package: ch.sbb.polarion.extension.interceptor +Export-Package: ch.sbb.polarion.extension.interceptor_manager diff --git a/src/main/resources/META-INF/hivemodule.xml b/src/main/resources/META-INF/hivemodule.xml index 0f751a8..ecb6cbc 100644 --- a/src/main/resources/META-INF/hivemodule.xml +++ b/src/main/resources/META-INF/hivemodule.xml @@ -1,9 +1,9 @@ - + - + @@ -16,24 +16,24 @@ diff --git a/src/main/resources/plugin.xml b/src/main/resources/plugin.xml index e3a04d0..2add8b4 100644 --- a/src/main/resources/plugin.xml +++ b/src/main/resources/plugin.xml @@ -4,15 +4,15 @@ + name="polarion/interceptor-manager" + contextRoot="webapp/interceptor-manager"> + name="polarion/interceptor-manager-admin" + contextRoot="webapp/interceptor-manager-admin"> \ No newline at end of file diff --git a/src/main/resources/webapp/interceptor-admin/WEB-INF/web.xml b/src/main/resources/webapp/interceptor-manager-admin/WEB-INF/web.xml similarity index 86% rename from src/main/resources/webapp/interceptor-admin/WEB-INF/web.xml rename to src/main/resources/webapp/interceptor-manager-admin/WEB-INF/web.xml index 3f5ab20..9c568f5 100644 --- a/src/main/resources/webapp/interceptor-admin/WEB-INF/web.xml +++ b/src/main/resources/webapp/interceptor-manager-admin/WEB-INF/web.xml @@ -8,7 +8,7 @@ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - interceptor-admin + interceptor-manager-admin DoAsFilter @@ -29,8 +29,8 @@ - interceptor-ui - ch.sbb.polarion.extension.interceptor.InterceptorAdminUiServlet + interceptor-manager-ui + ch.sbb.polarion.extension.interceptor_manager.InterceptorManagerAdminUiServlet debug @@ -40,7 +40,7 @@ - interceptor-ui + interceptor-manager-ui /ui/* diff --git a/src/main/resources/webapp/interceptor-admin/css/interceptor-admin.css b/src/main/resources/webapp/interceptor-manager-admin/css/interceptor-admin.css similarity index 100% rename from src/main/resources/webapp/interceptor-admin/css/interceptor-admin.css rename to src/main/resources/webapp/interceptor-manager-admin/css/interceptor-admin.css diff --git a/src/main/resources/webapp/interceptor-admin/html/.gitkeep b/src/main/resources/webapp/interceptor-manager-admin/html/.gitkeep similarity index 100% rename from src/main/resources/webapp/interceptor-admin/html/.gitkeep rename to src/main/resources/webapp/interceptor-manager-admin/html/.gitkeep diff --git a/src/main/resources/webapp/interceptor-admin/images/app-icon.svg b/src/main/resources/webapp/interceptor-manager-admin/images/app-icon.svg similarity index 100% rename from src/main/resources/webapp/interceptor-admin/images/app-icon.svg rename to src/main/resources/webapp/interceptor-manager-admin/images/app-icon.svg diff --git a/src/main/resources/webapp/interceptor-admin/js/settings.js b/src/main/resources/webapp/interceptor-manager-admin/js/settings.js similarity index 99% rename from src/main/resources/webapp/interceptor-admin/js/settings.js rename to src/main/resources/webapp/interceptor-manager-admin/js/settings.js index 0d9c03f..6ccb7cb 100644 --- a/src/main/resources/webapp/interceptor-admin/js/settings.js +++ b/src/main/resources/webapp/interceptor-manager-admin/js/settings.js @@ -1,6 +1,6 @@ const DEFAULT_SETTING_NAME = 'Default'; SbbCommon.init({ - extension: 'interceptor', + extension: 'interceptor-manager', setting: 'hook', scope: SbbCommon.getValueById('scope'), initCodeInput: true, diff --git a/src/main/resources/webapp/interceptor-admin/pages/about.jsp b/src/main/resources/webapp/interceptor-manager-admin/pages/about.jsp similarity index 100% rename from src/main/resources/webapp/interceptor-admin/pages/about.jsp rename to src/main/resources/webapp/interceptor-manager-admin/pages/about.jsp diff --git a/src/main/resources/webapp/interceptor-admin/pages/settings.jsp b/src/main/resources/webapp/interceptor-manager-admin/pages/settings.jsp similarity index 94% rename from src/main/resources/webapp/interceptor-admin/pages/settings.jsp rename to src/main/resources/webapp/interceptor-manager-admin/pages/settings.jsp index 4a4dba6..fae81b4 100644 --- a/src/main/resources/webapp/interceptor-admin/pages/settings.jsp +++ b/src/main/resources/webapp/interceptor-manager-admin/pages/settings.jsp @@ -4,7 +4,7 @@ <%! String bundleTimestamp = ch.sbb.polarion.extension.generic.util.VersionUtils.getVersion().getBundleBuildTimestampDigitsOnly(); %> - Interceptor: Hooks settings + Interceptor Manager: Hooks settings @@ -16,7 +16,7 @@
-

Interceptor: Hooks settings

+

Interceptor Manager: Hooks settings

@@ -43,7 +43,7 @@
-
+
diff --git a/src/main/resources/webapp/interceptor/WEB-INF/web.xml b/src/main/resources/webapp/interceptor-manager/WEB-INF/web.xml similarity index 90% rename from src/main/resources/webapp/interceptor/WEB-INF/web.xml rename to src/main/resources/webapp/interceptor-manager/WEB-INF/web.xml index ba3d742..875baea 100644 --- a/src/main/resources/webapp/interceptor/WEB-INF/web.xml +++ b/src/main/resources/webapp/interceptor-manager/WEB-INF/web.xml @@ -8,7 +8,7 @@ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - interceptor + interceptor-manager org.springframework.web.context.request.RequestContextListener @@ -24,12 +24,12 @@ - interceptor-rest + interceptor-manager-rest org.glassfish.jersey.servlet.ServletContainer javax.ws.rs.Application - ch.sbb.polarion.extension.interceptor.rest.InterceptorRestApplication + ch.sbb.polarion.extension.interceptor_manager.rest.InterceptorManagerRestApplication @@ -54,7 +54,7 @@ - interceptor-rest + interceptor-manager-rest /rest/* diff --git a/src/test/java/ch/sbb/polarion/extension/interceptor/util/PropertiesUtilsTest.java b/src/test/java/ch/sbb/polarion/extension/interceptor_manager/util/PropertiesUtilsTest.java similarity index 92% rename from src/test/java/ch/sbb/polarion/extension/interceptor/util/PropertiesUtilsTest.java rename to src/test/java/ch/sbb/polarion/extension/interceptor_manager/util/PropertiesUtilsTest.java index 83f6628..36693de 100644 --- a/src/test/java/ch/sbb/polarion/extension/interceptor/util/PropertiesUtilsTest.java +++ b/src/test/java/ch/sbb/polarion/extension/interceptor_manager/util/PropertiesUtilsTest.java @@ -1,4 +1,4 @@ -package ch.sbb.polarion.extension.interceptor.util; +package ch.sbb.polarion.extension.interceptor_manager.util; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith;