diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-07 12:16:22 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-07 12:16:22 +0000 |
commit | 51f302fcda077a0bd2e2dea0bc73cbeb855116af (patch) | |
tree | ddf0c1e186809e1cc4642e2b0c0e5e8bae0368e5 | |
parent | 01e04c97e4dd0339f07254b112a5fd3028f4ef1f (diff) | |
download | ATCD-51f302fcda077a0bd2e2dea0bc73cbeb855116af.tar.gz |
Sun Jan 7 12:14:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
20 files changed, 462 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 2a282630ee7..b62ba593da1 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,27 @@ +Sun Jan 7 12:14:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/CCM_ClientContainerInterceptor.idl: + * ciao/CCM_ClientContainerInterceptorRegistration.idl: + * ciao/CCM_ContainerClientRequestInfo.idl: + * ciao/CCM_ContainerInterceptor.idl: + * ciao/CCM_ContainerRequestInfo.idl: + * ciao/CCM_ContainerServantRequestInfo.idl: + * ciao/CCM_ContainerServerRequestInfo.idl: + * ciao/CCM_ContainerStubRequestInfo.idl: + * ciao/CCM_ExtensionComponent.idl: + * ciao/CCM_ExtensionContext.idl: + * ciao/CCM_InvalidRegistration.idl: + * ciao/CCM_QoS.idl: + * ciao/CCM_ServantContainerInterceptor.idl: + * ciao/CCM_ServantContainerInterceptorRegistration.idl: + * ciao/CCM_ServerContainerInterceptor.idl: + * ciao/CCM_ServerContainerInterceptorRegistration.idl: + * ciao/CCM_StubContainerInterceptor.idl: + * ciao/CCM_StubContainerInterceptorRegistration.idl: + Added interfaces from QoS for CCM spec (OMG 06-04-15). We + don't have an implementation yet, just the interfaces at + this moment + Fri Jan 5 12:14:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/RepositoryManager/RepositoryManager.cpp: diff --git a/CIAO/ciao/CCM_ClientContainerInterceptor.idl b/CIAO/ciao/CCM_ClientContainerInterceptor.idl new file mode 100644 index 00000000000..27a5fdc8929 --- /dev/null +++ b/CIAO/ciao/CCM_ClientContainerInterceptor.idl @@ -0,0 +1,27 @@ +// $Id$ + +#if !defined (CCM_CLIENTCONTAINERINTERCEPTOR_IDL) +#define CCM_CLIENTCONTAINERINTERCEPTOR_IDL + +#include "ciao/CCM_ContainerInterceptor.idl" +#include "ciao/CCM_ContainerClientRequestInfo.idl" +#include "tao/PI/PIForwardRequest.pidl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface ClientContainerInterceptor : ContainerInterceptor + { + void send_request (in ContainerClientRequestInfo info) + raises (PortableInterceptor::ForwardRequest); + void send_poll (in ContainerClientRequestInfo info); + void receive_reply (in ContainerClientRequestInfo info); + void receive_exception (in ContainerClientRequestInfo info) + raises (PortableInterceptor::ForwardRequest); + void receive_other (in ContainerClientRequestInfo info) + raises (PortableInterceptor::ForwardRequest); + }; + }; +}; +#endif /* CCM_CLIENTCONTAINERINTERCEPTOR_IDL */ diff --git a/CIAO/ciao/CCM_ClientContainerInterceptorRegistration.idl b/CIAO/ciao/CCM_ClientContainerInterceptorRegistration.idl new file mode 100644 index 00000000000..031f06f1a0f --- /dev/null +++ b/CIAO/ciao/CCM_ClientContainerInterceptorRegistration.idl @@ -0,0 +1,24 @@ +// $Id$ + +#if !defined (CCM_CLIENTCONTAINERINTERCEPTORREGISTRATION_IDL) +#define CCM_CLIENTCONTAINERINTERCEPTORREGISTRATION_IDL + +#include "ciao/CCM_Cookie.idl" +#include "ciao/CCM_InvalidRegistration.idl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface ClientContainerInterceptor; + + local interface ClientContainerInterceptorRegistration + { + Components::Cookie register_client_interceptor (in ClientContainerInterceptor ci); + ClientContainerInterceptor unregister_client_interceptor (in Components::Cookie cookie) + raises(InvalidRegistration); + }; + }; +}; + +#endif /* CCM_CLIENTCONTAINERINTERCEPTORREGISTRATION_IDL */ diff --git a/CIAO/ciao/CCM_Configurator.idl b/CIAO/ciao/CCM_Configurator.idl index 0d84ff629bc..0d48f8e65cb 100644 --- a/CIAO/ciao/CCM_Configurator.idl +++ b/CIAO/ciao/CCM_Configurator.idl @@ -28,4 +28,4 @@ module Components raises (WrongComponentType); }; }; -#endif /* CCM_CONFIGURATOR_IDLL */ +#endif /* CCM_CONFIGURATOR_IDL */ diff --git a/CIAO/ciao/CCM_ContainerClientRequestInfo.idl b/CIAO/ciao/CCM_ContainerClientRequestInfo.idl new file mode 100644 index 00000000000..b44dac880b8 --- /dev/null +++ b/CIAO/ciao/CCM_ContainerClientRequestInfo.idl @@ -0,0 +1,20 @@ +// $Id$ + +#if !defined (CCM_CONTAINERCLIENTREQUESTINFO_IDL) +#define CCM_CONTAINERCLIENTREQUESTINFO_IDL + +#include "ciao/CCM_ContainerRequestInfo.idl" +#include "tao/PI/ClientRequestInfo.pidl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface ContainerClientRequestInfo : ContainerRequestInfo + { + PortableInterceptor::ClientRequestInfo request_info(); + }; + }; +}; + +#endif /* CCM_CONTAINERCLIENTREQUESTINFO_IDL */ diff --git a/CIAO/ciao/CCM_ContainerInterceptor.idl b/CIAO/ciao/CCM_ContainerInterceptor.idl new file mode 100644 index 00000000000..b5ccdf52fae --- /dev/null +++ b/CIAO/ciao/CCM_ContainerInterceptor.idl @@ -0,0 +1,21 @@ +// $Id$ + +#if !defined (CCM_CONTAINERPORTABLEINTERCEPTOR_IDL) +#define CCM_CONTAINERPORTABLEINTERCEPTOR_IDL + +#include "tao/PI_Forward.pidl" + +module Components { + + module ContainerPortableInterceptor { + + local interface ContainerInterceptor + { + readonly attribute string name; + void destroy (); + void set_slot_id(in PortableInterceptor::SlotId slot_id); + }; + }; +}; + +#endif /* CCM_CONTAINERPORTABLEINTERCEPTOR_IDL */ diff --git a/CIAO/ciao/CCM_ContainerRequestInfo.idl b/CIAO/ciao/CCM_ContainerRequestInfo.idl new file mode 100644 index 00000000000..3fb590acc16 --- /dev/null +++ b/CIAO/ciao/CCM_ContainerRequestInfo.idl @@ -0,0 +1,22 @@ +// $Id$ + +#if !defined (CCM_CONTAINERREQUESTINFO_IDL) +#define CCM_CONTAINERREQUESTINFO_IDL + +#include "ciao/CCM_Navigation.idl" +#include "tao/OctetSeq.pidl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface ContainerRequestInfo + { + readonly attribute CORBA::OctetSeq origin_id; + readonly attribute CORBA::OctetSeq target_id; + readonly attribute FeatureName name; + }; + }; +}; + +#endif /* CCM_CONTAINERREQUESTINFO_IDL */ diff --git a/CIAO/ciao/CCM_ContainerServantRequestInfo.idl b/CIAO/ciao/CCM_ContainerServantRequestInfo.idl new file mode 100644 index 00000000000..0a3348b8f7e --- /dev/null +++ b/CIAO/ciao/CCM_ContainerServantRequestInfo.idl @@ -0,0 +1,25 @@ +// $Id$ + +#if !defined (CCM_CONTAINERSERVANTREQUESTINFO_IDL) +#define CCM_CONTAINERSERVANTREQUESTINFO_IDL + +#include "ciao/CCM_ContainerRequestInfo.idl" +#include "ciao/CCM_EnterpriseComponent.idl" +#include "tao/AnyTypeCode/Dynamic.pidl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface ContainerServantRequestInfo : ContainerRequestInfo + { + attribute Dynamic::ParameterList arguments; + readonly attribute string operation; + attribute any result; + attribute Components::EnterpriseComponent target; + attribute any the_exception; + }; + }; +}; + +#endif /* CCM_CONTAINERSERVANTREQUESTINFO_IDL */ diff --git a/CIAO/ciao/CCM_ContainerServerRequestInfo.idl b/CIAO/ciao/CCM_ContainerServerRequestInfo.idl new file mode 100644 index 00000000000..4868e6a2e8d --- /dev/null +++ b/CIAO/ciao/CCM_ContainerServerRequestInfo.idl @@ -0,0 +1,20 @@ +// $Id$ + +#if !defined (CCM_CONTAINERSERVERREQUESTINFO_IDL) +#define CCM_CONTAINERSERVERREQUESTINFO_IDL + +#include "ciao/CCM_ContainerRequestInfo.idl" +#include "tao/PI_Server/ServerRequestInfo.pidl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface ContainerServerRequestInfo : ContainerRequestInfo + { + PortableInterceptor::ServerRequestInfo request_info(); + }; + }; +}; + +#endif /* CCM_CONTAINERSERVERREQUESTINFO_IDL */ diff --git a/CIAO/ciao/CCM_ContainerStubRequestInfo.idl b/CIAO/ciao/CCM_ContainerStubRequestInfo.idl new file mode 100644 index 00000000000..da14afa9e08 --- /dev/null +++ b/CIAO/ciao/CCM_ContainerStubRequestInfo.idl @@ -0,0 +1,24 @@ +// $Id$ + +#if !defined (CCM_CONTAINERSTUBREQUESTINFO_IDL) +#define CCM_CONTAINERSTUBREQUESTINFO_IDL + +#include "ciao/CCM_ContainerRequestInfo.idl" +#include "tao/AnyTypeCode/Dynamic.pidl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface ContainerStubRequestInfo : ContainerRequestInfo + { + attribute Dynamic::ParameterList arguments; + readonly attribute string operation; + attribute any result; + attribute Object target; + attribute any the_exception; + }; + }; +}; + +#endif /* CCM_CONTAINERSTUBREQUESTINFO_IDL */ diff --git a/CIAO/ciao/CCM_ExtensionComponent.idl b/CIAO/ciao/CCM_ExtensionComponent.idl new file mode 100644 index 00000000000..585e5e85f64 --- /dev/null +++ b/CIAO/ciao/CCM_ExtensionComponent.idl @@ -0,0 +1,20 @@ +// $Id$ + +#if !defined (CCM_EXTENSIONCOMPONENT_IDL) +#define CCM_EXTENSIONCOMPONENT_IDL + +#include "ciao/CCM_EnterpriseComponent.idl" +#include "ciao/CCM_ExtensionContext.idl" + +module Components +{ + local interface ExtensionComponent : EnterpriseComponent + { + void set_extension_context (in ExtensionContext ctx) + raises (CCMException); + void ccm_remove () + raises (CCMException); + }; +}; + +#endif /* CCM_EXTENSIONCOMPONENT_IDL */ diff --git a/CIAO/ciao/CCM_ExtensionContext.idl b/CIAO/ciao/CCM_ExtensionContext.idl new file mode 100644 index 00000000000..33fa969b436 --- /dev/null +++ b/CIAO/ciao/CCM_ExtensionContext.idl @@ -0,0 +1,37 @@ +// $Id$ + +#if !defined (CCM_EXTENSIONCONTEXT_IDL) +#define CCM_EXTENSIONCONTEXT_IDL + +#include "ciao/CCM_Context.idl" +#include "ciao/CCM_ClientContainerInterceptorRegistration.idl" +#include "ciao/CCM_ServerContainerInterceptorRegistration.idl" +#include "ciao/CCM_StubContainerInterceptorRegistration.idl" +#include "ciao/CCM_ServantContainerInterceptorRegistration.idl" +#include "ciao/CCM_CCMException.idl" + +module Components +{ + local interface ExtensionContext : CCMContext + { + Components::ContainerPortableInterceptor::ClientContainerInterceptorRegistration + get_client_interceptor_registration () + raises (CCMException); + Components::ContainerPortableInterceptor::ServerContainerInterceptorRegistration + get_server_interceptor_registration () + raises (CCMException); + Components::ContainerPortableInterceptor::StubContainerInterceptorRegistration + get_stub_interceptor_registration() + raises (CCMException); + Components::ContainerPortableInterceptor::ServantContainerInterceptorRegistration + get_servant_interceptor_registration() + raises (CCMException); + + Cookie install_service_reference(in string service_id, in Object objref) + raises (CCMException); + Object uninstall_service_reference(in Cookie ck) + raises (CCMException); + }; +}; + +#endif /* CCM_EXTENSIONCONTEXT_IDL */ diff --git a/CIAO/ciao/CCM_InvalidRegistration.idl b/CIAO/ciao/CCM_InvalidRegistration.idl new file mode 100644 index 00000000000..a5dc36c640e --- /dev/null +++ b/CIAO/ciao/CCM_InvalidRegistration.idl @@ -0,0 +1,14 @@ +// $Id$ + +#if !defined (CCM_INVALIDREGISTRATION_IDL) +#define CCM_INVALIDREGISTRATION_IDL + +module Components +{ + module ContainerPortableInterceptor + { + exception InvalidRegistration { }; + }; +}; + +#endif /* CCM_INVALIDREGISTRATION_IDL */ diff --git a/CIAO/ciao/CCM_QoS.idl b/CIAO/ciao/CCM_QoS.idl new file mode 100644 index 00000000000..f78f98d3665 --- /dev/null +++ b/CIAO/ciao/CCM_QoS.idl @@ -0,0 +1,31 @@ +// $Id$ + +#if !defined (CCM_QOS_IDL) +#define CCM_QOS_IDL + +#include "ciao/CCM_Cookie.idl" +#include "ciao/CCM_CCMException.idl" + +module Components +{ + module QoS { + struct QoSInstance { + string dimension; + any value; + }; + typedef sequence<QoSInstance> QoSInstances; + struct QoSConstraint { + string characteristic; + QoSInstances instances; + }; + typedef sequence<QoSConstraint> QoSConstraints; + interface Negotiation + { + Components::Cookie require_qos(in QoSConstraint requirements, in string client_id) + raises (CCMException); + void release_qos (in Components::Cookie ck); + }; + }; +}; + +#endif /* CCM_QOS_IDL */ diff --git a/CIAO/ciao/CCM_ServantContainerInterceptor.idl b/CIAO/ciao/CCM_ServantContainerInterceptor.idl new file mode 100644 index 00000000000..884a1af2599 --- /dev/null +++ b/CIAO/ciao/CCM_ServantContainerInterceptor.idl @@ -0,0 +1,26 @@ +// $Id$ + +#if !defined (CCM_SERVANTCONTAINERINTERCEPTOR_IDL) +#define CCM_SERVANTCONTAINERINTERCEPTOR_IDL + +#include "ciao/CCM_ContainerInterceptor.idl" +#include "ciao/CCM_ContainerServantRequestInfo.idl" +#include "tao/PI/PIForwardRequest.pidl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface ServantContainerInterceptor : ContainerInterceptor + { + void servant_receive_request (in ContainerServantRequestInfo info, out boolean proceed_call) + raises (PortableInterceptor::ForwardRequest); + void servant_send_reply (in ContainerServantRequestInfo info, out boolean proceed_call); + void servant_send_exception (in ContainerServantRequestInfo info, out boolean proceed_call) + raises (PortableInterceptor::ForwardRequest); + void servant_send_other (in ContainerServantRequestInfo info) + raises (PortableInterceptor::ForwardRequest); + }; + }; +}; +#endif /* CCM_SERVANTCONTAINERINTERCEPTOR_IDL */ diff --git a/CIAO/ciao/CCM_ServantContainerInterceptorRegistration.idl b/CIAO/ciao/CCM_ServantContainerInterceptorRegistration.idl new file mode 100644 index 00000000000..39448de9a58 --- /dev/null +++ b/CIAO/ciao/CCM_ServantContainerInterceptorRegistration.idl @@ -0,0 +1,24 @@ +// $Id$ + +#if !defined (CCM_SERVANTCONTAINERINTERCEPTORREGISTRATION_IDL) +#define CCM_SERVANTCONTAINERINTERCEPTORREGISTRATION_IDL + +#include "ciao/CCM_Cookie.idl" +#include "ciao/CCM_InvalidRegistration.idl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface ServantContainerInterceptor; + + local interface ServantContainerInterceptorRegistration + { + Components::Cookie register_servant_interceptor (in ServantContainerInterceptor ci); + ServantContainerInterceptor unregister_servant_interceptor (in Components::Cookie cookie) + raises(InvalidRegistration); + }; + }; +}; + +#endif /* CCM_SERVANTCONTAINERINTERCEPTORREGISTRATION_IDL */ diff --git a/CIAO/ciao/CCM_ServerContainerInterceptor.idl b/CIAO/ciao/CCM_ServerContainerInterceptor.idl new file mode 100644 index 00000000000..58ce5cc69a7 --- /dev/null +++ b/CIAO/ciao/CCM_ServerContainerInterceptor.idl @@ -0,0 +1,28 @@ +// $Id$ + +#if !defined (CCM_SERVERCONTAINERINTERCEPTOR_IDL) +#define CCM_SERVERCONTAINERINTERCEPTOR_IDL + +#include "ciao/CCM_ContainerInterceptor.idl" +#include "ciao/CCM_ContainerServerRequestInfo.idl" +#include "tao/PI/PIForwardRequest.pidl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface ServerContainerInterceptor : ContainerInterceptor + { + void receive_request_service_contexts (in ContainerServerRequestInfo info) + raises (PortableInterceptor::ForwardRequest); + void receive_request (in ContainerServerRequestInfo info) + raises (PortableInterceptor::ForwardRequest); + void send_reply (in ContainerServerRequestInfo info); + void send_exception (in ContainerServerRequestInfo info) + raises (PortableInterceptor::ForwardRequest); + void send_other (in ContainerServerRequestInfo info) + raises (PortableInterceptor::ForwardRequest); + }; + }; +}; +#endif /* CCM_SERVERCONTAINERINTERCEPTOR_IDL */ diff --git a/CIAO/ciao/CCM_ServerContainerInterceptorRegistration.idl b/CIAO/ciao/CCM_ServerContainerInterceptorRegistration.idl new file mode 100644 index 00000000000..b4a3dafac26 --- /dev/null +++ b/CIAO/ciao/CCM_ServerContainerInterceptorRegistration.idl @@ -0,0 +1,24 @@ +// $Id$ + +#if !defined (CCM_SERVERCONTAINERINTERCEPTORREGISTRATION_IDL) +#define CCM_SERVERCONTAINERINTERCEPTORREGISTRATION_IDL + +#include "ciao/CCM_Cookie.idl" +#include "ciao/CCM_InvalidRegistration.idl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface ServerContainerInterceptor; + + local interface ServerContainerInterceptorRegistration + { + Components::Cookie register_server_interceptor (in ServerContainerInterceptor ci); + ServerContainerInterceptor unregister_client_interceptor (in Components::Cookie cookie) + raises(InvalidRegistration); + }; + }; +}; + +#endif /* CCM_SERVERCONTAINERINTERCEPTORREGISTRATION_IDL */ diff --git a/CIAO/ciao/CCM_StubContainerInterceptor.idl b/CIAO/ciao/CCM_StubContainerInterceptor.idl new file mode 100644 index 00000000000..c183801af86 --- /dev/null +++ b/CIAO/ciao/CCM_StubContainerInterceptor.idl @@ -0,0 +1,26 @@ +// $Id$ + +#if !defined (CCM_STUBCONTAINERINTERCEPTOR_IDL) +#define CCM_STUBCONTAINERINTERCEPTOR_IDL + +#include "ciao/CCM_ContainerInterceptor.idl" +#include "ciao/CCM_ContainerStubRequestInfo.idl" +#include "tao/PI/PIForwardRequest.pidl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface StubContainerInterceptor : ContainerInterceptor + { + void stub_send_request (in ContainerStubRequestInfo info, out boolean con) + raises (PortableInterceptor::ForwardRequest); + void stub_receive_reply (in ContainerStubRequestInfo info, out boolean con); + void stub_receive_exception (in ContainerStubRequestInfo info, out boolean con) + raises(PortableInterceptor::ForwardRequest); + void stub_receive_other (in ContainerStubRequestInfo info) + raises(PortableInterceptor::ForwardRequest); + }; + }; +}; +#endif /* CCM_STUBCONTAINERINTERCEPTOR_IDL */ diff --git a/CIAO/ciao/CCM_StubContainerInterceptorRegistration.idl b/CIAO/ciao/CCM_StubContainerInterceptorRegistration.idl new file mode 100644 index 00000000000..61ae62f51fa --- /dev/null +++ b/CIAO/ciao/CCM_StubContainerInterceptorRegistration.idl @@ -0,0 +1,24 @@ +// $Id$ + +#if !defined (CCM_STUBCONTAINERINTERCEPTORREGISTRATION_IDL) +#define CCM_STUBCONTAINERINTERCEPTORREGISTRATION_IDL + +#include "ciao/CCM_Cookie.idl" +#include "ciao/CCM_InvalidRegistration.idl" + +module Components +{ + module ContainerPortableInterceptor + { + local interface StubContainerInterceptor; + + local interface StubContainerInterceptorRegistration + { + Components::Cookie register_stub_interceptor (in StubContainerInterceptor ci); + StubContainerInterceptor unregister_stub_interceptor (in Components::Cookie cookie) + raises(InvalidRegistration); + }; + }; +}; + +#endif /* CCM_STUBCONTAINERINTERCEPTORREGISTRATION_IDL */ |