1 files changed, 69 insertions, 34 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
index 45691bc6e64..6bee188690d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
@@ -19,15 +19,17 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "tao/PortableServer/PortableServer.h"
+#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/NotifyExtC.h"
+#include "AdminProperties.h"
 
 class TAO_NS_EventChannelFactory;
 class TAO_NS_EventChannel;
 class TAO_NS_SupplierAdmin;
 class TAO_NS_ConsumerAdmin;
 class TAO_NS_FilterFactory;
-//class TAO_NS_Filter;
+class TAO_NS_Object;
 
 /**
  * @class TAO_NS_Builder
@@ -38,38 +40,71 @@ class TAO_NS_FilterFactory;
 class TAO_Notify_Export TAO_NS_Builder
 {
 public:
-  CosNotifyChannelAdmin::EventChannelFactory_ptr build_event_channel_factory (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
-
-  CosNotifyChannelAdmin::EventChannel_ptr build_event_channel (TAO_NS_EventChannelFactory* ecf, const CosNotification::QoSProperties & initial_qos, const CosNotification::AdminProperties & initial_admin, CosNotifyChannelAdmin::ChannelID_out id ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotification::UnsupportedQoS
-                     , CosNotification::UnsupportedAdmin
-                     ));
-
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr build_consumer_admin (TAO_NS_EventChannel* ec, CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  CosNotifyChannelAdmin::SupplierAdmin_ptr build_supplier_admin (TAO_NS_EventChannel* ec, CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  CosNotifyChannelAdmin::ProxyConsumer_ptr build_notification_push_consumer (TAO_NS_SupplierAdmin* sa, CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyChannelAdmin::AdminLimitExceeded
-                     ));
-
-  CosNotifyChannelAdmin::ProxySupplier_ptr build_notification_push_supplier (TAO_NS_ConsumerAdmin* ca, CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     , CosNotifyChannelAdmin::AdminLimitExceeded
-                     ));
-
-  CosNotifyFilter::FilterFactory_ptr build_filter_factory (ACE_ENV_SINGLE_ARG_DECL);
+  TAO_NS_Builder (void);
+
+  virtual ~TAO_NS_Builder ();
+
+  ///= Factory Methods
+
+  /// Build EventChannel Factory.
+  virtual CosNotifyChannelAdmin::EventChannelFactory_ptr
+  build_event_channel_factory (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
+
+  /// Build the Filter Factory.
+  virtual CosNotifyFilter::FilterFactory_ptr build_filter_factory (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// Build EventChannel.
+  virtual CosNotifyChannelAdmin::EventChannel_ptr
+  build_event_channel (TAO_NS_EventChannelFactory* ecf
+                       , const CosNotification::QoSProperties & initial_qos
+                       , const CosNotification::AdminProperties & initial_admin
+                       , CosNotifyChannelAdmin::ChannelID_out id
+                       ACE_ENV_ARG_DECL);
+
+  /// Build ConsumerAdmin
+  virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr
+  build_consumer_admin (TAO_NS_EventChannel* ec
+                        , CosNotifyChannelAdmin::InterFilterGroupOperator op
+                        , CosNotifyChannelAdmin::AdminID_out id
+                        ACE_ENV_ARG_DECL);
+
+  /// Build SupplierAdmin
+  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr
+  build_supplier_admin (TAO_NS_EventChannel* ec
+                        , CosNotifyChannelAdmin::InterFilterGroupOperator op
+                        , CosNotifyChannelAdmin::AdminID_out id
+                        ACE_ENV_ARG_DECL);
+
+  /// Build ProxyConsumer
+  virtual CosNotifyChannelAdmin::ProxyConsumer_ptr
+  build_proxy (TAO_NS_SupplierAdmin* sa
+               , CosNotifyChannelAdmin::ClientType ctype
+               , CosNotifyChannelAdmin::ProxyID_out proxy_id
+               ACE_ENV_ARG_DECL);
+
+  /// Build ProxySupplier.
+  virtual CosNotifyChannelAdmin::ProxySupplier_ptr
+  build_proxy (TAO_NS_ConsumerAdmin* ca
+               , CosNotifyChannelAdmin::ClientType ctype
+               , CosNotifyChannelAdmin::ProxyID_out proxy_id
+               ACE_ENV_ARG_DECL);
+
+  /// Build CosEC style ProxySupplier.
+  virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
+  build_proxy (TAO_NS_ConsumerAdmin* ca ACE_ENV_ARG_DECL);
+
+  /// Build CosEC style ProxyConsumer.
+  virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
+  build_proxy (TAO_NS_SupplierAdmin* sa ACE_ENV_ARG_DECL);
+
+  /// Apply Reactive concurrency.
+  virtual void apply_reactive_concurrency (TAO_NS_Object& object ACE_ENV_ARG_DECL);
+
+  /// Apply Thread Pools.
+  virtual void apply_thread_pool_concurrency (TAO_NS_Object& object, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL);
+
+  /// Apply Thread Pools with Lanes.
+  virtual void apply_lane_concurrency (TAO_NS_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
 };
 
 #if defined (__ACE_INLINE__)