You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2020/04/24 12:09:04 UTC
[sling-org-apache-sling-feature] branch master updated (f5bcd5b ->
01472b5)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature.git.
from f5bcd5b SLING-9362 : Use Apache Felix cm.json for JSON handling
new e9f1dac [Sling Feature Model] Split off IO packages into separate module.
new d3f4270 [Sling Feature Model] Refactor FeatureUtil out of the support module
new a6d66f6 Move version to 0.1.0
new e7a22dc Fix JSON repoinit reader test
new 896fc6e Add some missing Javadoc
new 57c0b71 SLING-7677 - FeatureJSONWriter uses isOptional instead of isRequired
new efcc9d2 SLING-7765 Application creation missing variable declarations
new 00a4689 SLING-7765 Application creation missing variable declarations
new d42f1fa SLING-7784 : Unable to add comments to the removals → bundles section
new c3eed15 SLING-7827 : Remove Application concept from feature model
new ff1bf37 SLING-7841: Add support for basic auth in repo urls.
new 7c9ddbc Use Felix Framework 6.0.1 by default.
new 3610247 Make ArtifactManager AutoCloseable
new 22de053 Change variable handling to not allow variables to be defined twice
new 8924eef Support for null variable values
new ccd691b Fix check type to not fail if class is null and more than a null value is present.
new 524a6c2 Update repoinit reading test to reflect repoinit TEXT support.
new 20c6212 SLING-7829: Change the includes to be include and from a list to a single (optional) field
new 34b9bc9 Merge pull request #3 from apache/issues/SLING-7829
new 6433b37 The runmodes bundle attribute needs to be written out as 'run-modes'
new 725002c SLING-7941 - Use streaming APIs to marshall the Feature to JSON
new 6452212 Remove unuse method
new afe2d4f Create interface for ArtifactManager
new cffefd1 Move file based artifact management into separate package
new e035dfb SLING-7998 - The FeatureJSONReader doesn't report in which file it encountered an error when the location information is available
new da23d5d SLING-8027 - Malformed JSON when serialising "include" elements
new 8538c45 Fix Text Extension Serialization.
new ebc7ce9 Fix Text Extension Serialization.
new 94f5be6 Move all json handling methods into base class
new 00bbb87 Back to dictionary for configurations
new e41908e Make subclassing of JSON IO easier
new b43a293 SLING-8064 : Support marking a feature as final
new b98e5bf Fix up Javadoc
new 2572382 SLING-8032 - Add a MOJO which is able to validate JSON Feature file against the JSON Schema
new 5629329 SLING-8100 : Add complete flag to Feature
new 31ab875 SLING-8109 Replace KeyValueMap with Map<String,String>
new 48700f4 SLING-8112: encoded path to local repository correctly on windows.
new 3240349 SLING-8119 : Improve configuration handling
new c0c7963 All null for variable values.
new 26678ad SLING-8124 : Remove method to get framework id
new f5ffbc3 SLING-8121 Rename feature 'include' to 'prototype'
new 7556d95 SLING-8133 Feature IO doesn't allow for bundles with same ID and different versions.
new c94f316 SLING-8233 Add unit test for reading feature with "complete": true
new 265d223 SLING-8476 : Packages are exported with 0.x
new ee77e76 SLING-8478 : Adding method to match Requirements and Capabilities
new 137953c SLING-8421: Allow artifact providers that work with URLs instead of Files
new 41a76f9 SLING-8421: add getFileFromURL and getJarFileFromURL method to IOUtils.
new 3200836 SLING-8421: add getFileFromURL and getJarFileFromURL method to IOUtils.
new 85be72b Merge pull request #13 from apache/issues/SLING-8421-2
new 7d88073 SLING-8502 : Update to latest Apache Felix Utils
new de9c52d @trivial removed unused imports
new c373f07 SLING-8631 : Introduce state for extensions
new 660925c SLING-8632 : Add a method to get a JSON object from an extension
new 3cc310c SLING-8419 refactor method to serialize OSGi configs as JSON
new 7d942f0 refactor API
new 25bdb54 SLING-8935 support primitive arrays and collection types
new 6f0c085 trivial: remove dead code
new 8df5276 SLING-8419 move JSON configuration serialization code to dedicated package with no dependencies to Sling Feature
new 9a0e345 SLING-9038 - Catch File Not Found Exception and only report it as trace message as it might be resolved later in another try
new fd7817c SLING-9080 : Support ArtifactProvider and FeatureProvider through ArtifactManager
new 2fb45ba SLING-9087 : Support creation of feature archives
new bc52700 SLING-9087 : Support creation of feature archives
new 285dc39 Remove unused imports
new 9b9f6a5 SLING-9087 : Support creation of feature archives
new a93cf20 SLING-9087 : Support creation of feature archives
new 18f402c SLING-9098 : Provide support for directly downloading artifacts through mvn
new a9bb0c7 SLING-9098 : Support creation of feature archives
new e386039 SLING-9087 : Support creation of feature archives. Add unit tests
new 276193c SLING-8676 : Prototype does not allow to remove requirements and capabilities
new ac294c0 SLING-9087 : Support creation of feature archives. Change format of archive to a pure repository archive, make sure to exclude META-INF
new 9d4b864 SLING-9258 : Provide features to consumer when reading feature archive
new 7f055eb SLING-9261 : Do not compress feature archive at all
new 14ee4f1 SLING-9262 : Add prototype feature to feature archive
new cb9b138 SLING-9263 : Allow feature ids and urls in manifest header
new 2dce322 SLING-9362 : Use Apache Felix cm.json for JSON handling
new 7ab1121 SLING-9362 : Use Apache Felix cm.json for JSON handling
new 2f9ae2c SLING-9362 : Use Apache Felix cm.json for JSON handling
new add3a43 SLING-9362 : Use Apache Felix cm.json for JSON handling
new 759e792 SLING-9362 : Use Apache Felix cm.json for JSON handling
new 268b3d0 SLING-9361 : Merge feature and feature.io modules
new 7555086 Merge branch 'master' of ../sling-org-apache-sling-feature-io
new 51eb6a6 SLING-9361 : Merge feature and feature.io modules
new 01472b5 SLING-9361 : Merge feature and feature.io modules
The 83 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 21 +-
.../{Extensions.java => io/CloseShieldWriter.java} | 38 +-
.../apache/sling/feature/io/ConfiguratorUtil.java | 80 +++
.../java/org/apache/sling/feature/io/IOUtils.java | 300 +++++++++
.../sling/feature/io/archive/ArchiveReader.java | 180 ++++++
.../sling/feature/io/archive/ArchiveWriter.java | 191 ++++++
.../{builder => io/archive}/package-info.java | 4 +-
.../feature/io/artifacts/ArtifactHandler.java | 71 ++
.../feature/io/artifacts/ArtifactManager.java | 527 +++++++++++++++
.../io/artifacts/ArtifactManagerConfig.java | 183 ++++++
.../{builder => io/artifacts}/package-info.java | 4 +-
.../feature/io/artifacts/spi/ArtifactProvider.java | 58 ++
.../artifacts/spi/ArtifactProviderContext.java} | 42 +-
.../artifacts/spi}/package-info.java | 4 +-
.../feature/io/json/ConfigurationJSONReader.java | 73 +++
.../feature/io/json/ConfigurationJSONWriter.java | 69 ++
.../sling/feature/io/json/FeatureJSONReader.java | 716 +++++++++++++++++++++
.../sling/feature/io/json/FeatureJSONWriter.java | 415 ++++++++++++
.../sling/feature/io/json/JSONConstants.java | 85 +++
.../sling/feature/io/json/ManifestUtils.java | 518 +++++++++++++++
.../feature/{builder => io/json}/package-info.java | 4 +-
.../sling/feature/{ => io}/package-info.java | 4 +-
.../META-INF/feature/Feature-1.0.0.schema.json | 226 +++++++
.../sling/feature/io/ConfiguratorUtilTest.java | 126 ++++
.../org/apache/sling/feature/io/IOUtilsTest.java | 170 +++++
.../feature/io/archive/ArchiveWriterTest.java | 120 ++++
.../feature/io/artifacts/ArtifactManagerTest.java | 96 +++
.../sling/feature/io/json/ArtifactsExtensions.java | 57 ++
.../feature/io/json/FeatureJSONReaderTest.java | 116 ++++
.../feature/io/json/FeatureJSONWriterTest.java | 135 ++++
.../java/org/apache/sling/feature/io/json/U.java | 73 +++
.../resources/features/artifacts-extension.json | 9 +
src/test/resources/features/complete.json | 4 +
src/test/resources/features/feature-model.json | 123 ++++
src/test/resources/features/final.json | 5 +
src/test/resources/features/repoinit.json | 4 +
src/test/resources/features/repoinit2.json | 7 +
src/test/resources/features/test.json | 92 +++
src/test/resources/features/test2.json | 7 +
src/test/resources/features/test3.json | 7 +
40 files changed, 4913 insertions(+), 51 deletions(-)
copy src/main/java/org/apache/sling/feature/{Extensions.java => io/CloseShieldWriter.java} (56%)
create mode 100644 src/main/java/org/apache/sling/feature/io/ConfiguratorUtil.java
create mode 100644 src/main/java/org/apache/sling/feature/io/IOUtils.java
create mode 100644 src/main/java/org/apache/sling/feature/io/archive/ArchiveReader.java
create mode 100644 src/main/java/org/apache/sling/feature/io/archive/ArchiveWriter.java
copy src/main/java/org/apache/sling/feature/{builder => io/archive}/package-info.java (89%)
create mode 100644 src/main/java/org/apache/sling/feature/io/artifacts/ArtifactHandler.java
create mode 100644 src/main/java/org/apache/sling/feature/io/artifacts/ArtifactManager.java
create mode 100644 src/main/java/org/apache/sling/feature/io/artifacts/ArtifactManagerConfig.java
copy src/main/java/org/apache/sling/feature/{builder => io/artifacts}/package-info.java (89%)
create mode 100644 src/main/java/org/apache/sling/feature/io/artifacts/spi/ArtifactProvider.java
copy src/main/java/org/apache/sling/feature/{Extensions.java => io/artifacts/spi/ArtifactProviderContext.java} (57%)
copy src/main/java/org/apache/sling/feature/{builder => io/artifacts/spi}/package-info.java (89%)
create mode 100644 src/main/java/org/apache/sling/feature/io/json/ConfigurationJSONReader.java
create mode 100644 src/main/java/org/apache/sling/feature/io/json/ConfigurationJSONWriter.java
create mode 100644 src/main/java/org/apache/sling/feature/io/json/FeatureJSONReader.java
create mode 100644 src/main/java/org/apache/sling/feature/io/json/FeatureJSONWriter.java
create mode 100644 src/main/java/org/apache/sling/feature/io/json/JSONConstants.java
create mode 100644 src/main/java/org/apache/sling/feature/io/json/ManifestUtils.java
copy src/main/java/org/apache/sling/feature/{builder => io/json}/package-info.java (89%)
copy src/main/java/org/apache/sling/feature/{ => io}/package-info.java (90%)
create mode 100644 src/main/resources/META-INF/feature/Feature-1.0.0.schema.json
create mode 100644 src/test/java/org/apache/sling/feature/io/ConfiguratorUtilTest.java
create mode 100644 src/test/java/org/apache/sling/feature/io/IOUtilsTest.java
create mode 100644 src/test/java/org/apache/sling/feature/io/archive/ArchiveWriterTest.java
create mode 100644 src/test/java/org/apache/sling/feature/io/artifacts/ArtifactManagerTest.java
create mode 100644 src/test/java/org/apache/sling/feature/io/json/ArtifactsExtensions.java
create mode 100644 src/test/java/org/apache/sling/feature/io/json/FeatureJSONReaderTest.java
create mode 100644 src/test/java/org/apache/sling/feature/io/json/FeatureJSONWriterTest.java
create mode 100644 src/test/java/org/apache/sling/feature/io/json/U.java
create mode 100644 src/test/resources/features/artifacts-extension.json
create mode 100644 src/test/resources/features/complete.json
create mode 100644 src/test/resources/features/feature-model.json
create mode 100644 src/test/resources/features/final.json
create mode 100644 src/test/resources/features/repoinit.json
create mode 100644 src/test/resources/features/repoinit2.json
create mode 100644 src/test/resources/features/test.json
create mode 100644 src/test/resources/features/test2.json
create mode 100644 src/test/resources/features/test3.json