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-whiteboard.git.
from 9b43030 Clarify update handling
add 9f36d1e SLING-7512 Order features based on their dependencies.
new ff7caaf Merge pull request #6 from bosschaert/SLING-7512-2
The 1 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:
featuremodel/feature-analyser/pom.xml | 14 +-
.../apache/sling/feature/analyser/Descriptor.java | 4 +-
.../analyser/impl/BundleDescriptorImpl.java | 4 +-
.../task/impl/CheckRequirementsCapabilities.java | 2 +-
.../scanner/impl/FelixFrameworkScanner.java | 2 +-
.../feature/scanner/impl/RepoInitScanner.java | 9 +-
.../sling/feature/analyser/AnalyserTest.java | 21 +-
featuremodel/feature-applicationbuilder/pom.xml | 13 ++
.../feature/applicationbuilder/impl/Main.java | 19 +-
featuremodel/feature-launcher/pom.xml | 5 +
.../feature/launcher/impl/FeatureProcessor.java | 13 +-
featuremodel/feature-modelconverter/pom.xml | 6 +
.../sling/feature/modelconverter/impl/Main.java | 13 +-
.../{feature-support => feature-resolver}/pom.xml | 46 ++---
.../sling/feature/resolver/FrameworkResolver.java | 224 +++++++++++++++++++++
.../feature/resolver/impl/BundleResourceImpl.java | 191 ++++++++++++++++++
.../feature/resolver/impl/ResolveContextImpl.java | 96 +++++++++
.../feature/resolver/FrameworkResolverTest.java | 100 +++++++++
.../resolver/impl/BundleResourceImplTest.java | 182 +++++++++++++++++
.../resolver/impl/ResolveContextImplTest.java | 129 ++++++++++++
.../src/test/resources/feature1.json | 5 +
.../src/test/resources/feature2.json | 5 +
.../src/test/resources/feature3.json | 5 +
.../apache/sling/feature/support/FeatureUtil.java | 11 +-
.../feature/support/json/FeatureJSONReader.java | 31 +--
.../feature/support/json/FeatureJSONWriter.java | 5 +-
.../feature/support/util/CapabilityMatcher.java | 8 +-
.../sling/feature/support/util/ManifestParser.java | 42 ++--
.../sling/feature/support/util/ManifestUtil.java | 8 +-
.../sling/feature/support/util/PackageInfo.java | 6 +
.../support/json/FeatureJSONReaderTest.java | 4 +-
.../org/apache/sling/feature/support/json/U.java | 4 +-
.../support/util/CapabilityMatcherTest.java | 4 +-
.../feature/AbstractCapabilityRequirement.java | 96 +++++++++
.../java/org/apache/sling/feature/Capability.java | 104 ----------
.../java/org/apache/sling/feature/Feature.java | 11 +-
.../org/apache/sling/feature/OSGiCapability.java | 59 ++++++
.../org/apache/sling/feature/OSGiRequirement.java | 59 ++++++
.../java/org/apache/sling/feature/Requirement.java | 113 -----------
.../sling/feature/process/ApplicationBuilder.java | 14 +-
.../apache/sling/feature/process/BuilderUtil.java | 4 +-
.../sling/feature/process/FeatureResolver.java} | 27 ++-
.../sling/feature/CapabilityRequirementTest.java | 68 +++++++
.../sling/feature/process/FeatureBuilderTest.java | 39 ++--
featuremodel/pom.xml | 1 +
45 files changed, 1443 insertions(+), 383 deletions(-)
copy featuremodel/{feature-support => feature-resolver}/pom.xml (65%)
create mode 100644
featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
create mode 100644
featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/BundleResourceImpl.java
create mode 100644
featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/ResolveContextImpl.java
create mode 100644
featuremodel/feature-resolver/src/test/java/org/apache/sling/feature/resolver/FrameworkResolverTest.java
create mode 100644
featuremodel/feature-resolver/src/test/java/org/apache/sling/feature/resolver/impl/BundleResourceImplTest.java
create mode 100644
featuremodel/feature-resolver/src/test/java/org/apache/sling/feature/resolver/impl/ResolveContextImplTest.java
create mode 100644
featuremodel/feature-resolver/src/test/resources/feature1.json
create mode 100644
featuremodel/feature-resolver/src/test/resources/feature2.json
create mode 100644
featuremodel/feature-resolver/src/test/resources/feature3.json
create mode 100644
featuremodel/feature/src/main/java/org/apache/sling/feature/AbstractCapabilityRequirement.java
delete mode 100644
featuremodel/feature/src/main/java/org/apache/sling/feature/Capability.java
create mode 100644
featuremodel/feature/src/main/java/org/apache/sling/feature/OSGiCapability.java
create mode 100644
featuremodel/feature/src/main/java/org/apache/sling/feature/OSGiRequirement.java
delete mode 100644
featuremodel/feature/src/main/java/org/apache/sling/feature/Requirement.java
copy
featuremodel/{osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/ApplicationProjectInfo.java
=>
feature/src/main/java/org/apache/sling/feature/process/FeatureResolver.java}
(59%)
create mode 100644
featuremodel/feature/src/test/java/org/apache/sling/feature/CapabilityRequirementTest.java
--
To stop receiving notification emails like this one, please contact
[email protected].
