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 2020/09/08 19:30:26 UTC
[sling-org-apache-sling-app-cms] branch master updated (cb407e4 ->
72c3197)
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 cb407e4 Adding sonarqube badges as per SLING-9682
add 0abd9a4 Updating to bring the PM closer to Sling 12
add 1795c27 Adding a POM to convert PM to FM
add c1b6527 Adding migrated Feature model files
add b172f73 Ignoring the launcher directory
add d3cc884 Using variables
add 37c207a Fixing an error with the whiteboard security load order
add 9cbf454 Updated file optim to 20 to resolve start order issue
add b32853b Updating the start order of several foundational libraries
add ee5c777 Moving codec and post up a level each
add 1f150bd Bumping up a few commons bundles:
add 923a859 Almost all bundle order issues resolved
add aed81c5 Fixed all bundle start ordering issues
add a31974a Adding current state on creating a standalone jar
add 4a515c8 Revising the module name and updating to embed feature launcher to enable launching the standalone JAR
add 9eee38b Simplify the conversion POM
add b7915fc Working on a composite node store solution
add c36b456 Building the Composite NodeStore on build of the docker image
add cd7ab57 Updating to bring the PM closer to Sling 12
add 5bd8100 Adding a POM to convert PM to FM
add 7387d3a Adding migrated Feature model files
add 0f227b4 Ignoring the launcher directory
add f3052d5 Using variables
add cdd2f07 Fixing an error with the whiteboard security load order
add 7185853 Updated file optim to 20 to resolve start order issue
add 1860c91 Updating the start order of several foundational libraries
add da0b4d8 Moving codec and post up a level each
add 673bbbb Bumping up a few commons bundles:
add 2671328 Almost all bundle order issues resolved
add 3276d19 Fixed all bundle start ordering issues
add ea52a3e Adding current state on creating a standalone jar
add edad9c8 Revising the module name and updating to embed feature launcher to enable launching the standalone JAR
add f9f16c3 Simplify the conversion POM
add 0c4a430 Working on a composite node store solution
add c49bc51 Building the Composite NodeStore on build of the docker image
add 1f38d3e Merge branch 'SLING-8913-multiple-instance-types' of github.com:apache/sling-org-apache-sling-app-cms into SLING-8913-multiple-instance-types
add a77f3ef Stopping the SlingCMS instance
add 10f6c1e Fixing name of runtime classifier
add bad02e2 Adding support for Content Distribution
add 42f1f91 Enabling actions to have a resource type
add 7b21dde Adding programmatic support for publication
add 5d225b9 Fixing baseline and provisioning build issues
add b7934d6 Minor -test improvements
add c115e06 Updating to clean up the code around publishable resources including pages and files
add 2828550 Fixing an issue where the page editor buttons weren't opening in a modal
add ec1affb Resolving issues where the security filter was not taking publication status into consideration and made it more configurable
add 6ef9918 Fixing error when retrieving a publishable resource with an unset / invalid publication type
add 3a3a691 Adding the new publication UI
add 707241d Merge branch 'master' of github.com:apache/sling-org-apache-sling-app-cms into SLING-8913-multiple-instance-types
add e21fe1d Merging
add dbccacc Fixing double click not firing
add 4d99150 Adding a constant for the sling:Config node type
add fe98d6a Ensuring the path is set if a failure publishing occurs
add 518f2b3 Adding the ability to re-publish
add 7b252a7 Fixing an issue where the content distributor wasn't re-binding on start
add 62ab937 Adding support for publishing configs
add 59175fe Starting on adding feature support for content distribution
add 7fa6f9b Adding UI for importers, exports and agents
add 6ba973e Updating icons to be less blurry
add 72c3197 Adding missed files
No new revisions were added by this update.
Summary of changes:
api/pom.xml | 14 +
.../java/org/apache/sling/cms/CMSConstants.java | 28 +-
api/src/main/java/org/apache/sling/cms/File.java | 105 +----
api/src/main/java/org/apache/sling/cms/Page.java | 107 +----
.../cms/{Page.java => PublishableResource.java} | 98 +++--
.../java/org/apache/sling/cms/ResourceTree.java | 23 +-
.../java/org/apache/sling/cms/package-info.java | 2 +-
.../IsPublishableResourceContainer.java | 37 +-
.../cms/publication/IsPublishableResourceType.java | 28 +-
.../sling/cms/publication/PUBLICATION_MODE.java | 14 +-
.../sling/cms/publication/PublicationEvent.java | 68 ++++
.../cms/publication/PublicationException.java | 24 +-
.../sling/cms/publication/PublicationManager.java | 56 +++
.../PublicationManagerFactory.java} | 26 +-
.../sling/cms/publication/PublicationType.java | 14 +-
.../sling/cms/publication}/package-info.java | 6 +-
.../cms/publication/PublicationEventTest.java | 53 +++
.../cms/publication/PublicationExceptionTest.java | 29 +-
builder/src/main/provisioning/cms.txt | 4 +-
builder/src/main/provisioning/composum.txt | 1 -
builder/src/main/provisioning/healthcheck.txt | 8 +-
builder/src/main/provisioning/repoinit.txt | 7 +
.../{webapp.txt => sling-distribution.txt} | 9 +-
builder/src/main/provisioning/sling-rewriter.txt | 38 --
converter/pom.xml | 178 +++++++++
core/pom.xml | 4 +
.../filters/CMSSecurityConfigInstance.java | 81 ++++
.../core/internal/filters/CMSSecurityFilter.java | 93 +++--
.../sling/cms/core/internal/models/FileImpl.java | 139 +------
.../sling/cms/core/internal/models/PageImpl.java | 148 +------
...{PageImpl.java => PublishableResourceImpl.java} | 176 ++++-----
.../cms/core/publication/BulkPublicationJob.java | 124 ++++++
.../ContentDistributionPublicationManager.java | 105 +++++
.../PublicationConfig.java} | 19 +-
.../publication/PublicationManagerFactoryImpl.java | 77 ++++
.../PublishPostOperation.java} | 43 +-
.../publication/StandalonePublicationManager.java | 83 ++++
.../UnpublishPostOperation.java} | 42 +-
.../main/resources/OSGI-INF/l10n/bundle.properties | 12 +-
.../sling/cms/core/helpers/SlingCMSTestHelper.java | 2 +
.../internal/filters/CMSSecurityFilterTest.java | 59 ++-
.../cms/core/internal/models/FileImplTest.java | 25 +-
.../cms/core/internal/models/PageImplTest.java | 29 +-
.../models/PublishableResourceImplTest.java | 72 ++++
.../internal/servlets/DownloadFileServletTest.java | 9 +-
.../ContentDistributionPublicationManagerTest.java | 105 +++++
.../PublicationManagerFactoryImplTest.java | 83 ++++
.../core/publication/PublishPostOperationTest.java | 74 ++++
.../StandalonePublicationManagerTest.java | 74 ++++
.../publication/UnpublishPostOperationTest.java | 74 ++++
core/src/test/resources/conf.json | 357 +++++++++++++++++
core/src/test/resources/content.json | 21 +-
core/src/test/resources/etc.json | 291 ++++++++++++++
docker/README.md | 12 +-
docker/cms/Dockerfile | 25 +-
docker/cms/download-dependencies.sh | 34 ++
docker/cms/settings.xml | 35 ++
docker/cms/setup-composite.sh | 49 +++
docker/docker-compose.yml | 16 +-
docker/webcache/Dockerfile | 10 +-
feature/.gitignore | 1 +
feature/pom.xml | 200 ++++++++++
feature/src/main/assembly/standalone.xml | 61 +++
feature/src/main/features/boot_boot.json | 131 +++++++
feature/src/main/features/cms_cms.json | 324 ++++++++++++++++
.../src/main/features/composum_composum-nodes.json | 32 ++
feature/src/main/features/distribution.json | 79 ++++
.../src/main/features/healthcheck_healthcheck.json | 103 +++++
feature/src/main/features/launchpad_launchpad.json | 19 +
.../node-store-composite/composite-runtime.json | 62 +++
.../node-store-composite/composite-seed.json | 39 ++
.../main/features/node-store-segment/segment.json | 16 +
feature/src/main/features/oak_oak.json | 118 ++++++
feature/src/main/features/repoinit_repoinit.json | 74 ++++
.../features/runmode-author/runmode-author.json | 40 ++
.../runmode-renderer/runmode-renderer.json | 13 +
.../runmode-standalone/runmode-standalone.json | 17 +
feature/src/main/features/scripting_sling.json | 92 +++++
.../features/sling-caconfig_sling-caconfig.json | 28 ++
.../features/sling-discovery_sling-discovery.json | 45 +++
.../src/main/features/sling-event_sling-event.json | 32 ++
...els-jacksonexporter_models-jacksonexporter.json | 22 ++
.../sling-validation_sling-validation.json | 36 ++
feature/src/main/features/sling_sling.json | 432 +++++++++++++++++++++
.../src/main/features/standalone_standalone.json | 16 +
feature/src/main/features/webapp_webapp.json | 4 +
.../java/org/apache/sling/cms/feature/Main.java | 46 +++
feature/src/main/resources/slingcms.properties | 10 +
.../apache/sling/launchpad/LaunchpadReadyRule.java | 4 +-
.../java/org/apache/sling/launchpad/SmokeIT.java | 0
.../org/apache/sling/launchpad/package-info.java | 0
pom.xml | 12 +-
.../apps/reference/components/pages/base/edit.json | 173 ++++-----
.../apps/reference/components/pages/post/edit.json | 185 ++++-----
transformer/src/test/resources/thumbnail.png | Bin 20437 -> 21183 bytes
ui/src/main/frontend/js/cms.form.js | 3 +-
ui/src/main/frontend/scss/cms.scss | 13 +
.../resources/SLING-INF/nodetypes/nodetypes.cnd | 37 +-
ui/src/main/resources/jcr_root/conf/global.json | 9 +-
.../components/cms/actions/basic/basic.jsp | 12 +-
.../{pages => cms/actions}/modal/modal.jsp | 53 ++-
.../components/cms/columns/actions/actions.jsp | 24 +-
.../components/cms/columns/publish/publish.jsp | 5 +-
.../components/cms/contentgrid/contentgrid.jsp | 170 ++++----
.../components/cms/contenttable/contenttable.jsp | 3 +-
.../components/cms/pageeditbar/actions/actions.jsp | 30 +-
.../finalize.jsp => cms/tilecard/tilecard.jsp} | 20 +-
.../buttonbar.jsp => cms/tiles/tiles.jsp} | 12 +-
.../editor/fields/{file.json => publication.json} | 3 +-
.../components/editor/fields/publication/field.jsp | 82 ++++
.../components/publication/agent/agent.jsp | 124 ++++++
.../configuration/configuration.jsp} | 23 +-
.../configurationarray/configurationarray.jsp} | 20 +-
.../components/publication/exporter/exporter.jsp | 66 ++++
.../sling-cms/components/publication/home/home.jsp | 12 +-
.../components/publication/importer/importer.jsp | 66 ++++
.../components/publication/status/status.jsp | 53 +++
.../jcr_root/libs/sling-cms/content/auth/list.json | 26 +-
.../libs/sling-cms/content/config/bucket.json | 16 +-
.../libs/sling-cms/content/config/buckets.json | 8 +-
.../libs/sling-cms/content/config/configs.json | 8 +-
.../libs/sling-cms/content/i18n/dictionaries.json | 4 +-
.../libs/sling-cms/content/i18n/dictionary.json | 2 +-
.../libs/sling-cms/content/mappings/list.json | 12 +-
.../jcr_root/libs/sling-cms/content/page/edit.json | 12 +-
.../libs/sling-cms/content/publication/agent.json | 94 +++++
.../libs/sling-cms/content/publication/agents.json | 57 +++
.../libs/sling-cms/content/publication/bulk.json | 48 +++
.../sling-cms/content/publication/exporter.json | 69 ++++
.../sling-cms/content/publication/exporters.json | 57 +++
.../libs/sling-cms/content/publication/home.json | 53 +++
.../sling-cms/content/publication/importer.json | 45 +++
.../sling-cms/content/publication/importers.json | 57 +++
.../libs/sling-cms/content/shared/publish.json | 18 +-
.../libs/sling-cms/content/shared/unpublish.json | 18 +-
.../libs/sling-cms/content/site/content.json | 52 +--
.../libs/sling-cms/content/site/sites.json | 12 +-
.../libs/sling-cms/content/siteconfig/editor.json | 8 +-
.../jcr_root/libs/sling-cms/content/start.json | 11 +
.../libs/sling-cms/content/static/content.json | 38 +-
.../libs/sling-cms/content/taxonomy/list.json | 8 +-
.../sling-cms/content/transformations/editor.json | 8 +-
.../sling-cms/content/usergenerated/content.json | 10 +-
.../resources/jcr_root/libs/sling-cms/i18n.json | 30 ++
.../sling-cms/thumbnails/bulk-publication.png | Bin 0 -> 4080 bytes
.../static/sling-cms/thumbnails/exporters.png | Bin 0 -> 3838 bytes
.../static/sling-cms/thumbnails/importers.png | Bin 0 -> 3833 bytes
.../static/sling-cms/thumbnails/publish-agent.png | Bin 0 -> 3013 bytes
148 files changed, 6110 insertions(+), 1556 deletions(-)
copy api/src/main/java/org/apache/sling/cms/{Page.java => PublishableResource.java} (54%)
copy core/src/main/java/org/apache/sling/cms/core/internal/models/PageManagerImpl.java => api/src/main/java/org/apache/sling/cms/publication/IsPublishableResourceContainer.java (53%)
copy core/src/main/java/org/apache/sling/cms/core/internal/models/SiteManagerImpl.java => api/src/main/java/org/apache/sling/cms/publication/IsPublishableResourceType.java (59%)
copy archetype/src/main/resources/archetype-resources/gulpfile.js => api/src/main/java/org/apache/sling/cms/publication/PUBLICATION_MODE.java (75%)
create mode 100644 api/src/main/java/org/apache/sling/cms/publication/PublicationEvent.java
copy core/src/main/java/org/apache/sling/cms/core/internal/SimplePrincipal.java => api/src/main/java/org/apache/sling/cms/publication/PublicationException.java (66%)
create mode 100644 api/src/main/java/org/apache/sling/cms/publication/PublicationManager.java
copy api/src/main/java/org/apache/sling/cms/{ComponentConfiguration.java => publication/PublicationManagerFactory.java} (62%)
copy archetype/src/main/resources/archetype-resources/gulpfile.js => api/src/main/java/org/apache/sling/cms/publication/PublicationType.java (75%)
copy {archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__ => api/src/main/java/org/apache/sling/cms/publication}/package-info.java (90%)
create mode 100644 api/src/test/java/org/apache/sling/cms/publication/PublicationEventTest.java
copy core/src/test/java/org/apache/sling/cms/core/internal/CommonUtilsTest.java => api/src/test/java/org/apache/sling/cms/publication/PublicationExceptionTest.java (60%)
copy builder/src/main/provisioning/{webapp.txt => sling-distribution.txt} (78%)
delete mode 100644 builder/src/main/provisioning/sling-rewriter.txt
create mode 100644 converter/pom.xml
create mode 100644 core/src/main/java/org/apache/sling/cms/core/internal/filters/CMSSecurityConfigInstance.java
copy core/src/main/java/org/apache/sling/cms/core/internal/models/{PageImpl.java => PublishableResourceImpl.java} (50%)
create mode 100644 core/src/main/java/org/apache/sling/cms/core/publication/BulkPublicationJob.java
create mode 100644 core/src/main/java/org/apache/sling/cms/core/publication/ContentDistributionPublicationManager.java
copy core/src/main/java/org/apache/sling/cms/core/{internal/listeners/AutoVersioningListenerConfig.java => publication/PublicationConfig.java} (60%)
create mode 100644 core/src/main/java/org/apache/sling/cms/core/publication/PublicationManagerFactoryImpl.java
copy core/src/main/java/org/apache/sling/cms/core/{internal/operations/ChangePasswordOperation.java => publication/PublishPostOperation.java} (63%)
create mode 100644 core/src/main/java/org/apache/sling/cms/core/publication/StandalonePublicationManager.java
copy core/src/main/java/org/apache/sling/cms/core/{internal/operations/ChangePasswordOperation.java => publication/UnpublishPostOperation.java} (63%)
copy archetype/src/main/resources/archetype-resources/src/test/java/__package__/HelloWorldModelTest.java => core/src/test/java/org/apache/sling/cms/core/internal/models/FileImplTest.java (68%)
copy archetype/src/main/resources/archetype-resources/src/test/java/__package__/HelloWorldModelTest.java => core/src/test/java/org/apache/sling/cms/core/internal/models/PageImplTest.java (60%)
create mode 100644 core/src/test/java/org/apache/sling/cms/core/internal/models/PublishableResourceImplTest.java
create mode 100644 core/src/test/java/org/apache/sling/cms/core/publication/ContentDistributionPublicationManagerTest.java
create mode 100644 core/src/test/java/org/apache/sling/cms/core/publication/PublicationManagerFactoryImplTest.java
create mode 100644 core/src/test/java/org/apache/sling/cms/core/publication/PublishPostOperationTest.java
create mode 100644 core/src/test/java/org/apache/sling/cms/core/publication/StandalonePublicationManagerTest.java
create mode 100644 core/src/test/java/org/apache/sling/cms/core/publication/UnpublishPostOperationTest.java
create mode 100644 core/src/test/resources/conf.json
create mode 100644 core/src/test/resources/etc.json
create mode 100644 docker/cms/download-dependencies.sh
create mode 100644 docker/cms/settings.xml
create mode 100644 docker/cms/setup-composite.sh
create mode 100644 feature/.gitignore
create mode 100644 feature/pom.xml
create mode 100644 feature/src/main/assembly/standalone.xml
create mode 100644 feature/src/main/features/boot_boot.json
create mode 100644 feature/src/main/features/cms_cms.json
create mode 100644 feature/src/main/features/composum_composum-nodes.json
create mode 100644 feature/src/main/features/distribution.json
create mode 100644 feature/src/main/features/healthcheck_healthcheck.json
create mode 100644 feature/src/main/features/launchpad_launchpad.json
create mode 100644 feature/src/main/features/node-store-composite/composite-runtime.json
create mode 100644 feature/src/main/features/node-store-composite/composite-seed.json
create mode 100644 feature/src/main/features/node-store-segment/segment.json
create mode 100644 feature/src/main/features/oak_oak.json
create mode 100644 feature/src/main/features/repoinit_repoinit.json
create mode 100644 feature/src/main/features/runmode-author/runmode-author.json
create mode 100644 feature/src/main/features/runmode-renderer/runmode-renderer.json
create mode 100644 feature/src/main/features/runmode-standalone/runmode-standalone.json
create mode 100644 feature/src/main/features/scripting_sling.json
create mode 100644 feature/src/main/features/sling-caconfig_sling-caconfig.json
create mode 100644 feature/src/main/features/sling-discovery_sling-discovery.json
create mode 100644 feature/src/main/features/sling-event_sling-event.json
create mode 100644 feature/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
create mode 100644 feature/src/main/features/sling-validation_sling-validation.json
create mode 100644 feature/src/main/features/sling_sling.json
create mode 100644 feature/src/main/features/standalone_standalone.json
create mode 100644 feature/src/main/features/webapp_webapp.json
create mode 100644 feature/src/main/java/org/apache/sling/cms/feature/Main.java
create mode 100644 feature/src/main/resources/slingcms.properties
copy {builder => feature}/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java (96%)
copy {builder => feature}/src/test/java/org/apache/sling/launchpad/SmokeIT.java (100%)
copy {builder => feature}/src/test/java/org/apache/sling/launchpad/package-info.java (100%)
copy reference/src/main/resources/jcr_root/apps/reference/components/general/cta/cta.jsp => ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/basic/basic.jsp (68%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/{pages => cms/actions}/modal/modal.jsp (62%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/{editor/scripts/finalize.jsp => cms/tilecard/tilecard.jsp} (52%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/{editor/fields/richtext/toolbar/buttonbar/buttonbar.jsp => cms/tiles/tiles.jsp} (80%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/{file.json => publication.json} (64%)
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/publication/field.jsp
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/publication/agent/agent.jsp
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/{caconfig/readability/config/config.jsp => publication/configuration/configuration.jsp} (57%)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/{caconfig/readability/config/config.jsp => publication/configurationarray/configurationarray.jsp} (67%)
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/publication/exporter/exporter.jsp
copy reference/src/main/resources/jcr_root/apps/reference/components/general/cta/cta.jsp => ui/src/main/resources/jcr_root/libs/sling-cms/components/publication/home/home.jsp (78%)
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/publication/importer/importer.jsp
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/publication/status/status.jsp
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/agent.json
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/agents.json
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/bulk.json
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/exporter.json
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/exporters.json
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/home.json
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/importer.json
create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/content/publication/importers.json
create mode 100644 ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/bulk-publication.png
create mode 100644 ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/exporters.png
create mode 100644 ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/importers.png
create mode 100644 ui/src/main/resources/jcr_root/static/sling-cms/thumbnails/publish-agent.png