From fb0fd74800776c7f628c26787f43d9bc11ebdcb2 Mon Sep 17 00:00:00 2001 From: Pawel Piech Date: Wed, 16 Aug 2006 16:48:25 +0000 Subject: [PATCH] Renamed remaining "Riverbed"s to "DSF"s. --- plugins/org.eclipse.dd.dsf/META-INF/MANIFEST.MF | 2 +- .../dd/dsf/concurrent/DefaultDsfExecutor.java | 4 ++-- .../src/org/eclipse/dd/dsf/concurrent/Done.java | 2 +- .../eclipse/dd/dsf/concurrent/DsfRunnable.java | 6 +++--- .../eclipse/dd/dsf/concurrent/DsfSequence.java | 16 ++++++++-------- .../eclipse/dd/dsf/debug/IBackEndProcess.java | 2 +- .../src/org/eclipse/dd/dsf/debug/IModules.java | 2 +- .../eclipse/dd/dsf/model/IDataModelService.java | 2 +- .../dd/dsf/service/AbstractDsfService.java | 4 ++-- .../dd/dsf/service/DsfServicesTracker.java | 6 +++--- .../org/eclipse/dd/dsf/service/DsfSession.java | 12 ++++++------ .../org/eclipse/dd/dsf/service/IDsfService.java | 8 ++++---- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/plugins/org.eclipse.dd.dsf/META-INF/MANIFEST.MF b/plugins/org.eclipse.dd.dsf/META-INF/MANIFEST.MF index 5f065af667f..b9ae36656fd 100644 --- a/plugins/org.eclipse.dd.dsf/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.dd.dsf/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Riverbed Plug-in +Bundle-Name: DSF Plug-in Bundle-SymbolicName: org.eclipse.dd.dsf Bundle-Version: 1.0.0 Bundle-Activator: org.eclipse.dd.dsf.DsfPlugin diff --git a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/DefaultDsfExecutor.java b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/DefaultDsfExecutor.java index 3bd4e996661..5247c800a17 100644 --- a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/DefaultDsfExecutor.java +++ b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/DefaultDsfExecutor.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.dd.dsf.DsfPlugin; /** - * Default implementation of a Riverbed executor interfaces, based on the + * Default implementation of a DSF executor interfaces, based on the * standard java.util.concurrent.ThreadPoolExecutor. */ @@ -29,7 +29,7 @@ public class DefaultDsfExecutor extends ScheduledThreadPoolExecutor Thread fThread; public Thread newThread(Runnable r) { assert fThread == null; // Should be called only once. - fThread = new Thread(new ThreadGroup("Riverbed Thread Group"), r, "Riverbed Dispatch Thread", 0); + fThread = new Thread(new ThreadGroup("DSF Thread Group"), r, "DSF Dispatch Thread", 0); return fThread; } } diff --git a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/Done.java b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/Done.java index 74d9cc58df8..1c7632d546b 100644 --- a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/Done.java +++ b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/Done.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.dd.dsf.DsfPlugin; /** - * Base class for Riverbed service method-completion callbacks. By default + * Base class for DSF service method-completion callbacks. By default * all callbacks that indicate a complition of a method contain the status * of the result. *
NOTE: Access to the status data is not synchronized, so diff --git a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/DsfRunnable.java b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/DsfRunnable.java index caf610210ae..65bc577c7df 100644 --- a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/DsfRunnable.java +++ b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/DsfRunnable.java @@ -13,9 +13,9 @@ package org.eclipse.dd.dsf.concurrent; /** * A DSF-instrumented alternative to the Runnable interface. *

- * 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: *

  • *
    1. original caller passes a Done callback to a method and invokes it *
    2. the method is executed by a subsystem @@ -49,7 +49,7 @@ abstract public class DsfSequence { * The abstract class that each step has to implement *
    FIXME: convert execute() and rollBacl() to take "done" as an argument. * This way we can make step a static class, and make its paradigm - * more consistent with rest of Riverbed. + * more consistent with rest of DSF. */ abstract public class Step { public void execute() { stepFinished(); } @@ -69,7 +69,7 @@ abstract public class DsfSequence { /** * Default constructor. If this constructor is used, the steps need to be initialized * before the sequence can be invoked. - * @param executor the Riverbed executor which will be used to invoke all steps + * @param executor the DSF executor which will be used to invoke all steps */ public DsfSequence(DsfExecutor executor) { this(executor, null); @@ -77,7 +77,7 @@ abstract public class DsfSequence { /** * Constructor that initialized the steps. - * @param executor the Riverbed executor which will be used to invoke all steps + * @param executor the DSF executor which will be used to invoke all steps * @param steps sequence steps */ public DsfSequence(DsfExecutor executor, Step[] steps) { @@ -85,7 +85,7 @@ abstract public class DsfSequence { fSteps = steps; } - /** Returns the riverbed executor for this sequence */ + /** Returns the DSF executor for this sequence */ public DsfExecutor getExecutor() { return fExecutor; } /** @@ -119,7 +119,7 @@ abstract public class DsfSequence { /** * Returns index of the step that is currently being executed. *
    NOTE: After sequence is invoked, this method should be called - * only in the Riverbed executor thread. + * only in the DSF executor thread. * @return */ public int getCurrentIdx() { return fCurrentStepIdx; } @@ -150,9 +150,9 @@ abstract public class DsfSequence { } /** - * Submits this sequence to the Riverbed executor, and blocks waiting for the + * Submits this sequence to the DSF executor, and blocks waiting for the * sequence to complete. - *
    NOTE: This method is NOT to be called on the Riverbed executor thread. + *
    NOTE: This method is NOT to be called on the DSF executor thread. */ public synchronized void invoke() { assert !fExecutor.isInExecutorThread() : diff --git a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/debug/IBackEndProcess.java b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/debug/IBackEndProcess.java index f8dae4b15df..094e63d0d2c 100644 --- a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/debug/IBackEndProcess.java +++ b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/debug/IBackEndProcess.java @@ -16,7 +16,7 @@ public interface IBackEndProcess extends IDsfService { * same time, a service property is needed to allow clients to distinguish * between them. */ - static final String PROCESS_ID = "org.eclipse.dsdp.riverbed.debug.BackendProcess.PROCESS_ID"; + static final String PROCESS_ID = "org.eclipse.dsdp.DSF.debug.BackendProcess.PROCESS_ID"; /** * Event indicating that the back end process has terminated. diff --git a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/debug/IModules.java b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/debug/IModules.java index 803dd2f0558..d15b2939322 100644 --- a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/debug/IModules.java +++ b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/debug/IModules.java @@ -13,7 +13,7 @@ import org.eclipse.dd.dsf.model.IDataModelService; * Debugger service representing module handling logic of a debugger. *
    * TODO: I meant this as a replacement for Application service as well as the - * registry API in Riverbed 1. But I still don't fully understand the format + * registry API in DSF 1. But I still don't fully understand the format * of the symbol data that is stored in the registry, so that needs to be added * to this interface. */ diff --git a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/model/IDataModelService.java b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/model/IDataModelService.java index dd39a162707..9ce857005fe 100644 --- a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/model/IDataModelService.java +++ b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/model/IDataModelService.java @@ -14,7 +14,7 @@ import org.eclipse.dd.dsf.concurrent.GetDataDone; import org.eclipse.dd.dsf.service.IDsfService; /** - * Interface for Riverbed services that provide model data to clients. + * Interface for DSF services that provide model data to clients. *

    * For completeness this service interface derives from 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. *

    * Properties of a session are following: - *
    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. *

    @@ -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";