Tue Dec 6 14:42:39 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>

        * TAO_IDL/be/be_interface.cpp:
        * TAO_IDL/be/be_visitor_component/component_svh.cpp:
        * TAO_IDL/be/be_visitor_component/component_svs.cpp:
        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
        * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
        revert changes after 2011-11-30 (ChangeLog.BRANCH missing those items) 

8 files changed, 43 insertions, 126 deletions

diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH
index 7b7497c5303..7afeffc8f98 100644
--- a/TAO/ChangeLog.BRANCH
+++ b/TAO/ChangeLog.BRANCH
@@ -1,29 +1,13 @@
-Tue Dec  6 11:26:51 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+Tue Dec  6 14:42:39 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
         * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-        No facet servant operations generated if connector.
-
-Mon Dec  5 16:35:32 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
         * TAO_IDL/be/be_visitor_component/component_svh.cpp:
         * TAO_IDL/be/be_visitor_component/component_svs.cpp:
         * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
         * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-        No facet servant generator if connector.
-
-Mon Dec  5 12:51:38 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-        Reverted previous commit.
-
-Thu Dec  1 13:51:38 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-        Facet on AMI connector svnt wasn't local.
+        * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+        revert changes after 2011-11-30 (ChangeLog.BRANCH missing those items) 
 
 Wed Nov 30 16:45:10 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
 
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 4a82e5f3cd7..b0028396a15 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -1273,15 +1273,6 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
                   continue;
                 }
 
-              // No server-side operation generation on connector,
-              AST_Decl::NodeType nt =
-                ScopeAsDecl (op->defined_in ())->node_type ();
-
-               if (nt == AST_Decl::NT_connector)
-                {
-                  continue;
-                }
-
               // We are an operation node.
               *os << "{\"" << d->original_local_name () << "\", &"
                   << full_skeleton_name << "::"
@@ -1383,15 +1374,6 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
                   continue;
                 }
 
-              // No server-side operation generation on connector,
-              AST_Decl::NodeType nt =
-                ScopeAsDecl (op->defined_in ())->node_type ();
-
-               if (nt == AST_Decl::NT_connector)
-                {
-                  continue;
-                }
-
               // Generate operation name.
 
               // We are an operation node. We use the original
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp
index f99782885b9..1764e19a800 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp
@@ -47,22 +47,16 @@ be_visitor_component_svh::visit_component (be_component *node)
   /// code generation.
   node->scan (node);
 
-  AST_Decl::NodeType nt = node->node_type ();
-  bool is_connector = (nt == AST_Decl::NT_connector);
+  // Generate the facet servant class declaration.
+  be_visitor_facet_svh facet_visitor (this->ctx_);
 
-  if (! is_connector)
+  if (facet_visitor.visit_component_scope (node) == -1)
     {
-      // Generate the facet servant class declaration.
-      be_visitor_facet_svh facet_visitor (this->ctx_);
-
-      if (facet_visitor.visit_component_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("be_visitor_component_svh::")
-                             ACE_TEXT ("visit_component - ")
-                             ACE_TEXT ("facet visitor failed\n")),
-                            -1);
-        }
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_component_svh::")
+                         ACE_TEXT ("visit_component - ")
+                         ACE_TEXT ("facet visitor failed\n")),
+                        -1);
     }
 
   /// CIDL-generated namespace used 'CIDL_' + composition name.
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp
index 1062183a9ae..5e098aa39fa 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp
@@ -43,21 +43,15 @@ be_visitor_component_svs::visit_component (be_component *node)
       return 0;
     }
 
-  AST_Decl::NodeType nt = node->node_type ();
-  bool is_connector = (nt == AST_Decl::NT_connector);
+  be_visitor_facet_svs facet_visitor (this->ctx_);
 
-  if (! is_connector)
+  if (facet_visitor.visit_component_scope (node) == -1)
     {
-      be_visitor_facet_svs facet_visitor (this->ctx_);
-
-      if (facet_visitor.visit_component_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("be_visitor_component_svs::")
-                             ACE_TEXT ("visit_component - ")
-                             ACE_TEXT ("facet visitor failed\n")),
-                            -1);
-        }
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_component_svs::")
+                         ACE_TEXT ("visit_component - ")
+                         ACE_TEXT ("facet visitor failed\n")),
+                        -1);
     }
 
   /// CIDL-generated namespace used 'CIDL_' + composition name.
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
index 3accfc82173..0709be18cd0 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
@@ -29,8 +29,6 @@ be_visitor_servant_svh::visit_component (be_component *node)
   // which already does a check for imported node, so none
   // is needed here.
   node_ = node;
