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/11 12:01:01 UTC
[sling-whiteboard] 02/02: Enabling Sling Rewriter
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 ac4267751df67111c64336e4d7563bc964014656
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri May 11 08:00:54 2018 -0400
Enabling Sling Rewriter
---
cms/builder/src/main/provisioning/cms.txt | 2 --
cms/builder/src/main/provisioning/repoinit.txt | 15 ++++++++++++++
.../src/main/provisioning/sling-discovery.txt | 23 ++++++++++++++++++++++
.../provisioning/{cms.txt => sling-rewriter.txt} | 21 +++++++++-----------
.../rewriter/reference-mapping-rewriter.json | 0
...rewriter.ReferenceMappingTransformerConfig.json | 11 -----------
...riter.ReferenceMappingTransformerFactory.config | 20 +++++++++++++++++++
7 files changed, 67 insertions(+), 25 deletions(-)
diff --git a/cms/builder/src/main/provisioning/cms.txt b/cms/builder/src/main/provisioning/cms.txt
index eb80dfb..ca71f22 100644
--- a/cms/builder/src/main/provisioning/cms.txt
+++ b/cms/builder/src/main/provisioning/cms.txt
@@ -21,8 +21,6 @@
[artifacts startLevel=20]
org.apache.cocoon/cocoon-serializers-charsets/1.0.0
- org.apache.sling/org.apache.sling.commons.html/1.0.0
- org.apache.sling/org.apache.sling.rewriter/1.2.2
org.apache.sling/org.apache.sling.resourcemerger/1.3.6
org.apache.sling/org.apache.sling.cms.core/1.0.0-SNAPSHOT
org.apache.sling/org.apache.sling.cms.ui/1.0.0-SNAPSHOT
diff --git a/cms/builder/src/main/provisioning/repoinit.txt b/cms/builder/src/main/provisioning/repoinit.txt
index e24e9c5..0308aae 100644
--- a/cms/builder/src/main/provisioning/repoinit.txt
+++ b/cms/builder/src/main/provisioning/repoinit.txt
@@ -25,11 +25,26 @@
[:repoinit]
# general
+ create path (sling:OrderedFolder) /conf
+ set ACL for everyone
+ allow jcr:read on /conf
+ end
+
create path (sling:OrderedFolder) /content
set ACL for everyone
allow jcr:read on /content
end
+ create path (sling:OrderedFolder) /etc/i18n
+ set ACL for everyone
+ allow jcr:read on /etc/i18n
+ end
+
+ create path (sling:OrderedFolder) /etc/taxonomy
+ set ACL for everyone
+ allow jcr:read on /etc/taxonomy
+ end
+
create path (sling:OrderedFolder) /static
set ACL for everyone
allow jcr:read on /static
diff --git a/cms/builder/src/main/provisioning/sling-discovery.txt b/cms/builder/src/main/provisioning/sling-discovery.txt
index 69612bb..6ea7477 100644
--- a/cms/builder/src/main/provisioning/sling-discovery.txt
+++ b/cms/builder/src/main/provisioning/sling-discovery.txt
@@ -21,3 +21,26 @@
[artifacts]
org.apache.sling/org.apache.sling.discovery.api/1.0.4
+ org.apache.sling/org.apache.sling.discovery.support/1.0.4
+ org.apache.sling/org.apache.sling.discovery.commons/1.0.20
+ org.apache.sling/org.apache.sling.discovery.base/2.0.8
+ org.apache.sling/org.apache.sling.discovery.oak/1.2.22
+
+[:repoinit]
+ create service user sling-discovery
+
+ create path (sling:Folder) /var/discovery
+ create path (sling:Folder) /var/discovery/oak
+
+ set ACL for sling-discovery
+ allow jcr:read,rep:write on /var/discovery
+ end
+
+
+[configurations]
+ org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling.discovery
+ user.mapping=[
+ "org.apache.sling.discovery.commons\=sling-discovery",
+ "org.apache.sling.discovery.base\=sling-discovery",
+ "org.apache.sling.discovery.oak\=sling-discovery"
+ ]
diff --git a/cms/builder/src/main/provisioning/cms.txt b/cms/builder/src/main/provisioning/sling-rewriter.txt
similarity index 71%
copy from cms/builder/src/main/provisioning/cms.txt
copy to cms/builder/src/main/provisioning/sling-rewriter.txt
index eb80dfb..7e2bd69 100644
--- a/cms/builder/src/main/provisioning/cms.txt
+++ b/cms/builder/src/main/provisioning/sling-rewriter.txt
@@ -15,26 +15,23 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-[feature name=cms]
-[variables]
- cms.version=1.0.0
+#
+#
+[feature name=sling-rewriter]
-[artifacts startLevel=20]
- org.apache.cocoon/cocoon-serializers-charsets/1.0.0
- org.apache.sling/org.apache.sling.commons.html/1.0.0
+[artifacts]
+ org.apache.sling/org.apache.sling.commons.html/1.0.0
org.apache.sling/org.apache.sling.rewriter/1.2.2
- org.apache.sling/org.apache.sling.resourcemerger/1.3.6
- org.apache.sling/org.apache.sling.cms.core/1.0.0-SNAPSHOT
- org.apache.sling/org.apache.sling.cms.ui/1.0.0-SNAPSHOT
- org.apache.sling/org.apache.sling.cms.reference/1.0.0-SNAPSHOT
-
+
[:repoinit]
create service user sling-rewriter
-
+
+
set ACL for sling-rewriter
allow jcr:read on /
end
+
[configurations]
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling.rewriter
user.mapping=[
diff --git a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/install/rewriter/reference-mapping-rewriter.json b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/config/rewriter/reference-mapping-rewriter.json
similarity index 100%
rename from cms/ui/src/main/resources/jcr_root/libs/sling-cms/install/rewriter/reference-mapping-rewriter.json
rename to cms/ui/src/main/resources/jcr_root/libs/sling-cms/config/rewriter/reference-mapping-rewriter.json
diff --git a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/install/org.apache.sling.cms.core.rewriter.ReferenceMappingTransformerConfig.json b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/install/org.apache.sling.cms.core.rewriter.ReferenceMappingTransformerConfig.json
deleted file mode 100644
index 1ad6736..0000000
--- a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/install/org.apache.sling.cms.core.rewriter.ReferenceMappingTransformerConfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "jcr:primaryType": "sling:OsgiConfig",
- "mappedAttributes": [
- "action",
- "href",
- "src"
- ],
- "enabledPaths": [
- "/content"
- ]
-}
\ No newline at end of file
diff --git a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/install/org.apache.sling.cms.core.rewriter.ReferenceMappingTransformerFactory.config b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/install/org.apache.sling.cms.core.rewriter.ReferenceMappingTransformerFactory.config
new file mode 100644
index 0000000..57cdc0a
--- /dev/null
+++ b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/install/org.apache.sling.cms.core.rewriter.ReferenceMappingTransformerFactory.config
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+mappedAttributes=["action","href","src"]
+enabledPaths=["/content"]
--
To stop receiving notification emails like this one, please contact
dklco@apache.org.