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/06/24 21:31:54 UTC
[sling-org-apache-sling-app-cms] branch master updated (6e31a94 ->
892d7fa)
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-org-apache-sling-app-cms.git.
from 6e31a94 Fixing SLING-8486: Fixing errors when using the FakeResponse and issues around the binding of the Insight Providers
add 1a40627 Fixing an issue where the reload content is cached in browser
add c253ab1 Initial crack at a better structure for the /conf content and fixing the breadcrumbs
add fed85ad Trivial whitespace
add 892d7fa Completely re-vamped the CA Configuration structure to be more consistent
No new revisions were added by this update.
Summary of changes:
...References.java => ComponentConfiguration.java} | 24 ++--
.../{PageTemplate.java => ComponentPolicy.java} | 45 ++------
...ileManager.java => ComponentPolicyManager.java} | 15 ++-
.../java/org/apache/sling/cms/PageManager.java | 5 +-
.../java/org/apache/sling/cms/PageTemplate.java | 16 +--
.../org/apache/sling/cms/PageTemplateManager.java | 4 +-
.../java/org/apache/sling/cms/package-info.java | 2 +-
.../sling/cms/core/insights/impl/FakeResponse.java | 4 +-
.../cms/core/insights/impl/InsightFactoryImpl.java | 4 +-
.../core/internal/ResourceEditorAssociation.java | 80 +++++++++++++
.../ResourceEditorAssociationConfig.java} | 26 +++--
...java => ResourceEditorAssociationProvider.java} | 21 ++--
.../core/internal/filters/EditIncludeFilter.java | 2 +-
.../models/ComponentConfigurationImpl.java | 55 +++++++++
.../core/internal/models/ComponentPolicyImpl.java | 94 +++++++++++++++
...erImpl.java => ComponentPolicyManagerImpl.java} | 42 +++----
.../cms/core/internal/models/PageTemplateImpl.java | 40 ++-----
.../sling/cms/core/models/ContentBreadcrumb.java | 126 +++++++++++++++++++++
.../apache/sling/cms/core/models/package-info.java | 2 +-
.../main/resources/OSGI-INF/l10n/bundle.properties | 26 ++++-
.../internal/ResourceEditorAssociationTest.java | 95 ++++++++++++++++
pom.xml | 1 +
.../components/general/codeblock/edit.json | 28 ++---
.../general/columncontrol/columncontrol.jsp | 49 ++++----
.../components/general/columncontrol/config.json | 40 ++++---
.../components/general/columncontrol/edit.json | 74 ++++++------
.../components/general/columncontrol/options.jsp | 5 +-
.../reference/components/general/cta/config.json | 26 +++--
.../apps/reference/components/general/cta/cta.jsp | 6 +-
.../reference/components/general/cta/edit.json | 96 ++++++++--------
.../reference/components/general/cta/options.jsp | 11 +-
.../components/general/iframe/config.json | 40 ++++---
.../reference/components/general/iframe/edit.json | 84 +++++++-------
.../reference/components/general/iframe/iframe.jsp | 5 +-
.../components/general/iframe/options.jsp | 11 +-
.../reference/components/general/image/config.json | 26 +++--
.../reference/components/general/image/edit.json | 64 +++++------
.../reference/components/general/image/image.jsp | 2 +-
.../reference/components/general/image/options.jsp | 11 +-
.../reference/components/general/list/config.json | 46 ++++----
.../reference/components/general/list/edit.json | 122 ++++++++++----------
.../reference/components/general/list/init.jsp | 2 +-
.../reference/components/general/list/item.jsp | 22 ++--
.../reference/components/general/list/list.jsp | 18 +--
.../components/general/list/pagination.jsp | 74 ++++++------
.../components/general/search/config.json | 88 +++++++-------
.../reference/components/general/search/edit.json | 44 +++----
.../components/general/search/pagination.jsp | 74 ++++++------
.../reference/components/general/search/result.jsp | 24 ++--
.../reference/components/general/search/search.jsp | 38 +++----
.../components/general/searchform/config.json | 46 ++++----
.../components/general/searchform/edit.json | 14 +--
.../components/general/searchform/searchform.jsp | 8 +-
.../components/general/stylewrapper/config.json | 20 ++--
.../components/general/stylewrapper/edit.json | 30 ++---
.../components/general/stylewrapper/options.jsp | 4 +-
.../general/stylewrapper/stylewrapper.jsp | 2 +-
.../components/general/suffixheader/edit.json | 106 ++++++++---------
.../general/suffixheader/suffixheader.jsp | 14 +--
.../reference/components/general/tags/config.json | 66 +++++------
.../reference/components/general/tags/edit.json | 14 +--
.../reference/components/general/tags/tags.jsp | 19 ++--
ui/src/main/frontend/src/js/cms.js | 5 +
ui/src/main/resources/jcr_root/conf/global.json | 48 ++++----
.../components/caconfig/component/component.jsp | 44 +++----
.../components/caconfig/component/edit.json | 38 +++----
.../components/caconfig/fileeditor/config.json | 3 +-
.../caconfig/fileeditor/config/edit.json | 42 +++----
.../components/caconfig/fileeditor/fileeditor.jsp | 2 +-
.../sling-cms/components/caconfig/policies.json | 6 +
.../caconfig/{readability => policies}/include.jsp | 3 +-
.../libs/sling-cms/components/caconfig/policy.json | 5 +
.../components/caconfig/policy/config.json | 4 +
.../policy}/config/config.jsp | 28 -----
.../{sitesettings => policy/config}/edit.json | 17 +--
.../components/caconfig/policy/policy.jsp | 8 +-
.../components/caconfig/policymapping.json | 6 +
.../config => policymapping}/edit.json | 23 ++--
.../config.jsp => policymapping/policymapping.jsp} | 18 ++-
.../sling-cms/components/caconfig/readability.json | 6 +-
.../sling-cms/components/caconfig/rewriter.json | 6 +-
.../components/caconfig/rewriter/config.json | 4 +
.../rewriter/{rewriter.jsp => config/config.jsp} | 24 ++--
.../{readability => rewriter}/config/edit.json | 24 ++--
.../components/caconfig/rewriter/edit.json | 25 ----
.../caconfig/{readability => rewriter}/include.jsp | 2 +-
.../components/caconfig/scripts/policyOptions.jsp | 11 +-
.../sling-cms/components/caconfig/site/site.jsp | 31 -----
.../components/caconfig/sitesettings.json | 6 +-
.../components/caconfig/sitesettings/config.json | 4 +
.../{sitesettings.jsp => config/config.jsp} | 0
.../caconfig/sitesettings/{ => config}/edit.json | 0
.../{readability => sitesettings}/include.jsp | 2 +-
.../template}/config.json | 0
.../template}/config/config.jsp | 25 +---
.../template}/config/edit.json | 6 +-
.../{base/base.jsp => template/template.jsp} | 10 +-
.../sling-cms/components/caconfig/templates.json | 5 +
.../components/caconfig/templates/templates.jsp | 6 +-
.../cms/contentbreadcrumb/contentbreadcrumb.jsp | 31 ++---
.../cms/templateeditor/templateeditor.jsp | 45 --------
.../{cms/templateeditor => }/config/config.jsp | 25 +---
.../{cms/templateeditor => }/config/edit.json | 0
.../editor/scripts/resourceTypeOptions.jsp | 26 ++---
.../components/general/container/container.jsp | 7 +-
.../content/config/{list.json => bucket.json} | 63 +----------
.../{taxonomy/list.json => config/buckets.json} | 32 +++---
.../{taxonomy/list.json => config/configs.json} | 32 +++---
.../libs/sling-cms/content/config/create.json | 8 +-
.../libs/sling-cms/content/config/edit.json | 4 +-
.../libs/sling-cms/content/site/content.json | 5 +-
.../libs/sling-cms/content/site/sites.json | 5 +-
.../libs/sling-cms/content/siteconfig/editor.json | 15 +--
.../jcr_root/libs/sling-cms/content/start.json | 4 +-
.../libs/sling-cms/content/static/content.json | 5 +-
.../libs/sling-cms/content/taxonomy/list.json | 3 +-
.../libs/sling-cms/content/template/edit.json | 15 ++-
.../sling-cms/content/usergenerated/content.json | 3 +-
...al.ResourceEditorAssociation-confbucket.config} | 4 +-
...l.ResourceEditorAssociation-confbuckets.config} | 4 +-
...rnal.ResourceEditorAssociation-confedit.config} | 4 +-
...rnal.ResourceEditorAssociation-confroot.config} | 4 +-
...internal.ResourceEditorAssociation-site.config} | 5 +-
...l.ResourceEditorAssociation-sitecontent.config} | 5 +-
...nternal.ResourceEditorAssociation-sites.config} | 6 +-
...ternal.ResourceEditorAssociation-static.config} | 4 +-
...rnal.ResourceEditorAssociation-taxonomy.config} | 4 +-
....internal.ResourceEditorAssociation-ugc.config} | 4 +-
128 files changed, 1663 insertions(+), 1408 deletions(-)
copy api/src/main/java/org/apache/sling/cms/{References.java => ComponentConfiguration.java} (62%)
copy api/src/main/java/org/apache/sling/cms/{PageTemplate.java => ComponentPolicy.java} (57%)
copy api/src/main/java/org/apache/sling/cms/{FileManager.java => ComponentPolicyManager.java} (67%)
create mode 100644 core/src/main/java/org/apache/sling/cms/core/internal/ResourceEditorAssociation.java
copy core/src/main/java/org/apache/sling/cms/core/{usergenerated/impl/UserGeneratedContentConfig.java => internal/ResourceEditorAssociationConfig.java} (56%)
copy core/src/main/java/org/apache/sling/cms/core/internal/{models/InternalCMSJobManager.java => ResourceEditorAssociationProvider.java} (64%)
create mode 100644 core/src/main/java/org/apache/sling/cms/core/internal/models/ComponentConfigurationImpl.java
create mode 100644 core/src/main/java/org/apache/sling/cms/core/internal/models/ComponentPolicyImpl.java
copy core/src/main/java/org/apache/sling/cms/core/internal/models/{PageManagerImpl.java => ComponentPolicyManagerImpl.java} (50%)
create mode 100644 core/src/main/java/org/apache/sling/cms/core/models/ContentBreadcrumb.java
create mode 100644 core/src/test/java/org/apache/sling/cms/core/internal/ResourceEditorAssociationTest.java
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/policies.json
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/{readability => policies}/include.jsp (87%)
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/policy.json
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/policy/config.json
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/{cms/templateeditor => caconfig/policy}/config/config.jsp (68%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/{sitesettings => policy/config}/edit.json (56%)
copy reference/src/main/resources/jcr_root/apps/reference/components/pages/base/base.jsp => ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/policy/policy.jsp (78%)
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/policymapping.json
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/{readability/config => policymapping}/edit.json (56%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/{readability/config/config.jsp => policymapping/policymapping.jsp} (70%)
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/rewriter/config.json
rename ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/rewriter/{rewriter.jsp => config/config.jsp} (70%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/{readability => rewriter}/config/edit.json (56%)
delete mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/rewriter/edit.json
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/{readability => rewriter}/include.jsp (93%)
copy reference/src/main/resources/jcr_root/apps/reference/components/general/cta/options.jsp => ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/scripts/policyOptions.jsp (58%)
delete mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/site/site.jsp
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/sitesettings/config.json
rename ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/sitesettings/{sitesettings.jsp => config/config.jsp} (100%)
rename ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/sitesettings/{ => config}/edit.json (100%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/{readability => sitesettings}/include.jsp (93%)
rename ui/src/main/resources/jcr_root/libs/sling-cms/components/{cms/templateeditor => caconfig/template}/config.json (100%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/{cms/templateeditor => caconfig/template}/config/config.jsp (77%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/{cms/templateeditor => caconfig/template}/config/edit.json (90%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/{base/base.jsp => template/template.jsp} (73%)
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/templates.json
copy reference/src/main/resources/jcr_root/apps/reference/components/pages/base/base.jsp => ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/templates/templates.jsp (81%)
delete mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/templateeditor/templateeditor.jsp
rename ui/src/main/resources/jcr_root/libs/sling-cms/components/{cms/templateeditor => }/config/config.jsp (77%)
rename ui/src/main/resources/jcr_root/libs/sling-cms/components/{cms/templateeditor => }/config/edit.json (100%)
rename ui/src/main/resources/jcr_root/libs/sling-cms/content/config/{list.json => bucket.json} (60%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/content/{taxonomy/list.json => config/buckets.json} (84%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/content/{taxonomy/list.json => config/configs.json} (84%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/install/{org.apache.sling.cms.core.internal.rewriter.ReferenceMappingTransformerFactory.config => org.apache.sling.cms.core.internal.ResourceEditorAssociation-confbucket.config} (90%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/install/{org.apache.sling.cms.core.internal.rewriter.ReferenceMappingTransformerFactory.config => org.apache.sling.cms.core.internal.ResourceEditorAssociation-confbuckets.config} (91%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/install/{org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling-cms-core.config => org.apache.sling.cms.core.internal.ResourceEditorAssociation-confedit.config} (89%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/install/{org.apache.sling.cms.core.internal.rewriter.ReferenceMappingTransformerFactory.config => org.apache.sling.cms.core.internal.ResourceEditorAssociation-confroot.config} (92%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/install/{org.apache.sling.cms.core.internal.rewriter.ReferenceMappingTransformerFactory.config => org.apache.sling.cms.core.internal.ResourceEditorAssociation-site.config} (90%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/install/{org.apache.sling.cms.core.internal.rewriter.ReferenceMappingTransformerFactory.config => org.apache.sling.cms.core.internal.ResourceEditorAssociation-sitecontent.config} (90%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/install/{org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling-cms-core.config => org.apache.sling.cms.core.internal.ResourceEditorAssociation-sites.config} (87%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/install/{org.apache.sling.cms.core.internal.rewriter.ReferenceMappingTransformerFactory.config => org.apache.sling.cms.core.internal.ResourceEditorAssociation-static.config} (92%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/install/{org.apache.sling.cms.core.internal.rewriter.ReferenceMappingTransformerFactory.config => org.apache.sling.cms.core.internal.ResourceEditorAssociation-taxonomy.config} (92%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/install/{org.apache.sling.cms.core.internal.rewriter.ReferenceMappingTransformerFactory.config => org.apache.sling.cms.core.internal.ResourceEditorAssociation-ugc.config} (90%)