felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1602646 - in /felix/trunk/scr/src: main/java/org/apache/felix/scr/impl/ main/java/org/apache/felix/scr/impl/config/ main/java/org/apache/felix/scr/impl/manager/ test/java/org/apache/felix/scr/integration/ test/resources/
Date Sun, 15 Jun 2014 01:10:19 GMT
Author: djencks
Date: Sun Jun 15 01:10:18 2014
New Revision: 1602646

URL: http://svn.apache.org/r1602646
Log:
FELIX-4402 make the ServiceComponentRuntime work with factory components, and make tests pass

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ConfigurationComponentFactoryImpl.java
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java
    felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentConfigurationTest.java
    felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentDisposeTest.java
    felix/trunk/scr/src/test/resources/integration_test_simple_components.xml

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java?rev=1602646&r1=1602645&r2=1602646&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java Sun Jun
15 01:10:18 2014
@@ -373,7 +373,7 @@ public class ComponentRegistry implement
     {
         Activator.log(LogService.LOG_DEBUG, null, 
                 "Registering component with pid {0} for bundle {1}",
-                new Object[] {componentHolder.getComponentMetadata().getConfigurationPid(),key.getBundleId()},
+                new Object[] {componentHolder.getComponentMetadata().getConfigurationPid(),
key.getBundleId()},
                 null);
         synchronized ( m_componentHoldersByName )
         {
@@ -551,28 +551,7 @@ public class ComponentRegistry implement
      */
     public ComponentHolder createComponentHolder( BundleComponentActivator activator, ComponentMetadata
metadata )
     {
-        ComponentHolder holder = null;//TODO not null
-
-        if (metadata.isFactory())
-        {
-            // 112.2.4 SCR must register a Component Factory
-            // service on behalf of the component
-            // as soon as the component factory is satisfied
-            if ( !metadata.isObsoleteFactoryComponentFactory() )
-            {
-//TODO                holder = new ComponentFactoryImpl(this );
-            }
-            else
-            {
-//TODO                holder = new ConfigurationComponentFactoryImpl(activator );
-            }
-        }
-        else
-        {
-            holder = new ConfigurableComponentHolder(activator, metadata);
-        }
-
-        return holder;
+        return new ConfigurableComponentHolder(activator, metadata);
     }
 
 

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java?rev=1602646&r1=1602645&r2=1602646&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
Sun Jun 15 01:10:18 2014
@@ -35,6 +35,8 @@ import org.apache.felix.scr.impl.Targete
 import org.apache.felix.scr.impl.helper.ComponentMethods;
 import org.apache.felix.scr.impl.helper.SimpleLogger;
 import org.apache.felix.scr.impl.manager.AbstractComponentManager;
+import org.apache.felix.scr.impl.manager.ComponentFactoryImpl;
+import org.apache.felix.scr.impl.manager.ConfigurationComponentFactoryImpl;
 import org.apache.felix.scr.impl.manager.SingleComponentManager;
 import org.apache.felix.scr.impl.manager.ServiceFactoryComponentManager;
 import org.apache.felix.scr.impl.metadata.ComponentMetadata;
@@ -153,13 +155,20 @@ public class ConfigurableComponentHolder
         this.m_enabled = false;
     }
 
-    protected SingleComponentManager<S> createComponentManager()
+    protected AbstractComponentManager<S> createComponentManager()
     {
 
-        SingleComponentManager<S> manager;
+        AbstractComponentManager<S> manager;
         if ( m_componentMetadata.isFactory() )
         {
-            throw new IllegalArgumentException( "Cannot create component factory for " +
m_componentMetadata.getName() );
+            if ( !m_componentMetadata.isObsoleteFactoryComponentFactory() )
+            {
+                manager = new ComponentFactoryImpl<S>(this );
+            }
+            else
+            {
+                manager = new ConfigurationComponentFactoryImpl<S>(this );
+            }
         }
         else if ( m_componentMetadata.getServiceScope() == Scope.bundle )
         {
@@ -598,7 +607,7 @@ public class ConfigurableComponentHolder
                 else
                 {
                     for (String pid: m_factoryConfigurations.keySet()) {
-                        SingleComponentManager<S> scm = createComponentManager();
+                        AbstractComponentManager<S> scm = createComponentManager();
                         m_components.put(pid, scm);
                         scm.reconfigure( mergeProperties( pid ), false);
                         cms.add( scm );
@@ -731,29 +740,34 @@ public class ConfigurableComponentHolder
      */
     List<AbstractComponentManager<S>> getComponentManagers( final boolean clear
)
     {
-        List<AbstractComponentManager<S>> cm;
+        List<AbstractComponentManager<S>> cms;
         if ( m_components.isEmpty() )
         {
             if ( m_singleComponent != null)
             {
-                cm = Collections.singletonList(m_singleComponent);
+                cms = new ArrayList<AbstractComponentManager<S>>();
+                m_singleComponent.getComponentManagers(cms);
             }
             else 
             {
-                cm = Collections.emptyList();
+                cms = Collections.emptyList();
             }
         }
 
         else
         {
-            cm = new ArrayList<AbstractComponentManager<S>>(m_components.values());
+            cms = new ArrayList<AbstractComponentManager<S>>();
+            for (AbstractComponentManager<S> cm: m_components.values())
+            {
+                cm.getComponentManagers(cms);
+            }
         }
         if ( clear )
         {
             m_components.clear();
             m_singleComponent = null;
         }
-        return cm;
+        return cms;
     }
 
     public boolean isLogEnabled( int level )

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java?rev=1602646&r1=1602645&r2=1602646&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
Sun Jun 15 01:10:18 2014
@@ -52,7 +52,6 @@ import org.apache.felix.scr.impl.helper.
 import org.apache.felix.scr.impl.metadata.ComponentMetadata;
 import org.apache.felix.scr.impl.metadata.ReferenceMetadata;
 import org.apache.felix.scr.impl.metadata.ServiceMetadata;
-import org.apache.felix.scr.impl.metadata.ServiceMetadata.Scope;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceException;
@@ -79,7 +78,7 @@ public abstract class AbstractComponentM
         "Component disabled",
         "Bundle stopped"};
     
-    protected final ComponentContainer m_container;
+    protected final ComponentContainer<S> m_container;
 
     private final boolean m_factoryInstance;
     // the ID of this component
@@ -132,16 +131,16 @@ public abstract class AbstractComponentM
      * @param container
      * @param componentMethods
      */
-    protected AbstractComponentManager( ComponentContainer container, ComponentMethods componentMethods
)
+    protected AbstractComponentManager( ComponentContainer<S> container, ComponentMethods
componentMethods )
     {
         this( container, componentMethods, false );
     }
     
-    protected AbstractComponentManager( ComponentContainer container, ComponentMethods componentMethods,
boolean factoryInstance )
+    protected AbstractComponentManager( ComponentContainer<S> container, ComponentMethods
componentMethods, boolean factoryInstance )
     {
         m_factoryInstance = factoryInstance;
         m_container = container;
-        this.m_componentMethods = componentMethods;
+        m_componentMethods = componentMethods;
         m_componentId = -1;
         
         ComponentMetadata metadata = container.getComponentMetadata();
@@ -1448,7 +1447,8 @@ public abstract class AbstractComponentM
         return m_internalEnabled;
     }
 
-    //TODO NEW!!
-	public abstract void reconfigure(Map<String, Object> value, boolean b);
+	public abstract void reconfigure(Map<String, Object> configuration, boolean configurationDeleted);
+	
+	public abstract void getComponentManagers(List<AbstractComponentManager<S>>
cms);
     
 }

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java?rev=1602646&r1=1602645&r2=1602646&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
Sun Jun 15 01:10:18 2014
@@ -96,7 +96,7 @@ public class ComponentFactoryImpl<S> ext
     {
         super( container, new ComponentMethods() );
         m_componentInstances = new IdentityHashMap<SingleComponentManager<S>, SingleComponentManager<S>>();
-        m_configuration = new Hashtable<String, Object>();
+        m_configuration = new HashMap<String, Object>();
     }
 
 
@@ -333,125 +333,125 @@ public class ComponentFactoryImpl<S> ext
     }
 
 
-    //---------- ComponentHolder interface
-
-    public void configurationDeleted( TargetedPID pid, TargetedPID factoryPid )
-    {
-        m_targetedPID = null;
-        if ( pid.equals( getComponentMetadata().getConfigurationPid() ) )
-        {
-            log( LogService.LOG_DEBUG, "Handling configuration removal", null );
-
-            m_changeCount = -1;
-            // nothing to do if there is no configuration currently known.
-            if ( !m_hasConfiguration )
-            {
-                log( LogService.LOG_DEBUG, "ignoring configuration removal: not currently
configured", null );
-                return;
-            }
-
-            // So far, we were configured: clear the current configuration.
-            m_hasConfiguration = false;
-            m_configuration = new Hashtable<String, Object>();
-
-            log( LogService.LOG_DEBUG, "Current component factory state={0}", new Object[]
{getState()}, null );
-
-            // And deactivate if we are not currently disposed and if configuration is required
-            if ( ( getState() & STATE_DISPOSED ) == 0 && getComponentMetadata().isConfigurationRequired()
)
-            {
-                log( LogService.LOG_DEBUG, "Deactivating component factory (required configuration
has gone)", null );
-                deactivateInternal( ComponentConstants.DEACTIVATION_REASON_CONFIGURATION_DELETED,
true, false );
-            }
-        }
-        else
-        {
-            // 112.7 Factory Configuration not allowed for factory component
-            log( LogService.LOG_ERROR, "Component Factory cannot be configured by factory
configuration", null );
-        }
-    }
-
-
-    public boolean configurationUpdated( TargetedPID pid, TargetedPID factoryPid, Dictionary<String,
Object> configuration, long changeCount )
-    {
-    	//TODO this needs somehow to be the same code as in ConfigurableComponentHolder.
-        if ( m_targetedPID != null && !m_targetedPID.equals( pid ))
-        {
-            log( LogService.LOG_ERROR, "ImmediateComponentHolder unexpected change in targetedPID
from {0} to {1}",
-                    new Object[] {m_targetedPID, pid}, null);
-            throw new IllegalStateException("Unexpected targetedPID change");
-        }
-        m_targetedPID = pid;
-        if ( configuration != null )
-        {
-            if ( changeCount <= m_changeCount )
-            {
-                log( LogService.LOG_DEBUG,
-                        "ImmediateComponentHolder out of order configuration updated for
pid {0} with existing count {1}, new count {2}",
-                        new Object[] { getComponentMetadata().getConfigurationPid(), m_changeCount,
changeCount }, null );
-                return false;
-            }
-            m_changeCount = changeCount;
-        }
-        else 
-        {
-            m_changeCount = -1;
-        }
-        if ( pid.equals( getComponentMetadata().getConfigurationPid() ) )
-        {
-            log( LogService.LOG_DEBUG, "Configuration PID updated for Component Factory",
null );
-
-            // Ignore the configuration if our policy is 'ignore'
-            if ( getComponentMetadata().isConfigurationIgnored() )
-            {
-                return false;
-            }
-
-            // Store the config admin configuration
-//            m_configuration = configuration;
-
-            // We are now configured from config admin.
-            m_hasConfiguration = true;
-
-            log( LogService.LOG_DEBUG, "Current ComponentFactory state={0}", new Object[]
-                    {getState()}, null );
-
-            // If we are active, but if some config target filters don't match anymore
-            // any required references, then deactivate.
-            if ( getState() == STATE_FACTORY )
-            {
-                log( LogService.LOG_DEBUG, "Verifying if Active Component Factory is still
satisfied", null );
-
-                // First update target filters.
-                updateTargets( getProperties() );
-
-                // Next, verify dependencies
-                if ( !verifyDependencyManagers() )
-                {
-                    log( LogService.LOG_DEBUG,
-                            "Component Factory target filters not satisfied anymore: deactivating",
null );
-                    deactivateInternal( ComponentConstants.DEACTIVATION_REASON_REFERENCE,
false, false );
-                    return false;
-                }
-            }
-
-            // Unsatisfied component and required configuration may change targets
-            // to satisfy references.
-            if ( getState() == STATE_UNSATISFIED && getComponentMetadata().isConfigurationRequired()
)
-            {
-                // try to activate our component factory, if all dependnecies are satisfied
-                log( LogService.LOG_DEBUG, "Attempting to activate unsatisfied component",
null );
-                // First update target filters.
-                updateTargets( getProperties() );
-                activateInternal( getTrackingCount().get() );
-            }
-        }
-        else
-        {
-            // 112.7 Factory Configuration not allowed for factory component
-            log( LogService.LOG_ERROR, "Component Factory cannot be configured by factory
configuration", null );
-        }
-        return false;
-    }
+//    //---------- ComponentHolder interface
+//
+//    public void configurationDeleted( TargetedPID pid, TargetedPID factoryPid )
+//    {
+//        m_targetedPID = null;
+//        if ( pid.equals( getComponentMetadata().getConfigurationPid() ) )
+//        {
+//            log( LogService.LOG_DEBUG, "Handling configuration removal", null );
+//
+//            m_changeCount = -1;
+//            // nothing to do if there is no configuration currently known.
+//            if ( !m_hasConfiguration )
+//            {
+//                log( LogService.LOG_DEBUG, "ignoring configuration removal: not currently
configured", null );
+//                return;
+//            }
+//
+//            // So far, we were configured: clear the current configuration.
+//            m_hasConfiguration = false;
+//            m_configuration = new Hashtable<String, Object>();
+//
+//            log( LogService.LOG_DEBUG, "Current component factory state={0}", new Object[]
{getState()}, null );
+//
+//            // And deactivate if we are not currently disposed and if configuration is
required
+//            if ( ( getState() & STATE_DISPOSED ) == 0 && getComponentMetadata().isConfigurationRequired()
)
+//            {
+//                log( LogService.LOG_DEBUG, "Deactivating component factory (required configuration
has gone)", null );
+//                deactivateInternal( ComponentConstants.DEACTIVATION_REASON_CONFIGURATION_DELETED,
true, false );
+//            }
+//        }
+//        else
+//        {
+//            // 112.7 Factory Configuration not allowed for factory component
+//            log( LogService.LOG_ERROR, "Component Factory cannot be configured by factory
configuration", null );
+//        }
+//    }
+//
+//
+//    public boolean configurationUpdated( TargetedPID pid, TargetedPID factoryPid, Dictionary<String,
Object> configuration, long changeCount )
+//    {
+//    	//TODO this needs somehow to be the same code as in ConfigurableComponentHolder.
+//        if ( m_targetedPID != null && !m_targetedPID.equals( pid ))
+//        {
+//            log( LogService.LOG_ERROR, "ImmediateComponentHolder unexpected change in targetedPID
from {0} to {1}",
+//                    new Object[] {m_targetedPID, pid}, null);
+//            throw new IllegalStateException("Unexpected targetedPID change");
+//        }
+//        m_targetedPID = pid;
+//        if ( configuration != null )
+//        {
+//            if ( changeCount <= m_changeCount )
+//            {
+//                log( LogService.LOG_DEBUG,
+//                        "ImmediateComponentHolder out of order configuration updated for
pid {0} with existing count {1}, new count {2}",
+//                        new Object[] { getComponentMetadata().getConfigurationPid(), m_changeCount,
changeCount }, null );
+//                return false;
+//            }
+//            m_changeCount = changeCount;
+//        }
+//        else 
+//        {
+//            m_changeCount = -1;
+//        }
+//        if ( pid.equals( getComponentMetadata().getConfigurationPid() ) )
+//        {
+//            log( LogService.LOG_DEBUG, "Configuration PID updated for Component Factory",
null );
+//
+//            // Ignore the configuration if our policy is 'ignore'
+//            if ( getComponentMetadata().isConfigurationIgnored() )
+//            {
+//                return false;
+//            }
+//
+//            // Store the config admin configuration
+////            m_configuration = configuration;
+//
+//            // We are now configured from config admin.
+//            m_hasConfiguration = true;
+//
+//            log( LogService.LOG_DEBUG, "Current ComponentFactory state={0}", new Object[]
+//                    {getState()}, null );
+//
+//            // If we are active, but if some config target filters don't match anymore
+//            // any required references, then deactivate.
+//            if ( getState() == STATE_FACTORY )
+//            {
+//                log( LogService.LOG_DEBUG, "Verifying if Active Component Factory is still
satisfied", null );
+//
+//                // First update target filters.
+//                updateTargets( getProperties() );
+//
+//                // Next, verify dependencies
+//                if ( !verifyDependencyManagers() )
+//                {
+//                    log( LogService.LOG_DEBUG,
+//                            "Component Factory target filters not satisfied anymore: deactivating",
null );
+//                    deactivateInternal( ComponentConstants.DEACTIVATION_REASON_REFERENCE,
false, false );
+//                    return false;
+//                }
+//            }
+//
+//            // Unsatisfied component and required configuration may change targets
+//            // to satisfy references.
+//            if ( getState() == STATE_UNSATISFIED && getComponentMetadata().isConfigurationRequired()
)
+//            {
+//                // try to activate our component factory, if all dependnecies are satisfied
+//                log( LogService.LOG_DEBUG, "Attempting to activate unsatisfied component",
null );
+//                // First update target filters.
+//                updateTargets( getProperties() );
+//                activateInternal( getTrackingCount().get() );
+//            }
+//        }
+//        else
+//        {
+//            // 112.7 Factory Configuration not allowed for factory component
+//            log( LogService.LOG_ERROR, "Component Factory cannot be configured by factory
configuration", null );
+//        }
+//        return false;
+//    }
 
 
     public synchronized long getChangeCount( TargetedPID pid, TargetedPID targetedPid)
