This is an automated email from the ASF dual-hosted git repository. ggrzybek pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 36c4541f4627c82503256ec267abb78c13c8d72f Merge: 674a7b5 e2a74b5 Author: Grzegorz Grzybek <[email protected]> AuthorDate: Mon Dec 11 17:50:23 2017 +0100 Merge pull request #427 from grgrzybek/KARAF-5376 Karaf 5376 .../resources/etc/org.apache.karaf.features.cfg | 9 + demos/profiles/dynamic/pom.xml | 6 +- demos/profiles/static/pom.xml | 6 +- .../karaf/features/command/InfoFeatureCommand.java | 3 + .../features/command/ListFeaturesCommand.java | 17 +- .../features/command/RefreshFeaturesCommand.java | 52 + .../karaf/features/command/RepoAddCommand.java | 4 + .../karaf/features/command/RepoListCommand.java | 23 +- .../completers/AvailableFeatureCompleter.java | 2 +- .../features/command/ListFeaturesCommandTest.java | 2 + features/core/pom.xml | 19 +- .../org/apache/karaf/features/Blacklisting.java | 34 + .../java/org/apache/karaf/features/BundleInfo.java | 25 +- .../java/org/apache/karaf/features/Feature.java | 2 +- .../org/apache/karaf/features/FeaturePattern.java | 126 +++ .../org/apache/karaf/features/FeaturesService.java | 68 +- .../java/org/apache/karaf/features/Library.java | 10 + .../org/apache/karaf/features/LocationPattern.java | 216 ++++ .../java/org/apache/karaf/features/Repository.java | 43 +- .../karaf/features/internal/model/Bundle.java | 36 +- .../karaf/features/internal/model/Conditional.java | 2 + .../karaf/features/internal/model/Feature.java | 12 + .../karaf/features/internal/model/Features.java | 16 +- .../model/processing/BundleReplacements.java | 101 ++ .../model/processing/FeatureReplacements.java | 81 ++ .../model/processing/FeaturesProcessing.java | 324 ++++++ .../internal/model/processing/ObjectFactory.java | 30 + .../model/processing/OverrideBundleDependency.java | 111 ++ .../internal/model/processing/package-info.java | 36 + .../karaf/features/internal/osgi/Activator.java | 15 +- .../karaf/features/internal/region/Subsystem.java | 284 ++++- .../internal/region/SubsystemResolveContext.java | 12 +- .../internal/region/SubsystemResolver.java | 98 +- .../internal/region/SubsystemResolverCallback.java | 34 + .../region/SubsystemResolverResolution.java | 82 ++ .../internal/region/SubsystemResolverResult.java | 78 ++ .../internal/resolver/FeatureResource.java | 32 +- .../features/internal/resolver/ResolverUtil.java | 5 + .../features/internal/resolver/ResourceUtils.java | 11 + .../karaf/features/internal/service/Blacklist.java | 249 +++-- .../internal/service/BundleInstallSupport.java | 13 +- .../internal/service/BundleInstallSupportImpl.java | 6 +- .../karaf/features/internal/service/Deployer.java | 282 +++-- .../features/internal/service/FeatureReq.java | 16 +- .../service/FeaturesProcessingSerializer.java | 322 ++++++ .../internal/service/FeaturesProcessor.java | 49 + .../internal/service/FeaturesProcessorImpl.java | 287 +++++ .../internal/service/FeaturesServiceConfig.java | 61 +- .../internal/service/FeaturesServiceImpl.java | 64 +- .../karaf/features/internal/service/Overrides.java | 37 +- .../features/internal/service/RepositoryCache.java | 147 ++- ...positoryCache.java => RepositoryCacheImpl.java} | 43 +- .../features/internal/service/RepositoryImpl.java | 50 +- .../karaf/features/internal/service/State.java | 23 +- .../karaf/features/internal/util/MapUtils.java | 29 + .../service/feature-processing-comments.properties | 27 + .../features/karaf-features-processing-1.0.0.xsd | 232 ++++ .../internal/region/FeaturesDependenciesTest.java | 13 +- .../features/internal/region/SubsystemTest.java | 174 ++- .../features/internal/service/BlacklistTest.java | 49 +- .../features/internal/service/DeployerTest.java | 48 +- .../internal/service/FeaturePatternTest.java | 73 ++ .../internal/service/FeaturesProcessorTest.java | 288 +++++ .../internal/service/FeaturesValidationTest.java | 2 +- .../internal/service/LocationPatternTest.java | 163 +++ .../features/internal/service/OverridesTest.java | 4 +- .../internal/service/RepositoryCacheTest.java | 70 ++ .../features/internal/service/urn/Handler.java | 35 + features/core/src/test/resources/log4j.properties | 35 + .../karaf/features/internal/region/data1/d.mf | 6 + .../karaf/features/internal/region/data10/a.mf | 5 + .../karaf/features/internal/region/data10/b.mf | 5 + .../features/internal/region/data10/features.xml | 26 + .../karaf/features/internal/region/data3/c.mf | 5 + ...verrides.properties => blacklisted2.properties} | 9 +- .../karaf/features/internal/service/fp01.xml | 26 + .../karaf/features/internal/service/fp02.xml | 28 + .../karaf/features/internal/service/fp03.xml | 34 + .../karaf/features/internal/service/fp04.xml | 32 + .../karaf/features/internal/service/fpi01.xml | 41 + .../karaf/features/internal/service/fpi02.xml | 29 + .../karaf/features/internal/service/fpi03.xml | 30 + .../karaf/features/internal/service/fpi04.xml | 31 + .../karaf/features/internal/service/fpi05.xml | 28 + .../internal/service/org.apache.karaf.features.xml | 98 ++ .../features/internal/service/overrides.properties | 4 +- .../internal/service/overrides2.properties | 37 + .../resources/org/apache/karaf/features/r1.xml | 20 + pom.xml | 16 + profile/pom.xml | 17 +- .../java/org/apache/karaf/profile/Profile.java | 150 ++- .../org/apache/karaf/profile/ProfileBuilder.java | 12 + .../org/apache/karaf/profile/ProfileConstants.java | 153 +++ .../karaf/profile/assembly/ArtifactInstaller.java | 51 +- .../profile/assembly/AssemblyDeployCallback.java | 59 +- .../org/apache/karaf/profile/assembly/Builder.java | 1125 +++++++++++++++----- .../karaf/profile/assembly/ConfigInstaller.java | 8 +- .../karaf/profile/assembly/FeatureSelector.java | 58 +- .../karaf/profile/command/ProfileDisplay.java | 14 +- .../apache/karaf/profile/command/ProfileEdit.java | 28 +- .../karaf/profile/impl/ProfileBuilderImpl.java | 351 ++++-- .../org/apache/karaf/profile/impl/ProfileImpl.java | 103 +- .../org/apache/karaf/profile/impl/Profiles.java | 99 +- .../apache/karaf/profile/impl/ProfilesTest.java | 148 ++- .../apache/karaf/profile/impl/PropertiesTest.java | 41 + profile/src/test/resources/log4j.properties | 26 + tooling/karaf-maven-plugin/pom.xml | 4 - .../org/apache/karaf/tooling/AssemblyMojo.java | 685 +++++++----- .../java/org/apache/karaf/tooling/VerifyMojo.java | 96 +- .../org/apache/karaf/tooling/utils/MavenUtil.java | 32 +- .../java/org/apache/karaf/util/maven/Parser.java | 66 ++ .../karaf/util/xml/IndentingXMLEventWriter.java | 144 +++ .../java/org/apache/karaf/util/ParserTest.java | 37 +- .../karaf/webconsole/features/ExtendedFeature.java | 6 + 114 files changed, 7690 insertions(+), 1291 deletions(-) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
