This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git

commit f3900a2a8fe0326bdbc439b33374daf4d016f2e1
Merge: d3ffce9 0a1dd11
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Mar 7 10:09:07 2018 +0100

    Merge pull request #9 from bosschaert/SLING-7521-2
    
    SLING-7521 Order bundles in the generated app based on feature order and 
start order

 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 +-
 .../src/test/resources/feature4.json               |   5 +
 .../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  |  50 +++++
 .../sling/feature/process/ApplicationBuilder.java  |  43 +++--
 .../sling/feature/process/FeatureResolver.java     |  13 +-
 29 files changed, 1123 insertions(+), 353 deletions(-)

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

Reply via email to