commit 806fdc29eeb21e1a45d51059fe3855e86df8b5d7
author Pierre De Rop <pderop@apache.org> Fri Jun 11 05:56:10 2010 +0000
committer Pierre De Rop <pderop@apache.org> Fri Jun 11 05:56:10 2010 +0000
tree a7ebe4cf57e86ebd431d39bba29c0b31a4624b4e
parent 86fe3f5ac9898036b05799ea1511820acd0eed72

added logs. Replaced destroy callback, by stop callback.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@953568 13f79535-47bb-0310-9956-ffa450edef68

dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceConsumer.java

diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceConsumer.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceConsumer.java
index 526cb7c..e14188d 100644
--- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceConsumer.java
+++ b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/resource/ResourceConsumer.java
@@ -20,10 +20,11 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dm.annotation.api.Destroy;
-import org.apache.felix.dm.annotation.api.Service;
 import org.apache.felix.dm.annotation.api.ResourceDependency;
+import org.apache.felix.dm.annotation.api.Service;
 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.resources.Resource;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
@@ -33,23 +34,30 @@
 @Service
 public class ResourceConsumer
 {
-    @ServiceDependency(filter = "(test=resource)")
+    @ServiceDependency(required=true,filter = "(test=resource)")
     Sequencer m_sequencer;
     
     private int m_resourcesSeen;
-
+    
+    @Start
+    void start() 
+    {
+        System.out.println("ResourceConsumer.start: sequencer=" + m_sequencer);
+    }
+    
     @ResourceDependency(required = false, filter = "(&(path=/test)(name=*.txt)(repository=TestRepository))")
     public void add(Resource resource)
     {
+        System.out.println("ResourceConsumer.add: resource=" + resource.getName() + ", m_sequencer=" + m_sequencer);
         if (match(resource, "test1.txt", "/test", "TestRepository"))
         {
-            m_resourcesSeen++;
+            m_resourcesSeen ++;
             return;
         }
 
         if (match(resource, "test2.txt", "/test", "TestRepository"))
         {
-            m_resourcesSeen++;
+            m_resourcesSeen ++;
             return;
         }
 
@@ -62,10 +70,11 @@
         return name.equals(resource.getName()) && path.equals(resource.getPath())
             && repo.equals(resource.getRepository());
     }
-
-    @Destroy
-    private void destroy()
+    
+    @Stop
+    void stop() 
     {
+        System.out.println("ResourceConsumer.stop: m_sequencer=" + m_sequencer);
         Assert.assertEquals(2, m_resourcesSeen);
         m_sequencer.step(1);
     }