Mon Dec 7 18:21:43 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

10 files changed, 60 insertions, 41 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 038b0f990ce..2efd2595796 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Mon Dec  7 18:21:43 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/schema/Basic_Deployment_Data.xsd:
+        * tools/Config_Handlers/Basic_Deployment_Data.cpp:
+        * tools/Config_Handlers/Basic_Deployment_Data.hpp:
+        * tools/Config_Handlers/CPD_Handler.cpp:
+        * tools/Config_Handlers/DnC_Dump.cpp:
+        * tools/Config_Handlers/PSPE_Handler.cpp:
+
+          Config handler updates. 
+        
 Mon Dec  7 17:51:30 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.idl:
@@ -7,8 +18,8 @@ Mon Dec  7 17:51:30 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
         * tests/CIAO_ComponentServer/Local_Facet/client.cpp:
         * tests/CIAO_ComponentServer/Local_Facet/run_test.pl:
 
-          Added simple test for local facet connection logic. 
-        
+          Added simple test for local facet connection logic.
+
 Mon Dec  7 17:04:43 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * tests/CIAO_ComponentServer/Local_Facet:
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl b/CIAO/connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl
index cf356190ca7..34ed31d82ce 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl
@@ -9,37 +9,37 @@
 module Hello_AMI
 {
   // callback interface from AMI-component to Sender component
-  interface AMI_MyFooCallback : ::Messaging::ReplyHandler
-    {
-      void foo (in long ami_return_val, in string answer);
-      void foo_excep   (in Messaging::ExceptionHolder excep_holder);
+  local interface AMI_MyFooCallback : ::Messaging::ReplyHandler
+  {
+    void foo (in long ami_return_val, in string answer);
+    void foo_excep   (in Messaging::ExceptionHolder excep_holder);
 
-      void hello (in long ami_return_val);
-      void hello_excep   (in Messaging::ExceptionHolder excep_holder);
+    void hello (in long ami_return_val);
+    void hello_excep   (in Messaging::ExceptionHolder excep_holder);
       
-      void get_rw_attrib (in short ami_return_val);
-      void get_rw_attrib_excep (in Messaging::ExceptionHolder excep_holder);
+    void get_rw_attrib (in short ami_return_val);
+    void get_rw_attrib_excep (in Messaging::ExceptionHolder excep_holder);
       
-      void set_rw_attrib ();
-      void set_rw_attrib_excep (in Messaging::ExceptionHolder excep_holder);
+    void set_rw_attrib ();
+    void set_rw_attrib_excep (in Messaging::ExceptionHolder excep_holder);
       
-      void get_ro_attrib (in short ami_return_val);
-      void get_ro_attrib_excep (in Messaging::ExceptionHolder excep_holder);
-    };
+    void get_ro_attrib (in short ami_return_val);
+    void get_ro_attrib_excep (in Messaging::ExceptionHolder excep_holder);
+  };
 
   // AMI component. Sender calls AMI-component and AMI-component calls Receiver
   // using the AMI_foo interface.
   // Example of a global reply handler
-  interface AMI_MyFoo
-    {
-      void sendc_foo (in AMI_MyFooCallback ami_handler, in string in_str);
-      void sendc_hello (in AMI_MyFooCallback ami_handler);
+  local interface AMI_MyFoo
+  {
+    void sendc_foo (in AMI_MyFooCallback ami_handler, in string in_str);
+    void sendc_hello (in AMI_MyFooCallback ami_handler);
       
-      //asynch method for handling attributes
-      void sendc_get_rw_attrib (in AMI_MyFooCallback ami_handler);
-      void sendc_set_rw_attrib (in AMI_MyFooCallback ami_handler, in short rw_attrib);
-      void sendc_get_ro_attrib (in AMI_MyFooCallback ami_handler);
-    };
+    //asynch method for handling attributes
+    void sendc_get_rw_attrib (in AMI_MyFooCallback ami_handler);
+    void sendc_set_rw_attrib (in AMI_MyFooCallback ami_handler, in short rw_attrib);
+    void sendc_get_ro_attrib (in AMI_MyFooCallback ami_handler);
+  };
 };
 
 #endif /* HELLO_BASE_IDL */
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl
index 766847fced3..6af31bce82b 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl
@@ -13,14 +13,11 @@ module Hello_AMI
 {
   component Sender
   {
-    // for asynch invocation.
+    // for asynch invocation. @@implied
     uses Hello_AMI::AMI_MyFoo       run_asynch_my_foo;
 
     // for synchronous invocation
     uses Hello::MyFoo         run_my_foo;
-
-    //provides the callback function/exception for the AMI component.
-    provides Hello_AMI::AMI_MyFooCallback        the_my_foo_callback;
   };
 
   home SenderHome manages Sender
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
index 22272db56d5..15c66c77a5f 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
@@ -281,18 +281,6 @@ namespace CIAO_Hello_AMI_Sender_Impl
   // Component attributes.
 
   // Port operations.
-
-  ::Hello_AMI::CCM_AMI_MyFooCallback_ptr
-  Sender_exec_i::get_the_my_foo_callback ()
-  {
-    if (CORBA::is_nil (global_foo_callback_))
-    {
-      global_foo_callback_ = new MyFoo_callback_exec_i ();
-    }
-
-    return  global_foo_callback_;
-  }
-
   // Operations from Components::SessionComponent.
 
   void
diff --git a/CIAO/docs/schema/Basic_Deployment_Data.xsd b/CIAO/docs/schema/Basic_Deployment_Data.xsd
index ddcc349a42f..717f2a11f9f 100644
--- a/CIAO/docs/schema/Basic_Deployment_Data.xsd
+++ b/CIAO/docs/schema/Basic_Deployment_Data.xsd
@@ -291,6 +291,7 @@
   <xsd:simpleType name="CCMComponentPortKind">
     <xsd:restriction base="xsd:NCName">
       <xsd:enumeration value="Facet"/>
+      <xsd:enumeration value="LocalFacet"/>
       <xsd:enumeration value="SimplexReceptacle"/>
       <xsd:enumeration value="MultiplexReceptacle"/>
       <xsd:enumeration value="EventEmitter"/>
diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
index 1e07c6cbfa2..2114fc7d99a 100644
--- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
+++ b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
@@ -6575,6 +6575,7 @@ namespace CIAO
       ::std::basic_string< ACE_TCHAR > v (e.value ());
 
       if (v == ACE_TEXT ("Facet")) v_ = Facet_l;
+      else if (v == ACE_TEXT ("LocalFacet")) v_ = LocalFacet_l;
       else if (v == ACE_TEXT ("SimplexReceptacle")) v_ = SimplexReceptacle_l;
       else if (v == ACE_TEXT ("MultiplexReceptacle")) v_ = MultiplexReceptacle_l;
       else if (v == ACE_TEXT ("EventEmitter")) v_ = EventEmitter_l;
@@ -6594,6 +6595,7 @@ namespace CIAO
       ::std::basic_string< ACE_TCHAR > v (a.value ());
 
       if (v == ACE_TEXT ("Facet")) v_ = Facet_l;
+      else if (v == ACE_TEXT ("LocalFacet")) v_ = LocalFacet_l;
       else if (v == ACE_TEXT ("SimplexReceptacle")) v_ = SimplexReceptacle_l;
       else if (v == ACE_TEXT ("MultiplexReceptacle")) v_ = MultiplexReceptacle_l;
       else if (v == ACE_TEXT ("EventEmitter")) v_ = EventEmitter_l;
@@ -6607,6 +6609,7 @@ namespace CIAO
     }
 
     CCMComponentPortKind const CCMComponentPortKind::Facet (CCMComponentPortKind::Facet_l);
