This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 553df5833dd14243cdec3f8ec6e34241a9210941
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Feb 1 13:56:56 2021 -0500
Further fixes for SLING-10083 - ensuring service user is present and
removing the fields for setting the service user on create user
---
feature/src/main/features/cms/cms.json | 7 +-----
feature/src/main/features/cms/reference.json | 27 ++++++++++++++++++++++
.../forms/actions/createuser/createuser.jsp | 2 --
.../components/forms/actions/createuser/edit.json | 7 ------
4 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/feature/src/main/features/cms/cms.json
b/feature/src/main/features/cms/cms.json
index 385fd86..aa203a7 100644
--- a/feature/src/main/features/cms/cms.json
+++ b/feature/src/main/features/cms/cms.json
@@ -13,10 +13,6 @@
"start-order": "20"
},
{
- "id":
"org.apache.sling:org.apache.sling.cms.reference:${cms-version}",
- "start-order": "20"
- },
- {
"id":
"org.apache.sling:org.apache.sling.cms.transformer:${cms-version}",
"start-order": "20"
},
@@ -184,8 +180,7 @@
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-ugc":
{
"user.mapping": [
- "org.apache.sling.cms.core:sling-cms-ugc=sling-cms-ugc",
- "org.apache.sling.cms.reference:sling-cms-ugc=sling-cms-ugc"
+ "org.apache.sling.cms.core:sling-cms-ugc=sling-cms-ugc"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-versionmgr":
{
diff --git a/feature/src/main/features/cms/reference.json
b/feature/src/main/features/cms/reference.json
new file mode 100644
index 0000000..54555c9
--- /dev/null
+++ b/feature/src/main/features/cms/reference.json
@@ -0,0 +1,27 @@
+{
+ "bundles": [
+ {
+ "id":
"org.apache.sling:org.apache.sling.cms.reference:${cms-version}",
+ "start-order": "20"
+ }
+ ],
+ "configurations": {
+
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-ugc-ref":
{
+ "user.mapping": [
+ "org.apache.sling.cms.reference:sling-cms-ugc=sling-cms-ugc"
+ ]
+ },
+
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~slingcms-reference-usermanager":
{
+ "user.mapping": [
+
"org.apache.sling.cms.reference:slingcms-reference-usermanager=slingcms-reference-usermanager"
+ ]
+ }
+ },
+ "repoinit:TEXT|true": [
+ "# Service users",
+ "create service user slingcms-reference-usermanager",
+ "set ACL for slingcms-reference-usermanager",
+ " allow\tjcr:all\ton /home",
+ "end"
+ ]
+}
\ No newline at end of file
diff --git
a/reference/src/main/resources/jcr_root/apps/reference/components/forms/actions/createuser/createuser.jsp
b/reference/src/main/resources/jcr_root/apps/reference/components/forms/actions/createuser/createuser.jsp
index b6c450f..35caee3 100644
---
a/reference/src/main/resources/jcr_root/apps/reference/components/forms/actions/createuser/createuser.jsp
+++
b/reference/src/main/resources/jcr_root/apps/reference/components/forms/actions/createuser/createuser.jsp
@@ -24,8 +24,6 @@
<dd>${sling:encode(fn:join(properties.groups,','),'HTML')}</dd>
<dt>Intermediate Path</dt>
<dd>${sling:encode(properties.intermediatePath,'HTML')}</dd>
- <dt>Service User</dt>
- <dd>${sling:encode(properties.serviceUser,'HTML')}</dd>
<dt>Set Profile Properties</dt>
<dd>${sling:encode(fn:join(properties.profileProperties,','),'HTML')}</dd>
</dl>
diff --git
a/reference/src/main/resources/jcr_root/apps/reference/components/forms/actions/createuser/edit.json
b/reference/src/main/resources/jcr_root/apps/reference/components/forms/actions/createuser/edit.json
index 3af280d..a469aeb 100644
---
a/reference/src/main/resources/jcr_root/apps/reference/components/forms/actions/createuser/edit.json
+++
b/reference/src/main/resources/jcr_root/apps/reference/components/forms/actions/createuser/edit.json
@@ -35,13 +35,6 @@
"label": "Intermediate Path",
"name": "intermediatePath",
"required": true
- },
- "serviceUser": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/editor/fields/text",
- "label": "Service User",
- "name": "serviceUser",
- "required": true
}
}
}
\ No newline at end of file
