This is an automated email from the ASF dual-hosted git repository.
enorman pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter-content.git
The following commit(s) were added to refs/heads/master by this push:
new 8ea0a43 SLING-11664 the starter acl/ace pages have visible licence
text
new 47a32ae Merge pull request #6 from enapps-enorman/issue/SLING-11664
8ea0a43 is described below
commit 8ea0a4399d4c9e5140a65f9abdd9657f17c316f8
Author: Eric Norman <[email protected]>
AuthorDate: Sun Nov 6 13:41:19 2022 -0800
SLING-11664 the starter acl/ace pages have visible licence text
---
.../apps/sling/servlet/default/ace.html.esp | 42 +++++++++++-----------
.../apps/sling/servlet/default/acl.html.esp | 42 +++++++++++-----------
2 files changed, 40 insertions(+), 44 deletions(-)
diff --git
a/src/main/resources/initial-content/apps/sling/servlet/default/ace.html.esp
b/src/main/resources/initial-content/apps/sling/servlet/default/ace.html.esp
index 894187b..8ff8584 100644
--- a/src/main/resources/initial-content/apps/sling/servlet/default/ace.html.esp
+++ b/src/main/resources/initial-content/apps/sling/servlet/default/ace.html.esp
@@ -1,21 +1,23 @@
-/*
- * 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.
- */
+<!DOCTYPE html>
+<html lang="en">
+<!--
+ 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.
+-->
<%
var privilegesInfo = new
Packages.org.apache.sling.jcr.jackrabbit.accessmanager.PrivilegesInfo();
if (!privilegesInfo.canReadAccessControl(currentNode)) {
@@ -36,10 +38,6 @@
}
}
%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xml:lang="en" lang="en"
- xmlns="http://www.w3.org/1999/xhtml";
->
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>Access Control Entry : <%=currentNode.name%></title>
diff --git
a/src/main/resources/initial-content/apps/sling/servlet/default/acl.html.esp
b/src/main/resources/initial-content/apps/sling/servlet/default/acl.html.esp
index a415016..d2d16bb 100644
--- a/src/main/resources/initial-content/apps/sling/servlet/default/acl.html.esp
+++ b/src/main/resources/initial-content/apps/sling/servlet/default/acl.html.esp
@@ -1,21 +1,23 @@
-/*
- * 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.
- */
+<!DOCTYPE html>
+<html lang="en">
+<!--
+ 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.
+-->
<%
var privilegesInfo = new
Packages.org.apache.sling.jcr.jackrabbit.accessmanager.PrivilegesInfo();
if (!privilegesInfo.canReadAccessControl(currentNode)) {
@@ -24,10 +26,6 @@
} else {
var canModify = privilegesInfo.canModifyAccessControl(currentNode);
%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xml:lang="en" lang="en"
- xmlns="http://www.w3.org/1999/xhtml";
->
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>Access Control List : <%=currentNode.name%></title>
