Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor/reorganize structure #442

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Refactor/reorganize structure #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a67ca82
removed ui.content and ui.system.user module
dprzybyl Mar 27, 2024
3a2df55
removed install module
dprzybyl Mar 27, 2024
73b0e32
added actions.checks module to all and all.cloud module
dprzybyl Mar 27, 2024
f2a4aed
minor
dprzybyl Mar 27, 2024
232d177
Update settings.gradle.kts
dprzybyl May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/release-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ 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/ui.apps/build/packageCompose -name "*.zip" -print0 | xargs -0 cp -t "artifacts"
find ./app/aem/ui.apps.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
Expand Down
4 changes: 4 additions & 0 deletions app/aem/all.cloud/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ plugins {
description = "APM (AEM Permission Management) - AEM All-In-One Package (Cloud)"

evaluationDependsOn(":app:aem:ui.apps.cloud")
evaluationDependsOn(":app:aem:actions.checks")

apply(from = rootProject.file("app/common.gradle.kts"))
apply(from = rootProject.file("app/aem/common.gradle.kts"))
Expand All @@ -17,6 +18,9 @@ aem {
nestPackageProject(":app:aem:ui.apps.cloud") {
dirPath.set("/apps/apm-packages/application/install")
}
nestPackageProject(":app:aem:actions.checks") {
dirPath.set("/apps/apm-packages/application/install")
}
}
}
}
Expand Down
10 changes: 3 additions & 7 deletions app/aem/all/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ 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")
evaluationDependsOn(":app:aem:actions.checks")

apply(from = rootProject.file("app/common.gradle.kts"))
apply(from = rootProject.file("app/aem/common.gradle.kts"))
Expand All @@ -19,11 +18,8 @@ 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")
nestPackageProject(":app:aem:actions.checks") {
dirPath.set("/apps/apm-packages/application/install")
}
}
}
Expand Down
0 .../install/launchers/ApmInstallService.java → .../install/launchers/ApmInstallService.java
View file
Open in desktop
File renamed without changes.
49 changes: 0 additions & 49 deletions app/aem/install/build.gradle.kts
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions app/aem/ui.apps.cloud/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ 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"))
Expand All @@ -25,9 +24,6 @@ aem {
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)
Expand Down
2 changes: 0 additions & 2 deletions app/aem/ui.apps/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ 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"))
Expand All @@ -25,7 +24,6 @@ aem {
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)
Expand Down
3 changes: 3 additions & 0 deletions app/aem/ui.apps/src/main/content/META-INF/vault/filter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@
<workspaceFilter version="1.0">
<filter root="/apps/apm"/>
<filter root="/apps/cq/core/content/nav/tools/security/apm"/>
<filter root="/conf/apm" mode="merge"/>
<filter root="/home/users/system/apm-system-user"/>
<filter root="/rep:policy"/>
</workspaceFilter>
0 ...src/main/content/jcr_root/_rep_policy.xml → ...src/main/content/jcr_root/_rep_policy.xml
View file
Open in desktop
File renamed without changes.
0 ...tent/jcr_root/conf/apm/scripts/.gitignore → ...tent/jcr_root/conf/apm/scripts/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...users/system/apm-system-user/.content.xml → ...users/system/apm-system-user/.content.xml
View file
Open in desktop
File renamed without changes.
28 changes: 0 additions & 28 deletions app/aem/ui.content/build.gradle.kts
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions app/aem/ui.content/src/main/content/META-INF/vault/filter.xml
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions app/aem/ui.system.user/build.gradle.kts
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions app/aem/ui.system.user/src/main/content/META-INF/vault/filter.xml
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ 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")
include(":app:aem:ui.system.user")
include(":app:aem:ui.content")
include(":examples")
include(":app:aem:all")
include(":app:aem:all.cloud")
include(":app:aem:all.cloud")
Loading