- * While it is perfectly fine for clients to call the Riverbed executor with - * an object only implementing the Runnable interface, the RbRunnable is a - * place holder for future tracing enhancments for Riverbed. + * While it is perfectly fine for clients to call the DSF executor with + * an object only implementing the Runnable interface, the DsfRunnable is a + * place holder for future tracing enhancments for DSF. */ abstract public class DsfRunnable implements Runnable { } diff --git a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/DsfSequence.java b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/DsfSequence.java index b8f852585b2..47c752d0af7 100644 --- a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/DsfSequence.java +++ b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/DsfSequence.java @@ -22,7 +22,7 @@ import org.eclipse.dd.dsf.DsfPlugin; *
* Certain complex tasks require multiple commands to be executed in a chain, * because for example result of one command is used as input into another - * command. The typical Riverbed pattern of solving this problem is the following: + * command. The typical DSF pattern of solving this problem is the following: *
* For completeness this service interface derives from
* Properties of a session are following:
- *
@@ -27,8 +27,8 @@ import org.eclipse.dd.dsf.concurrent.DsfExecutor;
* additional properties should be used when registering the service to allow clients
* to uniquely identify the services.
*
- * By convention, all methods of Riverbed services can be called only on the dispatch
- * thread of the Riverbed executor that is associated with the service. If a
+ * By convention, all methods of DSF services can be called only on the dispatch
+ * thread of the DSF executor that is associated with the service. If a
* service exposes a method that is to be called on non-dispatch thread, it should
* be documented so.
*
@@ -40,7 +40,7 @@ public interface IDsfService {
/**
* Property name for the session-id of this service. This property should be set by
- * all Riverbed services when they are registered with OSGI service framework.
+ * all DSF services when they are registered with OSGI service framework.
*/
static String PROP_SESSION_ID = "org.eclipse.dd.dsf.service.IService.session_id";
IDataModelData
* and has a method which allows clients to retrieve the DMC that represents the
diff --git a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/AbstractDsfService.java b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/AbstractDsfService.java
index 196e66c1bed..98c674b9f39 100644
--- a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/AbstractDsfService.java
+++ b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/AbstractDsfService.java
@@ -22,8 +22,8 @@ import org.osgi.framework.ServiceRegistration;
/**
- * Standard base implementation of the Riverbed service. This is a convinience
- * class that provides the basic functionality that all Riverbed services have
+ * Standard base implementation of the DSF service. This is a convinience
+ * class that provides the basic functionality that all DSF services have
* to implement.
*/
abstract public class AbstractDsfService
diff --git a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/DsfServicesTracker.java b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/DsfServicesTracker.java
index 5821e8796a6..6c9b440e31c 100644
--- a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/DsfServicesTracker.java
+++ b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/DsfServicesTracker.java
@@ -19,7 +19,7 @@ import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
/**
- * Convenience class to help track Riverbed services that a given
+ * Convenience class to help track DSF services that a given
* client needs to use. This class is similar to the standard OSGI
* org.osgi.util.tracker.ServiceTracker class, with a few differences:
*
1. This class is assumed to be accessed by a single thread hence it
@@ -28,7 +28,7 @@ import org.osgi.framework.ServiceReference;
*
2. This class is primarily designed to track multiple services of
* different type (class), while OSGI ServiceTracker is designed to work with
* single class type, with optional filtering options.
- *
3. This class uses knowledge of Riverbed sessions to help narrow down
+ *
3. This class uses knowledge of DSF sessions to help narrow down
* service references.
*
4. OSGI Service tracker explicitly listens to OSGI service
* startup/shutdown events and it will clear a reference to a service as
@@ -76,7 +76,7 @@ public class DsfServicesTracker {
/**
* Only constructor.
* @param bundleContext Context of the plugin that the client lives in.
- * @param sessionId The Riverbed session that this tracker will be used for.
+ * @param sessionId The DSF session that this tracker will be used for.
*/
public DsfServicesTracker(BundleContext bundleContext, String sessionId) {
fBundleContext = bundleContext;
diff --git a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/DsfSession.java b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/DsfSession.java
index aa273865fa9..33820e7114b 100644
--- a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/DsfSession.java
+++ b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/DsfSession.java
@@ -32,12 +32,12 @@ import org.eclipse.dd.dsf.concurrent.DsfRunnable;
import org.osgi.framework.Filter;
/**
- * Class to manage Riverbed sessions. A Riverbed session is a way to
- * associate a set of Riverbed services that are running simultaneously and
+ * Class to manage DSF sessions. A DSF session is a way to
+ * associate a set of DSF services that are running simultaneously and
* are interacting with each other to provide a complete set of functionality.
*
1. Each session is associated with a single Riverbed executor, although there
+ *
1. Each session is associated with a single DSF executor, although there
* could be multiple sessions using the same executor.
*
2. Each session has a unique String identifier, which has to be used by
* the services belonging to this session when registering with OSGI services.
@@ -135,7 +135,7 @@ public class DsfSession
* Starts and returns a new session instance. This method can be called on any
* thread, but the session-started listeners will be called using the session's
* executor.
- * @param executor The Riverbed executor to use for this session.
+ * @param executor The DSF executor to use for this session.
* @return instance object of the new session
*/
public static DsfSession startSession(DsfExecutor executor) {
@@ -214,7 +214,7 @@ public class DsfSession
/** Returns the ID of this session */
public String getId() { return fId; }
- /** Returns the Riverbed executor of this session */
+ /** Returns the DSF executor of this session */
public DsfExecutor getExecutor() { return fExecutor; }
/**
@@ -241,7 +241,7 @@ public class DsfSession
/**
* Retrieves and increments the startup counter for services in this session.
- * Riverbed services should retrieve this counter when they are initialized,
+ * DSF services should retrieve this counter when they are initialized,
* and should return it through IService.getStartupNumber(). This number is then
* used to prioritize service events.
* @return current startup counter value
diff --git a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/IDsfService.java b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/IDsfService.java
index 82e5c310e32..26f72fec26e 100644
--- a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/IDsfService.java
+++ b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/IDsfService.java
@@ -16,7 +16,7 @@ import org.eclipse.dd.dsf.concurrent.Done;
import org.eclipse.dd.dsf.concurrent.DsfExecutor;
/**
- * The inteface that all Riverbed services must implement. It only privides a
+ * The inteface that all DSF services must implement. It only privides a
* few features to help manage and identify the servies using the OSGI services
* framework.
*