You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/12/02 17:11:04 UTC
[2/2] karaf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/karaf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e2014e0a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e2014e0a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e2014e0a
Branch: refs/heads/master
Commit: e2014e0a144d78931f0651f1b77da9cd97bcfeba
Parents: 01d621f f9279d9
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Dec 2 17:10:55 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Dec 2 17:10:55 2015 +0100
----------------------------------------------------------------------
.../features/FeatureDeploymentListener.java | 9 +-
.../java/org/apache/karaf/features/Feature.java | 4 +
.../karaf/features/FeaturesNamespaces.java | 6 +-
.../org/apache/karaf/features/Repository.java | 2 +
.../karaf/features/internal/model/Feature.java | 25 ++
.../karaf/features/internal/model/Features.java | 37 ++-
.../karaf/features/internal/model/JaxbUtil.java | 5 +-
.../internal/region/RepositoryManager.java | 52 +++
.../features/internal/region/Subsystem.java | 39 ++-
.../region/SubsystemResolveContext.java | 11 +-
.../internal/region/SubsystemResolver.java | 4 +-
.../internal/repository/StaxParser.java | 47 ++-
.../features/internal/repository/UrlLoader.java | 4 +
.../internal/repository/XmlRepository.java | 3 +-
.../internal/resolver/ResourceUtils.java | 35 +-
.../features/internal/service/Deployer.java | 3 +-
.../internal/service/RepositoryImpl.java | 11 +
.../karaf/features/karaf-features-1.4.0.xsd | 328 +++++++++++++++++++
.../features/internal/region/SubsystemTest.java | 24 ++
.../karaf/features/internal/region/data7/a.mf | 6 +
.../karaf/features/internal/region/data7/b.mf | 6 +
.../features/internal/region/data7/features.xml | 31 ++
.../internal/region/data7/resources.xml | 32 ++
.../webconsole/features/ExtendedFeature.java | 11 +-
24 files changed, 662 insertions(+), 73 deletions(-)
----------------------------------------------------------------------