@@ -560,10 +560,28 @@ public class ComponentFactoryImpl<S> ext
 
 
 	@Override
-	public void reconfigure(Map<String, Object> value, boolean b) {
-		// TODO Auto-generated method stub
-		
+	public void reconfigure(Map<String, Object> configuration, boolean configurationDeleted)
{
+		m_configuration = configuration;
+		List<SingleComponentManager<S>> cms;
+		synchronized (m_componentInstances)
+        {
+            cms = new ArrayList<SingleComponentManager<S>>(m_componentInstances.keySet());
+        }
+		for (SingleComponentManager<S> cm: cms)
+		{
+		    cm.reconfigure( configuration, configurationDeleted);
+		}
 	}
 
 
+    @Override
+    public void getComponentManagers(List<AbstractComponentManager<S>> cms)
+    {
+        synchronized (m_componentInstances)
+        {
+            cms.addAll(m_componentInstances.keySet());
+        }
+    }
+
+
 }

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ConfigurationComponentFactoryImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ConfigurationComponentFactoryImpl.java?rev=1602646&r1=1602645&r2=1602646&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ConfigurationComponentFactoryImpl.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ConfigurationComponentFactoryImpl.java
Sun Jun 15 01:10:18 2014
@@ -115,77 +115,77 @@ public class ConfigurationComponentFacto
 
     //---------- ComponentHolder interface
 
