diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-08-20 07:59:56 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-08-20 07:59:56 +0000 |
commit | 5505c32e5e704f36944c0efb42ff6ae33de420b9 (patch) | |
tree | d9eaff648e01ac53b0fa87946279beef3d45beaf | |
parent | 29d589b24eec2fef0f7f50b568289599a44bbf1f (diff) | |
download | ATCD-5505c32e5e704f36944c0efb42ff6ae33de420b9.tar.gz |
ChangeLogTag: Fri Aug 20 07:59:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | TAO/tao/IORInterceptor/IORInfo.pidl | 70 | ||||
-rw-r--r-- | TAO/tao/IORInterceptor/IORInfoC.cpp | 282 | ||||
-rw-r--r-- | TAO/tao/IORInterceptor/IORInfoC.h | 336 | ||||
-rw-r--r-- | TAO/tao/IORInterceptor/IORInfoC.inl | 28 | ||||
-rw-r--r-- | TAO/tao/IORInterceptor/IORInterceptor.pidl | 27 | ||||
-rw-r--r-- | TAO/tao/IORInterceptor/IORInterceptorC.cpp | 221 | ||||
-rw-r--r-- | TAO/tao/IORInterceptor/IORInterceptorC.h | 214 | ||||
-rw-r--r-- | TAO/tao/PortableServer/IORInfo.h | 2 | ||||
-rw-r--r-- | TAO/tao/PortableServer/ORTRework.txt | 15 |
9 files changed, 734 insertions, 461 deletions
diff --git a/TAO/tao/IORInterceptor/IORInfo.pidl b/TAO/tao/IORInterceptor/IORInfo.pidl new file mode 100644 index 00000000000..3e6d5b7208d --- /dev/null +++ b/TAO/tao/IORInterceptor/IORInfo.pidl @@ -0,0 +1,70 @@ +// -*- IDL -*- + +/** + * @file IORInfo.pidl + * + * $Id$ + * + * @brief Pre-compiled IDL source for the IORInfo + * components in the ORB. + * + * The following is from orbos/99-12-02 Portable Interceptors spec, + * the full IDL is downloadable from orbos/99-12-02. This file contains + * interfaces from PortableInterceptor.idl that depend on + * ObjectReferenceFactory and ObjectReferenceTemplate, which inherit + * directly or indirectly from CORBA::ValueBase. This separate file + * has been created to remove the dependency from the rest of module + * PortableInterceptor. + * + * This file was used to generate the code in IORInfoC.* + * The command used to generate code is: + * + * tao_idl + * -o orig -Gp -Gd -Ge 1 -Sa -St -GT + * -I$(TAO_ROOT) + * -Wb,export_macro=TAO_IORInterceptor_Export + * -Wb,export_include="iorinterceptor_export.h" + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * IORInfo.pidl + */ + +// File: IORInfo.idl +#ifndef _IORINFO_IDL_ +#define _IORINFO_IDL_ + +#include "tao/PortableInterceptor.pidl" +#include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl" + +module PortableInterceptor +{ + typeprefix PortableInterceptor "omg.org"; + + const AdapterState HOLDING = 0; + const AdapterState ACTIVE = 1; + const AdapterState DISCARDING = 2; + const AdapterState INACTIVE = 3; + const AdapterState NON_EXISTENT = 4; + + local interface IORInfo + { + CORBA::Policy get_effective_policy (in CORBA::PolicyType type); + + void add_ior_component (in IOP::TaggedComponent a_component); + + void add_ior_component_to_profile ( + in IOP::TaggedComponent a_component, + in IOP::ProfileId profile_id + ); + + readonly attribute AdapterManagerId manager_id; + + readonly attribute AdapterState state; + + readonly attribute ObjectReferenceTemplate adapter_template; + + attribute ObjectReferenceFactory current_factory; + }; +}; + +#endif /* _IORINFO_IDL_ */ diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp new file mode 100644 index 00000000000..07779a7625f --- /dev/null +++ b/TAO/tao/IORInterceptor/IORInfoC.cpp @@ -0,0 +1,282 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:303 + + +#include "IORInfoC.h" +#include "tao/CDR.h" +#include "tao/Object_Argument_T.h" +#include "ace/OS_NS_string.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "IORInfoC.inl" +#endif /* !defined INLINE */ + +// TAO_IDL - Generated from +// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:64 + +// Arg traits specializations. +namespace TAO +{ + +#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_) +#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_IORInterceptor_Export Arg_Traits<PortableInterceptor::ObjectReferenceFactory> + : public + Object_Arg_Traits_T< + PortableInterceptor::ObjectReferenceFactory *, + PortableInterceptor::ObjectReferenceFactory_var, + PortableInterceptor::ObjectReferenceFactory_out, + TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory> + > + { + }; + +#endif /* end #if !defined */ +} + + +// TAO_IDL - Generated from +// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 + +// Traits specializations for PortableInterceptor::IORInfo. + +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +PortableInterceptor::IORInfo_ptr +TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_duplicate ( + PortableInterceptor::IORInfo_ptr p + ) +{ + return PortableInterceptor::IORInfo::_duplicate (p); +} + +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +void +TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_release ( + PortableInterceptor::IORInfo_ptr p + ) +{ + CORBA::release (p); +} + +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +PortableInterceptor::IORInfo_ptr +TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_nil (void) +{ + return PortableInterceptor::IORInfo::_nil (); +} + +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +CORBA::Boolean +TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_marshal ( + PortableInterceptor::IORInfo_ptr p, + TAO_OutputCDR & cdr + ) +{ + return CORBA::Object::marshal (p, cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*PortableInterceptor__TAO_IORInfo_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; + +PortableInterceptor::IORInfo::IORInfo (void) +{} + +PortableInterceptor::IORInfo::~IORInfo (void) +{} + +PortableInterceptor::IORInfo_ptr +PortableInterceptor::IORInfo::_narrow ( + CORBA::Object_ptr _tao_objref + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (_tao_objref)) + { + return IORInfo::_nil (); + } + + IORInfo_ptr proxy = + dynamic_cast<IORInfo_ptr> (_tao_objref); + + return IORInfo::_duplicate (proxy); +} + +PortableInterceptor::IORInfo_ptr +PortableInterceptor::IORInfo::_unchecked_narrow ( + CORBA::Object_ptr _tao_objref + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (_tao_objref)) + { + return IORInfo::_nil (); + } + + IORInfo_ptr proxy = + dynamic_cast<IORInfo_ptr> (_tao_objref); + + return IORInfo::_duplicate (proxy); +} + +PortableInterceptor::IORInfo_ptr +PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj) +{ + if (! CORBA::is_nil (obj)) + { + obj->_add_ref (); + } + + return obj; +} + +CORBA::Boolean +PortableInterceptor::IORInfo::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/IORInfo:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) + { + return 1; // success using local knowledge + } + else + { + return 0; + } +} + +const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableInterceptor/IORInfo:1.0"; +} + +CORBA::Boolean +PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &) +{ + return 0; +} + +// TAO_IDL - Generated from +// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1628 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_ + + template class + TAO::Arg_Traits< + PortableInterceptor::ObjectReferenceFactory + >; + + template class + TAO::Object_Arg_Traits_T< + PortableInterceptor::ObjectReferenceFactory *, + PortableInterceptor::ObjectReferenceFactory_var, + PortableInterceptor::ObjectReferenceFactory_out, + TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory> + >; + +#endif /* end #if !defined */ + + template class + TAO::Objref_Traits< + PortableInterceptor::IORInfo + >; + + template class + TAO_Objref_Var_T< + PortableInterceptor::IORInfo + >; + + template class + TAO_Objref_Out_T< + PortableInterceptor::IORInfo + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate \ + TAO::Arg_Traits< \ + PortableInterceptor::ObjectReferenceFactory \ + > + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + PortableInterceptor::ObjectReferenceFactory *, \ + PortableInterceptor::ObjectReferenceFactory_var, \ + PortableInterceptor::ObjectReferenceFactory_out, \ + TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory> \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Objref_Traits< \ + PortableInterceptor::IORInfo \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::IORInfo + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::IORInfo + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h new file mode 100644 index 00000000000..4ee3a13241e --- /dev/null +++ b/TAO/tao/IORInterceptor/IORInfoC.h @@ -0,0 +1,336 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:153 + +#ifndef _TAO_IDL_ORIG_IORINFOC_H_ +#define _TAO_IDL_ORIG_IORINFOC_H_ + +#include /**/ "ace/pre.h" + + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "iorinterceptor_export.h" +#include "tao/ORB.h" +#include "tao/Environment.h" +#include "tao/Object.h" +#include "tao/Objref_VarOut_T.h" + +#include "tao/PortableInterceptorC.h" +#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_IORInterceptor_Export + +#if defined (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_IORInterceptor_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63 + +namespace TAO +{ + class Collocation_Proxy_Broker; + + template<typename T> class Narrow_Utils; + template<typename T> class AbstractBase_Narrow_Utils; +} + +// TAO_IDL - Generated from +// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 + +namespace PortableInterceptor +{ + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + + const PortableInterceptor::AdapterState HOLDING = 0; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + + const PortableInterceptor::AdapterState ACTIVE = 1; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + + const PortableInterceptor::AdapterState DISCARDING = 2; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + + const PortableInterceptor::AdapterState INACTIVE = 3; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + + const PortableInterceptor::AdapterState NON_EXISTENT = 4; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613 + +#if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_ + + class IORInfo; + typedef IORInfo *IORInfo_ptr; + + typedef + TAO_Objref_Var_T< + IORInfo + > + IORInfo_var; + + typedef + TAO_Objref_Out_T< + IORInfo + > + IORInfo_out; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + +#if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_) +#define _PORTABLEINTERCEPTOR_IORINFO_CH_ + + class TAO_IORInterceptor_Export IORInfo + : public virtual CORBA::Object + { + public: + typedef IORInfo_ptr _ptr_type; + typedef IORInfo_var _var_type; + + // The static operations. + static IORInfo_ptr _duplicate (IORInfo_ptr obj); + + static IORInfo_ptr _narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static IORInfo_ptr _unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + static IORInfo_ptr _nil (void) + { + return (IORInfo_ptr)0; + } + + + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 + + virtual ::CORBA::Policy_ptr get_effective_policy ( + ::CORBA::PolicyType type + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 + + virtual void add_ior_component ( + const ::IOP::TaggedComponent & a_component + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 + + virtual void add_ior_component_to_profile ( + const ::IOP::TaggedComponent & a_component, + ::IOP::ProfileId profile_id + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 + + virtual PortableInterceptor::AdapterManagerId manager_id ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 + + virtual PortableInterceptor::AdapterState state ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 + + virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 + + virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 + + virtual void current_factory ( + ::PortableInterceptor::ObjectReferenceFactory * current_factory + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + // TAO_IDL - Generated from + // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208 + + virtual CORBA::Boolean _is_a ( + const char *type_id + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + + virtual const char* _interface_repository_id (void) const; + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); + + protected: + // Abstract or local interface only. + IORInfo (void); + + virtual ~IORInfo (void); + + private: + // Private and unimplemented for concrete interfaces. + IORInfo (const IORInfo &); + + void operator= (const IORInfo &); + }; + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 + +} // module PortableInterceptor + +// TAO_IDL - Generated from +// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:59 + +// Traits specializations. +namespace TAO +{ + +#if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_ + + ACE_TEMPLATE_SPECIALIZATION + struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInfo> + { + static ::PortableInterceptor::IORInfo_ptr tao_duplicate ( + ::PortableInterceptor::IORInfo_ptr + ); + static void tao_release ( + ::PortableInterceptor::IORInfo_ptr + ); + static ::PortableInterceptor::IORInfo_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + ::PortableInterceptor::IORInfo_ptr p, + TAO_OutputCDR & cdr + ); + }; + +#endif /* end #if !defined */ +} + +// TAO_IDL - Generated from +// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:958 + +#if defined (__ACE_INLINE__) +#include "IORInfoC.inl" +#endif /* defined INLINE */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ + +#include /**/ "ace/post.h" + +#endif /* ifndef */ + diff --git a/TAO/tao/IORInterceptor/IORInfoC.inl b/TAO/tao/IORInterceptor/IORInfoC.inl new file mode 100644 index 00000000000..38aa32569ba --- /dev/null +++ b/TAO/tao/IORInterceptor/IORInfoC.inl @@ -0,0 +1,28 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + + diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl index 6c5361b8669..1013e104599 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor.pidl +++ b/TAO/tao/IORInterceptor/IORInterceptor.pidl @@ -34,38 +34,13 @@ #define _IOR_INTERCEPTOR_IDL_ #include "tao/PortableInterceptor.pidl" +#include "tao/IORInterceptor/IORInfo.pidl" #include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl" module PortableInterceptor { typeprefix PortableInterceptor "omg.org"; - const AdapterState HOLDING = 0; - const AdapterState ACTIVE = 1; - const AdapterState DISCARDING = 2; - const AdapterState INACTIVE = 3; - const AdapterState NON_EXISTENT = 4; - - local interface IORInfo - { - CORBA::Policy get_effective_policy (in CORBA::PolicyType type); - - void add_ior_component (in IOP::TaggedComponent a_component); - - void add_ior_component_to_profile ( - in IOP::TaggedComponent a_component, - in IOP::ProfileId profile_id - ); - - readonly attribute AdapterManagerId manager_id; - - readonly attribute AdapterState state; - - readonly attribute ObjectReferenceTemplate adapter_template; - - attribute ObjectReferenceFactory current_factory; - }; - local interface IORInterceptor : Interceptor { void establish_components (in IORInfo info); diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp index 479490de092..6e0d078e22a 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp @@ -31,7 +31,6 @@ #include "IORInterceptorC.h" #include "tao/CDR.h" -#include "tao/Object_Argument_T.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) @@ -48,166 +47,12 @@ // Arg traits specializations. namespace TAO { - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_IORInterceptor_Export Arg_Traits<PortableInterceptor::ObjectReferenceFactory> - : public - Object_Arg_Traits_T< - PortableInterceptor::ObjectReferenceFactory *, - PortableInterceptor::ObjectReferenceFactory_var, - PortableInterceptor::ObjectReferenceFactory_out, - TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory> - > - { - }; - -#endif /* end #if !defined */ } // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -// Traits specializations for PortableInterceptor::IORInfo. - -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION -PortableInterceptor::IORInfo_ptr -TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_duplicate ( - PortableInterceptor::IORInfo_ptr p - ) -{ - return PortableInterceptor::IORInfo::_duplicate (p); -} - -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION -void -TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_release ( - PortableInterceptor::IORInfo_ptr p - ) -{ - CORBA::release (p); -} - -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION -PortableInterceptor::IORInfo_ptr -TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_nil (void) -{ - return PortableInterceptor::IORInfo::_nil (); -} - -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION -CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_marshal ( - PortableInterceptor::IORInfo_ptr p, - TAO_OutputCDR & cdr - ) -{ - return CORBA::Object::marshal (p, cdr); -} - -// Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * -(*PortableInterceptor__TAO_IORInfo_Proxy_Broker_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; - -PortableInterceptor::IORInfo::IORInfo (void) -{} - -PortableInterceptor::IORInfo::~IORInfo (void) -{} - -PortableInterceptor::IORInfo_ptr -PortableInterceptor::IORInfo::_narrow ( - CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if (CORBA::is_nil (_tao_objref)) - { - return IORInfo::_nil (); - } - - IORInfo_ptr proxy = - dynamic_cast<IORInfo_ptr> (_tao_objref); - - return IORInfo::_duplicate (proxy); -} - -PortableInterceptor::IORInfo_ptr -PortableInterceptor::IORInfo::_unchecked_narrow ( - CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if (CORBA::is_nil (_tao_objref)) - { - return IORInfo::_nil (); - } - - IORInfo_ptr proxy = - dynamic_cast<IORInfo_ptr> (_tao_objref); - - return IORInfo::_duplicate (proxy); -} - -PortableInterceptor::IORInfo_ptr -PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj) -{ - if (! CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -CORBA::Boolean -PortableInterceptor::IORInfo::_is_a ( - const char *value - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if ( - !ACE_OS::strcmp ( - (char *)value, - "IDL:omg.org/PortableInterceptor/IORInfo:1.0" - ) || - !ACE_OS::strcmp ( - (char *)value, - "IDL:omg.org/CORBA/LocalObject:1.0" - ) || - !ACE_OS::strcmp ( - (char *)value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return 1; // success using local knowledge - } - else - { - return 0; - } -} - -const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const -{ - return "IDL:omg.org/PortableInterceptor/IORInfo:1.0"; -} - -CORBA::Boolean -PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &) -{ - return 0; -} - -// TAO_IDL - Generated from -// C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 - // Traits specializations for PortableInterceptor::IORInterceptor. ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION @@ -366,39 +211,6 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) PortableInterceptor::IORInterceptor >; -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_ - - template class - TAO::Arg_Traits< - PortableInterceptor::ObjectReferenceFactory - >; - - template class - TAO::Object_Arg_Traits_T< - PortableInterceptor::ObjectReferenceFactory *, - PortableInterceptor::ObjectReferenceFactory_var, - PortableInterceptor::ObjectReferenceFactory_out, - TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory> - >; - -#endif /* end #if !defined */ - - template class - TAO::Objref_Traits< - PortableInterceptor::IORInfo - >; - - template class - TAO_Objref_Var_T< - PortableInterceptor::IORInfo - >; - - template class - TAO_Objref_Out_T< - PortableInterceptor::IORInfo - >; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ @@ -416,38 +228,5 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) PortableInterceptor::IORInterceptor > -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate \ - TAO::Arg_Traits< \ - PortableInterceptor::ObjectReferenceFactory \ - > - -# pragma instantiate \ - TAO::Object_Arg_Traits_T< \ - PortableInterceptor::ObjectReferenceFactory *, \ - PortableInterceptor::ObjectReferenceFactory_var, \ - PortableInterceptor::ObjectReferenceFactory_out, \ - TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory> \ - > - -#endif /* end #if !defined */ - -# pragma instantiate \ - TAO::Objref_Traits< \ - PortableInterceptor::IORInfo \ - > - -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableInterceptor::IORInfo - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableInterceptor::IORInfo - > - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h index 12f2b325d6a..1f2dd3fb3ba 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.h +++ b/TAO/tao/IORInterceptor/IORInterceptorC.h @@ -47,6 +47,7 @@ #include "tao/Objref_VarOut_T.h" #include "tao/PortableInterceptorC.h" +#include "tao/IORInterceptor/IORInfoC.h" #include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h" #if defined (TAO_EXPORT_MACRO) @@ -90,198 +91,6 @@ namespace PortableInterceptor { // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::AdapterState HOLDING = 0; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::AdapterState ACTIVE = 1; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::AdapterState DISCARDING = 2; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::AdapterState INACTIVE = 3; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::AdapterState NON_EXISTENT = 4; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613 - -#if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_) -#define _PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_ - - class IORInfo; - typedef IORInfo *IORInfo_ptr; - - typedef - TAO_Objref_Var_T< - IORInfo - > - IORInfo_var; - - typedef - TAO_Objref_Out_T< - IORInfo - > - IORInfo_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_) -#define _PORTABLEINTERCEPTOR_IORINFO_CH_ - - class TAO_IORInterceptor_Export IORInfo - : public virtual CORBA::Object - { - public: - typedef IORInfo_ptr _ptr_type; - typedef IORInfo_var _var_type; - - // The static operations. - static IORInfo_ptr _duplicate (IORInfo_ptr obj); - - static IORInfo_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - static IORInfo_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - static IORInfo_ptr _nil (void) - { - return (IORInfo_ptr)0; - } - - - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Policy_ptr get_effective_policy ( - ::CORBA::PolicyType type - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - - virtual void add_ior_component ( - const ::IOP::TaggedComponent & a_component - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - - virtual void add_ior_component_to_profile ( - const ::IOP::TaggedComponent & a_component, - ::IOP::ProfileId profile_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - - virtual PortableInterceptor::AdapterManagerId manager_id ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - - virtual PortableInterceptor::AdapterState state ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - - virtual void current_factory ( - ::PortableInterceptor::ObjectReferenceFactory * current_factory - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208 - - virtual CORBA::Boolean _is_a ( - const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - virtual const char* _interface_repository_id (void) const; - virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - - protected: - // Abstract or local interface only. - IORInfo (void); - - virtual ~IORInfo (void); - - private: - // Private and unimplemented for concrete interfaces. - IORInfo (const IORInfo &); - - void operator= (const IORInfo &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_) @@ -441,27 +250,6 @@ namespace TAO }; #endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_) -#define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_ - - ACE_TEMPLATE_SPECIALIZATION - struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInfo> - { - static ::PortableInterceptor::IORInfo_ptr tao_duplicate ( - ::PortableInterceptor::IORInfo_ptr - ); - static void tao_release ( - ::PortableInterceptor::IORInfo_ptr - ); - static ::PortableInterceptor::IORInfo_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - ::PortableInterceptor::IORInfo_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ } // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/IORInfo.h b/TAO/tao/PortableServer/IORInfo.h index 5b168a59fe4..2cc5954e87a 100644 --- a/TAO/tao/PortableServer/IORInfo.h +++ b/TAO/tao/PortableServer/IORInfo.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/IORInterceptor/IORInterceptorC.h" +#include "tao/IORInterceptor/IORInfoC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/ORTRework.txt b/TAO/tao/PortableServer/ORTRework.txt index d29e672264b..d2af090c8ca 100644 --- a/TAO/tao/PortableServer/ORTRework.txt +++ b/TAO/tao/PortableServer/ORTRework.txt @@ -1,3 +1,18 @@ +Fri Aug 20 07:59:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/IORInterceptor/IORInterceptor.pidl: + * tao/IORInterceptor/IORInfo.pidl: + Moved IORInfo interface to its own file + + * tao/IORInterceptor/IORInterceptorC.{h,cpp,i}: + Regenerated + + * tao/IORInterceptor/IORInfoC.{h,cpp,i}: + New generated files + + * tao/PortableServer/IORInfo.h: + Include IORInfoC.h instead of IORInterceptorC.h + Thu Aug 19 17:58:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PI_Forward.pidl: |