-  AST_Decl::NodeType nt = node->node_type ();
-  bool is_connector = (nt == AST_Decl::NT_connector);
 
   AST_Decl *scope = ScopeAsDecl (node_->defined_in ());
   ACE_CString sname_str (scope->full_name ());
@@ -100,12 +98,9 @@ be_visitor_servant_svh::visit_component (be_component *node)
                         -1);
     }
 
-   if (! is_connector)
-     {
-       status = this->visit_component_scope (node);
-     }
+  status = this->visit_component_scope (node);
 
-   if (status == -1)
+  if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "be_visitor_servant_svh::"
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
index 22fe8fd8676..f099df71945 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
@@ -89,25 +89,21 @@ be_visitor_servant_svs::visit_component (be_component *node)
 
   /// If a component has neither facets nor event sinks, the
   /// setup methods aren't generated.
-  if (!is_connector)
+  if (this->node_->n_remote_provides () > 0UL
+      || this->node_->n_consumes () > 0UL)
     {
+      be_visitor_populate_port_tables ppt_visitor (this->ctx_);
 
-      if (this->node_->n_remote_provides () > 0UL
-          || this->node_->n_consumes () > 0UL)
-        {
-
-          be_visitor_populate_port_tables ppt_visitor (this->ctx_);
-
-          if (ppt_visitor.visit_component_scope (node) == -1)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "be_visitor_component_svs::"
-                               "visit_component - "
-                               "populate port tables visitor failed\n"),
-                              -1);
-          }
-        }
+      if (ppt_visitor.visit_component_scope (node) == -1)
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "be_visitor_component_svs::"
+                           "visit_component - "
+                           "populate port tables visitor failed\n"),
+                          -1);
+      }
     }
+
   os_ << be_uidt_nl << "}";
 
   os_ << be_nl_2
@@ -186,6 +182,7 @@ be_visitor_servant_svs::visit_component (be_component *node)
 
   /// Port operations that require scope traversal to get all the
   /// possible string name matches.
+
   this->gen_provides_top ();
   this->gen_uses_top ();
 
@@ -196,19 +193,17 @@ be_visitor_servant_svs::visit_component (be_component *node)
       this->gen_emits_top ();
     }
 
-  if (!is_connector)
+  /// This call will generate all other operations and attributes,
+  /// including inherited ones.
+  if (this->visit_component_scope (node) == -1)
     {
-      /// This call will generate all other operations and attributes,
-      /// including inherited ones.
-      if (this->visit_component_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_component_svs::"
-                             "visit_component - "
-                             "visit_component_scope() failed\n"),
-                            -1);
-        }
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_component_svs::"
+                         "visit_component - "
+                         "visit_component_scope() failed\n"),
+                        -1);
     }
+
   return 0;
 }
 
@@ -1536,14 +1531,7 @@ be_visitor_populate_port_tables::visit_provides (
     {
       return 0;
     }
-/*  AST_Decl::NodeType nt = node->node_type ();
-    bool is_connector = (nt == AST_Decl::NT_connector);
 
-    if (is_connector)
-      {
-        return 0;
-      }
-*/
   ACE_CString prefix (this->ctx_->port_prefix ());
   prefix += node->local_name ()->get_string ();
   const char *port_name = prefix.c_str ();
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
index 57dc49cc163..af72ab06923 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
@@ -34,16 +34,6 @@ be_visitor_operation_sh::visit_operation (be_operation *node)
       return 0;
     }
 
-  /// No server-side code generation on connector,
-  /// except for operations derived from attributes.
-  AST_Decl::NodeType nt =
-    ScopeAsDecl (node->defined_in ())->node_type ();
-
-  if (nt == AST_Decl::NT_connector && !this->ctx_->attribute ())
-    {
-      return 0;
-    }
-
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index b41444d95a5..2903992ecba 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -34,16 +34,6 @@ be_visitor_operation_ss::visit_operation (be_operation * node)
       return 0;
     }
 
-  /// No server-side code generation on connector,
-  /// except for operations derived from attributes.
-  AST_Decl::NodeType nt =
-    ScopeAsDecl (node->defined_in ())->node_type ();
-
-   if (nt == AST_Decl::NT_connector && !this->ctx_->attribute ())
-    {
-      return 0;
-    }
-
   TAO_OutStream *os = this->ctx_->stream ();
   be_type *bt = 0;