This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-8428-mixin-linkedfile
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
The following commit(s) were added to
refs/heads/feature/SLING-8428-mixin-linkedfile by this push:
new 35da39b SLING-8428 apply additional patch provided by Dominique Jäggi
35da39b is described below
commit 35da39bd3233c51d2d1f4d171e0503ad07f37ccf
Author: sseifert <[email protected]>
AuthorDate: Wed May 22 15:55:20 2019 +0200
SLING-8428 apply additional patch provided by Dominique Jäggi
---
core/src/test/resources/SLING-INF/nodetypes/app.cnd | 7 +++++++
core/src/test/resources/json-import-samples/content.json | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/core/src/test/resources/SLING-INF/nodetypes/app.cnd
b/core/src/test/resources/SLING-INF/nodetypes/app.cnd
index 121343b..865cc1d 100644
--- a/core/src/test/resources/SLING-INF/nodetypes/app.cnd
+++ b/core/src/test/resources/SLING-INF/nodetypes/app.cnd
@@ -23,7 +23,14 @@
[app:PageContent] > nt:unstructured
[dam:Asset] > nt:unstructured
+ - jcr:versionHistory (string) copy
+ - jcr:baseVersion (string) copy
+ - jcr:predecessors (string) multiple
+ - jcr:isCheckedOut (boolean) copy
[dam:AssetContent] > nt:unstructured
+[app:Taggable] mixin
+ - app:tags (string) multiple
+
[app:TestMixin] mixin
- testMixinProp (string) copy
diff --git a/core/src/test/resources/json-import-samples/content.json
b/core/src/test/resources/json-import-samples/content.json
index a2d4358..1c8bccd 100644
--- a/core/src/test/resources/json-import-samples/content.json
+++ b/core/src/test/resources/json-import-samples/content.json
@@ -42,7 +42,7 @@
"jcr:created": "Thu Aug 07 2014 16:32:59 GMT+0200",
"jcr:content": {
"jcr:primaryType": "nt:resource",
- "jcr:mixinTypes": ["mix:referenceable"],
+ "jcr:mixinTypes": ["app:TestMixin"],
"jcr:lastModifiedBy": "anonymous",
"jcr:mimeType": "image/jpeg",
"jcr:lastModified": "Thu Aug 07 2014 16:32:59 GMT+0200",
@@ -54,7 +54,7 @@
"jcr:primaryType": "nt:file",
"jcr:content": {
"jcr:primaryType": "nt:resource",
- "jcr:mixinTypes": ["mix:referenceable"],
+ "jcr:mixinTypes": ["app:TestMixin"],
":jcr:data": 24377
}
},
