Author: marrs
Date: Tue Nov 24 16:02:10 2009
New Revision: 883744
URL: http://svn.apache.org/viewvc?rev=883744&view=rev
Log:
updated to osgi.org dependencies, fixed several small mistakes with previous
checkin
Added:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponent.java
- copied, changed from r883483,
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponent.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponentDependency.java
- copied, changed from r883483,
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponentDependency.java
Removed:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponent.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponentDependency.java
Modified:
felix/trunk/dependencymanager/core/pom.xml
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/AbstractTracked.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTracker.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTrackerCustomizer.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTracker.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTrackerCustomizer.java
felix/trunk/dependencymanager/shell/pom.xml
felix/trunk/dependencymanager/shell/src/main/java/org/apache/felix/dependencymanager/shell/DMCommand.java
felix/trunk/dependencymanager/test/pom.xml
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ConfigurationDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/MultipleServiceDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/TemporalServiceDependencyTest.java
Modified: felix/trunk/dependencymanager/core/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/pom.xml?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/pom.xml (original)
+++ felix/trunk/dependencymanager/core/pom.xml Tue Nov 24 16:02:10 2009
@@ -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>
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java
(original)
+++
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ConfigurationDependency.java
Tue Nov 24 16:02:10 2009
@@ -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;
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
(original)
+++
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceDependency.java
Tue Nov 24 16:02:10 2009
@@ -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;
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
(original)
+++
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceImpl.java
Tue Nov 24 16:02:10 2009
@@ -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;
Copied:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponent.java
(from r883483,
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponent.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponent.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponent.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponent.java&r1=883483&r2=883744&rev=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponent.java
(original)
+++
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponent.java
Tue Nov 24 16:02:10 2009
@@ -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
Copied:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponentDependency.java
(from r883483,
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponentDependency.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponentDependency.java?p2=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponentDependency.java&p1=felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponentDependency.java&r1=883483&r2=883744&rev=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/ServiceComponentDependency.java
(original)
+++
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/management/ServiceComponentDependency.java
Tue Nov 24 16:02:10 2009
@@ -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
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/AbstractTracked.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/AbstractTracked.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/AbstractTracked.java
(original)
+++
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/AbstractTracked.java
Tue Nov 24 16:02:10 2009
@@ -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.
*
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTracker.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTracker.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTracker.java
(original)
+++
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTracker.java
Tue Nov 24 16:02:10 2009
@@ -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.
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTrackerCustomizer.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTrackerCustomizer.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTrackerCustomizer.java
(original)
+++
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/BundleTrackerCustomizer.java
Tue Nov 24 16:02:10 2009
@@ -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.
*
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTracker.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTracker.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTracker.java
(original)
+++
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTracker.java
Tue Nov 24 16:02:10 2009
@@ -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.
*
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTrackerCustomizer.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTrackerCustomizer.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTrackerCustomizer.java
(original)
+++
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dependencymanager/tracker/ServiceTrackerCustomizer.java
Tue Nov 24 16:02:10 2009
@@ -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.
Modified: felix/trunk/dependencymanager/shell/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/shell/pom.xml?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
--- felix/trunk/dependencymanager/shell/pom.xml (original)
+++ felix/trunk/dependencymanager/shell/pom.xml Tue Nov 24 16:02:10 2009
@@ -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>
Modified:
felix/trunk/dependencymanager/shell/src/main/java/org/apache/felix/dependencymanager/shell/DMCommand.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/shell/src/main/java/org/apache/felix/dependencymanager/shell/DMCommand.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/shell/src/main/java/org/apache/felix/dependencymanager/shell/DMCommand.java
(original)
+++
felix/trunk/dependencymanager/shell/src/main/java/org/apache/felix/dependencymanager/shell/DMCommand.java
Tue Nov 24 16:02:10 2009
@@ -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;
Modified: felix/trunk/dependencymanager/test/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/pom.xml?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/pom.xml (original)
+++ felix/trunk/dependencymanager/test/pom.xml Tue Nov 24 16:02:10 2009
@@ -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>
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ComponentLifeCycleTest.java
Tue Nov 24 16:02:10 2009
@@ -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()
)
);
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ConfigurationDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ConfigurationDependencyTest.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ConfigurationDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ConfigurationDependencyTest.java
Tue Nov 24 16:02:10 2009
@@ -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()
)
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/MultipleServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/MultipleServiceDependencyTest.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/MultipleServiceDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/MultipleServiceDependencyTest.java
Tue Nov 24 16:02:10 2009
@@ -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()
)
);
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/ServiceDependencyTest.java
Tue Nov 24 16:02:10 2009
@@ -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()
)
);
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/TemporalServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/TemporalServiceDependencyTest.java?rev=883744&r1=883743&r2=883744&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/TemporalServiceDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dependencymanager/test/TemporalServiceDependencyTest.java
Tue Nov 24 16:02:10 2009
@@ -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()
)
);
