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 2019/12/23 18:02:27 UTC
[sling-org-apache-sling-app-cms] branch
SLING-8947-grid-missing-fields created (now 1294061)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch SLING-8947-grid-missing-fields
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
at 1294061 SLING-8919 - Updating to support filtering by title and data-value
This branch includes the following new commits:
new 3a94480 Adding title and modified date to the grid view
new eac8c5e Updating dependencies
new 35842e6 Merge branch 'master' into SLING-8947-grid-missing-fields
new 1294061 SLING-8919 - Updating to support filtering by title and data-value
The 4 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.
[sling-org-apache-sling-app-cms] 04/04: SLING-8919 - Updating to
support filtering by title and data-value
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-8947-grid-missing-fields
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 1294061a0d3e70f807c8cc96fecbbceb50962777
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Dec 23 13:02:17 2019 -0500
SLING-8919 - Updating to support filtering by title and data-value
---
ui/src/main/frontend/js/cms.nav.js | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/ui/src/main/frontend/js/cms.nav.js b/ui/src/main/frontend/js/cms.nav.js
index cac2a49..eb5a946 100644
--- a/ui/src/main/frontend/js/cms.nav.js
+++ b/ui/src/main/frontend/js/cms.nav.js
@@ -44,12 +44,26 @@ rava.bind('.contentnav', {
const searchParam = urlParams.get('search');
const cnav = this;
const search = document.querySelector('.contentnav-search input[name=search]');
+ function attrContains(ctx, attr) {
+ let matches = false;
+ const value = search.value.toLowerCase();
+ ctx.querySelectorAll(`*[${attr}]`).forEach((it) => {
+ if (it.getAttribute(attr).indexOf(value) !== -1) {
+ matches = true;
+ }
+ });
+ return matches;
+ }
function filter(event) {
- event.stopPropagation();
- event.preventDefault();
+ if (event) {
+ event.stopPropagation();
+ event.preventDefault();
+ }
const value = search.value.toLowerCase();
cnav.querySelectorAll('.contentnav__item').forEach((item) => {
- if (item.innerText.toLowerCase().indexOf(value) === -1 && !item.querySelector(`*[data-value="${resourceParam}"]`)) {
+ if (item.innerText.toLowerCase().indexOf(value) === -1
+ && !attrContains(item, 'title')
+ && !attrContains(item, 'data-value')) {
item.classList.add('is-hidden');
} else {
item.classList.remove('is-hidden');
@@ -72,7 +86,7 @@ rava.bind('.contentnav', {
document.querySelector('.contentnav-search input[name=search]').value = resourceParam;
} else if (searchParam) {
document.querySelector('.contentnav-search input[name=search]').value = searchParam;
- filter(new Event('fake'));
+ filter();
}
},
},
[sling-org-apache-sling-app-cms] 01/04: Adding title and modified
date to the grid view
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-8947-grid-missing-fields
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 3a94480ac0af97719267c2f0bc56d7be19f81079
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Dec 20 14:12:51 2019 -0500
Adding title and modified date to the grid view
---
ui/src/main/frontend/scss/cms.scss | 212 +++++++++++----------
ui/src/main/frontend/scss/editor.scss | 165 ++++++++--------
.../components/cms/contentgrid/contentgrid.jsp | 56 +++---
3 files changed, 235 insertions(+), 198 deletions(-)
diff --git a/ui/src/main/frontend/scss/cms.scss b/ui/src/main/frontend/scss/cms.scss
index 069083d..3991b7f 100644
--- a/ui/src/main/frontend/scss/cms.scss
+++ b/ui/src/main/frontend/scss/cms.scss
@@ -16,248 +16,260 @@
* specific language governing permissions and limitations
* under the License.
*/
-
@import 'fonts';
@import 'overrides';
@import "../../../../node_modules/bulma/bulma.sass";
+
body.cms {
- min-height: 100vh;
- @media screen and (min-width: $tablet), print {
- background: url(../img/gradient.jpg) no-repeat;
- background-attachment: fixed;
- }
- @media screen and (min-width: $tablet) and (max-width: $desktop - 1px) {
- padding-left: 2em;
- }
+ min-height: 100vh;
+ @media screen and (min-width: $tablet), print {
+ background: url("../img/gradient.jpg") no-repeat;
+ background-attachment: fixed;
+ }
+ @media screen and (min-width: $tablet) and (max-width: $desktop - 1px) {
+ padding-left: 2em;
+ }
}
dl {
- padding: 1em 0;
+ padding: 1em 0;
}
dd {
- padding-left: 1em;
+ padding-left: 1em;
}
dt {
- font-weight: bold;
+ font-weight: bold;
}
h1 {
- font-size: 200%;
+ font-size: 200%;
}
h2 {
- font-size: 180%;
+ font-size: 180%;
}
h3 {
- font-size: 160%;
+ font-size: 160%;
}
h4 {
- font-size: 140%;
+ font-size: 140%;
}
h5 {
- font-size: 120%;
+ font-size: 120%;
}
.breadcrumb {
- display:flex;
- justify-content: space-between;
-}
+ display: flex;
+ justify-content: space-between;
+}
.card.is-selected {
- border: 1px solid $violet;
+ border: 1px solid $violet;
}
.card-footer-item {
- word-break: break-all;
+ word-break: break-all;
+ display: block;
+ padding: 0.25em;
+ text-align: center;
+}
+
+small.card-footer-item {
+ font-size: 12px;
}
.container {
- height: 100vh;
- overflow: hidden;
- @media screen and (max-width: $tablet - 1px) {
- height: 100%;
- overflow: visible;
- }
+ height: 100vh;
+ overflow: hidden;
+ @media screen and (max-width: $tablet - 1px) {
+ height: 100%;
+ overflow: visible;
+ }
}
.contentnav-search {
- display: flex;
- margin-block-end: 0;
+ display: flex;
+ margin-block-end: 0;
}
.has-padding-1 {
- padding: .5em;
+ padding: 0.5em;
}
.editor-page {
- overflow-y: auto;
+ overflow-y: auto;
}
+
.file-icon {
- font-size: xx-large;
+ font-size: xx-large;
}
+
.file-label {
- text-align: center;
+ text-align: center;
}
+
.form-wrapper {
- border: none;
+ border: none;
}
.form-wrapper[disabled] .button,
.form-wrapper[disabled] .input,
-.form-wrapper[disabled] select,
-.form-wrapper[disabled] .textarea {
- background-color: #f5f5f5;
- border-color: #f5f5f5;
- box-shadow: none;
- color: #7a7a7a;
- cursor: not-allowed;
+.form-wrapper[disabled] .textarea,
+.form-wrapper[disabled] select {
+ background-color: #f5f5f5;
+ border-color: #f5f5f5;
+ box-shadow: none;
+ color: #7a7a7a;
+ cursor: not-allowed;
}
.is-linked {
- cursor: pointer;
+ cursor: pointer;
+ border: 1px solid rgba(0,0,0,0);
}
.is-draggable {
- position: relative;
+ position: relative;
}
.is-selected .is-linked {
- border: 1px solid $primary;
+ border: 1px solid $primary;
}
.is-vhidden {
- position: absolute !important;
- top: -9999px !important;
- left: -9999px !important;
+ position: absolute !important;
+ top: -9999px !important;
+ left: -9999px !important;
}
.loader {
- margin: auto;
- width: 2em;
- height: 2em;
- border: 2px solid $primary;
- border-right-color: transparent;
- border-top-color: transparent;
+ margin: auto;
+ width: 2em;
+ height: 2em;
+ border: 2px solid $primary;
+ border-right-color: transparent;
+ border-top-color: transparent;
}
.menu {
- overflow: auto;
+ overflow: auto;
}
.menu-label {
- text-transform: none;
- font-size: 1.25em;
- letter-spacing: normal;
- display: block;
- padding: .25em 0;
- color: #363636;
+ text-transform: none;
+ font-size: 1.25em;
+ letter-spacing: normal;
+ display: block;
+ padding: 0.25em 0;
+ color: #363636;
}
.menu-label:not(:last-child) {
- margin: 0;
+ margin: 0;
}
.note-group-select-from-files {
- display: none;
+ display: none;
}
.note-toolbar-wrapper {
- height: auto !important;
+ height: auto !important;
}
.fixed-box {
- max-height: 200px;
- overflow: auto;
+ max-height: 200px;
+ overflow: auto;
}
.preview {
- max-width: 100%;
- padding: 1em;
+ max-width: 100%;
+ padding: 1em;
}
.rte-form {
- margin: .5em 0;
+ margin: 0.5em 0;
}
.rte-form .buttons {
- margin: .5em 0;
+ margin: 0.5em 0;
}
.rte-toolbar .jam:before {
- font-size: x-large;
+ font-size: x-large;
}
.rte-toolbar .level {
- margin-bottom: .5em;
+ margin-bottom: 0.5em;
}
.scroll-container {
- overflow-y: auto;
- height: calc(100vh - 205px);
- overflow-x: hidden;
- padding: 2px;
- @media screen and (max-width: $tablet - 1px) {
- height: 100%;
- overflow: visible;
- padding: 0px;
- }
+ overflow-y: auto;
+ height: calc(100vh - 205px);
+ overflow-x: hidden;
+ padding: 2px;
+ @media screen and (max-width: $tablet - 1px) {
+ height: 100%;
+ overflow: visible;
+ padding: 0;
+ }
}
.scroll-container .scroll-container {
- height: auto;
- overflow: visible;
- padding: 0px;
+ height: auto;
+ overflow: visible;
+ padding: 0;
}
.scroll-container > .is-ancestor {
- flex-wrap: wrap;
+ flex-wrap: wrap;
}
#search-results .box {
- overflow: hidden;
+ overflow: hidden;
}
#search-results .tile {
- flex-wrap: wrap;
- padding: .5em;
+ flex-wrap: wrap;
+ padding: 0.5em;
}
.table__wrapper {
- overflow: auto;
+ overflow: auto;
}
table thead .sorting:after,
table thead .sorting_asc:after,
-table thead .sorting_desc:after,
table thead .sorting_asc_disabled:after,
+table thead .sorting_desc:after,
table thead .sorting_desc_disabled:after {
- font-family: 'jam-icons';
+ font-family: 'jam-icons';
}
table thead .sorting:after {
- content: "\e943"
+ content: "\e943";
}
table thead .sorting_asc:after {
- content: "\e93f"
+ content: "\e93f";
}
table thead .sorting_desc:after {
- content: "\e92a"
+ content: "\e92a";
}
-.table tr.is-selected, .menu .is-selected {
- background-color: lighten($gray, 50%);
- color: $grey-darker;
+.menu .is-selected,
+.table tr.is-selected {
+ background-color: lighten($gray, 50%);
+ color: $grey-darker;
}
.wysihtml-sandbox {
- width: 100% !important;
- max-height: 600px !important;
- min-height: 300px !important;
+ width: 100% !important;
+ max-height: 600px !important;
+ min-height: 300px !important;
}
diff --git a/ui/src/main/frontend/scss/editor.scss b/ui/src/main/frontend/scss/editor.scss
index 1722697..cd26fb9 100644
--- a/ui/src/main/frontend/scss/editor.scss
+++ b/ui/src/main/frontend/scss/editor.scss
@@ -17,89 +17,102 @@
* under the License.
*/
.sling-cms-editor {
- @import 'fonts';
- @import 'overrides';
- @import "../../../../node_modules/bulma/sass/utilities/_all.sass";
- @import "../../../../node_modules/bulma/sass/base/_all.sass";
- @import "../../../../node_modules/bulma/sass/elements/box.sass";
- @import "../../../../node_modules/bulma/sass/elements/button.sass";
- @import "../../../../node_modules/bulma/sass/form/_all.sass";
- @import "../../../../node_modules/bulma/sass/elements/icon.sass";
- @import "../../../../node_modules/bulma/sass/components/level.sass";
- @import "../../../../node_modules/bulma/sass/components/modal.sass";
- font-family: "Open Sans",sans-serif;
- * {
- box-sizing: border-box;
- }
- [draggable] {
- -moz-user-select: none;
- -khtml-user-select: none;
- -webkit-user-select: none;
- user-select: none;
- /* Required to make elements draggable in old WebKit */
- -khtml-user-drag: element;
- -webkit-user-drag: element;
- }
- .is-draggable {
- position: relative;
- }
- .is-vhidden {
- position: absolute !important;
- top: -9999px !important;
- left: -9999px !important;
- }
- .level {
- padding: .5em;
- }
- .modal-body {
- padding: .5em;
- height: 500px;
- }
- .modal-frame {
- width: 100%;
- height: 100%;
- border: none;
- }
- .modal-title {
- font-size: 180%;
- cursor: move;
- }
- .page-wrapper-frame {
- position: fixed;
- top: 44px;
- left: 0px;
- bottom: 0px;
- right: 0px;
- width: 100%;
- height: 100%;
- border: none;
- margin: 0;
- padding: 0;
- padding-top: 0px;
- overflow: hidden;
- z-index: 998;
- padding-top: 8px;
- @media screen and (max-width: $tablet) {
- top: 104px;
- }
- }
- .sling-cms-logo {
- height: 25px;
+ @import 'fonts';
+ @import 'overrides';
+ @import "../../../../node_modules/bulma/sass/utilities/_all.sass";
+ @import "../../../../node_modules/bulma/sass/base/_all.sass";
+ @import "../../../../node_modules/bulma/sass/elements/box.sass";
+ @import "../../../../node_modules/bulma/sass/elements/button.sass";
+ @import "../../../../node_modules/bulma/sass/form/_all.sass";
+ @import "../../../../node_modules/bulma/sass/elements/icon.sass";
+ @import "../../../../node_modules/bulma/sass/components/level.sass";
+ @import "../../../../node_modules/bulma/sass/components/modal.sass";
+ font-family: "Open Sans",sans-serif;
+
+ * {
+ box-sizing: border-box;
+ }
+
+ [draggable] {
+ -moz-user-select: none;
+ -khtml-user-select: none;
+ -webkit-user-select: none;
+ user-select: none;
+ /* Required to make elements draggable in old WebKit */
+ -khtml-user-drag: element;
+ -webkit-user-drag: element;
+ }
+
+ .is-draggable {
+ position: relative;
+ }
+
+ .is-vhidden {
+ position: absolute !important;
+ top: -9999px !important;
+ left: -9999px !important;
+ }
+
+ .level {
+ padding: 0.5em;
+ }
+
+ .modal-body {
+ padding: 0.5em;
+ height: 500px;
+ }
+
+ .modal-frame {
+ width: 100%;
+ height: 100%;
+ border: none;
+ }
+
+ .modal-title {
+ font-size: 180%;
+ cursor: move;
+ }
+
+ .page-wrapper-frame {
+ position: fixed;
+ top: 44px;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ width: 100%;
+ height: 100%;
+ border: none;
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+ z-index: 998;
+ padding-top: 8px;
+ @media screen and (max-width: $tablet) {
+ top: 104px;
}
+ }
+
+ .sling-cms-logo {
+ height: 25px;
+ }
}
+
.sling-cms-component {
- border: 1px solid rgba(0,0,0,0.0);
+ border: 1px solid rgba(0,0,0,0.0);
}
+
.sling-cms-component__is-active {
- border-color: hsl(0, 0%, 86%);
+ border-color: hsl(0, 0%, 86%);
}
+
.sling-cms-droptarget__is-active {
- height: 2em;
- border: 1px solid hsl(0, 0%, 71%);
- background-color: hsl(0, 0%, 96%);
+ height: 2em;
+ border: 1px solid hsl(0, 0%, 71%);
+ background-color: hsl(0, 0%, 96%);
}
+
.sling-cms-droptarget__is-over {
- height: 2em;
- border: 1px solid hsl(0, 0%, 96%);
- background-color: hsl(0, 0%, 71%);
+ height: 2em;
+ border: 1px solid hsl(0, 0%, 96%);
+ background-color: hsl(0, 0%, 71%);
}
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp
index afa41bd..c99214a 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp
@@ -29,7 +29,7 @@
<c:if test="${showCard}">
<div class="tile is-parent is-3 contentnav__item">
<div class="tile is-child">
- <div class="card is-linked " data-value="${child.path}">
+ <div class="card is-linked" title="${sling:encode(child.name,'HTML_ATTR')}" data-value="${child.path}">
<div class="card-image">
<figure class="image is-5by4">
<c:choose>
@@ -60,7 +60,7 @@
</figure>
<div class="is-vhidden cell-actions">
<sling:getResource base="${resource}" path="types/${child.valueMap['jcr:primaryType']}/columns/actions" var="colConfig" />
-
+
<c:forEach var="actionConfig" items="${sling:listChildren(colConfig)}">
<c:choose>
<c:when test="${actionConfig.valueMap.modal}">
@@ -83,35 +83,47 @@
</c:otherwise>
</c:choose>
</c:forEach>
-
- <c:choose>
- <c:when test="${sling:getRelativeResource(child,'jcr:content').valueMap.published}">
- <a class="button Fetch-Modal" href="/cms/shared/unpublish.html${child.path}" title="Content Published" data-title="Unpublish" data-path=".Main-Content form">
- <i class="jam jam-check">
- <span class="is-vhidden">Content Published</span>
- </i>
- </a>
- </c:when>
- <c:otherwise>
- <a class="button Fetch-Modal" href="/cms/shared/publish.html${child.path}" title="Content Not Published" data-title="Publish" data-path=".Main-Content form">
- <i class="jam jam-close">
- <span class="is-vhidden">Content Not Published</span>
- </i>
- </a>
- </c:otherwise>
- </c:choose>
</div>
</div>
<footer class="card-footer">
<sling:getResource base="${resource}" path="types/${child.valueMap['jcr:primaryType']}/columns/name" var="nameConfig" />
<c:choose>
- <c:when test="${child.resourceType == 'sling:Site' || child.resourceType == 'sling:OrderedFolder' || child.resourceType == 'sling:Folder' || child.resourceType == 'nt:folder' || child.resourceType == 'sling:Page'}">
- <a href="${nameConfig.valueMap.prefix}${child.path}" class="card-footer-item item-link">${child.name}</a>
+ <c:when test="${not empty child.valueMap['jcr:content/jcr:title']}">
+ <c:set var="title" value="${child.valueMap['jcr:content/jcr:title']}" />
</c:when>
<c:otherwise>
- <span class="card-footer-item">${child.name}</span>
+ <c:set var="title" value="${child.name}" />
</c:otherwise>
</c:choose>
+ <div class="card-footer-item">
+ <c:choose>
+ <c:when test="${child.resourceType == 'sling:Site' || child.resourceType == 'sling:OrderedFolder' || child.resourceType == 'sling:Folder' || child.resourceType == 'nt:folder' || child.resourceType == 'sling:Page'}">
+ <a href="${nameConfig.valueMap.prefix}${child.path}" class="item-link">${sling:encode(title,'HTML')}</a><br/>
+ </c:when>
+ <c:otherwise>
+ ${sling:encode(title,'HTML')}<br/>
+ </c:otherwise>
+ </c:choose>
+ <small>
+ <c:choose>
+ <c:when test="${sling:getRelativeResource(child,'jcr:content').valueMap.published}">
+ <a class="Fetch-Modal has-text-success" href="/cms/shared/unpublish.html${child.path}" title="Content Published" data-title="Unpublish" data-path=".Main-Content form">
+ <i class="jam jam-check">
+ <span class="is-vhidden">Content Published</span>
+ </i>
+ </a>
+ </c:when>
+ <c:otherwise>
+ <a class="has-text-warning Fetch-Modal" href="/cms/shared/publish.html${child.path}" title="Content Not Published" data-title="Publish" data-path=".Main-Content form">
+ <i class="jam jam-close">
+ <span class="is-vhidden">Content Not Published</span>
+ </i>
+ </a>
+ </c:otherwise>
+ </c:choose>
+ <fmt:formatDate type="both" dateStyle="long" timeStyle="long" value = "${child.valueMap['jcr:content/jcr:lastModified'].time}" />
+ </small>
+ </div>
</footer>
</div>
</div>
[sling-org-apache-sling-app-cms] 03/04: Merge branch 'master' into
SLING-8947-grid-missing-fields
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-8947-grid-missing-fields
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 35842e660689961fc99d028f872c742eb5553f76
Merge: 3a94480 eac8c5e
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Dec 23 09:47:48 2019 -0500
Merge branch 'master' into SLING-8947-grid-missing-fields
builder/src/main/provisioning/cms.txt | 39 +++++++++++++++--------------
builder/src/main/provisioning/scripting.txt | 16 ++++++------
builder/src/main/provisioning/sling.txt | 17 +++++++------
3 files changed, 37 insertions(+), 35 deletions(-)
[sling-org-apache-sling-app-cms] 02/04: Updating dependencies
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-8947-grid-missing-fields
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit eac8c5eab03fbf4335b32eaede2acd8dad6ba2c8
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Dec 23 09:47:34 2019 -0500
Updating dependencies
---
builder/src/main/provisioning/cms.txt | 39 +++++++++++++++--------------
builder/src/main/provisioning/scripting.txt | 16 ++++++------
builder/src/main/provisioning/sling.txt | 17 +++++++------
3 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/builder/src/main/provisioning/cms.txt b/builder/src/main/provisioning/cms.txt
index 6e89240..20ba52d 100644
--- a/builder/src/main/provisioning/cms.txt
+++ b/builder/src/main/provisioning/cms.txt
@@ -20,21 +20,22 @@
[artifacts startLevel=5]
org.apache.sling/org.apache.sling.cms.api/${cms.version}
org.apache.sling/org.apache.sling.cms.ui/${cms.version}
+ com.github.livesense/org.liveSense.fragment.sun.misc/1.0.5
[artifacts startLevel=15]
- org.apache.cocoon/cocoon-serializers-charsets/1.0.0
- org.jsoup/jsoup/1.11.3
- com.vladsch.flexmark/flexmark-osgi/0.34.22
- org.apache.sling/org.apache.sling.fileoptim/0.9.2
- org.apache.sling/org.apache.sling.resourcemerger/1.3.6
+ org.apache.cocoon/cocoon-serializers-charsets/1.0.2
+ org.jsoup/jsoup/1.12.1
+ com.vladsch.flexmark/flexmark-osgi/0.50.44
+ org.apache.sling/org.apache.sling.fileoptim/0.9.4
+ org.apache.sling/org.apache.sling.resourcemerger/1.3.10
org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/3.0.2_1
org.apache.commons/commons-math3/3.6.1
- org.apache.commons/commons-compress/1.18
+ org.apache.commons/commons-compress/1.19
org.apache.commons/commons-email/1.5
commons-lang/commons-lang/2.6
[artifacts startLevel=20]
- org.apache.servicemix.bundles/org.apache.servicemix.bundles.poi/4.0.1_2
+ org.apache.servicemix.bundles/org.apache.servicemix.bundles.poi/4.1.1_1
org.apache.sling/org.apache.sling.cms.core/${cms.version}
org.apache.sling/org.apache.sling.cms.reference/${cms.version}
org.apache.sling/org.apache.sling.cms.transformer/${cms.version}
@@ -64,8 +65,8 @@
set ACL for everyone
allow jcr:read on /etc/usergenerated
end
-
-
+
+
# Groups
create path (rep:AuthorizableFolder) /home/groups
create path (rep:AuthorizableFolder) /home/groups/sling-cms
@@ -118,7 +119,7 @@
set ACL for sling-cms-versionmgr
allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /content
end
-
+
[configurations]
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling-cms-error
@@ -156,18 +157,18 @@
hc.tags=["configuration"]
statusForMissing="WARN"
services.list=["(component.name\=org.apache.sling.cms.reference.forms.impl.actions.SendEmailAction)"]
-
+
org.apache.felix.hc.generalchecks.ServicesCheck-securityfilterconfigured
hc.name="Sling CMS - Security Filter Configured"
hc.tags=["configuration"]
statusForMissing="WARN"
services.list=["(component.name\=org.apache.sling.cms.core.internal.filters.CMSSecurityFilter)"]
-
+
org.apache.sling.hc.support.DefaultLoginsHealthCheck-slingcms
logins=["admin:admin"]
hc.name="Sling CMS - Default Logins Check"
hc.tags=["configuration"]
-
+
org.apache.felix.hc.generalchecks.JmxAttributeCheck-jobqueue
mbean.name="org.apache.sling:type\=queues,name\=AllQueues"
hc.name="Sling - Job Queue"
@@ -175,7 +176,7 @@
attribute.value.constraint="< 1000"
attribute.name="NumberOfQueuedJobs"
statusForFailedContraint="WARN"
-
+
org.apache.felix.hc.generalchecks.JmxAttributeCheck-requestdurationwarn
mbean.name="org.apache.sling:type\=engine,service\=RequestProcessor"
hc.name="Sling - StdDev Request Duration (WARN)"
@@ -183,7 +184,7 @@
attribute.value.constraint="matches (1)?\\d?\\d\\..*"
attribute.name="StandardDeviationDurationMsec"
statusForFailedContraint="WARN"
-
+
org.apache.felix.hc.generalchecks.JmxAttributeCheck-requestdurationcritical
mbean.name="org.apache.sling:type\=engine,service\=RequestProcessor"
hc.name="Sling - StdDev Request Duration (CRITICAL)"
@@ -191,7 +192,7 @@
attribute.value.constraint="matches (1|2|3|4)?\\d?\\d\\..*"
attribute.name="StandardDeviationDurationMsec"
statusForFailedContraint="CRITICAL"
-
+
org.apache.felix.hc.generalchecks.JmxAttributeCheck-index
mbean.name="org.apache.jackrabbit.oak:name\=async,type\=IndexStats"
hc.name="Jackrabbit Oak - Index"
@@ -199,7 +200,7 @@
attribute.value.constraint="false"
attribute.name="Failing"
statusForFailedContraint="CRITICAL"
-
+
org.apache.felix.hc.generalchecks.JmxAttributeCheck-luceneindex
mbean.name="org.apache.jackrabbit.oak:name\=Lucene Index statistics,type\=LuceneIndex"
hc.name="Jackrabbit Oak - Lucene Index"
@@ -207,7 +208,7 @@
attribute.value.constraint="false"
attribute.name="Failing"
statusForFailedContraint="CRITICAL"
-
+
org.apache.felix.hc.generalchecks.JmxAttributeCheck-slowqueries
mbean.name="org.apache.jackrabbit.oak:name\=Oak Query Statistics,type\=QueryStat"
hc.name="Jackrabbit Oak - Slow Queries"
@@ -215,7 +216,7 @@
attribute.value.constraint="0"
attribute.name="SlowQueriesQueueSize"
statusForFailedContraint="WARN"
-
+
org.apache.sling.servlets.get.DefaultGetServlet
index.files=["index","index.html"]
aliases=[""]
diff --git a/builder/src/main/provisioning/scripting.txt b/builder/src/main/provisioning/scripting.txt
index 75bd30a..6928b39 100644
--- a/builder/src/main/provisioning/scripting.txt
+++ b/builder/src/main/provisioning/scripting.txt
@@ -21,18 +21,18 @@
[artifacts]
org.apache.sling/org.apache.sling.scripting.api/2.2.0
- org.apache.sling/org.apache.sling.scripting.core/2.0.58
- org.apache.sling/org.apache.sling.scripting.javascript/3.0.4
- org.apache.sling/org.apache.sling.scripting.jsp/2.3.4
- org.apache.sling/org.apache.sling.scripting.jsp-api/1.0.0
+ org.apache.sling/org.apache.sling.scripting.core/2.1.0
+ org.apache.sling/org.apache.sling.scripting.javascript/3.1.2
+ org.apache.sling/org.apache.sling.scripting.jsp/2.4.0
+ org.apache.sling/org.apache.sling.scripting.jsp-api/1.0.2
org.apache.sling/org.apache.sling.scripting.el-api/1.0.0
org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.4.0
org.antlr/antlr4-runtime/4.7.2
- org.apache.sling/org.apache.sling.scripting.sightly.runtime/1.1.2-1.4.0
- org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.2.0-1.4.0
+ org.apache.sling/org.apache.sling.scripting.sightly.runtime/1.2.0-1.4.0
+ org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.2.4-1.4.0
org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.1.4-1.4.0
- org.apache.sling/org.apache.sling.scripting.sightly/1.2.0-1.4.0
- org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.30
+ org.apache.sling/org.apache.sling.scripting.sightly/1.3.0-1.4.0
+ org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.1.0
org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.10
org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.6
org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.10_1
diff --git a/builder/src/main/provisioning/sling.txt b/builder/src/main/provisioning/sling.txt
index f7e41b2..0665efa 100644
--- a/builder/src/main/provisioning/sling.txt
+++ b/builder/src/main/provisioning/sling.txt
@@ -25,6 +25,7 @@
[artifacts startLevel=4]
org.apache.felix/org.apache.felix.scr/2.1.16
org.apache.felix/org.apache.felix.metatype/1.2.2
+ org.osgi/org.osgi.util.converter/1.0.0
[artifacts startLevel=5]
org.apache.felix/org.apache.felix.http.whiteboard/4.0.0
@@ -47,9 +48,9 @@
commons-io/commons-io/2.6
commons-fileupload/commons-fileupload/1.3.3
org.apache.sling/org.apache.sling.commons.log.webconsole/1.0.0
- org.apache.sling/org.apache.sling.api/2.20.0
+ org.apache.sling/org.apache.sling.api/2.21.0
org.apache.sling/org.apache.sling.auth.core/1.4.4
-
+
[artifacts startLevel=10]
org.apache.felix/org.apache.felix.http.sslfilter/1.2.6
org.apache.pdfbox/pdfbox/2.0.17
@@ -96,23 +97,23 @@
org.apache.sling/org.apache.sling.commons.osgi/2.4.0
org.apache.sling/org.apache.sling.commons.scheduler/2.7.4
org.apache.sling/org.apache.sling.commons.threads/3.2.20
- org.apache.sling/org.apache.sling.engine/2.6.20
+ org.apache.sling/org.apache.sling.engine/2.6.22
org.apache.sling/org.apache.sling.fsresource/2.1.16
org.apache.sling/org.apache.sling.i18n/2.5.14
org.apache.sling/org.apache.sling.installer.console/1.0.2
org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.26
org.apache.sling/org.apache.sling.installer.hc/2.0.2
org.apache.sling/org.apache.sling.jcr.contentloader/2.3.0
- org.apache.sling/org.apache.sling.jcr.resource/3.0.18
+ org.apache.sling/org.apache.sling.jcr.resource/3.0.20
org.apache.sling/org.apache.sling.models.api/1.3.8
- org.apache.sling/org.apache.sling.models.impl/1.4.10
- org.apache.sling/org.apache.sling.resourceresolver/1.6.14
+ org.apache.sling/org.apache.sling.models.impl/1.4.12
+ org.apache.sling/org.apache.sling.resourceresolver/1.6.16
org.apache.sling/org.apache.sling.serviceusermapper/1.4.4
org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.2
org.apache.sling/org.apache.sling.servlets.get/2.1.40
org.apache.sling/org.apache.sling.servlets.post/2.3.36
- org.apache.sling/org.apache.sling.servlets.resolver/2.5.6
- org.apache.sling/org.apache.sling.xss/2.1.10
+ org.apache.sling/org.apache.sling.servlets.resolver/2.5.8
+ org.apache.sling/org.apache.sling.xss/2.1.18
javax.mail/mail/1.5.0-b01
org.apache.geronimo.bundles/jstl/1.2_1