Mailing-List: contact commits-help@felix.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@felix.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r903326 -
 /felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeInstanceDescription.java
Date: Tue, 26 Jan 2010 17:20:44 -0000
To: commits@felix.apache.org
From: clement@apache.org
Message-Id: <20100126172044.2AFBA2388901@eris.apache.org>

Author: clement
Date: Tue Jan 26 17:20:43 2010
New Revision: 903326

URL: http://svn.apache.org/viewvc?rev=903326&view=rev
Log:
Composite Architecture displays internal services.

Modified:
    felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeInstanceDescription.java

Modified: felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeInstanceDescription.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeInstanceDescription.java?rev=903326&r1=903325&r2=903326&view=diff
==============================================================================
--- felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeInstanceDescription.java (original)
+++ felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeInstanceDescription.java Tue Jan 26 17:20:43 2010
@@ -18,14 +18,20 @@
  */
 package org.apache.felix.ipojo.composite;
 
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.felix.ipojo.Factory;
 import org.apache.felix.ipojo.ServiceContext;
 import org.apache.felix.ipojo.architecture.Architecture;
 import org.apache.felix.ipojo.architecture.ComponentTypeDescription;
 import org.apache.felix.ipojo.architecture.InstanceDescription;
+import org.apache.felix.ipojo.metadata.Attribute;
 import org.apache.felix.ipojo.metadata.Element;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 
+
 /**
  * Composite Instance Description.
  * 
@@ -68,6 +74,36 @@
         return new InstanceDescription[0];
     }
 
+    /**
+     * Gets the list of internally published services.
+     * @return the list of published services.
+     */
+    public Element getInternalServices() {
+        Element services = new Element("services", "");
+        ServiceContext internal = ((CompositeManager) m_instance)
+                .getServiceContext();
+        try {
+            ServiceReference[] refs = internal.getServiceReferences(null, "(!(objectclass=" + Factory.class.getName() + "))");
+            for (int i = 0; refs != null && i < refs.length; i++) {
+                Element svc = new Element("service", "");
+                String[] keys = refs[i].getPropertyKeys();
+                for (int j = 0; j < keys.length; j++) {
+                    Object v = refs[i].getProperty(keys[j]);
+                    if (v instanceof String[]) {
+                        List l = Arrays.asList((String[]) v);
+                        svc.addAttribute(new Attribute(keys[j], l.toString()));
+                    } else {
+                        svc.addAttribute(new Attribute(keys[j], v.toString()));
+                    }
+                }
+                services.addElement(svc);
+            }
+
+        } catch (InvalidSyntaxException e) {
+            // Cannot happen
+        }
+        return services;
+    }
     
     /**
      * Gets the instance description.
@@ -76,7 +112,8 @@
      */
     public Element getDescription() {
         Element elem = super.getDescription();
-        // Contained instance (exposing architecture) (empty if primitive)
+        elem.addElement(getInternalServices());
+
         InstanceDescription[] descs = getContainedInstances();
         if (descs.length > 0) {
             Element inst = new Element("ContainedInstances", "");
@@ -85,6 +122,7 @@
             }
             elem.addElement(inst);
         }
+        
         return elem;
     }