-    public void configurationDeleted( TargetedPID pid, TargetedPID factoryPid )
-    {
-        if ( pid.equals( getComponentMetadata().getConfigurationPid() ) )
-        {
-            super.configurationDeleted( pid, factoryPid );
-        }
-        else
-        {
-            SingleComponentManager<S> cm;
-            synchronized ( m_configuredServices )
-            {
-                cm = m_configuredServices.remove( pid );
-            }
-
-            if ( cm != null )
-            {
-                log( LogService.LOG_DEBUG, "Disposing component after configuration deletion",
null );
-
-                cm.dispose();
-            }
-        }
-    }
-
-
-    public boolean configurationUpdated( TargetedPID targetedPid, TargetedPID factoryTargetedPid,
Dictionary<String, Object> configuration, long changeCount )
-    {
-    	return false;
+//    public void configurationDeleted( TargetedPID pid, TargetedPID factoryPid )
+//    {
 //        if ( pid.equals( getComponentMetadata().getConfigurationPid() ) )
 //        {
-//            return super.configurationUpdated( targetedPid, factoryTargetedPid, configuration,
changeCount );
+//            super.configurationDeleted( pid, factoryPid );
 //        }
-//        else   //non-spec backwards compatible
+//        else
 //        {
 //            SingleComponentManager<S> cm;
 //            synchronized ( m_configuredServices )
 //            {
