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-whiteboard.git
commit ec15a2ca357400f46de7ec811ae1b7b954925a1f Merge: 32a2483 b380e8c Author: Dan Klco <[email protected]> AuthorDate: Sat Aug 22 23:24:58 2020 -0400 Merge branch 'master' of github.com:apache/sling-whiteboard .asf.yaml | 7 + .sling-module.json | 5 + SlingModelPersist/pom.xml | 11 + .../sling/models/persistor/annotations/Ignore.java | 3 +- .../models/persistor/impl/ModelPersistorImpl.java | 59 +- .../persistor/impl/util/ReflectionUtils.java | 45 +- .../sling/models/persist/ModelPersistTest.java | 54 +- .../sling/models/persist/bean/ComplexBean.java | 7 +- distribution-service/README.md | 12 + fake-content-generator/.gitignore | 2 + fake-content-generator/README.md | 10 + fake-content-generator/index.js | 97 + fake-content-generator/package-lock.json | 18 + fake-content-generator/package.json | 15 + featuremodel-unpack-extension/bnd.bnd | 2 + featuremodel-unpack-extension/pom.xml | 119 + .../sling/feature/extension/unpack/Unpack.java | 239 + .../extension/unpack/impl/converter/Converter.java | 89 + .../impl/installer/InstallUnpackArchiveTask.java | 60 + .../installer/UnpackArchiveExtensionHandler.java | 51 + .../installer/UnpackArchiveInstallerPlugin.java | 127 + .../impl/launcher/UnpackLauncherExtension.java | 58 + ...eature.launcher.spi.extensions.ExtensionHandler | 1 + .../sling/feature/extension/unpack/TestUnpack.java | 102 + .../unpack/impl/converter/ConverterTest.java | 53 + .../installer/InstallUnpackArchiveTaskTest.java | 77 + .../UnpackArchiveExtensionHandlerTest.java | 65 + .../UnpackArchiveInstallerPluginTest.java | 169 + .../impl/launcher/UnpackLauncherExtensionTest.java | 82 + .../sling/feature/extension/unpack/test1/index.txt | 3 + .../feature/extension/unpack/test1/sub1/test1.txt | 1 + .../feature/extension/unpack/test1/sub2/test1.txt | 1 + .../feature/extension/unpack/test1/sub2/test2.txt | 1 + .../sling/feature/extension/unpack/test1/test.txt | 1 + graphql-scripting/README.md | 4 + http-caching-experiments/Dockerfile | 24 + http-caching-experiments/README.md | 25 + http-caching-experiments/httpd.conf | 567 ++ http-caching-experiments/public-html/example.lua | 32 + http-caching-experiments/public-html/index.html | 1 + http-caching-experiments/public-html/max-age.lua | 13 + http-caching-experiments/public-html/private.lua | 14 + it-is-cloudy-here/README.md | 17 + .../demo/assets/[email protected] | Bin 0 -> 246636 bytes .../demo/assets/[email protected] | Bin 0 -> 686475 bytes .../demo/assets/style.css | 112 + .../demo/menu/.sling.json | 3 + .../demo/menu/americano/.sling.json | 12 + .../demo/menu/americano/[email protected] | Bin 0 -> 235656 bytes .../demo/menu/americano/[email protected] | Bin 0 -> 623669 bytes .../demo/menu/coffee/.sling.json | 14 + .../demo/menu/coffee/[email protected] | Bin 0 -> 290488 bytes .../demo/menu/coffee/[email protected] | Bin 0 -> 750361 bytes .../demo/menu/latte/.sling.json | 12 + .../demo/menu/latte/[email protected] | Bin 0 -> 172388 bytes .../demo/menu/latte/[email protected] | Bin 0 -> 438392 bytes .../org-apache-sling-mini-demo/.gitignore | 20 + .../org-apache-sling-mini-demo}/CODE_OF_CONDUCT.md | 0 .../org-apache-sling-mini-demo}/CONTRIBUTING.md | 0 .../org-apache-sling-mini-demo/Dockerfile | 21 + .../org-apache-sling-mini-demo}/LICENSE | 0 .../org-apache-sling-mini-demo/README.md | 24 + .../org-apache-sling-mini-demo/docker-compose.yml | 37 + .../dropbox.accesstoken.sample | 1 + .../org-apache-sling-mini-demo/nginx.conf | 32 + .../org-apache-sling-mini-demo/pom.xml | 241 + .../src/main/features/dropbox-storage-config.json | 8 + .../src/main/features/feature.json | 12 + .../1.0.0/content.html | 7 +- .../1.0.0/extends | 1 + .../1.0.0/head.html | 15 +- .../1.0.0/item.html | 9 +- .../1.0.0/content.html | 28 +- .../org.apache.sling.mini.demo.menu/1.0.0/extends | 1 + .../1.0.0/head.html | 7 +- .../1.0.0/head.html | 6 - .../1.0.0/page.html | 20 +- it-is-cloudy-here/org-apache-sling-mini/.gitignore | 19 + .../org-apache-sling-mini}/CODE_OF_CONDUCT.md | 0 .../org-apache-sling-mini}/CONTRIBUTING.md | 0 it-is-cloudy-here/org-apache-sling-mini/Dockerfile | 47 + .../org-apache-sling-mini}/LICENSE | 0 it-is-cloudy-here/org-apache-sling-mini/README.md | 9 + .../org-apache-sling-mini/docker-compose.yml | 30 + it-is-cloudy-here/org-apache-sling-mini/nginx.conf | 32 + it-is-cloudy-here/org-apache-sling-mini/pom.xml | 205 + .../src/main/features/feature.json | 63 + .../src/main/features/jdk-extra.json | 7 + .../src/main/features/webconsole.json | 9 + .../.gitignore | 19 + .../CODE_OF_CONDUCT.md | 0 .../CONTRIBUTING.md | 0 .../LICENSE | 0 .../README.md | 15 + .../pom.xml | 192 + .../src/main/features/feature.json | 15 + .../dropbox/impl/DropboxDirectory.java | 78 + .../resourceprovider/dropbox/impl/DropboxFile.java | 64 + .../dropbox/impl/DropboxResourceReference.java | 101 + .../dropbox/impl/DropboxStorageProvider.java | 290 + .../impl/DropboxStorageProviderConfiguration.java | 71 + .../.gitignore | 19 + .../CODE_OF_CONDUCT.md | 0 .../CONTRIBUTING.md | 0 .../LICENSE | 0 .../README.md | 12 + .../docs/architecture.svg | 1 + .../pom.xml | 265 + .../src/main/features/feature.json | 29 + .../AbstractRemoteResourceReference.java | 51 + .../sling/remote/resourceprovider/Directory.java | 36 + .../apache/sling/remote/resourceprovider/File.java | 48 + .../resourceprovider/RemoteResourceEvent.java | 31 + .../RemoteResourceEventHandler.java | 27 + .../resourceprovider/RemoteResourceEventType.java | 35 + .../resourceprovider/RemoteResourceReference.java | 115 + .../resourceprovider/RemoteStorageProvider.java | 144 + .../resourceprovider/impl/CacheableResource.java | 141 + .../impl/CacheableResourceWrapper.java | 99 + .../impl/InMemoryResourceCache.java | 55 + .../impl/RemoteResourceProvider.java | 466 ++ .../impl/RemoteResourceProviderContext.java | 35 + .../impl/RemoteResourceProviderFactory.java | 186 + ...RemoteResourceProviderFactoryConfiguration.java | 45 + .../impl/paths/RemoveListener.java | 25 + .../impl/paths/ShallowReference.java | 75 + .../impl/paths/ShallowReferenceTree.java | 104 + .../remote/resourceprovider/package-info.java | 22 + .../AuthenticatedRemoteResourceProviderTest.java | 183 + .../impl/RemoteResourceProviderTestBase.java | 99 + .../UnauthenticatedRemoteResourceProviderTest.java | 138 + .../resourceprovider/impl/mocks/MimeTypes.java | 52 + .../impl/mocks/MockRemoteResourceReference.java | 100 + .../impl/mocks/MockRemoteStorageProvider.java | 166 + .../impl/paths/ShallowReferenceTreeTest.java | 144 + .../src/test/resources/content/test-1/.sling.json | 16 + .../src/test/resources/content/test-1/test-1.txt | 1 + it-is-cloudy-here/pom.xml | 57 + .../impl/MarkdownResourceProviderTest.java | 2 +- metrics-prometheus/pom.xml | 72 + .../prometheus/impl/WrapperMetricsServlet.java | 195 + .../impl/WrapperMetricsServletConfiguration.java | 56 +- .../.gitignore | 2 + org.apache.sling.graphql.samples.website/README.md | 4 + osgi-featuremodel/pom.xml | 108 + .../org/osgi/util/features/BuilderFactory.java | 67 + .../org/osgi/util/features/ConflictResolver.java | 29 +- .../main/java/org/osgi/util/features/Feature.java | 98 + .../org/osgi/util/features/FeatureArtifact.java | 21 +- .../org/osgi/util/features/FeatureBuilder.java | 119 + .../java/org/osgi/util/features/FeatureBundle.java | 22 +- .../osgi/util/features/FeatureBundleBuilder.java | 50 + .../osgi/util/features/FeatureConfiguration.java | 32 +- .../util/features/FeatureConfigurationBuilder.java | 51 + .../org/osgi/util/features/FeatureExtension.java | 73 + .../util/features/FeatureExtensionBuilder.java | 78 + .../main/java/org/osgi/util/features/Features.java | 71 + .../src/main/java/org/osgi/util/features/ID.java | 151 + .../java/org/osgi/util/features/MergeContext.java | 59 + .../osgi/util/features/MergeContextBuilder.java | 54 + .../org/osgi/util/features/impl/ArtifactImpl.java | 45 +- .../util/features/impl/BuilderFactoryImpl.java | 59 + .../osgi/util/features/impl/BundleBuilderImpl.java | 93 + .../features/impl/ConfigurationBuilderImpl.java | 124 + .../util/features/impl/ExtensionBuilderImpl.java | 178 + .../util/features/impl/FeatureBuilderImpl.java | 255 + .../util/features/impl/FeatureServiceImpl.java | 328 ++ .../features/impl/MergeContextBuilderImpl.java | 86 + .../util/features/impl/FeatureServiceImplTest.java | 171 + .../src/test/resources/features/test-exfeat1.json | 17 + .../src/test/resources/features/test-exfeat2.json | 9 + .../src/test/resources/features/test-feature.json | 28 + .../src/test/resources/features/test-feature2.json | 18 + osgi-metrics/README.md | 72 + osgi-metrics/collector/bnd.bnd | 2 + osgi-metrics/collector/pom.xml | 157 + .../sling/metrics/osgi/BundleStartDuration.java | 70 +- .../sling/metrics/osgi/ServiceRestartCounter.java | 64 +- .../apache/sling/metrics/osgi/StartupMetrics.java | 101 + .../sling/metrics/osgi/StartupMetricsListener.java | 63 +- .../apache/sling/metrics/osgi/impl/Activator.java | 51 + .../osgi/impl/BundleStartTimeCalculator.java | 112 + .../org/apache/sling/metrics/osgi/impl/Log.java | 64 +- .../osgi/impl/ServiceRestartCountCalculator.java | 239 + .../osgi/impl/ServiceTrackerCustomizerAdapter.java | 58 +- .../metrics/osgi/impl/StartupTimeCalculator.java | 136 + .../apache/sling/metrics/osgi/package-info.java | 43 +- .../apache/sling/metrics/osgi/impl/AbstractIT.java | 125 + .../osgi/impl/BundleStartTimeCalculatorTest.java | 61 + .../metrics/osgi/impl/HealthCheckSmokeIT.java | 61 + .../osgi/impl/ServiceRegistrationsTrackerTest.java | 76 + .../impl/ServiceRestartCountCalculatorTest.java | 191 + .../metrics/osgi/impl/SystemReadySmokeIT.java | 47 + .../impl/WaitForResultsStartupMetricsListener.java | 70 +- osgi-metrics/consumers/bnd.bnd | 1 + osgi-metrics/consumers/pom.xml | 103 + .../impl/dropwizard/DropwizardMetricsListener.java | 85 + .../impl/json/JsonWritingMetricsListener.java | 95 + .../consumers/impl/log/LoggingMetricsListener.java | 92 + .../impl/json/JsonWritingMetricsListenerTest.java | 77 + pom.xml => osgi-metrics/pom.xml | 13 +- pom.xml | 7 + saml-example/pom.xml | 151 + ....jcr.repoinit.RepositoryInitializer-saml.config | 38 + ...ache.felix.jaas.Configuration.factory-SAML2.xml | 31 + ...ling.auth.saml2.impl.SAML2ConfigServiceImpl.xml | 36 + ...e.sling.engine.impl.auth.SlingAuthenticator.xml | 27 + ...erviceUserMapperImpl.amended-saml2-user-mgt.xml | 25 + .../src/main/resources/sling-realm-export.json | 2180 ++++++++ .../LICENSE | 7 +- saml-handler/README.md | 230 + saml-handler/bnd.bnd | 35 + saml-handler/pom.xml | 266 + .../org/apache/sling/auth/saml2/Activator.java | 112 + .../auth/saml2/AuthenticationHandlerSAML2.java | 777 +++ .../saml2/AuthenticationHandlerSAML2Config.java | 117 + .../java/org/apache/sling/auth/saml2/Helpers.java | 103 + .../sling/auth/saml2/SAML2ConfigService.java | 35 +- .../sling/auth/saml2/SAML2RuntimeException.java | 28 +- .../sling/auth/saml2/Saml2UserMgtService.java | 17 +- .../org/apache/sling/auth/saml2/TokenStore.java | 474 ++ .../auth/saml2/impl/SAML2ConfigServiceImpl.java | 169 + .../sling/auth/saml2/impl/Saml2Credentials.java | 57 +- .../auth/saml2/impl/Saml2UserMgtServiceImpl.java | 168 + .../sling/auth/saml2/impl/SimplePrincipal.java | 45 +- .../apache/sling/auth/saml2/sp/JksCredentials.java | 58 + .../sling/auth/saml2/sp/KeyPairCredentials.java | 64 + .../sling/auth/saml2/sp/Saml2LoginModule.java | 142 + .../org/apache/sling/auth/saml2/sp/Saml2User.java | 103 + .../org/apache/sling/auth/saml2/sp/SamlReason.java | 60 + .../apache/sling/auth/saml2/sp/SessionStorage.java | 77 + .../auth/saml2/sp/VerifySignatureCredentials.java | 63 + saml-handler/src/main/resources/Saml2SP.png | Bin 0 -> 169928 bytes .../src/main/resources/getIDPpublicCert.png | Bin 0 -> 437363 bytes .../src/main/resources/importSPPEMCert.png | Bin 0 -> 217337 bytes .../src/main/resources/jaasConfiguration.png | Bin 0 -> 176698 bytes saml-handler/src/main/resources/jettyHttpsP12.png | Bin 0 -> 303852 bytes .../src/main/resources/realm-add-client.png | Bin 0 -> 235226 bytes saml-handler/src/main/resources/realm-add.png | Bin 0 -> 182425 bytes .../src/main/resources/saml2-user-mgt-acls.png | Bin 0 -> 305370 bytes .../src/main/resources/saml2localKeycloak.png | Bin 0 -> 409734 bytes .../src/main/resources/serviceUserMapping.png | Bin 0 -> 194394 bytes saml-handler/src/main/resources/signedInUser.png | Bin 0 -> 484415 bytes .../src/main/resources/user-add-groups.png | Bin 0 -> 248308 bytes saml-handler/src/main/resources/user-create.png | Bin 0 -> 232802 bytes .../src/main/resources/user-set-attribute.png | Bin 0 -> 231325 bytes .../src/main/resources/user-set-password.png | Bin 0 -> 307910 bytes .../src/main/resources/userSignInToIDP.png | Bin 0 -> 372915 bytes .../java/org/apache/sling/auth/saml2/JCETest.java | 43 + sling-feature-converter-maven-plugin/README.md | 37 - sling-feature-converter-maven-plugin/pom.xml | 356 -- .../core/pom.xml | 150 - .../test/cqconverter/SampleRequestModel.java | 53 - .../cpconverter/test/servlet/ByPathServlet.java | 71 - .../test/servlet/ByResourceTypeServlet.java | 77 - .../invoker.properties | 17 - .../pom.xml | 418 -- .../ui.apps/pom.xml | 124 - .../src/main/content/META-INF/vault/filter.xml | 40 - .../src/main/content/META-INF/vault/settings.xml | 17 - .../content/jcr_root/apps/cqconverter/.content.xml | 24 - .../jcr_root/apps/cqconverter/home/.content.xml | 20 - .../jcr_root/apps/cqconverter/home/body.html | 24 - .../jcr_root/apps/cqconverter/home/head.html | 23 - .../jcr_root/apps/cqconverter/install/.content.xml | 23 - .../jcr_root/apps/cqconverter/page/.content.xml | 19 - .../jcr_root/apps/cqconverter/page/body.html | 21 - .../jcr_root/apps/cqconverter/page/footer.html | 19 - .../jcr_root/apps/cqconverter/page/head.html | 23 - .../jcr_root/apps/cqconverter/page/page.html | 35 - .../jcr_root/content/cpconverter/.content.xml | 18 - .../jcr_root/content/cpconverter/home/.content.xml | 20 - .../content/cpconverter/home/welcome/.content.xml | 25 - .../verify.bsh | 93 - .../core/pom.xml | 150 - .../test/cqconverter/SampleRequestModel.java | 53 - .../cpconverter/test/servlet/ByPathServlet.java | 71 - .../test/servlet/ByResourceTypeServlet.java | 77 - .../fm.launcher/pom.xml | 98 - .../invoker.properties | 17 - .../package-with-single-bundle-target-mode/pom.xml | 419 -- .../ui.apps/pom.xml | 108 - .../src/main/content/META-INF/vault/filter.xml | 40 - .../src/main/content/META-INF/vault/settings.xml | 17 - .../content/jcr_root/apps/cqconverter/.content.xml | 24 - .../jcr_root/apps/cqconverter/home/.content.xml | 20 - .../jcr_root/apps/cqconverter/home/body.html | 24 - .../jcr_root/apps/cqconverter/home/head.html | 23 - .../jcr_root/apps/cqconverter/install/.content.xml | 23 - .../jcr_root/apps/cqconverter/page/.content.xml | 19 - .../jcr_root/apps/cqconverter/page/body.html | 21 - .../jcr_root/apps/cqconverter/page/footer.html | 19 - .../jcr_root/apps/cqconverter/page/head.html | 23 - .../jcr_root/apps/cqconverter/page/page.html | 35 - .../jcr_root/content/cpconverter/.content.xml | 18 - .../jcr_root/content/cpconverter/home/.content.xml | 20 - .../content/cpconverter/home/welcome/.content.xml | 25 - .../verify.bsh | 94 - .../core/pom.xml | 150 - .../test/cqconverter/SampleRequestModel.java | 53 - .../cpconverter/test/servlet/ByPathServlet.java | 71 - .../test/servlet/ByResourceTypeServlet.java | 77 - .../invoker.properties | 17 - .../pom.xml | 418 -- .../ui.apps/pom.xml | 129 - .../src/main/content/META-INF/vault/filter.xml | 40 - .../src/main/content/META-INF/vault/settings.xml | 17 - .../content/jcr_root/apps/cqconverter/.content.xml | 24 - .../jcr_root/apps/cqconverter/home/.content.xml | 20 - .../jcr_root/apps/cqconverter/home/body.html | 24 - .../jcr_root/apps/cqconverter/home/head.html | 23 - .../jcr_root/apps/cqconverter/install/.content.xml | 23 - .../jcr_root/apps/cqconverter/page/.content.xml | 19 - .../jcr_root/apps/cqconverter/page/body.html | 21 - .../jcr_root/apps/cqconverter/page/footer.html | 19 - .../jcr_root/apps/cqconverter/page/head.html | 23 - .../jcr_root/apps/cqconverter/page/page.html | 35 - .../jcr_root/content/cpconverter/.content.xml | 18 - .../jcr_root/content/cpconverter/home/.content.xml | 20 - .../content/cpconverter/home/welcome/.content.xml | 25 - .../verify.bsh | 93 - .../cpconverter/maven/mojos/AbstractBaseMojo.java | 45 - .../cpconverter/maven/mojos/ContentPackage.java | 114 - .../cpconverter/maven/mojos/ConvertCPMojo.java | 350 -- .../cpconverter/maven/mojos/ConvertPMMojo.java | 226 - .../maven/mojos/FeatureLauncherMojo.java | 57 - .../src/site/markdown/index.md | 10 - .../src/site/markdown/usage.md.vm | 276 - .../src/site/site.xml | 41 - slingpost/.gitignore | 3 + slingpost/README.md | 36 + slingpost/docs/jsdoc.md | 155 + slingpost/index.js | 296 + slingpost/package-lock.json | 5675 ++++++++++++++++++++ slingpost/package.json | 31 + slingpost/test/index.test.js | 417 ++ slingpost/test/test.json | 1 + slingpost/test/test2.json | 1 + starter-system-info/bnd.bnd | 2 + starter-system-info/pom.xml | 60 + .../apps/sling/starter/hostname/NetInfo.java | 11 +- .../apps/sling/starter/hostname/hostname.html | 20 + .../starter/sidebar-extensions/hostname.json | 3 + time-to-first-request/README.md | 2 +- transformer/README.md | 4 +- ...ationStep.java => TransformationConstants.java} | 13 +- .../sling/transformer/TransformationContext.java | 42 +- .../sling/transformer/TransformationStep.java | 30 +- .../sling/transformer/impl/LinkTransformer.java | 95 - .../sling/transformer/impl/NonceTransformer.java | 55 + .../impl/TransformationContextImpl.java | 25 +- .../transformer/impl/TransformationFilter.java | 27 +- .../impl/TransformationManagerImpl.java | 23 +- .../transformer/impl/TransformationResponse.java | 13 +- .../impl/TransformationStepWrapper.java | 7 +- .../transformer/impl/TransformationWriter.java | 42 +- 356 files changed, 24684 insertions(+), 6241 deletions(-)
