Thu Jun 17 19:15:04 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

        * DAnCE/DAnCE/DAnCE_Properties.idl:
          
          Added property to indentify the entity POA. 

        * DAnCE/DAnCE/DAnCE_Utility.h:
        * DAnCE/DAnCE/DAnCE_Utility.tpp:

          Added a utility method to extract exceptions from an Any. 

4 files changed, 32 insertions, 2 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 5fd6f86651d..7d453a9e654 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,13 +1,24 @@
+Thu Jun 17 19:15:04 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/DAnCE/DAnCE_Properties.idl:
+          
+          Added property to indentify the entity POA. 
+
+        * DAnCE/DAnCE/DAnCE_Utility.h:
+        * DAnCE/DAnCE/DAnCE_Utility.tpp:
+
+          Added a utility method to extract exceptions from an Any. 
+
 Thu Jun 17 15:34:10 UTC 2010  Martin Corino  <mcorino@remedy.nl>
 
         * DAnCE/tools/Completion/Completion_Counter_Base.inl:
         * DAnCE/tools/Completion/Completion_Counter_Base.h:
-	  Added error collection.
+          Added error collection.
 
         * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
         * DAnCE/DomainApplication/Domain_Application_Impl.cpp:
         * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp:
-	  Fixed error propagation.
+          Fixed error propagation.
 
 Thu Jun 17 14:48:02 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
diff --git a/CIAO/DAnCE/DAnCE/DAnCE_Properties.idl b/CIAO/DAnCE/DAnCE/DAnCE_Properties.idl
index b1973433595..53e46aaff64 100644
--- a/CIAO/DAnCE/DAnCE/DAnCE_Properties.idl
+++ b/CIAO/DAnCE/DAnCE/DAnCE_Properties.idl
@@ -38,6 +38,9 @@ module DAnCE
   /// Indicates the naming context used for instance objects.
   const string INSTANCE_NC = "edu.vanderbilt.dre.DAnCE.InstanceNC";
 
+  /// Indicates the POA in use for this entity.
+  const string ENTITY_POA = "edu.dre.vanderbilt.DAnCE.POA";
+
   const string LOCALITY_TIMEOUT = "edu.vanderbilt.dre.DAnCE.LocalityTimeout";
   const string LOCALITY_UUID = "edu.vanderbilt.dre.DAnCE.LocalityUUID";
   const string LOCALITY_ARGUMENTS = "edu.vanderbilt.dre.DAnCE.LocalityArguments";
diff --git a/CIAO/DAnCE/DAnCE/DAnCE_Utility.h b/CIAO/DAnCE/DAnCE/DAnCE_Utility.h
index 2ff4c2ff55e..93ad4e8fe37 100644
--- a/CIAO/DAnCE/DAnCE/DAnCE_Utility.h
+++ b/CIAO/DAnCE/DAnCE/DAnCE_Utility.h
@@ -75,6 +75,11 @@ namespace DAnCE
     /// overwritten.
     DANCE_STUB_Export int write_IOR (const ACE_TCHAR *pathname,
                                      const char *IOR);
+    
+    /// Attempt to extract the any into EXCEPTION type and
+    /// throw.  Returns 'false' if extraction fails.
+    template <typename EXCEPTION>
+    bool extract_and_throw_exception (const CORBA::Any &excep);
   }
 }
 
diff --git a/CIAO/DAnCE/DAnCE/DAnCE_Utility.tpp b/CIAO/DAnCE/DAnCE/DAnCE_Utility.tpp
index 5adf5798d35..d0dc74d922e 100644
--- a/CIAO/DAnCE/DAnCE/DAnCE_Utility.tpp
+++ b/CIAO/DAnCE/DAnCE/DAnCE_Utility.tpp
@@ -116,6 +116,17 @@ namespace DAnCE
           exception.reason = reason;
         }
     }
+    
+    template <typename EXCEPTION>
+    bool extract_and_throw_exception (const CORBA::Any &excep)
+    {
+      EXCEPTION *ex_holder;
+      
+      if ((excep >>= ex_holder))
+        throw *(ex_holder);
+      
+      return false;
+    }
   }
 }