FELIX-4294: added getClassName, getId, getServices methods. Modified getServiceProperties to return adapter service properties

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1550889 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java
index 76a7e84..843426f 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/FilterService.java
@@ -112,8 +112,14 @@
         return m_component.getService();
     }
 
+    public String getClassName() {
+        return m_component.getClassName();
+    }
+    
     public synchronized Dictionary getServiceProperties() {
-        return m_serviceProperties;
+        // We return the service properties (if any) of the adapter, not of the components 
+        // created by adapters or aspects.
+        return m_component.getServiceProperties();
     }
 
     public ServiceRegistration getServiceRegistration() {
@@ -269,7 +275,15 @@
     public int getState() {
         return m_component.getState();
     }
+    
+    public long getId() {
+        return m_component.getId();
+    }
 
+    public String[] getServices() {
+        return m_component.getServices();
+    }
+    
     public BundleContext getBundleContext() {
         return m_component.getBundleContext();
     };