You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2018/05/25 13:05:10 UTC
[sling-whiteboard] branch master updated (13e3815 -> db8468d)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git.
from 13e3815 Moving all of the create dialogs to use the name param name generator
new 3aee769 Fixing type of oak:index configurations
new bf04ebd removing the step to create the sling-i18n user in repoinit
new db8468d Updating to remove spaces
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cms/builder/src/main/provisioning/repoinit.txt | 7 -------
.../jcr_root/libs/sling/servlet/errorhandler/Throwable.jsp | 5 +----
.../resources/jcr_root/libs/sling/servlet/errorhandler/default.jsp | 5 +----
cms/ui/src/main/resources/jcr_root/oak%3Aindex/published.json | 4 ++--
.../src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json | 4 ++++
.../resources/jcr_root/oak%3Aindex/slingResourceSuperType.json | 4 ++--
cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingTemplate.json | 4 ++--
7 files changed, 12 insertions(+), 21 deletions(-)
--
To stop receiving notification emails like this one, please contact
dklco@apache.org.
[sling-whiteboard] 01/03: Fixing type of oak:index configurations
Posted by dk...@apache.org.
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-whiteboard.git
commit 3aee769caeee1e552f187916150c6121ec675bcf
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri May 25 08:45:36 2018 -0400
Fixing type of oak:index configurations
---
cms/ui/src/main/resources/jcr_root/oak%3Aindex/published.json | 4 ++--
cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json | 4 ++++
.../main/resources/jcr_root/oak%3Aindex/slingResourceSuperType.json | 4 ++--
cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingTemplate.json | 4 ++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/cms/ui/src/main/resources/jcr_root/oak%3Aindex/published.json b/cms/ui/src/main/resources/jcr_root/oak%3Aindex/published.json
index 412ae70..a94fd14 100644
--- a/cms/ui/src/main/resources/jcr_root/oak%3Aindex/published.json
+++ b/cms/ui/src/main/resources/jcr_root/oak%3Aindex/published.json
@@ -1,7 +1,7 @@
{
"jcr:primaryType": "oak:QueryIndexDefinition",
- "propertyNames": [
- "jcr:name:published"
+ "jcr:name:propertyNames": [
+ "published"
],
"type": "property",
"reindex": false,
diff --git a/cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json b/cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json
index 079ecab..1a6c0bc 100644
--- a/cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json
+++ b/cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json
@@ -47,6 +47,10 @@
"include3": {
"jcr:primaryType": "nt:unstructured",
"path": "*/*/*/*"
+ },
+ "include4": {
+ "jcr:primaryType": "nt:unstructured",
+ "path": "*/*/*/*/*"
}
}
},
diff --git a/cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingResourceSuperType.json b/cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingResourceSuperType.json
index f12eac3..7e6ae94 100644
--- a/cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingResourceSuperType.json
+++ b/cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingResourceSuperType.json
@@ -1,7 +1,7 @@
{
"jcr:primaryType": "oak:QueryIndexDefinition",
- "propertyNames": [
- "jcr:name:sling:resourceSuperType"
+ "jcr:name:propertyNames": [
+ "sling:resourceSuperType"
],
"type": "property",
"reindex": false,
diff --git a/cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingTemplate.json b/cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingTemplate.json
index a361d40..f19b671 100644
--- a/cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingTemplate.json
+++ b/cms/ui/src/main/resources/jcr_root/oak%3Aindex/slingTemplate.json
@@ -1,7 +1,7 @@
{
"jcr:primaryType": "oak:QueryIndexDefinition",
- "propertyNames": [
- "jcr:name:sling:template"
+ "jcr:name:propertyNames": [
+ "sling:template"
],
"type": "property",
"reindex": false,
--
To stop receiving notification emails like this one, please contact
dklco@apache.org.
[sling-whiteboard] 03/03: Updating to remove spaces
Posted by dk...@apache.org.
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-whiteboard.git
commit db8468d3ed1e1ab4975fca210c98ed5472a8c267
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri May 25 09:04:55 2018 -0400
Updating to remove spaces
---
.../resources/jcr_root/libs/sling/servlet/errorhandler/Throwable.jsp | 5 +----
.../resources/jcr_root/libs/sling/servlet/errorhandler/default.jsp | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/cms/ui/src/main/resources/jcr_root/libs/sling/servlet/errorhandler/Throwable.jsp b/cms/ui/src/main/resources/jcr_root/libs/sling/servlet/errorhandler/Throwable.jsp
index 317c9a4..e2b9f80 100644
--- a/cms/ui/src/main/resources/jcr_root/libs/sling/servlet/errorhandler/Throwable.jsp
+++ b/cms/ui/src/main/resources/jcr_root/libs/sling/servlet/errorhandler/Throwable.jsp
@@ -15,8 +15,5 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */ --%>
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@include file="/libs/sling-cms/global.jsp"%>
-<sling:adaptTo var="errorHandler" adaptable="${slingRequest}" adaptTo="org.apache.sling.cms.core.models.ErrorHandler" />
+ */ --%><%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%><%@include file="/libs/sling-cms/global.jsp"%><sling:adaptTo var="errorHandler" adaptable="${slingRequest}" adaptTo="org.apache.sling.cms.core.models.ErrorHandler" />
<sling:include path="${sling:getRelativeResource(errorHandler.handler,'jcr:content').path}.html" resourceType="${sling:getRelativeResource(errorHandler.handler,'jcr:content').resourceType}" />
\ No newline at end of file
diff --git a/cms/ui/src/main/resources/jcr_root/libs/sling/servlet/errorhandler/default.jsp b/cms/ui/src/main/resources/jcr_root/libs/sling/servlet/errorhandler/default.jsp
index 317c9a4..e2b9f80 100644
--- a/cms/ui/src/main/resources/jcr_root/libs/sling/servlet/errorhandler/default.jsp
+++ b/cms/ui/src/main/resources/jcr_root/libs/sling/servlet/errorhandler/default.jsp
@@ -15,8 +15,5 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */ --%>
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@include file="/libs/sling-cms/global.jsp"%>
-<sling:adaptTo var="errorHandler" adaptable="${slingRequest}" adaptTo="org.apache.sling.cms.core.models.ErrorHandler" />
+ */ --%><%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%><%@include file="/libs/sling-cms/global.jsp"%><sling:adaptTo var="errorHandler" adaptable="${slingRequest}" adaptTo="org.apache.sling.cms.core.models.ErrorHandler" />
<sling:include path="${sling:getRelativeResource(errorHandler.handler,'jcr:content').path}.html" resourceType="${sling:getRelativeResource(errorHandler.handler,'jcr:content').resourceType}" />
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
dklco@apache.org.
[sling-whiteboard] 02/03: removing the step to create the
sling-i18n user in repoinit
Posted by dk...@apache.org.
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-whiteboard.git
commit bf04ebd0935019640f57bf75dbd2f83baeb6bf2d
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri May 25 08:45:54 2018 -0400
removing the step to create the sling-i18n user in repoinit
---
cms/builder/src/main/provisioning/repoinit.txt | 7 -------
1 file changed, 7 deletions(-)
diff --git a/cms/builder/src/main/provisioning/repoinit.txt b/cms/builder/src/main/provisioning/repoinit.txt
index 60cb5e7..0308aae 100644
--- a/cms/builder/src/main/provisioning/repoinit.txt
+++ b/cms/builder/src/main/provisioning/repoinit.txt
@@ -49,13 +49,6 @@
set ACL for everyone
allow jcr:read on /static
end
-
- # sling-i18n
- create service user sling-i18n
-
- set ACL for sling-i18n
- allow jcr:read on /
- end
# sling-mapping
create service user sling-mapping
--
To stop receiving notification emails like this one, please contact
dklco@apache.org.