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

#2589 - Fixes issues with 6.4.8 compat #2590

Merged
merged 6 commits into from
May 25, 2021
Merged

#2589 - Fixes issues with 6.4.8 compat #2590

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
55b2d10
#2589 - Fixes issues with 6.4.8 compat.
davidjgonzalez May 21, 2021
82aa331
#2589 - Formatting of XML
davidjgonzalez May 24, 2021
394d6ec
#2589 - reverted path change
davidjgonzalez May 24, 2021
55a0924
#2589 - Fixed mangled comment
davidjgonzalez May 24, 2021
8469af6
#2589 - Reverted to .config format, using older `-` factory filename …
davidjgonzalez May 25, 2021
16bd2a0
Merge branch 'master' into fix/2589
davidjgonzalez May 25, 2021
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
22 changes: 11 additions & 11 deletions ...apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,19 @@ create path /content/cq:tags(sling:Folder)
create path /etc/packages(sling:Folder)

# create default contextual configuration for redirects: /conf/global/settings/redirects
create path /conf/global(sling:Folder)/settings(sling:Folder)/redirects(nt:unstructured)
set properties on /conf/global/settings/redirects
set sling:resourceType{String} to acs-commons/components/utilities/manage-redirects/redirects
end
create path /conf/global(sling:Folder)
create path /conf/global/settings(sling:Folder)
create path /conf/global/settings/redirects(nt:unstructured)

# Not supported in 6.4.8
#set properties on /conf/global/settings/redirects
# set sling:resourceType{String} to acs-commons/components/utilities/manage-redirects/redirects
#end

# user to invalidate cached redirects on change
create service user acs-commons-manage-redirects-service with path system/acs-aem-commons
set ACL for acs-commons-manage-redirects-service
allow jcr:read on /
allow jcr:read on /conf
end

