From 70e25455b7371eefd2e41f48d22e266e65690162 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Wed, 16 Oct 2024 15:50:26 +0200 Subject: [PATCH 01/15] removed install, runmodes, runmodes.cloud modules --- .../install/launchers/ApmInstallService.java | 0 .../services/RunModesProviderService.java | 0 app/aem/install/build.gradle.kts | 49 ------------------- app/aem/runmodes.cloud/build.gradle.kts | 48 ------------------ .../services/RunModesProviderService.java | 35 ------------- app/aem/runmodes/build.gradle.kts | 48 ------------------ app/aem/ui.apps.cloud/build.gradle.kts | 6 --- app/aem/ui.apps/build.gradle.kts | 4 -- 8 files changed, 190 deletions(-) rename app/aem/{install => core}/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java (100%) rename app/aem/{runmodes => core}/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java (100%) delete mode 100644 app/aem/install/build.gradle.kts delete mode 100644 app/aem/runmodes.cloud/build.gradle.kts delete mode 100644 app/aem/runmodes.cloud/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java delete mode 100644 app/aem/runmodes/build.gradle.kts diff --git a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java b/app/aem/core/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java similarity index 100% rename from app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java rename to app/aem/core/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java diff --git a/app/aem/runmodes/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java b/app/aem/core/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java similarity index 100% rename from app/aem/runmodes/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java rename to app/aem/core/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java diff --git a/app/aem/install/build.gradle.kts b/app/aem/install/build.gradle.kts deleted file mode 100644 index 4ee850418..000000000 --- a/app/aem/install/build.gradle.kts +++ /dev/null @@ -1,49 +0,0 @@ -import org.gradle.jvm.tasks.Jar - -plugins { - id("com.cognifide.aem.bundle") - java - `maven-publish` - signing -} - -description = "APM Install" - -apply(from = rootProject.file("app/common.gradle.kts")) -apply(from = rootProject.file("app/aem/common.gradle.kts")) - -dependencies { - implementation(project(":app:aem:api")) - implementation(project(":app:aem:core")) -} - -tasks { - register("sourcesJar") { - from(sourceSets.main.get().allSource) - archiveClassifier.set("sources") - } - - register("javadocJar") { - from(javadoc.get().destinationDir) - archiveClassifier.set("javadoc") - dependsOn(javadoc) - } -} - -publishing { - publications { - register("apm") { - from(components["java"]) - artifact(tasks["sourcesJar"]) - artifact(tasks["javadocJar"]) - afterEvaluate { - artifactId = "apm-" + project.name - version = rootProject.version - } - pom { - name.set("APM - " + project.name) - description.set(project.description) - } - } - } -} \ No newline at end of file diff --git a/app/aem/runmodes.cloud/build.gradle.kts b/app/aem/runmodes.cloud/build.gradle.kts deleted file mode 100644 index 72bb31f0a..000000000 --- a/app/aem/runmodes.cloud/build.gradle.kts +++ /dev/null @@ -1,48 +0,0 @@ -import org.gradle.jvm.tasks.Jar - -plugins { - id("com.cognifide.aem.bundle") - java - `maven-publish` - signing -} - -description = "APM RunModes (Cloud)" - -apply(from = rootProject.file("app/common.gradle.kts")) -apply(from = rootProject.file("app/aem/common.gradle.kts")) - -dependencies { - implementation(project(":app:aem:api")) -} - -tasks { - register("sourcesJar") { - from(sourceSets.main.get().allSource) - archiveClassifier.set("sources") - } - - register("javadocJar") { - from(javadoc.get().destinationDir) - archiveClassifier.set("javadoc") - dependsOn(javadoc) - } -} - -publishing { - publications { - register("apm") { - from(components["java"]) - artifact(tasks["sourcesJar"]) - artifact(tasks["javadocJar"]) - afterEvaluate { - artifactId = "apm-" + project.name - version = rootProject.version - } - pom { - name.set("APM - " + project.name) - description.set(project.description) - } - } - } -} \ No newline at end of file diff --git a/app/aem/runmodes.cloud/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java b/app/aem/runmodes.cloud/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java deleted file mode 100644 index ad3ca0bb9..000000000 --- a/app/aem/runmodes.cloud/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java +++ /dev/null @@ -1,35 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * AEM Permission Management - * %% - * Copyright (C) 2013 Wunderman Thompson Technology - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================LICENSE_END================================== - */ -package com.cognifide.apm.runmodes.services; - -import com.cognifide.apm.api.services.RunModesProvider; -import java.util.Collections; -import java.util.Set; -import org.osgi.service.component.annotations.Component; - -@Component -public class RunModesProviderService implements RunModesProvider { - - @Override - public Set getRunModes() { - return Collections.emptySet(); - } - -} diff --git a/app/aem/runmodes/build.gradle.kts b/app/aem/runmodes/build.gradle.kts deleted file mode 100644 index 057e7c1aa..000000000 --- a/app/aem/runmodes/build.gradle.kts +++ /dev/null @@ -1,48 +0,0 @@ -import org.gradle.jvm.tasks.Jar - -plugins { - id("com.cognifide.aem.bundle") - java - `maven-publish` - signing -} - -description = "APM RunModes" - -apply(from = rootProject.file("app/common.gradle.kts")) -apply(from = rootProject.file("app/aem/common.gradle.kts")) - -dependencies { - implementation(project(":app:aem:api")) -} - -tasks { - register("sourcesJar") { - from(sourceSets.main.get().allSource) - archiveClassifier.set("sources") - } - - register("javadocJar") { - from(javadoc.get().destinationDir) - archiveClassifier.set("javadoc") - dependsOn(javadoc) - } -} - -publishing { - publications { - register("apm") { - from(components["java"]) - artifact(tasks["sourcesJar"]) - artifact(tasks["javadocJar"]) - afterEvaluate { - artifactId = "apm-" + project.name - version = rootProject.version - } - pom { - name.set("APM - " + project.name) - description.set(project.description) - } - } - } -} \ No newline at end of file diff --git a/app/aem/ui.apps.cloud/build.gradle.kts b/app/aem/ui.apps.cloud/build.gradle.kts index acf9967c7..eac57cd21 100644 --- a/app/aem/ui.apps.cloud/build.gradle.kts +++ b/app/aem/ui.apps.cloud/build.gradle.kts @@ -9,10 +9,8 @@ description = "APM (AEM Permission Management) is an AEM based, cloud compatible evaluationDependsOn(":app:aem:ui.apps.base") evaluationDependsOn(":app:aem:api") -evaluationDependsOn(":app:aem:runmodes.cloud") evaluationDependsOn(":app:aem:core") evaluationDependsOn(":app:aem:actions.main") -evaluationDependsOn(":app:aem:install") apply(from = rootProject.file("app/common.gradle.kts")) apply(from = rootProject.file("app/aem/common.gradle.kts")) @@ -22,12 +20,8 @@ aem { packageCompose { mergePackageProject(":app:aem:ui.apps.base") installBundleProject(":app:aem:api") - installBundleProject(":app:aem:runmodes.cloud") installBundleProject(":app:aem:core") installBundleProject(":app:aem:actions.main") - installBundleProject(":app:aem:install") { - startLevel.set(27) - } vaultDefinition { duplicatesStrategy = DuplicatesStrategy.EXCLUDE version.set(rootProject.version as String) diff --git a/app/aem/ui.apps/build.gradle.kts b/app/aem/ui.apps/build.gradle.kts index 958e7f010..eac57cd21 100644 --- a/app/aem/ui.apps/build.gradle.kts +++ b/app/aem/ui.apps/build.gradle.kts @@ -9,10 +9,8 @@ description = "APM (AEM Permission Management) is an AEM based, cloud compatible evaluationDependsOn(":app:aem:ui.apps.base") evaluationDependsOn(":app:aem:api") -evaluationDependsOn(":app:aem:runmodes") evaluationDependsOn(":app:aem:core") evaluationDependsOn(":app:aem:actions.main") -evaluationDependsOn(":app:aem:install") apply(from = rootProject.file("app/common.gradle.kts")) apply(from = rootProject.file("app/aem/common.gradle.kts")) @@ -22,10 +20,8 @@ aem { packageCompose { mergePackageProject(":app:aem:ui.apps.base") installBundleProject(":app:aem:api") - installBundleProject(":app:aem:runmodes") installBundleProject(":app:aem:core") installBundleProject(":app:aem:actions.main") - installBundleProject(":app:aem:install") vaultDefinition { duplicatesStrategy = DuplicatesStrategy.EXCLUDE version.set(rootProject.version as String) From 3ee0c667c800adaf9cbeca9a9b5456082fdc7540 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Thu, 17 Oct 2024 01:38:54 +0200 Subject: [PATCH 02/15] removed api, actions.main, actions.checks modules --- app/aem/actions.checks/build.gradle.kts | 85 ------------------- app/aem/actions.main/build.gradle.kts | 60 ------------- app/aem/api/build.gradle.kts | 44 ---------- app/aem/core/build.gradle.kts | 7 +- .../main/content/META-INF/vault/filter.xml | 0 .../com/cognifide/apm/api/actions/Action.java | 0 .../apm/api/actions/ActionResult.java | 0 .../apm/api/actions/AuthorizableManager.java | 0 .../cognifide/apm/api/actions/Context.java | 0 .../cognifide/apm/api/actions/Message.java | 0 .../apm/api/actions/SessionSavingMode.java | 0 .../apm/api/actions/SessionSavingPolicy.java | 0 .../apm/api/actions/annotations/Flag.java | 0 .../apm/api/actions/annotations/Flags.java | 0 .../apm/api/actions/annotations/Mapper.java | 0 .../apm/api/actions/annotations/Mapping.java | 0 .../apm/api/actions/annotations/Named.java | 0 .../apm/api/actions/annotations/Required.java | 0 .../exceptions/ActionCreationException.java | 0 .../apm/api/exceptions/ActionException.java | 0 .../exceptions/ActionExecutionException.java | 0 .../AuthorizableNotFoundException.java | 0 .../api/exceptions/ExecutionException.java | 0 .../InvalidActionMapperException.java | 0 .../apm/api/scripts/LaunchEnvironment.java | 0 .../cognifide/apm/api/scripts/LaunchMode.java | 0 .../apm/api/scripts/MutableScript.java | 0 .../com/cognifide/apm/api/scripts/Script.java | 0 .../apm/api/scripts/TransientScript.java | 0 .../apm/api/services/DefinitionsProvider.java | 0 .../apm/api/services/ExecutionMode.java | 0 .../apm/api/services/ExecutionResult.java | 0 .../apm/api/services/RunModesProvider.java | 0 .../apm/api/services/ScriptFinder.java | 0 .../apm/api/services/ScriptManager.java | 0 .../com/cognifide/apm/api/status/Status.java | 0 .../apm/checks/actions/ActionGroup.java | 0 .../checks/actions/exclude/CheckExcludes.java | 0 .../actions/exclude/CheckExcludesMapper.java | 0 .../exists/CheckAuthorizableExists.java | 0 .../exists/CheckGroupExistsMapper.java | 0 .../actions/exists/CheckUserExistsMapper.java | 0 .../checks/actions/include/CheckIncludes.java | 0 .../actions/include/CheckIncludesMapper.java | 0 .../actions/notexists/CheckNotExists.java | 0 .../notexists/CheckNotExistsMapper.java | 0 .../actions/password/CheckPassword.java | 0 .../actions/password/CheckPasswordMapper.java | 0 .../actions/permissions/CheckAllowMapper.java | 0 .../actions/permissions/CheckDenyMapper.java | 0 .../actions/permissions/CheckPermissions.java | 0 .../actions/property/CheckProperty.java | 0 .../actions/property/CheckPropertyMapper.java | 0 .../apm/checks/utils/ActionUtils.java | 0 .../apm/checks/utils/MessagingUtils.java | 0 .../cognifide/apm/main/CompositeAction.java | 0 .../apm/main/RandomPasswordGenerator.java | 0 .../apm/main/actions/ActionGroup.java | 0 .../apm/main/actions/CommonFlags.java | 0 .../main/actions/addchildren/AddChildren.java | 0 .../addchildren/AddChildrenMapper.java | 0 .../main/actions/addparents/AddParents.java | 0 .../actions/addparents/AddParentsMapper.java | 0 .../actions/addparents/AddToGroupMapper.java | 0 .../apm/main/actions/allow/Allow.java | 0 .../apm/main/actions/allow/AllowMapper.java | 0 .../actions/clearpermissions/ClearMapper.java | 0 .../ClearPermissionsMapper.java | 0 .../main/actions/clearpermissions/Purge.java | 0 .../actions/clearpermissions/RemoveAll.java | 0 .../CreateAuthorizable.java | 0 .../CreateAuthorizableStrategy.java | 0 .../createauthorizable/CreateGroupMapper.java | 0 .../CreateSystemUserMapper.java | 0 .../createauthorizable/CreateUserMapper.java | 0 .../main/actions/deletegroup/DeleteGroup.java | 0 .../deletegroup/DeleteGroupMapper.java | 0 .../actions/deleteuser/DeleteUserMapper.java | 0 .../main/actions/deleteuser/DestroyUser.java | 0 .../main/actions/deleteuser/RemoveUser.java | 0 .../cognifide/apm/main/actions/deny/Deny.java | 0 .../apm/main/actions/deny/DenyMapper.java | 0 .../forauthorizable/ForAuthorizable.java | 0 .../forauthorizable/ForGroupMapper.java | 0 .../forauthorizable/ForUserMapper.java | 0 .../main/actions/internal/DefineMapper.java | 0 .../main/actions/internal/ForEachMapper.java | 0 .../main/actions/internal/ImportMapper.java | 0 .../main/actions/internal/RequireMapper.java | 0 .../apm/main/actions/internal/RunMapper.java | 0 .../internal/datasources/LevelsMapper.java | 0 .../internal/datasources/LowerMapper.java | 0 .../internal/datasources/UpperMapper.java | 0 .../internal/datasources/ValueMapMapper.java | 0 .../removechildren/RemoveChildren.java | 0 .../removechildren/RemoveChildrenMapper.java | 0 .../ClearFromGroupDetacher.java | 0 .../RemoveChildrenGroups.java | 0 .../RemoveChildrenGroupsMapper.java | 0 .../removeparents/RemoveFromGroupMapper.java | 0 .../actions/removeparents/RemoveParents.java | 0 .../removeparents/RemoveParentsMapper.java | 0 .../RemoveParentsGroups.java | 0 .../RemoveParentsGroupsMapper.java | 0 .../removeproperty/RemoveProperty.java | 0 .../removeproperty/RemovePropertyMapper.java | 0 .../cognifide/apm/main/actions/save/Save.java | 0 .../apm/main/actions/save/SaveMapper.java | 0 .../main/actions/sessionsave/SessionSave.java | 0 .../sessionsave/SessionSaveMapper.java | 0 .../main/actions/setpassword/SetPassword.java | 0 .../setpassword/SetPasswordMapper.java | 0 .../main/actions/setproperty/SetProperty.java | 0 .../setproperty/SetPropertyMapper.java | 0 .../permissions/PermissionActionHelper.java | 0 .../apm/main/permissions/PrivilegeGroup.java | 0 .../apm/main/permissions/Restrictions.java | 0 .../exceptions/PermissionException.java | 0 .../JackrabbitAccessControlListUtil.java | 0 .../main/services/ApmActionsMainService.java | 0 .../cognifide/apm/main/utils/ActionUtils.java | 0 .../apm/main/utils/MessagingUtils.java | 0 .../cognifide/apm/main/utils/PathUtils.java | 0 .../main/resources/apidefinition/README.md | 0 .../apidefinition/apm-api-definition.yaml | 0 app/aem/ui.apps.cloud/build.gradle.kts | 4 - app/aem/ui.apps/build.gradle.kts | 4 - settings.gradle.kts | 6 -- 128 files changed, 2 insertions(+), 208 deletions(-) delete mode 100644 app/aem/actions.checks/build.gradle.kts delete mode 100644 app/aem/actions.main/build.gradle.kts delete mode 100644 app/aem/api/build.gradle.kts rename app/aem/{actions.checks => core}/src/main/content/META-INF/vault/filter.xml (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/Action.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/ActionResult.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/AuthorizableManager.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/Context.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/Message.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/SessionSavingMode.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/SessionSavingPolicy.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/annotations/Flag.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/annotations/Flags.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/annotations/Mapper.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/annotations/Mapping.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/annotations/Named.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/actions/annotations/Required.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/exceptions/ActionCreationException.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/exceptions/ActionException.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/exceptions/ActionExecutionException.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/exceptions/AuthorizableNotFoundException.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/exceptions/ExecutionException.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/exceptions/InvalidActionMapperException.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/scripts/LaunchMode.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/scripts/MutableScript.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/scripts/Script.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/scripts/TransientScript.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/services/DefinitionsProvider.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/services/ExecutionMode.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/services/ExecutionResult.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/services/ScriptFinder.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/services/ScriptManager.java (100%) rename app/aem/{api => core}/src/main/java/com/cognifide/apm/api/status/Status.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/ActionGroup.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/exclude/CheckExcludes.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/exclude/CheckExcludesMapper.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/exists/CheckAuthorizableExists.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/exists/CheckGroupExistsMapper.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/exists/CheckUserExistsMapper.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/include/CheckIncludes.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/include/CheckIncludesMapper.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/notexists/CheckNotExists.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/notexists/CheckNotExistsMapper.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/password/CheckPassword.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/password/CheckPasswordMapper.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckAllowMapper.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckDenyMapper.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckPermissions.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/property/CheckProperty.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/actions/property/CheckPropertyMapper.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/utils/ActionUtils.java (100%) rename app/aem/{actions.checks => core}/src/main/java/com/cognifide/apm/checks/utils/MessagingUtils.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/CompositeAction.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/RandomPasswordGenerator.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/ActionGroup.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/CommonFlags.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildrenMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/addparents/AddParentsMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/addparents/AddToGroupMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/allow/Allow.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/allow/AllowMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/clearpermissions/ClearMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/clearpermissions/ClearPermissionsMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/clearpermissions/RemoveAll.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizable.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizableStrategy.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateGroupMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateSystemUserMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateUserMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroup.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroupMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/deleteuser/DeleteUserMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/deleteuser/DestroyUser.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/deleteuser/RemoveUser.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/deny/Deny.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/deny/DenyMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForAuthorizable.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForGroupMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForUserMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/internal/DefineMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/internal/ForEachMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/internal/ImportMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/internal/RequireMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/internal/RunMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/internal/datasources/LevelsMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/internal/datasources/LowerMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/internal/datasources/UpperMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/internal/datasources/ValueMapMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildren.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildrenMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/ClearFromGroupDetacher.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/RemoveChildrenGroups.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/RemoveChildrenGroupsMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveFromGroupMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParents.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParentsMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/removeparentsgroups/RemoveParentsGroups.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/removeparentsgroups/RemoveParentsGroupsMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemoveProperty.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemovePropertyMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/save/Save.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/save/SaveMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSave.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSaveMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPassword.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPasswordMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/setproperty/SetProperty.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/actions/setproperty/SetPropertyMapper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/permissions/PermissionActionHelper.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/permissions/PrivilegeGroup.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/permissions/Restrictions.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/permissions/exceptions/PermissionException.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/permissions/utils/JackrabbitAccessControlListUtil.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/services/ApmActionsMainService.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/utils/ActionUtils.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/utils/MessagingUtils.java (100%) rename app/aem/{actions.main => core}/src/main/java/com/cognifide/apm/main/utils/PathUtils.java (100%) rename app/aem/{api => core}/src/main/resources/apidefinition/README.md (100%) rename app/aem/{api => core}/src/main/resources/apidefinition/apm-api-definition.yaml (100%) diff --git a/app/aem/actions.checks/build.gradle.kts b/app/aem/actions.checks/build.gradle.kts deleted file mode 100644 index eca85f314..000000000 --- a/app/aem/actions.checks/build.gradle.kts +++ /dev/null @@ -1,85 +0,0 @@ -import com.cognifide.gradle.aem.bundle.tasks.bundle -import org.gradle.jvm.tasks.Jar - -plugins { - id("com.cognifide.aem.bundle") - id("com.cognifide.aem.package") - java - `maven-publish` - signing -} - -description = "APM Actions Checks" - -apply(from = rootProject.file("app/common.gradle.kts")) -apply(from = rootProject.file("app/aem/common.gradle.kts")) - -aem { - tasks { - packageCompose { - installBundleProject(":app:aem:actions.checks") - vaultDefinition { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - version.set(rootProject.version as String) - description.set(project.description) - } - } - jar { - bundle { - attribute("APM-Actions", "com.cognifide.apm.checks.actions") - installPath.set("/apps/apm-checks/install") - } - } - } -} - -dependencies { - implementation(project(":app:aem:api")) -} - -tasks { - getByName("packageDeploy") { - mustRunAfter(":app:aem:ui.apps:packageDeploy") - } - - register("sourcesJar") { - from(sourceSets.main.get().allSource) - archiveClassifier.set("sources") - } - - register("javadocJar") { - from(javadoc.get().destinationDir) - archiveClassifier.set("javadoc") - dependsOn(javadoc) - } -} - -publishing { - publications { - register("apm") { - from(components["java"]) - artifact(tasks["sourcesJar"]) - artifact(tasks["javadocJar"]) - afterEvaluate { - artifactId = "apm-" + project.name - version = rootProject.version - } - pom { - name.set("APM - " + project.name) - description.set(project.description) - } - } - register("apmCrx") { - groupId = project.group.toString() + ".crx" - artifact(tasks["packageCompose"]) - afterEvaluate { - artifactId = "apm-" + project.name - version = rootProject.version - } - pom { - name.set("APM - " + project.name) - description.set(project.description) - } - } - } -} \ No newline at end of file diff --git a/app/aem/actions.main/build.gradle.kts b/app/aem/actions.main/build.gradle.kts deleted file mode 100644 index 39030890e..000000000 --- a/app/aem/actions.main/build.gradle.kts +++ /dev/null @@ -1,60 +0,0 @@ -import com.cognifide.gradle.aem.bundle.tasks.bundle -import org.gradle.jvm.tasks.Jar - -plugins { - id("com.cognifide.aem.bundle") - java - `maven-publish` - signing -} - -description = "APM Actions Main" - -apply(from = rootProject.file("app/common.gradle.kts")) -apply(from = rootProject.file("app/aem/common.gradle.kts")) - -aem { - tasks { - jar { - bundle { - exportPackage("com.cognifide.apm.main.services.*") - attribute("APM-Actions", "com.cognifide.apm.main.actions") - } - } - } -} - -dependencies { - implementation(project(":app:aem:api")) -} - -tasks { - register("sourcesJar") { - from(sourceSets.main.get().allSource) - archiveClassifier.set("sources") - } - - register("javadocJar") { - from(javadoc.get().destinationDir) - archiveClassifier.set("javadoc") - dependsOn(javadoc) - } -} - -publishing { - publications { - register("apm") { - from(components["java"]) - artifact(tasks["sourcesJar"]) - artifact(tasks["javadocJar"]) - afterEvaluate { - artifactId = "apm-" + project.name - version = rootProject.version - } - pom { - name.set("APM - " + project.name) - description.set(project.description) - } - } - } -} \ No newline at end of file diff --git a/app/aem/api/build.gradle.kts b/app/aem/api/build.gradle.kts deleted file mode 100644 index b64e926d8..000000000 --- a/app/aem/api/build.gradle.kts +++ /dev/null @@ -1,44 +0,0 @@ -import org.gradle.jvm.tasks.Jar - -plugins { - id("com.cognifide.aem.bundle") - java - `maven-publish` - signing -} - -description = "APM API" - -apply(from = rootProject.file("app/common.gradle.kts")) -apply(from = rootProject.file("app/aem/common.gradle.kts")) - -tasks { - register("sourcesJar") { - from(sourceSets.main.get().allSource) - archiveClassifier.set("sources") - } - - register("javadocJar") { - from(javadoc.get().destinationDir) - archiveClassifier.set("javadoc") - dependsOn(javadoc) - } -} - -publishing { - publications { - register("apm") { - from(components["java"]) - artifact(tasks["sourcesJar"]) - artifact(tasks["javadocJar"]) - afterEvaluate { - artifactId = "apm-" + project.name - version = rootProject.version - } - pom { - name.set("APM - " + project.name) - description.set(project.description) - } - } - } -} \ No newline at end of file diff --git a/app/aem/core/build.gradle.kts b/app/aem/core/build.gradle.kts index b0856eee2..6ea817e1b 100644 --- a/app/aem/core/build.gradle.kts +++ b/app/aem/core/build.gradle.kts @@ -10,7 +10,7 @@ plugins { signing } -description = "APM Core" +description = "AEM Permission Management (APM)" apply(from = rootProject.file("app/common.gradle.kts")) apply(from = rootProject.file("app/aem/common.gradle.kts")) @@ -20,7 +20,7 @@ aem { jar { bundle { importPackage("javax.annotation;version=0.0.0", "!android.os") - attribute("Sling-Model-Packages", "com.cognifide.apm.core") + attribute("Sling-Model-Packages", "com.cognifide.apm") excludePackage("org.antlr.stringtemplate", "org.antlr.v4.gui") embedPackage("org.antlr:antlr4-runtime:4.7.2", "org.antlr.v4.runtime.*") } @@ -29,9 +29,6 @@ aem { } dependencies { - implementation(project(":app:aem:api")) - implementation(project(":app:aem:actions.main")) - antlr("org.antlr:antlr4:4.7.2") } diff --git a/app/aem/actions.checks/src/main/content/META-INF/vault/filter.xml b/app/aem/core/src/main/content/META-INF/vault/filter.xml similarity index 100% rename from app/aem/actions.checks/src/main/content/META-INF/vault/filter.xml rename to app/aem/core/src/main/content/META-INF/vault/filter.xml diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/Action.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/Action.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/Action.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/Action.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/ActionResult.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/ActionResult.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/ActionResult.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/ActionResult.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/AuthorizableManager.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/AuthorizableManager.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/AuthorizableManager.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/AuthorizableManager.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/Context.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/Context.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/Context.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/Context.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/Message.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/Message.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/Message.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/Message.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/SessionSavingMode.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/SessionSavingMode.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/SessionSavingMode.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/SessionSavingMode.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/SessionSavingPolicy.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/SessionSavingPolicy.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/SessionSavingPolicy.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/SessionSavingPolicy.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/annotations/Flag.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/annotations/Flag.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/annotations/Flag.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/annotations/Flag.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/annotations/Flags.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/annotations/Flags.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/annotations/Flags.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/annotations/Flags.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/annotations/Mapper.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/annotations/Mapper.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/annotations/Mapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/annotations/Mapper.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/annotations/Mapping.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/annotations/Mapping.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/annotations/Mapping.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/annotations/Mapping.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/annotations/Named.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/annotations/Named.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/annotations/Named.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/annotations/Named.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/actions/annotations/Required.java b/app/aem/core/src/main/java/com/cognifide/apm/api/actions/annotations/Required.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/actions/annotations/Required.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/actions/annotations/Required.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/exceptions/ActionCreationException.java b/app/aem/core/src/main/java/com/cognifide/apm/api/exceptions/ActionCreationException.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/exceptions/ActionCreationException.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/exceptions/ActionCreationException.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/exceptions/ActionException.java b/app/aem/core/src/main/java/com/cognifide/apm/api/exceptions/ActionException.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/exceptions/ActionException.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/exceptions/ActionException.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/exceptions/ActionExecutionException.java b/app/aem/core/src/main/java/com/cognifide/apm/api/exceptions/ActionExecutionException.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/exceptions/ActionExecutionException.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/exceptions/ActionExecutionException.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/exceptions/AuthorizableNotFoundException.java b/app/aem/core/src/main/java/com/cognifide/apm/api/exceptions/AuthorizableNotFoundException.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/exceptions/AuthorizableNotFoundException.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/exceptions/AuthorizableNotFoundException.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/exceptions/ExecutionException.java b/app/aem/core/src/main/java/com/cognifide/apm/api/exceptions/ExecutionException.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/exceptions/ExecutionException.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/exceptions/ExecutionException.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/exceptions/InvalidActionMapperException.java b/app/aem/core/src/main/java/com/cognifide/apm/api/exceptions/InvalidActionMapperException.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/exceptions/InvalidActionMapperException.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/exceptions/InvalidActionMapperException.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java b/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/LaunchMode.java b/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/LaunchMode.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/scripts/LaunchMode.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/scripts/LaunchMode.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/MutableScript.java b/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/MutableScript.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/scripts/MutableScript.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/scripts/MutableScript.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/Script.java b/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/Script.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/scripts/Script.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/scripts/Script.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/TransientScript.java b/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/TransientScript.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/scripts/TransientScript.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/scripts/TransientScript.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/services/DefinitionsProvider.java b/app/aem/core/src/main/java/com/cognifide/apm/api/services/DefinitionsProvider.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/services/DefinitionsProvider.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/services/DefinitionsProvider.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/services/ExecutionMode.java b/app/aem/core/src/main/java/com/cognifide/apm/api/services/ExecutionMode.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/services/ExecutionMode.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/services/ExecutionMode.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/services/ExecutionResult.java b/app/aem/core/src/main/java/com/cognifide/apm/api/services/ExecutionResult.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/services/ExecutionResult.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/services/ExecutionResult.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java b/app/aem/core/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/services/ScriptFinder.java b/app/aem/core/src/main/java/com/cognifide/apm/api/services/ScriptFinder.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/services/ScriptFinder.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/services/ScriptFinder.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/services/ScriptManager.java b/app/aem/core/src/main/java/com/cognifide/apm/api/services/ScriptManager.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/services/ScriptManager.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/services/ScriptManager.java diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/status/Status.java b/app/aem/core/src/main/java/com/cognifide/apm/api/status/Status.java similarity index 100% rename from app/aem/api/src/main/java/com/cognifide/apm/api/status/Status.java rename to app/aem/core/src/main/java/com/cognifide/apm/api/status/Status.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/ActionGroup.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/ActionGroup.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/ActionGroup.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/ActionGroup.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/exclude/CheckExcludes.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/exclude/CheckExcludes.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/exclude/CheckExcludes.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/exclude/CheckExcludes.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/exclude/CheckExcludesMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/exclude/CheckExcludesMapper.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/exclude/CheckExcludesMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/exclude/CheckExcludesMapper.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/exists/CheckAuthorizableExists.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/exists/CheckAuthorizableExists.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/exists/CheckAuthorizableExists.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/exists/CheckAuthorizableExists.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/exists/CheckGroupExistsMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/exists/CheckGroupExistsMapper.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/exists/CheckGroupExistsMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/exists/CheckGroupExistsMapper.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/exists/CheckUserExistsMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/exists/CheckUserExistsMapper.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/exists/CheckUserExistsMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/exists/CheckUserExistsMapper.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/include/CheckIncludes.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/include/CheckIncludes.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/include/CheckIncludes.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/include/CheckIncludes.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/include/CheckIncludesMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/include/CheckIncludesMapper.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/include/CheckIncludesMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/include/CheckIncludesMapper.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/notexists/CheckNotExists.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/notexists/CheckNotExists.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/notexists/CheckNotExists.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/notexists/CheckNotExists.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/notexists/CheckNotExistsMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/notexists/CheckNotExistsMapper.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/notexists/CheckNotExistsMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/notexists/CheckNotExistsMapper.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/password/CheckPassword.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/password/CheckPassword.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/password/CheckPassword.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/password/CheckPassword.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/password/CheckPasswordMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/password/CheckPasswordMapper.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/password/CheckPasswordMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/password/CheckPasswordMapper.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckAllowMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckAllowMapper.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckAllowMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckAllowMapper.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckDenyMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckDenyMapper.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckDenyMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckDenyMapper.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckPermissions.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckPermissions.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckPermissions.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/permissions/CheckPermissions.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/property/CheckProperty.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/property/CheckProperty.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/property/CheckProperty.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/property/CheckProperty.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/property/CheckPropertyMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/actions/property/CheckPropertyMapper.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/actions/property/CheckPropertyMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/actions/property/CheckPropertyMapper.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/utils/ActionUtils.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/utils/ActionUtils.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/utils/ActionUtils.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/utils/ActionUtils.java diff --git a/app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/utils/MessagingUtils.java b/app/aem/core/src/main/java/com/cognifide/apm/checks/utils/MessagingUtils.java similarity index 100% rename from app/aem/actions.checks/src/main/java/com/cognifide/apm/checks/utils/MessagingUtils.java rename to app/aem/core/src/main/java/com/cognifide/apm/checks/utils/MessagingUtils.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/CompositeAction.java b/app/aem/core/src/main/java/com/cognifide/apm/main/CompositeAction.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/CompositeAction.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/CompositeAction.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/RandomPasswordGenerator.java b/app/aem/core/src/main/java/com/cognifide/apm/main/RandomPasswordGenerator.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/RandomPasswordGenerator.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/RandomPasswordGenerator.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/ActionGroup.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/ActionGroup.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/ActionGroup.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/ActionGroup.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/CommonFlags.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/CommonFlags.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/CommonFlags.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/CommonFlags.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildrenMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildrenMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildrenMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildrenMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddParentsMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/addparents/AddParentsMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddParentsMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/addparents/AddParentsMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddToGroupMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/addparents/AddToGroupMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddToGroupMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/addparents/AddToGroupMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/allow/Allow.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/allow/Allow.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/allow/Allow.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/allow/Allow.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/allow/AllowMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/allow/AllowMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/allow/AllowMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/allow/AllowMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/ClearMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/clearpermissions/ClearMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/ClearMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/clearpermissions/ClearMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/ClearPermissionsMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/clearpermissions/ClearPermissionsMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/ClearPermissionsMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/clearpermissions/ClearPermissionsMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/RemoveAll.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/clearpermissions/RemoveAll.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/RemoveAll.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/clearpermissions/RemoveAll.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizable.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizable.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizable.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizable.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizableStrategy.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizableStrategy.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizableStrategy.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizableStrategy.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateGroupMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateGroupMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateGroupMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateGroupMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateSystemUserMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateSystemUserMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateSystemUserMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateSystemUserMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateUserMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateUserMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateUserMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateUserMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroup.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroup.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroup.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroup.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroupMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroupMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroupMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroupMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/DeleteUserMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/deleteuser/DeleteUserMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/DeleteUserMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/deleteuser/DeleteUserMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/DestroyUser.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/deleteuser/DestroyUser.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/DestroyUser.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/deleteuser/DestroyUser.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/RemoveUser.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/deleteuser/RemoveUser.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/RemoveUser.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/deleteuser/RemoveUser.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deny/Deny.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/deny/Deny.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deny/Deny.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/deny/Deny.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deny/DenyMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/deny/DenyMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deny/DenyMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/deny/DenyMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForAuthorizable.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForAuthorizable.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForAuthorizable.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForAuthorizable.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForGroupMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForGroupMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForGroupMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForGroupMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForUserMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForUserMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForUserMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForUserMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/DefineMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/DefineMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/DefineMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/DefineMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/ForEachMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/ForEachMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/ForEachMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/ForEachMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/ImportMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/ImportMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/ImportMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/ImportMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/RequireMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/RequireMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/RequireMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/RequireMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/RunMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/RunMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/RunMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/RunMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/datasources/LevelsMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/datasources/LevelsMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/datasources/LevelsMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/datasources/LevelsMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/datasources/LowerMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/datasources/LowerMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/datasources/LowerMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/datasources/LowerMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/datasources/UpperMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/datasources/UpperMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/datasources/UpperMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/datasources/UpperMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/datasources/ValueMapMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/datasources/ValueMapMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/internal/datasources/ValueMapMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/internal/datasources/ValueMapMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildren.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildren.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildren.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildren.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildrenMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildrenMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildrenMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildrenMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/ClearFromGroupDetacher.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/ClearFromGroupDetacher.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/ClearFromGroupDetacher.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/ClearFromGroupDetacher.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/RemoveChildrenGroups.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/RemoveChildrenGroups.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/RemoveChildrenGroups.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/RemoveChildrenGroups.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/RemoveChildrenGroupsMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/RemoveChildrenGroupsMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/RemoveChildrenGroupsMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/RemoveChildrenGroupsMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveFromGroupMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveFromGroupMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveFromGroupMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveFromGroupMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParents.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParents.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParents.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParents.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParentsMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParentsMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParentsMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParentsMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparentsgroups/RemoveParentsGroups.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeparentsgroups/RemoveParentsGroups.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparentsgroups/RemoveParentsGroups.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeparentsgroups/RemoveParentsGroups.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparentsgroups/RemoveParentsGroupsMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeparentsgroups/RemoveParentsGroupsMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparentsgroups/RemoveParentsGroupsMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeparentsgroups/RemoveParentsGroupsMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemoveProperty.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemoveProperty.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemoveProperty.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemoveProperty.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemovePropertyMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemovePropertyMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemovePropertyMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemovePropertyMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/save/Save.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/save/Save.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/save/Save.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/save/Save.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/save/SaveMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/save/SaveMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/save/SaveMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/save/SaveMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSave.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSave.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSave.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSave.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSaveMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSaveMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSaveMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSaveMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPassword.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPassword.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPassword.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPassword.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPasswordMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPasswordMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPasswordMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPasswordMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setproperty/SetProperty.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/setproperty/SetProperty.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setproperty/SetProperty.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/setproperty/SetProperty.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setproperty/SetPropertyMapper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/actions/setproperty/SetPropertyMapper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setproperty/SetPropertyMapper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/actions/setproperty/SetPropertyMapper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/permissions/PermissionActionHelper.java b/app/aem/core/src/main/java/com/cognifide/apm/main/permissions/PermissionActionHelper.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/permissions/PermissionActionHelper.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/permissions/PermissionActionHelper.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/permissions/PrivilegeGroup.java b/app/aem/core/src/main/java/com/cognifide/apm/main/permissions/PrivilegeGroup.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/permissions/PrivilegeGroup.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/permissions/PrivilegeGroup.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/permissions/Restrictions.java b/app/aem/core/src/main/java/com/cognifide/apm/main/permissions/Restrictions.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/permissions/Restrictions.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/permissions/Restrictions.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/permissions/exceptions/PermissionException.java b/app/aem/core/src/main/java/com/cognifide/apm/main/permissions/exceptions/PermissionException.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/permissions/exceptions/PermissionException.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/permissions/exceptions/PermissionException.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/permissions/utils/JackrabbitAccessControlListUtil.java b/app/aem/core/src/main/java/com/cognifide/apm/main/permissions/utils/JackrabbitAccessControlListUtil.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/permissions/utils/JackrabbitAccessControlListUtil.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/permissions/utils/JackrabbitAccessControlListUtil.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/services/ApmActionsMainService.java b/app/aem/core/src/main/java/com/cognifide/apm/main/services/ApmActionsMainService.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/services/ApmActionsMainService.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/services/ApmActionsMainService.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/ActionUtils.java b/app/aem/core/src/main/java/com/cognifide/apm/main/utils/ActionUtils.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/ActionUtils.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/utils/ActionUtils.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/MessagingUtils.java b/app/aem/core/src/main/java/com/cognifide/apm/main/utils/MessagingUtils.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/MessagingUtils.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/utils/MessagingUtils.java diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/PathUtils.java b/app/aem/core/src/main/java/com/cognifide/apm/main/utils/PathUtils.java similarity index 100% rename from app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/PathUtils.java rename to app/aem/core/src/main/java/com/cognifide/apm/main/utils/PathUtils.java diff --git a/app/aem/api/src/main/resources/apidefinition/README.md b/app/aem/core/src/main/resources/apidefinition/README.md similarity index 100% rename from app/aem/api/src/main/resources/apidefinition/README.md rename to app/aem/core/src/main/resources/apidefinition/README.md diff --git a/app/aem/api/src/main/resources/apidefinition/apm-api-definition.yaml b/app/aem/core/src/main/resources/apidefinition/apm-api-definition.yaml similarity index 100% rename from app/aem/api/src/main/resources/apidefinition/apm-api-definition.yaml rename to app/aem/core/src/main/resources/apidefinition/apm-api-definition.yaml diff --git a/app/aem/ui.apps.cloud/build.gradle.kts b/app/aem/ui.apps.cloud/build.gradle.kts index eac57cd21..a034d859d 100644 --- a/app/aem/ui.apps.cloud/build.gradle.kts +++ b/app/aem/ui.apps.cloud/build.gradle.kts @@ -8,9 +8,7 @@ plugins { description = "APM (AEM Permission Management) is an AEM based, cloud compatible tool focused on streamlining the permission configuration. It provides a rich UX console tailored for administrators. They can write human readable scripts that handle user/group creation/deletion and permissions application, both in bulk. Through it's flexible grammar, exposed API, and high extensibility it vastly improves permission-based implementations." evaluationDependsOn(":app:aem:ui.apps.base") -evaluationDependsOn(":app:aem:api") evaluationDependsOn(":app:aem:core") -evaluationDependsOn(":app:aem:actions.main") apply(from = rootProject.file("app/common.gradle.kts")) apply(from = rootProject.file("app/aem/common.gradle.kts")) @@ -19,9 +17,7 @@ aem { tasks { packageCompose { mergePackageProject(":app:aem:ui.apps.base") - installBundleProject(":app:aem:api") installBundleProject(":app:aem:core") - installBundleProject(":app:aem:actions.main") vaultDefinition { duplicatesStrategy = DuplicatesStrategy.EXCLUDE version.set(rootProject.version as String) diff --git a/app/aem/ui.apps/build.gradle.kts b/app/aem/ui.apps/build.gradle.kts index eac57cd21..a034d859d 100644 --- a/app/aem/ui.apps/build.gradle.kts +++ b/app/aem/ui.apps/build.gradle.kts @@ -8,9 +8,7 @@ plugins { description = "APM (AEM Permission Management) is an AEM based, cloud compatible tool focused on streamlining the permission configuration. It provides a rich UX console tailored for administrators. They can write human readable scripts that handle user/group creation/deletion and permissions application, both in bulk. Through it's flexible grammar, exposed API, and high extensibility it vastly improves permission-based implementations." evaluationDependsOn(":app:aem:ui.apps.base") -evaluationDependsOn(":app:aem:api") evaluationDependsOn(":app:aem:core") -evaluationDependsOn(":app:aem:actions.main") apply(from = rootProject.file("app/common.gradle.kts")) apply(from = rootProject.file("app/aem/common.gradle.kts")) @@ -19,9 +17,7 @@ aem { tasks { packageCompose { mergePackageProject(":app:aem:ui.apps.base") - installBundleProject(":app:aem:api") installBundleProject(":app:aem:core") - installBundleProject(":app:aem:actions.main") vaultDefinition { duplicatesStrategy = DuplicatesStrategy.EXCLUDE version.set(rootProject.version as String) diff --git a/settings.gradle.kts b/settings.gradle.kts index 5a5b493db..f0e857ff0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,12 +1,6 @@ rootProject.name = "apm" -include(":app:aem:api") -include(":app:aem:runmodes") -include(":app:aem:runmodes.cloud") include(":app:aem:core") -include(":app:aem:actions.checks") -include(":app:aem:actions.main") -include(":app:aem:install") include(":app:aem:ui.apps.base") include(":app:aem:ui.apps") include(":app:aem:ui.apps.cloud") From d98c377ade3806d35f1cd932917b726ecf7c5025 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Thu, 17 Oct 2024 23:00:15 +0200 Subject: [PATCH 03/15] minor --- app/aem/core/build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/aem/core/build.gradle.kts b/app/aem/core/build.gradle.kts index 6ea817e1b..3a4f799c6 100644 --- a/app/aem/core/build.gradle.kts +++ b/app/aem/core/build.gradle.kts @@ -19,10 +19,13 @@ aem { tasks { jar { bundle { + symbolicName = "com.cognifide.apm" + exportPackage("com.cognifide.apm.*") importPackage("javax.annotation;version=0.0.0", "!android.os") attribute("Sling-Model-Packages", "com.cognifide.apm") excludePackage("org.antlr.stringtemplate", "org.antlr.v4.gui") embedPackage("org.antlr:antlr4-runtime:4.7.2", "org.antlr.v4.runtime.*") + attribute("APM-Actions", "com.cognifide.apm") } } } From 72aebbbbf6d42f447b4d61027dbf46682a7a805e Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Thu, 17 Oct 2024 23:35:09 +0200 Subject: [PATCH 04/15] removed ui.content, ut.system.user modules --- app/aem/all/build.gradle.kts | 8 ------ app/aem/ui.apps/build.gradle.kts | 1 + .../main/content/META-INF/vault/filter.xml | 3 ++ .../src/main/content/jcr_root/_rep_policy.xml | 0 .../jcr_root/conf/apm/scripts/.content.xml | 3 ++ .../users/system/apm-system-user/.content.xml | 0 app/aem/ui.content/build.gradle.kts | 28 ------------------- .../main/content/META-INF/vault/filter.xml | 4 --- .../jcr_root/conf/apm/scripts/.gitignore | 0 app/aem/ui.system.user/build.gradle.kts | 28 ------------------- .../main/content/META-INF/vault/filter.xml | 5 ---- settings.gradle.kts | 2 -- 12 files changed, 7 insertions(+), 75 deletions(-) rename app/aem/{ui.system.user => ui.apps}/src/main/content/jcr_root/_rep_policy.xml (100%) create mode 100644 app/aem/ui.apps/src/main/content/jcr_root/conf/apm/scripts/.content.xml rename app/aem/{ui.system.user => ui.apps}/src/main/content/jcr_root/home/users/system/apm-system-user/.content.xml (100%) delete mode 100644 app/aem/ui.content/build.gradle.kts delete mode 100644 app/aem/ui.content/src/main/content/META-INF/vault/filter.xml delete mode 100644 app/aem/ui.content/src/main/content/jcr_root/conf/apm/scripts/.gitignore delete mode 100644 app/aem/ui.system.user/build.gradle.kts delete mode 100644 app/aem/ui.system.user/src/main/content/META-INF/vault/filter.xml diff --git a/app/aem/all/build.gradle.kts b/app/aem/all/build.gradle.kts index 64d9e3a0b..a1be2fd94 100644 --- a/app/aem/all/build.gradle.kts +++ b/app/aem/all/build.gradle.kts @@ -7,8 +7,6 @@ plugins { description = "APM (AEM Permission Management) - AEM All-In-One Package" evaluationDependsOn(":app:aem:ui.apps") -evaluationDependsOn(":app:aem:ui.system.user") -evaluationDependsOn(":app:aem:ui.content") apply(from = rootProject.file("app/common.gradle.kts")) apply(from = rootProject.file("app/aem/common.gradle.kts")) @@ -19,12 +17,6 @@ aem { nestPackageProject(":app:aem:ui.apps") { dirPath.set("/apps/apm-packages/application/install") } - nestPackageProject(":app:aem:ui.system.user") { - dirPath.set("/apps/apm-packages/content/install") - } - nestPackageProject(":app:aem:ui.content") { - dirPath.set("/apps/apm-packages/content/install") - } } } } diff --git a/app/aem/ui.apps/build.gradle.kts b/app/aem/ui.apps/build.gradle.kts index a034d859d..7b6c7a693 100644 --- a/app/aem/ui.apps/build.gradle.kts +++ b/app/aem/ui.apps/build.gradle.kts @@ -22,6 +22,7 @@ aem { duplicatesStrategy = DuplicatesStrategy.EXCLUDE version.set(rootProject.version as String) description.set(project.description) + acHandling(true) } } } diff --git a/app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml b/app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml index 74c954454..189c10778 100644 --- a/app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml +++ b/app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml @@ -2,4 +2,7 @@ + + + diff --git a/app/aem/ui.system.user/src/main/content/jcr_root/_rep_policy.xml b/app/aem/ui.apps/src/main/content/jcr_root/_rep_policy.xml similarity index 100% rename from app/aem/ui.system.user/src/main/content/jcr_root/_rep_policy.xml rename to app/aem/ui.apps/src/main/content/jcr_root/_rep_policy.xml diff --git a/app/aem/ui.apps/src/main/content/jcr_root/conf/apm/scripts/.content.xml b/app/aem/ui.apps/src/main/content/jcr_root/conf/apm/scripts/.content.xml new file mode 100644 index 000000000..07c0d0724 --- /dev/null +++ b/app/aem/ui.apps/src/main/content/jcr_root/conf/apm/scripts/.content.xml @@ -0,0 +1,3 @@ + + diff --git a/app/aem/ui.system.user/src/main/content/jcr_root/home/users/system/apm-system-user/.content.xml b/app/aem/ui.apps/src/main/content/jcr_root/home/users/system/apm-system-user/.content.xml similarity index 100% rename from app/aem/ui.system.user/src/main/content/jcr_root/home/users/system/apm-system-user/.content.xml rename to app/aem/ui.apps/src/main/content/jcr_root/home/users/system/apm-system-user/.content.xml diff --git a/app/aem/ui.content/build.gradle.kts b/app/aem/ui.content/build.gradle.kts deleted file mode 100644 index 97db8fa80..000000000 --- a/app/aem/ui.content/build.gradle.kts +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - id("com.cognifide.aem.package") - id("com.cognifide.aem.package.sync") - `maven-publish` - signing -} - -description = "APM (AEM Permission Management) - Content" - -apply(from = rootProject.file("app/common.gradle.kts")) -apply(from = rootProject.file("app/aem/common.gradle.kts")) - -publishing { - publications { - register("apmCrx") { - groupId = project.group.toString() + ".crx" - artifact(tasks["packageCompose"]) - afterEvaluate { - artifactId = "apm-" + project.name - version = rootProject.version - } - pom { - name.set("APM - " + project.name) - description.set(project.description) - } - } - } -} \ No newline at end of file diff --git a/app/aem/ui.content/src/main/content/META-INF/vault/filter.xml b/app/aem/ui.content/src/main/content/META-INF/vault/filter.xml deleted file mode 100644 index 354c74d9a..000000000 --- a/app/aem/ui.content/src/main/content/META-INF/vault/filter.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/aem/ui.content/src/main/content/jcr_root/conf/apm/scripts/.gitignore b/app/aem/ui.content/src/main/content/jcr_root/conf/apm/scripts/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/aem/ui.system.user/build.gradle.kts b/app/aem/ui.system.user/build.gradle.kts deleted file mode 100644 index 826a7803c..000000000 --- a/app/aem/ui.system.user/build.gradle.kts +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - id("com.cognifide.aem.package") - id("com.cognifide.aem.package.sync") - `maven-publish` - signing -} - -description = "APM (AEM Permission Management) - System User" - -apply(from = rootProject.file("app/common.gradle.kts")) -apply(from = rootProject.file("app/aem/common.gradle.kts")) - -publishing { - publications { - register("apmCrx") { - groupId = project.group.toString() + ".crx" - artifact(tasks["packageCompose"]) - afterEvaluate { - artifactId = "apm-" + project.name - version = rootProject.version - } - pom { - name.set("APM - " + project.name) - description.set(project.description) - } - } - } -} \ No newline at end of file diff --git a/app/aem/ui.system.user/src/main/content/META-INF/vault/filter.xml b/app/aem/ui.system.user/src/main/content/META-INF/vault/filter.xml deleted file mode 100644 index 03ab9bec8..000000000 --- a/app/aem/ui.system.user/src/main/content/META-INF/vault/filter.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/settings.gradle.kts b/settings.gradle.kts index f0e857ff0..9c9b326c5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,8 +4,6 @@ include(":app:aem:core") include(":app:aem:ui.apps.base") include(":app:aem:ui.apps") include(":app:aem:ui.apps.cloud") -include(":app:aem:ui.system.user") -include(":app:aem:ui.content") include(":examples") include(":app:aem:all") include(":app:aem:all.cloud") \ No newline at end of file From e2f48c94303e6b307446bb8f419451d858ba0070 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Fri, 18 Oct 2024 00:28:55 +0200 Subject: [PATCH 05/15] minor --- app/aem/core/src/main/content/META-INF/vault/filter.xml | 4 ---- app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 app/aem/core/src/main/content/META-INF/vault/filter.xml diff --git a/app/aem/core/src/main/content/META-INF/vault/filter.xml b/app/aem/core/src/main/content/META-INF/vault/filter.xml deleted file mode 100644 index 6b8902f65..000000000 --- a/app/aem/core/src/main/content/META-INF/vault/filter.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml b/app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml index 189c10778..932f6f8d0 100644 --- a/app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml +++ b/app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml @@ -2,7 +2,7 @@ + - From 4cdb723a35f7ef43c3c0953e78f7303150091f6a Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Fri, 18 Oct 2024 00:46:49 +0200 Subject: [PATCH 06/15] refactor RunModesProvider service --- .../apm/api/scripts/LaunchEnvironment.java | 2 +- .../apm/api/services/RunModesProvider.java | 28 ------------------- .../core/launchers/StartupScriptLauncher.java | 2 +- .../apm/core/scripts/ScriptFilters.java | 2 +- .../services/RunModesProvider.java} | 16 +++++++---- .../ScriptsResourceChangeListener.java | 1 - .../apm/core/tools/ApmInstallHook.java | 2 +- 7 files changed, 14 insertions(+), 39 deletions(-) delete mode 100644 app/aem/core/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java rename app/aem/core/src/main/java/com/cognifide/apm/{runmodes/services/RunModesProviderService.java => core/services/RunModesProvider.java} (77%) diff --git a/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java b/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java index 8d11c0dff..c69742d71 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java @@ -19,7 +19,7 @@ */ package com.cognifide.apm.api.scripts; -import com.cognifide.apm.api.services.RunModesProvider; +import com.cognifide.apm.core.services.RunModesProvider; import java.util.Arrays; import java.util.Optional; import org.apache.commons.lang3.StringUtils; diff --git a/app/aem/core/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java b/app/aem/core/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java deleted file mode 100644 index 25967a7d4..000000000 --- a/app/aem/core/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java +++ /dev/null @@ -1,28 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * AEM Permission Management - * %% - * Copyright (C) 2013 Wunderman Thompson Technology - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================LICENSE_END================================== - */ -package com.cognifide.apm.api.services; - -import java.util.Set; - -public interface RunModesProvider { - - Set getRunModes(); - -} diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/StartupScriptLauncher.java b/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/StartupScriptLauncher.java index 9935ac88f..2660c32b5 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/StartupScriptLauncher.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/StartupScriptLauncher.java @@ -24,12 +24,12 @@ import com.cognifide.apm.api.scripts.LaunchEnvironment; import com.cognifide.apm.api.scripts.Script; -import com.cognifide.apm.api.services.RunModesProvider; import com.cognifide.apm.api.services.ScriptFinder; import com.cognifide.apm.api.services.ScriptManager; import com.cognifide.apm.core.Property; import com.cognifide.apm.core.services.ModifiedScriptFinder; import com.cognifide.apm.core.services.ResourceResolverProvider; +import com.cognifide.apm.core.services.RunModesProvider; import com.cognifide.apm.core.utils.sling.SlingHelper; import java.util.ArrayList; import java.util.List; diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java index ee6e46eef..8b943dd81 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java @@ -22,7 +22,7 @@ import com.cognifide.apm.api.scripts.LaunchEnvironment; import com.cognifide.apm.api.scripts.LaunchMode; import com.cognifide.apm.api.scripts.Script; -import com.cognifide.apm.api.services.RunModesProvider; +import com.cognifide.apm.core.services.RunModesProvider; import java.util.Date; import java.util.Set; import java.util.function.Predicate; diff --git a/app/aem/core/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java b/app/aem/core/src/main/java/com/cognifide/apm/core/services/RunModesProvider.java similarity index 77% rename from app/aem/core/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java rename to app/aem/core/src/main/java/com/cognifide/apm/core/services/RunModesProvider.java index eaafa8ba0..8890d2a5f 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/core/services/RunModesProvider.java @@ -17,23 +17,27 @@ * limitations under the License. * =========================LICENSE_END================================== */ -package com.cognifide.apm.runmodes.services; +package com.cognifide.apm.core.services; -import com.cognifide.apm.api.services.RunModesProvider; +import com.cognifide.apm.core.Property; import java.util.Set; import org.apache.sling.settings.SlingSettingsService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; -@Component -public class RunModesProviderService implements RunModesProvider { +@Component( + service = RunModesProvider.class, + property = { + Property.DESCRIPTION + "APM Service for providing run modes", + Property.VENDOR + } +) +public class RunModesProvider { @Reference private SlingSettingsService slingSettings; - @Override public Set getRunModes() { return slingSettings.getRunModes(); } - } diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java index 78a2f6e08..b071f53e9 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java @@ -23,7 +23,6 @@ import com.cognifide.apm.api.scripts.LaunchMode; import com.cognifide.apm.api.scripts.Script; -import com.cognifide.apm.api.services.RunModesProvider; import com.cognifide.apm.api.services.ScriptFinder; import com.cognifide.apm.api.services.ScriptManager; import com.cognifide.apm.core.Apm; diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/tools/ApmInstallHook.java b/app/aem/core/src/main/java/com/cognifide/apm/core/tools/ApmInstallHook.java index b74d395f2..48100a9ac 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/core/tools/ApmInstallHook.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/core/tools/ApmInstallHook.java @@ -27,12 +27,12 @@ import com.cognifide.apm.api.scripts.Script; import com.cognifide.apm.api.services.ExecutionMode; import com.cognifide.apm.api.services.ExecutionResult; -import com.cognifide.apm.api.services.RunModesProvider; import com.cognifide.apm.api.services.ScriptFinder; import com.cognifide.apm.api.services.ScriptManager; import com.cognifide.apm.api.status.Status; import com.cognifide.apm.core.services.ModifiedScriptFinder; import com.cognifide.apm.core.services.ResourceResolverProvider; +import com.cognifide.apm.core.services.RunModesProvider; import com.cognifide.apm.core.services.event.ApmEvent; import com.cognifide.apm.core.services.event.EventManager; import com.cognifide.apm.core.utils.sling.SlingHelper; From 3bd63700d9714dce94801df9be015f75bd615602 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Fri, 18 Oct 2024 21:12:15 +0200 Subject: [PATCH 07/15] fixed release-version.yml --- .github/workflows/release-version.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release-version.yml b/.github/workflows/release-version.yml index dbda4df71..00b79f957 100644 --- a/.github/workflows/release-version.yml +++ b/.github/workflows/release-version.yml @@ -29,8 +29,6 @@ jobs: mkdir artifacts find ./app/aem/all/build/packageCompose -name "*.zip" -print0 | xargs -0 cp -t "artifacts" find ./app/aem/all.cloud/build/packageCompose -name "*.zip" -print0 | xargs -0 cp -t "artifacts" - find ./app/aem/actions.checks/build/packageCompose -name "*.zip" -print0 | xargs -0 cp -t "artifacts" - find ./artifacts -name '*.zip' -exec bash -c ' mv $0 ${0/core/apmt}' {} \; - name: Upload Release Asset uses: skx/github-action-publish-binaries@release-0.14 env: From 7f060e3be91d64ed23299f017722d732e5ce9fa0 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Fri, 18 Oct 2024 21:53:22 +0200 Subject: [PATCH 08/15] fixed ServiceUserMapperImpl configurations --- ....impl.ServiceUserMapperImpl.amended~apm-system-user.cfg.json | 2 +- ...ng.impl.ServiceUserMapperImpl.amended-apm-system-user.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~apm-system-user.cfg.json b/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~apm-system-user.cfg.json index 9875a5b24..d9825e70d 100644 --- a/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~apm-system-user.cfg.json +++ b/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~apm-system-user.cfg.json @@ -1,5 +1,5 @@ { "user.mapping":[ - "com.cognifide.apm.core=[apm-system-user]" + "com.cognifide.apm=[apm-system-user]" ] } \ No newline at end of file diff --git a/app/aem/ui.apps/src/main/content/jcr_root/apps/apm/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-apm-system-user.config b/app/aem/ui.apps/src/main/content/jcr_root/apps/apm/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-apm-system-user.config index 331bbc7eb..61dfc425c 100644 --- a/app/aem/ui.apps/src/main/content/jcr_root/apps/apm/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-apm-system-user.config +++ b/app/aem/ui.apps/src/main/content/jcr_root/apps/apm/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-apm-system-user.config @@ -1 +1 @@ -user.mapping=["com.cognifide.apm.core\=apm-system-user"] +user.mapping=["com.cognifide.apm\=apm-system-user"] From 6f439438f8e3071cb5988a434d66c885bebb9734 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Fri, 18 Oct 2024 21:57:56 +0200 Subject: [PATCH 09/15] fixed LoginAdminWhitelist configurations --- ....jcr.base.internal.LoginAdminWhitelist.fragment~apm.cfg.json | 2 +- ...ng.jcr.base.internal.LoginAdminWhitelist.fragment-apm.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~apm.cfg.json b/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~apm.cfg.json index 15de9ffaa..ba09963b7 100644 --- a/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~apm.cfg.json +++ b/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~apm.cfg.json @@ -1,6 +1,6 @@ { "whitelist.bundles":[ - "com.cognifide.apm.core" + "com.cognifide.apm" ], "whitelist.name":"apm" } \ No newline at end of file diff --git a/app/aem/ui.apps/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-apm.config b/app/aem/ui.apps/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-apm.config index c67bba96f..f4965b606 100644 --- a/app/aem/ui.apps/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-apm.config +++ b/app/aem/ui.apps/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-apm.config @@ -1,2 +1,2 @@ whitelist.name="apm" -whitelist.bundles=["com.cognifide.apm.core"] +whitelist.bundles=["com.cognifide.apm"] From d9ea625e0a70e18e78da482fc2ca6356f558089b Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Fri, 18 Oct 2024 22:08:25 +0200 Subject: [PATCH 10/15] fixed amp grammar --- app/aem/core/src/main/antlr/ApmLang.g4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/aem/core/src/main/antlr/ApmLang.g4 b/app/aem/core/src/main/antlr/ApmLang.g4 index 6b5fcb4ca..30e30b558 100644 --- a/app/aem/core/src/main/antlr/ApmLang.g4 +++ b/app/aem/core/src/main/antlr/ApmLang.g4 @@ -25,7 +25,7 @@ grammar ApmLang; */ apm - : command+ EOF + : command* EOF ; name From 9215e6713866cd000ff714dbb9a0b901a9dc55f4 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Fri, 18 Oct 2024 22:40:21 +0200 Subject: [PATCH 11/15] fixed ScriptManagerImpl --- .../com/cognifide/apm/core/scripts/ScriptManagerImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptManagerImpl.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptManagerImpl.java index 838d9b558..15fc01511 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptManagerImpl.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptManagerImpl.java @@ -169,7 +169,7 @@ public Progress process(Script script, ExecutionMode mode, Map c } updateScriptProperties(script, mode, progress.isSuccess()); - versionService.updateVersionIfNeeded(resolver, script); + updateVersionIfNeeded(mode, resolver, script); saveHistory(script, mode, progress); eventManager.trigger(new ScriptExecutedEvent(script, mode, progress.isSuccess())); @@ -196,6 +196,12 @@ private void updateScriptProperties(Script script, ExecutionMode mode, boolean s } } + private void updateVersionIfNeeded(ExecutionMode mode, ResourceResolver resolver, Script... scripts) { + if (mode != ExecutionMode.VALIDATION) { + versionService.updateVersionIfNeeded(resolver, scripts); + } + } + @Override public Map getPredefinedDefinitions() { return definitionsProviders.stream() From 750c89a743c3e30c9bf6471ab12199318bedbf1a Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Tue, 22 Oct 2024 01:40:49 +0200 Subject: [PATCH 12/15] fixed summaryTable.html styling --- .../components/summaryTable/summaryTable.html | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/components/summaryTable/summaryTable.html b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/components/summaryTable/summaryTable.html index 352a869f0..13a03b6dc 100644 --- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/components/summaryTable/summaryTable.html +++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/components/summaryTable/summaryTable.html @@ -30,44 +30,44 @@ Duration: ${item.entry.executionDuration}s - - - -
+ + + + - - - - - - + - - - - - + + + + - -
No + Authorizable + Action + Parameters + Status + Messages
${executionList.index}${execution.authorizable}${execution.command.toUpperCase} +
${executionList.index}${execution.authorizable}${execution.command.toUpperCase}
  • ${text}
 + +
  • ${text}
From 19a69ad63a3025e8df08f6b5afb3e0b694c06247 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Fri, 25 Oct 2024 12:47:45 +0200 Subject: [PATCH 13/15] removed ApmActionsMainService service --- .../actions/ActionMapperRegistryImpl.java | 4 --- .../main/services/ApmActionsMainService.java | 33 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 app/aem/core/src/main/java/com/cognifide/apm/main/services/ApmActionsMainService.java diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/actions/ActionMapperRegistryImpl.java b/app/aem/core/src/main/java/com/cognifide/apm/core/actions/ActionMapperRegistryImpl.java index 399d33fee..6d365ec0d 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/core/actions/ActionMapperRegistryImpl.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/core/actions/ActionMapperRegistryImpl.java @@ -25,7 +25,6 @@ import com.cognifide.apm.core.Property; import com.cognifide.apm.core.actions.scanner.AnnotatedClassRegistry; import com.cognifide.apm.core.actions.scanner.RegistryChangedListener; -import com.cognifide.apm.main.services.ApmActionsMainService; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import java.util.ArrayList; @@ -57,9 +56,6 @@ public class ActionMapperRegistryImpl implements RegistryChangedListener, Action private static final String BUNDLE_HEADER = "APM-Actions"; - @Reference - private ApmActionsMainService apmActionsMainService; - private AnnotatedClassRegistry registry; private final AtomicReference> mappers = new AtomicReference<>( diff --git a/app/aem/core/src/main/java/com/cognifide/apm/main/services/ApmActionsMainService.java b/app/aem/core/src/main/java/com/cognifide/apm/main/services/ApmActionsMainService.java deleted file mode 100644 index a9491e9a9..000000000 --- a/app/aem/core/src/main/java/com/cognifide/apm/main/services/ApmActionsMainService.java +++ /dev/null @@ -1,33 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * AEM Permission Management - * %% - * Copyright (C) 2013 Wunderman Thompson Technology - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================LICENSE_END================================== - */ -package com.cognifide.apm.main.services; - -import org.osgi.framework.Constants; -import org.osgi.service.component.annotations.Component; - -@Component( - service = ApmActionsMainService.class, - property = { - Constants.SERVICE_DESCRIPTION + "=APM Actions Main service", - Constants.SERVICE_VENDOR + "=Wunderman Thompson Technology" - } -) -public class ApmActionsMainService { -} From 851ab241e3b4d62db6b89e8855b7e297a7a1c1af Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Mon, 28 Oct 2024 16:08:38 +0100 Subject: [PATCH 14/15] Revert "refactor RunModesProvider service" This reverts commit 4cdb723a35f7ef43c3c0953e78f7303150091f6a. --- .../apm/api/scripts/LaunchEnvironment.java | 2 +- .../apm/api/services/RunModesProvider.java | 28 +++++++++++++++++++ .../core/launchers/StartupScriptLauncher.java | 2 +- .../apm/core/scripts/ScriptFilters.java | 2 +- .../ScriptsResourceChangeListener.java | 1 + .../apm/core/tools/ApmInstallHook.java | 2 +- .../services/RunModesProviderService.java} | 16 ++++------- 7 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 app/aem/core/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java rename app/aem/core/src/main/java/com/cognifide/apm/{core/services/RunModesProvider.java => runmodes/services/RunModesProviderService.java} (77%) diff --git a/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java b/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java index c69742d71..8d11c0dff 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/api/scripts/LaunchEnvironment.java @@ -19,7 +19,7 @@ */ package com.cognifide.apm.api.scripts; -import com.cognifide.apm.core.services.RunModesProvider; +import com.cognifide.apm.api.services.RunModesProvider; import java.util.Arrays; import java.util.Optional; import org.apache.commons.lang3.StringUtils; diff --git a/app/aem/core/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java b/app/aem/core/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java new file mode 100644 index 000000000..25967a7d4 --- /dev/null +++ b/app/aem/core/src/main/java/com/cognifide/apm/api/services/RunModesProvider.java @@ -0,0 +1,28 @@ +/*- + * ========================LICENSE_START================================= + * AEM Permission Management + * %% + * Copyright (C) 2013 Wunderman Thompson Technology + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * =========================LICENSE_END================================== + */ +package com.cognifide.apm.api.services; + +import java.util.Set; + +public interface RunModesProvider { + + Set getRunModes(); + +} diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/StartupScriptLauncher.java b/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/StartupScriptLauncher.java index 2660c32b5..9935ac88f 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/StartupScriptLauncher.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/StartupScriptLauncher.java @@ -24,12 +24,12 @@ import com.cognifide.apm.api.scripts.LaunchEnvironment; import com.cognifide.apm.api.scripts.Script; +import com.cognifide.apm.api.services.RunModesProvider; import com.cognifide.apm.api.services.ScriptFinder; import com.cognifide.apm.api.services.ScriptManager; import com.cognifide.apm.core.Property; import com.cognifide.apm.core.services.ModifiedScriptFinder; import com.cognifide.apm.core.services.ResourceResolverProvider; -import com.cognifide.apm.core.services.RunModesProvider; import com.cognifide.apm.core.utils.sling.SlingHelper; import java.util.ArrayList; import java.util.List; diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java index 8b943dd81..ee6e46eef 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java @@ -22,7 +22,7 @@ import com.cognifide.apm.api.scripts.LaunchEnvironment; import com.cognifide.apm.api.scripts.LaunchMode; import com.cognifide.apm.api.scripts.Script; -import com.cognifide.apm.core.services.RunModesProvider; +import com.cognifide.apm.api.services.RunModesProvider; import java.util.Date; import java.util.Set; import java.util.function.Predicate; diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java index b071f53e9..78a2f6e08 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java @@ -23,6 +23,7 @@ import com.cognifide.apm.api.scripts.LaunchMode; import com.cognifide.apm.api.scripts.Script; +import com.cognifide.apm.api.services.RunModesProvider; import com.cognifide.apm.api.services.ScriptFinder; import com.cognifide.apm.api.services.ScriptManager; import com.cognifide.apm.core.Apm; diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/tools/ApmInstallHook.java b/app/aem/core/src/main/java/com/cognifide/apm/core/tools/ApmInstallHook.java index 48100a9ac..b74d395f2 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/core/tools/ApmInstallHook.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/core/tools/ApmInstallHook.java @@ -27,12 +27,12 @@ import com.cognifide.apm.api.scripts.Script; import com.cognifide.apm.api.services.ExecutionMode; import com.cognifide.apm.api.services.ExecutionResult; +import com.cognifide.apm.api.services.RunModesProvider; import com.cognifide.apm.api.services.ScriptFinder; import com.cognifide.apm.api.services.ScriptManager; import com.cognifide.apm.api.status.Status; import com.cognifide.apm.core.services.ModifiedScriptFinder; import com.cognifide.apm.core.services.ResourceResolverProvider; -import com.cognifide.apm.core.services.RunModesProvider; import com.cognifide.apm.core.services.event.ApmEvent; import com.cognifide.apm.core.services.event.EventManager; import com.cognifide.apm.core.utils.sling.SlingHelper; diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/services/RunModesProvider.java b/app/aem/core/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java similarity index 77% rename from app/aem/core/src/main/java/com/cognifide/apm/core/services/RunModesProvider.java rename to app/aem/core/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java index 8890d2a5f..eaafa8ba0 100644 --- a/app/aem/core/src/main/java/com/cognifide/apm/core/services/RunModesProvider.java +++ b/app/aem/core/src/main/java/com/cognifide/apm/runmodes/services/RunModesProviderService.java @@ -17,27 +17,23 @@ * limitations under the License. * =========================LICENSE_END================================== */ -package com.cognifide.apm.core.services; +package com.cognifide.apm.runmodes.services; -import com.cognifide.apm.core.Property; +import com.cognifide.apm.api.services.RunModesProvider; import java.util.Set; import org.apache.sling.settings.SlingSettingsService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; -@Component( - service = RunModesProvider.class, - property = { - Property.DESCRIPTION + "APM Service for providing run modes", - Property.VENDOR - } -) -public class RunModesProvider { +@Component +public class RunModesProviderService implements RunModesProvider { @Reference private SlingSettingsService slingSettings; + @Override public Set getRunModes() { return slingSettings.getRunModes(); } + } From 60d4d9acd880f07cc572e800037ff3922236ef95 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Mon, 28 Oct 2024 17:20:32 +0100 Subject: [PATCH 15/15] minor --- ....jcr.base.internal.LoginAdminWhitelist.fragment~apm.cfg.json | 2 +- ....impl.ServiceUserMapperImpl.amended~apm-system-user.cfg.json | 2 +- settings.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~apm.cfg.json b/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~apm.cfg.json index ba09963b7..0e90b96bd 100644 --- a/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~apm.cfg.json +++ b/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~apm.cfg.json @@ -3,4 +3,4 @@ "com.cognifide.apm" ], "whitelist.name":"apm" -} \ No newline at end of file +} diff --git a/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~apm-system-user.cfg.json b/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~apm-system-user.cfg.json index d9825e70d..23fddb0da 100644 --- a/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~apm-system-user.cfg.json +++ b/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~apm-system-user.cfg.json @@ -2,4 +2,4 @@ "user.mapping":[ "com.cognifide.apm=[apm-system-user]" ] -} \ No newline at end of file +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 9c9b326c5..f84429ed6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,4 +6,4 @@ include(":app:aem:ui.apps") include(":app:aem:ui.apps.cloud") include(":examples") include(":app:aem:all") -include(":app:aem:all.cloud") \ No newline at end of file +include(":app:aem:all.cloud")