Skip to content

Commit 07340a4

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents f2fbced + 728c0fa commit 07340a4

File tree

90 files changed

+154
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+154
-106
lines changed

‎build-deploy_aem65.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fi
2626
# install AEM 6.5 with service pack
2727
mvn --non-recursive wcmio-content-package:install \
2828
--activate-profiles=${MAVEN_PROFILES} \
29-
-Dvault.artifact=adobe.binary.aem.65.servicepack:aem-service-pkg:zip:6.5.19.0 \
29+
-Dvault.artifact=adobe.binary.aem.65.servicepack:aem-service-pkg:zip:6.5.20.0 \
3030
-Dvault.delayAfterInstallSec=30
3131

3232
if [ "$?" -ne "0" ]; then

‎bundles/core/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>2.0.2-2.23.2</version>
28+
<version>2.0.4-2.25.4</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm</groupId>
3333
<artifactId>io.wcm.wcm.core.components</artifactId>
34-
<version>2.0.2-2.23.2</version>
34+
<version>2.0.4-2.25.4</version>
3535
<packaging>jar</packaging>
3636

3737
<name>WCM Core Components</name>

‎bundles/core/src/main/java/io/wcm/wcm/core/components/commons/link/LinkHtmlAttributesSerializer.java

+3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ public LinkHtmlAttributesSerializer() {
4848
this(null);
4949
}
5050

51+
/**
52+
* @param t Class map
53+
*/
5154
protected LinkHtmlAttributesSerializer(Class<Map<String, String>> t) {
5255
super(t);
5356
}

