You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2019/06/27 02:11:31 UTC
[sling-whiteboard] 01/02: Merge branch 'master' into
feature/sling-cpconverter-maven-plugin
This is an automated email from the ASF dual-hosted git repository.
andysch pushed a commit to branch feature/sling-cpconverter-maven-plugin
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 1f67335417d73477e49bceb440376b8cb98de22c
Merge: f0b3e0b 7e8182c
Author: Andreas Schaefer <sc...@iMac.local>
AuthorDate: Tue Jun 25 14:25:13 2019 -0700
Merge branch 'master' into feature/sling-cpconverter-maven-plugin
content-package-2-feature-model/LICENSE | 201 ----------
content-package-2-feature-model/README.md | 396 -------------------
content-package-2-feature-model/pom.xml | 322 ---------------
.../src/main/assembly/README.md | 149 -------
.../src/main/assembly/bin.xml | 71 ----
.../ContentPackage2FeatureModelConverter.java | 431 ---------------------
.../cpconverter/DefaultBundlesDeployer.java | 99 -----
.../cpconverter/RegexBasedResourceFilter.java | 54 ---
...ntentPackage2FeatureModelConverterLauncher.java | 186 ---------
.../feature/cpconverter/cli/ShutDownHook.java | 81 ----
.../AbstractConfigurationEntryHandler.java | 68 ----
.../handlers/AbstractRegexEntryHandler.java | 44 ---
.../cpconverter/handlers/BundleEntryHandler.java | 136 -------
.../handlers/ConfigurationEntryHandler.java | 36 --
.../handlers/ContentPackageEntryHandler.java | 49 ---
.../handlers/JsonConfigurationEntryHandler.java | 75 ----
.../PropertiesConfigurationEntryHandler.java | 60 ---
.../handlers/XmlConfigurationEntryHandler.java | 92 -----
.../feature/cpconverter/handlers/package-info.java | 23 --
.../feature/cpconverter/spi/ArtifactWriter.java | 26 --
.../feature/cpconverter/spi/package-info.java | 21 -
.../cpconverter/vltpkg/VaultPackageAssembler.java | 172 --------
.../feature/cpconverter/vltpkg/package-info.java | 21 -
.../cpconverter/writers/FileArtifactWriter.java | 42 --
.../writers/InputStreamArtifactWriter.java | 39 --
.../writers/MavenPomSupplierWriter.java | 54 ---
.../feature/cpconverter/writers/package-info.java | 21 -
.../src/main/legal/LICENSE-with-deps | 233 -----------
.../src/main/legal/NOTICE-with-deps | 5 -
.../src/main/legal/license-header | 14 -
...ache.sling.feature.cpconverter.spi.EntryHandler | 6 -
.../sling/feature/cpconverter/vltpkg/config.xml | 95 -----
.../cpconverter/vltpkg/definition/.content.xml | 19 -
.../sling/feature/cpconverter/vltpkg/settings.xml | 22 --
.../ContentPackage2FeatureModelConverterTest.java | 235 -----------
.../cpconverter/DefaultBundlesDeployerTest.java | 80 ----
.../cpconverter/RegexBasedResourceFilterTest.java | 69 ----
.../handlers/BundleEntryHandlerTest.java | 118 ------
.../handlers/ConfigurationEntryHandlerTest.java | 127 ------
.../JsonConfigurationEntryHandlerTest.java | 46 ---
.../vltpkg/VaultPackageAssemblerTest.java | 89 -----
.../cpconverter/handlers/jcr_root/.content.xml | 22 --
...ceusermapping.impl.ServiceUserMapperImpl.config | 17 -
...ceusermapping.impl.ServiceUserMapperImpl.config | 17 -
...ing.impl.ServiceUserMapperImpl.INVALID.cfg.json | 1 -
...rviceusermapping.impl.ServiceUserMapperImpl.cfg | 17 -
...usermapping.impl.ServiceUserMapperImpl.cfg.json | 7 -
...ceusermapping.impl.ServiceUserMapperImpl.config | 17 -
...sermapping.impl.ServiceUserMapperImpl.empty.cfg | 14 -
...pping.impl.ServiceUserMapperImpl.empty.cfg.json | 3 -
...mapping.impl.ServiceUserMapperImpl.empty.config | 14 -
...sermapping.impl.ServiceUserMapperImpl.empty.xml | 19 -
...apping.impl.ServiceUserMapperImpl.empty.xml.cfg | 19 -
...rviceusermapping.impl.ServiceUserMapperImpl.xml | 21 -
...eusermapping.impl.ServiceUserMapperImpl.xml.cfg | 22 --
.../apps/asd/install.author/test-framework.jar | Bin 13288 -> 0 bytes
.../apps/asd/install.publish/test-framework.jar | Bin 13288 -> 0 bytes
.../apps/asd/install/test-framework-no-pom.jar | Bin 10769 -> 0 bytes
.../jcr_root/apps/asd/install/test-framework.jar | Bin 13288 -> 0 bytes
.../cpconverter/handlers/jcr_root/asd/.content.xml | 20 -
.../handlers/jcr_root/asd/public/.content.xml | 19 -
.../handlers/jcr_root/asd/public/_rep_policy.xml | 24 --
.../handlers/jcr_root/asd/public/license.txt | 14 -
.../test-content-package-unacceptable.zip | Bin 15017 -> 0 bytes
.../feature/cpconverter/test-content-package.zip | Bin 46393 -> 0 bytes
feature-api-regions/README.md | 164 --------
.../sling/feature/apiregions/model/ApiRegion.java | 280 -------------
.../sling/feature/apiregions/model/ApiRegions.java | 85 ----
.../feature/apiregions/model/JoinedIterator.java | 54 ---
.../model/io/json/ApiRegionsJSONParser.java | 160 --------
.../model/io/json/ApiRegionsJSONSerializer.java | 115 ------
.../apiregions/model/io/json/package-info.java | 21 -
.../feature/apiregions/model/package-info.java | 21 -
.../feature/apiregions/model/ApiRegionTest.java | 158 --------
.../feature/apiregions/model/ApiRegionsTest.java | 113 ------
.../model/io/json/ApiRegionsJSONParserTest.java | 100 -----
.../io/json/ApiRegionsJSONSerializerTest.java | 125 ------
feature-diff/README.md | 149 ++-----
feature-diff/pom.xml | 44 ++-
.../diff/AbstractFeatureElementComparator.java | 61 ---
.../sling/feature/diff/ArtifactsComparator.java | 57 ---
.../feature/diff/ComplexElementComparator.java | 24 --
.../feature/diff/ConfigurationsComparator.java | 77 ----
.../org/apache/sling/feature/diff/DiffRequest.java | 72 ++++
.../org/apache/sling/feature/diff/DiffSection.java | 106 -----
.../sling/feature/diff/ElementComparator.java | 23 --
.../sling/feature/diff/ExtensionsComparator.java | 142 -------
.../org/apache/sling/feature/diff/FeatureDiff.java | 83 ++--
.../sling/feature/diff/GenericMapComparator.java | 62 ---
.../sling/feature/diff/RequirementsComparator.java | 54 ---
.../org/apache/sling/feature/diff/UpdatedItem.java | 74 ----
.../impl/AbstractFeatureElementComparator.java | 26 +-
.../sling/feature/diff/impl/BundlesComparator.java | 61 +++
.../diff/impl/ConfigurationsComparator.java | 195 ++++++++++
.../feature/diff/impl/ExtensionsComparator.java | 145 +++++++
.../diff/impl/FeatureElementComparator.java | 26 +-
.../diff/impl/FrameworkPropertiesComparator.java | 63 +++
.../diff/io/json/FeatureDiffJSONSerializer.java | 142 -------
.../sling/feature/diff/io/json/package-info.java | 21 -
.../apache/sling/feature/diff/package-info.java | 3 +-
.../feature/diff/ApiRegionsComparatorTest.java | 112 ------
.../apache/sling/feature/diff/DiffSectionTest.java | 98 -----
.../apache/sling/feature/diff/FeatureDiffTest.java | 87 ++---
.../apache/sling/feature/diff/UpdatedItemTest.java | 42 --
.../feature/diff/impl/AbstractComparatorTest.java | 33 +-
.../BundlesComparatorTest.java} | 58 +--
.../{ => impl}/ConfigurationsComparatorTest.java | 55 ++-
.../diff/impl/ExtensionsComparatorTest.java | 133 +++++++
.../FrameworkPropertiesComparatorTest.java} | 51 +--
.../io/json/FeatureDiffJSONSerializerTest.java | 126 ------
.../sling/feature/diff/io/json/expectedDiff.json | 81 ----
pom.xml | 1 -
.../CODE_OF_CONDUCT.md | 0
.../CONTRIBUTING.md | 0
{feature-api-regions => runtime2feature}/LICENSE | 0
runtime2feature/README.md | 66 ++++
{feature-api-regions => runtime2feature}/pom.xml | 72 +++-
.../r2f/RuntimeEnvironment2FeatureModel.java | 14 +-
.../r2f/impl/AbstractFeatureElementConsumer.java | 20 +-
.../feature/r2f/impl/Bundle2ArtifactMapper.java | 127 ++++++
...GiConfiguration2FeatureConfigurationMapper.java | 55 +++
.../RuntimeEnvironment2FeatureModelService.java | 181 +++++++++
.../apache/sling/feature/r2f}/package-info.java | 6 +-
url-connection-agent/README.md | 49 ---
url-connection-agent/pom.xml | 143 -------
.../main/java/org/apache/sling/uca/impl/Agent.java | 54 ---
.../uca/impl/HttpClient3TimeoutTransformer.java | 74 ----
.../uca/impl/HttpClient4TimeoutTransformer.java | 37 --
.../sling/uca/impl/JavaNetTimeoutTransformer.java | 90 -----
.../main/java/org/apache/sling/uca/impl/Log.java | 113 ------
.../sling/uca/impl/OkHttpTimeoutTransformer.java | 36 --
...pdateFieldsInConstructorTimeoutTransformer.java | 76 ----
.../java/org/apache/sling/uca/impl/AgentIT.java | 245 ------------
.../apache/sling/uca/impl/HttpClientLauncher.java | 171 --------
.../uca/impl/JaveNetTimeoutTransformerTest.java | 51 ---
.../sling/uca/impl/MisbehavingServerControl.java | 31 --
.../sling/uca/impl/MisbehavingServerExtension.java | 116 ------
.../src/test/resources/simplelogger.properties | 20 -
138 files changed, 1438 insertions(+), 8806 deletions(-)