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

Feature/restructure project

Author: dprzybyl

.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/actions.checks/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/actions.checks/src/main/content/META-INF/vault/filter.xml

@@ -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/actions.main/build.gradle.kts

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