summaryrefslogtreecommitdiff
path: root/CIAO/connectors
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-06-21 08:47:15 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-06-21 08:47:15 +0000
commit1f9ab197260c6ab80fb183617517a16ea0671525 (patch)
tree1510096d20ed8808900020acf243aae4c9492479 /CIAO/connectors
parent708ad86664a9c2fa8c309d42c04f383a366ad0af (diff)
downloadATCD-1f9ab197260c6ab80fb183617517a16ea0671525.tar.gz
Mon Jun 21 08:46:04 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/ami4ccm/ami4ccm/ami4ccm.h: * connectors/ami4ccm/ami4ccm/ami4ccm.idl: Added some more documentation * connectors/ami4ccm/docs/AMI4CCM-explanation.odt: * connectors/ami4ccm/docs/AMI4CCM-spec.odt: Some initial updates
Diffstat (limited to 'CIAO/connectors')
-rw-r--r--CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h1
-rw-r--r--CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl9
-rw-r--r--CIAO/connectors/ami4ccm/docs/AMI4CCM-explanation.odtbin15964 -> 25036 bytes
-rw-r--r--CIAO/connectors/ami4ccm/docs/AMI4CCM-spec.odtbin20334 -> 20767 bytes
4 files changed, 9 insertions, 1 deletions
diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h
index adff1d42a04..71fb08df9f5 100644
--- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h
+++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.h
@@ -30,6 +30,7 @@ namespace CCM_AMI
public:
ExceptionHolder_i (::Messaging::ExceptionHolder* holder);
+ /// Rethrow the original exception
virtual void raise_exception (void);
private:
diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl
index fa2c491f572..d2f5d2559fc 100644
--- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl
+++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl
@@ -11,6 +11,7 @@ module CCM_AMI
{
native UserExceptionBase;
+ /// Exception holder to rethrow the original exception
local interface ExceptionHolder
{
void raise_exception() raises (UserExceptionBase);
@@ -21,10 +22,16 @@ module CCM_AMI
{
};
+ /// Base class for all AMI4CCM connectors
connector AMI4CCM_Base
{
};
-
+
+ /**
+ * Templated Connector module for AMI4CC. Expects
+ * two template arguments, the original interface and
+ * its AMI4CCM counterpart
+ */
module Connector_T<interface T, interface AMI4CCM_T>
{
porttype AMI4CCM_Port_Type
diff --git a/CIAO/connectors/ami4ccm/docs/AMI4CCM-explanation.odt b/CIAO/connectors/ami4ccm/docs/AMI4CCM-explanation.odt
index fe474abf2d1..63eae0ee929 100644
--- a/CIAO/connectors/ami4ccm/docs/AMI4CCM-explanation.odt
+++ b/CIAO/connectors/ami4ccm/docs/AMI4CCM-explanation.odt
Binary files differ
diff --git a/CIAO/connectors/ami4ccm/docs/AMI4CCM-spec.odt b/CIAO/connectors/ami4ccm/docs/AMI4CCM-spec.odt
index 1a944433525..6eea66da930 100644
--- a/CIAO/connectors/ami4ccm/docs/AMI4CCM-spec.odt
+++ b/CIAO/connectors/ami4ccm/docs/AMI4CCM-spec.odt
Binary files differ