‎bundles/core/src/main/java/io/wcm/wcm/core/components/impl/models/wcmio/v1/ResponsiveImageV1Impl.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import io.wcm.handler.media.MediaNameConstants;
6262
import io.wcm.handler.media.Rendition;
6363
import io.wcm.handler.mediasource.inline.InlineMediaSource;
64-
import io.wcm.sling.commons.adapter.AdaptTo;
6564
import io.wcm.sling.models.annotations.AemObject;
6665
import io.wcm.wcm.core.components.impl.models.helpers.AbstractComponentImpl;
6766
import io.wcm.wcm.core.components.impl.models.helpers.ImageAreaV1Impl;
@@ -246,7 +245,7 @@ public List<ImageArea> getAreas() {
246245
.withAssetData(() -> Optional.of(media)
247246
.filter(Media::isValid)
248247
.map(Media::getAsset)
249-
.map(asset -> AdaptTo.notNull(asset, com.day.cq.dam.api.Asset.class))
248+
.map(asset -> asset.adaptTo(com.day.cq.dam.api.Asset.class))
250249
.map(DataLayerBuilder::forAsset)
251250
.map(AssetDataBuilder::build)
252251
.orElse(null))

‎bundles/core/src/main/webapp/app-root/components/image/v3/image.json

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
/** Overwrite property to switch default value to unchecked */
3030
"imageFromPageImage": {
3131
"uncheckedValue": "false",
32+
"forceIgnoreFreshness": true,
3233
"name": "./imageFromPageImage",
3334
"text": "Inherit featured image from page",
3435
"value": true,

‎bundles/core/src/main/webapp/app-root/components/wcmio/responsiveimage/v1/responsiveimage.json

+8
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
"titleValueFromDAM": {
131131
"sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
132132
"uncheckedValue": "false",
133+
"forceIgnoreFreshness": true,
133134
"name": "./titleValueFromDAM",
134135
"text": "Get caption from DAM",
135136
"value": true,
@@ -143,6 +144,7 @@
143144
"displayPopupTitle": {
144145
"sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
145146
"uncheckedValue": "false",
147+
"forceIgnoreFreshness": true,
146148
"name": "./displayPopupTitle",
147149
"text": "Display caption as pop-up",
148150
"value": true,
@@ -207,6 +209,7 @@
207209
"decorative": {
208210
"sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
209211
"uncheckedValue": "false",
212+
"forceIgnoreFreshness": true,
210213
"name": "./isDecorative",
211214
"text": "Image is decorative",
212215
"value": true,
@@ -215,6 +218,7 @@
215218
"altValueFromDAM": {
216219
"sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
217220
"uncheckedValue": "false",
221+
"forceIgnoreFreshness": true,
218222
"name": "./altValueFromDAM",
219223
"text": "Get alternative text from DAM",
220224
"value": true,
@@ -224,6 +228,7 @@
224228
"titleValueFromDAM": {
225229
"sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
226230
"uncheckedValue": "false",
231+
"forceIgnoreFreshness": true,
227232
"name": "./titleValueFromDAM",
228233
"text": "Get caption from DAM",
229234
"value": true,
@@ -233,6 +238,7 @@
233238
"displayCaptionPopup": {
234239
"sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
235240
"uncheckedValue": "false",
241+
"forceIgnoreFreshness": true,
236242
"name": "./displayPopupTitle",
237243
"text": "Display caption as pop-up",
238244
"value": true,
@@ -242,6 +248,7 @@
242248
"disableUuidTracking": {
243249
"sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
244250
"uncheckedValue": "false",
251+
"forceIgnoreFreshness": true,
245252
"name": "./uuidDisabled",
246253
"text": "Disable UUID tracking",
247254
"value": true,
@@ -282,6 +289,7 @@
282289
"sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox",
283290
"uncheckedValue": false,
284291
"granite:class": "js-cq-ImageEditor-allowUpload",
292+
"forceIgnoreFreshness": true,
285293
"name": "./allowUpload",
286294
"text": "Allow asset upload from file system",
287295
"value": true,

‎bundles/core/src/test/java/io/wcm/wcm/core/components/impl/models/wcmio/v1/ResponsiveImageV1ImplTest.java

+9
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ void testWithAssetImage() {
157157

158158
@Test
159159
void testWithUploadedImage() {
160+
enableDataLayer(context, true);
161+
160162
Resource imageResource = context.create().resource(page.getContentResource().getPath() + "/image",
161163
PROPERTY_RESOURCE_TYPE, RESOURCE_TYPE,
162164
NN_MEDIA_INLINE_STANDARD + "Name", "file1.png");
@@ -176,6 +178,13 @@ void testWithUploadedImage() {
176178

177179
assertValidMedia(underTest, expectedMediaUrl);
178180
assertInvalidLink(underTest);
181+
182+
ComponentData data = underTest.getData();
183+
assertNotNull(data);
184+
assertEquals(RESOURCE_TYPE, data.getType());
185+
186+
AssetData assetData = ((ImageData)data).getAssetData();
187+
assertNull(assetData);
179188
}
180189

181190
@Test

‎changes.xml

+12
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="2.0.4-2.25.4" date="2024-06-04">
27+
<action type="update" dev="sseifert" issue="22">
28+
Update to AEM WCM Core Components 2.25.4.
29+
</action>
30+
<action type="update" dev="sseifert" issue="22"><![CDATA[
31+
Image (v3) and Responsive Image (v1): Set forceIgnoreFreshness property on edit dialog properties with default value (related to <a href="https://github.com/adobe/aem-core-wcm-components/pull/2735">PR #2735</a>).
32+
]]></action>
33+
<action type="fix" dev="sseifert" issue="25">
34+
Responsive Image (v1): Fix exception when trying to access asset data layer for components not based on a DAM asset (e.g. inline image).
35+
</action>
36+
</release>
37+
2638
<release version="2.0.2-2.23.2" date="2024-03-13">
2739
<action type="fix" dev="sseifert" issue="20">
2840
Download (v1/v2): Don't display file size if it is not available.

‎examples/bundles/examples-core/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>2.0.2-2.23.2</version>
28+
<version>2.0.4-2.25.4</version>
2929
<relativePath>../../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.samples</groupId>
3333
<artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
34-
<version>2.0.2-2.23.2</version>
34+
<version>2.0.4-2.25.4</version>
3535
<packaging>jar</packaging>
3636

3737
<name>WCM Core Components Examples Core</name>
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>io.wcm</groupId>
4646
<artifactId>io.wcm.wcm.core.components</artifactId>
47-
<version>2.0.2-2.23.2</version>
47+
<version>2.0.4-2.25.4</version>
4848
<scope>compile</scope>
4949
</dependency>
5050

‎examples/content-packages/examples-libs/pom.xml

+9-8
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>2.0.2-2.23.2</version>
28+
<version>2.0.4-2.25.4</version>
2929
<relativePath>../../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.samples</groupId>
3333
<artifactId>io.wcm.wcm.core.components.examples-libs</artifactId>
34-
<version>2.0.2-2.23.2</version>
34+
<version>2.0.4-2.25.4</version>
3535
<packaging>content-package</packaging>
3636

3737
<name>WCM Core Components Examples wcm.io Libraries</name>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>io.wcm</groupId>
4444
<artifactId>io.wcm.wcm.core.components</artifactId>
45-
<version>2.0.2-2.23.2</version>
45+
<version>2.0.4-2.25.4</version>
4646
<scope>compile</scope>
4747
</dependency>
4848

@@ -138,12 +138,13 @@
138138
<dependency>
139139
<groupId>io.wcm</groupId>
140140
<artifactId>io.wcm.caconfig.extensions</artifactId>
141+
<!-- Stick with version 1.8.x because 1.9.x depends on latest Sling Context-Aware Configuration SPI/Impl -->
141142
<version>1.8.8</version>
142143
</dependency>
143144
<dependency>
144145
<groupId>io.wcm</groupId>
145146
<artifactId>io.wcm.caconfig.editor</artifactId>
146-
<version>1.15.8</version>
147+
<version>1.16.0</version>
147148
</dependency>
148149
<dependency>
149150
<groupId>io.wcm</groupId>
@@ -163,17 +164,17 @@
163164
<dependency>
164165
<groupId>io.wcm</groupId>
165166
<artifactId>io.wcm.handler.url</artifactId>
166-
<version>2.0.0</version>
167+
<version>2.1.0</version>
167168
</dependency>
168169
<dependency>
169170
<groupId>io.wcm</groupId>
170171
<artifactId>io.wcm.handler.link</artifactId>
171-
<version>2.0.0</version>
172+
<version>2.2.0</version>
172173
</dependency>
173174
<dependency>
174175
<groupId>io.wcm</groupId>
175176
<artifactId>io.wcm.handler.media</artifactId>
176-
<version>2.0.0</version>
177+
<version>2.0.8</version>
177178
</dependency>
178179
<dependency>
179180
<groupId>io.wcm</groupId>
@@ -188,7 +189,7 @@
188189
<dependency>
189190
<groupId>io.wcm</groupId>
190191
<artifactId>io.wcm.wcm.ui.granite</artifactId>
191-
<version>1.10.2</version>
192+
<version>1.10.4</version>
192193
</dependency>
193194

194195
</dependencies>

‎examples/content-packages/examples-sample-content/jcr_root/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
33
jcr:mixinTypes="[rep:AccessControllable,rep:RepoAccessControllable]"
44
jcr:primaryType="rep:root"
55
sling:resourceType="sling:redirect"

‎examples/content-packages/examples-sample-content/jcr_root/conf/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
33
jcr:mixinTypes="[rep:AccessControllable]"
44
jcr:primaryType="sling:Folder"/>

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
33
jcr:primaryType="sling:Folder"
44
jcr:title="wcm.io WCM Core Components Examples"/>

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/_sling_configs/.content.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rep="internal"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
33
jcr:mixinTypes="[rep:AccessControllable]"
44
jcr:primaryType="nt:unstructured">
55
<com.adobe.cq.wcm.core.components.internal.DataLayerConfig
66
jcr:primaryType="nt:unstructured"
77
enabled="{Boolean}true"/>
88
<com.adobe.cq.wcm.core.components.internal.services.pdfviewer.PdfViewerCaConfig
99
jcr:primaryType="nt:unstructured"
10-
clientId="28b07c6be4d544f188dc2f36e33b196b"
11-
reportSuiteId=""/>
10+
clientId="28b07c6be4d544f188dc2f36e33b196b"/>
1211
<rep:policy/>
1312
</jcr:root>

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/_sling_configs/_rep_policy.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:crx="http://www.day.com/crx/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:crx="http://www.day.com/crx/1.0" xmlns:rep="internal"
33
jcr:primaryType="rep:ACL">
44
<allow
55
jcr:primaryType="rep:GrantACE"

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
33
jcr:primaryType="sling:Folder"/>

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
33
jcr:primaryType="cq:Page">
44
<templates/>
55
<policies/>

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/policies/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:wcmio="http://wcm.io/ns" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rep="internal"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rep="internal" xmlns:wcmio="http://wcm.io/ns" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
33
jcr:mixinTypes="[rep:AccessControllable]"
44
jcr:primaryType="cq:Page">
55
<rep:policy/>

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/policies/_rep_policy.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:crx="http://www.day.com/crx/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:crx="http://www.day.com/crx/1.0" xmlns:rep="internal"
33
jcr:primaryType="rep:ACL">
44
<allow
55
jcr:primaryType="rep:GrantACE"

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/template-types/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:cq="http://www.day.com/jcr/cq/1.0"
33
jcr:mixinTypes="[rep:AccessControllable]"
44
jcr:primaryType="cq:Page">
55
<empty-page/>

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/template-types/empty-page/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
33
jcr:mixinTypes="[mix:lockable]"
44
jcr:primaryType="cq:Template"
55
ranking="{Long}1">

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/template-types/empty-page/initial/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
33
jcr:primaryType="cq:Page">
44
<jcr:content
55
jcr:primaryType="cq:PageContent"

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/template-types/empty-page/policies/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
33
jcr:primaryType="cq:Page">
44
<jcr:content
55
jcr:primaryType="nt:unstructured"

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/template-types/empty-page/structure/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
33
jcr:primaryType="cq:Page">
44
<jcr:content
55
cq:deviceGroups="[/etc/mobile/groups/responsive]"

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/templates/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:cq="http://www.day.com/jcr/cq/1.0"
33
jcr:mixinTypes="[rep:AccessControllable]"
44
jcr:primaryType="cq:Page">
55
<content-page/>

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/templates/_rep_policy.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:crx="http://www.day.com/crx/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:crx="http://www.day.com/crx/1.0" xmlns:rep="internal"
33
jcr:primaryType="rep:ACL">
44
<allow
55
jcr:primaryType="rep:GrantACE"

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/templates/content-page/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
33
jcr:primaryType="cq:Template">
44
<jcr:content
55
cq:templateType="/conf/core-components-examples/settings/wcm/template-types/content-page"

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/templates/content-page/initial/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
33
jcr:primaryType="cq:Page">
44
<jcr:content
55
cq:template="/conf/wcmio-core-components-examples/settings/wcm/templates/content-page"

‎examples/content-packages/examples-sample-content/jcr_root/conf/wcmio-core-components-examples/settings/wcm/templates/content-page/policies/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
33
jcr:primaryType="cq:Page">
44
<jcr:content
55
cq:policy="wcm-io-samples/wcm-core-components/components/page/policy_212634895490169"

0 commit comments

Comments
 (0)