-//                cm = m_configuredServices.get( pid );
+//                cm = m_configuredServices.remove( pid );
 //            }
 //
-//            if ( cm == null )
+//            if ( cm != null )
 //            {
-//                // create a new instance with the current configuration
-//                cm = createConfigurationComponentManager();
+//                log( LogService.LOG_DEBUG, "Disposing component after configuration deletion",
null );
 //
-//                // this should not call component reactivation because it is
-//                // not active yet
-//                cm.reconfigure( configuration, changeCount, m_targetedPID );
+//                cm.dispose();
+//            }
+//        }
+//    }
 //
-//                // enable asynchronously if components are already enabled
-//                if ( getState() == STATE_FACTORY )
-//                {
-//                    cm.enable( false );
-//                }
 //
-//                synchronized ( m_configuredServices )
-//                {
-//                    // keep a reference for future updates
-//                    m_configuredServices.put( pid, cm );
-//                }
-//                return true;
+//    public boolean configurationUpdated( TargetedPID targetedPid, TargetedPID factoryTargetedPid,
Dictionary<String, Object> configuration, long changeCount )
+//    {
+//    	return false;
+////        if ( pid.equals( getComponentMetadata().getConfigurationPid() ) )
+////        {
+////            return super.configurationUpdated( targetedPid, factoryTargetedPid, configuration,
changeCount );
+////        }
+////        else   //non-spec backwards compatible
+////        {
+////            SingleComponentManager<S> cm;
+////            synchronized ( m_configuredServices )
+////            {
+////                cm = m_configuredServices.get( pid );
+////            }
+////
+////            if ( cm == null )
+////            {
+////                // create a new instance with the current configuration
+////                cm = createConfigurationComponentManager();
+////
+////                // this should not call component reactivation because it is
+////                // not active yet
+////                cm.reconfigure( configuration, changeCount, m_targetedPID );
+////
+////                // enable asynchronously if components are already enabled
+////                if ( getState() == STATE_FACTORY )
+////                {
+////                    cm.enable( false );
+////                }
+////
+////                synchronized ( m_configuredServices )
+////                {
+////                    // keep a reference for future updates
+////                    m_configuredServices.put( pid, cm );
+////                }
+////                return true;
+////
+////            }
+////            else
+////            {
+////                // update the configuration as if called as ManagedService
+////                cm.reconfigure( configuration, changeCount, m_targetedPID );
+////                return false;
+////            }
+////        }
+//    }
 //
