Author: pderop
Date: Fri Dec 4 21:53:48 2009
New Revision: 887377
URL: http://svn.apache.org/viewvc?rev=887377&view=rev
Log:
moved dependencymanager package to dm. reworked dm API
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/BundleDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ComponentLifeCycleTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ConfigurationDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/Ensure.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleServiceDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ResourceDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ServiceDependencyTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/TemporalServiceDependencyTest.java
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectTest.java?rev=887377&r1=887376&r2=887377&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectTest.java
Fri Dec 4 21:53:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dependencymanager.test;
+package org.apache.felix.dm.test;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
@@ -24,9 +24,8 @@
import java.util.Properties;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
-import org.apache.felix.dependencymanager.impl.Logger;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -49,7 +48,7 @@
@Test
public void testDynamicallyAddAndRemoveAspect(BundleContext context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/BundleDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/BundleDependencyTest.java?rev=887377&r1=887376&r2=887377&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/BundleDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/BundleDependencyTest.java
Fri Dec 4 21:53:48 2009
@@ -16,16 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dependencymanager.test;
+package org.apache.felix.dm.test;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
import junit.framework.Assert;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
-import org.apache.felix.dependencymanager.impl.Logger;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -48,7 +47,7 @@
@Test
public void testBundleDependencies(BundleContext context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// create a service provider and consumer
Consumer c = new Consumer();
Service consumer =
m.createService().setImplementation(c).add(m.createBundleDependency().setCallbacks("add",
"remove"));
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ComponentLifeCycleTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ComponentLifeCycleTest.java?rev=887377&r1=887376&r2=887377&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ComponentLifeCycleTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ComponentLifeCycleTest.java
Fri Dec 4 21:53:48 2009
@@ -16,15 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dependencymanager.test;
+package org.apache.felix.dm.test;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
-import org.apache.felix.dependencymanager.impl.Logger;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -46,7 +45,7 @@
@Test
public void testComponentLifeCycleCallbacks(BundleContext context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a simple service component
@@ -61,7 +60,7 @@
@Test
public void testCustomComponentLifeCycleCallbacks(BundleContext context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a simple service component
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ConfigurationDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ConfigurationDependencyTest.java?rev=887377&r1=887376&r2=887377&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ConfigurationDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ConfigurationDependencyTest.java
Fri Dec 4 21:53:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dependencymanager.test;
+package org.apache.felix.dm.test;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
@@ -28,9 +28,8 @@
import junit.framework.Assert;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
-import org.apache.felix.dependencymanager.impl.Logger;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -56,7 +55,7 @@
@Test
public void
testComponentWithRequiredConfigurationAndServicePropertyPropagation(BundleContext
context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/Ensure.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/Ensure.java?rev=887377&r1=887376&r2=887377&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/Ensure.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/Ensure.java
Fri Dec 4 21:53:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dependencymanager.test;
+package org.apache.felix.dm.test;
import junit.framework.Assert;
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleServiceDependencyTest.java?rev=887377&r1=887376&r2=887377&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleServiceDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleServiceDependencyTest.java
Fri Dec 4 21:53:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dependencymanager.test;
+package org.apache.felix.dm.test;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
@@ -24,9 +24,8 @@
import java.util.Properties;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
-import org.apache.felix.dependencymanager.impl.Logger;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -49,7 +48,7 @@
@Test
public void testMultipleServiceRegistrationAndConsumption(BundleContext
context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
@@ -70,7 +69,7 @@
@Test
public void testReplacementAutoConfig(BundleContext context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
@@ -91,7 +90,7 @@
@Test
public void testReplacementCallbacks(BundleContext context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
@@ -163,4 +162,4 @@
m_ensure.step(6);
}
}
-}
\ No newline at end of file
+}
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ResourceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ResourceDependencyTest.java?rev=887377&r1=887376&r2=887377&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ResourceDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ResourceDependencyTest.java
Fri Dec 4 21:53:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dependencymanager.test;
+package org.apache.felix.dm.test;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
@@ -32,11 +32,10 @@
import junit.framework.Assert;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
-import org.apache.felix.dependencymanager.impl.Logger;
-import org.apache.felix.dependencymanager.resources.Resource;
-import org.apache.felix.dependencymanager.resources.ResourceHandler;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.resources.Resource;
+import org.apache.felix.dm.resources.ResourceHandler;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -61,7 +60,7 @@
@Test
public void testResourceDependency(BundleContext context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
@@ -139,12 +138,12 @@
synchronized (m_handlers) {
m_handlers.put(handler, filter);
}
- for (int i = 0; i < m_resources.length; i++) {
- if (filter.match(m_resources[i].getProperties())) {
- handler.added(m_resources[i]);
+ for (int i = 0; i < m_resources.length; i++) {
+ if (filter.match(m_resources[i].getProperties())) {
+ handler.added(m_resources[i]);
+ }
}
}
- }
public void remove(ServiceReference ref, ResourceHandler handler) {
Filter filter;
@@ -155,13 +154,13 @@
}
private void removeResources(ResourceHandler handler, Filter filter) {
- for (int i = 0; i < m_resources.length; i++) {
- if (filter.match(m_resources[i].getProperties())) {
- handler.removed(m_resources[i]);
+ for (int i = 0; i < m_resources.length; i++) {
+ if (filter.match(m_resources[i].getProperties())) {
+ handler.removed(m_resources[i]);
+ }
}
}
- }
-
+
public void destroy() {
Entry[] handlers;
synchronized (m_handlers) {
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ServiceDependencyTest.java?rev=887377&r1=887376&r2=887377&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ServiceDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ServiceDependencyTest.java
Fri Dec 4 21:53:48 2009
@@ -16,15 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dependencymanager.test;
+package org.apache.felix.dm.test;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
-import org.apache.felix.dependencymanager.impl.Logger;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -46,7 +45,7 @@
@Test
public void testServiceRegistrationAndConsumption(BundleContext context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java?rev=887377&r1=887376&r2=887377&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/SharingDependenciesWithMultipleServicesTest.java
Fri Dec 4 21:53:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dependencymanager.test;
+package org.apache.felix.dm.test;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
@@ -27,15 +27,14 @@
import java.util.Dictionary;
import java.util.Properties;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
-import org.apache.felix.dependencymanager.dependencies.BundleDependency;
-import org.apache.felix.dependencymanager.dependencies.ConfigurationDependency;
-import org.apache.felix.dependencymanager.dependencies.ResourceDependency;
-import org.apache.felix.dependencymanager.dependencies.ServiceDependency;
-import org.apache.felix.dependencymanager.impl.Logger;
-import org.apache.felix.dependencymanager.resources.Resource;
-import org.apache.felix.dependencymanager.resources.ResourceHandler;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.dependencies.BundleDependency;
+import org.apache.felix.dm.dependencies.ConfigurationDependency;
+import org.apache.felix.dm.dependencies.ResourceDependency;
+import org.apache.felix.dm.dependencies.ServiceDependency;
+import org.apache.felix.dm.resources.Resource;
+import org.apache.felix.dm.resources.ResourceHandler;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -64,7 +63,7 @@
@Test
public void testShareServiceDependencyWithMultipleServices(BundleContext
context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
@@ -85,7 +84,7 @@
@Test
public void
testShareConfigurationDependencyWithMultipleServices(BundleContext context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
@@ -110,7 +109,7 @@
@Test
public void testShareBundleDependencyWithMultipleServices(BundleContext
context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
@@ -128,7 +127,7 @@
@Test
public void testShareResourceDependencyWithMultipleServices(BundleContext
context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
@@ -228,7 +227,7 @@
m_ensure.step(m_step);
}
}
-
+
static class ResourceConsumer {
private final Ensure m_ensure;
private int m_step;
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/TemporalServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/TemporalServiceDependencyTest.java?rev=887377&r1=887376&r2=887377&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/TemporalServiceDependencyTest.java
(original)
+++
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/TemporalServiceDependencyTest.java
Fri Dec 4 21:53:48 2009
@@ -16,15 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dependencymanager.test;
+package org.apache.felix.dm.test;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
-import org.apache.felix.dependencymanager.DependencyManager;
-import org.apache.felix.dependencymanager.Service;
-import org.apache.felix.dependencymanager.impl.Logger;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -46,7 +45,7 @@
@Test
public void
testServiceConsumptionAndIntermittentAvailability(BundleContext context) {
- DependencyManager m = new DependencyManager(context, new
Logger(context));
+ DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();
// create a service provider and consumer
