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

Add back jcr:content definition to avoid the folder being created as nt:folder #1021

Merged
merged 5 commits into from
Jan 13, 2023
Merged

Add back jcr:content definition to avoid the folder being created as nt:folder #1021

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccd6877
Add back jcr:content definition to avoid the folder being created as …
vladbailescu Jan 11, 2023
2883d22
Added jcr:content node to root filters
vladbailescu Jan 11, 2023
039e1da
Add dam/../jcr:content filter with merge_properties mode
vladbailescu Jan 12, 2023
db4dc2e
Switch filters to use exclude/include
vladbailescu Jan 12, 2023
57b45f4
Fix typo in GH action
vladbailescu Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/archetype/ui.apps.structure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@

<!-- DAM folder root, will be created via repoinit -->
<filter><root>/content/dam/${appId}</root></filter>
<filter><root>/content/dam/${appId}/jcr:content</root></filter>
Copy link
Contributor

Choose a reason for hiding this comment

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

This additional filter is redundant. Are you sure this is effective at all?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, you're right, it's absolutely useless 🤦

Since you added the new MERGE_PROPERTIES mode in https://issues.apache.org/jira/browse/JCRVLT-255 I think we can use that.

The whole idea was to avoid having a broad filter on the /content/dam/${appId} node as it was causing issues during deployments on Cloud Service.

Copy link
Contributor

Choose a reason for hiding this comment

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

MERGE_PROPERTIES will never be supported in AEM 6.5 as it uses an ancient FileVault version, even AEM Cloud is not yet on a new FileVault release (but that should happen soon).

Copy link
Member Author

Choose a reason for hiding this comment

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

Alternatively, we could add the /content/dam/${appId} filter and jcr:content node definition only for 6.5 projects.

Copy link
Contributor

Choose a reason for hiding this comment

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

I would rather work with includes/excludes there.


</filters>
</configuration>
Expand Down