-//            }
-//            else
-//            {
-//                // update the configuration as if called as ManagedService
-//                cm.reconfigure( configuration, changeCount, m_targetedPID );
-//                return false;
-//            }
-//        }
-    }
-
 
     public List<? extends ComponentManager<S>> getComponents()
     {

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java?rev=1602646&r1=1602645&r2=1602646&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java
Sun Jun 15 01:10:18 2014
@@ -20,7 +20,6 @@ package org.apache.felix.scr.impl.manage
 
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -30,20 +29,17 @@ import java.util.concurrent.CountDownLat
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.felix.scr.impl.BundleComponentActivator;
-import org.apache.felix.scr.impl.TargetedPID;
 import org.apache.felix.scr.impl.config.ComponentContainer;
-import org.apache.felix.scr.impl.config.ComponentManager;
 import org.apache.felix.scr.impl.config.ReferenceManager;
 import org.apache.felix.scr.impl.helper.ActivateMethod.ActivatorParameter;
 import org.apache.felix.scr.impl.helper.ComponentMethods;
 import org.apache.felix.scr.impl.helper.MethodResult;
 import org.apache.felix.scr.impl.helper.ModifiedMethod;
-import org.apache.felix.scr.impl.metadata.ReferenceMetadata;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceFactory;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.ComponentConstants;
-import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.ComponentInstance;
 import org.osgi.service.log.LogService;
 
@@ -80,12 +76,12 @@ public class SingleComponentManager<S> e
      * The constructor receives both the activator and the metadata
  * @param componentMethods
      */
-    public SingleComponentManager( ComponentContainer container, ComponentMethods componentMethods
)
+    public SingleComponentManager( ComponentContainer<S> container, ComponentMethods
componentMethods )
     {
         this(container, componentMethods, false);
     }
     
-    public SingleComponentManager( ComponentContainer container, ComponentMethods componentMethods,
+    public SingleComponentManager( ComponentContainer<S> container, ComponentMethods
componentMethods,
             boolean factoryInstance )
     {
         super( container, componentMethods, factoryInstance );
@@ -429,18 +425,31 @@ public class SingleComponentManager<S> e
         if ( m_properties == null )
         {
 
-        	
+
             // 1. Merge all the config properties
-        	Map<String, Object> props = new HashMap<String, Object>();
-        	if ( m_configurationProperties != null ) 
-        	{
-				props.putAll(m_configurationProperties);
-			}
-			if ( m_factoryProperties != null)
-        	{
-        		props.putAll(m_factoryProperties);
-        	}
-                    
+            Map<String, Object> props = new HashMap<String, Object>();
+            if ( m_configurationProperties != null ) 
+            {
+                props.putAll(m_configurationProperties);
+            }
+            if ( m_factoryProperties != null)
+            {
+                props.putAll(m_factoryProperties);
+                if (getComponentMetadata().isDS13() && m_factoryProperties.containsKey(Constants.SERVICE_PID))
+                {
+                    List<String> servicePids = (List<String>) m_configurationProperties.get(Constants.SERVICE_PID);
+                    if (servicePids == null) 
+                    {
+                        servicePids = new ArrayList<String>();
+                    }
+                    if (m_factoryProperties.get(Constants.SERVICE_PID) instanceof String)
+                    {
+                        servicePids.add((String)m_factoryProperties.get(Constants.SERVICE_PID));
+                    }
+                    props.put(Constants.SERVICE_PID, servicePids);
+                }
+            }
+
             // 2. set component.name and component.id
             props.put( ComponentConstants.COMPONENT_NAME, getComponentMetadata().getName()
);
             props.put( ComponentConstants.COMPONENT_ID, getId() );
@@ -626,7 +635,7 @@ public class SingleComponentManager<S> e
                     }
                     finally
                     {
-                        releaseActivationWriteeLock( "reconfigure.deactivate.activate" );;
+                        releaseActivationWriteeLock( "reconfigure.deactivate.activate" );
                     }
                     activateInternal( getTrackingCount().get() );
                 }
@@ -923,4 +932,10 @@ public class SingleComponentManager<S> e
         return getComponentMetadata().isDelayedKeepInstances();
     }
 
+    @Override
+    public void getComponentManagers(List<AbstractComponentManager<S>> cms)
+    {
+        cms.add(this);
+    }
+
 }

Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentConfigurationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentConfigurationTest.java?rev=1602646&r1=1602645&r2=1602646&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentConfigurationTest.java
(original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentConfigurationTest.java
Sun Jun 15 01:10:18 2014
@@ -19,7 +19,9 @@
 package org.apache.felix.scr.integration;
 
 
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
@@ -178,7 +180,8 @@ public class ComponentConfigurationTest 
     {
         final String pid = "DynamicConfigurationComponent";
         boolean pre13 = true;
-        dynamicConfigTest(pid, pre13);
+        boolean recreateOnDelete = true;
+        dynamicConfigTest(pid, pre13, recreateOnDelete);
     }
 
     @Test
@@ -186,19 +189,33 @@ public class ComponentConfigurationTest 
     {
         final String pid = "DynamicConfigurationComponent13";
         boolean pre13 = false;
-        dynamicConfigTest(pid, pre13);
+        boolean recreateOnDelete = false;
+        dynamicConfigTest(pid, pre13, recreateOnDelete);
     }
     
     @Test
     public void test_SimpleComponent_dynamic_configuration_flag()
     {
         final String pid = "DynamicConfigurationComponentFlag";
-        boolean pre13 = false;
-        dynamicConfigTest(pid, pre13);
+        boolean pre13 = true;
+        boolean recreateOnDelete = false;
+        dynamicConfigTest(pid, pre13, recreateOnDelete);
     }
 
 
-	private void dynamicConfigTest(final String pid, boolean pre13) {
+	private void dynamicConfigTest(final String pid, boolean pre13, boolean recreateOnDelete)
{
+	    Object pidWithout;
+	    Object pidWith;
+	    if (pre13)
+	    {
+	        pidWithout = pid + ".description";
+	        pidWith = pid;
+	    }
+	    else 
+	    {
+	        pidWithout = Collections.singletonList(pid + ".description");
+	        pidWith = Arrays.asList(new String[] {pid + ".description", pid});
+	    }
         deleteConfig( pid );
         delay();
 
@@ -206,7 +223,7 @@ public class ComponentConfigurationTest 
 
         TestCase.assertNotNull( SimpleComponent.INSTANCE );
         TestCase.assertNull( SimpleComponent.INSTANCE.getProperty( PROP_NAME ) );
-        TestCase.assertEquals( pid, SimpleComponent.INSTANCE.getProperty( Constants.SERVICE_PID
) );
+        TestCase.assertEquals(pidWithout, SimpleComponent.INSTANCE.getProperty(Constants.SERVICE_PID));
 
         final SimpleComponent instance = SimpleComponent.INSTANCE;
 
@@ -216,13 +233,13 @@ public class ComponentConfigurationTest 
         findComponentConfigurationByName(pid, ComponentConfigurationDTO.ACTIVE);
         TestCase.assertEquals( instance, SimpleComponent.INSTANCE );
         TestCase.assertEquals( PROP_NAME, SimpleComponent.INSTANCE.getProperty( PROP_NAME
) );
-        TestCase.assertEquals( pid, SimpleComponent.INSTANCE.getProperty( Constants.SERVICE_PID
) );
+        TestCase.assertEquals(pidWith, SimpleComponent.INSTANCE.getProperty(Constants.SERVICE_PID));
 
         deleteConfig( pid );
         delay();
 
         findComponentConfigurationByName(pid, ComponentConfigurationDTO.ACTIVE);
-        if (pre13)
+        if (recreateOnDelete)
         {
             TestCase.assertNotSame( instance, SimpleComponent.INSTANCE );
         }
@@ -231,7 +248,7 @@ public class ComponentConfigurationTest 
             TestCase.assertSame( instance, SimpleComponent.INSTANCE );
         }
         TestCase.assertNull( SimpleComponent.INSTANCE.getProperty( PROP_NAME ) );
-        TestCase.assertEquals( pid, SimpleComponent.INSTANCE.getProperty( Constants.SERVICE_PID
) );
+        TestCase.assertEquals(pidWithout, SimpleComponent.INSTANCE.getProperty(Constants.SERVICE_PID));
 
         disableAndCheck( cc );
         TestCase.assertNull( SimpleComponent.INSTANCE );

Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentDisposeTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentDisposeTest.java?rev=1602646&r1=1602645&r2=1602646&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentDisposeTest.java
(original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentDisposeTest.java
Sun Jun 15 01:10:18 2014
@@ -144,31 +144,31 @@ public class ComponentDisposeTest extend
 
         final SimpleComponent instance = SimpleComponent.INSTANCES.values().iterator().next();
 
-        final Object holder = getComponentHolder( instance.m_activateContext );
-        TestCase.assertNotNull( holder );
-
-        Map<?, ?> m_components = ( Map<?, ?> ) getFieldValue( holder, "m_components"
);
-        TestCase.assertNotNull( m_components );
-        TestCase.assertEquals( 1, m_components.size() );
+//        final Object holder = getComponentHolder( instance.m_activateContext );
+//        TestCase.assertNotNull( holder );
+//
+//        Map<?, ?> m_components = ( Map<?, ?> ) getFieldValue( holder, "m_components"
);
+//        TestCase.assertNotNull( m_components );
+//        TestCase.assertEquals( 1, m_components.size() );
     }
 
 
-    private static Object getComponentHolder( ComponentContext ctx )
-    {
-        try
-        {
-            final Class<?> ccImpl = getType( ctx, "ComponentContextImpl" );
-            final Field m_componentManager = getField( ccImpl, "m_componentManager" );
-            final Object acm = m_componentManager.get( ctx );
-
-            final Class<?> cmImpl = getType( acm, "SingleComponentManager" );
-            final Field m_componentHolder = getField( cmImpl, "m_componentHolder" );
-            return m_componentHolder.get( acm );
-        }
-        catch ( Throwable t )
-        {
-            TestCase.fail( "Cannot get ComponentHolder for " + ctx + ": " + t );
-            return null; // keep the compiler happy
-        }
-    }
+//    private static Object getComponentHolder( ComponentContext ctx )
+//    {
+//        try
+//        {
+//            final Class<?> ccImpl = getType( ctx, "ComponentContextImpl" );
+//            final Field m_componentManager = getField( ccImpl, "m_componentManager" );
+//            final Object acm = m_componentManager.get( ctx );
+//
+//            final Class<?> cmImpl = getType( acm, "SingleComponentManager" );
+//            final Field m_componentHolder = getField( cmImpl, "m_componentHolder" );
+//            return m_componentHolder.get( acm );
+//        }
+//        catch ( Throwable t )
+//        {
+//            TestCase.fail( "Cannot get ComponentHolder for " + ctx + ": " + t );
+//            return null; // keep the compiler happy
+//        }
+//    }
 }

