[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "single-build-dir" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Apr 26 11:50:15 CDT 2011
branch "single-build-dir" has been updated
discards c913a14dc06a449b0bd8b526cafc7dcc362ab607 (commit)
via ccc9fef2f724df94c7b313a815eda7dcb43ddcda (commit)
via 9f9d5030c25864f2998439d0a648553a71528128 (commit)
via ed832a3e584ad82c47f5f3c76c1f024b91566420 (commit)
via f98052b0ad439cf31b1c3b0ba8991b095fa01fcd (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (c913a14dc06a449b0bd8b526cafc7dcc362ab607)
\
N -- N -- N (ccc9fef2f724df94c7b313a815eda7dcb43ddcda)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Summary of changes:
AsteriskSCF/System/Component/ConfigurationIf.ice | 132 +++++++++++-----------
AsteriskSCF/System/WorkQueue/WorkQueueIf.ice | 18 ++--
2 files changed, 75 insertions(+), 75 deletions(-)
- Log -----------------------------------------------------------------
commit ccc9fef2f724df94c7b313a815eda7dcb43ddcda
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Apr 25 17:46:21 2011 -0500
Changes to work with new single-build-directory CMake script.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f26841..8d97fc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,8 @@
# All rights reserved.
#
+asterisk_scf_project(API 3.4)
+
asterisk_scf_component_init(asterisk-scf-api CXX)
# Make all of our slice definitions available to... themselves!
commit 9f9d5030c25864f2998439d0a648553a71528128
Author: Mark Michelson <mmichelson at digium.com>
Date: Mon Apr 25 15:53:16 2011 -0500
Change the WorkNotFound exception to a WorkInProgress exception.
It was decided that trying to cancel nonexistent work is not really
exceptional. However, trying to cancel work that is not cancellable
due to its being suspended or executing is a different matter, so
the SuspendableQueue can throw the WorkInProgress exception now.
diff --git a/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice b/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice
index f09ad14..d4ad1a3 100644
--- a/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice
+++ b/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice
@@ -76,9 +76,9 @@ module V1
/**
* Exception thrown when attempting to cancel a work item that is
- * not in a Queue or SuspendableQueue
+ * currently executing in a SuspendableQueue;
*/
- local exception WorkNotFound
+ local exception WorkInProgress
{
};
@@ -110,14 +110,13 @@ module V1
* Cancel a previously queued work item.
*
* Searches the queue for the specified work item. If found,
- * the item is removed, otherwise WorkNotFound is thrown. Note
- * that if multiple copies of a Work item are in the queue, only
- * the frontmost one will be removed as a result of this method
- * call.
+ * the item is removed. Note that if multiple copies of a Work
+ * item are in the queue, only the frontmost one will be removed
+ * as a result of this method call.
*
* @param item The item to be canceled
*/
- void cancelWork(Work item) throws WorkNotFound;
+ void cancelWork(Work item);
/**
* Pop the front item from the queue and call its execute() method
@@ -225,14 +224,15 @@ module V1
* Cancel a previously queued SuspendableWork item.
*
* Searches the queue for the specified work item. If found,
- * the item is removed, otherwise WorkNotFound is thrown. Note
+ * the item is removed. If the item to be removed is currently in
+ * progress or suspended, then WorkInProgress is thrown. Note
* that if multiple copies of a SuspendableWork item are in the
* queue, only the frontmost one will be removed as a result of
* this method call.
*
* @param item The item to be canceled
*/
- void cancelWork(SuspendableWork item) throws WorkNotFound;
+ void cancelWork(SuspendableWork item) throws WorkInProgress;
/**
* Pop the front item from the queue and call its execute() method
commit ed832a3e584ad82c47f5f3c76c1f024b91566420
Merge: f98052b 93dd1c7
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Apr 21 16:37:08 2011 -0500
Merge branch 'master' of git.asterisk.org:asterisk-scf/release/slice
commit f98052b0ad439cf31b1c3b0ba8991b095fa01fcd
Author: Mark Michelson <mmichelson at digium.com>
Date: Wed Apr 20 14:06:03 2011 -0500
Fix spacing in ConfigurationIf.ice
It was just bugging me too much.
diff --git a/AsteriskSCF/System/Component/ConfigurationIf.ice b/AsteriskSCF/System/Component/ConfigurationIf.ice
index 1fed82f..4537fea 100644
--- a/AsteriskSCF/System/Component/ConfigurationIf.ice
+++ b/AsteriskSCF/System/Component/ConfigurationIf.ice
@@ -43,18 +43,18 @@ module V1
["visitor:ConfigurationItemVisitor"]
class ConfigurationItem
{
- /**
- * Serial number of the configuration item. This number should be incremented each
- * time an update is sent to the setConfiguration method on the Configuration interface.
- *
- * If the serial number is older than is currently presently on the configured item then
- * an exception will be thrown indicating that the configured item has already been changed
- * from another source.
- *
- * The serial number check can be disabled by passing a serial number of -1. This will force
- * the update to proceed no matter what.
- */
- int serialNumber;
+ /**
+ * Serial number of the configuration item. This number should be incremented each
+ * time an update is sent to the setConfiguration method on the Configuration interface.
+ *
+ * If the serial number is older than is currently presently on the configured item then
+ * an exception will be thrown indicating that the configured item has already been changed
+ * from another source.
+ *
+ * The serial number check can be disabled by passing a serial number of -1. This will force
+ * the update to proceed no matter what.
+ */
+ int serialNumber;
};
/**
@@ -78,10 +78,10 @@ module V1
["visitor:ConfigurationGroupVisitor"]
class ConfigurationGroup
{
- /**
- * Dictionary of configuration items for this group.
- */
- ConfigurationItemDict configurationItems;
+ /**
+ * Dictionary of configuration items for this group.
+ */
+ ConfigurationItemDict configurationItems;
};
/**
@@ -94,16 +94,16 @@ module V1
*/
exception SerialConflict
{
- /**
- * The configuration group that the item belongs to. This includes all configuration items so that
- * they can all be updated and retried.
- */
- ConfigurationGroup group;
-
- /**
- * The configuration item that the serial conflict applies to.
- */
- ConfigurationItem item;
+ /**
+ * The configuration group that the item belongs to. This includes all configuration items so that
+ * they can all be updated and retried.
+ */
+ ConfigurationGroup group;
+
+ /**
+ * The configuration item that the serial conflict applies to.
+ */
+ ConfigurationItem item;
};
/**
@@ -117,61 +117,61 @@ module V1
interface ConfigurationService
{
/**
- * Retrieves a sequence of configuration groups containing the configuration items specified
- * in the ConfigurationGroup classes in the sequence itself and their current values.
- *
- * @param groups A sequence of group classes to be retrieved, along with the configuration items to be retrieved
- * in each class.
- *
- * @return A sequence of group classes containing the current values of the configuration items requested.
- *
- */
+ * Retrieves a sequence of configuration groups containing the configuration items specified
+ * in the ConfigurationGroup classes in the sequence itself and their current values.
+ *
+ * @param groups A sequence of group classes to be retrieved, along with the configuration items to be retrieved
+ * in each class.
+ *
+ * @return A sequence of group classes containing the current values of the configuration items requested.
+ *
+ */
idempotent ConfigurationGroupSeq getConfiguration(ConfigurationGroupSeq groups);
/**
- * Retrieves a sequence of configuration groups containing all the configuration items and
- * their current values.
- *
- * @param groups A sequence of group classes to be retrieved.
- *
- * @return A sequence of group classes containing the current values of the configuration items requested.
- *
- */
+ * Retrieves a sequence of configuration groups containing all the configuration items and
+ * their current values.
+ *
+ * @param groups A sequence of group classes to be retrieved.
+ *
+ * @return A sequence of group classes containing the current values of the configuration items requested.
+ *
+ */
idempotent ConfigurationGroupSeq getConfigurationAll(ConfigurationGroupSeq groups);
/**
- * Retrieves a sequence of current configuration groups. This does not return all the configuration items.
- * If the configuration items are needed the getConfiguration method must be called afterwards.
- *
- * @return A sequence of current configuration groups.
- *
- */
+ * Retrieves a sequence of current configuration groups. This does not return all the configuration items.
+ * If the configuration items are needed the getConfiguration method must be called afterwards.
+ *
+ * @return A sequence of current configuration groups.
+ *
+ */
idempotent ConfigurationGroupSeq getConfigurationGroups();
/**
- * Update the configuration of one or more configuration groups.
- *
- * @param groups The groups and configuration items to update (or add).
- *
- * @throws SerialConflict when serial number of a configuration item is out of date.
- *
- */
+ * Update the configuration of one or more configuration groups.
+ *
+ * @param groups The groups and configuration items to update (or add).
+ *
+ * @throws SerialConflict when serial number of a configuration item is out of date.
+ *
+ */
idempotent void setConfiguration(ConfigurationGroupSeq groups) throws SerialConflict;
/**
- * Remove specific configuration items from a configuration group.
- *
- * @param groups The groups or configuration items to remove.
- *
- */
+ * Remove specific configuration items from a configuration group.
+ *
+ * @param groups The groups or configuration items to remove.
+ *
+ */
void removeConfigurationItems(ConfigurationGroupSeq groups);
/**
- * Remove a configuration group and all configuration items.
- *
- * @param groups The groups or configuration items to remove.
- *
- */
+ * Remove a configuration group and all configuration items.
+ *
+ * @param groups The groups or configuration items to remove.
+ *
+ */
void removeConfigurationGroups(ConfigurationGroupSeq groups);
};
-----------------------------------------------------------------------
--
asterisk-scf/integration/slice.git
More information about the asterisk-scf-commits
mailing list