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 2020/04/14 12:05:05 UTC
[sling-whiteboard] branch master updated: Renamed package
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new c5c0d20 Renamed package
c5c0d20 is described below
commit c5c0d207acd5de7a46f5c7ea6f41a7e8c81e0a48
Author: David Bosschaert <da...@gmail.com>
AuthorDate: Tue Apr 14 13:04:48 2020 +0100
Renamed package
---
.../osgi/{feature => util/features}/Artifact.java | 2 +-
.../{feature => util/features}/ArtifactID.java | 2 +-
.../{feature => util/features}/BuilderFactory.java | 2 +-
.../osgi/{feature => util/features}/Bundle.java | 2 +-
.../{feature => util/features}/BundleBuilder.java | 2 +-
.../{feature => util/features}/Configuration.java | 2 +-
.../features}/ConfigurationBuilder.java | 2 +-
.../features}/ConflictResolver.java | 2 +-
.../osgi/{feature => util/features}/Extension.java | 2 +-
.../features}/ExtensionBuilder.java | 2 +-
.../osgi/{feature => util/features}/Feature.java | 2 +-
.../{feature => util/features}/FeatureBuilder.java | 2 +-
.../{feature => util/features}/FeatureService.java | 2 +-
.../{feature => util/features}/MergeContext.java | 2 +-
.../features}/MergeContextBuilder.java | 2 +-
.../features}/impl/ArtifactImpl.java | 6 ++---
.../features}/impl/BuilderFactoryImpl.java | 20 ++++++++--------
.../features}/impl/BundleBuilderImpl.java | 8 +++----
.../features}/impl/ConfigurationBuilderImpl.java | 6 ++---
.../features}/impl/ExtensionBuilderImpl.java | 12 +++++-----
.../features}/impl/FeatureBuilderImpl.java | 16 ++++++-------
.../features}/impl/FeatureServiceImpl.java | 28 +++++++++++-----------
.../features}/impl/MergeContextBuilderImpl.java | 16 ++++++-------
.../features}/impl/FeatureServiceImplTest.java | 21 +++++++++-------
24 files changed, 83 insertions(+), 80 deletions(-)
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/Artifact.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/Artifact.java
similarity index 96%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/Artifact.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/Artifact.java
index 8576bfa..33c3c34 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/Artifact.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/Artifact.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
/**
* An Artifact is an entity with an ID.
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/ArtifactID.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/ArtifactID.java
similarity index 99%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/ArtifactID.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/ArtifactID.java
index 11d13bb..79e22bf 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/ArtifactID.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/ArtifactID.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
import java.util.Objects;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/BuilderFactory.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/BuilderFactory.java
similarity index 98%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/BuilderFactory.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/BuilderFactory.java
index 774b149..bb46808 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/BuilderFactory.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/BuilderFactory.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
/**
* The Builder Factory can be used to obtain builders for the various entities.
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/Bundle.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/Bundle.java
similarity index 97%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/Bundle.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/Bundle.java
index 73df021..a242aa0 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/Bundle.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/Bundle.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
import java.util.Map;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/BundleBuilder.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/BundleBuilder.java
similarity index 98%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/BundleBuilder.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/BundleBuilder.java
index 5f0c97c..d734fac 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/BundleBuilder.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/BundleBuilder.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
import java.util.Map;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/Configuration.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/Configuration.java
similarity index 97%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/Configuration.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/Configuration.java
index 4890b91..a1ae47b 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/Configuration.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/Configuration.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
import java.util.Map;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/ConfigurationBuilder.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/ConfigurationBuilder.java
similarity index 98%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/ConfigurationBuilder.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/ConfigurationBuilder.java
index f6f6c51..4be8eab 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/ConfigurationBuilder.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/ConfigurationBuilder.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
import java.util.Map;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/ConflictResolver.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/ConflictResolver.java
similarity index 97%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/ConflictResolver.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/ConflictResolver.java
index 9d20fae..eeb0e1a 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/ConflictResolver.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/ConflictResolver.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
/**
* Interface implemented by a callback that can resolve merge conflicts.
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/Extension.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/Extension.java
similarity index 98%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/Extension.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/Extension.java
index 0f00deb..9f74dab 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/Extension.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/Extension.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
import java.util.List;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/ExtensionBuilder.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/ExtensionBuilder.java
similarity index 98%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/ExtensionBuilder.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/ExtensionBuilder.java
index f9345ba..b86ce35 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/ExtensionBuilder.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/ExtensionBuilder.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
/**
* A builder for Feature Model {@link Extension} objects.
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/Feature.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/Feature.java
similarity index 98%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/Feature.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/Feature.java
index 0828a52..ab6a728 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/Feature.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/Feature.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
import java.util.List;
import java.util.Map;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/FeatureBuilder.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureBuilder.java
similarity index 99%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/FeatureBuilder.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureBuilder.java
index 3bdf508..7bd4268 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/FeatureBuilder.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureBuilder.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
import java.util.Map;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/FeatureService.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureService.java
similarity index 98%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/FeatureService.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureService.java
index 65442c8..2953e25 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/FeatureService.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureService.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
import java.io.IOException;
import java.io.Reader;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/MergeContext.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/MergeContext.java
similarity index 98%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/MergeContext.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/MergeContext.java
index 274f431..26f2821 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/MergeContext.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/MergeContext.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
import java.util.List;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/MergeContextBuilder.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/MergeContextBuilder.java
similarity index 98%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/MergeContextBuilder.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/MergeContextBuilder.java
index 25fcc38..2ca1a9c 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/MergeContextBuilder.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/MergeContextBuilder.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature;
+package org.osgi.util.features;
import java.util.List;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/ArtifactImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ArtifactImpl.java
similarity index 92%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/impl/ArtifactImpl.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ArtifactImpl.java
index 9d2ed80..c258702 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/ArtifactImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ArtifactImpl.java
@@ -14,10 +14,10 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature.impl;
+package org.osgi.util.features.impl;
-import org.osgi.feature.Artifact;
-import org.osgi.feature.ArtifactID;
+import org.osgi.util.features.Artifact;
+import org.osgi.util.features.ArtifactID;
import java.util.Objects;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/BuilderFactoryImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BuilderFactoryImpl.java
similarity index 78%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/impl/BuilderFactoryImpl.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BuilderFactoryImpl.java
index 52f39f7..e4f917e 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/BuilderFactoryImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BuilderFactoryImpl.java
@@ -14,17 +14,17 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature.impl;
+package org.osgi.util.features.impl;
-import org.osgi.feature.ArtifactID;
-import org.osgi.feature.BuilderFactory;
-import org.osgi.feature.BundleBuilder;
-import org.osgi.feature.ConfigurationBuilder;
-import org.osgi.feature.Extension.Kind;
-import org.osgi.feature.Extension.Type;
-import org.osgi.feature.ExtensionBuilder;
-import org.osgi.feature.FeatureBuilder;
-import org.osgi.feature.MergeContextBuilder;
+import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.BuilderFactory;
+import org.osgi.util.features.BundleBuilder;
+import org.osgi.util.features.ConfigurationBuilder;
+import org.osgi.util.features.ExtensionBuilder;
+import org.osgi.util.features.FeatureBuilder;
+import org.osgi.util.features.MergeContextBuilder;
+import org.osgi.util.features.Extension.Kind;
+import org.osgi.util.features.Extension.Type;
class BuilderFactoryImpl implements BuilderFactory {
@Override
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/BundleBuilderImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BundleBuilderImpl.java
similarity index 94%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/impl/BundleBuilderImpl.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BundleBuilderImpl.java
index 02afc3b..ed8cef3 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/BundleBuilderImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BundleBuilderImpl.java
@@ -14,11 +14,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature.impl;
+package org.osgi.util.features.impl;
-import org.osgi.feature.ArtifactID;
-import org.osgi.feature.Bundle;
-import org.osgi.feature.BundleBuilder;
+import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.Bundle;
+import org.osgi.util.features.BundleBuilder;
import java.util.Collections;
import java.util.HashMap;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/ConfigurationBuilderImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ConfigurationBuilderImpl.java
similarity index 96%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/impl/ConfigurationBuilderImpl.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ConfigurationBuilderImpl.java
index 30e1876..4ef254c 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/ConfigurationBuilderImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ConfigurationBuilderImpl.java
@@ -14,10 +14,10 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature.impl;
+package org.osgi.util.features.impl;
-import org.osgi.feature.Configuration;
-import org.osgi.feature.ConfigurationBuilder;
+import org.osgi.util.features.Configuration;
+import org.osgi.util.features.ConfigurationBuilder;
import java.util.Collections;
import java.util.HashMap;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/ExtensionBuilderImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ExtensionBuilderImpl.java
similarity index 95%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/impl/ExtensionBuilderImpl.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ExtensionBuilderImpl.java
index 8e24e69..a32760d 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/ExtensionBuilderImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ExtensionBuilderImpl.java
@@ -14,13 +14,13 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature.impl;
+package org.osgi.util.features.impl;
-import org.osgi.feature.ArtifactID;
-import org.osgi.feature.Extension;
-import org.osgi.feature.Extension.Kind;
-import org.osgi.feature.Extension.Type;
-import org.osgi.feature.ExtensionBuilder;
+import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.Extension;
+import org.osgi.util.features.ExtensionBuilder;
+import org.osgi.util.features.Extension.Kind;
+import org.osgi.util.features.Extension.Type;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/FeatureBuilderImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureBuilderImpl.java
similarity index 96%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/impl/FeatureBuilderImpl.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureBuilderImpl.java
index 194c1af..d4bce20 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/FeatureBuilderImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureBuilderImpl.java
@@ -14,14 +14,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature.impl;
-
-import org.osgi.feature.ArtifactID;
-import org.osgi.feature.Bundle;
-import org.osgi.feature.Configuration;
-import org.osgi.feature.Extension;
-import org.osgi.feature.Feature;
-import org.osgi.feature.FeatureBuilder;
+package org.osgi.util.features.impl;
+
+import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.Bundle;
+import org.osgi.util.features.Configuration;
+import org.osgi.util.features.Extension;
+import org.osgi.util.features.Feature;
+import org.osgi.util.features.FeatureBuilder;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/FeatureServiceImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureServiceImpl.java
similarity index 95%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/impl/FeatureServiceImpl.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureServiceImpl.java
index a2a8114..63168fd 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/FeatureServiceImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureServiceImpl.java
@@ -14,20 +14,20 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature.impl;
-
-import org.osgi.feature.ArtifactID;
-import org.osgi.feature.BuilderFactory;
-import org.osgi.feature.Bundle;
-import org.osgi.feature.BundleBuilder;
-import org.osgi.feature.Configuration;
-import org.osgi.feature.ConfigurationBuilder;
-import org.osgi.feature.Extension;
-import org.osgi.feature.ExtensionBuilder;
-import org.osgi.feature.Feature;
-import org.osgi.feature.FeatureBuilder;
-import org.osgi.feature.FeatureService;
-import org.osgi.feature.MergeContext;
+package org.osgi.util.features.impl;
+
+import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.BuilderFactory;
+import org.osgi.util.features.Bundle;
+import org.osgi.util.features.BundleBuilder;
+import org.osgi.util.features.Configuration;
+import org.osgi.util.features.ConfigurationBuilder;
+import org.osgi.util.features.Extension;
+import org.osgi.util.features.ExtensionBuilder;
+import org.osgi.util.features.Feature;
+import org.osgi.util.features.FeatureBuilder;
+import org.osgi.util.features.FeatureService;
+import org.osgi.util.features.MergeContext;
import java.io.IOException;
import java.io.Reader;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/MergeContextBuilderImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/MergeContextBuilderImpl.java
similarity index 89%
rename from osgi-featuremodel/src/main/java/org/osgi/feature/impl/MergeContextBuilderImpl.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/impl/MergeContextBuilderImpl.java
index c4f2638..2811551 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/MergeContextBuilderImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/MergeContextBuilderImpl.java
@@ -14,15 +14,15 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature.impl;
+package org.osgi.util.features.impl;
-import org.osgi.feature.Bundle;
-import org.osgi.feature.Configuration;
-import org.osgi.feature.ConflictResolver;
-import org.osgi.feature.Extension;
-import org.osgi.feature.Feature;
-import org.osgi.feature.MergeContext;
-import org.osgi.feature.MergeContextBuilder;
+import org.osgi.util.features.Bundle;
+import org.osgi.util.features.Configuration;
+import org.osgi.util.features.ConflictResolver;
+import org.osgi.util.features.Extension;
+import org.osgi.util.features.Feature;
+import org.osgi.util.features.MergeContext;
+import org.osgi.util.features.MergeContextBuilder;
import java.util.List;
diff --git a/osgi-featuremodel/src/test/java/org/osgi/feature/impl/FeatureServiceImplTest.java b/osgi-featuremodel/src/test/java/org/osgi/util/features/impl/FeatureServiceImplTest.java
similarity index 92%
rename from osgi-featuremodel/src/test/java/org/osgi/feature/impl/FeatureServiceImplTest.java
rename to osgi-featuremodel/src/test/java/org/osgi/util/features/impl/FeatureServiceImplTest.java
index 2161574..ea87787 100644
--- a/osgi-featuremodel/src/test/java/org/osgi/feature/impl/FeatureServiceImplTest.java
+++ b/osgi-featuremodel/src/test/java/org/osgi/util/features/impl/FeatureServiceImplTest.java
@@ -14,17 +14,20 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.osgi.feature.impl;
+package org.osgi.util.features.impl;
import org.junit.Test;
-import org.osgi.feature.ArtifactID;
-import org.osgi.feature.BuilderFactory;
-import org.osgi.feature.Bundle;
-import org.osgi.feature.Configuration;
-import org.osgi.feature.Extension;
-import org.osgi.feature.Feature;
-import org.osgi.feature.FeatureService;
-import org.osgi.feature.MergeContext;
+import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.BuilderFactory;
+import org.osgi.util.features.Bundle;
+import org.osgi.util.features.Configuration;
+import org.osgi.util.features.Extension;
+import org.osgi.util.features.Feature;
+import org.osgi.util.features.FeatureService;
+import org.osgi.util.features.MergeContext;
+import org.osgi.util.features.impl.ConfigurationBuilderImpl;
+import org.osgi.util.features.impl.ExtensionBuilderImpl;
+import org.osgi.util.features.impl.FeatureServiceImpl;
import java.io.IOException;
import java.io.InputStreamReader;