You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2010/07/04 23:03:17 UTC
svn commit: r960396 - in
/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime:
FactorySet.java ServiceBuilder.java ServiceFactory.java
Author: pderop
Date: Sun Jul 4 21:03:17 2010
New Revision: 960396
URL: http://svn.apache.org/viewvc?rev=960396&view=rev
Log:
renamed ServiceFactory.java class into FactorySet.java
Added:
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactorySet.java
- copied, changed from r960272, felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceFactory.java
Removed:
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceFactory.java
Modified:
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java
Copied: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactorySet.java (from r960272, felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceFactory.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactorySet.java?p2=felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactorySet.java&p1=felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceFactory.java&r1=960272&r2=960396&rev=960396&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceFactory.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactorySet.java Sun Jul 4 21:03:17 2010
@@ -42,7 +42,7 @@ import org.osgi.service.log.LogService;
* Service instance.
*/
@SuppressWarnings( { "unchecked" })
-public class ServiceFactory extends AbstractSet<Dictionary>
+public class FactorySet extends AbstractSet<Dictionary>
{
/**
* The actual Service instance that is allocated for each dictionaries added in this Set.
@@ -152,7 +152,7 @@ public class ServiceFactory extends Abst
* @param provide The Services provided by this Service
* @param factoryConfigure The configure callback invoked in order to pass configurations added in this Set.
*/
- public ServiceFactory(Bundle b, MetaData srvMeta, List<MetaData> depsMeta)
+ public FactorySet(Bundle b, MetaData srvMeta, List<MetaData> depsMeta)
{
m_serviceProperties = srvMeta.getDictionary(Params.properties, null);
m_provide = srvMeta.getStrings(Params.provide, null);
@@ -299,7 +299,7 @@ public class ServiceFactory extends Abst
@Override
public String toString()
{
- return ServiceFactory.class.getName() + "(" + m_services.size() + " active instances)";
+ return FactorySet.class.getName() + "(" + m_services.size() + " active instances)";
}
/**
Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java?rev=960396&r1=960395&r2=960396&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java Sun Jul 4 21:03:17 2010
@@ -82,8 +82,8 @@ public class ServiceBuilder extends Serv
// We don't instantiate the service, but instead we provide a Set in the registry.
// This Set will act as a factory and another component may registers some
// service configurations into it in order to fire some service instantiations.
- ServiceFactory serviceFactory = new ServiceFactory(b, srvMeta, depsMeta);
- service.setImplementation(serviceFactory);
+ FactorySet factorySet = new FactorySet(b, srvMeta, depsMeta);
+ service.setImplementation(factorySet);
service.setCallbacks(null, "start", "stop", null);
Hashtable<String, String> props = new Hashtable<String, String>();
props.put(DM_FACTORY_NAME, factory);