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 d3ffce9  Merge pull request #8 from bosschaert/multilineTests
     add 0a1dd11  SLING-7521 Order bundles in the generated app based on 
feature order and start order
     new f3900a2  Merge pull request #9 from bosschaert/SLING-7521-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/example/sling/oak.json                |  16 +-
 featuremodel/example/sling/sling.json              | 206 ++++++++++-----------
 .../sling/feature/analyser/AnalyserTest.java       |  33 +++-
 .../feature/analyser/TestBundleResourceImpl.java}  |  96 +++++++---
 .../src/test/resources/feature_complete.json       |  38 ++--
 .../src/test/resources/feature_incomplete.json     |  38 ++--
 featuremodel/feature-applicationbuilder/pom.xml    |  31 +++-
 .../impl/ApplicationBuilderTest.java               | 144 ++++++++++++++
 .../src/test/resources/featureA.json               |   5 +
 .../src/test/resources/featureB.json               |  14 ++
 .../src/test/resources/featureC.json               |  18 ++
 .../src/test/resources/featureD.json               |   5 +
 featuremodel/feature-resolver/pom.xml              |  18 ++
 .../sling/feature/resolver/FrameworkResolver.java  | 164 ++++++++++------
 .../resolver/impl/AbstractResourceImpl.java        |  50 +++++
 .../feature/resolver/impl/BundleResourceImpl.java  | 129 +++++++++----
 .../feature/resolver/impl/FeatureResourceImpl.java | 153 +++++++++++++++
 .../feature/resolver/impl/ResolveContextImpl.java  |  16 +-
 .../feature/resolver/FrameworkResolverTest.java    |  85 +++++++--
 .../resolver/impl/BundleResourceImplTest.java      |  43 +++--
 .../resolver/impl/ResolveContextImplTest.java      |  18 +-
 .../src/test/resources/feature3.json               |  12 +-
 .../resources/{feature1.json => feature4.json}     |   2 +-
 .../src/test/resources/feature5.json               |  13 ++
 .../src/test/resources/feature6.json               |  12 ++
 .../src/test/resources/features/test.json          |   8 +-
 .../org/apache/sling/feature/FeatureResource.java} |  32 ++--
 .../sling/feature/process/ApplicationBuilder.java  |  43 +++--
 .../sling/feature/process/FeatureResolver.java     |  13 +-
 29 files changed, 1087 insertions(+), 368 deletions(-)
 copy 
featuremodel/{feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/BundleResourceImpl.java
 => 
feature-analyser/src/test/java/org/apache/sling/feature/analyser/TestBundleResourceImpl.java}
 (77%)
 create mode 100644 
featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java
 create mode 100644 
featuremodel/feature-applicationbuilder/src/test/resources/featureA.json
 create mode 100644 
featuremodel/feature-applicationbuilder/src/test/resources/featureB.json
 create mode 100644 
featuremodel/feature-applicationbuilder/src/test/resources/featureC.json
 create mode 100644 
featuremodel/feature-applicationbuilder/src/test/resources/featureD.json
 create mode 100644 
featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/AbstractResourceImpl.java
 create mode 100644 
featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/impl/FeatureResourceImpl.java
 copy featuremodel/feature-resolver/src/test/resources/{feature1.json => 
feature4.json} (59%)
 create mode 100644 
featuremodel/feature-resolver/src/test/resources/feature5.json
 create mode 100644 
featuremodel/feature-resolver/src/test/resources/feature6.json
 copy 
featuremodel/{feature-support/src/main/java/org/apache/sling/feature/support/spi/ArtifactProviderContext.java
 => feature/src/main/java/org/apache/sling/feature/FeatureResource.java} (52%)

-- 
To stop receiving notification emails like this one, please contact
cziege...@apache.org.

Reply via email to