You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2021/05/28 14:29:25 UTC
[sling-whiteboard] branch master updated (6a26c03 -> 10b4ab4)
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git.
from 6a26c03 Explain the sample better
add 10b4ab4 Update to latest OSGi feature API
No new revisions were added by this update.
Summary of changes:
osgi-featuremodel/pom.xml | 8 +-
.../sling/feature/osgi}/impl/ArtifactImpl.java | 6 +-
.../feature/osgi}/impl/BuilderFactoryImpl.java | 24 +--
.../feature/osgi}/impl/BundleBuilderImpl.java | 8 +-
.../osgi}/impl/ConfigurationBuilderImpl.java | 6 +-
.../feature/osgi}/impl/ExtensionBuilderImpl.java | 73 ++++---
.../feature/osgi}/impl/FeatureBuilderImpl.java | 120 +++++++-----
.../feature/osgi}/impl/FeatureServiceImpl.java | 154 +++------------
.../feature}/BuilderFactory.java | 36 ++--
.../java/org/osgi/service/feature/Feature.java | 125 ++++++++++++
.../org/osgi/service/feature/FeatureArtifact.java | 53 +++--
.../feature}/FeatureBuilder.java | 114 ++++++-----
.../org/osgi/service/feature/FeatureBundle.java | 35 ++++
.../feature}/FeatureBundleBuilder.java | 30 +--
.../feature}/FeatureConfiguration.java | 30 +--
.../feature}/FeatureConfigurationBuilder.java | 30 +--
.../org/osgi/service/feature/FeatureExtension.java | 118 +++++++++++
.../service/feature/FeatureExtensionBuilder.java | 87 ++++++++
.../java/org/osgi/service/feature/Features.java | 53 +++++
.../{util/features => service/feature}/ID.java | 46 +++--
.../org/osgi/util/features/ConflictResolver.java | 36 ----
.../main/java/org/osgi/util/features/Feature.java | 98 ---------
.../org/osgi/util/features/FeatureArtifact.java | 28 ---
.../java/org/osgi/util/features/FeatureBundle.java | 31 ---
.../org/osgi/util/features/FeatureExtension.java | 73 -------
.../util/features/FeatureExtensionBuilder.java | 78 --------
.../main/java/org/osgi/util/features/Features.java | 71 -------
.../java/org/osgi/util/features/MergeContext.java | 59 ------
.../osgi/util/features/MergeContextBuilder.java | 54 -----
.../features/impl/MergeContextBuilderImpl.java | 86 --------
.../feature/osgi/impl/FeatureServiceImplTest.java | 120 ++++++++++++
.../util/features/impl/FeatureServiceImplTest.java | 218 ---------------------
32 files changed, 897 insertions(+), 1211 deletions(-)
rename osgi-featuremodel/src/main/java/org/{osgi/util/features => apache/sling/feature/osgi}/impl/ArtifactImpl.java (91%)
rename osgi-featuremodel/src/main/java/org/{osgi/util/features => apache/sling/feature/osgi}/impl/BuilderFactoryImpl.java (72%)
rename osgi-featuremodel/src/main/java/org/{osgi/util/features => apache/sling/feature/osgi}/impl/BundleBuilderImpl.java (93%)
rename osgi-featuremodel/src/main/java/org/{osgi/util/features => apache/sling/feature/osgi}/impl/ConfigurationBuilderImpl.java (95%)
rename osgi-featuremodel/src/main/java/org/{osgi/util/features => apache/sling/feature/osgi}/impl/ExtensionBuilderImpl.java (74%)
rename osgi-featuremodel/src/main/java/org/{osgi/util/features => apache/sling/feature/osgi}/impl/FeatureBuilderImpl.java (66%)
rename osgi-featuremodel/src/main/java/org/{osgi/util/features => apache/sling/feature/osgi}/impl/FeatureServiceImpl.java (60%)
rename osgi-featuremodel/src/main/java/org/osgi/{util/features => service/feature}/BuilderFactory.java (69%)
create mode 100644 osgi-featuremodel/src/main/java/org/osgi/service/feature/Feature.java
copy tag-modifier/src/main/java/org/apache/sling/tagmodifier/ElementType.java => osgi-featuremodel/src/main/java/org/osgi/service/feature/FeatureArtifact.java (52%)
rename osgi-featuremodel/src/main/java/org/osgi/{util/features => service/feature}/FeatureBuilder.java (51%)
create mode 100644 osgi-featuremodel/src/main/java/org/osgi/service/feature/FeatureBundle.java
rename osgi-featuremodel/src/main/java/org/osgi/{util/features => service/feature}/FeatureBundleBuilder.java (59%)
rename osgi-featuremodel/src/main/java/org/osgi/{util/features => service/feature}/FeatureConfiguration.java (50%)
rename osgi-featuremodel/src/main/java/org/osgi/{util/features => service/feature}/FeatureConfigurationBuilder.java (63%)
create mode 100644 osgi-featuremodel/src/main/java/org/osgi/service/feature/FeatureExtension.java
create mode 100644 osgi-featuremodel/src/main/java/org/osgi/service/feature/FeatureExtensionBuilder.java
create mode 100644 osgi-featuremodel/src/main/java/org/osgi/service/feature/Features.java
rename osgi-featuremodel/src/main/java/org/osgi/{util/features => service/feature}/ID.java (77%)
delete mode 100644 osgi-featuremodel/src/main/java/org/osgi/util/features/ConflictResolver.java
delete mode 100644 osgi-featuremodel/src/main/java/org/osgi/util/features/Feature.java
delete mode 100644 osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureArtifact.java
delete mode 100644 osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureBundle.java
delete mode 100644 osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureExtension.java
delete mode 100644 osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureExtensionBuilder.java
delete mode 100644 osgi-featuremodel/src/main/java/org/osgi/util/features/Features.java
delete mode 100644 osgi-featuremodel/src/main/java/org/osgi/util/features/MergeContext.java
delete mode 100644 osgi-featuremodel/src/main/java/org/osgi/util/features/MergeContextBuilder.java
delete mode 100644 osgi-featuremodel/src/main/java/org/osgi/util/features/impl/MergeContextBuilderImpl.java
create mode 100644 osgi-featuremodel/src/test/java/org/apache/sling/feature/osgi/impl/FeatureServiceImplTest.java
delete mode 100644 osgi-featuremodel/src/test/java/org/osgi/util/features/impl/FeatureServiceImplTest.java