+    CCMComponentPortKind const CCMComponentPortKind::LocalFacet (CCMComponentPortKind::LocalFacet_l);
     CCMComponentPortKind const CCMComponentPortKind::SimplexReceptacle (CCMComponentPortKind::SimplexReceptacle_l);
     CCMComponentPortKind const CCMComponentPortKind::MultiplexReceptacle (CCMComponentPortKind::MultiplexReceptacle_l);
     CCMComponentPortKind const CCMComponentPortKind::EventEmitter (CCMComponentPortKind::EventEmitter_l);
@@ -16648,6 +16651,7 @@ namespace CIAO
         ::std::basic_string< ACE_TCHAR > s;
 
         if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::Facet) s = ACE_TEXT ("Facet");
+        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::LocalFacet) s = ACE_TEXT ("LocalFacet");
         else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::SimplexReceptacle) s = ACE_TEXT ("SimplexReceptacle");
         else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::MultiplexReceptacle) s = ACE_TEXT ("MultiplexReceptacle");
         else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::EventEmitter) s = ACE_TEXT ("EventEmitter");
diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
index 50b1ec3283a..0500ea5d221 100644
--- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
@@ -1774,6 +1774,7 @@ namespace CIAO
       CCMComponentPortKind (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
 
       static CCMComponentPortKind const Facet;
+      static CCMComponentPortKind const LocalFacet;
       static CCMComponentPortKind const SimplexReceptacle;
       static CCMComponentPortKind const MultiplexReceptacle;
       static CCMComponentPortKind const EventEmitter;
@@ -1784,7 +1785,7 @@ namespace CIAO
 
       enum Value
       {
-        Facet_l, SimplexReceptacle_l, MultiplexReceptacle_l, EventEmitter_l, EventPublisher_l, EventConsumer_l, ExtendedPort_l, MirrorPort_l
+        Facet_l, LocalFacet_l, SimplexReceptacle_l, MultiplexReceptacle_l, EventEmitter_l, EventPublisher_l, EventConsumer_l, ExtendedPort_l, MirrorPort_l
       };
 
 
diff --git a/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/CIAO/tools/Config_Handlers/CPD_Handler.cpp
index afad9712eed..3519a2fd41e 100644
--- a/CIAO/tools/Config_Handlers/CPD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/CPD_Handler.cpp
@@ -34,6 +34,10 @@ namespace CIAO
           toconfig.kind = Deployment::Facet;
           break;
 
+        case CCMComponentPortKind::LocalFacet_l:
+          toconfig.kind = Deployment::LocalFacet;
+          break;
+
         case CCMComponentPortKind::SimplexReceptacle_l:
           toconfig.kind = Deployment::SimplexReceptacle;
           break;
@@ -115,6 +119,10 @@ namespace CIAO
           cpd.kind (CCMComponentPortKind::Facet);
           break;
 
+        case ::Deployment::LocalFacet:
+          cpd.kind (CCMComponentPortKind::LocalFacet);
+          break;
+
         case ::Deployment::SimplexReceptacle:
           cpd.kind (CCMComponentPortKind::SimplexReceptacle);
           break;
diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
index 3bee947afd3..3703761168d 100644
--- a/CIAO/tools/Config_Handlers/DnC_Dump.cpp
+++ b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
@@ -209,6 +209,7 @@ namespace Deployment
     ACE_DEBUG ((LM_DEBUG, "%skind: ", Dump_Obj::indent()));
     switch (compportdesc.kind) {
     case Facet: ACE_DEBUG ((LM_DEBUG, "Facet\n")); break;
+    case LocalFacet: ACE_DEBUG ((LM_DEBUG, "LocalFacet\n")); break;
     case SimplexReceptacle: ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\n")); break;
     case MultiplexReceptacle: ACE_DEBUG ((LM_DEBUG, "MultiplexReceptacle\n")); break;
     case EventEmitter: ACE_DEBUG ((LM_DEBUG, "EventEmitter\n")); break;
diff --git a/CIAO/tools/Config_Handlers/PSPE_Handler.cpp b/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
index 28d29bf8f34..9b070443749 100644
--- a/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
@@ -62,6 +62,10 @@ namespace CIAO
           dest.kind = Deployment::Facet;
           break;
 
+        case CCMComponentPortKind::LocalFacet_l:
+          dest.kind = Deployment::LocalFacet;
+          break;
+
         case CCMComponentPortKind::SimplexReceptacle_l:
           dest.kind = Deployment::SimplexReceptacle;
           break;
@@ -117,6 +121,10 @@ namespace CIAO
           pspe.kind (CCMComponentPortKind::Facet);
           break;
 
+        case ::Deployment::LocalFacet:
+          pspe.kind (CCMComponentPortKind::LocalFacet);
+          break;
+
         case ::Deployment::SimplexReceptacle:
           pspe.kind (CCMComponentPortKind::SimplexReceptacle);
           break;