[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "route_replica" created.

[Commits to the Asterisk SCF project code repositories]

branch "route_replica" has been created
        at  493f06c8eb9b1f8f1e3c3fa259078eead3db7df4 (commit)

- Log -----------------------------------------------------------------
commit 493f06c8eb9b1f8f1e3c3fa259078eead3db7df4
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Mon Mar 7 01:18:31 2011 -0600

    Changes required for routing replication:
     - Transaction support operations
     - Component test interface

diff --git a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index aea965c..f81f94c 100644
--- a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -38,6 +38,13 @@ module V1
    const string Version = "V1";
 
    /**
+    * Context entry key for transactional operations.
+	* An item with this key will be placed in the Ice context
+	* of certain operaions.
+	*/
+	const string TransactionKey = "TransactionId"; 
+
+   /**
     * Forward declaration for the Session interface.
     */
     interface Session;
diff --git a/AsteriskSCF/System/Component/ComponentServiceIf.ice b/AsteriskSCF/System/Component/ComponentServiceIf.ice
index d374e29..c76a0f8 100644
--- a/AsteriskSCF/System/Component/ComponentServiceIf.ice
+++ b/AsteriskSCF/System/Component/ComponentServiceIf.ice
@@ -46,39 +46,57 @@ module V1
    exception Suspended { };
 
    /**
-    * Service is the base interface for all AsteriskSCF services. Most components will include an implementation
+    * This is the base interface for all AsteriskSCF services. Most components will include an implementation
     * of this or a derived interface.
     */
-   interface ComponentService
-   {
-      /**
-       * Suspends activity in the service. In general this means that the primary activity of a service
-       * is suspended. Queries about state etc, may or may not be available. Calling suspend on a service
-       * that is suspended should be treated as a no-op.
-       *
-       * @throws ShuttingDown if the service is in the process of shutting down.
-       */
-      void suspend() throws ShuttingDown;
-
-      /**
-       * Resumes a service that has been suspended. After this call returns the suspended service
-       * must be ready to handle requests in a manner consistent with its state at the time the service
-       * was suspended.
-       *
-       * @throws ShuttingDown if the service is in the process of shutting down.
-       */
-      void resume() throws ShuttingDown;
-
-      /**
-       * Commences a clean shutdown of the services. The details of shutdown are implementation specific.
-       * For example, some services will begin to reject requests immediately after being shutdown but
-       * resume requests currently being handled. Others might abort requests in progress. A component
-       * implementing this interface should indicate if requests will be aborted or not on shutdown.
-       *
-       * @throws Suspended if the service is suspended.
-       */
-      void shutdown() throws Suspended;
-   };
+    interface ComponentService
+    {
+        /**
+         * Suspends activity in the service. In general this means that the primary activity of a service
+         * is suspended. Queries about state etc, may or may not be available. Calling suspend on a service
+         * that is suspended should be treated as a no-op.
+         *
+         * @throws ShuttingDown if the service is in the process of shutting down.
+         */
+        void suspend() throws ShuttingDown;
+
+        /**
+         * Resumes a service that has been suspended. After this call returns the suspended service
+         * must be ready to handle requests in a manner consistent with its state at the time the service
+         * was suspended.
+         *
+         * @throws ShuttingDown if the service is in the process of shutting down.
+         */
+        void resume() throws ShuttingDown;
+
+        /**
+         * Commences a clean shutdown of the services. The details of shutdown are implementation specific.
+         * For example, some services will begin to reject requests immediately after being shutdown but
+         * resume requests currently being handled. Others might abort requests in progress. A component
+         * implementing this interface should indicate if requests will be aborted or not on shutdown.
+         *
+         * @throws Suspended if the service is suspended.
+         */
+         void shutdown() throws Suspended;
+    };
+
+	/** 
+	 * A base class to enable arbitary parameter passing to the ComponentTest inteface.
+	 */
+	class ComponentTestParam {};
+    sequence<ComponentTestParam> ComponentTestParamSeq;
+
+	const string ComponentTestFacet = "TestFacet";
+
+    /**
+     * This interface is expsed as an optional facet on ComponentService. Release builds of components
+	 * will never have this interface present for security reasons.
+     */
+    interface ComponentTest
+	{
+	    void setTestMode(string mode);
+		void setTestModeWithArgs(string mode, ComponentTestParamSeq params);
+    };
 
 }; /*  End of V1 */
 

commit 2bc6c47c93bf0cf0c5667428b38790ac9f445d15
Merge: 6ecd31b 030aad4
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Mar 3 16:44:46 2011 -0600

    Merge branch 'master' of gitdepot:asterisk-scf/release/slice into route_async


commit 6ecd31ba74fac3e9d9de5012a58a64e58656f5d9
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Mar 3 11:02:56 2011 -0600

    Changes to support replication in routing service.

diff --git a/Core/Routing/RoutingIf.ice b/Core/Routing/RoutingIf.ice
index 0514cda..f8dcdc3 100644
--- a/Core/Routing/RoutingIf.ice
+++ b/Core/Routing/RoutingIf.ice
@@ -216,7 +216,7 @@ module V1
 	  *
 	  * @param result Indicates whether or not the attempt was successful.
 	  */
-	 void addEndpointLocatorEvent(string id, RegExSeq destinationIdRangeList, OperationResult result);
+	 void addEndpointLocatorEvent(string id, RegExSeq destinationIdRangeList, EndpointLocator *locator, OperationResult result);
 
 	 /**
 	  * Notification that an attempt was made to remove an EndpointLocator.

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/slice.git