Tue Mar 2 09:58:04 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * TAO_IDL/be/be_interface.cpp:
        * TAO_IDL/be/be_visitor_interface.cpp:
        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp:
        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp:
        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
        * TAO_IDL/be_include/be_component.h:
        * TAO_IDL/be_include/be_connector.h:
        * TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h:
        * TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h:
        * TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h:
        * TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h:
          Generate direct and through poa proxy brokers for connectors

13 files changed, 93 insertions, 26 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d08bb6848f3..6f7e8b46f98 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,23 @@
+Tue Mar  2 09:58:04 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_visitor_interface.cpp:
+        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
+        * TAO_IDL/be_include/be_component.h:
+        * TAO_IDL/be_include/be_connector.h:
+        * TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h:
+        * TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h:
+        * TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h:
+        * TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h:
+          Generate direct and through poa proxy brokers for connectors
+
 Thu Feb 25 17:04:04 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * NEWS:
-        
+
           Updated TAO_IDL cleanup item.
 
 Thu Feb 25 16:50:09 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 7df1bcf5dc9..44c1bbdc0bb 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -18,6 +18,7 @@
 #include "be_interface.h"
 #include "be_interface_strategy.h"
 #include "be_component.h"
+#include "be_connector.h"
 #include "be_attribute.h"
 #include "be_operation.h"
 #include "be_exception.h"
@@ -1455,7 +1456,7 @@ be_interface::traverse_inheritance_graph (
                              "dequeue_head failed\n"),
                             -1);
         }
-        
+
       AST_Decl::NodeType nt = intf->node_type ();
 
       // If we are doing a home, we check for a parent.
@@ -2708,6 +2709,21 @@ be_interface::gen_facet_idl (TAO_OutStream &os)
 
       os << be_uidt_nl
          << "};";
+
+/*
+         os << be_nl << be_nl
+  << "local interface CCM_AMI_CONN_MyFoo" << be_nl
+  << "  : ::Components::EnterpriseComponent" << be_nl
+  << "{" << be_nl
+  << "  ::Hello::CCM_AMI_MyFoo get_provides_MyFoo ();" << be_nl
+  << "};" << be_nl
+  << be_nl
+  << "local interface CCM_AMI_CONN_MyFoo_Context" << be_nl
+  << "  : ::Components::SessionContext" << be_nl
+  << "{" << be_nl
+  << "  ::Hello::MyFoo get_connection_uses_MyFoo ();" << be_nl
+  << "  ::Hello::AMI_MyFoo get_connection_provides_MyFoo ();" << be_nl
+  << "};";*/
     }
 
   this->gen_nesting_close (os);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index 2cec5ecd095..7dc1fcd3ee6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -28,6 +28,7 @@
 #include "be_typedef.h"
 #include "be_predefined_type.h"
 #include "be_component.h"
+#include "be_connector.h"
 #include "be_helper.h"
 #include "be_extern.h"
 #include "be_util.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
index bed337f0d7b..43bac884bc7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
@@ -198,8 +198,14 @@ be_visitor_interface_direct_proxy_impl_sh::gen_abstract_ops_helper (
 }
 
 int be_visitor_interface_direct_proxy_impl_sh::visit_component (
-    be_component *node
-  )
+    be_component *node)
 {
   return this->visit_interface (node);
 }
+
+int be_visitor_interface_direct_proxy_impl_sh::visit_connector (
+    be_connector *node)
+{
+  return this->visit_component (node);
+}
+
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
index 44fe3052750..d42dbf5fb2d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
@@ -160,10 +160,14 @@ be_visitor_interface_direct_proxy_impl_ss::gen_abstract_ops_helper (
 }
 
 int be_visitor_interface_direct_proxy_impl_ss::visit_component (
-    be_component *node
-  )
+    be_component *node)
 {
   return this->visit_interface (node);
 }
 
+int be_visitor_interface_direct_proxy_impl_ss::visit_connector (
+    be_connector *node)
+{
+  return this->visit_component (node);
+}
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
index 4a1d80b9434..310e84a8918 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
@@ -77,8 +77,13 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (
 }
 
 int be_visitor_interface_strategized_proxy_broker_sh::visit_component (
-    be_component *node
-  )
+    be_component *node)
 {
   return this->visit_interface (node);
 }
+
+int be_visitor_interface_strategized_proxy_broker_sh::visit_connector (
+    be_connector *node)
+{
+  return this->visit_component (node);
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
index d93e1bed7ae..097bd1ae71e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
@@ -1,6 +1,5 @@
 //
 // $Id$
-//
 
 be_visitor_interface_strategized_proxy_broker_ss::
 be_visitor_interface_strategized_proxy_broker_ss (be_visitor_context *ctx)
@@ -102,16 +101,21 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
 
 int
 be_visitor_interface_strategized_proxy_broker_ss::visit_component (
-    be_component *node
-  )
+    be_component *node)
 {
   return this->visit_interface (node);
 }
 
