Merge pull request #448 from wttech/feature/restructure-project

Feature/restructure project

.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/[email protected]
         env:

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")
-            }
         }
     }
 }

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"))
@@ -19,19 +19,19 @@ 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.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.*")
+                attribute("APM-Actions", "com.cognifide.apm")
             }
         }
     }
 }
 
 dependencies {
-    implementation(project(":app:aem:api"))
-    implementation(project(":app:aem:actions.main"))
-
     antlr("org.antlr:antlr4:4.7.2")
 }
 

app/aem/core/src/main/antlr/ApmLang.g4

@@ -25,7 +25,7 @@ grammar ApmLang;
  */
 
 apm
-    : command+ EOF
+    : command* EOF
     ;
 
 name

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<Map<String, MapperDescriptor>> mappers = new AtomicReference<>(

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<String, String> 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<String, String> getPredefinedDefinitions() {
     return definitionsProviders.stream()