Modified: felix/trunk/scr/src/test/resources/integration_test_simple_components.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/resources/integration_test_simple_components.xml?rev=1602646&r1=1602645&r2=1602646&view=diff
==============================================================================
--- felix/trunk/scr/src/test/resources/integration_test_simple_components.xml (original)
+++ felix/trunk/scr/src/test/resources/integration_test_simple_components.xml Sun Jun 15 01:10:18
2014
@@ -47,20 +47,20 @@
     <scr:component name="DynamicConfigurationComponent"
         enabled="false" modified="configure">
         <implementation class="org.apache.felix.scr.integration.components.SimpleComponent"
/>
-        <property name="service.pid" value="DynamicConfigurationComponent" />
+        <property name="service.pid" value="DynamicConfigurationComponent.description"
/>
     </scr:component>
 
     <scr13:component xmlns:scr13="http://www.osgi.org/xmlns/scr/v1.3.0" name="DynamicConfigurationComponent13"
         enabled="false" modified="configure">
         <implementation class="org.apache.felix.scr.integration.components.SimpleComponent"
/>
-        <property name="service.pid" value="DynamicConfigurationComponent13" />
+        <property name="service.pid" value="DynamicConfigurationComponent13.description"
/>
     </scr13:component>
 
     <scr:component xmlns:felix="http://felix.apache.org/xmlns/scr/extensions/v1.0.0" name="DynamicConfigurationComponentFlag"
         enabled="false" modified="configure"
         felix:deleteCallsModify="true">
         <implementation class="org.apache.felix.scr.integration.components.SimpleComponent"
/>
-        <property name="service.pid" value="DynamicConfigurationComponentFlag" />
+        <property name="service.pid" value="DynamicConfigurationComponentFlag.description"
/>
     </scr:component>
 
     <!-- component dynamically updates configuration with a required reference plus target-->



Mime
View raw message