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-org-apache-sling-app-cms.git
commit 6dea5f79019a84b2188072e45e6ab8cf43e6b20a Merge: 8d6723d 10fa72e Author: Dan Klco <[email protected]> AuthorDate: Wed Sep 12 11:53:20 2018 -0400 Merge branch 'api-improvements' api/pom.xml | 97 ++++++ .../java/org/apache/sling/cms/CMSConstants.java | 118 +++++++ .../main/java/org/apache/sling/cms}/CMSUtils.java | 2 +- .../main/java/org/apache/sling/cms/Component.java | 67 ++++ .../org/apache/sling/cms/ComponentManager.java | 54 +++ .../org/apache/sling/cms/EditableResource.java | 63 ++++ api/src/main/java/org/apache/sling/cms/Page.java | 160 +++++++++ .../java/org/apache/sling/cms/PageManager.java | 28 +- .../java/org/apache/sling/cms/PageTemplate.java | 74 +++++ .../org/apache/sling/cms/PageTemplateManager.java | 84 +++-- .../main/java/org/apache/sling/cms/References.java | 29 +- api/src/main/java/org/apache/sling/cms/Site.java | 79 +++++ .../java/org/apache/sling/cms}/SiteManager.java | 27 +- .../java/org/apache/sling/cms}/package-info.java | 4 +- .../sling/cms}/usergenerated/UGCBucketConfig.java | 8 +- .../usergenerated/UserGeneratedContentService.java | 55 ++++ .../sling/cms}/usergenerated/package-info.java | 4 +- builder/src/main/provisioning/cms.txt | 3 +- core/pom.xml | 361 +++++++++++---------- .../org/apache/sling/cms/core/CMSConstants.java | 109 ------- .../core/internal/filters/EditIncludeFilter.java | 185 +++++------ .../cms/core/internal/filters/LocaleFilter.java | 4 +- .../cms/core/internal/filters/PublishFilter.java | 54 +-- .../cms/core/internal/models/ComponentImpl.java | 178 ++++++++++ .../core/internal/models/ComponentManagerImpl.java | 111 +++++++ .../core/internal/models/EditableResourceImpl.java | 85 +++++ .../sling/cms/core/internal/models/PageImpl.java | 214 ++++++++++++ .../models/PageManagerImpl.java} | 37 ++- .../cms/core/internal/models/PageTemplateImpl.java | 138 ++++++++ .../internal/models/PageTemplateManagerImpl.java | 88 +++++ .../{ => internal}/models/ReferenceOperation.java | 4 +- .../models/ReferencesImpl.java} | 32 +- .../sling/cms/core/internal/models/SiteImpl.java | 169 ++++++++++ .../models/SiteManagerImpl.java} | 23 +- .../operations/UpdateReferencesPostOperation.java | 2 +- .../rewriter/ReferenceMappingTransformer.java | 264 +++++++-------- .../cms/core/models/AbstractContentModel.java | 124 ------- .../apache/sling/cms/core/models/Component.java | 177 ---------- .../sling/cms/core/models/ComponentManager.java | 110 ------- .../sling/cms/core/models/EditableResource.java | 83 ----- .../apache/sling/cms/core/models/ErrorHandler.java | 220 +++++++------ .../apache/sling/cms/core/models/LocaleList.java | 26 +- .../sling/cms/core/models/LocaleResource.java | 18 +- .../org/apache/sling/cms/core/models/Page.java | 123 ------- .../apache/sling/cms/core/models/PageTemplate.java | 137 -------- .../sling/cms/core/models/PageTemplateManager.java | 86 ----- .../sling/cms/core/models/RedirectAttribute.java | 72 ---- .../sling/cms/core/models/SearchResults.java | 50 +-- .../org/apache/sling/cms/core/models/Site.java | 168 ---------- .../apache/sling/cms/core/models/i18nHelper.java | 44 +-- .../apache/sling/cms/core/models/package-info.java | 7 +- .../usergenerated/UserGeneratedContentService.java | 53 --- .../usergenerated/impl/ApproveUGCOperation.java | 123 +++---- .../impl/UserGeneratedContentConfig.java | 8 +- .../impl/UserGeneratedContentServiceImpl.java | 152 ++++----- pom.xml | 2 + reference/pom.xml | 1 + .../components/general/breadcrumb/breadcrumb.jsp | 2 +- .../general/columncontrol/columncontrol.jsp | 2 +- .../components/general/columncontrol/options.jsp | 2 +- .../reference/components/general/cta/options.jsp | 2 +- .../reference/components/general/iframe/iframe.jsp | 2 +- .../components/general/iframe/options.jsp | 2 +- .../reference/components/general/image/options.jsp | 2 +- .../reference/components/general/list/init.jsp | 2 +- .../reference/components/general/rss/rss.xml.jsp | 4 +- .../reference/components/general/search/search.jsp | 2 +- .../components/general/searchform/searchform.jsp | 2 +- .../components/general/sitemap/sitemap.xml.jsp | 4 +- .../components/general/stylewrapper/options.jsp | 2 +- .../reference/components/general/tags/tags.jsp | 2 +- ui/pom.xml | 1 + .../availablecomponenttypes.jsp | 2 +- .../sling-cms/components/cms/getform/getform.jsp | 2 +- .../propertieseditor/propertieseditor.jsp | 2 +- .../editor/fields/references/references.jsp | 2 +- .../editor/scripts/pageTemplateOptions.jsp | 2 +- .../components/general/container/container.jsp | 2 +- .../resources/jcr_root/libs/sling-cms/global.jsp | 3 +- 79 files changed, 2685 insertions(+), 2161 deletions(-) diff --cc builder/src/main/provisioning/cms.txt index 6f6eeea,ea145bb..42c68d7 --- a/builder/src/main/provisioning/cms.txt +++ b/builder/src/main/provisioning/cms.txt @@@ -23,8 -23,9 +23,9 @@@ 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.1-SNAPSHOT + org.apache.sling/org.apache.sling.fileoptim/0.9.2 org.apache.sling/org.apache.sling.resourcemerger/1.3.6 + org.apache.sling/org.apache.sling.cms.api/${cms.version} org.apache.sling/org.apache.sling.cms.core/${cms.version} org.apache.sling/org.apache.sling.cms.ui/${cms.version} org.apache.sling/org.apache.sling.cms.reference/${cms.version}
