[midPoint-git] [Evolveum/midpoint] 37bd79: Improve SubscriptionUtil code a bit

mederly noreply at github.com
Thu Jan 25 20:20:26 CET 2024


  Branch: refs/heads/support-4.8
  Home:   https://github.com/Evolveum/midpoint
  Commit: 37bd79bb89a17243a8978d9c6e0b8d5b9976cf5c
      https://github.com/Evolveum/midpoint/commit/37bd79bb89a17243a8978d9c6e0b8d5b9976cf5c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-01-25 (Thu, 25 Jan 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageAdminLTE.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/util/SubscriptionInformation.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/util/SubscriptionUtil.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/util/SubscriptionWrapper.java
    M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/SubscriptionDateValidityTest.java

  Log Message:
  -----------
  Improve SubscriptionUtil code a bit

Just cosmetic changes.

(cherry picked from commit d46c644a3fa2ab01ecfe41b17f9e1d74de3d28c2)


  Commit: 817f37425ce9248f533381944af184883510c322
      https://github.com/Evolveum/midpoint/commit/817f37425ce9248f533381944af184883510c322
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-01-25 (Thu, 25 Jan 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageAdminLTE.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/RepositoryDiag.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SystemConfigurationTypeUtil.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/mock/MockFactory.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AbstractGeneralNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/transport/impl/legacy/LegacyMailTransport.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/LocalBeans.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/Subscription.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionPolicies.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionState.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionStateCache.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionUtil.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SystemFeatures.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SystemFeaturesEnquirer.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/util/SubscriptionInformation.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/util/SubscriptionUtil.java
    M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/SubscriptionDateValidityTest.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleServiceBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java

  Log Message:
  -----------
  Improve subscription handling code

1. Determining if we are in production mode.
2. Placing all the business logic into SubscriptionPolicies.
3. Separating various concerns: Subscription, SubscriptionState,
SystemFeatures, SubscriptionPolicies, etc.

(cherry picked from commit 00565e3e6b8c2c2c6dd416403682c78fca730c8d)


  Commit: 9f8063b2e56d410f9b79e8d0ab2bf072fa4aee1a
      https://github.com/Evolveum/midpoint/commit/9f8063b2e56d410f9b79e8d0ab2bf072fa4aee1a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-01-25 (Thu, 25 Jan 2024)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointJarSignatureChecker.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    A gui/admin-gui/src/main/resources/jar-signing.cer
    M gui/midpoint-jar/pom.xml
    M pom.xml
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/JarSignatureHolder.java

  Log Message:
  -----------
  Add midpoint.jar signing

This is to distinguish between official and unofficial builds.
The checking is currently very primitive, though.

(cherry picked from commit e46c8d178a989397f362ea8059a7db8bddd3f254)


  Commit: 39514ecd2d0984b38ca72dcf4dca502b457dea1c
      https://github.com/Evolveum/midpoint/commit/39514ecd2d0984b38ca72dcf4dca502b457dea1c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-01-25 (Thu, 25 Jan 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointJarSignatureChecker.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/JarSignatureHolder.java

  Log Message:
  -----------
  Skip JAR checking for overlays

It depends on overlay-info.txt resource being present.

(cherry picked from commit a40a6fa65b59ad45102ad179ced555d167dc18e4)


  Commit: 1eba1f342e53be01f4aae9c5d0f66b48ae69371f
      https://github.com/Evolveum/midpoint/commit/1eba1f342e53be01f4aae9c5d0f66b48ae69371f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-01-25 (Thu, 25 Jan 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageAdminLTE.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/Subscription.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionPolicies.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionState.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionUtil.java

  Log Message:
  -----------
  Fix subscription management terminology

The "valid" term was too confusing.

- The subscription ID itself is now either well-formed,
malformed or none.

- The subscription state is now active (either fully active
or in the grace period), expired, or with subscription ID
malformed/none.

(cherry picked from commit b0f823f63806059039f6f7aebdbf1eeb990be3c3)


  Commit: 026534d04b1a7ebb806fdc8cdb6b6f8955d3272e
      https://github.com/Evolveum/midpoint/commit/026534d04b1a7ebb806fdc8cdb6b6f8955d3272e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-01-25 (Thu, 25 Jan 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SystemConfigurationTypeUtil.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/mock/MockFactory.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    R repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/Subscription.java
    A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionId.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionPolicies.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionState.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionStateCache.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SystemFeatures.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SystemFeaturesEnquirer.java
    R repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/SubscriptionDateValidityTest.java
    A repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/SubscriptionIdDateValidityTest.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleServiceBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java

  Log Message:
  -----------
  Update the subscription handling code

(cherry picked from commit d818af4a2ae32971177271636ddd060d3221314c)


  Commit: e98d9240310d326f865d8d84d7c7f26cbb89c5f8
      https://github.com/Evolveum/midpoint/commit/e98d9240310d326f865d8d84d7c7f26cbb89c5f8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-01-25 (Thu, 25 Jan 2024)

  Changed paths:
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionPolicies.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionState.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionStateCache.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SystemFeaturesEnquirer.java
    M repo/repo-common/testng-unit.xml

  Log Message:
  -----------
  Improve/fix the subscription handling code

(cherry picked from commit be232592493d52206fb443d8dac2a88f1ba25a1a)


  Commit: 1898e6c9e39d5a969c1fcacd01227176a78e2d9f
      https://github.com/Evolveum/midpoint/commit/1898e6c9e39d5a969c1fcacd01227176a78e2d9f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-01-25 (Thu, 25 Jan 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M model/authentication-impl/src/main/java/com/evolveum/midpoint/authentication/impl/evaluator/NodeAuthenticationEvaluatorImpl.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionState.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionStateCache.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/remote/RestConnector.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/nodes/NodeRetriever.java

  Log Message:
  -----------
  Allow production clustering only with subscription

(cherry picked from commit c56a1504fdb8c2bd413d6d3c878de85e713ec851)


  Commit: 5725bf3dc48166798ea1ce41118194011b470a44
      https://github.com/Evolveum/midpoint/commit/5725bf3dc48166798ea1ce41118194011b470a44
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-01-25 (Thu, 25 Jan 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/JarSignatureHolder.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/subscription/SubscriptionPolicies.java

  Log Message:
  -----------
  Do cosmetic subscription mgmt code improvements


Compare: https://github.com/Evolveum/midpoint/compare/4fc2973f5d7f...5725bf3dc481


More information about the midPoint-svn mailing list