+int
+be_visitor_interface_strategized_proxy_broker_ss::visit_connector (
+    be_connector *node)
+{
+  return this->visit_component (node);
+}
+
 void
 be_visitor_interface_strategized_proxy_broker_ss::gen_direct_operations (
     be_interface *,
-    TAO_OutStream *
-  )
+    TAO_OutStream *)
 {
 }
diff --git a/TAO/TAO_IDL/be_include/be_component.h b/TAO/TAO_IDL/be_include/be_component.h
index 35f22413299..cd9d0f9a0d9 100644
--- a/TAO/TAO_IDL/be_include/be_component.h
+++ b/TAO/TAO_IDL/be_include/be_component.h
@@ -46,10 +46,10 @@ public:
   /// Catch BE-specific members before delegating to the base class.
   virtual void redefine (AST_Interface *from);
 
-  // Cleanup function.
+  /// Cleanup function.
   virtual void destroy (void);
 
-  // Visiting.
+  /// Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Need for public access to fe_add_structure and fe_add_typedef,
diff --git a/TAO/TAO_IDL/be_include/be_connector.h b/TAO/TAO_IDL/be_include/be_connector.h
index d76b5bc4304..e3575025c5f 100644
--- a/TAO/TAO_IDL/be_include/be_connector.h
+++ b/TAO/TAO_IDL/be_include/be_connector.h
@@ -16,8 +16,8 @@ public:
                 AST_Connector *base_connector);
 
   virtual ~be_connector (void);
-  
-  // Cleanup function.
+
+  /// Cleanup function.
   virtual void destroy (void);
 
   // Narrowing.
@@ -25,7 +25,7 @@ public:
   DEF_NARROW_FROM_DECL (be_connector);
   DEF_NARROW_FROM_SCOPE (be_connector);
 
-  // Visiting.
+  /// Visiting.
   virtual int accept (be_visitor *visitor);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h
index 77d0b074db9..2d872ba5f1a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h
@@ -39,6 +39,10 @@ public:
   /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
 
+  /// This will just call the above method - no need to create
+  /// another set of visitors for this stuff.
+  virtual int visit_connector (be_connector *node);
+
   /// Helper to generate the declarations for the operations
   /// of any abstract parents we may have.
   static int gen_abstract_ops_helper (be_interface *node,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h
index d5e7564b5fe..a24dad9c6fc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h
@@ -38,6 +38,10 @@ public:
   /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
 
+  /// This will just call the above method - no need to create
+  /// another set of visitors for this stuff.
+  virtual int visit_connector (be_connector *node);
+
   /// Helper to generate the declarations for the operations
   /// of any abstract parents we may have.
   static int gen_abstract_ops_helper (be_interface *node,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h
index 0373dc003dd..36d89682895 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h
@@ -38,6 +38,10 @@ public:
   /// This will just call the above method - no need to create
   /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+
+  /// This will just call the above method - no need to create
+  /// another set of visitors for this stuff.
+  virtual int visit_connector (be_connector *node);
 };
 
 #endif /* BE_STRATEGIZED_PROXY_BROKER_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h
index 2ef0624165a..8962eed07f8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h
@@ -13,17 +13,18 @@
  */
 //=============================================================================
 
-
 #ifndef BE_STRATEGIZED_PROXY_BROKER_SS_H_
 #define BE_STRATEGIZED_PROXY_BROKER_SS_H_
 
+/**
+ * @class be_visitor_interface_direct_proxy_impl_ss
+ *
+ * @brief Generates the implementation for the base proxy
+ * broker class.
+ */
 class be_visitor_interface_strategized_proxy_broker_ss
   : public be_visitor_interface
 {
-  // = TITLE
-  //   Generates the implementation  for the base proxy
-  //   broker class.
-
 public:
   // -- Ctor/Dtor Decl. --
   be_visitor_interface_strategized_proxy_broker_ss (be_visitor_context *ctx);
@@ -37,10 +38,12 @@ public:
   /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
 
-private:
+  /// This will just call the above method - no need to create
+  /// another set of visitors for this stuff.
+  virtual int visit_connector (be_connector *node);
 
-  void gen_direct_operations (be_interface *node,
-                              TAO_OutStream *os);
+private:
+  void gen_direct_operations (be_interface *node, TAO_OutStream *os);
 };
 
 #endif /* BE_STRATEGIZED_PROXY_BROKER_SS_H_ */