Expand All @@ -20,7 +26,7 @@ set ACL for anonymous
allow jcr:read on /conf restriction(rep:glob,/*/settings/redirects)
end

create service user acs-commons-automatic-package-replicator-service with path system/acs-commons
create service user acs-commons-automatic-package-replicator-service with path system/acs-aem-commons
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this path change?

set ACL for acs-commons-automatic-package-replicator-service
allow jcr:read,jcr:versionManagement,rep:write,crx:replicate on /etc/packages
allow jcr:read on /
Expand All @@ -41,12 +47,6 @@ set ACL for acs-commons-remote-assets-service
# If /etc/tags is used, these ACLs be set manually - if RepoInit defines this structure, it supersedes the use of /content/cq:tags
# allow jcr:read, jcr:versionManagement, rep:write, crx:replicate on /etc/tags
end

create service user acs-commons-manage-redirects-service with path system/acs-aem-commons
HitmanInWis marked this conversation as resolved.
Show resolved Hide resolved
set ACL for acs-commons-manage-redirects-service
allow jcr:read on /
end

"
]

9 changes: 9 additions & 0 deletions ...ig/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:primaryType="sling:OsgiConfig"
user.default=""
user.mapping="[com.adobe.acs.acs-aem-commons-bundle:ensure-oak-index=[acs-commons-ensure-oak-index-service],com.adobe.acs.acs-aem-commons-bundle:email-service=[acs-commons-email-service],com.adobe.acs.acs-aem-commons-bundle:httpcache-jcr-storage-service=[acs-commons-httpcache-jcr-storage-service],com.adobe.acs.acs-aem-commons-bundle:review-task-asset-mover=[acs-commons-review-task-asset-mover-service],com.adobe.acs.acs-aem-commons-bundle:error-page-handler=[acs-commons-error-page-handler-service],com.adobe.acs.acs-aem-commons-bundle:form-helper=[acs-commons-form-helper-service],com.adobe.acs.acs-aem-commons-bundle:dispatcher-flush=[acs-commons-dispatcher-flush-service],com.adobe.acs.acs-aem-commons-bundle:package-replication-status-event-listener=[acs-commons-package-replication-status-event-service],com.adobe.acs.acs-aem-commons-bundle:component-error-handler=[acs-commons-component-error-handler-service],com.adobe.acs.acs-aem-commons-bundle:system-notifications=[acs-commons-system-notifications-service],com.adobe.acs.acs-aem-commons-bundle-twitter:twitter-updater=[acs-commons-twitter-updater-service],com.adobe.acs.acs-aem-commons-bundle:workflow-remover=[acs-commons-workflow-remover-service],com.adobe.acs.acs-aem-commons-bundle:bulk-workflow=[acs-commons-bulk-workflow-servic],com.adobe.acs.acs-aem-commons-bundle:bulk-workflow-runner=[workflow-process-service],com.adobe.acs.acs-aem-commons-bundle:ensure-service-user=[acs-commons-ensure-service-user-service],com.adobe.acs.acs-aem-commons-bundle:shared-component-props=[acs-commons-shared-component-props-service],com.adobe.acs.acs-aem-commons-bundle:manage-controlled-processes=[acs-commons-manage-controlled-processes-service],com.adobe.acs.acs-aem-commons-bundle:automatic-package-replicator=[acs-commons-automatic-package-replicator-service],com.adobe.acs.acs-aem-commons-bundle:on-deploy-scripts=[acs-commons-on-deploy-scripts-service],com.adobe.acs.acs-aem-commons-bundle:remote-assets=[acs-commons-remote-assets-service],com.adobe.acs.acs-aem-commons-bundle:workflowpackagemanager-service=[acs-commons-workflowpackagemanager-service],com.adobe.acs.acs-aem-commons-bundle:redirect-manager=[acs-commons-manage-redirects-service],com.adobe.acs.acs-aem-commons-bundle:file-fetch=[acs-commons-file-fetch-service]]"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible for this to be stored on multiple lines to ease up on merge conflicts?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeh - good idea.


<!-- sling:OsgiConfig format used due to 6.4.8 support -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even AEM 6.4 supports the better suited .config format (https://sling.apache.org/documentation/bundles/configuration-installer-factory.html#configuration-files-config). I would not recommend adding new configuration with sling:OsgiConfig format which has a lot of flaws: https://sling.apache.org/documentation/bundles/configuration-installer-factory.html#slingosgiconfig-resources

Copy link
Contributor Author

@davidjgonzalez davidjgonzalez May 24, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these any caveats with .config? That's what we had before and when installed no service user mappings would get registered. Moving them back to sling:OsgiConfig and they work just fine. The .config did work on 6.5 and AEM CS though... thoughts on why 6.4 was problematic?

Does master (which uses .config) work for you on 6.4.8?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not that I know of. In case there is issues with .config on 6.4.8 this is probably due to escaping. Any logs available from OSGi installer with the problematic .config?

Copy link
Contributor

@kwin kwin May 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, the problem is not the .config, but the filename. Tilde as separator is only supported since Configuration Factory Packages 1.2.0 (https://issues.apache.org/jira/browse/SLING-7786) while AEM 6.4 still ships with 1.1.x. So just converting the filename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~acs-commons.config to ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.config should be enough to fix this.

@davidjgonzalez When you converted to sling:OsgiConfig format you also changed the filename separator. Thats why it was working with this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sunuva. didnt even see that .. 👓 ...
Ill flip it back and update to -..



25 changes: 0 additions & 25 deletions ...org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~acs-commons.config
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions ui.content/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 @@ -3,6 +3,9 @@
<filter root="/conf/rep:policy"/>
<filter root="/content/dam/rep:policy"/>
<filter root="/content/rep:policy"/>
<filter root="/conf/global/settings">
<include pattern="/conf/global/settings/redirects"/>
</filter>
<filter root="/etc/acs-commons">
<include pattern="/etc/acs-commons/jcr:content"/>
<include pattern="/etc/acs-commons/automatic-package-replication"/>
Expand Down
4 changes: 4 additions & 0 deletions ui.content/src/main/content/jcr_root/conf/global/settings/redirects/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:primaryType="nt:unstructured"
sling:resourceType="acs-commons/components/utilities/manage-redirects/redirects"/>