| commit | a35d19106156bf255152480bf0dcbe827ba98063 | [log] [tgz] |
|---|---|---|
| author | Marcel Offermans <marrs@apache.org> | Wed Mar 03 15:38:54 2010 +0000 |
| committer | Marcel Offermans <marrs@apache.org> | Wed Mar 03 15:38:54 2010 +0000 |
| tree | 37287e157197dfa081c3f46eff03635afd875839 | |
| parent | 791c8d8aa08f73ebd6dd1effcda6b1da7ada66f4 [diff] |
Updated these test classes. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@918522 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/ServiceProviderAspect.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/ServiceProviderAspect.java index 69d94ec..1ed28b3 100644 --- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/ServiceProviderAspect.java +++ b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspect/ServiceProviderAspect.java
@@ -19,12 +19,10 @@ package org.apache.felix.dm.test.bundle.annotation.aspect; import org.apache.felix.dm.annotation.api.AspectService; -import org.apache.felix.dm.annotation.api.Param; import org.apache.felix.dm.annotation.api.ServiceDependency; import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer; -import org.osgi.framework.Constants; -@AspectService(filter = "(!(" + Constants.SERVICE_RANKING + "=*))", properties = { @Param(name = Constants.SERVICE_RANKING, value = "1") }) +@AspectService(ranking = 10) public class ServiceProviderAspect implements ServiceInterface { @ServiceDependency(filter = "(test=aspect.ServiceProviderAspect)")
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProviderAspect.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProviderAspect.java index b6d778f..872c78b 100644 --- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProviderAspect.java +++ b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProviderAspect.java
@@ -21,14 +21,12 @@ import org.apache.felix.dm.annotation.api.AspectService; import org.apache.felix.dm.annotation.api.Destroy; import org.apache.felix.dm.annotation.api.Init; -import org.apache.felix.dm.annotation.api.Param; import org.apache.felix.dm.annotation.api.ServiceDependency; import org.apache.felix.dm.annotation.api.Start; import org.apache.felix.dm.annotation.api.Stop; import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer; -import org.osgi.framework.Constants; -@AspectService(filter = "(!(" + Constants.SERVICE_RANKING + "=*))", properties = { @Param(name = Constants.SERVICE_RANKING, value = "1") }) +@AspectService(ranking = 10) public class ServiceProviderAspect implements ServiceInterface { protected boolean m_initCalled;