You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2010/03/20 21:19:15 UTC
svn commit: r925673 - in
/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm:
dependencies/ResourceDependency.java dependencies/ServiceDependency.java
impl/dependencies/ResourceDependencyImpl.java
Author: marrs
Date: Sat Mar 20 20:19:15 2010
New Revision: 925673
URL: http://svn.apache.org/viewvc?rev=925673&view=rev
Log:
Prefixed some methods in interfaces with 'public', implemented instance bound feature in resource dependencies.
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ResourceDependency.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ServiceDependency.java
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ResourceDependency.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ResourceDependency.java?rev=925673&r1=925672&r2=925673&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ResourceDependency.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ResourceDependency.java Sat Mar 20 20:19:15 2010
@@ -32,7 +32,7 @@ public interface ResourceDependency exte
* @param removed the method to call when a service was removed
* @return this service dependency
*/
- ResourceDependency setCallbacks(String added, String removed) ;
+ public ResourceDependency setCallbacks(String added, String removed) ;
/**
* Sets the callbacks for this service. These callbacks can be used as hooks whenever a
@@ -45,7 +45,7 @@ public interface ResourceDependency exte
* @param removed the method to call when a service was removed
* @return this service dependency
*/
- ResourceDependency setCallbacks(String added, String changed, String removed);
+ public ResourceDependency setCallbacks(String added, String changed, String removed);
/**
* Sets the callbacks for this service. These callbacks can be used as hooks whenever a
@@ -58,7 +58,7 @@ public interface ResourceDependency exte
* @param removed the method to call when a service was removed
* @return this service dependency
*/
- ResourceDependency setCallbacks(Object instance, String added, String removed);
+ public ResourceDependency setCallbacks(Object instance, String added, String removed);
/**
* Sets the callbacks for this service. These callbacks can be used as hooks whenever a
@@ -72,7 +72,7 @@ public interface ResourceDependency exte
* @param removed the method to call when a service was removed
* @return this service dependency
*/
- ResourceDependency setCallbacks(Object instance, String added, String changed, String removed);
+ public ResourceDependency setCallbacks(Object instance, String added, String changed, String removed);
/**
* Sets auto configuration for this service. Auto configuration allows the
@@ -82,7 +82,7 @@ public interface ResourceDependency exte
* @param autoConfig the value of auto config
* @return this service dependency
*/
- ResourceDependency setAutoConfig(boolean autoConfig);
+ public ResourceDependency setAutoConfig(boolean autoConfig);
/**
* Sets auto configuration for this service. Auto configuration allows the
@@ -92,13 +92,15 @@ public interface ResourceDependency exte
* @param instanceName the name of attribute to auto config
* @return this service dependency
*/
- ResourceDependency setAutoConfig(String instanceName);
+ public ResourceDependency setAutoConfig(String instanceName);
- ResourceDependency setResource(Resource resource);
+ public ResourceDependency setResource(Resource resource);
- ResourceDependency setRequired(boolean required);
+ public ResourceDependency setRequired(boolean required);
- ResourceDependency setFilter(String resourceFilter);
+ public ResourceDependency setFilter(String resourceFilter);
- ResourceDependency setPropagate(boolean propagate);
+ public ResourceDependency setPropagate(boolean propagate);
+
+ public ResourceDependency setInstanceBound(boolean isInstanceBound);
}
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ServiceDependency.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ServiceDependency.java?rev=925673&r1=925672&r2=925673&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ServiceDependency.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/dependencies/ServiceDependency.java Sat Mar 20 20:19:15 2010
@@ -33,7 +33,7 @@ public interface ServiceDependency exten
* @param serviceName the name of the service
* @return this service dependency
*/
- ServiceDependency setService(Class serviceName);
+ public ServiceDependency setService(Class serviceName);
/**
* Sets the name of the service that should be tracked. You can either specify
@@ -46,7 +46,7 @@ public interface ServiceDependency exten
* @param serviceFilter the filter condition
* @return this service dependency
*/
- ServiceDependency setService(Class serviceName, String serviceFilter);
+ public ServiceDependency setService(Class serviceName, String serviceFilter);
/**
* Sets the filter for the services that should be tracked. Any service object
@@ -56,7 +56,7 @@ public interface ServiceDependency exten
* @param serviceFilter the filter condition
* @return this service dependency
*/
- ServiceDependency setService(String serviceFilter);
+ public ServiceDependency setService(String serviceFilter);
/**
* Sets the name of the service that should be tracked. You can either specify
@@ -68,7 +68,7 @@ public interface ServiceDependency exten
* @param serviceReference the service reference to track
* @return this service dependency
*/
- ServiceDependency setService(Class serviceName, ServiceReference serviceReference);
+ public ServiceDependency setService(Class serviceName, ServiceReference serviceReference);
/**
* Sets the default implementation for this service dependency. You can use this to supply
@@ -80,7 +80,7 @@ public interface ServiceDependency exten
* instantiate this implementation
* @return this service dependency
*/
- ServiceDependency setDefaultImplementation(Object implementation);
+ public ServiceDependency setDefaultImplementation(Object implementation);
/**
* Sets the required flag which determines if this service is required or not.
@@ -88,7 +88,7 @@ public interface ServiceDependency exten
* @param required the required flag
* @return this service dependency
*/
- ServiceDependency setRequired(boolean required);
+ public ServiceDependency setRequired(boolean required);
/**
* Sets auto configuration for this service. Auto configuration allows the
@@ -98,7 +98,7 @@ public interface ServiceDependency exten
* @param autoConfig the value of auto config
* @return this service dependency
*/
- ServiceDependency setAutoConfig(boolean autoConfig);
+ public ServiceDependency setAutoConfig(boolean autoConfig);
/**
* Sets auto configuration for this service. Auto configuration allows the
@@ -108,7 +108,7 @@ public interface ServiceDependency exten
* @param instanceName the name of attribute to auto config
* @return this service dependency
*/
- ServiceDependency setAutoConfig(String instanceName);
+ public ServiceDependency setAutoConfig(String instanceName);
/**
* Sets the callbacks for this service. These callbacks can be used as hooks whenever a
@@ -120,7 +120,7 @@ public interface ServiceDependency exten
* @param removed the method to call when a service was removed
* @return this service dependency
*/
- ServiceDependency setCallbacks(String added, String removed);
+ public ServiceDependency setCallbacks(String added, String removed);
/**
* Sets the callbacks for this service. These callbacks can be used as hooks whenever a
@@ -133,7 +133,7 @@ public interface ServiceDependency exten
* @param removed the method to call when a service was removed
* @return this service dependency
*/
- ServiceDependency setCallbacks(String added, String changed, String removed);
+ public ServiceDependency setCallbacks(String added, String changed, String removed);
/**
* Sets the callbacks for this service. These callbacks can be used as hooks whenever a
@@ -146,7 +146,7 @@ public interface ServiceDependency exten
* @param removed the method to call when a service was removed
* @return this service dependency
*/
- ServiceDependency setCallbacks(Object instance, String added, String removed);
+ public ServiceDependency setCallbacks(Object instance, String added, String removed);
/**
* Sets the callbacks for this service. These callbacks can be used as hooks whenever a
@@ -160,7 +160,7 @@ public interface ServiceDependency exten
* @param removed the method to call when a service was removed
* @return this service dependency
*/
- ServiceDependency setCallbacks(Object instance, String added, String changed, String removed);
+ public ServiceDependency setCallbacks(Object instance, String added, String changed, String removed);
public ServiceDependency setInstanceBound(boolean isInstanceBound);
}
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java?rev=925673&r1=925672&r2=925673&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ResourceDependencyImpl.java Sat Mar 20 20:19:15 2010
@@ -53,6 +53,7 @@ public class ResourceDependencyImpl impl
private List m_resources = new ArrayList();
private Resource m_resourceInstance;
private boolean m_propagate;
+ private boolean m_isInstanceBound;
public ResourceDependencyImpl(BundleContext context, Logger logger) {
m_context = context;
@@ -69,7 +70,12 @@ public class ResourceDependencyImpl impl
}
public boolean isInstanceBound() {
- return false; // TODO for now we are never bound to the service implementation instance
+ return m_isInstanceBound;
+ }
+
+ public ResourceDependency setInstanceBound(boolean isInstanceBound) {
+ m_isInstanceBound = isInstanceBound;
+ return this;
}
public void start(DependencyService service) {