This is an automated email from the ASF dual-hosted git repository.
ggrzybek pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git.
from 674a7b5 [KARAF-5478] Provide org.apache.karaf.util.Version class
add 7e8394f [KARAF-5468] Cleaning up AssemblyMojo, Profiles and profile
Builder
add 21ba70b [KARAF-5468] Add comments to generated
target/assembly/etc/profile.cfg
add b23d6ce [KARAF-5376] Moving overrides and blacklist mechanisms to
"features processor" service
add a8fb5b5 [KARAF-5376] Include new Features JAXB model info in
feature:* commands
add ecc3488 [KARAF-5376] Polish LocationPattern and FeaturePattern
helpers for blacklist/override matching
add 0e0b980 [KARAF-5376] Using "features processor" in profile builder
(overrides, blacklist)
add b9d3504 [KARAF-5376] Generate/merge features processor configuration
from external and Maven config, improve logging in karaf-maven-plugin:assembly
add 3f2f99a [KARAF-5468] Adjust JavaVersion enum:
supportsEndorsedAndExtLibraries()
add 8e86dfd [KARAF-5376] Integrate features processor with Deployer and
SubsystemResolver
add 5b3f2af [KARAF-5376] Use etc/versions.properties (configurable) to
resolve placeholders in etc/org.apache.karaf.features.xml
add af50317 [KARAF-5339] Add blacklisted.[repository|feature|bundle].xx
properties support to profiles
add 367441a [KARAF-5273] Allow to use feature identifiers in
karaf-maven-plugin:assembly config, profiles and profile builder
add 2b6fe8f [KARAF-5376] Implement feature overriding and dependency flag
overriding
add e2a74b5 [KARAF-5376] Provide feature:refresh command that re-reads
all feature XMLs and feature processing XML
new 36c4541 Merge pull request #427 from grgrzybek/KARAF-5376
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:
.../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 +-
...ureCommand.java => RefreshFeaturesCommand.java} | 36 +-
.../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 | 16 +-
.../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 | 13 +-
.../model/processing/OverrideBundleDependency.java | 111 ++
.../package-info.java} | 48 +-
.../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 | 16 +-
.../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 | 34 +-
.../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 | 21 +-
.../core/src/test/resources/log4j.properties | 3 +-
.../internal/region/{data7/a.mf => data1/d.mf} | 2 +-
.../internal/region/{data6 => data10}/a.mf | 0
.../internal/region/{data6 => data10}/b.mf | 0
.../internal/region/{data3 => data10}/features.xml | 3 +-
.../features/internal/region/data3/{b.mf => c.mf} | 2 +-
.../{blacklist.txt => blacklisted2.properties} | 5 +
.../karaf/features/internal/service/fp01.xml | 52 +-
.../karaf/features/internal/service/fp02.xml | 54 +-
.../karaf/features/internal/service/fp03.xml | 60 +-
.../karaf/features/internal/service/fp04.xml | 58 +-
.../karaf/features/internal/service/fpi01.xml | 41 +
.../karaf/features/internal/service/fpi02.xml | 55 +-
.../karaf/features/internal/service/fpi03.xml | 56 +-
.../karaf/features/internal/service/fpi04.xml | 57 +-
.../karaf/features/internal/service/fpi05.xml | 54 +-
.../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 | 4 +-
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 | 21 +-
.../src/test/resources/log4j.properties | 13 +-
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, 7359 insertions(+), 1619 deletions(-)
copy
features/command/src/main/java/org/apache/karaf/features/command/{UninstallFeatureCommand.java
=> RefreshFeaturesCommand.java} (55%)
copy
shell/core/src/main/java/org/apache/karaf/shell/api/console/SignalListener.java
=> features/core/src/main/java/org/apache/karaf/features/Blacklisting.java (68%)
create mode 100644
features/core/src/main/java/org/apache/karaf/features/FeaturePattern.java
create mode 100644
features/core/src/main/java/org/apache/karaf/features/LocationPattern.java
create mode 100644
features/core/src/main/java/org/apache/karaf/features/internal/model/processing/BundleReplacements.java
create mode 100644
features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeatureReplacements.java
create mode 100644
features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeaturesProcessing.java
copy
tooling/karaf-maven-plugin/src/it/test-aggregate-features/aggregate-recursive-module-c/src/main/java/test/C.java
=>
features/core/src/main/java/org/apache/karaf/features/internal/model/processing/ObjectFactory.java
(76%)
create mode 100644
features/core/src/main/java/org/apache/karaf/features/internal/model/processing/OverrideBundleDependency.java
copy
features/core/src/main/java/org/apache/karaf/features/internal/model/{ScopeFilter.java
=> processing/package-info.java} (54%)
copy
shell/core/src/main/java/org/apache/karaf/shell/api/console/SignalListener.java
=>
features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolverCallback.java
(69%)
create mode 100644
features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolverResolution.java
create mode 100644
features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolverResult.java
create mode 100644
features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesProcessingSerializer.java
copy shell/console/src/main/java/org/apache/karaf/shell/console/SubShell.java
=>
features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesProcessor.java
(54%)
create mode 100644
features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesProcessorImpl.java
copy
features/core/src/main/java/org/apache/karaf/features/internal/service/{RepositoryCache.java
=> RepositoryCacheImpl.java} (70%)
create mode 100644
features/core/src/main/resources/org/apache/karaf/features/internal/service/feature-processing-comments.properties
create mode 100644
features/core/src/main/resources/org/apache/karaf/features/karaf-features-processing-1.0.0.xsd
create mode 100644
features/core/src/test/java/org/apache/karaf/features/internal/service/FeaturePatternTest.java
create mode 100644
features/core/src/test/java/org/apache/karaf/features/internal/service/FeaturesProcessorTest.java
create mode 100644
features/core/src/test/java/org/apache/karaf/features/internal/service/LocationPatternTest.java
create mode 100644
features/core/src/test/java/org/apache/karaf/features/internal/service/RepositoryCacheTest.java
copy
shell/core/src/test/java/org/apache/karaf/shell/support/ansi/AnsiSplitterTest.java
=>
features/core/src/test/java/org/apache/karaf/features/internal/service/urn/Handler.java
(65%)
copy {maven => features}/core/src/test/resources/log4j.properties (90%)
copy
features/core/src/test/resources/org/apache/karaf/features/internal/region/{data7/a.mf
=> data1/d.mf} (82%)
copy
features/core/src/test/resources/org/apache/karaf/features/internal/region/{data6
=> data10}/a.mf (100%)
copy
features/core/src/test/resources/org/apache/karaf/features/internal/region/{data6
=> data10}/b.mf (100%)
copy
features/core/src/test/resources/org/apache/karaf/features/internal/region/{data3
=> data10}/features.xml (96%)
copy
features/core/src/test/resources/org/apache/karaf/features/internal/region/data3/{b.mf
=> c.mf} (71%)
copy
features/core/src/test/resources/org/apache/karaf/features/internal/service/{blacklist.txt
=> blacklisted2.properties} (88%)
copy demos/deployer/kar/src/main/feature/feature.xml =>
features/core/src/test/resources/org/apache/karaf/features/internal/service/fp01.xml
(65%)
copy demos/deployer/kar/src/main/feature/feature.xml =>
features/core/src/test/resources/org/apache/karaf/features/internal/service/fp02.xml
(72%)
copy demos/deployer/kar/src/main/feature/feature.xml =>
features/core/src/test/resources/org/apache/karaf/features/internal/service/fp03.xml
(57%)
copy demos/deployer/kar/src/main/feature/feature.xml =>
features/core/src/test/resources/org/apache/karaf/features/internal/service/fp04.xml
(63%)
create mode 100644
features/core/src/test/resources/org/apache/karaf/features/internal/service/fpi01.xml
copy demos/deployer/kar/src/main/feature/feature.xml =>
features/core/src/test/resources/org/apache/karaf/features/internal/service/fpi02.xml
(61%)
copy demos/deployer/kar/src/main/feature/feature.xml =>
features/core/src/test/resources/org/apache/karaf/features/internal/service/fpi03.xml
(64%)
copy demos/deployer/kar/src/main/feature/feature.xml =>
features/core/src/test/resources/org/apache/karaf/features/internal/service/fpi04.xml
(63%)
copy demos/deployer/kar/src/main/feature/feature.xml =>
features/core/src/test/resources/org/apache/karaf/features/internal/service/fpi05.xml
(65%)
create mode 100644
features/core/src/test/resources/org/apache/karaf/features/internal/service/org.apache.karaf.features.xml
create mode 100644
features/core/src/test/resources/org/apache/karaf/features/internal/service/overrides2.properties
copy profile/src/test/resources/repo/foo/baz/1.0/baz-1.0-features.xml =>
features/core/src/test/resources/org/apache/karaf/features/r1.xml (86%)
create mode 100644
profile/src/main/java/org/apache/karaf/profile/ProfileConstants.java
copy
shell/core/src/test/java/org/apache/karaf/shell/support/ansi/AnsiSplitterTest.java
=> profile/src/test/java/org/apache/karaf/profile/impl/PropertiesTest.java
(56%)
copy {itests => profile}/src/test/resources/log4j.properties (70%)
create mode 100755
util/src/main/java/org/apache/karaf/util/xml/IndentingXMLEventWriter.java
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
