updated to osgi.org dependencies, fixed several small mistakes with previous checkin
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@883744 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/core/pom.xml b/dependencymanager/core/pom.xml
index ca470c4..2309519 100644
--- a/dependencymanager/core/pom.xml
+++ b/dependencymanager/core/pom.xml
@@ -29,16 +29,14 @@
<artifactId>org.apache.felix.dependencymanager</artifactId>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
- <scope>provided</scope>
+ <version>4.2.0</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- <scope>provided</scope>
+ <version>4.2.0</version>
</dependency>
</dependencies>
<build>
@@ -55,7 +53,7 @@
<Bundle-Description>A bundle that provides a run-time
service dependency manager.</Bundle-Description>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Export-Package>org.apache.felix.dependencymanager</Export-Package>
+ <Export-Package>org.apache.felix.dependencymanager,org.apache.felix.dependencymanager.management,org.apache.felix.dependencymanager.tracker</Export-Package>
<Import-Package>!org.apache.felix.dependencymanager,*</Import-Package>
</instructions>
</configuration>
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java
index f7ac01b..3299826 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java
@@ -22,6 +22,7 @@
import java.util.Dictionary;
import java.util.Properties;
+import org.apache.felix.dependencymanager.management.ServiceComponentDependency;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
index b1db122..5ba1f7d 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
@@ -29,6 +29,9 @@
import java.util.Map;
import java.util.Set;
+import org.apache.felix.dependencymanager.management.ServiceComponentDependency;
+import org.apache.felix.dependencymanager.tracker.ServiceTracker;
+import org.apache.felix.dependencymanager.tracker.ServiceTrackerCustomizer;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
index f5f4c90..e61bce3 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
@@ -33,6 +33,8 @@
import java.util.Map;
import java.util.Properties;
+import org.apache.felix.dependencymanager.management.ServiceComponent;
+import org.apache.felix.dependencymanager.management.ServiceComponentDependency;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponent.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponent.java
similarity index 96%
rename from dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponent.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponent.java
index 2d70ea7..456a966 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponent.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dependencymanager;
+package org.apache.felix.dependencymanager.management;
/**
* Describes a service component. Service components form descriptions of services
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponentDependency.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponentDependency.java
similarity index 97%
rename from dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponentDependency.java
rename to dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponentDependency.java
index 53c13ac..8b95fbe 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponentDependency.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponentDependency.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dependencymanager;
+package org.apache.felix.dependencymanager.management;
/**
* Describes a service component dependency. They form descriptions of dependencies
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/AbstractTracked.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/AbstractTracked.java
index 013384b..8e4bb7d 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/AbstractTracked.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/AbstractTracked.java
@@ -1,4 +1,4 @@
-package org.apache.felix.dependencymanager4.tracker;
+package org.apache.felix.dependencymanager.tracker;
/*
* Copyright (c) OSGi Alliance (2007, 2008). All Rights Reserved.
*
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTracker.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTracker.java
index c407dc5..40674af 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTracker.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTracker.java
@@ -1,4 +1,4 @@
-package org.apache.felix.dependencymanager4.tracker;
+package org.apache.felix.dependencymanager.tracker;
/*
* Copyright (c) OSGi Alliance (2007, 2008). All Rights Reserved.
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTrackerCustomizer.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTrackerCustomizer.java
index 94ac3c7..6b35df2 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTrackerCustomizer.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTrackerCustomizer.java
@@ -1,4 +1,4 @@
-package org.apache.felix.dependencymanager4.tracker;
+package org.apache.felix.dependencymanager.tracker;
/*
* Copyright (c) OSGi Alliance (2007, 2008). All Rights Reserved.
*
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTracker.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTracker.java
index c32a7d4..8fe3baa 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTracker.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTracker.java
@@ -1,4 +1,4 @@
-package org.apache.felix.dependencymanager4.tracker;
+package org.apache.felix.dependencymanager.tracker;
/*
* Copyright (c) OSGi Alliance (2000, 2009). All Rights Reserved.
*
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTrackerCustomizer.java b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTrackerCustomizer.java
index 5369107..c69effd 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTrackerCustomizer.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTrackerCustomizer.java
@@ -1,4 +1,4 @@
-package org.apache.felix.dependencymanager4.tracker;
+package org.apache.felix.dependencymanager.tracker;
/*
* Copyright (c) OSGi Alliance (2000, 2008). All Rights Reserved.
diff --git a/dependencymanager/shell/pom.xml b/dependencymanager/shell/pom.xml
index 089e026..aa339b2 100644
--- a/dependencymanager/shell/pom.xml
+++ b/dependencymanager/shell/pom.xml
@@ -31,16 +31,14 @@
<artifactId>org.apache.felix.dependencymanager.shell</artifactId>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
- <scope>provided</scope>
+ <version>4.2.0</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- <scope>provided</scope>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
diff --git a/dependencymanager/shell/src/main/java/org/apache/felix/dependencymanager/shell/DMCommand.java b/dependencymanager/shell/src/main/java/org/apache/felix/dependencymanager/shell/DMCommand.java
index 8719b3c..e37f4a8 100644
--- a/dependencymanager/shell/src/main/java/org/apache/felix/dependencymanager/shell/DMCommand.java
+++ b/dependencymanager/shell/src/main/java/org/apache/felix/dependencymanager/shell/DMCommand.java
@@ -24,8 +24,8 @@
import java.util.Comparator;
import java.util.StringTokenizer;
-import org.apache.felix.dependencymanager.ServiceComponent;
-import org.apache.felix.dependencymanager.ServiceComponentDependency;
+import org.apache.felix.dependencymanager.management.ServiceComponent;
+import org.apache.felix.dependencymanager.management.ServiceComponentDependency;
import org.apache.felix.shell.Command;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
diff --git a/dependencymanager/test/pom.xml b/dependencymanager/test/pom.xml
index a55a11b..de8b2d2 100644
--- a/dependencymanager/test/pom.xml
+++ b/dependencymanager/test/pom.xml
@@ -28,16 +28,14 @@
<artifactId>org.apache.felix.dependencymanager.test</artifactId>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
- <scope>provided</scope>
+ <version>4.2.0</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- <scope>provided</scope>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java
index 47fbf32..38e8bb2 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java
@@ -38,7 +38,7 @@
public static Option[] configuration() {
return options(
provision(
- mavenBundle().groupId("org.apache.felix").artifactId("org.osgi.compendium").versionAsInProject(),
+ mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version("4.2.0"),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject()
)
);
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ConfigurationDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ConfigurationDependencyTest.java
index 67acbe3..f0d9fb6 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ConfigurationDependencyTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ConfigurationDependencyTest.java
@@ -47,7 +47,7 @@
public static Option[] configuration() {
return options(
provision(
- mavenBundle().groupId("org.apache.felix").artifactId("org.osgi.compendium").versionAsInProject(),
+ mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version("4.2.0"),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.configadmin").version("1.2.4"),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject()
)
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/MultipleServiceDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/MultipleServiceDependencyTest.java
index 6ea11c2..e453b15 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/MultipleServiceDependencyTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/MultipleServiceDependencyTest.java
@@ -23,7 +23,7 @@
public static Option[] configuration() {
return options(
provision(
- mavenBundle().groupId("org.apache.felix").artifactId("org.osgi.compendium").versionAsInProject(),
+ mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version("4.2.0"),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject()
)
);
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java
index ecf80c1..37cff66 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java
@@ -38,7 +38,7 @@
public static Option[] configuration() {
return options(
provision(
- mavenBundle().groupId("org.apache.felix").artifactId("org.osgi.compendium").versionAsInProject(),
+ mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version("4.2.0"),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject()
)
);
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/TemporalServiceDependencyTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/TemporalServiceDependencyTest.java
index 03937bd..30bf35a 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/TemporalServiceDependencyTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/TemporalServiceDependencyTest.java
@@ -38,7 +38,7 @@
public static Option[] configuration() {
return options(
provision(
- mavenBundle().groupId("org.apache.felix").artifactId("org.osgi.compendium").versionAsInProject(),
+ mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version("4.2.0"),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject()
)
);